From 7c617b3515261a95c80f43855de2e8a91abaa561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 11 Nov 2014 11:21:31 +0100 Subject: [PATCH 001/172] Update card.php --- htdocs/expedition/card.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 8984e4c5424..1b1dbedfe59 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -664,7 +664,8 @@ if ($action == 'create') print ''.$langs->trans("DateDeliveryPlanned").''; print ''; //print dol_print_date($object->date_livraison,"day"); // date_livraison come from order and will be stored into date_delivery planed. - print $form->select_date($object->date_livraison?$object->date_livraison:-1,'date_delivery',1,1); + $date_delivery = ($date_delivery?$date_delivery:$object->date_livraison); // $date_delivery comes from GETPOST + print $form->select_date($date_delivery?$date_delivery:-1,'date_delivery',1,1); print "\n"; print ''; From 477aeecdac467663a3fbe42aaa5cdf27130b17e5 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 2 Dec 2014 22:30:40 +0100 Subject: [PATCH 002/172] #1725 Missing table cells in services list header --- htdocs/product/liste.php | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index cab06a7f387..44a6a69da2e 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -324,12 +324,16 @@ else print ''; print ''; print ''; + + // Barcode if (! empty($conf->barcode->enabled)) { print ''; print ''; print ''; } + + // Date modification print ''; print ' '; print ''; @@ -363,16 +367,7 @@ else print ''; print ' '; print ''; - //desiredstock - print ''; - print ' '; - print ''; - } - else - { - print ''; - print ' '; - print ''; + // Desired stock print ''; print ' '; print ''; @@ -501,15 +496,6 @@ else print $product_static->stock_reel; print ''; } - else - { - print ''; - print ' '; - print ''; - print ''; - print ' '; - print ''; - } } // Status (to buy) From aaf2cca45f3488a81ffd713e148ea9c3572efaf8 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 27 Oct 2014 19:31:42 +0100 Subject: [PATCH 003/172] Fix bug n sellist extrafield filtered --- htdocs/core/class/extrafields.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 451598a5830..228fef11d10 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -727,11 +727,11 @@ class ExtraFields if (strpos($InfoFieldList[4], 'extra')!==false) { $sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra'; - $sqlwhere.= ' AND extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4]; + $sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4]; } else { - $sqlwhere.= ' AND '.$InfoFieldList[4]; + $sqlwhere.= ' WHERE '.$InfoFieldList[4]; } } if (in_array($InfoFieldList[0],array('tablewithentity'))) $sqlwhere.= ' AND entity = '.$conf->entity; // Some tables may have field, some other not. For the moment we disable it. From bd8b393d8a8e383e6345488be2836e61d7e1004c Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Fri, 5 Dec 2014 21:24:16 +0100 Subject: [PATCH 004/172] Fix [ bug #1740 ] Clone project make task date crazy --- htdocs/projet/class/task.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 4f883e1b743..68b6c867442 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1007,7 +1007,8 @@ class Task extends CommonObject $error=0; - $now=dol_now(); + //Use 00:00 of today if time is use on task. + $now=dol_mktime(0,0,0,dol_print_date(dol_now(),'%m'),dol_print_date(dol_now(),'%d'),dol_print_date(dol_now(),'%Y')); $datec = $now; From a8052d8ea48f1ad9622c82e95b39b4f01ee9bd10 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Dec 2014 19:05:22 +0100 Subject: [PATCH 005/172] Fixed: Several fix in color management (function at wrong place, mark param that are deprecated, convertion of value to get correct format in all situation) --- htdocs/adherents/stats/geo.php | 3 +- htdocs/core/class/html.formother.class.php | 8 ++--- htdocs/core/lib/functions.lib.php | 13 -------- htdocs/core/lib/functions2.lib.php | 39 ++++++++++++++++++++++ htdocs/theme/eldy/style.css.php | 13 ++++---- 5 files changed, 52 insertions(+), 24 deletions(-) diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 736f6ef0140..938e3e172b2 100644 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -23,6 +23,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $graphwidth=DolGraph::getDefaultGraphSizeForStats('width',700); @@ -69,7 +70,7 @@ dol_mkdir($dir); if ($mode) { - // Define sql + // Define sql if ($mode == 'memberbycountry') { $label=$langs->trans("Country"); diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 1ed76cddd9b..c7f953dbbfc 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -560,13 +560,13 @@ class FormOther * * @param string $set_color Pre-selected color * @param string $prefix Name of HTML field - * @param string $form_name Name of form + * @param string $form_name Deprecated. Not used. * @param int $showcolorbox 1=Show color code and color box, 0=Show only color code * @param array $arrayofcolors Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813') * @return void * @deprecated */ - function select_color($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='') + function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='') { print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors); } @@ -576,13 +576,13 @@ class FormOther * * @param string $set_color Pre-selected color * @param string $prefix Name of HTML field - * @param string $form_name Name of form + * @param string $form_name Deprecated. Not used. * @param int $showcolorbox 1=Show color code and color box, 0=Show only color code * @param array $arrayofcolors Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813') * @param string $morecss Add css style into input field * @return void */ - function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='') + function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='') { global $langs,$conf; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a7cb3bbee73..a48b7e3caff 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4835,19 +4835,6 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=') } -/** - * Convert an array with RGB value into hex RGB value - * - * @param array $arraycolor Array - * @param string $colorifnotfound Color code to return if entry not defined - * @return string RGB hex value (without # before). For example: FF00FF - */ -function colorArrayToHex($arraycolor,$colorifnotfound='888888') -{ - if (! is_array($arraycolor)) return $colorifnotfound; - return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]); -} - /** * Set focus onto field with selector * diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 4702fe69e99..246af863d12 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1836,3 +1836,42 @@ function fetchObjectByElement($element_id,$element_type) { } return 0; } + + +/** + * Convert an array with RGB value into hex RGB value + * + * @param array $arraycolor Array + * @param string $colorifnotfound Color code to return if entry not defined + * @return string RGB hex value (without # before). For example: FF00FF + * @see Make the opposite of colorStringToArray + */ +function colorArrayToHex($arraycolor,$colorifnotfound='888888') +{ + if (! is_array($arraycolor)) return $colorifnotfound; + return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]); +} + + +/** + * Convert a string RGB value ('FFFFFF', '255,255,255') into an array RGB array(255,255,255) + * + * @param string $stringcolor String with hex (FFFFFF) or comma RGB ('255,255,255') + * @param string $colorifnotfound Color code to return if entry not defined + * @return string RGB hex value (without # before). For example: FF00FF + * @see Make the opposite of colorArrayToHex + */ +function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88)) +{ + if (is_array($stringcolor)) return $stringcolor; // If already into correct output format, we return as is + $tmp=preg_match('/^([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg); + if (! $tmp) + { + $tmp=explode(',',$stringcolor); + if (count($tmp) < 3) return $colorifnotfound; + return $tmp; + } + return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3])); +} + + diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c4d933d4940..99d5495ef58 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -38,6 +38,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); require_once '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined) if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login']); @@ -131,12 +132,8 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255'; $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252'; $conf->global->THEME_ELDY_TEXT='50,50,130'; - /*if ($dol_use_jmobile) - { - $conf->global->THEME_ELDY_BACKTABCARD1='245,245,245'; // topmenu - $conf->global->THEME_ELDY_BACKTABCARD2='245,245,245'; - $conf->global->THEME_ELDY_BACKTABACTIVE='245,245,245'; - }*/ + $conf->global->THEME_ELDY_FONT_SIZE1='12'; + $conf->global->THEME_ELDY_FONT_SIZE2='11'; } $colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1); @@ -167,6 +164,10 @@ if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf-> $colorbacklinepairhover=''; } +// Format color value to match expected format (may be 'FFFFFF' or '255,255,255') +$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1)); +$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2)); + // Set text color to black or white $tmppart=explode(',',$colorbackhmenu1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); From 5f8919c857b16df0aec7505e2d89652cc25fca70 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Dec 2014 23:59:33 +0100 Subject: [PATCH 006/172] Update translation --- htdocs/comm/action/card.php | 4 ++-- htdocs/langs/en_US/agenda.lang | 1 + htdocs/langs/fr_FR/agenda.lang | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 60fb20206b7..8a2c602a3f0 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -902,7 +902,7 @@ if ($id > 0) } // Assigned to - print ''.$langs->trans("ActionAffectedTo").''; + print ''.$langs->trans("ActionAssignedTo").''; $listofuserid=array(); if (empty($donotclearsession)) { @@ -1072,7 +1072,7 @@ if ($id > 0) } // Assigned to - print ''.$langs->trans("ActionAffectedTo").''; + print ''.$langs->trans("ActionAssignedTo").''; $listofuserid=array(); if (empty($donotclearsession)) { diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 5781d5e3ac0..1cc01ec2e7b 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= All my events/tasks AllActions= All events/tasks ViewList=List view diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index be2e6083aa6..a4e5e7e0a03 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Événements affectés à ActionsDoneBy=Événements réalisés par ActionsForUser=Evénements de l'utilisateur ActionsForUsersGroup=Evénements de tous les utilisateurs du groupe +ActionAssignedTo=Événement assigné à AllMyActions= Tous mes événements AllActions= Tous les événements ViewList=Vue liste From cf641194a1730c0edd97361535d218293b05b5d9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Dec 2014 00:02:43 +0100 Subject: [PATCH 007/172] Fix: CRLF --- dev/translation/strip_language_file.php | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php index d6c45d9f249..42a70c8c1a6 100755 --- a/dev/translation/strip_language_file.php +++ b/dev/translation/strip_language_file.php @@ -1,20 +1,20 @@ #!/usr/bin/php - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Copyright (C) 2014 Laurent Destailleur + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . * * ----- * @@ -270,8 +270,8 @@ foreach($filesToProcess as $fileToProcess) print "Output can be found at $output.\n"; - print "To rename all .delta files, you can do\n"; - print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n"; + print "To rename all .delta files, you can do\n"; + print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n"; } From 146107280160f090dfd7fb1cdf8c37996ae3f7f9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Dec 2014 01:12:52 +0100 Subject: [PATCH 008/172] Fix: Paypal link were broken dur to SSL v3 closed. --- ChangeLog | 2 ++ htdocs/paypal/lib/paypal.lib.php | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a65eef7fc9..949492346b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 3.5.7 compared to 3.5.6 ***** +Fix: Paypal link were broken dur to SSL v3 closed. ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 31ed9b97ff8..3d9dcf16d02 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -683,7 +683,8 @@ function hash_call($methodName,$nvpStr) exit;*/ curl_setopt($ch, CURLOPT_URL, $API_Endpoint); curl_setopt($ch, CURLOPT_VERBOSE, 1); - curl_setopt($ch, CURLOPT_SSLVERSION, 3); // Force SSLv3 + //curl_setopt($ch, CURLOPT_SSLVERSION, 3); // Force SSLv3 + curl_setopt($ch, CURLOPT_SSLVERSION, 1); // Force TLSv1 //turning off the server and peer verification(TrustManager Concept). curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); From 666e66e78f54ca45ed926f20e41fe442c20289d3 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 9 Dec 2014 05:04:12 +0100 Subject: [PATCH 009/172] Correct link in activity box --- htdocs/core/boxes/box_activity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php index bddeb4b957e..8e0bd6a8a21 100644 --- a/htdocs/core/boxes/box_activity.php +++ b/htdocs/core/boxes/box_activity.php @@ -114,7 +114,7 @@ class box_activity extends ModeleBoxes $billurl="viewstatut=2&paye=1&year=".$objp->annee; $this->info_box_contents[$i][2] = array('td' => 'align="right"', - 'text' => $objp->nb, 'url' => DOL_URL_ROOT."/compta/facture/liste.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills" + 'text' => $objp->nb, 'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills" ); $this->info_box_contents[$i][3] = array('td' => 'align="right"', From 81dc1415deabd45c2c3da2f4376d841c825166f4 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 9 Dec 2014 05:04:39 +0100 Subject: [PATCH 010/172] Untranslatable token in activity box --- htdocs/core/class/html.formother.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 5150f2d4e41..c54991af434 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -1017,6 +1017,7 @@ class FormOther if ($nbboxactivated) { $langs->load("boxes"); + $langs->load("projects"); $emptybox=new ModeleBoxes($db); From 63f2bfed24123dfde67150566a82916c99666330 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Dec 2014 11:19:16 +0100 Subject: [PATCH 011/172] Fixed: Maxi debug of withdrawal module. --- htdocs/admin/prelevement.php | 4 +- htdocs/compta/facture/class/facture.class.php | 25 ++++-- htdocs/compta/facture/prelevement.php | 77 ++++++++++++------- .../class/bonprelevement.class.php | 16 ++-- .../class/ligneprelevement.class.php | 6 +- htdocs/compta/prelevement/create.php | 21 +++-- htdocs/compta/prelevement/fiche-stat.php | 3 +- htdocs/compta/prelevement/ligne.php | 2 +- htdocs/compta/prelevement/lignes.php | 8 +- htdocs/compta/prelevement/stats.php | 4 +- htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/en_US/withdrawals.lang | 3 +- htdocs/societe/rib.php | 20 +++-- 13 files changed, 124 insertions(+), 67 deletions(-) diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 6094bb7e4f1..3bff5c29118 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2010 Laurent Destailleur + * Copyright (C) 2005-2014 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2010-2013 Juanjo Menent * @@ -153,7 +153,7 @@ print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEME print ''; // ICS -print ''.$langs->trans("ICS").''; +print ''.$langs->trans("ICS").''; print ''; print ''; print ''; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index b924b059bfd..cd8ba3b06a1 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2837,6 +2837,8 @@ class Facture extends CommonInvoice */ function demande_prelevement($user) { + $error=0; + dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG); if ($this->statut > 0 && $this->paye == 0) @@ -2882,21 +2884,32 @@ class Facture extends CommonInvoice $sql .= ",'".$bac->cle_rib."')"; dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG); - if ($this->db->query($sql)) + $resql=$this->db->query($sql); + if (! $resql) { - return 1; - } - else - { $this->error=$this->db->lasterror(); dol_syslog(get_class($this).'::demandeprelevement Erreur'); - return -1; + $error++; } + + if (! $error) + { + // Force payment mode of invoice to withdraw + $payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement'); + if ($payment_mode_id > 0) + { + $result=$this->setPaymentMethods($payment_mode_id); + } + } + + if ($error) return -1; + return 1; } else { $this->error="A request already exists"; dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours'); + return 0; } } else diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 48ca10afd2d..1b4f440b461 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -58,6 +58,7 @@ if ($id > 0 || ! empty($ref)) } } + /* * Actions */ @@ -69,14 +70,14 @@ if ($action == "new") $result = $object->demande_prelevement($user); if ($result > 0) { - header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); - exit; + setEventMessage($langs->trans("RecordSaved")); } else { setEventMessage($object->error, 'errors'); } } + $action=''; } if ($action == "delete") @@ -307,6 +308,31 @@ if ($object->id > 0) print ''; print ''; + // Conditions de reglement + print ''; + print ''; + if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; + print '
'; + print $langs->trans('PaymentConditionsShort'); + print 'id.'">'.img_edit($langs->trans('SetConditions'),1).'
'; + print ''; + if ($object->type != Facture::TYPE_CREDIT_NOTE) + { + if ($action == 'editconditions') + { + $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id'); + } + else + { + $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none'); + } + } + else + { + print ' '; + } + print ''; + // Date payment term print ''; print ''; - // Conditions de reglement - print ''; - - // Mode de reglement + // Payment mode print ''; + print ''; print ''; print ''; } @@ -475,10 +481,10 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) } // IBAN - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; ; $total += $obj->reel; if (price2num($obj->pmp)) $totalwithpmp += $obj->reel; - $totalvalue = $totalvalue + price2num($obj->pmp*$obj->reel,'MU'); // Ditto : Show PMP from movement or from product - $totalvaluesell = $totalvaluesell + price2num($product->price*$obj->reel,'MU'); // Ditto : Show PMP from movement or from product + $totalvalue = $totalvalue + ($obj->pmp*$obj->reel); // Ditto : Show PMP from movement or from product + $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel); // Ditto : Show PMP from movement or from product //Batch Detail if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) { @@ -670,7 +673,7 @@ else dol_print_error($db); print ''; print ''; print ''; // Value purchase print ''; + print ''; // Total PMP - print ''; - $totalvalue+=price2num($objp->pmp*$objp->value,'MT'); + print ''; + $totalvalue+=price2num($objp->ppmp*$objp->value,'MT'); // Price sell min if (empty($conf->global->PRODUIT_MULTIPRICES)) diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index c55466ebdb1..c85c501fa58 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -52,7 +52,7 @@ $year = strftime("%Y",time()); */ $sql = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays,"; -$sql.= " SUM(ps.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue"; +$sql.= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue"; $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid"; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index e7be28b96bd..616e91d1924 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -125,7 +125,7 @@ if ($action == "correct_stock" && ! $cancel) $product = new Product($db); $result=$product->fetch($id); } - if ($product->hasbatch()) + if ($product->hasbatch()) { $d_eatby=dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']); $d_sellby=dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']); @@ -140,7 +140,7 @@ if ($action == "correct_stock" && ! $cancel) $d_sellby, GETPOST('batch_number') ); // We do not change value of stock for a correction - } + } else { $result=$product->correct_stock( @@ -633,9 +633,9 @@ if ($resql) print ''; print ''; // PMP - print ''; // Ditto : Show PMP from movement or from product + print ''; // Ditto : Show PMP from movement or from product // Value purchase - print ''; // Ditto : Show PMP from movement or from product + print ''; // Ditto : Show PMP from movement or from product // Sell price print ''; ; $total += $obj->reel; - if (price2num($obj->pmp)) $totalwithpmp += $obj->reel; - $totalvalue = $totalvalue + ($obj->pmp*$obj->reel); // Ditto : Show PMP from movement or from product + if (price2num($product->pmp)) $totalwithpmp += $obj->reel; + $totalvalue = $totalvalue + ($product->pmp*$obj->reel); // Ditto : Show PMP from movement or from product $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel); // Ditto : Show PMP from movement or from product //Batch Detail - if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) + if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) { $details=Productbatch::findAll($db,$obj->product_stock_id); if ($details<0) dol_print_error($db); - foreach ($details as $pdluo) + foreach ($details as $pdluo) { print "\n".''; print ''; @@ -670,14 +670,15 @@ if ($resql) } } else dol_print_error($db); + print ''; print ''; print ''; // Value purchase print ''; print ''; - print ''; print ''; } else { $var=!$var; print ''; - print ''; print ''; } From 37e5a97f84fea2e4a45d72e425e75de2faeb4810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Dec 2014 23:07:41 +0100 Subject: [PATCH 022/172] Typo --- htdocs/compta/bank/rappro.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 70e2be1cfd4..9339ff202ec 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -249,7 +249,7 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; - print ""; + print "\n"; // print ''; // print ''; @@ -261,9 +261,9 @@ if ($resql) // Date value if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate)) { - print ''; print "
'; @@ -333,32 +359,7 @@ if ($object->id > 0) } print '
'; - print ''; - if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; - print '
'; - print $langs->trans('PaymentConditionsShort'); - print 'id.'">'.img_edit($langs->trans('SetConditions'),1).'
'; - print '		'; - if ($object->type != Facture::TYPE_CREDIT_NOTE) - { - if ($action == 'editconditions') - { - $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id'); - } - else - { - $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none'); - } - } - else - { - print ' '; - } - print '
'; print ''; + // Bank Account + print '"; + print ''; + // Montants print ''; print ''; diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 47ac4d1a390..5da94a28b76 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -56,7 +56,9 @@ class BonPrelevement extends CommonObject var $statut; // 0-Wait, 1-Trans, 2-Done var $labelstatut=array(); + var $invoice_in_error=array(); + /** * Constructor * @@ -835,7 +837,7 @@ class BonPrelevement extends CommonObject else { dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR); - $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->name; + $this->invoice_in_error[$fac[0]]="Error on default bank number RIB/IBAN for invoice ".$fact->getNomUrl(0)." for thirdparty (reported by function verif) ".$soc->name; } } else @@ -1814,21 +1816,21 @@ class BonPrelevement extends CommonObject if ($mode == 1) { - if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0').' '.$langs->trans($this->labelstatut[$statut]); - if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]); + if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]); + if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3').' '.$langs->trans($this->labelstatut[$statut]); if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6').' '.$langs->trans($this->labelstatut[$statut]); } if ($mode == 2) { - if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0'); - if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1'); + if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1'); + if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3'); if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6'); } if ($mode == 3) { - if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut0'); - if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1'); + if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1'); + if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut3'); if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut6'); } } diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php index 9c4bf96e8b3..581fb3152af 100644 --- a/htdocs/compta/prelevement/class/ligneprelevement.class.php +++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php @@ -138,20 +138,20 @@ class LignePrelevement if ($mode == 1) { - if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]); + if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]); if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]); if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]); } if ($mode == 2) { - if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0'); + if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1'); if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4'); if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8'); } if ($mode == 3) { - if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0'); + if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1'); if ($statut==2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4'); if ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut8'); } diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 0326e4922f1..e4cb4b65c30 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -70,6 +70,10 @@ if ($action == 'create') if ($result == 0) { $mesg='
'.$langs->trans("NoInvoiceCouldBeWithdrawed").'
'; + foreach($bprev->invoice_in_error as $key => $val) + { + $mesg.=$val."
\n"; + } } } @@ -179,6 +183,7 @@ if ($resql) print ''; print ''; print ''; + print ''; print ''; print ''; print ''; @@ -190,16 +195,22 @@ if ($resql) { $obj = $db->fetch_object($resql); $var=!$var; - print ''; + print ''; + // Thirdparty print ''; + // RIB + print ''; + // Amount print ''; @@ -211,7 +222,7 @@ if ($resql) $i++; } } - else print ''; + else print ''; print "
'; print $langs->trans('PaymentMode'); @@ -376,6 +377,26 @@ if ($object->id > 0) } print '
'; + print ''; + print '
'; + print $langs->trans('BankAccount'); + print ''; + if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon)) + print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).'
'; + print '		'; + if ($action == 'editbankaccount') + { + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); + } + else + { + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); + } + print "
'.$langs->trans('AmountHT').''.price($object->total_ht).'
'.$langs->trans("Invoice").''.$langs->trans("ThirdParty").''.$langs->trans("RIB").''.$langs->trans("AmountTTC").''.$langs->trans("DateRequest").'
'; + print '
'; $invoicestatic->id=$obj->rowid; $invoicestatic->ref=$obj->facnumber; print $invoicestatic->getNomUrl(1,'withdraw'); print ''; - $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->name=$obj->name; - print $thirdpartystatic->getNomUrl(1,'customer'); + $thirdpartystatic->fetch($obj->socid); + print $thirdpartystatic->getNomUrl(1,'card'); print ''; + print $thirdpartystatic->display_rib(); + print ''; print price($obj->total_ttc,0,$langs,0,0,-1,$conf->currency); print '
'.$langs->trans("None").'
'.$langs->trans("None").'
"; print "
\n"; } diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 37b6c708b96..0e9174ef034 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -106,7 +106,6 @@ if ($prev_id) /* * Stats - * */ $ligne=new LignePrelevement($db,$user); @@ -121,6 +120,8 @@ if ($prev_id) $num = $db->num_rows($resql); $i = 0; + print_fiche_titre($langs->trans("StatisticsByLineStatus"),'',''); + print"\n\n"; print ''; print ''; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index f1617979645..3e7cb5b6bd7 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -134,7 +134,7 @@ if ($id) print '
'; print ''; + print $bon->getNomUrl(1).''; print ''; print ''; print ''; diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index 1e96e9276d8..c4724824f36 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -124,8 +124,6 @@ $pagenext = $page + 1; /* * Liste des lignes de prelevement - * - * */ $sql = "SELECT pl.rowid, pl.statut, pl.amount"; $sql.= ", s.rowid as socid, s.nom as name"; @@ -175,7 +173,11 @@ if ($result) print substr('000000'.$obj->rowid, -6); print ''; - print '\n"; + $thirdparty=new Societe($db); + $thirdparty->fetch($obj->socid); + print '\n"; print '\n"; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 2c8607a9a56..c3667f8b69f 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -21,7 +21,7 @@ /** * \file htdocs/compta/prelevement/stats.php * \ingroup prelevement - * \brief Page de stats des prelevements + * \brief Page with statistics on withdrawals */ require('../../main.inc.php'); @@ -96,7 +96,7 @@ if ($resql) print ''; print ''; - $var=True; + $var=false; while ($i < $num) { diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 29664483d18..e0c1a9152e6 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -444,7 +444,7 @@ Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index fd4305bbd0b..a0f8078fb18 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 01d82ac0867..ab14d757f6f 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2013 Peter Fontaine * @@ -185,6 +185,7 @@ if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes') } } + /* * View */ @@ -317,8 +318,13 @@ if ($socid && $action != 'edit' && $action != "create") print '
'.$langs->trans("RIBControlError").'
'; } - print "
"; + print "
"; + + /* + * List of bank accounts + */ + print_titre($langs->trans("AllRIB")); $rib_list = $soc->get_all_rib(); @@ -339,7 +345,7 @@ if ($socid && $action != 'edit' && $action != "create") foreach ($rib_list as $rib) { - print ""; + print ""; // Label print ''; // Bank name @@ -382,7 +388,7 @@ if ($socid && $action != 'edit' && $action != "create") } if (count($rib_list) == 0) { - print ''; + print ''; } print '
'.$langs->trans("WithdrawalsReceipts").''; - print ''.$lipre->bon_ref.'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($lipre->amount).'
'.$langs->trans("Status").''.$lipre->LibStatut($lipre->statut,1).'
'.$obj->name."'; + print $thirdparty->getNomUrl(1); + print "'.price($obj->amount)."'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
'.$rib->label.'
'.$langs->trans("NoBANRecord").'
'.$langs->trans("NoBANRecord").'
'; @@ -458,7 +464,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) if ($val == 'AccountNumber') { - print '		'.$langs->trans("BankAccountNumber").''.$langs->trans("BankAccountNumber").'
'.$langs->trans("IBAN").'
'.$langs->trans("IBAN").'
'.$langs->trans("BIC").'
'.$langs->trans("BIC").'
'.$langs->trans("BankAccountDomiciliation").''; From 6a70af2b67ab26b4baa538d9efd7269d72f522e1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Dec 2014 14:03:10 +0100 Subject: [PATCH 012/172] Fixed: bug into produc batch management --- htdocs/core/modules/modProductBatch.class.php | 2 +- .../stock/class/mouvementstock.class.php | 41 ++++++++++++++----- htdocs/product/stock/product.php | 33 ++++++++------- 3 files changed, 50 insertions(+), 26 deletions(-) diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php index 6eb358aa99d..4dd7d0a81ae 100644 --- a/htdocs/core/modules/modProductBatch.class.php +++ b/htdocs/core/modules/modProductBatch.class.php @@ -49,7 +49,7 @@ class modProductBatch extends DolibarrModules $this->name = preg_replace('/^mod/i','',get_class($this)); $this->description = "Batch number, eat-by and sell-by date management module"; - $this->rights_class = 'stock'; + $this->rights_class = 'productbatch'; // Possible values for version are: 'development', 'experimental', 'dolibarr' or version $this->version = 'experimental'; // Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase) diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 9e508f41461..24ca13da355 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -163,21 +163,40 @@ class MouvementStock extends CommonObject { $newpmp=0; $newpmpwarehouse=0; - // Note: PMP is calculated on stock input only (type = 0 or 3). If type == 0 or 3, qty should be > 0. + // Note: PMP is calculated on stock input only (type of movement = 0 or 3). If type == 0 or 3, qty should be > 0. // Note: Price should always be >0 or 0. PMP should be always >0 (calculated on input) if (($type == 0 || $type == 3) && $price > 0) { + // If we will change PMP for the warehouse we edit and the product, we must first check/clean that PMP is defined + // on every stock entry with old value (so global updated value will match recalculated value from product_stock) + $sql = "UPDATE ".MAIN_DB_PREFIX."product_stock SET pmp = ".($oldpmp?$oldpmp:'0'); + $sql.= " WHERE pmp = 0 AND fk_product = ".$fk_product; + dol_syslog(get_class($this)."::_create", LOG_DEBUG); + $resql=$this->db->query($sql); + if (! $resql) + { + $this->error=$this->db->lasterror(); + $error = -4; + } + $oldqtytouse=($oldqty >= 0?$oldqty:0); // We make a test on oldpmp>0 to avoid to use normal rule on old data with no pmp field defined if ($oldpmp > 0) $newpmp=price2num((($oldqtytouse * $oldpmp) + ($qty * $price)) / ($oldqtytouse + $qty), 'MU'); - else $newpmp=$price; - $oldqtywarehousetouse=($oldqtywarehouse >= 0?$oldqtywarehouse:0); + else + { + $newpmp=$price; // For this product, PMP was not yet set. We will set it later. + } + $oldqtywarehousetouse=$oldqtywarehouse; if ($oldpmpwarehouse > 0) $newpmpwarehouse=price2num((($oldqtywarehousetouse * $oldpmpwarehouse) + ($qty * $price)) / ($oldqtywarehousetouse + $qty), 'MU'); else $newpmpwarehouse=$price; - //print "oldqtytouse=".$oldqtytouse." oldpmp=".$oldpmp." oldqtywarehousetouse=".$oldqtywarehousetouse." oldpmpwarehouse=".$oldpmpwarehouse." "; - //print "qty=".$qty." newpmp=".$newpmp." newpmpwarehouse=".$newpmpwarehouse; - //exit; + /*print "oldqtytouse=".$oldqtytouse." oldpmp=".$oldpmp." oldqtywarehousetouse=".$oldqtywarehousetouse." oldpmpwarehouse=".$oldpmpwarehouse." "; + print "qty=".$qty." newpmp=".$newpmp." newpmpwarehouse=".$newpmpwarehouse; + exit;*/ + } + else if ($type == 1 || $type == 2) + { + // After a stock decrease, we don't change value of PMP for product. } else { @@ -207,14 +226,17 @@ class MouvementStock extends CommonObject { $this->error=$this->db->lasterror(); $error = -3; - } else if(empty($fk_product_stock)){ + } + else if(empty($fk_product_stock)) + { $fk_product_stock = $this->db->last_insert_id(MAIN_DB_PREFIX."product_stock"); } - } + } // Update detail stock for sell-by date - if (($product->hasbatch()) && (! $error) && (! $skip_sellby)){ + if (($product->hasbatch()) && (! $error) && (! $skip_sellby)) + { $param_batch=array('fk_product_stock' =>$fk_product_stock, 'eatby'=>$eatby,'sellby'=>$sellby,'batchnumber'=>$batch); $result=$this->_create_batch($param_batch, $qty); if ($result<0) $error++; @@ -245,7 +267,6 @@ class MouvementStock extends CommonObject if ($movestock && ! $error) { - $this->product_id = $fk_product; $this->entrepot_id = $entrepot_id; $this->qty = $qty; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index f6dfe3150b1..e7be28b96bd 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -122,10 +122,11 @@ if ($action == "correct_stock" && ! $cancel) if (is_numeric(GETPOST("nbpiece")) && $id) { if (empty($product)) { - $product = new Product($db); - $result=$product->fetch($id); + $product = new Product($db); + $result=$product->fetch($id); } - if ($product->hasbatch()) { + if ($product->hasbatch()) + { $d_eatby=dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']); $d_sellby=dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']); $result=$product->correct_stock_batch( @@ -139,15 +140,17 @@ if ($action == "correct_stock" && ! $cancel) $d_sellby, GETPOST('batch_number') ); // We do not change value of stock for a correction - } else { - $result=$product->correct_stock( - $user, - GETPOST("id_entrepot"), - GETPOST("nbpiece"), - GETPOST("mouvement"), - GETPOST("label"), - $priceunit - ); // We do not change value of stock for a correction + } + else + { + $result=$product->correct_stock( + $user, + GETPOST("id_entrepot"), + GETPOST("nbpiece"), + GETPOST("mouvement"), + GETPOST("label"), + $priceunit + ); // We do not change value of stock for a correction } if ($result > 0) @@ -645,8 +648,8 @@ if ($resql) print '
'.$langs->trans("Total").':'.$total.''; -print ($totalwithpmp?price($totalvalue/$totalwithpmp):' '); +print ($totalwithpmp?price(price2num(price2num($totalvalue,'MT')/$totalwithpmp,'MT')):' '); // This value may have rounding errors print ''; From 9be99b298783d796228f26cc29e670e91473d8c8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Dec 2014 14:27:02 +0100 Subject: [PATCH 013/172] Fixed: We must use PMP of product. Not warehouse. --- htdocs/install/mysql/tables/llx_entrepot.sql | 2 +- .../mysql/tables/llx_product_stock.sql | 2 +- htdocs/product/stock/card.php | 16 +++++++------- htdocs/product/stock/list.php | 2 +- htdocs/product/stock/product.php | 21 ++++++++++--------- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 1c49ac293f8..9e9bfc9c26f 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -33,7 +33,7 @@ create table llx_entrepot fk_departement integer, fk_pays integer DEFAULT 0, statut tinyint DEFAULT 1, -- 1 open, 0 close - valo_pmp float(12,4), -- valoristaion du stock en PMP + valo_pmp float(12,4), -- PMP value for this warehouse (deprecated. No sens for a warehouse) fk_user_author integer, import_key varchar(14) )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index 5d550aadb6d..99d7d27fb77 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -25,7 +25,7 @@ create table llx_product_stock fk_product integer NOT NULL, fk_entrepot integer NOT NULL, reel real, -- physical stock - pmp double(24,8) default 0 NOT NULL, -- PMP value for product in this warehouse + pmp double(24,8) default 0 NOT NULL, -- PMP value for product in this warehouse (deprecated. no sens for warehouse) import_key varchar(14) -- Import key )ENGINE=innodb; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 2a7f64ee475..39b778536b5 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -73,13 +73,13 @@ if ($action == 'add' && $user->rights->stock->creer) $object->town = GETPOST("town"); $object->country_id = GETPOST("country_id"); - if (! empty($object->libelle)) + if (! empty($object->libelle)) { $id = $object->create($user); if ($id > 0) { setEventMessage($langs->trans("RecordSaved")); - + if (! empty($backtopage)) { header("Location: ".$backtopage); @@ -180,9 +180,9 @@ if ($action == 'create') print ''; print ''; print ''; - + dol_fiche_head(); - + print ''; // Ref @@ -225,7 +225,7 @@ if ($action == 'create') print '
'; dol_fiche_end(); - + print '
'; print ''; @@ -445,10 +445,10 @@ else $totalunit+=$objp->value; // Price buy PMP - print '		'.price(price2num($objp->pmp,'MU')).''.price(price2num($objp->ppmp,'MU')).''.price(price2num($objp->pmp*$objp->value,'MT')).''.price(price2num($objp->ppmp*$objp->value,'MT')).''.$entrepotstatic->getNomUrl(1).''.$obj->reel.($obj->reel<0?' '.img_warning():'').''.(price2num($obj->pmp)?price2num($obj->pmp,'MU'):'').''.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').''.(price2num($obj->pmp)?price(price2num($obj->pmp*$obj->reel,'MT')):'').''.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').''; if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'),1); @@ -647,15 +647,15 @@ if ($resql) else print $langs->trans("Variable"); print '
'.$pdluo->batch.'
'.$langs->trans("Total").':'.$total.''; -print ($totalwithpmp?price(price2num(price2num($totalvalue,'MT')/$totalwithpmp,'MT')):' '); // This value may have rounding errors +print ($totalwithpmp?price(price2num($totalvalue/$totalwithpmp,'MU')):' '); // This value may have rounding errors print ''; -print price(price2num($totalvalue,'MT'),1); +print $totalvalue?price(price2num($totalvalue,'MT'),1):' '; print ''; if (empty($conf->global->PRODUIT_MULTI_PRICES)) print ($total?price($totalvaluesell/$total,1):' '); From 8cae2f14482a21530319f9d2cc0f197db8c25ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Dec 2014 16:21:44 +0100 Subject: [PATCH 014/172] Use same size for select_produits_fournisseur and select_produits --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 08bc3b4c85e..f782b06e7e2 100755 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1896,7 +1896,7 @@ class Form // mode=2 means suppliers products $urloption=($socid > 0?'socid='.$socid.'&':'').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished; print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions); - print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').''; + print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').''; } else { From 34b42ba7985cc1a456ef87752f40e4c0b55247f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Dec 2014 18:47:12 +0100 Subject: [PATCH 015/172] Truncate label different for small or big screen --- htdocs/core/class/html.form.class.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 08bc3b4c85e..1150b446637 100755 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1720,11 +1720,13 @@ class Form else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"'; } $opt.= '>'; - $opt.= $objp->ref.' - '.dol_trunc($label,32).' - '; + // Truncate label for small or big screen + $trunclabel = (($conf->dol_optimize_smallscreen==1)?32:92); + $opt.= $objp->ref.' - '.dol_trunc($label, $trunclabel).' - '; $objRef = $objp->ref; if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','$1',$objRef,1); - $outval.=$objRef.' - '.dol_trunc($label,32).' - '; + $outval.=$objRef.' - '.dol_trunc($label, $trunclabel).' - '; $found=0; @@ -2004,8 +2006,10 @@ class Form $outval.=$objRef; if (! empty($objp->idprodfournprice)) $outval.=' ('.$objRefFourn.')'; $outval.=' - '; - $opt.=dol_trunc($objp->label,18).' - '; - $outval.=dol_trunc($label,18).' - '; + // Truncate label for small or big screen + $trunclabel = (($conf->dol_optimize_smallscreen==1)?18:78); + $opt.=dol_trunc($label,$trunclabel).' - '; + $outval.=dol_trunc($label,$trunclabel).' - '; if (! empty($objp->idprodfournprice)) { From 590618eb3818d962bec136185b60d71155bf14af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Dec 2014 20:17:13 +0100 Subject: [PATCH 016/172] Update functions.lib.php --- htdocs/core/lib/functions.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index fb587487aae..254ab6ab99e 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1789,7 +1789,8 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo global $conf; if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string; - + // reduce for small screen + if ($conf->dol_optimize_smallscreen==1) $size = round($size/3); // We go always here if ($trunc == 'right') { From 6a01b6982e54300637766c19cab52ec988fb87c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Dec 2014 20:20:52 +0100 Subject: [PATCH 017/172] Update html.form.class.php --- htdocs/core/class/html.form.class.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 1150b446637..d8e05263a4e 100755 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1720,13 +1720,11 @@ class Form else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"'; } $opt.= '>'; - // Truncate label for small or big screen - $trunclabel = (($conf->dol_optimize_smallscreen==1)?32:92); - $opt.= $objp->ref.' - '.dol_trunc($label, $trunclabel).' - '; + $opt.= $objp->ref.' - '.dol_trunc($label, 99).' - '; $objRef = $objp->ref; if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','$1',$objRef,1); - $outval.=$objRef.' - '.dol_trunc($label, $trunclabel).' - '; + $outval.=$objRef.' - '.dol_trunc($label, 99).' - '; $found=0; @@ -2006,10 +2004,8 @@ class Form $outval.=$objRef; if (! empty($objp->idprodfournprice)) $outval.=' ('.$objRefFourn.')'; $outval.=' - '; - // Truncate label for small or big screen - $trunclabel = (($conf->dol_optimize_smallscreen==1)?18:78); - $opt.=dol_trunc($label,$trunclabel).' - '; - $outval.=dol_trunc($label,$trunclabel).' - '; + $opt.=dol_trunc($label, 72).' - '; + $outval.=dol_trunc($label, 72).' - '; if (! empty($objp->idprodfournprice)) { From 66f634f2173a623be48713302f0cd71c6e28bc5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Dec 2014 20:47:54 +0100 Subject: [PATCH 018/172] Update functions.lib.php --- htdocs/core/lib/functions.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 254ab6ab99e..4c3ee24522a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1782,15 +1782,16 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie', * @param string $trunc Where to trunc: right, left, middle (size must be a 2 power), wrap * @param string $stringencoding Tell what is source string encoding * @param int $nodot Truncation do not add ... after truncation. So it's an exact truncation. + * @param int $display Trunc is use to display and can be changed for small screen * @return string Truncated string */ -function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodot=0) +function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodot=0, $display=0) { global $conf; if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string; // reduce for small screen - if ($conf->dol_optimize_smallscreen==1) $size = round($size/3); + if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3); // We go always here if ($trunc == 'right') { From 9f1ec0e710aedf3e7a8037cc0bbfbf3c9d1d9a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Dec 2014 20:52:55 +0100 Subject: [PATCH 019/172] Update html.form.class.php --- htdocs/core/class/html.form.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index d8e05263a4e..bf2f1a7f2d6 100755 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1720,11 +1720,11 @@ class Form else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"'; } $opt.= '>'; - $opt.= $objp->ref.' - '.dol_trunc($label, 99).' - '; + $opt.= $objp->ref.' - '.dol_trunc($label, 99, '', '', 1).' - '; $objRef = $objp->ref; if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','$1',$objRef,1); - $outval.=$objRef.' - '.dol_trunc($label, 99).' - '; + $outval.=$objRef.' - '.dol_trunc($label, 99, '', '', 1).' - '; $found=0; From 275ba0e3de1832116007e7ba4081326f85e741f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Dec 2014 22:21:51 +0100 Subject: [PATCH 020/172] Typo --- htdocs/main.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 072c0bb5546..018b7cfbdaf 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1188,7 +1188,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) // jQuery plugin "mutiselect", "multiple-select", "select2"... { $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT; - print ''."\n"; } // jQuery jMobile if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0)) From dd2b19d855300ede0bd024ff961f3ef595f2d7af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Dec 2014 22:45:27 +0100 Subject: [PATCH 021/172] Typo --- htdocs/comm/propal/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 66b36e0320f..0f62552dcae 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -435,14 +435,14 @@ if ($result) if($num<$limit){ $var=!$var; print '
'.$langs->trans("TotalHT").''.price($total).''; + print ''.price($total).'
'.$langs->trans("TotalHTforthispage").''.price($total).''; + print ''.price($total).'
'; + print ''."\n"; print ''.dol_print_date($db->jdate($objp->dv),"day").""; - print '  '; + print ' '; print ''; print ''; print img_edit_remove() . " "; From 090b18f44dd3abbfea7c39ad784959f5099ec2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Dec 2014 23:23:10 +0100 Subject: [PATCH 023/172] Typo --- htdocs/index.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index ebc6760252c..55252f6533f 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -294,15 +294,15 @@ $showweather=empty($conf->global->MAIN_DISABLE_METEO)?1:0; $rowspan=0; $dashboardlines=array(); -print ''; +print '
'."\n"; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print ''; -print ''; +print ''; if ($showweather) print ''; -print ''; +print ''."\n"; // @@ -317,7 +317,7 @@ if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) $board->load_board($user); $board->warning_delay=$conf->actions->warning_delay/60/60/24; $board->label=$langs->trans("ActionsToDo"); - $board->url=DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&mainmenu=agenda'; + $board->url=DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&mainmenu=agenda'; $board->img=img_object($langs->trans("Actions"),"action"); $rowspan++; $dashboardlines[]=$board; @@ -458,7 +458,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s { $board->warning_delay=$conf->bank->rappro->warning_delay/60/60/24; $board->label=$langs->trans("TransactionsToConciliate"); - $board->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank'; + $board->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank'; $board->img=img_object($langs->trans("TransactionsToConciliate"),"payment"); $rowspan++; $dashboardlines[]=$board; @@ -475,7 +475,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s $board->load_board($user); $board->warning_delay=$conf->bank->cheque->warning_delay/60/60/24; $board->label=$langs->trans("BankChecksToReceipt"); - $board->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=accountancy'; + $board->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=accountancy'; $board->img=img_object($langs->trans("BankChecksToReceipt"),"payment"); $rowspan++; $dashboardlines[]=$board; @@ -491,7 +491,7 @@ if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $use $board->load_board($user); $board->warning_delay=$conf->adherent->cotisation->warning_delay/60/60/24; $board->label=$langs->trans("MembersWithSubscriptionToReceive"); - $board->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&statut=1'; + $board->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&statut=1'; $board->img=img_object($langs->trans("Members"),"user"); $rowspan++; $dashboardlines[]=$board; From 7834a9b0995e5920f67db8acc4dac982d49244c1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Dec 2014 00:51:57 +0100 Subject: [PATCH 024/172] Add hidden constant to solve bug of too low size to see products label. --- htdocs/core/class/html.form.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 272798a6f65..771a79cd95b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1678,6 +1678,8 @@ class Form $outqty=1; $outdiscount=0; + $maxlengtharticle=(empty($conf->global->PRODUCT_MAX_LENGTH_COMBO)?48:$conf->global->PRODUCT_MAX_LENGTH_COMBO); + $label=$objp->label; if (! empty($objp->label_translated)) $label=$objp->label_translated; if (! empty($filterkey) && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','$1',$label,1); @@ -1697,11 +1699,11 @@ class Form else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"'; } $opt.= '>'; - $opt.= $objp->ref.' - '.dol_trunc($label,32).' - '; + $opt.= $objp->ref.' - '.dol_trunc($label,$maxlengtharticle).' - '; $objRef = $objp->ref; if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','$1',$objRef,1); - $outval.=$objRef.' - '.dol_trunc($label,32).' - '; + $outval.=$objRef.' - '.dol_trunc($label,$maxlengtharticle).' - '; $found=0; From cd6c72b14286d5c195f10626fb87e17d96ffa21a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Dec 2014 20:03:39 +0100 Subject: [PATCH 025/172] Fixed: Update of time consumed --- htdocs/projet/class/task.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 3e6219afb40..5acdbbadddf 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -791,7 +791,7 @@ class Task extends CommonObject { $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task"; $sql.= " SET duration_effective = duration_effective + '".price2num($this->timespent_duration)."'"; - $sql.= ", progress = " . $this->progress; + if (isset($this->progress)) $sql.= ", progress = " . $this->progress; // Do not overwrite value if not provided $sql.= " WHERE rowid = ".$this->id; dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG); @@ -803,7 +803,7 @@ class Task extends CommonObject } $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time"; - $sql.= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")"; + $sql.= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")"; // set average hour rate of user $sql.= " WHERE rowid = ".$tasktime_id; dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG); From 99e5715f287f2702e4c8fdf30e77e80570e9107f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Dec 2014 20:09:48 +0100 Subject: [PATCH 026/172] Fixed: Length too small to see fullname. --- htdocs/user/class/user.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 15a5cf8b8ed..0b0c452020c 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1795,7 +1795,7 @@ class User extends CommonObject $result.=($lien.img_object($langs->trans("ShowUser"),'user').$lienfin); if ($withpicto != 2) $result.=' '; } - $result.=$lien.$this->getFullName($langs,'','',16).$lienfin; + $result.=$lien.$this->getFullName($langs,'','',24).$lienfin; return $result; } From b681885542d778185fb356a908e59ca4df9220a7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Dec 2014 21:14:59 +0100 Subject: [PATCH 027/172] Fixed: Bad url link --- htdocs/fourn/commande/orderstoinvoice.php | 140 +++++++++++----------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php index 6c5ce8aa11c..3397b18a30b 100644 --- a/htdocs/fourn/commande/orderstoinvoice.php +++ b/htdocs/fourn/commande/orderstoinvoice.php @@ -73,7 +73,7 @@ $date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST[" if ($action == 'create') { if (is_array($selected) == false) { $mesgs = array ( - '
' . $langs->trans('Error_OrderNotChecked') . '
' + '
' . $langs->trans('Error_OrderNotChecked') . '
' ); } else { $origin = GETPOST('origin'); @@ -91,11 +91,11 @@ $hookmanager->initHooks(array('orderstoinvoicesupplier')); */ if (($action == 'create' || $action == 'add') && empty($mesgs)) { - + require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php'; if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; - + $langs->load('bills'); $langs->load('products'); $langs->load('main'); @@ -103,7 +103,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) { $orders_id = $_GET['orders_to_invoice']; $n = count($orders_id); $i = 0; - + $originid = $orders_id[0]; $_GET['originid'] = $orders_id[0]; } @@ -111,30 +111,30 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) { $orders_id = $_POST['orders_to_invoice']; $nn = count($orders_id); $ii = 0; - + $originid = $orders_id[0]; $_POST['originid'] = $orders_id[0]; } - + $projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0; $lineid = GETPOST('lineid', 'int'); $userid = GETPOST('userid', 'int'); $search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref') : GETPOST('search_ref'); - + // Security check if ($user->societe_id) $socid = $user->societe_id; $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture'); - + $usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE; $object = new FactureFournisseur($db); - + // Insert new invoice in database if ($action == 'add' && $user->rights->fournisseur->facture->creer) { $object->socid = GETPOST('socid'); $db->begin(); $error = 0; - + // Standard or deposit or proforma invoice $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); if (empty($datefacture)) { @@ -154,17 +154,17 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) { $projectid = GETPOST('projectid'); if ($projectid > 0) $object->fk_project = $projectid; - + // Auto calculation of date due if not filled by user if (empty($object->date_echeance)) $object->date_echeance = $object->calculate_date_lim_reglement(); - + if ($_POST['origin'] && $_POST['originid']) { $object->origin = $_POST['origin']; $object->origin_id = $orders_id[$ii]; $object->linked_objects = $orders_id; $id = $object->create($user); - + if ($id > 0) { foreach ( $orders_id as $origin => $origin_id ) { $origin_id = (! empty($origin_id) ? $origin_id : $object->origin_id); @@ -180,14 +180,14 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) { $sql .= ", " . $id; $sql .= ", '" . $object->element . "'"; $sql .= ")"; - + if ($db->query($sql)) { $db->commit(); } else { $db->rollback(); } } - + while ( $ii < $nn ) { $objectsrc = new CommandeFournisseur($db); dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines"); @@ -202,10 +202,10 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) { $num = count($lines); for($i = 0; $i < $num; $i ++) { $desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle); - + $desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle); $product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0); - + // Dates // TODO mutualiser $date_start = $lines[$i]->date_debut_prevue; @@ -218,14 +218,14 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) { $date_end = $lines[$i]->date_fin_reel; if ($lines[$i]->date_end) $date_end = $lines[$i]->date_end; - + // Reset fk_parent_line for no child products and special product if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) { $fk_parent_line = 0; } // FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example. $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type); - + if ($result > 0) { $lineid = $result; } else { @@ -250,11 +250,11 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) { } } } - + // End of object creation, we show it if ($id > 0 && ! $error) { $db->commit(); - header('Location: ' . DOL_URL_ROOT . '/fourn/facture/fiche.php?facid=' . $id); + header('Location: ' . DOL_URL_ROOT . '/fourn/facture/card.php?facid=' . $id); exit(); } else { $db->rollback(); @@ -277,10 +277,10 @@ $companystatic = new Societe($db); // Mode creation if ($action == 'create' && empty($mesgs)) { - + llxHeader(); print_fiche_titre($langs->trans('NewBill')); - + $soc = new Societe($db); if ($socid) $res = $soc->fetch($socid); @@ -289,7 +289,7 @@ if ($action == 'create' && empty($mesgs)) { $mode_reglement_id = $soc->mode_reglement_id; } $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : ''; - + print ''; print ''; print ''; @@ -300,21 +300,21 @@ if ($action == 'create' && empty($mesgs)) { print ''; print ''; print '
'.$langs->trans("DolibarrWorkBoard").''.$langs->trans("Number").''.$langs->trans("Late").''.$langs->trans("DolibarrWorkBoard").''.$langs->trans("Number").''.$langs->trans("Late").'    
'; - + // Ref print ''; - + // Ref supplier print ''; print ''; - + // Third party print ''; print '' . "\n"; - + // Date invoice print ''; } - + $objectsrc = new CommandeFournisseur($db); $listoforders = array (); foreach ( $selected as $sel ) { @@ -345,30 +345,30 @@ if ($action == 'create' && empty($mesgs)) { $listoforders[] = $objectsrc->ref; } } - + // Other attributes $parameters = array ( 'objectsrc' => $objectsrc, 'idsrc' => $listoforders, - 'colspan' => ' colspan="3"' + 'colspan' => ' colspan="3"' ); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook - + // Modele PDF print ''; print '"; - + // Public note print ''; print ''; print ''; // Private note if (empty($user->societe_id)) { @@ -376,22 +376,22 @@ if ($action == 'create' && empty($mesgs)) { print ''; print ''; } - + print '
' . $langs->trans('Ref') . '' . $langs->trans('Draft') . '
' . $langs->trans('RefSupplier') . '
' . $langs->trans('Customer') . ''; print $soc->getNomUrl(1); print ''; print '
' . $langs->trans('Date') . ''; $html->select_date('', '', '', '', '', "add", 1, 1); @@ -330,13 +330,13 @@ if ($action == 'create' && empty($mesgs)) { // Project if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); - + $langs->load('projects'); print '
' . $langs->trans('Project') . ''; $formproject->select_projects($soc->id, $projectid, 'projectid'); print '
' . $langs->trans('Model') . ''; $liste = ModelePDFSuppliersInvoices::liste_modeles($db); print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF); print "
' . $langs->trans('NotePublic') . ''; print '
' . $langs->trans('NotePrivate') . ''; print '
'; - + while ( $i < $n ) { print ''; - + $i ++; } - + // Button "Create Draft" print '
'; print "\n"; - + print '
\n"; } @@ -411,7 +411,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) { }); entity; $sql .= ' AND c.fk_soc = s.rowid'; - + // Show orders with status validated, shipping started and delivered (well any order we can bill) $sql .= " AND c.fk_statut IN (5)"; - + // Find order that are not already invoiced $sql .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')"; - + if ($socid) $sql .= ' AND s.rowid = ' . $socid; if (! $user->rights->societe->client->voir && ! $socid) @@ -437,20 +437,20 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) { if ($sall) { $sql .= " AND (c.ref LIKE '%" . $db->escape($sall) . "%' OR c.note LIKE '%" . $db->escape($sall) . "%')"; } - + // Date filter if ($date_start && $date_end) $sql .= " AND c.date_commande >= '" . $db->idate($date_start) . "' AND c.date_commande <= '" . $db->idate($date_end) . "'"; if ($date_starty && $date_endy) $sql .= " AND c.date_livraison >= '" . $db->idate($date_starty) . "' AND c.date_livraison <= '" . $db->idate($date_endy) . "'"; - + if (! empty($sref_client)) { $sql .= ' AND c.ref_supplier LIKE \'%' . $db->escape($sref_client) . '%\''; } $sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder; dol_syslog('fourn/commande/ordertoinvoice.php sql=' . $sql); $resql = $db->query($sql); - + if ($resql) { if ($socid) { $soc = new Societe($db); @@ -463,14 +463,14 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) { $i = 0; $period = $html->select_date($date_start, 'date_start', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_end, 'date_end', 0, 0, 1, '', 1, 0, 1); $periodely = $html->select_date($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0, 1); - + if (! empty($socid)) { // Company $companystatic->id = $socid; $companystatic->nom = $soc->nom; print '

' . $companystatic->getNomUrl(1, 'customer') . '

'; } - + print ''; print ''; print_liste_field_titre($langs->trans('Ref'), 'orderstoinvoice.php', 'c.ref', '', '&socid=' . $socid, '', $sortfield, $sortorder); @@ -480,7 +480,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) { print_liste_field_titre($langs->trans('Status'), '', '', '', '', 'align="right"'); print_liste_field_titre($langs->trans('GenerateBill'), '', '', '', '', 'align="center"'); print ''; - + // Lignes des champs de filtre print ''; print ''; @@ -492,48 +492,48 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) { // print ''; - + // DATE DELIVERY print ''; - + // SEARCH BUTTON print ''; - + print ''; print ''; - + print ''; $var = True; $generic_commande = new CommandeFournisseur($db); - + while ( $i < $num ) { $objp = $db->fetch_object($resql); $var = ! $var; print ''; print ''; - + print ''; - + // Order date print ''; - + // Delivery date print ''; - + // Statut print ''; - + // Checkbox print ''; - + print ''; - + $total = $total + $objp->price; $subtotal = $subtotal + $objp->price; $i ++; } print '
'; print ''; print ''; - + // DATE ORDER print ''; print $period; print ''; print $periodely; print ''; print ''; - + // ALL/NONE print ''; if ($conf->use_javascript_ajax) print '' . $langs->trans("All") . ' / ' . $langs->trans("None") . ''; print '
'; - + $generic_commande->id = $objp->rowid; $generic_commande->ref = $objp->ref; - + print ''; print ''; - + print '
'; print $generic_commande->getNomUrl(1, $objp->fk_statut); print ''; $filename = dol_sanitizeFileName($objp->ref); $filedir = $conf->fournisseur->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref); @@ -541,35 +541,35 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) { print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir); print '
'; print '		' . $objp->ref_supplier . ''; print dol_print_date($db->jdate($objp->date_commande), 'day'); print ''; print dol_print_date($db->jdate($objp->date_livraison), 'day'); print '' . $generic_commande->LibStatut($objp->fk_statut, 5) . ''; print ''; print '
'; - + /* * Boutons actions */ From 67cf3cb99b203c0e01444f6870f74e18418387a7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Dec 2014 10:13:44 +0100 Subject: [PATCH 028/172] Fixed: BIC/SWIFT and IBAN must be at same level --- htdocs/core/lib/pdf.lib.php | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 15cb2f87b0b..bf2e5f2c218 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -492,7 +492,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text) * @param int $curx X * @param int $cury Y * @param Account $account Bank account object - * @param int $onlynumber Output only number + * @param int $onlynumber Output only number (bank+desk+key+number according to country, but without name of bank and domiciliation) * @param int $default_font_size Default font size * @return float The Y PDF position */ @@ -513,10 +513,14 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default $outputlangs->load("banks"); + // Use correct name of bank id according to country + $bickey="BICNumber"; + if ($account->getCountryCode() == 'IN') $bickey="SWIFT"; + // Get format of bank account according to its country $usedetailedbban=$account->useDetailedBBAN(); - //$onlynumber=0; $usedetailedbban=0; // For tests + $onlynumber=0; $usedetailedbban=1; // For tests if ($usedetailedbban) { $savcurx=$curx; @@ -529,27 +533,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default $cury+=3; } - // Use correct name of bank id according to country - $ibankey="IBANNumber"; - if ($account->getCountryCode() == 'IN') $ibankey="IFSC"; - if (! empty($account->iban)) - { - $ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban); - $ibanDisplay = ""; - - for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++){ - $ibanDisplay .= $ibanDisplay_temp[$i]; - if($i%4 == 3 && $i > 0){ - $ibanDisplay .= " "; - } - } - - $pdf->SetFont('','B',$default_font_size - 3); - $pdf->SetXY($curx, $cury); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0); - $cury+=3; - } - if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8); if ($usedetailedbban == 1) @@ -612,7 +595,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default } $curx=$savcurx; - $cury+=10; + $cury+=9; } else { @@ -629,10 +612,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default if ($diffsizecontent <= 2) $cury+=1; } - // Use correct name of bank id according to country - $bickey="BICNumber"; - if ($account->getCountryCode() == 'IN') $bickey="SWIFT"; - $pdf->SetFont('','',$default_font_size - $diffsizecontent); if (empty($onlynumber) && ! empty($account->domiciliation)) @@ -647,8 +626,29 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default } else if (! $usedetailedbban) $cury+=1; + // Use correct name of bank id according to country + $ibankey="IBANNumber"; + if ($account->getCountryCode() == 'IN') $ibankey="IFSC"; + if (! empty($account->iban)) + { + $ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban); + $ibanDisplay = ""; + + for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++) + { + $ibanDisplay .= $ibanDisplay_temp[$i]; + if($i%4 == 3 && $i > 0) $ibanDisplay .= " "; + } + + $pdf->SetFont('','B',$default_font_size - 3); + $pdf->SetXY($curx, $cury); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0); + $cury+=3; + } + if (! empty($account->bic)) { + $pdf->SetFont('','B',$default_font_size - 3); $pdf->SetXY($curx, $cury); $pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); } From a4e0de0d8a121d2005590c6517322035e0669644 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Dec 2014 13:12:05 +0100 Subject: [PATCH 029/172] Fixed: Contract must use serpis if no config set Fixed: Missing fetch_thirdparty. --- htdocs/contrat/card.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index dfdf0e95a87..8456b3e54b9 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -538,7 +538,7 @@ else if ($action == 'addline' && $user->rights->contrat->creer) } $ret = $object->fetch($id); // Reload to get new records - + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } @@ -847,7 +847,7 @@ $formfile = new FormFile($db); $objectlignestatic=new ContratLigne($db); // Load object modContract -$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_olive'); +$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_serpis'); if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php') { $module = substr($module, 0, dol_strlen($module)-4); @@ -1043,6 +1043,8 @@ else if ($object->id > 0) { + $object->fetch_thirdparty(); + $result=$object->fetch_lines(); // This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed if ($result < 0) dol_print_error($db,$object->error); From c0473f0246b50b0661ee951ad922382c854e3af2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Dec 2014 13:13:11 +0100 Subject: [PATCH 030/172] Fixed: when transvers_mode is on, a user is not linked to a dedicated environment (always entity 1), so we should not show info not reliable with this mode. --- htdocs/user/index.php | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/htdocs/user/index.php b/htdocs/user/index.php index ac1ebc9e1c5..5d0b0ac77e4 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -114,6 +114,10 @@ if ($result) print_liste_field_titre($langs->trans("LastName"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_societe",$param,"","",$sortfield,$sortorder); + if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) + { + print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder); + } print_liste_field_titre($langs->trans("DateCreation"),$_SERVER['PHP_SELF'],"u.datec",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder); @@ -165,9 +169,20 @@ if ($result) $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1); } - // Multicompany enabled - else if (! empty($conf->multicompany->enabled)) + else if ($obj->ldap_sid) { + print $langs->trans("DomainUser"); + } + else + { + print $langs->trans("InternalUser"); + } + print ''; + + // Multicompany enabled + if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) + { + print ''; if (! $obj->entity) { print $langs->trans("AllEntities"); @@ -181,16 +196,8 @@ if ($result) print $mc->label; } } + print ''; } - else if ($obj->ldap_sid) - { - print $langs->trans("DomainUser"); - } - else - { - print $langs->trans("InternalUser"); - } - print ''; // Date creation print ''.dol_print_date($db->jdate($obj->datec),"dayhour").''; From 036914756bf7ae0d1aebccd839b0ae4de4a19de0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Dec 2014 14:15:40 +0100 Subject: [PATCH 031/172] Fixed: option CONTRACT_SUPPORT_PRODUCTS not correctly supported --- htdocs/contrat/card.php | 13 +++++++++---- htdocs/langs/en_US/contracts.lang | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 8456b3e54b9..e4a8c644615 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2012 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010-2014 Juanjo Menent @@ -273,7 +273,7 @@ if ($action == 'add' && $user->rights->contrat->creer) { $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0); - if ($product_type == 1) { //only services // TODO Exclude also deee + if ($product_type == 1 || (! empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0,1)))) { // TODO Exclude also deee // service prédéfini if ($lines[$i]->fk_product > 0) { @@ -1020,13 +1020,18 @@ if ($action == 'create') print "\n"; + print '
'; + if (is_object($objectsrc)) { print ''; print ''; - } - print '
'; + if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) + { + print '
'.$langs->trans("Note").': '.$langs->trans("OnlyLinesWithTypeServiceAreUsed"); + } + } print "\n"; diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index 06c05e520fa..57ba3bb15d8 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract From 03cfff66ea518cf26c64bd82382ed7df942d645c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Dec 2014 14:26:34 +0100 Subject: [PATCH 032/172] Fixed: no form into table --- htdocs/admin/contract.php | 55 ++++++++++++++------------------------- 1 file changed, 20 insertions(+), 35 deletions(-) diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 2abb2b5acad..6905156990b 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -182,30 +182,15 @@ else if ($action == 'setmod') dolibarr_set_const($db, "CONTRACT_ADDON",$value,'chaine',0,'',$conf->entity); } -else if ($action == 'set_CONTRACT_FREE_TEXT') +else if ($action == 'set_other') { $freetext= GETPOST('CONTRACT_FREE_TEXT','alpha'); - $res = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); + $res1 = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); - if (! $res > 0) $error++; - - if (! $error) - { - setEventMessage($langs->trans("SetupSaved")); - } - else - { - setEventMessage($langs->trans("Error"),'errors'); - } -} - -else if ($action == 'set_CONTRACT_DRAFT_WATERMARK') -{ $draft= GETPOST('CONTRACT_DRAFT_WATERMARK','alpha'); + $res2 = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity); - $res = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity); - - if (! $res > 0) $error++; + if (! $res1 > 0 || ! $res2 > 0) $error++; if (! $error) { @@ -217,6 +202,7 @@ else if ($action == 'set_CONTRACT_DRAFT_WATERMARK') } } + /* * View */ @@ -506,44 +492,43 @@ print "
"; * */ +print '
'; +print ''; +print ''; + print_titre($langs->trans("OtherOptions")); print ''; print ''; print ''; print ''; -print "\n"; print "\n"; $var=true; $var=! $var; -print ''; -print ''; -print ''; print '\n"; +print ''."\n"; print ''; //Use draft Watermark $var=!$var; -print ""; -print ''; -print ""; print '\n"; -print ''; +print ''."\n"; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").' 
'; print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')
'; print ''; -print '		'; -print ''; -print "
'; print $langs->trans("WatermarkOnDraftContractCards").'
'; print ''; -print '		'; -print ''; -print "
'; -print '
'; +print '
'; +print ''; +print '
'; + +print ''; + +dol_fiche_end(); -$db->close(); llxFooter(); + +$db->close(); From c994fbe44dac72910267345b5f92e5e3d8bda39d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Dec 2014 14:31:47 +0100 Subject: [PATCH 033/172] Fixed: Bad style --- htdocs/core/class/html.formfile.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index cf06894dde5..1ef5045c845 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -855,7 +855,7 @@ class FormFile } if ($nboffiles == 0) { - print ''; + print ''; if (empty($textifempty)) print $langs->trans("NoFileFound"); else print $textifempty; print ''; @@ -1043,7 +1043,7 @@ class FormFile if (count($filearray) == 0) { - print ''; + print ''; if (empty($textifempty)) print $langs->trans("NoFileFound"); else print $textifempty; print ''; @@ -1210,7 +1210,7 @@ class FormFile } if ($nboflinks == 0) { - print ''; + print ''; print $langs->trans("NoLinkFound"); print ''; } From 627e344c78f325cec1c15f4ad4787a2b91f54b0a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Dec 2014 14:43:14 +0100 Subject: [PATCH 034/172] Documentation of external link. --- htdocs/admin/modules.php | 7 +++++++ htdocs/langs/en_US/admin.lang | 1 + 2 files changed, 8 insertions(+) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 9ce93a6bc26..df9632761dd 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -525,6 +525,13 @@ else print ''.$url.''; print ''; + $var=!$var; + print "\n"; + $url='http://partners.dolibarr.org'; + print ''; + print ''.$langs->trans("DoliPartnersDesc").''; + print ''.$url.''; + print ''; print "\n"; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index e0c1a9152e6..f0dd8219f06 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -208,6 +208,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Link BoxesAvailable=Boxes available From bc4e6d4c7ee5c320f2fb19d93851d832569c1291 Mon Sep 17 00:00:00 2001 From: csv115 Date: Thu, 11 Dec 2014 16:17:37 +0100 Subject: [PATCH 035/172] hooks more button function on contract card --- htdocs/contrat/card.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index cea29c96793..035ae7bee08 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1714,6 +1714,9 @@ else if ($user->societe_id == 0) { print '
'; + + $parameters=array(); + $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action); // Note that $action and $object may have been modified by hook if ($object->statut == 0 && $nbofservices) { From a0112ba724b43dae8c9526a0fcc70192ed69c4f0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Dec 2014 21:38:53 +0100 Subject: [PATCH 036/172] Better position of elements --- htdocs/core/tpl/login.tpl.php | 22 +++++++++++++--------- htdocs/core/tpl/passwordforgotten.tpl.php | 21 +++++++++++++-------- htdocs/theme/eldy/style.css.php | 7 ++++--- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 8ce6e631a4a..eabf4c2ad89 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -89,17 +89,17 @@ $(document).ready(function () { - -resArray['options'])) { ?> - @@ -158,7 +162,7 @@ if ($forgetpasslink || $helpcenterlink) if ($dol_use_jmobile) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$dol_use_jmobile; echo '
'; - echo '
+ -" name="username" class="flat input-icon-user" size="15" value="" tabindex="1" autofocus="autofocus" /> +" name="username" class="flat input-icon-user" size="20" value="" tabindex="1" autofocus="autofocus" />
+ -" name="password" class="flat input-icon-password" type="password" size="15" value="" tabindex="2" autocomplete="off" /> +" name="password" class="flat input-icon-password" type="password" size="20" value="" tabindex="2" autocomplete="off" />
+ - + - +
+
- @@ -94,19 +94,24 @@ if (! empty($hookmanager->resArray['options'])) { } ?> - + - @@ -127,7 +132,7 @@ if (! empty($hookmanager->resArray['options'])) {
class="button" name="password" value="trans('SendNewPassword'); ?>" tabindex="4" />
-
+
dol_hide_topmenu)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 9d29707e1bf..89c779785d5 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -849,7 +849,7 @@ form#login { vertical-align: middle; } .login_table_title { - max-width: 560px; + max-width: 530px; color: #888888; text-shadow: 1px 1px 1px #FFF; } @@ -861,7 +861,7 @@ form#login { margin-right: 10px; padding-left:6px; padding-right:6px; - padding-top:12px; + padding-top:16px; padding-bottom:12px; max-width: 560px; @@ -973,10 +973,11 @@ img.login, img.printer, img.entity { background-image: url(); background-repeat: no-repeat; } +/* .span-icon-user input, .span-icon-password input { margin-right: 30px; - width: 98%; } +*/ /* ============================================================================== */ /* Menu gauche */ From a1bba472a03e146975fd932a1c91490cdddcf57d Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Fri, 12 Dec 2014 11:57:20 +0100 Subject: [PATCH 037/172] FIX: hook insertExtraFields must return a returnvalue (0,1,-1) --- htdocs/core/class/hookmanager.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 849b6bb0370..2a54354aedf 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -131,6 +131,7 @@ class HookManager // Define type of hook ('output', 'returnvalue' or 'addreplace'). 'addreplace' should be type for all hooks. 'output' and 'returnvalue' are deprecated. $hooktype='output'; if (preg_match('/^pdf_/',$method)) $hooktype='returnvalue'; // pdf_xxx except pdf_writelinedesc are returnvalue hooks. When there is 2 hooks of this type, only last one win. + if ($method =='insertExtraFields') $hooktype='returnvalue'; if (in_array( $method, array( From 27b47a4f4836f4bbb49898187a1be06d9ca00841 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Fri, 12 Dec 2014 14:31:36 +0100 Subject: [PATCH 038/172] FIX: dont put a mess with date and datetime extrafield value if already in right format (the bug was in propale/order/invoice extrafields, mainly visible with 2 datetime extrafields) --- htdocs/core/class/commonobject.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 5af3f5a93c3..3b7623f43ca 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2178,10 +2178,10 @@ abstract class CommonObject $this->array_options[$key] = price2num($this->array_options[$key]); break; case 'date': - $this->array_options[$key]=$this->db->idate($this->array_options[$key]); + if (is_numeric($this->array_options[$key])) $this->array_options[$key]=$this->db->idate($this->array_options[$key]); break; case 'datetime': - $this->array_options[$key]=$this->db->idate($this->array_options[$key]); + if (is_numeric($this->array_options[$key])) $this->array_options[$key]=$this->db->idate($this->array_options[$key]); break; } } From 3ee2ced22abeb5993149e95f89d6c23203bc59c0 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Sat, 13 Dec 2014 01:28:23 +0100 Subject: [PATCH 039/172] Trad: Update es_ES from transifex --- htdocs/langs/es_ES/admin.lang | 7 ++++--- htdocs/langs/es_ES/printipp.lang | 5 +++++ htdocs/langs/es_ES/productbatch.lang | 3 ++- htdocs/langs/es_ES/projects.lang | 2 ++ htdocs/langs/es_ES/resource.lang | 2 -- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 2deac3d4278..a5e4ab1fdfa 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -475,8 +475,8 @@ Module320Name=Hilos RSS Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr Module330Name=Marcadores Module330Desc=Gestión de marcadores -Module400Name=Proyectos/Oportunidades -Module400Desc=Gestión de proyectos o oportunidades. Puede asignar otros elementos (facturas, pedidos, presupuestos, intervenciones, etc.) a los proyectos +Module400Name=Proyectos/Oportunidades/Leads +Module400Desc=Gestión de proyectos, oportunidades o leads, Puede asignar cualquier elemento (factura, pedido, presupuesto, intervención, etc.) a un proyecto y obtener una vista transversal del proyecto Module410Name=Webcalendar Module410Desc=Interfaz con el calendario Webcalendar Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos) @@ -531,7 +531,7 @@ Module50200Desc=Módulo para proporcionar un pago en línea con tarjeta de créd Module50400Name=Contabilidad (avanzada) Module50400Desc=Gestión contable (doble partida) Module54000Name=PrintIPP -Module54000Desc=Imprimir vía impresora Cups IPP. +Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz Cups IPP (La impresora debe ser visible por el servidor y CUPS debe estar instalado en el servidor) Module55000Name=OpenSurvey Module55000Desc=Módulo para realizar encuestas online (Como Doodle, Studs, Rdvz, etc.) Module59000Name=Márgenes @@ -783,6 +783,7 @@ DictionaryOrderMethods=Métodos de pedido DictionarySource=Orígenes de presupuestos/pedidos DictionaryAccountancyplan=Plan contable DictionaryAccountancysystem=Modelos de planes contables +DictionaryEMailTemplates=Plantillas E-Mails SetupSaved=Configuración guardada BackToModuleList=Volver a la lista de módulos BackToDictionaryList=Volver a la lista de diccionarios diff --git a/htdocs/langs/es_ES/printipp.lang b/htdocs/langs/es_ES/printipp.lang index b1831a86789..e97bd15c596 100644 --- a/htdocs/langs/es_ES/printipp.lang +++ b/htdocs/langs/es_ES/printipp.lang @@ -7,3 +7,8 @@ PRINTIPP_PORT=Puerto PRINTIPP_USER=Usuario PRINTIPP_PASSWORD=Contraseña NoPrinterFound=No se han encontrado impresoras (Compruebe la configuración de su CUPS) +FileWasSentToPrinter=El archivo %s ha sido enviado a la impresora +NoDefaultPrinterDefined=No hay impresora por defecto definida +DefaultPrinter=Impresora por defecto +Printer=Impresora +CupsServer=Servidor CUPS diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang index dd61a420dbc..ceb6bd361e3 100644 --- a/htdocs/langs/es_ES/productbatch.lang +++ b/htdocs/langs/es_ES/productbatch.lang @@ -10,10 +10,11 @@ batch_number=Número Lote/Serie l_eatby=Fecha de caducidad l_sellby=Fecha límite de venta DetailBatchNumber=Detalles del lote/serie -DetailBatchFormat=Caducidad: %s Límite venta: %s LOTE: %s (Stock : %d) +DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d) printBatch=Lote: %s printEatby=Caducidad: %s printSellby=Límite venta: %s printQty=Cant.: %d AddDispatchBatchLine=Añada una línea para despacho por caducidad BatchDefaultNumber=Indefinido +WhenProductBatchModuleOnOptionAreForced=Si el módulo de Lotes/Series está activado, el incremento/decremento de stock es forzado a lo último escogido y no puede editarse. Otras opciones pueden definirse si se necesita diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index da5a65ceb96..5ac8e82d6f9 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -36,6 +36,8 @@ TaskTimeSpent=Tiempo dedicado en tareas TaskTimeUser=Usuario TaskTimeNote=Nota TaskTimeDate=Fecha +TasksOnOpenedProject=Tareas en proyectos abiertos +WorkloadNotDefined=Carga de trabajo no definida NewTimeSpent=Nuevo tiempo dedicado MyTimeSpent=Mi tiempo dedicado MyTasks=Mis tareas diff --git a/htdocs/langs/es_ES/resource.lang b/htdocs/langs/es_ES/resource.lang index 5bc252fbce3..21c3311d29a 100644 --- a/htdocs/langs/es_ES/resource.lang +++ b/htdocs/langs/es_ES/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=¿Está seguro de querer eliminar este recurso? RessourceSuccessfullyDeleted=Recurso eliminado correctamente DictionaryResourceType=Tipo de recursos -DictionaryEMailTemplates=Modelo de E-Mails - SelectResource=Seleccionar recurso From 64507c3af1a1bd8b4851a7f5c616a3c55e501baf Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Sat, 13 Dec 2014 01:30:39 +0100 Subject: [PATCH 040/172] Trad: Update es_ES from transifex --- htdocs/langs/es_ES/admin.lang | 7 ++++--- htdocs/langs/es_ES/printipp.lang | 5 +++++ htdocs/langs/es_ES/productbatch.lang | 3 ++- htdocs/langs/es_ES/projects.lang | 2 ++ htdocs/langs/es_ES/resource.lang | 2 -- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 2deac3d4278..a5e4ab1fdfa 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -475,8 +475,8 @@ Module320Name=Hilos RSS Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr Module330Name=Marcadores Module330Desc=Gestión de marcadores -Module400Name=Proyectos/Oportunidades -Module400Desc=Gestión de proyectos o oportunidades. Puede asignar otros elementos (facturas, pedidos, presupuestos, intervenciones, etc.) a los proyectos +Module400Name=Proyectos/Oportunidades/Leads +Module400Desc=Gestión de proyectos, oportunidades o leads, Puede asignar cualquier elemento (factura, pedido, presupuesto, intervención, etc.) a un proyecto y obtener una vista transversal del proyecto Module410Name=Webcalendar Module410Desc=Interfaz con el calendario Webcalendar Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos) @@ -531,7 +531,7 @@ Module50200Desc=Módulo para proporcionar un pago en línea con tarjeta de créd Module50400Name=Contabilidad (avanzada) Module50400Desc=Gestión contable (doble partida) Module54000Name=PrintIPP -Module54000Desc=Imprimir vía impresora Cups IPP. +Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz Cups IPP (La impresora debe ser visible por el servidor y CUPS debe estar instalado en el servidor) Module55000Name=OpenSurvey Module55000Desc=Módulo para realizar encuestas online (Como Doodle, Studs, Rdvz, etc.) Module59000Name=Márgenes @@ -783,6 +783,7 @@ DictionaryOrderMethods=Métodos de pedido DictionarySource=Orígenes de presupuestos/pedidos DictionaryAccountancyplan=Plan contable DictionaryAccountancysystem=Modelos de planes contables +DictionaryEMailTemplates=Plantillas E-Mails SetupSaved=Configuración guardada BackToModuleList=Volver a la lista de módulos BackToDictionaryList=Volver a la lista de diccionarios diff --git a/htdocs/langs/es_ES/printipp.lang b/htdocs/langs/es_ES/printipp.lang index b1831a86789..e97bd15c596 100644 --- a/htdocs/langs/es_ES/printipp.lang +++ b/htdocs/langs/es_ES/printipp.lang @@ -7,3 +7,8 @@ PRINTIPP_PORT=Puerto PRINTIPP_USER=Usuario PRINTIPP_PASSWORD=Contraseña NoPrinterFound=No se han encontrado impresoras (Compruebe la configuración de su CUPS) +FileWasSentToPrinter=El archivo %s ha sido enviado a la impresora +NoDefaultPrinterDefined=No hay impresora por defecto definida +DefaultPrinter=Impresora por defecto +Printer=Impresora +CupsServer=Servidor CUPS diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang index dd61a420dbc..ceb6bd361e3 100644 --- a/htdocs/langs/es_ES/productbatch.lang +++ b/htdocs/langs/es_ES/productbatch.lang @@ -10,10 +10,11 @@ batch_number=Número Lote/Serie l_eatby=Fecha de caducidad l_sellby=Fecha límite de venta DetailBatchNumber=Detalles del lote/serie -DetailBatchFormat=Caducidad: %s Límite venta: %s LOTE: %s (Stock : %d) +DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d) printBatch=Lote: %s printEatby=Caducidad: %s printSellby=Límite venta: %s printQty=Cant.: %d AddDispatchBatchLine=Añada una línea para despacho por caducidad BatchDefaultNumber=Indefinido +WhenProductBatchModuleOnOptionAreForced=Si el módulo de Lotes/Series está activado, el incremento/decremento de stock es forzado a lo último escogido y no puede editarse. Otras opciones pueden definirse si se necesita diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index da5a65ceb96..5ac8e82d6f9 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -36,6 +36,8 @@ TaskTimeSpent=Tiempo dedicado en tareas TaskTimeUser=Usuario TaskTimeNote=Nota TaskTimeDate=Fecha +TasksOnOpenedProject=Tareas en proyectos abiertos +WorkloadNotDefined=Carga de trabajo no definida NewTimeSpent=Nuevo tiempo dedicado MyTimeSpent=Mi tiempo dedicado MyTasks=Mis tareas diff --git a/htdocs/langs/es_ES/resource.lang b/htdocs/langs/es_ES/resource.lang index 5bc252fbce3..21c3311d29a 100644 --- a/htdocs/langs/es_ES/resource.lang +++ b/htdocs/langs/es_ES/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=¿Está seguro de querer eliminar este recurso? RessourceSuccessfullyDeleted=Recurso eliminado correctamente DictionaryResourceType=Tipo de recursos -DictionaryEMailTemplates=Modelo de E-Mails - SelectResource=Seleccionar recurso From 81c9d12313ea889250c167ea9158c6f975ce0b85 Mon Sep 17 00:00:00 2001 From: "Ying-Chun Liu (PaulLiu)" Date: Sat, 13 Dec 2014 21:41:29 +0800 Subject: [PATCH 041/172] Add Taiwan VAT 5% The most common VAT in Taiwan is 5%. This commit adds the VAT for Taiwan. Signed-off-by: Ying-Chun Liu (PaulLiu) --- htdocs/install/mysql/data/llx_c_tva.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 01d2894bca6..375b577d128 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -240,6 +240,9 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 6 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 63, 6, '2.5','0','VAT super-reduced rate',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6, '0','0','VAT Rate 0', 1); +-- TAIWAN (id country=213) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2131, 213, '5','0','VAT 5%',1); + -- TUNISIA (id country=10) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (101,10, '6','0','VAT 6%', 1, 1, '4', 0, 0); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (102,10, '12','0','VAT 12%',1, 1, '4', 0, 0); From da3bc3868d535c393390b1d55386592fbf8ec35b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Dec 2014 11:46:21 +0100 Subject: [PATCH 042/172] Fixed: Duplicated lang key --- htdocs/admin/compta.php | 3 ++- htdocs/langs/en_US/compta.lang | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 610bf371f29..b5aed0c683e 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load('admin'); $langs->load('compta'); +$langs->load('accountancy'); if (!$user->admin) accessforbidden(); @@ -153,7 +154,7 @@ foreach ($list as $key) print '
'; // Param - $libelle = $langs->trans($key); + $libelle = $langs->trans($key); print ''; // Value diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 770cb6d25bf..89a32876dc3 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties From 83d3ee45ee16ee4fa39cde5819f3b6d7c2875a58 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sun, 14 Dec 2014 14:44:28 +0100 Subject: [PATCH 043/172] Update fichinter.class.php simplify the libstatut management and allow enhancing mode --- htdocs/fichinter/class/fichinter.class.php | 37 ++++++++-------------- 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index bc12821530f..ccec1075ca8 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -79,6 +79,9 @@ class Fichinter extends CommonObject $this->statuts_short[0]='Draft'; $this->statuts_short[1]='Validated'; $this->statuts_short[2]='StatusInterInvoiced'; + $this->statuts_logo[0]='statut0'; + $this->statuts_logo[1]='statut4'; + $this->statuts_logo[2]='statut6'; } @@ -508,37 +511,23 @@ class Fichinter extends CommonObject global $langs; if ($mode == 0) - { return $langs->trans($this->statuts[$statut]); - } + if ($mode == 1) - { return $langs->trans($this->statuts_short[$statut]); - } + if ($mode == 2) - { - if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts_short[$statut]); - if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]); - if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts_short[$statut]); - } + return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]).' '.$langs->trans($this->statuts_short[$statut]); + if ($mode == 3) - { - if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0'); - if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4'); - if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6'); - } + return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]); + if ($mode == 4) - { - if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]); - if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]); - if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]); - } + return img_picto($langs->trans($this->statuts_short[$statut]),$this->statuts_logo[$statut]).' '.$langs->trans($this->statuts[$statut]); + if ($mode == 5) - { - if ($statut==0) return ''.$langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0'); - if ($statut==1) return ''.$langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4'); - if ($statut==2) return ''.$langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6'); - } + return ''.$langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),$this->statuts_logo[$statut]); + } /** From 2245361a2e9453604a7b328c67e0d011fdde7cad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Dec 2014 15:09:30 +0100 Subject: [PATCH 044/172] Fixed: [ bug #1732 ] Tasks ressources and time consumption are not deleted on project / task deletion --- htdocs/projet/class/project.class.php | 87 +++++++++++++++++---------- htdocs/projet/class/task.class.php | 35 ++++++++--- 2 files changed, 81 insertions(+), 41 deletions(-) diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index ec449f009c7..41ae40a259d 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -479,48 +479,71 @@ class Project extends CommonObject } } - $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields"; - $sql.= " WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")"; - - dol_syslog(get_class($this) . "::delete", LOG_DEBUG); - $resql = $this->db->query($sql); - if (!$resql) + // Delete tasks + if (! $error) { - $this->errors[] = $this->db->lasterror(); - $error++; + $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_time"; + $sql.= " WHERE fk_task IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")"; + + $resql = $this->db->query($sql); + if (!$resql) + { + $this->errors[] = $this->db->lasterror(); + $error++; + } } - $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task"; - $sql.= " WHERE fk_projet=" . $this->id; - - dol_syslog(get_class($this) . "::delete", LOG_DEBUG); - $resql = $this->db->query($sql); - if (!$resql) + if (! $error) { - $this->errors[] = $this->db->lasterror(); - $error++; + $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields"; + $sql.= " WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")"; + + $resql = $this->db->query($sql); + if (!$resql) + { + $this->errors[] = $this->db->lasterror(); + $error++; + } } - $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet"; - $sql.= " WHERE rowid=" . $this->id; - - dol_syslog(get_class($this) . "::delete", LOG_DEBUG); - $resql = $this->db->query($sql); - if (!$resql) + if (! $error) { - $this->errors[] = $this->db->lasterror(); - $error++; + $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task"; + $sql.= " WHERE fk_projet=" . $this->id; + + $resql = $this->db->query($sql); + if (!$resql) + { + $this->errors[] = $this->db->lasterror(); + $error++; + } } - $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_extrafields"; - $sql.= " WHERE fk_object=" . $this->id; - - dol_syslog(get_class($this) . "::delete", LOG_DEBUG); - $resql = $this->db->query($sql); - if (! $resql) + // Delete project + if (! $error) { - $this->errors[] = $this->db->lasterror(); - $error++; + $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet"; + $sql.= " WHERE rowid=" . $this->id; + + $resql = $this->db->query($sql); + if (!$resql) + { + $this->errors[] = $this->db->lasterror(); + $error++; + } + } + + if (! $error) + { + $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_extrafields"; + $sql.= " WHERE fk_object=" . $this->id; + + $resql = $this->db->query($sql); + if (! $resql) + { + $this->errors[] = $this->db->lasterror(); + $error++; + } } if (empty($error)) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 5acdbbadddf..40773879757 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -342,7 +342,7 @@ class Task extends CommonObject /** - * Delete object in database + * Delete task from database * * @param User $user User that delete * @param int $notrigger 0=launch triggers after, 1=disable triggers @@ -379,15 +379,32 @@ class Task extends CommonObject } } - // Delete rang of line - //$this->delRangOfLine($this->id, $this->element); + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time"; + $sql.= " WHERE fk_task=".$this->id; - $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task"; - $sql.= " WHERE rowid=".$this->id; + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + } - dol_syslog(get_class($this)."::delete", LOG_DEBUG); - $resql = $this->db->query($sql); - if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_extrafields"; + $sql.= " WHERE fk_object=".$this->id; + + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + } + + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task"; + $sql.= " WHERE rowid=".$this->id; + + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + } if (! $error) { @@ -412,7 +429,7 @@ class Task extends CommonObject return -1*$error; } else - { + { //Delete associated link file if ($conf->projet->dir_output) { From c0afd4f174a30355c00b697508c86f5056a1fc00 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Dec 2014 15:44:22 +0100 Subject: [PATCH 045/172] Fixed: [ bug #1654 ] Can't display margins in product card --- htdocs/margin/tabs/productMargins.php | 52 ++++++++++++------------ htdocs/margin/tabs/thirdpartyMargins.php | 10 ++--- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index 46cf4245b60..d811f898c0b 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -131,12 +131,12 @@ if ($id > 0 || ! empty($ref)) if ($user->rights->facture->lire) { $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,"; $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,"; - $sql.= " f.datef, f.paye, f.fk_statut as statut,"; + $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,"; - $sql.= " sum(d.total_ht) as selling_price,"; - $sql.= $db->ifsql('f.type =2','sum(d.qty *-1)','sum(d.qty)')." as qty,"; - $sql.= $db->ifsql('f.type =2','sum(d.qty * d.buy_price_ht *-1)','sum(d.qty * d.buy_price_ht)')." as buying_price,"; - $sql.= $db->ifsql('f.type =2','sum(-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty)))','sum(d.total_ht - (d.buy_price_ht * d.qty))')." as marge" ; + $sql.= " sum(d.total_ht) as selling_price,"; // may be negative or positive + $sql.= " sum(d.qty) as qty,"; + $sql.= " sum(d.qty * d.buy_price_ht) as buying_price,"; // always positive + $sql.= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge" ; // always positive $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."facturedet as d"; @@ -150,9 +150,9 @@ if ($id > 0 || ! empty($ref)) if (! empty($socid)) $sql.= " AND f.fk_soc = $socid"; $sql .= " AND d.buy_price_ht IS NOT NULL"; if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0"; - $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut"; + $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user"; - $sql.= " ORDER BY ".$sortfield." ".$sortorder; + $sql.= $db->order($sortfield,$sortorder); // TODO: calculate total to display then restore pagination //$sql.= $db->plimit($conf->liste_limit +1, $offset); dol_syslog('margin:tabs:productMargins.php', LOG_DEBUG); @@ -192,13 +192,8 @@ if ($id > 0 || ! empty($ref)) $objp = $db->fetch_object($result); $var=!$var; - if ($objp->marge < 0) { - $marginRate = ($objp->buying_price != 0)?-1*(100 * $objp->marge / $objp->buying_price):'' ; - $markRate = ($objp->selling_price != 0)?-1*(100 * $objp->marge / $objp->selling_price):'' ; - } else { - $marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ; - $markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ; - } + $marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ; + $markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ; print ''; print '\n"; print ''; print "\n"; - print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - if (! empty($conf->global->DISPLAY_MARGIN_RATES)) - print "\n"; - if (! empty($conf->global->DISPLAY_MARK_RATES)) - print "\n"; - print ''; + print ""; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + if (! empty($conf->global->DISPLAY_MARGIN_RATES)) + print "\n"; + if (! empty($conf->global->DISPLAY_MARK_RATES)) + print "\n"; + print ''; print "\n"; $i++; $cumul_achat += $objp->buying_price; @@ -230,10 +225,13 @@ if ($id > 0 || ! empty($ref)) // affichage totaux marges $var=!$var; $totalMargin = $cumul_vente - $cumul_achat; - if ($totalMargin < 0) { + if ($totalMargin < 0) + { $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):''; $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):''; - } else { + } + else + { $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):''; $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):''; } diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index 144246f154a..457d55e81f0 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -143,7 +143,7 @@ if ($socid > 0) $sql.= " AND d.buy_price_ht IS NOT NULL"; if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0"; $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type"; - $sql.= " ORDER BY ".$sortfield." ".$sortorder; + $sql.= $db->order($sortfield,$sortorder); // TODO: calculate total to display then restore pagination //$sql.= $db->plimit($conf->liste_limit +1, $offset); @@ -206,7 +206,7 @@ if ($socid > 0) print ''; print "\n"; $i++; - $cumul_achat += (($objp->type == 2 ? -1 : 1) * $objp->buying_price); + $cumul_achat += $objp->buying_price; $cumul_vente += $objp->selling_price; } } @@ -255,8 +255,8 @@ $db->close(); ?> From c6bb5904e72ab75f66115424f523325b978b9c5a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Dec 2014 16:01:25 +0100 Subject: [PATCH 046/172] Fixed: Cancel button not correctly supported --- htdocs/product/price.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 3ff496356a8..ce2ed5f11d8 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -55,11 +55,19 @@ $object = new Product($db); $error=0; + /* * Actions */ -if ($action == 'update_price' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) { +if ($action == 'update_price' && GETPOST("cancel")) +{ + + $action=''; +} + +if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit->creer || $user->rights->service->creer)) +{ $result = $object->fetch($id); $error=0; @@ -341,9 +349,9 @@ if ($isphoto) { print ''; // MultiPrix -if (! empty($conf->global->PRODUIT_MULTIPRICES)) +if (! empty($conf->global->PRODUIT_MULTIPRICES)) { - if (! empty($socid)) + if (! empty($socid)) { $soc = new Societe($db); $soc->id = $socid; @@ -366,7 +374,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) // Prix mini print ''; print ''; // Price by quantity - if ($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) { + if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) + { print ''; - print "\n"; - print ''; + print "\n"; $var=True; while ($i < $num && $i < $conf->liste_limit) @@ -366,6 +365,7 @@ if ($resql) } print "
+ -" id="username" name="username" class="flat input-icon-user" size="15" value="" tabindex="1" /> +" id="username" name="username" class="flat input-icon-user" size="20" value="" tabindex="1" />
+ - + - +
'; @@ -208,17 +203,17 @@ if ($id > 0 || ! empty($ref)) print "'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'".$objp->code_client.""; - print dol_print_date($db->jdate($objp->datef),'day')."".price($objp->selling_price, null, null, null, null, $rounding)."".price($objp->buying_price, null, null, null, null, $rounding)."".price($objp->qty, null, null, null, null, $rounding)."".price($objp->marge, null, null, null, null, $rounding)."".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'"; + print dol_print_date($db->jdate($objp->datef),'day')."".price($objp->selling_price, null, null, null, null, $rounding)."".price($objp->buying_price, null, null, null, null, $rounding)."".price($objp->qty, null, null, null, null, $rounding)."".price($objp->marge, null, null, null, null, $rounding)."".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'
'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'
' . $langs->trans("MinPrice") . ''; - if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') + if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') { print price($object->multiprices_min_ttc["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]); } else { @@ -411,10 +419,10 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) // Prix mini print '
' . $langs->trans("MinPrice") . ' ' . $i . ''; if (empty($object->multiprices_base_type["$i"])) $object->multiprices_base_type["$i"]="HT"; - if ($object->multiprices_base_type["$i"] == 'TTC') + if ($object->multiprices_base_type["$i"] == 'TTC') { print price($object->multiprices_min_ttc["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]); - } + } else { print price($object->multiprices_min["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]); From 729134aad4342d2d890931bf981465f600f2e8e0 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sun, 14 Dec 2014 17:04:56 +0100 Subject: [PATCH 047/172] Update card.php add INTERVENTION_ADDLINE_FREEDUREATION in update line too --- htdocs/fichinter/card.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 2f067efeae2..a9888a59a24 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1486,7 +1486,9 @@ else if ($id > 0 || ! empty($ref)) // Duration print ''; - $form->select_duration('duration',$objp->duree); + $selectmode='select'; + if (! empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) $selectmode='text'; + $form->select_duration('duration',$objp->duree, $selectmode); print ''; From 135d6c1d1f248e8b3e5d95dc7fab060e8466ca42 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sun, 14 Dec 2014 18:03:30 +0100 Subject: [PATCH 048/172] Update facture.php if socid is filled and send, they no need to get the thirdparty of the object --- htdocs/compta/facture.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index be6ad58764a..ef5d1d90bea 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1766,8 +1766,10 @@ if ($action == 'create') $projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : ''); $ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : ''); $ref_int = (! empty($objectsrc->ref_int) ? $objectsrc->ref_int : ''); - - $soc = $objectsrc->thirdparty; + + // only if socid is not filled + if (empty($socid)) + $soc = $objectsrc->thirdparty; $cond_reglement_id = (! empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(! empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1)); $mode_reglement_id = (! empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(! empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0)); @@ -1786,7 +1788,7 @@ if ($action == 'create') { $cond_reglement_id = $soc->cond_reglement_id; $mode_reglement_id = $soc->mode_reglement_id; - $fk_account = $soc->fk_account; + $fk_account = $soc->fk_account; $remise_percent = $soc->remise_percent; $remise_absolue = 0; $dateinvoice = (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$dateinvoice); // Do not set 0 here (0 for a date is 1970) From 0b6ff8f9bc855905bdc722d9a6c732cf25ace113 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Dec 2014 20:41:11 +0100 Subject: [PATCH 049/172] Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not be finished. We keep it as development status. --- htdocs/core/class/html.form.class.php | 2 +- htdocs/langs/en_US/products.lang | 6 +-- htdocs/product/admin/product.php | 10 ++--- htdocs/product/ajax/products.php | 58 ++++++++++++------------ htdocs/product/price.php | 65 ++++++++++++++------------- 5 files changed, 73 insertions(+), 68 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 771a79cd95b..eec9318f9ba 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1749,7 +1749,7 @@ class Form } // Price by quantity - if (!empty($objp->quantity) && $objp->quantity >= 1 && $conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) + if (!empty($objp->quantity) && $objp->quantity >= 1 && ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) { $found = 1; $outqty=$objp->quantity; diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index b38bcd150a9..1a6c5a35511 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -198,7 +198,7 @@ HelpAddThisServiceCard=This option allows you to create or clone a service if it CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price -PriceByQuantity=Price by quantity +PriceByQuantity=Different prices by quantity PriceByQuantityRange=Quantity range ProductsDashboard=Products/Services summary UpdateOriginalProductLabel=Modify original label @@ -234,9 +234,9 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar c BarCodeDataForProduct=Barcode information of product %s : BarCodeDataForThirdparty=Barcode information of thirdparty %s : ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) -PriceByCustomer=Price by customer +PriceByCustomer=Different price for each customer PriceCatalogue=Unique price per product/service -PricingRule=Pricing Rules +PricingRule=Rules for customer prices AddCustomerPrice=Add price by customers ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 7ecc390516d..2d0c1cca468 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -44,13 +44,13 @@ $value = GETPOST('value','alpha'); // Pricing Rules $select_pricing_rules=array( -'PRODUCT_PRICE_UNIQ'=>$langs->trans('PriceCatalogue'), // Unique price -'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'), // Several prices according to a customer level -'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer') // Different price for each customer +'PRODUCT_PRICE_UNIQ'=>$langs->trans('PriceCatalogue'), // Unique price +'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'), // Several prices according to a customer level +'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer'), // Different price for each customer ); -if ($conf->global->MAIN_FEATURES_LEVEL==2) +if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { - $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity'); + $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity'); // TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity'); } diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php index 61a1c3bff73..7dda37b6f2c 100644 --- a/htdocs/product/ajax/products.php +++ b/htdocs/product/ajax/products.php @@ -58,32 +58,32 @@ $price_by_qty_rowid = GETPOST('pbq', 'int'); dol_syslog(join(',', $_GET)); // print_r($_GET); -if (! empty($action) && $action == 'fetch' && ! empty($id)) { +if (! empty($action) && $action == 'fetch' && ! empty($id)) +{ require DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; - + $outjson = array(); - + $object = new Product($db); $ret = $object->fetch($id); - if ($ret > 0) { + if ($ret > 0) + { $outref = $object->ref; $outlabel = $object->label; $outdesc = $object->description; $outtype = $object->type; $outqty = 1; $outdiscount = 0; - + $found = false; - + // Price by qty - if (! empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))) // If we need a - // particular price related - // to qty + if (! empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))) // If we need a particular price related to qty { $sql = "SELECT price, unitprice, quantity, remise_percent"; $sql .= " FROM " . MAIN_DB_PREFIX . "product_price_by_qty "; $sql .= " WHERE rowid=" . $price_by_qty_rowid . ""; - + $result = $db->query($sql); if ($result) { $objp = $db->fetch_object($result); @@ -98,7 +98,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) { } } } - + // Multiprice if (! $found && isset($price_level) && $price_level >= 1 && (! empty($conf->global->PRODUIT_MULTIPRICES))) // If we need a particular price // level (from 1 to 6) @@ -110,7 +110,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) { $sql .= " AND price_level=" . $price_level; $sql .= " ORDER BY date_price"; $sql .= " DESC LIMIT 1"; - + $result = $db->query($sql); if ($result) { $objp = $db->fetch_object($result); @@ -123,16 +123,16 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) { } } } - + // Price by customer if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && ! empty($socid)) { - + require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php'; - + $prodcustprice = new Productcustomerprice($db); - + $filter = array('t.fk_product' => $object->id,'t.fk_soc' => $socid); - + $result = $prodcustprice->fetch_all('', '', 0, 0, $filter); if ($result) { if (count($prodcustprice->lines) > 0) { @@ -144,48 +144,48 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) { } } } - + if (! $found) { $outprice_ht = price($object->price); $outprice_ttc = price($object->price_ttc); $outpricebasetype = $object->price_base_type; $outtva_tx = $object->tva_tx; } - + $outjson = array('ref' => $outref,'label' => $outlabel,'desc' => $outdesc,'type' => $outtype,'price_ht' => $outprice_ht,'price_ttc' => $outprice_ttc,'pricebasetype' => $outpricebasetype,'tva_tx' => $outtva_tx,'qty' => $outqty,'discount' => $outdiscount); } - + echo json_encode($outjson); } else { require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php'; - + $langs->load("products"); $langs->load("main"); - + top_httphead(); - + if (empty($htmlname)) return; - + $match = preg_grep('/(' . $htmlname . '[0-9]+)/', array_keys($_GET)); sort($match); $idprod = (! empty($match [0]) ? $match [0] : ''); - + if (! GETPOST($htmlname) && ! GETPOST($idprod)) return; - + // When used from jQuery, the search term is added as GET param "term". $searchkey = (GETPOST($idprod) ? GETPOST($idprod) : (GETPOST($htmlname) ? GETPOST($htmlname) : '')); - + $form = new Form($db); if (empty($mode) || $mode == 1) { $arrayresult = $form->select_produits_list("", $htmlname, $type, "", $price_level, $searchkey, $status, 2, $outjson, $socid); } elseif ($mode == 2) { $arrayresult = $form->select_produits_fournisseurs_list($socid, "", $htmlname, $type, "", $searchkey, $status, $outjson, $socid); } - + $db->close(); - + if ($outjson) print json_encode($arrayresult); } diff --git a/htdocs/product/price.php b/htdocs/product/price.php index ce2ed5f11d8..98cfd675fac 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -430,12 +430,13 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print '
' . $langs->trans("PriceByQuantity") . ' ' . $i; print ''; if ($object->prices_by_qty [$i] == 1) { - print ''; + print '
'; print ''; print ''; @@ -445,30 +446,30 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print ''; foreach ($object->prices_by_qty_list [$i] as $ii => $prices) { - if ($action == 'edit_price_by_qty' && $rowid == $prices ['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) { + if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) { print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; - print ''; - print ''; + print ''; + print ''; // print ''; - print ''; + print ''; print ''; print ''; print ''; } else { print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; @@ -524,7 +525,8 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; // Price by quantity - if ($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) { + if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) + { print '
' . $langs->trans("PriceByQuantityRange") . ' ' . $i . ' 
 ' . $object->price_base_type . ' ' . $object->price_base_type . '  % %
' . $prices ['quantity'] . '' . price($prices ['price']) . '' . price($prices ['unitprice']) . '' . price($prices ['remise_percent']) . ' %' . price($prices['price']) . '' . price($prices['unitprice']) . '' . price($prices['remise_percent']) . ' %'; if (($user->rights->produit->creer || $user->rights->service->creer)) { - print ''; + print ''; print img_edit() . ''; - print ''; + print ''; print img_delete() . ''; } else { print ' '; @@ -480,7 +481,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) if ($action != 'edit_price_by_qty' && ($user->rights->produit->creer || $user->rights->service->creer)) { print '
'; print ''; - print ''; + print ''; print ''; print '
' . $langs->trans("PriceByQuantity"); if ($object->prices_by_qty [0] == 0) { print ' ' . $langs->trans("Activate"); @@ -532,7 +534,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; if ($object->prices_by_qty [0] == 1) { - print ''; + print '
'; print ''; print ''; print ''; @@ -540,31 +542,33 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print ''; print ''; - foreach ($object->prices_by_qty_list [0] as $ii => $prices) { - if ($action == 'edit_price_by_qty' && $rowid == $prices ['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) { + foreach ($object->prices_by_qty_list [0] as $ii => $prices) + { + if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) + { print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; - print ''; - print ''; + print ''; + print ''; // print ''; - print ''; + print ''; print ''; print ''; print ''; } else { print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print '"; } // Price by quantity - if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) { + if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) + { $type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard'; print '"; } From 8e6d30589d8bf452dd3d0be3aafaeca57456c075 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Dec 2014 20:51:28 +0100 Subject: [PATCH 050/172] Fixed: Size too low --- htdocs/product/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 133cd9e20cc..a4c4e4ee92e 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -839,7 +839,7 @@ else print ''; $tmpcode=''; if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type); - print '
' . $langs->trans("PriceByQuantityRange") . '' . $langs->trans("HT") . '' . $langs->trans("Discount") . ' 
 ' . $object->price_base_type . ' ' . $object->price_base_type . '  % %
' . $prices ['quantity'] . '' . price($prices ['price']) . '' . price($prices ['unitprice']) . '' . price($prices ['remise_percent']) . ' %' . $prices['quantity'] . '' . price($prices['price']) . '' . price($prices['unitprice']) . '' . price($prices['remise_percent']) . ' %'; if (($user->rights->produit->creer || $user->rights->service->creer)) { - print ''; + print ''; print img_edit() . ''; - print ''; + print ''; print img_delete() . ''; } else { print ' '; @@ -803,7 +807,8 @@ if ($result) { print '' . $objp->price_level . "' . $langs->trans($type) . "
'.$langs->trans("Ref").''; + print ''.$langs->trans("Ref").''; if ($_error) { print $langs->trans("RefAlreadyExists"); @@ -1083,7 +1083,7 @@ else print ''; // Ref - print ''; + print ''; // Label print ''; From bd34f4e2473535f39005e1861d47f342e9a4360e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Dec 2014 22:26:58 +0100 Subject: [PATCH 051/172] Fixed: Typo --- htdocs/langs/en_US/withdrawals.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index a0f8078fb18..7894351c01f 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -79,7 +79,7 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" From d2398dd1b1b7835d3f28b3ab114565c955dde25d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Dec 2014 10:31:40 +0100 Subject: [PATCH 052/172] Sync from transifex --- htdocs/langs/ar_SA/admin.lang | 23 +- htdocs/langs/ar_SA/agenda.lang | 1 + htdocs/langs/ar_SA/categories.lang | 14 +- htdocs/langs/ar_SA/compta.lang | 4 - htdocs/langs/ar_SA/contracts.lang | 3 +- htdocs/langs/ar_SA/errors.lang | 21 +- htdocs/langs/ar_SA/members.lang | 30 +- htdocs/langs/ar_SA/products.lang | 21 +- htdocs/langs/ar_SA/projects.lang | 2 + htdocs/langs/ar_SA/resource.lang | 2 - htdocs/langs/ar_SA/withdrawals.lang | 3 +- htdocs/langs/bg_BG/admin.lang | 19 +- htdocs/langs/bg_BG/agenda.lang | 1 + htdocs/langs/bg_BG/compta.lang | 4 - htdocs/langs/bg_BG/contracts.lang | 3 +- htdocs/langs/bg_BG/errors.lang | 25 +- htdocs/langs/bg_BG/members.lang | 5 +- htdocs/langs/bg_BG/products.lang | 21 +- htdocs/langs/bg_BG/projects.lang | 10 +- htdocs/langs/bg_BG/resource.lang | 2 - htdocs/langs/bg_BG/withdrawals.lang | 3 +- htdocs/langs/bs_BA/accountancy.lang | 2 +- htdocs/langs/bs_BA/admin.lang | 19 +- htdocs/langs/bs_BA/agenda.lang | 1 + htdocs/langs/bs_BA/compta.lang | 4 - htdocs/langs/bs_BA/contracts.lang | 3 +- htdocs/langs/bs_BA/errors.lang | 21 +- htdocs/langs/bs_BA/members.lang | 408 ++++++++-------- htdocs/langs/bs_BA/products.lang | 21 +- htdocs/langs/bs_BA/projects.lang | 6 +- htdocs/langs/bs_BA/resource.lang | 2 - htdocs/langs/bs_BA/withdrawals.lang | 3 +- htdocs/langs/ca_ES/admin.lang | 19 +- htdocs/langs/ca_ES/agenda.lang | 1 + htdocs/langs/ca_ES/compta.lang | 4 - htdocs/langs/ca_ES/contracts.lang | 3 +- htdocs/langs/ca_ES/errors.lang | 21 +- htdocs/langs/ca_ES/members.lang | 10 +- htdocs/langs/ca_ES/printipp.lang | 17 +- htdocs/langs/ca_ES/products.lang | 21 +- htdocs/langs/ca_ES/projects.lang | 6 +- htdocs/langs/ca_ES/resource.lang | 2 - htdocs/langs/ca_ES/withdrawals.lang | 3 +- htdocs/langs/cs_CZ/admin.lang | 19 +- htdocs/langs/cs_CZ/agenda.lang | 1 + htdocs/langs/cs_CZ/compta.lang | 4 - htdocs/langs/cs_CZ/contracts.lang | 3 +- htdocs/langs/cs_CZ/errors.lang | 21 +- htdocs/langs/cs_CZ/members.lang | 10 +- htdocs/langs/cs_CZ/printipp.lang | 32 +- htdocs/langs/cs_CZ/products.lang | 21 +- htdocs/langs/cs_CZ/projects.lang | 6 +- htdocs/langs/cs_CZ/resource.lang | 2 - htdocs/langs/cs_CZ/withdrawals.lang | 3 +- htdocs/langs/da_DK/admin.lang | 19 +- htdocs/langs/da_DK/agenda.lang | 1 + htdocs/langs/da_DK/compta.lang | 4 - htdocs/langs/da_DK/contracts.lang | 3 +- htdocs/langs/da_DK/errors.lang | 21 +- htdocs/langs/da_DK/members.lang | 30 +- htdocs/langs/da_DK/products.lang | 21 +- htdocs/langs/da_DK/projects.lang | 6 +- htdocs/langs/da_DK/resource.lang | 2 - htdocs/langs/da_DK/withdrawals.lang | 3 +- htdocs/langs/de_DE/admin.lang | 59 ++- htdocs/langs/de_DE/agenda.lang | 3 +- htdocs/langs/de_DE/compta.lang | 4 - htdocs/langs/de_DE/contracts.lang | 5 +- htdocs/langs/de_DE/cron.lang | 2 +- htdocs/langs/de_DE/errors.lang | 25 +- htdocs/langs/de_DE/mails.lang | 8 +- htdocs/langs/de_DE/members.lang | 22 +- htdocs/langs/de_DE/products.lang | 21 +- htdocs/langs/de_DE/projects.lang | 4 +- htdocs/langs/de_DE/resource.lang | 8 +- htdocs/langs/de_DE/users.lang | 2 +- htdocs/langs/de_DE/withdrawals.lang | 5 +- htdocs/langs/el_GR/accountancy.lang | 14 +- htdocs/langs/el_GR/admin.lang | 29 +- htdocs/langs/el_GR/agenda.lang | 9 +- htdocs/langs/el_GR/bills.lang | 12 +- htdocs/langs/el_GR/boxes.lang | 23 +- htdocs/langs/el_GR/commercial.lang | 12 +- htdocs/langs/el_GR/compta.lang | 4 - htdocs/langs/el_GR/contracts.lang | 5 +- htdocs/langs/el_GR/cron.lang | 2 +- htdocs/langs/el_GR/deliveries.lang | 4 +- htdocs/langs/el_GR/errors.lang | 21 +- htdocs/langs/el_GR/externalsite.lang | 2 +- htdocs/langs/el_GR/members.lang | 8 +- htdocs/langs/el_GR/orders.lang | 2 +- htdocs/langs/el_GR/paybox.lang | 6 +- htdocs/langs/el_GR/products.lang | 29 +- htdocs/langs/el_GR/projects.lang | 6 +- htdocs/langs/el_GR/resource.lang | 2 - htdocs/langs/el_GR/sendings.lang | 4 +- htdocs/langs/el_GR/trips.lang | 4 +- htdocs/langs/el_GR/users.lang | 2 +- htdocs/langs/el_GR/withdrawals.lang | 3 +- htdocs/langs/es_ES/agenda.lang | 1 + htdocs/langs/es_ES/compta.lang | 4 - htdocs/langs/es_ES/contracts.lang | 1 + htdocs/langs/es_ES/withdrawals.lang | 3 +- htdocs/langs/et_EE/admin.lang | 19 +- htdocs/langs/et_EE/agenda.lang | 1 + htdocs/langs/et_EE/compta.lang | 4 - htdocs/langs/et_EE/contracts.lang | 3 +- htdocs/langs/et_EE/errors.lang | 21 +- htdocs/langs/et_EE/members.lang | 5 +- htdocs/langs/et_EE/products.lang | 21 +- htdocs/langs/et_EE/projects.lang | 6 +- htdocs/langs/et_EE/resource.lang | 2 - htdocs/langs/et_EE/withdrawals.lang | 3 +- htdocs/langs/eu_ES/admin.lang | 19 +- htdocs/langs/eu_ES/agenda.lang | 19 +- htdocs/langs/eu_ES/bills.lang | 58 +-- htdocs/langs/eu_ES/bookmarks.lang | 36 +- htdocs/langs/eu_ES/commercial.lang | 14 +- htdocs/langs/eu_ES/companies.lang | 30 +- htdocs/langs/eu_ES/compta.lang | 4 - htdocs/langs/eu_ES/contracts.lang | 3 +- htdocs/langs/eu_ES/cron.lang | 2 +- htdocs/langs/eu_ES/dict.lang | 644 +++++++++++++------------- htdocs/langs/eu_ES/errors.lang | 21 +- htdocs/langs/eu_ES/ftp.lang | 22 +- htdocs/langs/eu_ES/languages.lang | 36 +- htdocs/langs/eu_ES/link.lang | 16 +- htdocs/langs/eu_ES/mails.lang | 4 +- htdocs/langs/eu_ES/main.lang | 220 ++++----- htdocs/langs/eu_ES/members.lang | 408 ++++++++-------- htdocs/langs/eu_ES/products.lang | 21 +- htdocs/langs/eu_ES/projects.lang | 6 +- htdocs/langs/eu_ES/resource.lang | 2 - htdocs/langs/eu_ES/salaries.lang | 18 +- htdocs/langs/eu_ES/trips.lang | 22 +- htdocs/langs/eu_ES/withdrawals.lang | 3 +- htdocs/langs/fa_IR/admin.lang | 19 +- htdocs/langs/fa_IR/agenda.lang | 1 + htdocs/langs/fa_IR/compta.lang | 4 - htdocs/langs/fa_IR/contracts.lang | 3 +- htdocs/langs/fa_IR/errors.lang | 21 +- htdocs/langs/fa_IR/members.lang | 11 +- htdocs/langs/fa_IR/products.lang | 21 +- htdocs/langs/fa_IR/projects.lang | 6 +- htdocs/langs/fa_IR/resource.lang | 2 - htdocs/langs/fa_IR/withdrawals.lang | 3 +- htdocs/langs/fi_FI/admin.lang | 19 +- htdocs/langs/fi_FI/agenda.lang | 1 + htdocs/langs/fi_FI/bills.lang | 14 +- htdocs/langs/fi_FI/compta.lang | 4 - htdocs/langs/fi_FI/contracts.lang | 3 +- htdocs/langs/fi_FI/dict.lang | 64 ++- htdocs/langs/fi_FI/errors.lang | 21 +- htdocs/langs/fi_FI/margins.lang | 14 +- htdocs/langs/fi_FI/members.lang | 30 +- htdocs/langs/fi_FI/products.lang | 53 ++- htdocs/langs/fi_FI/projects.lang | 6 +- htdocs/langs/fi_FI/resource.lang | 2 - htdocs/langs/fi_FI/withdrawals.lang | 3 +- htdocs/langs/fr_FR/admin.lang | 61 +-- htdocs/langs/fr_FR/agenda.lang | 4 +- htdocs/langs/fr_FR/bills.lang | 2 +- htdocs/langs/fr_FR/compta.lang | 4 - htdocs/langs/fr_FR/contracts.lang | 5 +- htdocs/langs/fr_FR/cron.lang | 2 +- htdocs/langs/fr_FR/errors.lang | 34 +- htdocs/langs/fr_FR/mails.lang | 8 +- htdocs/langs/fr_FR/members.lang | 31 +- htdocs/langs/fr_FR/orders.lang | 2 +- htdocs/langs/fr_FR/printipp.lang | 17 +- htdocs/langs/fr_FR/productbatch.lang | 39 +- htdocs/langs/fr_FR/products.lang | 7 +- htdocs/langs/fr_FR/projects.lang | 2 + htdocs/langs/fr_FR/resource.lang | 6 +- htdocs/langs/fr_FR/users.lang | 2 +- htdocs/langs/fr_FR/withdrawals.lang | 7 +- htdocs/langs/he_IL/admin.lang | 19 +- htdocs/langs/he_IL/agenda.lang | 1 + htdocs/langs/he_IL/compta.lang | 4 - htdocs/langs/he_IL/contracts.lang | 3 +- htdocs/langs/he_IL/errors.lang | 21 +- htdocs/langs/he_IL/members.lang | 404 ++++++++-------- htdocs/langs/he_IL/products.lang | 21 +- htdocs/langs/he_IL/projects.lang | 6 +- htdocs/langs/he_IL/resource.lang | 2 - htdocs/langs/he_IL/withdrawals.lang | 3 +- htdocs/langs/hr_HR/admin.lang | 19 +- htdocs/langs/hr_HR/agenda.lang | 1 + htdocs/langs/hr_HR/compta.lang | 4 - htdocs/langs/hr_HR/contracts.lang | 3 +- htdocs/langs/hr_HR/errors.lang | 21 +- htdocs/langs/hr_HR/members.lang | 408 ++++++++-------- htdocs/langs/hr_HR/products.lang | 21 +- htdocs/langs/hr_HR/projects.lang | 6 +- htdocs/langs/hr_HR/resource.lang | 2 - htdocs/langs/hr_HR/withdrawals.lang | 3 +- htdocs/langs/hu_HU/admin.lang | 19 +- htdocs/langs/hu_HU/agenda.lang | 1 + htdocs/langs/hu_HU/compta.lang | 4 - htdocs/langs/hu_HU/contracts.lang | 3 +- htdocs/langs/hu_HU/errors.lang | 21 +- htdocs/langs/hu_HU/members.lang | 30 +- htdocs/langs/hu_HU/products.lang | 21 +- htdocs/langs/hu_HU/projects.lang | 6 +- htdocs/langs/hu_HU/resource.lang | 2 - htdocs/langs/hu_HU/withdrawals.lang | 3 +- htdocs/langs/id_ID/accountancy.lang | 74 +-- htdocs/langs/id_ID/admin.lang | 389 ++++++++-------- htdocs/langs/id_ID/agenda.lang | 1 + htdocs/langs/id_ID/companies.lang | 54 +-- htdocs/langs/id_ID/compta.lang | 4 - htdocs/langs/id_ID/contracts.lang | 3 +- htdocs/langs/id_ID/errors.lang | 21 +- htdocs/langs/id_ID/install.lang | 100 ++-- htdocs/langs/id_ID/members.lang | 408 ++++++++-------- htdocs/langs/id_ID/products.lang | 21 +- htdocs/langs/id_ID/projects.lang | 6 +- htdocs/langs/id_ID/resource.lang | 2 - htdocs/langs/id_ID/withdrawals.lang | 3 +- htdocs/langs/is_IS/admin.lang | 19 +- htdocs/langs/is_IS/agenda.lang | 1 + htdocs/langs/is_IS/compta.lang | 4 - htdocs/langs/is_IS/contracts.lang | 3 +- htdocs/langs/is_IS/errors.lang | 21 +- htdocs/langs/is_IS/members.lang | 30 +- htdocs/langs/is_IS/products.lang | 21 +- htdocs/langs/is_IS/projects.lang | 6 +- htdocs/langs/is_IS/resource.lang | 2 - htdocs/langs/is_IS/withdrawals.lang | 3 +- htdocs/langs/it_IT/admin.lang | 19 +- htdocs/langs/it_IT/agenda.lang | 11 +- htdocs/langs/it_IT/banks.lang | 4 +- htdocs/langs/it_IT/bills.lang | 36 +- htdocs/langs/it_IT/compta.lang | 12 +- htdocs/langs/it_IT/contracts.lang | 3 +- htdocs/langs/it_IT/errors.lang | 25 +- htdocs/langs/it_IT/exports.lang | 6 +- htdocs/langs/it_IT/members.lang | 9 +- htdocs/langs/it_IT/orders.lang | 2 +- htdocs/langs/it_IT/products.lang | 53 ++- htdocs/langs/it_IT/projects.lang | 16 +- htdocs/langs/it_IT/resource.lang | 36 +- htdocs/langs/it_IT/withdrawals.lang | 3 +- htdocs/langs/ja_JP/admin.lang | 19 +- htdocs/langs/ja_JP/agenda.lang | 1 + htdocs/langs/ja_JP/compta.lang | 4 - htdocs/langs/ja_JP/contracts.lang | 3 +- htdocs/langs/ja_JP/errors.lang | 21 +- htdocs/langs/ja_JP/members.lang | 30 +- htdocs/langs/ja_JP/products.lang | 21 +- htdocs/langs/ja_JP/projects.lang | 6 +- htdocs/langs/ja_JP/resource.lang | 2 - htdocs/langs/ja_JP/withdrawals.lang | 3 +- htdocs/langs/ko_KR/admin.lang | 19 +- htdocs/langs/ko_KR/agenda.lang | 1 + htdocs/langs/ko_KR/compta.lang | 4 - htdocs/langs/ko_KR/contracts.lang | 3 +- htdocs/langs/ko_KR/errors.lang | 21 +- htdocs/langs/ko_KR/members.lang | 408 ++++++++-------- htdocs/langs/ko_KR/products.lang | 21 +- htdocs/langs/ko_KR/projects.lang | 6 +- htdocs/langs/ko_KR/resource.lang | 2 - htdocs/langs/ko_KR/withdrawals.lang | 3 +- htdocs/langs/lt_LT/admin.lang | 19 +- htdocs/langs/lt_LT/agenda.lang | 1 + htdocs/langs/lt_LT/compta.lang | 4 - htdocs/langs/lt_LT/contracts.lang | 3 +- htdocs/langs/lt_LT/errors.lang | 21 +- htdocs/langs/lt_LT/members.lang | 408 ++++++++-------- htdocs/langs/lt_LT/products.lang | 21 +- htdocs/langs/lt_LT/projects.lang | 6 +- htdocs/langs/lt_LT/resource.lang | 2 - htdocs/langs/lt_LT/withdrawals.lang | 3 +- htdocs/langs/lv_LV/admin.lang | 19 +- htdocs/langs/lv_LV/agenda.lang | 1 + htdocs/langs/lv_LV/compta.lang | 4 - htdocs/langs/lv_LV/contracts.lang | 3 +- htdocs/langs/lv_LV/errors.lang | 23 +- htdocs/langs/lv_LV/members.lang | 5 +- htdocs/langs/lv_LV/printipp.lang | 30 +- htdocs/langs/lv_LV/products.lang | 21 +- htdocs/langs/lv_LV/projects.lang | 6 +- htdocs/langs/lv_LV/resource.lang | 2 - htdocs/langs/lv_LV/withdrawals.lang | 3 +- htdocs/langs/mk_MK/admin.lang | 19 +- htdocs/langs/mk_MK/agenda.lang | 1 + htdocs/langs/mk_MK/compta.lang | 4 - htdocs/langs/mk_MK/contracts.lang | 3 +- htdocs/langs/mk_MK/errors.lang | 21 +- htdocs/langs/mk_MK/members.lang | 408 ++++++++-------- htdocs/langs/mk_MK/products.lang | 21 +- htdocs/langs/mk_MK/projects.lang | 6 +- htdocs/langs/mk_MK/resource.lang | 2 - htdocs/langs/mk_MK/withdrawals.lang | 3 +- htdocs/langs/nb_NO/admin.lang | 19 +- htdocs/langs/nb_NO/agenda.lang | 1 + htdocs/langs/nb_NO/compta.lang | 4 - htdocs/langs/nb_NO/contracts.lang | 3 +- htdocs/langs/nb_NO/errors.lang | 21 +- htdocs/langs/nb_NO/members.lang | 5 +- htdocs/langs/nb_NO/products.lang | 29 +- htdocs/langs/nb_NO/projects.lang | 6 +- htdocs/langs/nb_NO/resource.lang | 2 - htdocs/langs/nb_NO/withdrawals.lang | 3 +- htdocs/langs/nl_NL/admin.lang | 19 +- htdocs/langs/nl_NL/agenda.lang | 5 +- htdocs/langs/nl_NL/categories.lang | 2 +- htdocs/langs/nl_NL/commercial.lang | 12 +- htdocs/langs/nl_NL/compta.lang | 4 - htdocs/langs/nl_NL/contracts.lang | 3 +- htdocs/langs/nl_NL/cron.lang | 68 +-- htdocs/langs/nl_NL/errors.lang | 21 +- htdocs/langs/nl_NL/members.lang | 5 +- htdocs/langs/nl_NL/orders.lang | 10 +- htdocs/langs/nl_NL/products.lang | 21 +- htdocs/langs/nl_NL/projects.lang | 6 +- htdocs/langs/nl_NL/resource.lang | 2 - htdocs/langs/nl_NL/withdrawals.lang | 3 +- htdocs/langs/pl_PL/admin.lang | 19 +- htdocs/langs/pl_PL/agenda.lang | 1 + htdocs/langs/pl_PL/compta.lang | 4 - htdocs/langs/pl_PL/contracts.lang | 3 +- htdocs/langs/pl_PL/errors.lang | 21 +- htdocs/langs/pl_PL/members.lang | 30 +- htdocs/langs/pl_PL/products.lang | 21 +- htdocs/langs/pl_PL/projects.lang | 6 +- htdocs/langs/pl_PL/resource.lang | 2 - htdocs/langs/pl_PL/withdrawals.lang | 3 +- htdocs/langs/pt_PT/admin.lang | 19 +- htdocs/langs/pt_PT/agenda.lang | 5 +- htdocs/langs/pt_PT/compta.lang | 4 - htdocs/langs/pt_PT/contracts.lang | 3 +- htdocs/langs/pt_PT/dict.lang | 14 +- htdocs/langs/pt_PT/errors.lang | 21 +- htdocs/langs/pt_PT/install.lang | 4 +- htdocs/langs/pt_PT/main.lang | 12 +- htdocs/langs/pt_PT/members.lang | 21 +- htdocs/langs/pt_PT/products.lang | 21 +- htdocs/langs/pt_PT/projects.lang | 6 +- htdocs/langs/pt_PT/resource.lang | 44 +- htdocs/langs/pt_PT/withdrawals.lang | 3 +- htdocs/langs/ro_RO/admin.lang | 105 +++-- htdocs/langs/ro_RO/agenda.lang | 3 +- htdocs/langs/ro_RO/banks.lang | 2 +- htdocs/langs/ro_RO/bills.lang | 4 +- htdocs/langs/ro_RO/cashdesk.lang | 26 +- htdocs/langs/ro_RO/compta.lang | 28 +- htdocs/langs/ro_RO/contracts.lang | 5 +- htdocs/langs/ro_RO/cron.lang | 2 +- htdocs/langs/ro_RO/donations.lang | 10 +- htdocs/langs/ro_RO/errors.lang | 18 + htdocs/langs/ro_RO/externalsite.lang | 2 +- htdocs/langs/ro_RO/install.lang | 60 +-- htdocs/langs/ro_RO/mails.lang | 8 +- htdocs/langs/ro_RO/members.lang | 8 +- htdocs/langs/ro_RO/orders.lang | 2 +- htdocs/langs/ro_RO/paybox.lang | 6 +- htdocs/langs/ro_RO/products.lang | 5 + htdocs/langs/ro_RO/projects.lang | 2 + htdocs/langs/ro_RO/resource.lang | 56 ++- htdocs/langs/ro_RO/stocks.lang | 2 +- htdocs/langs/ro_RO/users.lang | 2 +- htdocs/langs/ro_RO/withdrawals.lang | 5 +- htdocs/langs/ru_RU/admin.lang | 19 +- htdocs/langs/ru_RU/agenda.lang | 1 + htdocs/langs/ru_RU/compta.lang | 4 - htdocs/langs/ru_RU/contracts.lang | 3 +- htdocs/langs/ru_RU/errors.lang | 21 +- htdocs/langs/ru_RU/members.lang | 5 +- htdocs/langs/ru_RU/products.lang | 21 +- htdocs/langs/ru_RU/projects.lang | 6 +- htdocs/langs/ru_RU/resource.lang | 2 - htdocs/langs/ru_RU/withdrawals.lang | 3 +- htdocs/langs/sk_SK/admin.lang | 19 +- htdocs/langs/sk_SK/agenda.lang | 1 + htdocs/langs/sk_SK/compta.lang | 4 - htdocs/langs/sk_SK/contracts.lang | 3 +- htdocs/langs/sk_SK/errors.lang | 21 +- htdocs/langs/sk_SK/members.lang | 8 +- htdocs/langs/sk_SK/printipp.lang | 32 +- htdocs/langs/sk_SK/products.lang | 21 +- htdocs/langs/sk_SK/projects.lang | 6 +- htdocs/langs/sk_SK/resource.lang | 2 - htdocs/langs/sk_SK/withdrawals.lang | 3 +- htdocs/langs/sl_SI/admin.lang | 53 ++- htdocs/langs/sl_SI/agenda.lang | 7 +- htdocs/langs/sl_SI/bills.lang | 32 +- htdocs/langs/sl_SI/categories.lang | 2 +- htdocs/langs/sl_SI/compta.lang | 4 - htdocs/langs/sl_SI/contracts.lang | 5 +- htdocs/langs/sl_SI/errors.lang | 21 +- htdocs/langs/sl_SI/main.lang | 2 +- htdocs/langs/sl_SI/members.lang | 7 +- htdocs/langs/sl_SI/orders.lang | 2 +- htdocs/langs/sl_SI/products.lang | 173 +++---- htdocs/langs/sl_SI/projects.lang | 32 +- htdocs/langs/sl_SI/resource.lang | 2 - htdocs/langs/sl_SI/stocks.lang | 2 +- htdocs/langs/sl_SI/users.lang | 2 +- htdocs/langs/sl_SI/withdrawals.lang | 3 +- htdocs/langs/sq_AL/admin.lang | 19 +- htdocs/langs/sq_AL/agenda.lang | 1 + htdocs/langs/sq_AL/compta.lang | 4 - htdocs/langs/sq_AL/contracts.lang | 3 +- htdocs/langs/sq_AL/errors.lang | 21 +- htdocs/langs/sq_AL/members.lang | 7 +- htdocs/langs/sq_AL/products.lang | 21 +- htdocs/langs/sq_AL/projects.lang | 6 +- htdocs/langs/sq_AL/resource.lang | 2 - htdocs/langs/sq_AL/withdrawals.lang | 3 +- htdocs/langs/sv_SE/accountancy.lang | 26 +- htdocs/langs/sv_SE/admin.lang | 103 ++-- htdocs/langs/sv_SE/agenda.lang | 3 +- htdocs/langs/sv_SE/banks.lang | 6 +- htdocs/langs/sv_SE/bills.lang | 38 +- htdocs/langs/sv_SE/boxes.lang | 2 +- htdocs/langs/sv_SE/categories.lang | 2 +- htdocs/langs/sv_SE/compta.lang | 142 +++--- htdocs/langs/sv_SE/contracts.lang | 5 +- htdocs/langs/sv_SE/cron.lang | 2 +- htdocs/langs/sv_SE/donations.lang | 10 +- htdocs/langs/sv_SE/errors.lang | 18 + htdocs/langs/sv_SE/exports.lang | 34 +- htdocs/langs/sv_SE/externalsite.lang | 2 +- htdocs/langs/sv_SE/interventions.lang | 32 +- htdocs/langs/sv_SE/ldap.lang | 2 +- htdocs/langs/sv_SE/mails.lang | 80 ++-- htdocs/langs/sv_SE/main.lang | 6 +- htdocs/langs/sv_SE/margins.lang | 20 +- htdocs/langs/sv_SE/members.lang | 1 + htdocs/langs/sv_SE/opensurvey.lang | 60 +-- htdocs/langs/sv_SE/orders.lang | 2 +- htdocs/langs/sv_SE/other.lang | 46 +- htdocs/langs/sv_SE/paybox.lang | 12 +- htdocs/langs/sv_SE/products.lang | 49 +- htdocs/langs/sv_SE/projects.lang | 90 ++-- htdocs/langs/sv_SE/resource.lang | 56 ++- htdocs/langs/sv_SE/sendings.lang | 4 +- htdocs/langs/sv_SE/stocks.lang | 22 +- htdocs/langs/sv_SE/suppliers.lang | 14 +- htdocs/langs/sv_SE/trips.lang | 4 +- htdocs/langs/sv_SE/users.lang | 2 +- htdocs/langs/sv_SE/withdrawals.lang | 25 +- htdocs/langs/sv_SE/workflow.lang | 6 +- htdocs/langs/th_TH/admin.lang | 19 +- htdocs/langs/th_TH/agenda.lang | 1 + htdocs/langs/th_TH/compta.lang | 4 - htdocs/langs/th_TH/contracts.lang | 3 +- htdocs/langs/th_TH/errors.lang | 21 +- htdocs/langs/th_TH/members.lang | 5 +- htdocs/langs/th_TH/products.lang | 21 +- htdocs/langs/th_TH/projects.lang | 6 +- htdocs/langs/th_TH/resource.lang | 2 - htdocs/langs/th_TH/withdrawals.lang | 3 +- htdocs/langs/tr_TR/admin.lang | 89 ++-- htdocs/langs/tr_TR/agenda.lang | 9 +- htdocs/langs/tr_TR/bills.lang | 2 +- htdocs/langs/tr_TR/companies.lang | 6 +- htdocs/langs/tr_TR/compta.lang | 4 - htdocs/langs/tr_TR/contracts.lang | 5 +- htdocs/langs/tr_TR/cron.lang | 2 +- htdocs/langs/tr_TR/errors.lang | 20 +- htdocs/langs/tr_TR/exports.lang | 26 +- htdocs/langs/tr_TR/mails.lang | 8 +- htdocs/langs/tr_TR/main.lang | 2 +- htdocs/langs/tr_TR/members.lang | 5 +- htdocs/langs/tr_TR/orders.lang | 2 +- htdocs/langs/tr_TR/printipp.lang | 19 +- htdocs/langs/tr_TR/products.lang | 19 +- htdocs/langs/tr_TR/projects.lang | 4 +- htdocs/langs/tr_TR/resource.lang | 6 +- htdocs/langs/tr_TR/users.lang | 2 +- htdocs/langs/tr_TR/withdrawals.lang | 5 +- htdocs/langs/uk_UA/admin.lang | 19 +- htdocs/langs/uk_UA/agenda.lang | 1 + htdocs/langs/uk_UA/compta.lang | 4 - htdocs/langs/uk_UA/contracts.lang | 3 +- htdocs/langs/uk_UA/errors.lang | 21 +- htdocs/langs/uk_UA/members.lang | 5 +- htdocs/langs/uk_UA/products.lang | 21 +- htdocs/langs/uk_UA/projects.lang | 6 +- htdocs/langs/uk_UA/resource.lang | 2 - htdocs/langs/uk_UA/withdrawals.lang | 3 +- htdocs/langs/uz_UZ/admin.lang | 19 +- htdocs/langs/uz_UZ/agenda.lang | 1 + htdocs/langs/uz_UZ/compta.lang | 4 - htdocs/langs/uz_UZ/contracts.lang | 3 +- htdocs/langs/uz_UZ/errors.lang | 21 +- htdocs/langs/uz_UZ/members.lang | 5 +- htdocs/langs/uz_UZ/products.lang | 21 +- htdocs/langs/uz_UZ/projects.lang | 6 +- htdocs/langs/uz_UZ/withdrawals.lang | 3 +- htdocs/langs/vi_VN/admin.lang | 19 +- htdocs/langs/vi_VN/agenda.lang | 1 + htdocs/langs/vi_VN/compta.lang | 4 - htdocs/langs/vi_VN/contracts.lang | 3 +- htdocs/langs/vi_VN/ecm.lang | 2 +- htdocs/langs/vi_VN/errors.lang | 21 +- htdocs/langs/vi_VN/members.lang | 51 +- htdocs/langs/vi_VN/products.lang | 45 +- htdocs/langs/vi_VN/projects.lang | 16 +- htdocs/langs/vi_VN/propal.lang | 6 +- htdocs/langs/vi_VN/resource.lang | 2 - htdocs/langs/vi_VN/suppliers.lang | 8 +- htdocs/langs/vi_VN/withdrawals.lang | 3 +- htdocs/langs/zh_CN/admin.lang | 19 +- htdocs/langs/zh_CN/agenda.lang | 1 + htdocs/langs/zh_CN/compta.lang | 4 - htdocs/langs/zh_CN/contracts.lang | 3 +- htdocs/langs/zh_CN/errors.lang | 29 +- htdocs/langs/zh_CN/members.lang | 7 +- htdocs/langs/zh_CN/products.lang | 31 +- htdocs/langs/zh_CN/projects.lang | 6 +- htdocs/langs/zh_CN/resource.lang | 2 - htdocs/langs/zh_CN/withdrawals.lang | 3 +- htdocs/langs/zh_TW/admin.lang | 19 +- htdocs/langs/zh_TW/agenda.lang | 1 + htdocs/langs/zh_TW/compta.lang | 4 - htdocs/langs/zh_TW/contracts.lang | 3 +- htdocs/langs/zh_TW/errors.lang | 21 +- htdocs/langs/zh_TW/members.lang | 30 +- htdocs/langs/zh_TW/products.lang | 21 +- htdocs/langs/zh_TW/projects.lang | 6 +- htdocs/langs/zh_TW/resource.lang | 2 - htdocs/langs/zh_TW/withdrawals.lang | 3 +- htdocs/theme/eldy/style.css.php | 18 +- 526 files changed, 6337 insertions(+), 4955 deletions(-) diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index a4214d4e592..e5d0499ff88 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= أضف فلتر كخيار لعرض/إخفاء الجهات الأخرى التي تقوم بنشاط حالياً أو توقفت عنه UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=فلاتر خيارات البحث NumberOfKeyToSearch=عدد الحروف لبدء البحث: %s ViewFullDateActions=أظهر التواريخ الكاملة للأحداث في الصفحة الثالثة @@ -208,6 +210,7 @@ ModulesJobDesc=توفير وحدات تجارية بسيطة ومحددة سلف ModulesMarketPlaceDesc=يمكنك العثور على مزيد من وحدات للتحميل على مواقع الإنترنت الخارجية على شبكة الانترنت... ModulesMarketPlaces=مزيد من وحدات... DoliStoreDesc=DoliStore ، في السوق الرسمي لتخطيط موارد المؤسسات وحدات Dolibarr / خارجي إدارة علاقات العملاء +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=مزودي موقع ويب يمكنك البحث للعثور على المزيد من وحدات... URL=رابط BoxesAvailable=صناديق متاحة @@ -437,14 +440,14 @@ Module52Name=الاسهم Module52Desc=مخزون إدارة المنتجات Module53Name=الخدمات Module53Desc=الخدمات الإدارية -Module54Name=عقود -Module54Desc=العقود والخدمات الإدارية +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcodes إدارة Module56Name=الخدمات الهاتفية Module56Desc=تكامل الخدمات الهاتفية Module57Name=أوامر دائمة -Module57Desc=أوامر دائمة وسحب إدارة +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial التكامل Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=تغذية RSS Module320Desc=إضافة تغذية RSS داخل الشاشة صفحة Dolibarr Module330Name=العناوين Module330Desc=العناوين إدارة -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar التكامل Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=الفئات Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن) Module2000Name=Fckeditor Module2000Desc=سوغ محرر +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=جدول الأعمال @@ -503,6 +508,8 @@ Module2500Name=إدارة المحتوى الإلكتروني Module2500Desc=حفظ وتبادل الوثائق Module2600Name=WebServices Module2600Desc=تمكين خدمات الويب Dolibarr الملقم +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=غرفتر Module2700Desc=استخدام خدمة غرفتر على الانترنت (www.gravatar.com) لإظهار الصورة من المستخدمين / أعضاء (وجدت مع رسائل البريد الإلكتروني الخاصة بهم). في حاجة الى الوصول الى شبكة الانترنت Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع PayBox Module50100Name=نقطة البيع @@ -527,7 +534,7 @@ Module50200Desc=وحدة لتقديم على صفحة الدفع عبر الإن Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=الإعداد المحفوظة BackToModuleList=العودة إلى قائمة الوحدات BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليم DefaultLanguage=اللغة الافتراضية لاستخدام (شفرة اللغة) EnableMultilangInterface=تتيح واجهة متعددة اللغات EnableShowLogo=عرض الشعار على اليسار القائمة +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=النظام الخاص بك تم تحديث بنجاح CompanyInfo=الشركة / المؤسسة المعلومات CompanyIds=الشركة / المؤسسة الهويات diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang index d732b03639c..0e6094546d3 100644 --- a/htdocs/langs/ar_SA/agenda.lang +++ b/htdocs/langs/ar_SA/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=أحداث عينت لـ ActionsDoneBy=أحداث انهيت بواسطة ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= كل أحداثي/ مهامي AllActions= جميع الأحداث / المهام ViewList=عرض قائمة diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang index b67793fcf84..77ec72df825 100644 --- a/htdocs/langs/ar_SA/categories.lang +++ b/htdocs/langs/ar_SA/categories.lang @@ -15,20 +15,20 @@ ProductsCategoriesArea=منتجات / خدمات الفئات المنطقة SuppliersCategoriesArea=الموردين منطقة الفئات CustomersCategoriesArea=العملاء منطقة الفئات ThirdPartyCategoriesArea=أطراف ثالثة 'منطقة الفئات -MembersCategoriesArea=أعضاء فئات المناطق +MembersCategoriesArea=منطقة فئات الأعضاء ContactsCategoriesArea=Contacts categories area MainCats=الفئات الرئيسية -SubCats=فرعية -CatStatistics=احصاءات +SubCats=الفئات الفرعية +CatStatistics=إحصائيات CatList=قائمة الفئات AllCats=جميع الفئات -ViewCat=وترى هذه الفئة +ViewCat=عرض الفئة NewCat=إضافة فئة NewCategory=فئة جديدة ModifCat=تعديل الفئة -CatCreated=فئة خلق -CreateCat=خلق فئة -CreateThisCat=تهيئة هذه الفئة +CatCreated=تم إنشاء الفئة +CreateCat=إنشاء فئة +CreateThisCat=إنشاء هذه الفئة ValidateFields=صحة المجالات NoSubCat=لا فرعية. SubCatOf=فرعية diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang index 88215629f80..a086e30b48c 100644 --- a/htdocs/langs/ar_SA/compta.lang +++ b/htdocs/langs/ar_SA/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang index 446ea9e2fb7..133036960c0 100644 --- a/htdocs/langs/ar_SA/contracts.lang +++ b/htdocs/langs/ar_SA/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=قائمة تشغيل خطوط العقد ListOfRunningServices=لائحة ادارة الخدمات NotActivatedServices=لا تنشيط الخدمات) بين مصدق العقود) BoardNotActivatedServices=خدمات لتفعيل العقود بين مصدق -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=ق الماضي ٪ تنشيط الخدمات LastModifiedServices=آخر تعديل ٪ ق الخدمات EditServiceLine=تعديل خط الخدمات @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=ممثل مبيعات توقيع العقد diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang index d25c2f5d8d0..670c99a851a 100644 --- a/htdocs/langs/ar_SA/errors.lang +++ b/htdocs/langs/ar_SA/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=رمز المورد المطلوب ErrorSupplierCodeAlreadyUsed=الشفرة المستخدمة بالفعل مورد ErrorBadParameters=بارامترات سيئة ErrorBadValueForParameter=قيمة خاطئة "%s 'ل' %s" المعلمة غير صحيحة -ErrorBadImageFormat=ملف الصورة لم تنسيق معتمد +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat='%s' قيمة له خاطئ تنسيق التاريخ ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=لم يكتب في دليل ٪ ق @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=لا يستطيع المستخدم الدخول مع ErrorLoginHasNoEmail=هذا المستخدم ليس لديه عنوان البريد الإلكتروني. إحباط عملية. ErrorBadValueForCode=سيئة قيمة لرمز الحماية. حاول مرة أخرى مع القيمة الجديدة ... ErrorBothFieldCantBeNegative=ويمكن لحقول %s و%s لا تكون سلبية +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=%s تستخدم حساب مستخدم لتنفيذ خادم الويب لا يوجد لديه إذن لذلك ErrorNoActivatedBarcode=لا يوجد نوع الباركود تفعيلها ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang index c49ccb303ac..ee9d10f88e0 100644 --- a/htdocs/langs/ar_SA/members.lang +++ b/htdocs/langs/ar_SA/members.lang @@ -8,7 +8,7 @@ Members=أعضاء MemberAccount=دخول الأعضاء ShowMember=وتظهر بطاقة عضو UserNotLinkedToMember=المستخدم لا ترتبط عضو -# ThirdpartyNotLinkedToMember=Third-party not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=أعضاء التذاكر FundationMembers=أعضاء المؤسسة Attributs=الصفات @@ -85,8 +85,7 @@ SubscriptionLateShort=متأخر SubscriptionNotReceivedShort=لم يتلق ListOfSubscriptions=قائمة الاشتراكات SendCardByMail=أرسل بطاقة -AddMember=إضافة عضو -MemberType=عضو نوع +AddMember=Create member NoTypeDefinedGoToSetup=لا يجوز لأي عضو في أنواع محددة. الذهاب إلى الإعداد -- أنواع الأعضاء NewMemberType=عضو جديد من نوع WelcomeEMail=مرحبا بك في البريد الإلكتروني @@ -126,12 +125,12 @@ Date=تاريخ DateAndTime=التاريخ والوقت PublicMemberCard=عضو بطاقة العامة MemberNotOrNoMoreExpectedToSubscribe=أو ليست عضوا في أي أكثر من المتوقع للاكتتاب -AddSubscription=إضافة اشتراك +AddSubscription=Create subscription ShowSubscription=وتظهر اكتتاب MemberModifiedInDolibarr=عضو في تعديل Dolibarr SendAnEMailToMember=البريد الإلكتروني لإرسال معلومات العضو -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=بريد إلكتروني الموضوع لautosubscription الأعضاء DescADHERENT_AUTOREGISTER_MAIL=البريد الإلكتروني لعضو autosubscription DescADHERENT_MAIL_VALID_SUBJECT=البريد الإلكتروني لعضو في موضوع المصادقة @@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=موضوع البريد الإلكتروني ل DescADHERENT_MAIL_RESIL=البريد الإلكتروني لعضو resiliation DescADHERENT_MAIL_FROM=البريد الإلكتروني للمرسل البريد الإلكتروني التلقائي DescADHERENT_ETIQUETTE_TYPE=علامات الشكل -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets DescADHERENT_CARD_TYPE=شكل بطاقات صفحة DescADHERENT_CARD_HEADER_TEXT=نص مطبوع على رأس عضو البطاقات DescADHERENT_CARD_TEXT=نص مطبوع على بطاقات الأعضاء @@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=لم يرتبط بها من طرف ثالث له ThirdPartyDolibarr=Dolibarr طرف ثالث MembersAndSubscriptions= وأعضاء Subscriptions MoreActions=تكميلية العمل على تسجيل -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription MoreActionBankDirect=إنشاء سجل المعاملات مباشرة على حساب MoreActionBankViaInvoice=إنشاء الفاتورة والدفع على حساب MoreActionInvoiceOnly=إنشاء فاتورة مع دفع أي مبلغ @@ -171,6 +170,8 @@ LastSubscriptionAmount=آخر مبلغ الاشتراك MembersStatisticsByCountries=أعضاء إحصاءات حسب البلد MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاطعة MembersStatisticsByTown=أعضاء إحصاءات بلدة +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=عدد الأعضاء NoValidatedMemberYet=العثور على أي أعضاء التحقق من صحة MembersByCountryDesc=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الدول. لكن الرسم يعتمد على خدمة غوغل الرسم البياني على الإنترنت ويتوفر فقط إذا كان على اتصال بالإنترنت ويعمل. @@ -196,9 +197,10 @@ Collectivités=المنظمات Particuliers=الشخصية Entreprises=الشركات DOLIBARRFOUNDATION_PAYMENT_FORM=أن يسدد الاشتراك باستخدام حوالة مصرفية، راجع صفحة http://wiki.dolibarr.org/index.php/Subscribe .
الدفع باستخدام بطاقة ائتمان أو باي بال، وانقر على زر في أسفل هذه الصفحة.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang index 0902013f2bb..49d6fff5689 100644 --- a/htdocs/langs/ar_SA/products.lang +++ b/htdocs/langs/ar_SA/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=إذا كان المنتج هو خدمة لفترة مح MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=عدد من السعر MultiPriceLevelsName=سعر الفئات -AssociatedProductsAbility=تنشيط المنتجات -AssociatedProducts=المنتجات -AssociatedProductsNumber=عدد المنتجات -ParentProductsNumber=عدد من الناتج الأم -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=المنتسبون Translation=الترجمة KeywordFilter=الكلمة الرئيسية فلتر @@ -132,7 +132,7 @@ AddDel=إضافة / حذف Quantity=الكمية NoMatchFound=العثور على أي مباراة ProductAssociationList=قائمة المنتجات المتعلقة / الخدمات : اسم المنتج / الخدمة (الكمية المتضررة) -ProductParentList=قائمة من المنتجات / الخدمات مع هذا المنتج كعنصر +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=واحد من اختيار المنتج الأم الحالية المنتج DeleteProduct=حذف المنتجات / الخدمات ConfirmDeleteProduct=هل أنت متأكد من حذف هذه المنتجات / الخدمات؟ @@ -179,7 +179,7 @@ CloneProduct=استنساخ المنتجات أو الخدمات ConfirmCloneProduct=هل أنت متأكد من أن المنتج أو الخدمة استنساخ ٪ ق؟ CloneContentProduct=استنساخ جميع المعلومات الرئيسية من المنتجات / الخدمات ClonePricesProduct=استنساخ الرئيسية معلومات والأسعار -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=ويستخدم هذا المنتج NewRefForClone=المرجع. من المنتجات الجديدة / خدمة CustomerPrices=أسعار العملاء @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang index 34c6bea737f..26d051445c3 100644 --- a/htdocs/langs/ar_SA/projects.lang +++ b/htdocs/langs/ar_SA/projects.lang @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=جديد الوقت الذي يقضيه MyTimeSpent=وقتي قضى MyTasks=مهمتي diff --git a/htdocs/langs/ar_SA/resource.lang b/htdocs/langs/ar_SA/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/ar_SA/resource.lang +++ b/htdocs/langs/ar_SA/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang index 96323e4b1bb..5d7a45bbe66 100644 --- a/htdocs/langs/ar_SA/withdrawals.lang +++ b/htdocs/langs/ar_SA/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=الائتمان على WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=وتظهر سحب IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ومع ذلك، إذا فاتورة واحدة على الأقل دفع انسحاب لا تتم معالجتها حتى الآن، فإنه لن يكون كما سيولي للسماح لإدارة الانسحاب قبل. -DoStandingOrdersBeforePayments=هذه علامات تسمح لك لطلب لاستصدار أمر دائم. مرة واحدة وسيتم الانتهاء من ذلك، يمكنك كتابة دفع لإغلاق الفاتورة. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=دفع %s النظام الدائمة من قبل البنك diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index 2300a4772e8..0516b22b16e 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Използвайте автоматично довъ ActivityStateToSelectCompany= Добавяне на филтър опция за показване / скриване на thirdparties, които в момента са в дейност или е престанала UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Използвайте автоматично довършване полета, за избор на контакт (вместо да използвте списъка от полето). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Опции на филтрите за търсене NumberOfKeyToSearch=NBR от знаци, за да предизвика търсене: %s ViewFullDateActions=Показване на пълните събития дати в третия лист @@ -208,6 +210,7 @@ ModulesJobDesc=Бизнес модули осигуряват прост пре ModulesMarketPlaceDesc=Можете да намерите повече модули за изтегляне на външни уеб-сайтове в Интернет ... ModulesMarketPlaces=Повече модули ... DoliStoreDesc=DoliStore, официалният пазар за външни модули за Dolibarr ERP/CRM +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Доставчици на уеб сайта можете да търсите да намерите повече модули ... URL=Връзка BoxesAvailable=Налични Кутии @@ -444,7 +447,7 @@ Module55Desc=Управление на баркод Module56Name=Телефония Module56Desc=Телефония интеграция Module57Name=Постоянните поръчки -Module57Desc=Постоянни нареждания и оттегляне управление +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Интеграция на ClickToDial система (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS емисия Module320Desc=Добавяне на RSS емисия в страниците на Dolibarr Module330Name=Отметки Module330Desc=Управление на отметки -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar интеграция Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Категории Module1780Desc=Управление на категории (продукти, доставчици и клиенти) Module2000Name=WYSIWYG редактор Module2000Desc=Оставя се да редактирате някакъв текст, чрез използване на усъвършенствана редактор +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Дневен ред @@ -503,6 +508,8 @@ Module2500Name=Електронно Управление на Съдържани Module2500Desc=Запазване и споделяне на документи Module2600Name=WebServices Module2600Desc=Активирайте сървъра на Dolibarr за уеб услуги +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Използвайте онлайн Gravatar услуга (www.gravatar.com), за да покаже снимка на потребители / членове с техните имейли. Нуждаете се от интернет Module2800Desc=FTP Клиент @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paybox Module50100Name=Точка на продажбите @@ -527,7 +534,7 @@ Module50200Desc=Модул предлага онлайн страница на Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Полета @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup спаси BackToModuleList=Обратно към списъка с модули BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Постоянна форма за търсене в л DefaultLanguage=Език по подразбиране (код на езика) EnableMultilangInterface=Разрешаване на многоезичен интерфейс EnableShowLogo=Показване на логото в лявото меню +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Вашата система е актуализиран успешно CompanyInfo=Информация за фирмата/организацията CompanyIds=Идентичност на фирмата/организацията diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang index b97d5a8658d..6affd27cc53 100644 --- a/htdocs/langs/bg_BG/agenda.lang +++ b/htdocs/langs/bg_BG/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Събития възложени на ActionsDoneBy=Събития извършени от ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Всички мои събития/задачи AllActions= Всички събития/задачи ViewList=Списъчен изглед diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang index 9aa1fa85417..0830bcfd2d3 100644 --- a/htdocs/langs/bg_BG/compta.lang +++ b/htdocs/langs/bg_BG/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Счетоводен код по подразбиране за продажба на услуги ACCOUNTING_VAT_ACCOUNT=Счетоводен код по подразбиране за начисляване на ДДС ACCOUNTING_VAT_BUY_ACCOUNT=Счетоводен код по подразбиране за плащане на ДДС ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang index b78304394ed..1aa00c03e0e 100644 --- a/htdocs/langs/bg_BG/contracts.lang +++ b/htdocs/langs/bg_BG/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Списък на линиите на движени ListOfRunningServices=Списък на стартираните услуги NotActivatedServices=Неактивни услуги (сред валидирани договори) BoardNotActivatedServices=Услуги за да активирате сред утвърдени договори -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Последните %s активирани услуги LastModifiedServices=Последните %s променени услуги EditServiceLine=Редактиране на сервизна линия @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Търговски представител подписване на договора diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang index 494b1ede1e0..f75d1b490b1 100644 --- a/htdocs/langs/bg_BG/errors.lang +++ b/htdocs/langs/bg_BG/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Доставчик изисква код ErrorSupplierCodeAlreadyUsed=Доставчик код вече се използва ErrorBadParameters=Лошите параметри ErrorBadValueForParameter=Грешна стойност "%s" за параметрите неправилни "%s" -ErrorBadImageFormat=Image файла не е поддържан формат +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat="%s" Стойност има грешна дата формат ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Неуспех при запис в директорията %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Потребителя %s не е намерен. ErrorLoginHasNoEmail=Този потребител няма имейл адрес. Процес прекратено. ErrorBadValueForCode=Неправилна стойност за код за сигурност. Опитайте отново с нова стойност ... ErrorBothFieldCantBeNegative=Полетата %s и %s не може да бъде едновременно отрицателен +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Потребителски акаунт %s използват за извършване на уеб сървър не разполага с разрешение за това ErrorNoActivatedBarcode=Не е тип баркод активира ErrUnzipFails=Неуспех да разархивирате %s с ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени @@ -155,5 +174,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). WarningNotRelevant=Irrelevant operation for this dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. -WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. -WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters +WarningPaymentDateLowerThanInvoiceDate=Датата на плащане (%s) е по-ранна от датата на фактуриране (%s) за фактура %s. +WarningTooManyDataPleaseUseMoreFilters=Твърде много данни. Моля, използвайте повече филтри diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang index 15bb3fbe4ff..88566d73fdb 100644 --- a/htdocs/langs/bg_BG/members.lang +++ b/htdocs/langs/bg_BG/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Със закъснение SubscriptionNotReceivedShort=Не е получаван ListOfSubscriptions=Списък на членския внос SendCardByMail=Изпращане на карта по имейл -AddMember=Добавяне на член +AddMember=Create member NoTypeDefinedGoToSetup=Не са зададени типове членове. Отидете на менюто "Типове членове" NewMemberType=Нов тип член WelcomeEMail=E-mail за приветствие @@ -125,7 +125,7 @@ Date=Дата DateAndTime=Дата и час PublicMemberCard=Публична карта на член MemberNotOrNoMoreExpectedToSubscribe=-Членка не може или не повече очаква да се абонирате -AddSubscription=Добавяне на чл. внос +AddSubscription=Create subscription ShowSubscription=Покажи чл. внос MemberModifiedInDolibarr=Члена е променен в Dolibarr SendAnEMailToMember=Изпращане на информационен имейл до член @@ -203,3 +203,4 @@ MembersByNature=Members by nature VATToUseForSubscriptions=VAT rate to use for subscriptions NoVatOnSubscription=No TVA for subscriptions MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang index 1fdf4f81644..4d6d702069e 100644 --- a/htdocs/langs/bg_BG/products.lang +++ b/htdocs/langs/bg_BG/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Ако продуктът е услуга с ограни MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Категории цени -AssociatedProductsAbility=Активиране на виртуалните продукти да се отличават -AssociatedProducts=Виртуален продукт -AssociatedProductsNumber=Брой на продуктите, съставящи този виртуален продукт -ParentProductsNumber=Брой на основния виртуален продукт -IfZeroItIsNotAVirtualProduct=Ако е 0, този продукт не е виртуален продукт -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Асоцииране Translation=Превод KeywordFilter=Филтър по ключова дума @@ -132,7 +132,7 @@ AddDel=Добавяне/Изтриване Quantity=Количество NoMatchFound=Не са намерени съвпадения ProductAssociationList=Списък на продукти / услуги, свързани с: име на продукта / услугата (количество засегнати) -ProductParentList=Списък на продукти / услуги с този продукт като компонент +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Един от избрания продукт е родител с настоящия продукт DeleteProduct=Изтриване на продукта/услугата ConfirmDeleteProduct=Сигурни ли сте, че желаете да изтриете този продукт/услуга? @@ -179,7 +179,7 @@ CloneProduct=Клониране на продукт или услуга ConfirmCloneProduct=Сигурни ли сте, че желаете да клонирате продукта или услугата %s?? CloneContentProduct=Клониране на всички основни данни за продукта/услугата ClonePricesProduct=Клониране на основните данни и цени -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Този продукт е използван NewRefForClone=Реф. на нов продукт/услуга CustomerPrices=Цени за клиенти @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang index 95d094a6934..0b34f372aab 100644 --- a/htdocs/langs/bg_BG/projects.lang +++ b/htdocs/langs/bg_BG/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Този възглед представя всички проекти Myprojects=Моите проекти ProjectsArea=Проекти област NewProject=Нов проект -AddProject=Добави проект +AddProject=Create project DeleteAProject=Изтриване на проект DeleteATask=Изтриване на задача ConfirmDeleteAProject=Сигурен ли сте, че искате да изтриете този проект? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Времето, прекарано на MyTimeSpent=Времето, прекарано MyTasks=Моите задачи @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Нова задача -AddTask=Добавяне на задача +AddTask=Create task AddDuration=Добави продължителността Activity=Дейност Activities=Задачите / дейностите @@ -120,7 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element -UnlinkElement=Unlink element +UnlinkElement=Прекъсни връзката към елемента # Documents models DocumentModelBaleine=Доклад за цялостния проект модел (logo. ..) PlannedWorkload = Planned workload @@ -129,4 +131,4 @@ ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects -FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето diff --git a/htdocs/langs/bg_BG/resource.lang b/htdocs/langs/bg_BG/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/bg_BG/resource.lang +++ b/htdocs/langs/bg_BG/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang index cf10ed07746..cb289ea4725 100644 --- a/htdocs/langs/bg_BG/withdrawals.lang +++ b/htdocs/langs/bg_BG/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Кредит за WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Покажи Теглене IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Въпреки това, ако фактурата не е все още най-малко една оттегляне плащане обработват, не се определя като плаща, за да се даде възможност да управляват оттеглянето им преди. -DoStandingOrdersBeforePayments=Това разделите ви позволява да изисквате за постоянно нареждане. След като той ще бъде завършен, можете да въведете плащането, за да затворите фактура. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Плащане на постоянно нареждане %s от банката diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang index 39c2732ec29..954d9c60650 100644 --- a/htdocs/langs/bs_BA/accountancy.lang +++ b/htdocs/langs/bs_BA/accountancy.lang @@ -1,7 +1,7 @@ # Dolibarr language file - en_US - Accounting Expert CHARSET=UTF-8 -Accounting=Accounting +Accounting=Računovodstvo Globalparameters=Global parameters Chartofaccounts=Chart of accounts Fiscalyear=Fiscal years diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang index 8e1c91270ef..19cb28c82fd 100644 --- a/htdocs/langs/bs_BA/admin.lang +++ b/htdocs/langs/bs_BA/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Dodaj opciju filter za prikazivanje/sakrivanje trećih stranaka koji su trenutno u aktivnosti ili su prestali UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s ViewFullDateActions=Show full dates events in the third sheet @@ -208,6 +210,7 @@ ModulesJobDesc=Poslovni moduli pružaju jednostavane unparijed postavljenje post ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Link BoxesAvailable=Boxes available @@ -444,7 +447,7 @@ Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmark management -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Upravljanje workflow-om - tokom rada Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales @@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print preko Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Postavke snimljene BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang index 5059966f54a..1b80e817bee 100644 --- a/htdocs/langs/bs_BA/agenda.lang +++ b/htdocs/langs/bs_BA/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Događaji dodijeljeni korisniku ActionsDoneBy=Događaji završeni od strane korisnika ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Svi moji događaji/zadaci AllActions= Svi događaji/zadaci ViewList=Lista diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang index 98aa9a4e395..3cb7124de3a 100644 --- a/htdocs/langs/bs_BA/compta.lang +++ b/htdocs/langs/bs_BA/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/bs_BA/contracts.lang b/htdocs/langs/bs_BA/contracts.lang index 272cd202ef8..4952376c86c 100644 --- a/htdocs/langs/bs_BA/contracts.lang +++ b/htdocs/langs/bs_BA/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista stavki aktivnih ugovora ListOfRunningServices=Lista aktivnih usluga NotActivatedServices=Nekativne usluge (među potvrđenim ugovorima) BoardNotActivatedServices=Usluge za aktiviranje među potvrđenim ugovorima -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Zadnjih $s aktiviranih usluga LastModifiedServices=Zadnjih %s izmijenjenih usluga EditServiceLine=Izmijeni stavku usluge @@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista usluga pred isticanje NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Predstavnik prodaje koji potpisuje ugovor diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang index a2c8ec77de2..53f8d168a55 100644 --- a/htdocs/langs/bs_BA/errors.lang +++ b/htdocs/langs/bs_BA/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang index 9246a04ced9..40bca8e85fb 100644 --- a/htdocs/langs/bs_BA/members.lang +++ b/htdocs/langs/bs_BA/members.lang @@ -1,204 +1,206 @@ # Dolibarr language file - Source file is en_US - members -# MembersArea=Members area -# PublicMembersArea=Public members area -# MemberCard=Member card -# SubscriptionCard=Subscription card -# Member=Member -# Members=Members -# MemberAccount=Member login -# ShowMember=Show member card -# UserNotLinkedToMember=User not linked to a member -# ThirdpartyNotLinkedToMember=Third-party not linked to a member -# MembersTickets=Members Tickets -# FundationMembers=Foundation members -# Attributs=Attributes -# ErrorMemberTypeNotDefined=Member type not defined -# ListOfPublicMembers=List of public members -# ListOfValidatedPublicMembers=List of validated public members -# ErrorThisMemberIsNotPublic=This member is not public -# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). -# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. -# ThisIsContentOfYourCard=This is details of your card -# CardContent=Content of your member card -# SetLinkToUser=Link to a Dolibarr user -# SetLinkToThirdParty=Link to a Dolibarr third party -# MembersCards=Members business cards -# MembersList=List of members -# MembersListToValid=List of draft members (to be validated) -# MembersListValid=List of valid members -# MembersListUpToDate=List of valid members with up to date subscription -# MembersListNotUpToDate=List of valid members with subscription out of date -# MembersListResiliated=List of resiliated members -# MembersListQualified=List of qualified members -# MenuMembersToValidate=Draft members -# MenuMembersValidated=Validated members -# MenuMembersUpToDate=Up to date members -# MenuMembersNotUpToDate=Out of date members -# MenuMembersResiliated=Resiliated members -# MembersWithSubscriptionToReceive=Members with subscription to receive -# DateAbonment=Subscription date -# DateSubscription=Subscription date -# DateNextSubscription=Next subscription -# DateEndSubscription=Subscription end date -# EndSubscription=End subscription -# SubscriptionId=Subscription id -# MemberId=Member id -# NewMember=New member -# NewType=New member type -# MemberType=Member type -# MemberTypeId=Member type id -# MemberTypeLabel=Member type label -# MembersTypes=Members types -# MembersAttributes=Members attributes -# SearchAMember=Search a member -# MemberStatusDraft=Draft (needs to be validated) -# MemberStatusDraftShort=Draft -# MemberStatusActive=Validated (waiting subscription) -# MemberStatusActiveShort=Validated -# MemberStatusActiveLate=subscription expired -# MemberStatusActiveLateShort=Expired -# MemberStatusPaid=Subscription up to date -# MemberStatusPaidShort=Up to date -# MemberStatusResiliated=Resiliated member -# MemberStatusResiliatedShort=Resiliated -# MembersStatusToValid=Draft members -# MembersStatusToValidShort=Draft members -# MembersStatusValidated=Validated members -# MembersStatusPaid=Subscription up to date -# MembersStatusPaidShort=Up to date -# MembersStatusNotPaid=Subscription out of date -# MembersStatusNotPaidShort=Out of date -# MembersStatusResiliated=Resiliated members -# MembersStatusResiliatedShort=Resiliated members -# NewCotisation=New contribution -# PaymentSubscription=New contribution payment -# EditMember=Edit member -# SubscriptionEndDate=Subscription's end date -# MembersTypeSetup=Members type setup -# NewSubscription=New subscription -# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. -# Subscription=Subscription -# Subscriptions=Subscriptions -# SubscriptionLate=Late -# SubscriptionNotReceived=Subscription never received -# SubscriptionLateShort=Late -# SubscriptionNotReceivedShort=Never received -# ListOfSubscriptions=List of subscriptions -# SendCardByMail=Send card by Email -# AddMember=Add member -# MemberType=Member type -# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" -# NewMemberType=New member type -# WelcomeEMail=Welcome e-mail -# SubscriptionRequired=Subscription required -# EditType=Edit member type -# DeleteType=Delete -# VoteAllowed=Vote allowed -# Physical=Physical -# Moral=Moral -# MorPhy=Moral/Physical -# Reenable=Reenable -# ResiliateMember=Resiliate a member -# ConfirmResiliateMember=Are you sure you want to resiliate this member ? -# DeleteMember=Delete a member -# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? -# DeleteSubscription=Delete a subscription -# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? -# Filehtpasswd=htpasswd file -# ValidateMember=Validate a member -# ConfirmValidateMember=Are you sure you want to validate this member ? -# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. -# PublicMemberList=Public member list -# BlankSubscriptionForm=Public auto-subscription form -# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. -# EnablePublicSubscriptionForm=Enable the public auto-subscription form -# MemberPublicLinks=Public links/pages -# ExportDataset_member_1=Members and subscriptions -# ImportDataset_member_1=Members -# LastMembers=Last %s members -# LastMembersModified=Last %s modified members -# LastSubscriptionsModified=Last %s modified subscriptions -# AttributeName=Attribute name -# String=String -# Text=Text -# Int=Int -# Date=Date -# DateAndTime=Date and time -# PublicMemberCard=Member public card -# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -# AddSubscription=Add subscription -# ShowSubscription=Show subscription -# MemberModifiedInDolibarr=Member modified in Dolibarr -# SendAnEMailToMember=Send information email to member -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription -# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription -# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation -# DescADHERENT_MAIL_VALID=EMail for member validation -# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription -# DescADHERENT_MAIL_COTIS=EMail for subscription -# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation -# DescADHERENT_MAIL_RESIL=EMail for member resiliation -# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails -# DescADHERENT_ETIQUETTE_TYPE=Format of labels page -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets -# DescADHERENT_CARD_TYPE=Format of cards page -# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards -# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) -# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) -# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards -# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here -# MayBeOverwrited=This text can be overwrited by value defined for member's type -# ShowTypeCard=Show type '%s' -# HTPasswordExport=htpassword file generation -# NoThirdPartyAssociatedToMember=No third party associated to this member -# ThirdPartyDolibarr=Dolibarr third party -# MembersAndSubscriptions= Members and Subscriptions -# MoreActions=Complementary action on recording -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription -# MoreActionBankDirect=Create a direct transaction record on account -# MoreActionBankViaInvoice=Create an invoice and payment on account -# MoreActionInvoiceOnly=Create an invoice with no payment -# LinkToGeneratedPages=Generate visit cards -# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. -# DocForAllMembersCards=Generate business cards for all members -# DocForOneMemberCards=Generate business cards for a particular member -# DocForLabels=Generate address sheets -# SubscriptionPayment=Subscription payment -# LastSubscriptionDate=Last subscription date -# LastSubscriptionAmount=Last subscription amount -# MembersStatisticsByCountries=Members statistics by country -# MembersStatisticsByState=Members statistics by state/province -# MembersStatisticsByTown=Members statistics by town -# NbOfMembers=Number of members -# NoValidatedMemberYet=No validated members found -# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. -# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. -# MembersByTownDesc=This screen show you statistics on members by town. -# MembersStatisticsDesc=Choose statistics you want to read... -# MenuMembersStats=Statistics -# LastMemberDate=Last member date -# Nature=Nature -# Public=Information are public -# Exports=Exports -# NewMemberbyWeb=New member added. Awaiting approval -# NewMemberForm=New member form -# SubscriptionsStatistics=Statistics on subscriptions -# NbOfSubscriptions=Number of subscriptions -# AmountOfSubscriptions=Amount of subscriptions -# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) -# DefaultAmount=Default amount of subscription -# CanEditAmount=Visitor can choose/edit amount of its subscription -# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page -# Associations=Foundations -# Collectivités=Organizations -# Particuliers=Personal -# Entreprises=Companies -# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member +Members=Members +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions +ImportDataset_member_1=Members +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang index 42620a9f0e4..90ab1fa6e30 100644 --- a/htdocs/langs/bs_BA/products.lang +++ b/htdocs/langs/bs_BA/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang index 95c53abeecf..465c2e15488 100644 --- a/htdocs/langs/bs_BA/projects.lang +++ b/htdocs/langs/bs_BA/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših koris Myprojects=Moji projekti ProjectsArea=Područje za projekte NewProject=Novi projekat -AddProject=Dodaj projekat +AddProject=Create project DeleteAProject=Obisati projekat DeleteATask=Obrisati zadatak ConfirmDeleteAProject=Jeste li sigurni da želite obrisati ovaj projekt? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Nova provedeno vrijeme MyTimeSpent=Moje provedeno vrijeme MyTasks=Moji zadaci @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Novi zadatak -AddTask=Dodaj zadatak +AddTask=Create task AddDuration=Dodaj trajanje Activity=Aktivnost Activities=Zadaci/aktivnosti diff --git a/htdocs/langs/bs_BA/resource.lang b/htdocs/langs/bs_BA/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/bs_BA/resource.lang +++ b/htdocs/langs/bs_BA/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang index bbc20358aeb..e4e4dce6e69 100644 --- a/htdocs/langs/bs_BA/withdrawals.lang +++ b/htdocs/langs/bs_BA/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=Ova kartica vam omogućava da zatražite trajni nalog. Kada je potpuna, možete izvršiti plaćanje za zatvaranje računa. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Plaćanje trajnog naloga %s od strane banke diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 262ca3919fc..739cd6fb23b 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Afegir un filtre en la recerca per mostrar/ocultar els tercers en actiu o que hagin deixat d'exercir UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Opcions filtres de cerca NumberOfKeyToSearch=Nombre de caràcters per a desencadenar la cerca: %s ViewFullDateActions=Veure les dades de les accions en la seva totalitat en la fitxa de tercer @@ -208,6 +210,7 @@ ModulesJobDesc=Els mòduls específics permeten una preconfiguració simplificad ModulesMarketPlaceDesc=Hi ha disponbiles per a baixar en llocs externs d'Internet altres mòduls / extensions... ModulesMarketPlaces=Més mòduls... DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Llocs proveïdors a consultar per trobar més mòduls URL=Enllaç BoxesAvailable=Panells disponibles @@ -444,7 +447,7 @@ Module55Desc=Gestió dels codis de barra Module56Name=Telefonia Module56Desc=Gestió de la telefonia Module57Name=Domiciliacions -Module57Desc=Gestió de domiciliacions i reintegraments bancaris +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integració amb ClickToDial Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=Fils RSS Module320Desc=Addició de fils d'informació RSS en les pantalles Dolibarr Module330Name=Bookmarks Module330Desc=Gestió de bookmarks -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Interface amb el calendari webcalendar Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Categories Module1780Desc=Gestió de categories (productes, proveïdors i clients) Module2000Name=Editor WYSIWYG Module2000Desc=Permet l'edició de certes zones de text mitjançant un editor avançat +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Gestor de tasques programades Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Gestió Electrònica de Documents Module2500Desc=Permet administrar una base de documents Module2600Name=WebServices Module2600Desc=Activa els serveis de servidor web services de Dolibarr +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Utilitza el servei en línia de Gravatar (www.gravatar.com) per mostrar fotos dels usuaris/membres (que es troben en els seus missatges de correu electrònic). Necessita un accés a Internet Module2800Desc=Client FTP @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paybox Module50100Name=TPV @@ -527,7 +534,7 @@ Module50200Desc=Mòdul per a proporcionar un pagament en línia amb targeta de c Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Márgenes @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Configuració desada BackToModuleList=Retornar llista de mòduls BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra DefaultLanguage=Idioma per defecte a utilitzar (codi d'idioma) EnableMultilangInterface=Activar interface multiidioma EnableShowLogo=Mostra el logotip en el menú de l'esquerra +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=El seu sistema està actualitzat CompanyInfo=Informació de l'empresa/institució CompanyIds=Identificació reglamentaria diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang index c66562e7c11..a9c55c4f272 100644 --- a/htdocs/langs/ca_ES/agenda.lang +++ b/htdocs/langs/ca_ES/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Esdeveniments assignats a ActionsDoneBy=Esdeveniments realitzats per ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Tots els meus esdeveniments/tasques AllActions= Tots els esdeveniments/tasques ViewList=Vista llistat diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang index fc6efa906e0..098a65b11f5 100644 --- a/htdocs/langs/ca_ES/compta.lang +++ b/htdocs/langs/ca_ES/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=segons el proveïdor, triar el mètode adequat per a TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode comptabilitat de caixa no és rellevant. Aquest informe només està disponible quan s'utilitza el mode compromís comptable(consulteu la configuració del mòdul de comptabilitat). CalculationMode=Mode de càlcul AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang index bd31f48ce5d..be202d8b593 100644 --- a/htdocs/langs/ca_ES/contracts.lang +++ b/htdocs/langs/ca_ES/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Llistat de línies de contractes en servei ListOfRunningServices=Llistat de serveis actius NotActivatedServices=Serveis no activats (amb els contractes validats) BoardNotActivatedServices=Serveis a activar amb els contractes validats -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Els %s darrers serveis activats LastModifiedServices=Els %s darrers serveis modificats EditServiceLine=Edició línia del servei @@ -91,6 +91,7 @@ ListOfServicesToExpire=Llistat de serveis actius a expirar NoteListOfYourExpiredServices=Aquest llistat conté només els serveis de contractes de tercers dels que vostè és comercial StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Comercial signant del contracte diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang index 61148a83890..d841687a0c3 100644 --- a/htdocs/langs/ca_ES/errors.lang +++ b/htdocs/langs/ca_ES/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Codi proveïdor obligatori ErrorSupplierCodeAlreadyUsed=Codi de proveïdor ja utilitzat ErrorBadParameters=Paràmetres incorrectes ErrorBadValueForParameter=Valor '%s' incorrecte per al paràmetre '%s' -ErrorBadImageFormat=La imatge no té un format reconegut +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=El valor '%s' té un format de data no reconegut ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=No es pot escriure a la carpeta %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=El compte d'usuari de %s no s'ha trobat. ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar. ErrorBadValueForCode=Valor no vàlid per al codi. Torneu a intentar-ho amb un nou valor ... ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=El compte d'execució del servidor web %s no disposa dels permisos per això ErrorNoActivatedBarcode=No hi ha activat cap tipus de codi de barres ErrUnzipFails=No s'ha pogut descomprimir el fitxer %s amb ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang index c09107519fd..6a164471ba2 100644 --- a/htdocs/langs/ca_ES/members.lang +++ b/htdocs/langs/ca_ES/members.lang @@ -8,7 +8,7 @@ Members=Membres MemberAccount=Login membre ShowMember=Mostrar fitxa membre UserNotLinkedToMember=Usuari no vinculat a un membre -# ThirdpartyNotLinkedToMember=Third-party not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=Etiquetes membres FundationMembers=Membres de l'associació Attributs=Atributs @@ -85,8 +85,7 @@ SubscriptionLateShort=En retard SubscriptionNotReceivedShort=No rebuda ListOfSubscriptions=Llista d'afiliacions SendCardByMail=Enviar fitxa per e-mail -AddMember=Afegir membre -MemberType=Tipus de membre +AddMember=Create member NoTypeDefinedGoToSetup=Cap tipus de membre definit. Aneu a Configuració->Tipus de membres NewMemberType=Nou tipus de membre WelcomeEMail=E-mail @@ -126,7 +125,7 @@ Date=Data DateAndTime=Data i hora PublicMemberCard=Fitxa pública membre MemberNotOrNoMoreExpectedToSubscribe=No sotmesa a cotització -AddSubscription=Afegir afiliació +AddSubscription=Create subscription ShowSubscription=Mostrar afiliació MemberModifiedInDolibarr=Membre modificat en Dolibarr SendAnEMailToMember=Enviar e-mail d'informació al membre (E-mail: %s) @@ -171,6 +170,8 @@ LastSubscriptionAmount=Import de l'última cotització MembersStatisticsByCountries=Estadístiques de membres per país MembersStatisticsByState=Estadístiques de membres per població MembersStatisticsByTown=Estadístiques de membres per població +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=Nombre de membres NoValidatedMemberYet=Cap membre validat trobat MembersByCountryDesc=Aquesta pantalla presenta una estadística del nombre de membres per país. No obstant això, el gràfic utilitza el servei en línia de gràfics de Google i només és operatiu quan es troba disponible una connexió a Internet. @@ -202,3 +203,4 @@ MembersByNature=Membres per naturalesa VATToUseForSubscriptions=Taxa d'IVA per les afiliacions NoVatOnSubscription=Sense IVA per a les afiliacions MEMBER_PAYONLINE_SENDEMAIL=E-Mail per advertir en cas de recepció de confirmació d'un pagament validat d'una afiliació +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/ca_ES/printipp.lang b/htdocs/langs/ca_ES/printipp.lang index da015f80205..835e6827f12 100644 --- a/htdocs/langs/ca_ES/printipp.lang +++ b/htdocs/langs/ca_ES/printipp.lang @@ -1,9 +1,14 @@ # Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Configuració del mòdul Impressió directa IPP -PrintIPPDesc=Aquest mòdul permet afegir un botó d'impressió directa dels seus documents cap a la seva impressora. Es requereix un sistema Linux equipat amb Cups. -PRINTIPP_ENABLED=Mostra el logo "Impressió directa" en els llistats de documents -PRINTIPP_HOST=Servidor d'impressió +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server PRINTIPP_PORT=Port PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Contrasenya -NoPrinterFound=No s'ha trobat cap impressora (comprovi la seva configuració Cups) \ No newline at end of file +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang index e15f7808bb4..e8b8b6b5053 100644 --- a/htdocs/langs/ca_ES/products.lang +++ b/htdocs/langs/ca_ES/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Si el servei és de durada limitada: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Nº de preus MultiPriceLevelsName=Categoria de preus -AssociatedProductsAbility=Activar productes compostos -AssociatedProducts=Productes compostos -AssociatedProductsNumber=Nº de productes que composen aquest producte -ParentProductsNumber=Nº de productes que aquest producte compon -IfZeroItIsNotAVirtualProduct=Si 0, aquest producte no és un producte virtual -IfZeroItIsNotUsedByVirtualProduct=Si 0, aquest producte no està sent utilitzat per cap producte virtual +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Compondre Translation=Traducció KeywordFilter=Filtre per clau @@ -132,7 +132,7 @@ AddDel=Adjuntar/Retirar Quantity=Quantitat NoMatchFound=No s'han trobat resultats ProductAssociationList=Llistat de productes/serveis components d'aquest producte: el nombre entre parèntesis és la quantitat afectada en aquesta composició -ProductParentList=Llistat de productes/serveis amb aquest producte com a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Un dels productes seleccionats és pare del producte en curs DeleteProduct=Eliminar un producte/servei ConfirmDeleteProduct=Esteu segur de voler eliminar aquest producte/servei? @@ -179,7 +179,7 @@ CloneProduct=Clonar producte/servei ConfirmCloneProduct=Esteu segur de voler clonar el producte o servei %s ? CloneContentProduct=Clonar només la informació general del producte/servei ClonePricesProduct=Clonar la informació general i els preus -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Aquest producte és utilitzat NewRefForClone=Ref. del nou producte/servei CustomerPrices=Preus clients @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang index 8caccc50f04..49d18cb3d36 100644 --- a/htdocs/langs/ca_ES/projects.lang +++ b/htdocs/langs/ca_ES/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritza Myprojects=Els meus projectes ProjectsArea=Àrea projectes NewProject=Nou projecte -AddProject=Crear projecte +AddProject=Create project DeleteAProject=Eliminar un projecte DeleteATask=Eliminar una tasca ConfirmDeleteAProject=Esteu segur de voler eliminar aquest projecte? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Nou temps dedicat MyTimeSpent=El meu temps dedicat MyTasks=Les meves tasques @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Nova tasca -AddTask=Afegir tasca +AddTask=Create task AddDuration=Indicar durada Activity=Activitat Activities=Tasques/activitats diff --git a/htdocs/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/ca_ES/resource.lang +++ b/htdocs/langs/ca_ES/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang index bf3bbac2ebb..9a4eef3a705 100644 --- a/htdocs/langs/ca_ES/withdrawals.lang +++ b/htdocs/langs/ca_ES/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Abonada el WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Veure domiciliació IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No obstant això, si la factura té pendent algun pagament per domiciliació, no serà tancada per a permetre la gestió de la domiciliació. -DoStandingOrdersBeforePayments=Aquesta pestanya us permet realitzar una petició de domiciliació. Un cop, podeu ingressar el pagament a la factura per procedir al seu tancament. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Arxiu de la domiciliació SetToStatusSent=Classificar com "Arxiu enviat" ThisWillAlsoAddPaymentOnInvoice=Es crearan els pagaments de les factures i les classificarà com pagades +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Abonament de domiciliació %s pel banc diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index bcbc227a151..e4a6da486cf 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Přidat možnost filtru pro zobrazení / skrytí třetích stran, které jsou v současné době v činnosti nebo ji ukončili UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Nastavení vyhledávání NumberOfKeyToSearch=Počet charakterů nutných k spuštění hledání: %s ViewFullDateActions=Zobrazit rozšířené datumy události v třetím listu @@ -208,6 +210,7 @@ ModulesJobDesc=Obchodní moduly poskytují jednoduché nastavení systému Dolib ModulesMarketPlaceDesc=Více modulů naleznete ke stažení na externích webových stránkách ... ModulesMarketPlaces=Více modulů ... DoliStoreDesc=DoliStore, oficiální trh pro download externích modulů Dolibarr ERP / CRM +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Weboví poskytovatelé Dolibarr modulů ... URL=Odkaz BoxesAvailable=Boxy jsou k dispozici @@ -444,7 +447,7 @@ Module55Desc=Barcode řízení Module56Name=Telefonie Module56Desc=Telefonie integrace Module57Name=Trvalé příkazy -Module57Desc=Trvalé příkazy a abstinenční řízení +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integrace ClickToDial systému (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Přidat RSS kanál uvnitř obrazovek Dolibarr Module330Name=Záložky Module330Desc=Správa záložek -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=WebCalendar Module410Desc=WebCalendar integrace Module500Name=Zvláštní náklady (daně, sociální příspěvky a dividendy) @@ -495,6 +498,8 @@ Module1780Name=Kategorie Module1780Desc=Category management (produkty, dodavatelé a odběratelé) Module2000Name=WYSIWYG editor Module2000Desc=Nechte upravit některé textové pole pomocí pokročilého editoru +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Plánované správu úloh Module2400Name=Pořad jednání @@ -503,6 +508,8 @@ Module2500Name=Elektronický Redakční Module2500Desc=Uložit a sdílet dokumenty Module2600Name=WebServices Module2600Desc=Povolit Dolibarr webových služeb serveru +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Pomocí on-line služby (Gravatar www.gravatar.com) ukázat fotku uživatelů / členů (nalezen s jejich e-maily). Potřebujete přístup k internetu Module2800Desc=FTP klient @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paybox Module50100Name=Bod prodeje @@ -527,7 +534,7 @@ Module50200Desc=Modul nabídnout on-line platby kreditní kartou stránku s Payp Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Tisk přes poháry tiskárny IPP. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Okraje @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Nastavení uloženo BackToModuleList=Zpět na seznam modulů BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanentní vyhledávací formulář na levém menu DefaultLanguage=Výchozí jazyk používat (kód jazyka) EnableMultilangInterface=Povolit vícejazyčné rozhraní EnableShowLogo=Zobrazit logo na levém menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Systém byl úspěšně aktualizován CompanyInfo=Společnosti / Nadace informace CompanyIds=Společnost / nadace identity diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang index 08e0a334726..06b4b7d4a32 100644 --- a/htdocs/langs/cs_CZ/agenda.lang +++ b/htdocs/langs/cs_CZ/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Akce přiřazené ActionsDoneBy=Akce provedené ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Všechny mé akce / úkoly AllActions= Všechny události / úkoly ViewList=Zobrazení seznamu diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang index 84074b96401..aa187c9880e 100644 --- a/htdocs/langs/cs_CZ/compta.lang +++ b/htdocs/langs/cs_CZ/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=podle dodavatele zvolit vhodnou metodu použít stej TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat zpráva za zboží, při použití hotovosti evidence režim není relevantní. Tato zpráva je k dispozici pouze při použití zásnubní evidence režimu (viz nastavení účetního modulu). CalculationMode=Výpočet režim AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/cs_CZ/contracts.lang b/htdocs/langs/cs_CZ/contracts.lang index e8a6754c08e..792ed511937 100644 --- a/htdocs/langs/cs_CZ/contracts.lang +++ b/htdocs/langs/cs_CZ/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Seznam běžících smluv linek ListOfRunningServices=Seznam spuštěných služeb NotActivatedServices=Neaktivní služby (u ověřených smluv) BoardNotActivatedServices=Služby pro aktivaci u ověřených smluv -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Poslední %s aktivaci služby LastModifiedServices=Poslední %s upravené služby EditServiceLine=Upravit linka @@ -91,6 +91,7 @@ ListOfServicesToExpire=Seznam služeb vyprší NoteListOfYourExpiredServices=Tento seznam obsahuje pouze služby smluv pro třetí strany si jsou propojeny jako obchodního zástupce. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Obchodní zástupce podpisu smlouvy diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang index 54a9f2bcc25..57331cb59c0 100644 --- a/htdocs/langs/cs_CZ/errors.lang +++ b/htdocs/langs/cs_CZ/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Dodavatel povinen kód ErrorSupplierCodeAlreadyUsed=Dodavatel kód již používán ErrorBadParameters=Bad parametry ErrorBadValueForParameter=Chybná hodnota "%s" pro nastavení parametrů nesprávných "%s" -ErrorBadImageFormat=Obrazový soubor nemá podporovaný formát +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Hodnota "%s" má nesprávný formát data ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Nepodařilo se zapsat do adresáře %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Uživatel s přihlášením %s nebyl nalezen. ErrorLoginHasNoEmail=Tento uživatel nemá žádnou e-mailovou adresu. Proces přerušena. ErrorBadValueForCode=Bad hodnota bezpečnostního kódu. Zkuste to znovu s novou hodnotou ... ErrorBothFieldCantBeNegative=Pole %s a %s nemohou být negativní +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Uživatelský účet %s použít ke spuštění webový server nemá oprávnění pro které ErrorNoActivatedBarcode=Žádný čárový kód aktivován typ ErrUnzipFails=Nepodařilo se rozbalit %s s ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang index f7f6fde39a5..d2f00c116d8 100644 --- a/htdocs/langs/cs_CZ/members.lang +++ b/htdocs/langs/cs_CZ/members.lang @@ -8,7 +8,7 @@ Members=Členové MemberAccount=Vstup pro členy ShowMember=Zobrazit členskou kartu UserNotLinkedToMember=Uživatel není spojena s členem -# ThirdpartyNotLinkedToMember=Third-party not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=Členové Vstupenky FundationMembers=Členy Nadace Attributs=Atributy @@ -85,8 +85,7 @@ SubscriptionLateShort=Pozdě SubscriptionNotReceivedShort=Nikdy nedostal ListOfSubscriptions=Seznam předplatné SendCardByMail=Poslat kartu e-mailem -AddMember=Přidat člena -MemberType=Členské typ +AddMember=Create member NoTypeDefinedGoToSetup=Žádný člen definovány typy. Jdi na menu "Členové typy" NewMemberType=Nový člen typu WelcomeEMail=Vítejte e-mail @@ -126,7 +125,7 @@ Date=Datum DateAndTime=Datum a čas PublicMemberCard=Členské veřejné karta MemberNotOrNoMoreExpectedToSubscribe=Člen, který nebo ne více očekává, že k odběru -AddSubscription=Přidat předplatné +AddSubscription=Create subscription ShowSubscription=Zobrazit předplatné MemberModifiedInDolibarr=Člen upraven v Dolibarr SendAnEMailToMember=Poslat e-mail Informace o členovi @@ -171,6 +170,8 @@ LastSubscriptionAmount=Poslední úpisu MembersStatisticsByCountries=Členové Statistiky podle země MembersStatisticsByState=Členové statistika stát / provincie MembersStatisticsByTown=Členové statistika podle města +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=Počet členů NoValidatedMemberYet=Žádné ověřené členy nalezeno MembersByCountryDesc=Tato obrazovka vám ukáže statistiku členů jednotlivých zemích. Grafika však závisí na Google on-line služby grafu a je k dispozici pouze v případě, je připojení k internetu funguje. @@ -202,3 +203,4 @@ MembersByNature=Členové od přírody VATToUseForSubscriptions=Sazba DPH se má použít pro předplatné NoVatOnSubscription=Ne TVA za upsaný vlastní kapitál MEMBER_PAYONLINE_SENDEMAIL=E-mail upozornit při Dolibarr obdržíte potvrzení o ověřenou platby za předplatné +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/cs_CZ/printipp.lang b/htdocs/langs/cs_CZ/printipp.lang index 7ef2cd5649d..835e6827f12 100644 --- a/htdocs/langs/cs_CZ/printipp.lang +++ b/htdocs/langs/cs_CZ/printipp.lang @@ -1,18 +1,14 @@ -/* - * Language code: cs_CZ - * Automatic generated via autotranslator.php tool - * Generation date 2013-10-26 11:58:10 - */ - - -// START - Lines generated via autotranslator.php tool (2013-10-26 11:58:10). -// Reference language: en_US -> cs_CZ -PrintIPPSetup=Nastavení modulu Přímý tisk -PrintIPPDesc=Ce modul Permet d'un ajouter Bouton d'dojem přímé des dokumenty vers votre imprimante. Il requiert un systeme Linux Equipe de poháry. -PRINTIPP_ENABLED=Zobrazit Piktogram "Přímý tisk" do seznamu dokumentů -PRINTIPP_HOST=Tiskový server -PRINTIPP_PORT=Přístav -PRINTIPP_USER=Přihlášení -PRINTIPP_PASSWORD=Heslo -NoPrinterFound=Žádné tiskárny nalezeny (zkontrolujte poháry Nasta) -// STOP - Lines generated via autotranslator.php tool (2013-10-26 12:39:36). +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang index 7829116108a..43becba423e 100644 --- a/htdocs/langs/cs_CZ/products.lang +++ b/htdocs/langs/cs_CZ/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Je-li výrobek je služba s omezeným trváním: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Počet cen MultiPriceLevelsName=Cenová kategorie -AssociatedProductsAbility=Aktivace virtuální produkty se vyznačují -AssociatedProducts=Virtuální produkt -AssociatedProductsNumber=Počet výrobků tvořících tento virtuální produkt -ParentProductsNumber=Počet mateřské virtuální produkt -IfZeroItIsNotAVirtualProduct=Pokud je 0, tento produkt není virtuální produkt -IfZeroItIsNotUsedByVirtualProduct=Je-li 0, je tento výrobek není používán žádným virtuální produkt +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Asociovat Translation=Překlad KeywordFilter=Klíčové slovo filtr @@ -132,7 +132,7 @@ AddDel=Přidat / Smazat Quantity=Množství NoMatchFound=Ne nalezena shoda ProductAssociationList=Seznam souvisejících produktů / služeb: název produktu / služby (množství ovlivněny) -ProductParentList=Seznam virtuálních produktů / služeb s tímto produktem jako součást +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Jedním z vybraného produktu je rodič s aktuální produkt DeleteProduct=Odstranění produktu / služby ConfirmDeleteProduct=Jste si jisti, že chcete smazat tento výrobek / službu? @@ -179,7 +179,7 @@ CloneProduct=Clone produkt nebo službu ConfirmCloneProduct=Jste si jisti, že chcete klonovat produktů nebo služeb %s? CloneContentProduct=Klon všechny hlavní informace o produktu / služby ClonePricesProduct=Klonovat hlavní informace a ceny -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Tento produkt se používá NewRefForClone=Ref. nového produktu / služby CustomerPrices=Prodejní ceny @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang index 52d88d6a4dd..434b6b86f3d 100644 --- a/htdocs/langs/cs_CZ/projects.lang +++ b/htdocs/langs/cs_CZ/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské Myprojects=Moje projekty ProjectsArea=Projekty NewProject=Nový projekt -AddProject=Přidat projekt +AddProject=Create project DeleteAProject=Odstranit projekt DeleteATask=Odstranit úkol ConfirmDeleteAProject=Jste si jisti, že chcete smazat tento projekt? @@ -36,6 +36,8 @@ TaskTimeSpent=Čas strávený na úkolech TaskTimeUser=Uživatel TaskTimeNote=Poznámka TaskTimeDate=Datum +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Nový strávený čas MyTimeSpent=Můj strávený čas MyTasks=Moje úkoly @@ -45,7 +47,7 @@ TaskDateStart=Datum zahájení úkolu TaskDateEnd=Datum ukončení úkolu TaskDescription=Popis úkolu NewTask=Nový úkol -AddTask=Přidat úkol +AddTask=Create task AddDuration=Přidat trvání Activity=Činnost Activities=Úkoly / činnosti diff --git a/htdocs/langs/cs_CZ/resource.lang b/htdocs/langs/cs_CZ/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/cs_CZ/resource.lang +++ b/htdocs/langs/cs_CZ/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang index 086bf5db2b5..09545ace787 100644 --- a/htdocs/langs/cs_CZ/withdrawals.lang +++ b/htdocs/langs/cs_CZ/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Kredit na WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Zobrazit Natáhněte IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Odstoupení soubor SetToStatusSent=Nastavte na stav "odeslaný soubor" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Platba %s trvalého příkazu bankou diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index d46556e6e38..92eb78a915a 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Brug automatisk udfyldning af felter til at vælge tred ActivityStateToSelectCompany= Tilføj en filter mulighed for at vise / skjule thirdparties, der i øjeblikket i aktivitet eller er ophørt den UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Brug automatisk udfyldning af felter til at vælge kontakt (i stedet for at bruge en liste). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Søg filtre optioner NumberOfKeyToSearch=NBR af tegn til at udløse søgning: %s ViewFullDateActions=Vis fuld datoer aktioner i tredje ark @@ -208,6 +210,7 @@ ModulesJobDesc=Business moduler give simple foruddefineret opsætning af Dolibar ModulesMarketPlaceDesc=Du kan finde flere moduler for at downloade på eksterne hjemmesider på internettet ... ModulesMarketPlaces=Flere moduler ... DoliStoreDesc=DoliStore den officielle markedsplads for Dolibarr ERP / CRM eksterne moduler +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site udbydere kan du søge at finde flere moduler ... URL=Link BoxesAvailable=Bokse til rådighed @@ -444,7 +447,7 @@ Module55Desc=Stregkoder 'ledelse Module56Name=Telefoni Module56Desc=Telefoni integration Module57Name=Stående ordrer -Module57Desc=Stående ordrer og tilbagetrækninger 'ledelse +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial integration Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Tilføj RSS feed inde Dolibarr skærmen sider Module330Name=Bogmærker Module330Desc=Bogmærker 'ledelse -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Kategorier Module1780Desc=Kategorier 'forvaltning (produkter, leverandører og kunder) Module2000Name=FCKeditor Module2000Desc=WYSIWYG Editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Elektronisk Content Management Module2500Desc=Gemme og dele dokumenter Module2600Name=WebServices Module2600Desc=Aktiver Dolibarr webtjenester server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Brug online Gravatar service (www.gravatar.com) for at vise foto af brugere / medlemmer (fundet med deres e-mails). Har brug for en internetadgang Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PAYBOX Module50000Desc=Modul til at tilbyde en online betaling side med kreditkort med PAYBOX Module50100Name=Cash desk @@ -527,7 +534,7 @@ Module50200Desc=Modul til at tilbyde en online betaling side med kreditkort med Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup gemt BackToModuleList=Tilbage til moduler liste BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Faste search form på venstre menu DefaultLanguage=Standard sprog til brug (sprog code) EnableMultilangInterface=Aktiver flersproget grænseflade EnableShowLogo=Vis logo på venstre menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Dit system er blevet opdateret med succes CompanyInfo=Company / fundament oplysninger CompanyIds=Company / fundament identiteter diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang index bafe7810175..577f4ba40ef 100644 --- a/htdocs/langs/da_DK/agenda.lang +++ b/htdocs/langs/da_DK/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Aktioner påvirkes i ActionsDoneBy=Aktioner udført af ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Alle mine handlinger / opgaver AllActions= Alle les handlinger / opgaver ViewList=Vis liste diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang index 23ddcc67510..ded8d2c0619 100644 --- a/htdocs/langs/da_DK/compta.lang +++ b/htdocs/langs/da_DK/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Kalkulations mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/da_DK/contracts.lang b/htdocs/langs/da_DK/contracts.lang index f46b393f678..73a7e126d9e 100644 --- a/htdocs/langs/da_DK/contracts.lang +++ b/htdocs/langs/da_DK/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste over kører kontrakt linjer ListOfRunningServices=Liste over kører tjenester NotActivatedServices=Ikke aktiverede tjenester (blandt valideret kontrakter) BoardNotActivatedServices=Tjenester for at aktivere blandt valideret kontrakter -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Seneste %s aktiveret tjenester LastModifiedServices=Seneste %s modificerede tjenester EditServiceLine=Rediger service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Salg repræsentant, der underskriver kontrakt diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang index ca87688e893..2b99a1f9166 100644 --- a/htdocs/langs/da_DK/errors.lang +++ b/htdocs/langs/da_DK/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Leverandør kode kræves ErrorSupplierCodeAlreadyUsed=Leverandør koden allerede anvendes ErrorBadParameters=Bad parametre ErrorBadValueForParameter=Forkert værdi "%s" for parameter forkerte "%s forb. -ErrorBadImageFormat=Billede fil har ikke et understøttet format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Værdi '%s' har forkert datoformat ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Det lykkedes ikke at skrive i mappen %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Bruger med login %s kunne ikke findes. ErrorLoginHasNoEmail=Denne bruger har ingen e-mail-adresse. Processen afbrydes. ErrorBadValueForCode=Bad værdi former for kode. Prøv igen med en ny værdi ... ErrorBothFieldCantBeNegative=Fields %s og %s kan ikke være både negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Brugerkonto %s anvendes til at udføre web-server har ikke tilladelse til at ErrorNoActivatedBarcode=Ingen stregkode aktiveret typen ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang index c638bb3c968..c0a8555be79 100644 --- a/htdocs/langs/da_DK/members.lang +++ b/htdocs/langs/da_DK/members.lang @@ -8,7 +8,7 @@ Members=Medlemmer MemberAccount=Medlem login ShowMember=Vis medlem kortet UserNotLinkedToMember=Brugeren ikke er knyttet til et medlem -# ThirdpartyNotLinkedToMember=Third-party not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=Medlemmer Billetter FundationMembers=Instituttets medlemmer Attributs=Attributter @@ -85,8 +85,7 @@ SubscriptionLateShort=Sen SubscriptionNotReceivedShort=Aldrig modtaget ListOfSubscriptions=Liste over abonnementer SendCardByMail=Send kort -AddMember=Tilføj medlem -MemberType=Medlem type +AddMember=Create member NoTypeDefinedGoToSetup=Intet medlem definerede typer. Gå til opsætning - Medlemmer typer NewMemberType=Nyt medlem type WelcomeEMail=Velkommen e-mail @@ -126,12 +125,12 @@ Date=Dato DateAndTime=Dato og tid PublicMemberCard=Medlem offentlige kortet MemberNotOrNoMoreExpectedToSubscribe=Medlem ikke eller ikke længere forventes at abonnere -AddSubscription=Tilføj abonnement +AddSubscription=Create subscription ShowSubscription=Vis tegning MemberModifiedInDolibarr=Medlem ændret i Dolibarr SendAnEMailToMember=Send information email til medlem -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-mail emne til medlem autosubscription DescADHERENT_AUTOREGISTER_MAIL=EMail for medlem autosubscription DescADHERENT_MAIL_VALID_SUBJECT=E-mail emne til medlem validering @@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=E-mail emne til medlem resiliation DescADHERENT_MAIL_RESIL=E-mail for medlem resiliation DescADHERENT_MAIL_FROM=Sender e-mail for automatiske e-mails DescADHERENT_ETIQUETTE_TYPE=Etiketter format -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets DescADHERENT_CARD_TYPE=Format af kort side DescADHERENT_CARD_HEADER_TEXT=Tekst trykt på toppen af medlem-kort DescADHERENT_CARD_TEXT=Tekst påtrykt medlem kort @@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Nr. tredjepart forbundet til dette medlem ThirdPartyDolibarr=Dolibarr tredjepart MembersAndSubscriptions= Medlemmer og Subscriptions MoreActions=Supplerende aktion om kontrolapparatet -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription MoreActionBankDirect=Opret en direkte transaktion record på grund MoreActionBankViaInvoice=Opret en faktura og acontobeløb MoreActionInvoiceOnly=Opret en faktura uden betaling @@ -171,6 +170,8 @@ LastSubscriptionAmount=Sidste tegningsbeløbet MembersStatisticsByCountries=Medlemmer statistik efter land MembersStatisticsByState=Medlemmer statistikker stat / provins MembersStatisticsByTown=Medlemmer statistikker byen +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=Antal medlemmer NoValidatedMemberYet=Ingen validerede medlemmer fundet MembersByCountryDesc=Denne skærm viser dig statistikker over medlemmer af lande. Grafisk afhænger dog på Google online-graf service og er kun tilgængelig, hvis en internetforbindelse virker. @@ -196,9 +197,10 @@ Collectivités=Organisationer Particuliers=Personlig Entreprises=Virksomheder DOLIBARRFOUNDATION_PAYMENT_FORM=For at gøre dit abonnement betaling med en bankoverførsel, se side http://wiki.dolibarr.org/index.php/Subscribe .
At betale med kreditkort eller Paypal, klik på knappen nederst på denne side.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang index 332c8629569..b267137b5e1 100644 --- a/htdocs/langs/da_DK/products.lang +++ b/htdocs/langs/da_DK/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Hvis produktet er en tjeneste med begrænset varighed: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Antal pris MultiPriceLevelsName=Pris kategorier -AssociatedProductsAbility=Aktiver tilhørende produkter -AssociatedProducts=Tilhørende produkter -AssociatedProductsNumber=Antallet af tilknyttede produkter -ParentProductsNumber=Antal forælder produkt -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Oversættelse KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Tilføj / Slet Quantity=Mængde NoMatchFound=Ingen match fundet ProductAssociationList=Liste over relaterede produkter / tjenesteydelser: navn på produkt / tjeneste (mængde påvirkes) -ProductParentList=Liste over produkter / services med dette produkt som en komponent +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=En af valgte produkt er moderselskab med aktuelle produkt DeleteProduct=Slet et produkt / service ConfirmDeleteProduct=Er du sikker på du vil slette dette produkt / service? @@ -179,7 +179,7 @@ CloneProduct=Klon vare eller tjenesteydelse ConfirmCloneProduct=Er du sikker på at du vil klone vare eller tjenesteydelse %s? CloneContentProduct=Klon alle de vigtigste informationer af produkt / service ClonePricesProduct=Klon vigtigste informationer og priser -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Dette produkt er brugt NewRefForClone=Ref. af nye produkter / ydelser CustomerPrices=Kunder priser @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang index 1ce1b5f81bd..db358f6bdad 100644 --- a/htdocs/langs/da_DK/projects.lang +++ b/htdocs/langs/da_DK/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertill Myprojects=Mine projekter ProjectsArea=Projekter område NewProject=Nyt projekt -AddProject=Tilføj projekt +AddProject=Create project DeleteAProject=Slet et projekt DeleteATask=Slet en opgave ConfirmDeleteAProject=Er du sikker på du vil slette dette projekt? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Ny tid MyTimeSpent=Min tid MyTasks=Mine opgaver @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Ny opgave -AddTask=Tilføj opgave +AddTask=Create task AddDuration=Tilføj varighed Activity=Aktivitet Activities=Opgaver / aktiviteter diff --git a/htdocs/langs/da_DK/resource.lang b/htdocs/langs/da_DK/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/da_DK/resource.lang +++ b/htdocs/langs/da_DK/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang index fb881515567..11dda452e35 100644 --- a/htdocs/langs/da_DK/withdrawals.lang +++ b/htdocs/langs/da_DK/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Kredit på WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Vis Træk IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis faktura mindst en tilbagetrækning betaling endnu ikke behandlet, vil den ikke blive angivet som betales for at tillade at styre tilbagetrækning før. -DoStandingOrdersBeforePayments=Denne faner giver dig mulighed for at anmode om en stående ordre. Når den bliver færdig, kan du skrive betalingen for at lukke fakturaen. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Betaling af stående ordre %s af banken diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index f1168a1fce5..bf4499985bc 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Suchfeld statt Listenansicht für Partnerauswahl verwen ActivityStateToSelectCompany= Setzt einen Filter um Partner ein-/ausblenden, welche aktiv oder inaktiv sind. UseSearchToSelectContactTooltip=Wenn Sie eine große Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings. UseSearchToSelectContact=Suchfeld statt Listenansicht für Kontaktauswahl verwenden. +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Suchfilter Optionen NumberOfKeyToSearch=Anzahl der Buchstaben um eine Suche auszulösen: %s ViewFullDateActions=Zeige alle Terminaktionen in der Partneransicht @@ -208,6 +210,7 @@ ModulesJobDesc=Die Geschäftstypenmodule erlauben eine einfache Einrichtung des ModulesMarketPlaceDesc=Hier finden Sie weitere Module auf externen Web-Sites ModulesMarketPlaces=Sie können zusätzliche Module im Web finden... DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Website-Anbieter für Ihre Suche nach weiteren Modulen URL=Link BoxesAvailable=Verfügbare Boxen @@ -396,7 +399,7 @@ ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer übersc ExternalModule=Externes Modul - im Verzeichnis %s installiert BarcodeInitForThirdparties=Alle Strichcodes für Drittanbieter initialisieren BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen -CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined. +CurrentlyNWithoutBarCode=Zur Zeit gibt es %s Datensätze in %s ohne Barcode. InitEmptyBarCode=Startwert für die nächsten %s leeren Datensätze EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen ConfirmEraseAllCurrentBarCode=Möchten Sie wirklich alle aktuellen Barcodes löschen? @@ -437,14 +440,14 @@ Module52Name=Produktbestände Module52Desc=Produktbestandsverwaltung Module53Name=Leistungen Module53Desc=Leistungs-Verwaltung -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Kontrakte/Abonnements +Module54Desc=Kontraktverwaltung (Dienstleistungen oder sich wiederholende Abos) Module55Name=Barcodes Module55Desc=Barcode-Verwaltung Module56Name=Telefonie Module56Desc=Telefonie-Integration Module57Name=Daueraufträge -Module57Desc=Daueraufträge und Retourenverwaltung (RMA) +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial-Integration Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS-Feed Module320Desc=RSS-Feed-Bildschirm innerhalb des Systems anzeigen Module330Name=Lesezeichen Module330Desc=Lesezeichenverwaltung -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webkalender Module410Desc=Webkalenderintegration Module500Name=Sonderausgaben (Steuern, Sozialbeiträge und Dividenden) @@ -495,6 +498,8 @@ Module1780Name=Kategorien Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden) Module2000Name=FCKeditor Module2000Desc=WYSIWYG-Editor +Module2200Name=Dynamische Preise +Module2200Desc=Mathematische Ausdrücke für Preise aktivieren Module2300Name=Cron Module2300Desc=Verwaltung geplanter Aufgaben Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Inhaltsverwaltung(ECM) Module2500Desc=Speicherung und Verteilung von Dokumenten Module2600Name=WebServices Module2600Desc=Aktivieren Sie Verwendung von Webservices +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Verwenden Sie den online Gravatar-Dienst (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung Module2800Desc=FTP-Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Urlaubsantrags-Verwaltung Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten. Module39000Name=Produktstapel -Module39000Desc=Batch-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten +Module39000Desc=Chargen- oder Serien-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten Module50000Name=PayBox Module50000Desc=Über dieses Modul können Sie online Kreditkartenzahlungen entgegennehmen Module50100Name=Kasse @@ -527,7 +534,7 @@ Module50200Desc=Mit diesem Modul können Sie via PayPal Online Kreditkartenzahlu Module50400Name=Buchhaltung (erweitert) Module50400Desc=Buchhaltung für Experten (doppelte Buchhaltung) Module54000Name=PrintIPP -Module54000Desc=Mit Cups IPP Drucker ausdrucken. +Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein und auf dem Server muss CUPS installiert sein) Module55000Name=Open Poll Module55000Desc=Modul um online Umfragen zu starten. (Wie Doodle, Studs, Rdvz,...) Module59000Name=Gewinnspannen @@ -606,11 +613,11 @@ Permission151=Daueraufträge einsehen Permission152=Dauerauftragsanträge erstellen/bearbeiten Permission153=Dauerauftragsbelege übertragen Permission154=Dauerauftragsbelege kreditieren/ablehnen -Permission161=Read contracts/subscriptions -Permission162=Create/modify contracts/subscriptions -Permission163=Activate a service/subscription of a contract -Permission164=Disable a service/subscription of a contract -Permission165=Delete contracts/subscriptions +Permission161=Kontrakte/Abonnements einsehen +Permission162=Kontrakte/Abonnements erstellen/bearbeiten +Permission163=Dienstleistungen/Abonnements in einem Vertrag aktivieren +Permission164=Dienstleistungen/Abonnements in einem Vertrag deaktivieren +Permission165=Kontrakt/Abonnement löschen Permission171=Reisen und Spesen einsehen (eigene und Untergebene) Permission172=Reisen und Spesen erstellen/ändern Permission173=Reisen und Spesen löschen @@ -672,7 +679,7 @@ Permission300=Barcodes einsehen Permission301=Barcodes erstellen/bearbeiten Permission302=Barcodes löschen Permission311=Leistungen lesen -Permission312=Assign service/subscription to contract +Permission312=Leistung/Abonnement einem Vertrag zuordnen Permission331=Lesezeichen einsehen Permission332=Lesezeichen erstellen/bearbeiten Permission333=Lesezeichen löschen @@ -702,8 +709,8 @@ Permission701=Spenden einsehen Permission702=Spenden erstellen/bearbeiten Permission703=Spenden löschen Permission1001=Warenbestände einsehen -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses +Permission1002=Warenlager erstellen/ändern +Permission1003=Warenlager löschen Permission1004=Lagerbewegungen einsehen Permission1005=Lagerbewegungen erstellen/bearbeiten Permission1101=Lieferscheine einsehen @@ -765,7 +772,7 @@ DictionaryCivility=Anredeformen DictionaryActions=Maßnahmen DictionarySocialContributions=Sozialbeitragstypen DictionaryVAT=MwSt.-Sätze -DictionaryRevenueStamp=Amount of revenue stamps +DictionaryRevenueStamp=Anzahl der Steuermarken DictionaryPaymentConditions=Zahlungsbedingungen DictionaryPaymentModes=Zahlungsarten DictionaryTypeContact=Kontaktarten @@ -779,6 +786,7 @@ DictionaryOrderMethods=Bestellmethoden DictionarySource=Quelle der Angebote/Bestellungen DictionaryAccountancyplan=Kontenplan DictionaryAccountancysystem=Kontenplan Modul +DictionaryEMailTemplates=Emails templates SetupSaved=Setup gespeichert BackToModuleList=Zurück zur Modulübersicht BackToDictionaryList=Zurück zur Wörterbuchübersicht @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Ständiges Suchfeld auf der linken Seite DefaultLanguage=Standardsprache der Anwendung (Sprachcode) EnableMultilangInterface=Mehrsprachigkeit aktivieren EnableShowLogo=Logo über dem linken Menü anzeigen +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Das System wurde erfolgreich aktualisiert CompanyInfo=Firmen-/Stiftungsinformationen CompanyIds=Firmen-/Stiftungs-IDs @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Li ModuleCompanyCodePanicum=Generiert einen leeren Kontierungscode. ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Partnercodes zusammen. UseNotifications=Benachrichtigungen verwenden -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* or by setting a global target email address on module setup page. +NotificationsDesc=E-Mail-Benachrichtigungsfunktionen erlauben Ihnen den stillschweigenden Versand automatischer Benachrichtigungen zu einigen Dolibarr-Ereignissen. Ziele dafür können definiert werden:
* pro Partner-Kontakt (Kunden oder Lieferanten), ein Partner zur Zeit.
* durch das Setzen einer globalen Ziel-Mail-Adresse in den Modul-Einstellungen ModelModules=Dokumentvorlagenmodul DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Wasserzeichen auf Entwurf @@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Intervention Nummerierung Module TemplatePDFInterventions=Intervention Karte Dokumenten Modelle WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keins, wenn leer) ##### Contracts ##### -ContractsSetup=Contracts/Subscriptions module setup +ContractsSetup=Kontrakte/Abonnements-Modul Einstellungen ContractsNumberingModules=Verträge Nummerierung Module TemplatePDFContracts=Vertragsvorlagen FreeLegalTextOnContracts=Freier Text auf Verträgen @@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Dateien vom Typ %s werden vom HTTP Server nicht komprim CacheByServer=Vom Server zwischengespeichert CacheByClient=Vom Browser zwischengespeichert CompressionOfResources=Komprimierung von HTTP Antworten -TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich ##### Products ##### ProductSetup=Produktmoduleinstellungen ServiceSetup=Dienstleistungen Modul Setup @@ -1415,8 +1424,8 @@ OSCommerceTestOk=Verbindung zum Server '%s' für Datenbank '%s' mit Benutzer '%s OSCommerceTestKo1=Verbindung zum Server '%s' erfolgreich, aber Datenbank '%s' konnte nicht erreicht werden. OSCommerceTestKo2=Verbindung zum Server '%s' mit dem Benutzer '%s' fehlgeschlagen. ##### Stock ##### -StockSetup=Warehouse module setup -UserWarehouse=Use user personal warehouses +StockSetup=Warenlager-Modul Einstellungen +UserWarehouse=Persönliche Warenläger verwenden IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menü gelöscht @@ -1482,12 +1491,12 @@ ClickToDialDesc=Dieses Modul fügt ein Symbols nach Telefonnummern ein, bei dess ##### Point Of Sales (CashDesk) ##### CashDesk=Point of Sales CashDeskSetup=Kassenmoduleinstellungen -CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich) CashDeskBankAccountForCheque= Finanzkonto für Scheckeinlösungen CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale -CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease +CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### @@ -1552,4 +1561,4 @@ NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "| SalariesSetup=Setup of module salaries SortOrder=Sortierreihenfolge Format=Format -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang index 1590b3464b3..cdf2c1620ab 100644 --- a/htdocs/langs/de_DE/agenda.lang +++ b/htdocs/langs/de_DE/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Termine zugewiesen an ActionsDoneBy=Termine erledigt von ActionsForUser=Maßnahmen für Benutzer ActionsForUsersGroup=Maßnahmen für alle Benutzer der Gruppe +ActionAssignedTo=Event assigned to AllMyActions= Alle meine Termine/Aufgaben AllActions= Alle Termine / Aufgaben ViewList=Listenansicht @@ -44,7 +45,7 @@ AgendaExtSitesDesc=Diese Seite erlaubt Ihnen externe Kalender zu konfigurieren. ActionsEvents=Veranstaltungen zur automatischen Übernahme in die Agenda PropalValidatedInDolibarr=Angebot freigegeben InvoiceValidatedInDolibarr=Rechnung freigegeben -InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen InvoiceDeleteDolibarr=Rechnung %s gelöscht OrderValidatedInDolibarr= Bestellung %s freigegeben diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang index e1d23dec501..13aa22245fc 100644 --- a/htdocs/langs/de_DE/compta.lang +++ b/htdocs/langs/de_DE/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Berechnungsmodus AccountancyJournal=Buchhaltungscode-Journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen -ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Dienstleistungen zu kaufen -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Dienstleistungen zu verkaufen ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt einzuziehen ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang index bd84dd8ed7e..0027d817391 100644 --- a/htdocs/langs/de_DE/contracts.lang +++ b/htdocs/langs/de_DE/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Vertragsübersicht ListOfContracts=Liste der Verträge -LastModifiedContracts=Last %s modified contracts +LastModifiedContracts=Letzte %s geänderte Kontrakte AllContracts=Alle Verträge ContractCard=Vertragskarte ContractStatus=Vertragsstatus @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste der aktiven Vertragspositionen ListOfRunningServices=Liste aktiver Services NotActivatedServices=Inaktive Services (in freigegebenen Verträgen) BoardNotActivatedServices=Zu aktivierende Services (in freigegebenen Verträgen) -LastContracts=Last % contracts +LastContracts=Letzte %s Kontrakte LastActivatedServices=%s zuletzt aktivierte Services LastModifiedServices=%s zuletzt bearbeitete Services EditServiceLine=Service-Position bearbeiten @@ -91,6 +91,7 @@ ListOfServicesToExpire=Liste der Services die ablaufen NoteListOfYourExpiredServices=Diese Liste enthält nur Dienstleistungen an Partner, bei denen Sie als Vertreter Angegeben sind. StandardContractsTemplate=Standard Vertragsschablone ContactNameAndSignature=Für %s, Name und Unterschrift +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang index f63c423a33c..dddf3eb47c6 100644 --- a/htdocs/langs/de_DE/cron.lang +++ b/htdocs/langs/de_DE/cron.lang @@ -18,7 +18,7 @@ CronExplainHowToRunUnix=In Unix-Umgebungen sollte man crontab benutzen um die Ko CronExplainHowToRunWin=In Microsoft(tm) Windows kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede Minute aufzurufen # Menu CronJobs=Geplante Jobs -CronListActive=List of active/scheduled jobs +CronListActive=Liste der aktiven/geplanten Jobs CronListInactive=Liste der deaktivierten Jobs # Page list CronDateLastRun=Letzte Ausführung diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang index c509a7ce090..55b246e3c98 100644 --- a/htdocs/langs/de_DE/errors.lang +++ b/htdocs/langs/de_DE/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Lieferanten-Nr. erforderlich ErrorSupplierCodeAlreadyUsed=Diese Lieferanten Nr. ist bereits vergeben. ErrorBadParameters=Ungültige Werte ErrorBadValueForParameter=Falscher Wert '%s' für falsche Parameter '%s' -ErrorBadImageFormat=Imagedatei hat nicht ein unterstütztes Dateiformat +ErrorBadImageFormat=Bildformat nicht unsterstützt (Ihr PHP hat keine Konvertierungsfunktion für dieses Format) ErrorBadDateFormat=Eintrag '%s' hat falsche Datumsformat ErrorWrongDate=Falsches Datum! ErrorFailedToWriteInDir=Fehler beim Schreiben in das Verzeichnis %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Benutzer mit Anmeldung %s konnte nicht gefunden w ErrorLoginHasNoEmail=Dieser Benutzer hat keine E-Mail-Adresse. Prozess abgebrochen. ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut... ErrorBothFieldCantBeNegative=Die Felder %s und %s können nicht gleichzeitig negativ sein +ErrorQtyForCustomerInvoiceCantBeNegative=Mengen in Kundenrechnungen dürfen nicht negativ sein ErrorWebServerUserHasNotPermission=Der Benutzerkonto %s wurde verwendet um auf dem Webserver etwas auszuführen, hat aber keine Rechte dafür. ErrorNoActivatedBarcode=Kein Barcode aktiviert ErrUnzipFails=Fehler beim Entpacken von %s mit ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist no ErrorThereIsSomeDeliveries=Fehler: Lieferung(en) zu dieser Sendung vorhanden. Löschen nicht möglich. ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden ErrorCantDeletePaymentSharedWithPayedInvoice=Eine Zahlung, die zu mindestens einer als bezahlt markierten Rechnung gehört, kann nicht entfernt werden +ErrorPriceExpression1=Zur Konstanten '%s' kann nicht zugewiesen werden +ErrorPriceExpression2=Die eingebaute Funktion '%s' kann nicht neu definiert werden +ErrorPriceExpression3=Nicht definierte Variable '%s' in Funktionsdefinition +ErrorPriceExpression4=Nicht erlaubtes Zeichen '%s' +ErrorPriceExpression5='%s' unerwartet +ErrorPriceExpression6=Falsche Anzahl Argumente (%s angegeben, %s erwartet) +ErrorPriceExpression8=Unerwarteter operator '%s' +ErrorPriceExpression9=Ein unerwarteter Fehler ist aufgetreten +ErrorPriceExpression10=Operand fehlt bei Operator '%s' +ErrorPriceExpression11='%s' erwartet +ErrorPriceExpression14=Division durch Null +ErrorPriceExpression17=Nicht definierte Variable '%s +ErrorPriceExpression19=Ausdruck nicht gefunden +ErrorPriceExpression20=Leerer Ausdruck +ErrorPriceExpression21=Leeres Ergebnis '%s' +ErrorPriceExpression22=Negatives Ergebnis '%s' +ErrorPriceExpressionInternal=Interner Fehler '%s' +ErrorPriceExpressionUnknown=Unbekannter Fehler '%s' # Warnings WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert @@ -155,5 +174,5 @@ WarningUsingThisBoxSlowDown=Warnung: Der Einsatz dieser Box verlangsamt sämtlic WarningClickToDialUserSetupNotComplete=Die ClickToDial-Informationen für Ihren Benutzer sind nicht vollständig (siehe Registerkarte ClickToDial auf Ihrer Benutzerkarte). WarningNotRelevant=Operation für dieses Daten-Set nicht relevant WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funktion deaktiviert, wenn die Bildschirm-Ausgabe für Blinde oder Text-Browser optimiert ist. -WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. -WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters +WarningPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) liegt vor dem Rechnungsdatum (%s) für Rechnung %s. +WarningTooManyDataPleaseUseMoreFilters=Zu viele Ergebnisse. Bitte nutzen Sie mehr Filter diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang index 881b4946d83..8a91a8911c4 100644 --- a/htdocs/langs/de_DE/mails.lang +++ b/htdocs/langs/de_DE/mails.lang @@ -115,7 +115,7 @@ SentBy=Gesendet von MailingNeedCommand=Aus Sicherheitsgründen sollten E-Mails von der Kommandozeile aus versandt werden. Bitten Sie Ihren Server Administrator um die Ausführung des folgenden Befehls, um den Versand an alle Empfänger zu starten: MailingNeedCommand2=Sie können den Versand jedoch auch online starten, indem Sie den Parameter MAILING_LIMIT_SENDBYWEB auf den Wert der pro Sitzung gleichzeitig zu versendenden Mails setzen. Die entsprechenden Einstellungen finden Sie unter Übersicht-Einstellungen-Andere. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +LimitSendingEmailing=Hinweis: Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versand von E-Mails auf %s Empfänger je Sitzung beschränkt. TargetsReset=Liste leeren ToClearAllRecipientsClickHere=Klicken Sie hier, um die Empfängerliste zu leeren ToAddRecipientsChooseHere=Fügen Sie Empfänger über die Listenauswahl hinzu @@ -124,7 +124,7 @@ NbOfEMailingsSend=Massenmails versandt IdRecord=Eintrag-ID DeliveryReceipt=Zustellbestätigung YouCanUseCommaSeparatorForSeveralRecipients=Trennen Sie mehrere Empfänger mit einem Komma -TagCheckMail=Track mail opening +TagCheckMail=Öffnen der Mail verfolgen TagUnsubscribe=Abmelde Link TagSignature=Signatur des Absenders TagMailtoEmail=E-Mailadresses des Empfängers @@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versandt AddNewNotification=Neues E-Mail-Beachrichtigungsziel aktivieren ListOfActiveNotifications=Liste aller aktiven E-Mail-Beachrichtigungsziele ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen -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. +MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für Massen-Mails verwendet werden. +MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sHome - Einstellungen - EMails%s den Parameter '%s' auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die Masse-E-Mail-Funktion nutzen. MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang index 3bbcef686ed..02362bbd665 100644 --- a/htdocs/langs/de_DE/members.lang +++ b/htdocs/langs/de_DE/members.lang @@ -85,8 +85,7 @@ SubscriptionLateShort=Verspätet SubscriptionNotReceivedShort=Nie erhalten ListOfSubscriptions=Liste der Abonnements SendCardByMail=Karte per E-Mail versenden -AddMember=Mitglied hinzufügen -MemberType=Mitgliedsart +AddMember=Mitglied erstellen NoTypeDefinedGoToSetup=Sie haben noch keine Mitgliedsarten definiert. Sie können dies unter Einstellungen-Mitgliedsarten vornehmen. NewMemberType=Neue Mitgliedsart WelcomeEMail=Willkommen E-Mail @@ -126,7 +125,7 @@ Date=Datum DateAndTime=Datum und Uhrzeit PublicMemberCard=Öffentliche Mitgliedskarte MemberNotOrNoMoreExpectedToSubscribe=Mitglied ohne (und ohne Aussicht auf) Abonnement -AddSubscription=Abonnement hinzufügen +AddSubscription=Abonnement erstellen ShowSubscription=Zeige Abonnement MemberModifiedInDolibarr=Mitglied bearbeitet SendAnEMailToMember=Informations-E-Mail an Mitglied senden @@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Mit diesem Mitglied ist kein Partner verknüpft ThirdPartyDolibarr=Partner MembersAndSubscriptions= Mitglieder und Abonnements MoreActions=Ergänzende Erfassungsmaßnahmen -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription MoreActionBankDirect=Autom. einen Einzugsermächtigunsantrag zum Mitgliedskonto erstellen MoreActionBankViaInvoice=Autom. eine Rechnung zum Mitgliedskonto erstellen und Zahlung auf Rechnung setzen MoreActionInvoiceOnly=Autom. eine Rechnung (ohne Zahlung) erstellen @@ -171,6 +170,8 @@ LastSubscriptionAmount=Letzter Abo-Betrag MembersStatisticsByCountries=Mitgliederstatistik nach Ländern MembersStatisticsByState=Mitgliederstatistik nach Bundesländern MembersStatisticsByTown=Mitgliederstatistik nach Städten +MembersStatisticsByRegion=Mitgliederstatistik nach Region +MemberByRegion=Mitglieder nach Region NbOfMembers=Anzahl der Mitglieder NoValidatedMemberYet=Kein freizugebenden Mitglieder gefunden MembersByCountryDesc=Diese Form zeigt Ihnen die Mitgliederstatistik nach Ländern. Die Grafik basiert auf Googles Online-Grafik-Service ab und funktioniert nur wenn eine Internverbindung besteht. @@ -196,9 +197,10 @@ Collectivités=Organisationen Particuliers=Privatpersonen Entreprises=Unternehmen DOLIBARRFOUNDATION_PAYMENT_FORM=Um Ihre Beitragszahlung mit einer Banküberweisung auszuführen, gehen Sie zur Seite: http://wiki.dolibarr.org/index.php/Subscribe.
Um mittels Kreditkarte zu zahlen, klicken Sie auf den Button am Seitenende.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ByProperties=nach Eigenschaften +MembersStatisticsByProperties=Mitgliederstatistik nach Eigenschaften +MembersByNature=Members by nature +VATToUseForSubscriptions=Mehrwertsteuersatz für Abonnements +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang index 3d82f643187..e222cf88f90 100644 --- a/htdocs/langs/de_DE/products.lang +++ b/htdocs/langs/de_DE/products.lang @@ -118,11 +118,11 @@ MultiPricesAbility=Mehrere Preisstufen pro Produkt/Dienstleistung MultiPricesNumPrices=Anzahl Preise MultiPriceLevelsName=Preiskategorien AssociatedProductsAbility=Untergeordnete Produkte aktivieren -AssociatedProducts=Unterprodukte +AssociatedProducts=Package product AssociatedProductsNumber=Anzahl der Unterprodukte -ParentProductsNumber=Anzahl der übergeordnete Produkt -IfZeroItIsNotAVirtualProduct=Fall 0 eingestellt ist, ist das Produkt kein Unterprodukt -IfZeroItIsNotUsedByVirtualProduct=Fall 0 eingestellt ist, wird das Produkt von keinem Unterprodukt verwendet +ParentProductsNumber=Anzahl der übergeordneten Produkte +IfZeroItIsNotAVirtualProduct=Falls 0 ist das Produkt kein Unterprodukt +IfZeroItIsNotUsedByVirtualProduct=Falls 0 wird das Produkt von keinem Unterprodukt verwendet EditAssociate=Verbinden Translation=Übersetzung KeywordFilter=Stichwortfilter @@ -132,7 +132,7 @@ AddDel=Hinzufügen/Löschen Quantity=Stückzahl NoMatchFound=Kein Eintrag gefunden ProductAssociationList=Liste der verknüpften Produkte/Leistungen: Name des Produkts/der Leistung (Stückzahl) -ProductParentList=Liste der Produkte / Dienstleistungen mit diesem Produkt als ein Bestandteil +ProductParentList=Liste der Produkte / Dienstleistungen mit diesem Produkt als Bestandteil ErrorAssociationIsFatherOfThis=Eines der ausgewählten Produkte ist Elternteil des aktuellen Produkts DeleteProduct=Produkt/Dienstleistung löschen ConfirmDeleteProduct=Möchten Sie dieses Produkt/Leistung wirklich löschen? @@ -144,7 +144,7 @@ ExportDataset_service_1=Dienstleistungen ImportDataset_produit_1=Produkte ImportDataset_service_1=Dienstleistungen DeleteProductLine=Produktlinie löschen -ConfirmDeleteProductLine=Möchten Sie diese Produktlinie wirklich löschen? +ConfirmDeleteProductLine=Möchten Sie diese Position wirklich löschen? NoProductMatching=Kein Produkt/Leistung entspricht Ihren Suchkriterien MatchingProducts=Passende Produkte/Leistungen NoStockForThisProduct=Kein Warenbestand für dieses Produkt @@ -179,7 +179,7 @@ CloneProduct=Produkt/Leistung duplizieren ConfirmCloneProduct=Möchten Sie die Leistung %s wirklich duplizieren? CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren ClonePricesProduct=Allgemeine Informationen und Preise duplizieren -CloneCompositionProduct=Unterprodukt/-Dienstleistung duplizieren +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Produkt in Verwendung NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen CustomerPrices=Kundenpreise @@ -237,8 +237,13 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r PriceByCustomer=Preis des Kunden PriceCatalogue=Einzigartiger Preis pro Produkt/Dienstleistung PricingRule=Preisregeln -AddCustomerPrice=Add price by customers +AddCustomerPrice=Preis je Kunde hinzufügen ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimaler Preis kann nicht kleiner als %s sein MinimumRecommendedPrice=Minimaler empfohlener Preis: %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Nummer diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang index 3569bc378b6..107b4eef252 100644 --- a/htdocs/langs/de_DE/projects.lang +++ b/htdocs/langs/de_DE/projects.lang @@ -36,6 +36,8 @@ TaskTimeSpent=Zeitaufwände für Aufgaben TaskTimeUser=Benutzer TaskTimeNote=Hinweis TaskTimeDate=Datum +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Neuer Zeitaufwand MyTimeSpent=Mein Zeitaufwand MyTasks=Meine Aufgaben @@ -129,4 +131,4 @@ ProjectReferers=Bezugnahmen SearchAProject=Suchen Sie ein Projekt ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden ProjectDraft=Projekt-Entwürfe -FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +FirstAddRessourceToAllocateTime=Eine Ressource zuordnen, um Zeit festzulegen diff --git a/htdocs/langs/de_DE/resource.lang b/htdocs/langs/de_DE/resource.lang index 6dd94c6cfc5..edcfcf065c8 100644 --- a/htdocs/langs/de_DE/resource.lang +++ b/htdocs/langs/de_DE/resource.lang @@ -20,10 +20,10 @@ ResourcesLinkedToElement=mit Element verknüpfte Ressourcen ShowResourcePlanning=Ressourcen-Planung zeigen GotoDate=Gehe zu Datum -ResourceElementPage=Element resources +ResourceElementPage=Element-Ressourcen ResourceCreatedWithSuccess=Ressource erfolgreich erstellt -RessourceLineSuccessfullyDeleted=Resource line successfully deleted -RessourceLineSuccessfullyUpdated=Resource line successfully updated +RessourceLineSuccessfullyDeleted=Ressourcen-Zeile erfolgreich gelöscht +RessourceLineSuccessfullyUpdated=Ressourcen-Zeile erfolgreich aktualisiert ResourceLinkedWithSuccess=Ressource erfolgreich verknüpft TitleResourceCard=Ressourcen-Karte @@ -31,6 +31,4 @@ ConfirmDeleteResource=Ressource wirklich löschen? RessourceSuccessfullyDeleted=Ressource erfolgreich gelöscht DictionaryResourceType=Ressourcen-Typ -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Ressource wählen diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang index f574590148e..e7f84a4c27f 100644 --- a/htdocs/langs/de_DE/users.lang +++ b/htdocs/langs/de_DE/users.lang @@ -102,7 +102,7 @@ UserDisabled=Benutzer %s deaktiviert UserEnabled=Benutzer %s aktiviert UserDeleted=Benutzer %s entfernt NewGroupCreated=Gruppe %s erstellt -GroupModified=Group %s modified +GroupModified=Gruppe %s geändert GroupDeleted=Gruppe %s entfernt ConfirmCreateContact=Möchten Sie für diesen Kontakt wirklich ein Systembenutzerkonto anlegen? ConfirmCreateLogin=Möchten Sie für dieses Mitglied wirklich ein Benutzerkonto erstellen? diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang index 8289f34fa77..2f66393922b 100644 --- a/htdocs/langs/de_DE/withdrawals.lang +++ b/htdocs/langs/de_DE/withdrawals.lang @@ -47,7 +47,7 @@ RefusedData=Ablehnungsdatum RefusedReason=Ablehnungsgrund RefusedInvoicing=Ablehnung in Rechnung stellen NoInvoiceRefused=Ablehnung nicht in Rechnung stellen -InvoiceRefused=Invoice refused (Charge the rejection to customer) +InvoiceRefused=Rechnung abgelehnt (Abweisung dem Kunden berechnen) Status=Status StatusUnknown=Unbekannt StatusWaiting=Wartend @@ -79,10 +79,11 @@ CreditDate=Am WithdrawalFileNotCapable=Abbuchungsformular für Ihr Land %s konnte nicht erstellt werden (Dieses Land wird nicht unterstützt). ShowWithdraw=Zeige Abbuchung IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Wenn eine Rechnung mindestens eine noch zu bearbeitende Verbuchung vorweist, kann diese nicht als bezahlt markiert werden. -DoStandingOrdersBeforePayments=Dies erlaubt Ihnen, einen Dauerauftrag anzulegen. Sobald dieser vollständig ist, können Sie den Zahlbetrag eingeben, um die Rechnung abzuschließen. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Datei abbuchen SetToStatusSent=Setze in Status "Datei versandt" ThisWillAlsoAddPaymentOnInvoice=Dies wird auch Zahlungen auf Rechnungen erstellen und diese als bezahlt markieren +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Zahlung des Dauerauftrags %s diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang index c3c355390c5..d77b366a57c 100644 --- a/htdocs/langs/el_GR/accountancy.lang +++ b/htdocs/langs/el_GR/accountancy.lang @@ -66,7 +66,7 @@ Lineofinvoice=Γραμμή τιμολογίου VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTING_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Διαχωριστικό CSV ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements @@ -77,9 +77,9 @@ AccountLengthDesc=Λειτουργία που επιτρέπει να υποκρ ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_BANK_JOURNAL=Τραπεζικό ημερολόγιο ACCOUNTING_CASH_JOURNAL=Cash journal ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal ACCOUNTING_SOCIAL_JOURNAL=Social journal @@ -130,15 +130,15 @@ ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπο ReportThirdParty=Λίστα λογαριασμού Πελ./Προμ. DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts -ListAccounts=List of the accounting accounts +ListAccounts=Λίστα των λογιστικών λογαριασμών -Pcgversion=Version of the plan +Pcgversion=Έκδοση του σχεδίου Pcgtype=Class of account Pcgsubtype=Under class of account Accountparent=Root of the account Active=Statement -NewFiscalYear=New fiscal year +NewFiscalYear=Νέα οικονομική χρονιά DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT @@ -151,7 +151,7 @@ DescVentilSupplier=Consult here the annual breakdown accounting of your invoices DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account -ValidateHistory=Validate Automatically +ValidateHistory=Αυτόματη επικύρωση ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 24c2ac930a1..14ccab0887d 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Χρησιμοποιήστε τα πεδία αυτόμ ActivityStateToSelectCompany= Προσθέστε μια επιλογή φίλτρου για εμφάνιση / απόκρυψη ΠΕΛ./ΠΡΟΜ. τα οποία βρίσκονται σε λειτουργία ή έχει παύσει UseSearchToSelectContactTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς. UseSearchToSelectContact=Χρησιμοποιήστε τα πεδία αυτόματης συμπλήρωσης για να επιλέξετε την επαφή (αντί της χρήσης ενός πλαισίου λίστας). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Αναζήτηση επιλογές φίλτρων NumberOfKeyToSearch=Πλήθος χαρακτήρων για να ξεκινήσει η αναζήτηση: %s ViewFullDateActions=Εμφάνιση πλήρους χρονοδιαγράμματος γεγονότων στο φύλλο ΠΕΛ./ΠΡΟΜ. @@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=Περισσότερα Αρθρώματα... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Ιστοσελίδα BoxesAvailable=Διαθέσιμα Πλαίσια @@ -444,7 +447,7 @@ Module55Desc=Barcode management Module56Name=Τηλεφωνία Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Σελιδοδείκτες Module330Desc=Bookmark management -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινωνικής ασφάλισης, μερίσματα) @@ -495,6 +498,8 @@ Module1780Name=Κατηγορίες Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Μενού Module2300Desc=Scheduled task management Module2400Name=Ατζέντα @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Διαχείρισης Ροών Εργασιών Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Παρτίδα προϊόντων -Module39000Desc=Αριθμός παρτίδας, κατανάλωση μέχρι ημερομηνία και πώληση μέχρι ημερομηνία διαχείριση για τα προϊόντα +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Ενότητα για να προσφέρει μια σε απευθείας σύνδεση σελίδα πληρωμής με πιστωτική κάρτα με Paybox Module50100Name=Σημείο Πωλήσεων @@ -527,7 +534,7 @@ Module50200Desc=Ενότητα για να προσφέρει μια σε απε Module50400Name=Λογιστική (για προχωρημένους) Module50400Desc=Λογιστική διαχείριση (διπλά μέρη) Module54000Name=PrintIPP -Module54000Desc=Εκτύπωση μέσω Cups IPP εκτυπωτή. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Ανοικτή Ψηφοφορία Module55000Desc=Πρόσθετο για την δημιουργία μιας διαδικτυακής έρευνας (όπως Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Μέθοδος Παραγγελίας DictionarySource=Προέλευση των προτάσεων/παραγγελιών DictionaryAccountancyplan=Λογιστικό σχέδιο DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου +DictionaryEMailTemplates=Emails templates SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν BackToModuleList=Πίσω στη λίστα με τα modules BackToDictionaryList=Επιστροφή στη λίστα λεξικών @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Προκαθορισμένη Γλώσσα (κωδ. γλώσσας) EnableMultilangInterface=Ενεργοποίησ πολυγλωσσικού περιβάλλοντος EnableShowLogo=Εμφάνιση λογότυπου στο αριστερό μενού +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Το σύστημά σας αναβαθμίστηκε επιτυχώς CompanyInfo=Πληροφορίες Εταιρίας/Οργανισμού CompanyIds=Ταυτότητες Εταιρίας/Οργανισμού @@ -1544,12 +1553,12 @@ Opened=Ανοίξτε Closed=Κλείστε AlwaysEditable=Can always be edited MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) -NbMajMin=Minimum number of uppercase characters -NbNumMin=Minimum number of numeric characters -NbSpeMin=Minimum number of special characters -NbIteConsecutive=Maximum number of repeating same characters +NbMajMin=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων +NbNumMin=Ελάχιστος αριθμός αριθμητικών χαρακτήρων +NbSpeMin=Ελάχιστος αριθμός ειδικών χαρακτήρων +NbIteConsecutive=Ελάχιστος αριθμός επανάληψης ίδιων χαρακτήρων NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation SalariesSetup=Setup of module salaries -SortOrder=Sort order +SortOrder=Σειρά ταξινόμησης Format=Μορφή TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang index 932a236ab4a..cf4031d8785 100644 --- a/htdocs/langs/el_GR/agenda.lang +++ b/htdocs/langs/el_GR/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Ενέργειες που ανατέθηκαν σε ActionsDoneBy=Ενέργειες που ολοκληρώθηκαν από ActionsForUser=Γεγονότα για τον χρήστη ActionsForUsersGroup=Γεγονότα όλων των χρηστών της ομάδας +ActionAssignedTo=Event assigned to AllMyActions= Όλες οι ενέργειες/εργασίες μου AllActions= Όλες οι ενέργειες/εργασίες ViewList=Εμφάνιση Λίστας @@ -44,7 +45,7 @@ AgendaExtSitesDesc=Αυτή η σελίδα σας επιτρέπει να ρυ ActionsEvents=Γεγονότα για τα οποία θα δημιουργήσουν εγγραφή στο ημερολόγιο, αυτόματα PropalValidatedInDolibarr=Η πρόταση %s επικυρώθηκε InvoiceValidatedInDolibarr=Το τιμολόγιο %s επικυρώθηκε -InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceValidatedInDolibarrFromPos=Το τιμολόγιο επικυρώθηκε από το POS InvoiceBackToDraftInDolibarr=Τιμολόγιο %s θα επιστρέψει στην κατάσταση του σχεδίου InvoiceDeleteDolibarr=Τιμολόγιο %s διαγράφεται OrderValidatedInDolibarr= Η παραγγελία %s επικυρώθηκε @@ -68,9 +69,9 @@ DateActionStart= Ημερομηνία έναρξης DateActionEnd= Ημερομηνία λήξης AgendaUrlOptions1=Μπορείτε ακόμη να προσθέσετε τις ακόλουθες παραμέτρους για να φιλτράρετε τα αποτέλεσμα: AgendaUrlOptions2=login=%s για να περιορίσετε τα αποτελέσματα σε ενέργειες που δημιουργήθηκαν και έγιναν από τον χρήστη %s. -AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. +AgendaUrlOptions3=logina=%s να περιορίσει την παραγωγή ενεργειών που ανήκουν στον χρήστη %s. AgendaUrlOptions4=logint=%s για να περιορίσετε τα αποτελέσματα σε ενέργειες που αφορούν τον χρήστη%s. -AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. +AgendaUrlOptionsProject=project=PROJECT_ID να περιορίσει την παραγωγή της σε ενέργειες που σχετίζονται με το έργο PROJECT_ID. AgendaShowBirthdayEvents=Εμφάνιση γενεθλίων των προσώπων επικοινωνίας AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των προσώπων επικοινωνίας Busy=Απασχολ. @@ -87,5 +88,5 @@ ExtSiteUrlAgenda=URL για να αποκτήσετε πρόσβαση στο .i ExtSiteNoLabel=Χωρίς Περιγραφή WorkingTimeRange=Εύρος χρόνου εργασίας WorkingDaysRange=Εύρος ημερών εργασίας -AddEvent=Create event +AddEvent=Δημιουργία συμβάντος MyAvailability=Η διαθεσιμότητα μου diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang index 1c0ff4d72c9..c8a0d2af2e3 100644 --- a/htdocs/langs/el_GR/bills.lang +++ b/htdocs/langs/el_GR/bills.lang @@ -222,12 +222,12 @@ NonPercuRecuperable=Non-recoverable SetConditions=Set payment conditions SetMode=Set payment mode Billed=Τιμολογημένο -RepeatableInvoice=Template invoice -RepeatableInvoices=Template invoices -Repeatable=Template -Repeatables=Templates -ChangeIntoRepeatableInvoice=Convert into template invoice -CreateRepeatableInvoice=Create template invoice +RepeatableInvoice=Πρότυπο τιμολογίου +RepeatableInvoices=Πρότυπο τιμολόγιο +Repeatable=Πρώτυπο +Repeatables=Πρώτυπα +ChangeIntoRepeatableInvoice=Μετατροπή σε πρότυπο τιμολόγιο +CreateRepeatableInvoice=Δημιουργία πρότυπο τιμολόγιο CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Πληρωμές και τιμολόγια πελατών diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang index 61543f9747e..c011ce85374 100644 --- a/htdocs/langs/el_GR/boxes.lang +++ b/htdocs/langs/el_GR/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Τελευταίες τροποποιημένες προοπτ BoxLastCustomers=Τελευταίοι τροποποιημένοι πελάτες BoxLastSuppliers=Τελευταίοι τροποποιημένοι προμηθευτές BoxLastCustomerOrders=Τελευταίες παραγγελίες πελατών +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Τελευταία Βιβλία BoxLastActions=Τελευταίες Ενέργειες BoxLastContracts=Τελευταία συμβόλαια @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Πλήθος πελατών BoxTitleLastRssInfos=Τα %s πιο πρόσφατα νέα από %s BoxTitleLastProducts=Τα %s πιο πρόσφατα τροποποιημένα προϊόντα/υπηρεσίες BoxTitleProductsAlertStock=Προειδοποίηση προϊόντων σε απόθεμα -BoxTitleLastCustomerOrders=Οι %s πιο πρόσφατα τροποποιημένες παραγγελίες πελατών +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Οι %s πιο πρόσφατα καταχωρημένοι προμηθευτές BoxTitleLastCustomers=Οι %s πιο πρόσφατα καταχωρημένοι πελάτες BoxTitleLastModifiedSuppliers=Οι %s πιο πρόσφατα τροποποιημένοι προμηθευτές BoxTitleLastModifiedCustomers=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες -BoxTitleLastCustomersOrProspects=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες ή προοπτικές -BoxTitleLastPropals=Οι %s πιο πρόσφατα καταχωρημένες προσφορές +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Τα %s πιο πρόσφατα τιμολόγια πελατών +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Τα %s πιο πρόσφατα τιμολόγια προμηθευτών -BoxTitleLastProspects=Οι %s πιο πρόσφατες προσφορές +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Οι %s πιο πρόσφατα τροποποιημένες προσφορές BoxTitleLastProductsInContract=Τα %s πιο πρόσφατα συμβόλαια με προϊόντα/υπηρεσίες -BoxTitleLastModifiedMembers=Τελευταία %s τροποποίηση των μελών +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Τελευταία %s ενημέρωση παρέμβασης -BoxTitleOldestUnpaidCustomerBills=Τα %s παλαιότερα απλήρωτα τιμολόγια πελατών -BoxTitleOldestUnpaidSupplierBills=Τα %s παλαιότερα απλήρωτα τιμολόγια προμηθευτών +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Άνοιξε τα υπόλοιπα των λογαριασμών BoxTitleSalesTurnover=Κύκλος εργασιών των πωλήσεων BoxTitleTotalUnpaidCustomerBills=Απλήρωτα τιμολόγια πελατών -BoxTitleTotalUnpaidSuppliersBills=Απλήρωτα τιμολόγια προμηθευτών +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Οι τελευταίες %s τροποποιημένες επαφές / διευθύνσεις BoxMyLastBookmarks=Οι %s νεότεροι σελιδοδείκτες μου BoxOldestExpiredServices=Παλαιότερες ενεργές υπηρεσίες που έχουν λήξει @@ -76,7 +80,8 @@ NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβό NoRecordedContracts=Δεν υπάρχουν καταχωρημένα συμβόλαια NoRecordedInterventions=Δεν καταγράφονται παρεμβάσεις BoxLatestSupplierOrders=Τελευταίες παραγγελίες προμηθευτών -BoxTitleLatestSupplierOrders=Οι %s τελευταίες παραγγελίες προμηθευτών +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=Δεν υπάρχουν καταχωρημένες παραγγελίες προμηθευτών BoxCustomersInvoicesPerMonth=Τιμολόγια πελατών ανά μήνα BoxSuppliersInvoicesPerMonth=Τιμολόγια προμηθευτών ανά μήνα diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang index 0ad9573f800..605097a3a19 100644 --- a/htdocs/langs/el_GR/commercial.lang +++ b/htdocs/langs/el_GR/commercial.lang @@ -9,9 +9,9 @@ Prospect=Προοπτική Prospects=Προοπτικές DeleteAction=Διαγραφή Ενέργειας/Εργασίας NewAction=Νέα Ενέργεια/Εργασία -AddAction=Προσθήκη Ενέργειας/Εργασίας -AddAnAction=Προσθήκη Ενέργειας/Εργασίας -AddActionRendezVous=Προσθήκη Συνάντησης +AddAction=Δημιουργία συμβάντος/εργασίας +AddAnAction=Δημιουργία συμβάντος/εργασίας +AddActionRendezVous=Δημιουργήστε μια εκδήλωση ραντεβού Rendez-Vous=Συναντήσεις ConfirmDeleteAction=Είστε σίγουροι ότι θέλετε να διαγράψετε την ενέργεια; CardAction=Καρτέλα Ενέργειας @@ -44,8 +44,8 @@ DoneActions=Ολοκληρωμένες Ενέργειες DoneActionsFor=Ολοκληρωμένες Ενέργειες γιά %s ToDoActions=Ημιτελείς Ενέργειες ToDoActionsFor=Ημιτελείς Ενέργειες για %s -SendPropalRef=Αποστολή εμπορικής προσφοράς %s -SendOrderRef=Αποστολή παραγγελίας %s +SendPropalRef=Υποβολή των προσφορών %s +SendOrderRef=Υποβολή της παραγγελίας %s StatusNotApplicable=Δεν ισχύει StatusActionToDo=Να γίνουν StatusActionDone=Ολοκληρωμένη @@ -62,7 +62,7 @@ LastProspectContactDone=Η επικοινωνία έγινε DateActionPlanned=Ημερ. προγραμματισμού DateActionDone=Ημερ. ολοκλήρωσης ActionAskedBy=Η ενέργεια ζητήθηκε από -ActionAffectedTo=Η ενέργεια αφορά τον/την +ActionAffectedTo=Εκδήλωση που ανήκει ActionDoneBy=Η ενέργεια έγινε από τον/την ActionUserAsk=Καταγράφηκε από τον/την ErrorStatusCantBeZeroIfStarted=Εάν το πεδίο 'Date done' είναι γεμάτο, η ενέργεια έχει αρχίσει (ή έχει τελειώσει), οπότε το πεδίο 'Status' δεν μπορεί να είναι 0%%. diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang index 2e5b6951bc6..c9aaba74e1a 100644 --- a/htdocs/langs/el_GR/compta.lang +++ b/htdocs/langs/el_GR/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, ε TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε ταμειακής λογιστικής mode is not relevant. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε λογιστικής δέσμευσης τρόπος (ανατρέξτε στην ενότητα Ρύθμιση της μονάδας λογιστικής). CalculationMode=Τρόπο υπολογισμού AccountancyJournal=Λογιστικος Κωδικός περιοδικό -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για αγορά των προϊόντων -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για πώληση προϊόντων -ACCOUNTING_SERVICE_BUY_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για αγορές υπηρεσιών -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για πώληση υπηρεσιών ACCOUNTING_VAT_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ ACCOUNTING_VAT_BUY_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτες diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang index 6b3e508c9af..cff09df3981 100644 --- a/htdocs/langs/el_GR/contracts.lang +++ b/htdocs/langs/el_GR/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Περιοχή Συμβολαίων ListOfContracts=Λίστα Συμβολαίων -LastModifiedContracts=Last %s modified contracts +LastModifiedContracts=Τελευταίες τροποποιημένες συμβάσεις %s AllContracts=Όλα τα συμβόλαια ContractCard=Κάρτέλα Συμβολαίου ContractStatus=Κατάσταση συμβολαίου @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=Λίστα τρέχουσων υπηρεσιών NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Υπηρεσίες προς ενεργοποίηση σε επικυρωμένα συμβόλαια -LastContracts=Last % contracts +LastContracts=Τελευταίες συμβάσεις %s LastActivatedServices=Last %s activated services LastModifiedServices=Last %s modified services EditServiceLine=Edit service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=Κατάλογος Υπηρεσιών προς λήξει NoteListOfYourExpiredServices=Αυτή η λίστα περιέχει μόνο τις υπηρεσίες των συμβάσεων για λογαριασμό ΠΕΛ./ΠΡΟΜ. που συνδέονται ως εκπρόσωπος πώληση. StandardContractsTemplate=Οι πρότυπες συμβάσεις ContactNameAndSignature=Για %s, το όνομα και η υπογραφή: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Σύμβαση πώλησης υπογραφή εκπροσώπου diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang index a9a19f31b89..4163539e47f 100644 --- a/htdocs/langs/el_GR/cron.lang +++ b/htdocs/langs/el_GR/cron.lang @@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Σχετικά με το περιβάλλον Unix θα CronExplainHowToRunWin=Στο Microsoft (tm) των Windows environement, μπορείτε να χρησιμοποιήσετε τα εργαλεία Προγραμματισμένη εργασία ώστε να εκτελεστεί μια γραμμή εντολών κάθε λιγα λεπτά # Menu CronJobs=Προγραμματισμένες εργασίες -CronListActive=List of active/scheduled jobs +CronListActive=Λίστα ενεργών/προγραμματισμένων εργασιών CronListInactive=Λίστα με τις απενεργοποιημένες εργασίες # Page list CronDateLastRun=Τελευταία εκτέλεση diff --git a/htdocs/langs/el_GR/deliveries.lang b/htdocs/langs/el_GR/deliveries.lang index f4c2175888a..9fe9b52b375 100644 --- a/htdocs/langs/el_GR/deliveries.lang +++ b/htdocs/langs/el_GR/deliveries.lang @@ -23,4 +23,6 @@ GoodStatusDeclaration=Παραδόθηκαν τα παραπάνω σε καλή Deliverer=Διανομέας : Sender=Αποστολέας Recipient=Παραλήπτης -# ErrorStockIsNotEnough=There's not enough stock +ErrorStockIsNotEnough=Δεν υπάρχει αρκετό απόθεμα +Shippable=Για Αποστολή +NonShippable=Δεν αποστέλλονται diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang index 885dc185b8e..67f1d9a24cd 100644 --- a/htdocs/langs/el_GR/errors.lang +++ b/htdocs/langs/el_GR/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Κωδικός προμηθευτή που απαιτ ErrorSupplierCodeAlreadyUsed=Κωδικός προμηθευτή που ήδη χρησιμοποιείται ErrorBadParameters=Λάθος παράμετρος ErrorBadValueForParameter=%s Λάθος τιμή για την παράμετρο λάθος %s -ErrorBadImageFormat=Το αρχείο εικόνας δεν έχει μια μορφή που υποστηρίζεται +ErrorBadImageFormat=Το αρχείο εικόνας δεν έχει μια υποστηριζόμενη μορφή (Η PHP σας δεν υποστηρίζει λειτουργίες για να μετατρέψετε τις εικόνες αυτής της μορφής) ErrorBadDateFormat=«%s« Αξία έχει λάθος μορφή ημερομηνίας ErrorWrongDate=Η ημερομηνία δεν είναι σωστή! ErrorFailedToWriteInDir=Αποτυχία εγγραφής στο %s κατάλογο @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Χρήστης με %s login δεν θα μπορ ErrorLoginHasNoEmail=Αυτός ο χρήστης δεν έχει τη διεύθυνση ηλεκτρονικού ταχυδρομείου. Επεξεργασία ματαιώθηκε. ErrorBadValueForCode=Κακό αξία για τον κωδικό ασφαλείας. Δοκιμάστε ξανά με νέα τιμή ... ErrorBothFieldCantBeNegative=Πεδία %s %s και δεν μπορεί να είναι τόσο αρνητικές όσο +ErrorQtyForCustomerInvoiceCantBeNegative=Η ποσότητα στην γραμμή στα τιμολόγια των πελατών δεν μπορεί να είναι αρνητική ErrorWebServerUserHasNotPermission=Λογαριασμό χρήστη %s χρησιμοποιείται για την εκτέλεση του web server δεν έχει άδεια για τη συγκεκριμένη ErrorNoActivatedBarcode=Δεν ενεργοποιείται τύπου barcode ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Σφάλμα, το μέλος ErrorThereIsSomeDeliveries=Σφάλμα υπάρχουν κάποιες παραδόσεις που συνδέονται με την εν λόγω αποστολή. Η διαγραφή απορρίφθηκε. ErrorCantDeletePaymentReconciliated=Δεν μπορείτε να διαγράψετε μια πληρωμή με τραπεζική συναλλαγή που είχε φτάσει σε συμβιβασμό ErrorCantDeletePaymentSharedWithPayedInvoice=Δεν μπορείτε να διαγράψετε μια πληρωμή που σχετίζεται με ένα τουλάχιστον τιμολόγιο με καθεστώς πληρωμένο +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/el_GR/externalsite.lang b/htdocs/langs/el_GR/externalsite.lang index 97d9a9ed48b..d9331df4fa4 100644 --- a/htdocs/langs/el_GR/externalsite.lang +++ b/htdocs/langs/el_GR/externalsite.lang @@ -2,4 +2,4 @@ ExternalSiteSetup=Ρύθμιση συνδέσμου σε εξωτερικό website ExternalSiteURL=Εξωτερικές διεύθυνσης URL ιστοσελίδας ExternalSiteModuleNotComplete=Το Module Εξωτερικά Site δεν έχει ρυθμιστεί σωστά. -ExampleMyMenuEntry=My menu entry +ExampleMyMenuEntry=Καταχώρηση του μενού μου diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang index 3b5743499f8..49147dc78f2 100644 --- a/htdocs/langs/el_GR/members.lang +++ b/htdocs/langs/el_GR/members.lang @@ -85,8 +85,7 @@ SubscriptionLateShort=Καθυστ. SubscriptionNotReceivedShort=Never received ListOfSubscriptions=List of subscriptions SendCardByMail=Send card by Email -AddMember=Προσθήκη μέλους -MemberType=Τύπος μέλους +AddMember=Δημιουργία μέλους NoTypeDefinedGoToSetup=Νέος τύπος μέλους. Πηγαίνετε στις Ρυθμίσεις -> Τύποι μελών NewMemberType=Νέος τύπος μέλους WelcomeEMail=Welcome e-mail @@ -126,7 +125,7 @@ Date=Date DateAndTime=Date and time PublicMemberCard=Member public card MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -AddSubscription=Add subscription +AddSubscription=Δημιουργία εγγραφής ShowSubscription=Show subscription MemberModifiedInDolibarr=Member modified in Dolibarr SendAnEMailToMember=Send information email to member @@ -171,6 +170,8 @@ LastSubscriptionAmount=Τελευταία ποσό συνδρομής MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη +MembersStatisticsByRegion=Στατιστικά Μελών ανά περιοχή +MemberByRegion=Μέλη ανά περιοχή NbOfMembers=Αριθμός μελών NoValidatedMemberYet=Δεν επικυρώνονται τα μέλη βρέθηκαν MembersByCountryDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από τις χώρες. Graphic εξαρτάται, ωστόσο, στην υπηρεσία της Google online διάγραμμα και είναι διαθέσιμο μόνο αν μια σύνδεση στο Διαδίκτυο είναι λειτουργεί. @@ -202,3 +203,4 @@ MembersByNature=Μέλη εκ φύσεως VATToUseForSubscriptions=Συντελεστή ΦΠΑ που θα χρησιμοποιηθεί για τις συνδρομές NoVatOnSubscription=No TVA for subscriptions MEMBER_PAYONLINE_SENDEMAIL=Στείλτε e-mail για να προειδοποιήσει όταν Dolibarr λάβετε μια επιβεβαίωση της μια επικυρωμένη πληρωμής για την εγγραφή +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Το προϊόν χρησιμοποιείται για τη γραμμή από συνδρομές στο τιμολόγιο: %s diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang index bee3ae37dd9..96495ea8aea 100644 --- a/htdocs/langs/el_GR/orders.lang +++ b/htdocs/langs/el_GR/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Μια αποστολή, υπάρχει DraftOrWaitingApproved=Draft or approved not yet ordered DraftOrWaitingShipped=Draft or validated not yet shipped MenuOrdersToBill=Παραγγελίες προς χρέωση -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Χρεώσιμες παραγγελίες SearchOrder=Εύρεση παραγγελίας SearchACustomerOrder=Αναζητήστε μία παραγγελία πελάτη ShipProduct=Ship product diff --git a/htdocs/langs/el_GR/paybox.lang b/htdocs/langs/el_GR/paybox.lang index f5df39595f7..54a2746121e 100644 --- a/htdocs/langs/el_GR/paybox.lang +++ b/htdocs/langs/el_GR/paybox.lang @@ -35,6 +35,6 @@ MessageKO=Μήνυμα για την ακύρωση σελίδα επιστρο NewPayboxPaymentReceived=Νέα πληρωμή Paybox που λήφθηκε NewPayboxPaymentFailed=Νέα πληρωμή Paybox προσπάθησαν αλλά απέτυχαν PAYBOX_PAYONLINE_SENDEMAIL=Στείλτε e-mail προειδοποιήσεις μετά από πληρωμή (επιτυχία ή όχι) -PAYBOX_PBX_SITE=Value for PBX SITE -PAYBOX_PBX_RANG=Value for PBX Rang -PAYBOX_PBX_IDENTIFIANT=Value for PBX ID +PAYBOX_PBX_SITE=Τιμή για PBX SITE +PAYBOX_PBX_RANG=Τιμή για PBX Rang +PAYBOX_PBX_IDENTIFIANT=Τιμή για PBX ID diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang index 34449987715..bdc764a85d2 100644 --- a/htdocs/langs/el_GR/products.lang +++ b/htdocs/langs/el_GR/products.lang @@ -80,12 +80,12 @@ ContractStatusClosed=Κλειστό ContractStatusRunning=Ενεργό ContractStatusExpired=Ληγμένο ContractStatusOnHold=Ανενεργό -ContractStatusToRun=To get running +ContractStatusToRun=Για να πάρετε την εκτέλεση ContractNotRunning=Το Συμβόλαιο είναι Ανενεργό ErrorProductAlreadyExists=Ένα προϊόν με κωδικό %s υπάρχει ήδη. ErrorProductBadRefOrLabel=Λάθος τιμή για την αναφορά ή την ετικέτα. ErrorProductClone=Υπήρξε ένα πρόβλημα κατά την προσπάθεια για την κλωνοποίηση του προϊόντος ή της υπηρεσίας. -ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +ErrorPriceCantBeLowerThanMinPrice=Σφάλμα η τιμή δεν μπορεί να είναι χαμηλότερη από την ελάχιστο τιμή. Suppliers=Προμηθευτές SupplierRef=Κωδ. Προμηθευτή ShowProduct=Εμφάνιση προϊόντων @@ -117,12 +117,12 @@ ServiceLimitedDuration=Εάν το προϊόν είναι μια υπηρεσί MultiPricesAbility=Πολλά επίπεδα των τιμών ανά προϊόν/υπηρεσία MultiPricesNumPrices=Αριθμός τιμής MultiPriceLevelsName=Κατηγορίες τιμών -AssociatedProductsAbility=Ενεργοποίηση υποπροϊόντων -AssociatedProducts=Υποπροϊόντα -AssociatedProductsNumber=Πλήθος προϊόντων που συνθέτουν αυτό το προϊόν -ParentProductsNumber=Αριθμός προϊόντος μητρικής -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Ενεργοποίηση της δυνατότητας εικονικών πακέτων +AssociatedProducts=Πακέτο προϊόντων +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Συσχέτιση Translation=Μετάφραση KeywordFilter=Φίλτρο λέξης-κλειδιού @@ -132,7 +132,7 @@ AddDel=Προσθήκη/Διαγραφή Quantity=Ποσότητα NoMatchFound=Δεν βρέθηκε κατάλληλη εγγραφή ProductAssociationList=Κατάλογος των σχετικών προϊόντων / υπηρεσιών: το όνομα του προϊόντος / υπηρεσίας (επηρεάζονται ποσότητα) -ProductParentList=Κατάλογος των προϊόντων / υπηρεσιών με αυτό το προϊόν ως συστατικό +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Ένα από τα προϊόντα που θα επιλεγούν είναι γονέας με την τρέχουσα προϊόν DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας ConfirmDeleteProduct=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το προϊόν / υπηρεσία; @@ -179,7 +179,7 @@ CloneProduct=Κλώνοποίηση προϊόντος ή υπηρεσίας ConfirmCloneProduct=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσει το προϊόν ή την υπηρεσία %s; CloneContentProduct=Κλώνος όλες τις κύριες πληροφορίες του προϊόντος / υπηρεσίας ClonePricesProduct=Κλώνος κύριες πληροφορίες και τιμές -CloneCompositionProduct=Εικονικός κλώνος προϊόντων/υπηρεσιών +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Μεταχειρισμένο NewRefForClone=Ref. of new product/service CustomerPrices=Τιμές πελατών @@ -240,5 +240,10 @@ PricingRule=Κανόνες τιμολόγησης AddCustomerPrice=Προσθέστε τιμή των πελατών ForceUpdateChildPriceSoc=Ορισμός ίδιας τιμής για τις θυγατρικές του πελάτη PriceByCustomerLog=Τιμή ανά πελάτη log -MinimumPriceLimit=Minimum price can't be lower that %s -MinimumRecommendedPrice=Minimum recommended price is : %s +MinimumPriceLimit=Ελάχιστη τιμή δεν μπορεί να είναι μικρότερη από %s +MinimumRecommendedPrice=Ελάχιστη συνιστώμενη τιμή είναι: %s +PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών +PriceExpressionSelected=Επιλογή συνάρτησης τιμών +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Αριθμός diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang index 77b4de1917c..eba1f92f7b3 100644 --- a/htdocs/langs/el_GR/projects.lang +++ b/htdocs/langs/el_GR/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα κ Myprojects=Τα έργα μου ProjectsArea=Περιοχή Έργων NewProject=Νέο Έργο -AddProject=Προσθήκη Έργου +AddProject=Δημιουργία έργου DeleteAProject=Διαγραφή Έργου DeleteATask=Διαγραφή Εργασίας ConfirmDeleteAProject=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το έργο; @@ -36,6 +36,8 @@ TaskTimeSpent=Ο χρόνος που δαπανάται σε εργασίες TaskTimeUser=Χρήστης TaskTimeNote=Σημείωση TaskTimeDate=Ημερομηνία +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Νέος χρόνος που δαπανάται MyTimeSpent=Ο χρόνος μου πέρασε MyTasks=Οι Εργασίες μου @@ -45,7 +47,7 @@ TaskDateStart=Ημερομηνία έναρξης εργασιών TaskDateEnd=Ημερομηνία λήξης εργασιών TaskDescription=Περιγραφή των εργασιών NewTask=Νέα Εργασία -AddTask=Προσθήκη Εργασίας +AddTask=Δημιουργία εργασίας AddDuration=Προσθήκη Διάρκειας Activity=Δραστηριότητα Activities=Εργασίες/Δραστηριότητες diff --git a/htdocs/langs/el_GR/resource.lang b/htdocs/langs/el_GR/resource.lang index 1139926a95e..a28060f39b6 100644 --- a/htdocs/langs/el_GR/resource.lang +++ b/htdocs/langs/el_GR/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Επιβεβαιώστε την διαγραφή αυτο RessourceSuccessfullyDeleted=Ο Πόρος διαγράφηκε με επιτυχία DictionaryResourceType=Το είδος των πόρων -DictionaryEMailTemplates=Μοντέλα των Emails - SelectResource=Επιλέξτε πόρο diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang index f0364df4db5..2b00a7dfb0b 100644 --- a/htdocs/langs/el_GR/sendings.lang +++ b/htdocs/langs/el_GR/sendings.lang @@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=Προς το παρόν, η δημιουργί RelatedShippings=Σχετικές αποστολές ShipmentLine=Σειρά αποστολής CarrierList=Κατάλογος των μεταφορέων -SendingRunning=Product from customer order already sent -SuppliersReceiptRunning=Product from supplier order already received +SendingRunning=Προϊόν από παραγγελία του πελάτη που έχει ήδη αποσταλεί +SuppliersReceiptRunning=Προϊόν από παραγγελία προμηθευτή έχει ληφθεί # Sending methods SendingMethodCATCH=Πιάσε τον πελάτη diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang index c826f4f78e6..4de061f4c84 100644 --- a/htdocs/langs/el_GR/trips.lang +++ b/htdocs/langs/el_GR/trips.lang @@ -4,7 +4,7 @@ Trips=Ταξίδια TripsAndExpenses=Ταξίδια και έξοδα TripsAndExpensesStatistics=Στατιστικά ταξιδιών και εξόδων TripCard=Καρτέλα ταξιδιού -AddTrip=Προσθήκη ταξιδιού +AddTrip=Δημιουργία ταξιδιού ListOfTrips=Λίστα ταξιδιών ListOfFees=Λίστα φόρων NewTrip=Νέο ταξίδι @@ -19,4 +19,4 @@ TF_TRIP=Ταξίδι ListTripsAndExpenses=Λίστα ταξιδιών και εξόδων ExpensesArea=Ταξίδια και έξοδα περιοχή SearchATripAndExpense=Αναζήτηση ένα ταξίδι και τα έξοδα -ClassifyRefunded=Classify 'Refunded' +ClassifyRefunded=Ταξινομήστε «επιστραφεί» diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang index 318a2054c4d..68794752db8 100644 --- a/htdocs/langs/el_GR/users.lang +++ b/htdocs/langs/el_GR/users.lang @@ -102,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group %s modified +GroupModified=Ομάδα %s τροποποιημένη GroupDeleted=Group %s removed ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang index 68a92beb6cf..fe1365fda56 100644 --- a/htdocs/langs/el_GR/withdrawals.lang +++ b/htdocs/langs/el_GR/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Πιστωτικές με WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Εμφάνιση Ανάληψη IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο δεν έχει τουλάχιστον μία πληρωμή απόσυρσης ακόμη σε επεξεργασία, δεν θα πρέπει να οριστεί ως καταβληθέν θα επιτρέψει εκ των προτέρων την απόσυρση από την διαχείριση. -DoStandingOrdersBeforePayments=Αυτή η καρτέλα σας επιτρέπει να ζητήσετε μια πάγια εντολή. Από τη στιγμή που έχει ολοκληρωθεί, μπορείτε να πληκτρολογήσετε την πληρωμή για να κλείσει το τιμολόγιο. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Απόσυρση αρχείο SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου" ThisWillAlsoAddPaymentOnInvoice=Αυτό θα ισχύει επίσης για τις πληρωμές προς τα τιμολόγια και θα τα χαρακτηρίσουν ως "Πληρωμένα" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Η πληρωμή των πάγιων %s ώστε από την τράπεζα diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang index feb1581d674..db154055b67 100644 --- a/htdocs/langs/es_ES/agenda.lang +++ b/htdocs/langs/es_ES/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Eventos asignados a ActionsDoneBy=Eventos realizados por ActionsForUser=Acontecimientos del usuario ActionsForUsersGroup=Acontecimientos de todos los usuarios del grupo +ActionAssignedTo=Event assigned to AllMyActions= Todos mis eventos/tareas AllActions= Todos los eventos/tareas ViewList=Vista listado diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index ded2c3c764e..f6eaf40f12b 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=de acuerdo con el proveedor, seleccione el método a TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de ventas por producto, cuando se utiliza en modo contabilidad de caja no es relevante. Este informe sólo está disponible cuando se utiliza en modo contabilidad de compromiso (consulte la configuración del módulo de contabilidad). CalculationMode=Modo de cálculo AccountancyJournal=Código contable diario -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Código contable por defecto para la compra de productos -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Código contable por defecto para la venta de productos -ACCOUNTING_SERVICE_BUY_ACCOUNT=Código contable por defecto para la compra de servicios -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Código contable por defecto para la venta de servicios ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang index 6e8cc61b5c4..c9e59a17cd6 100644 --- a/htdocs/langs/es_ES/contracts.lang +++ b/htdocs/langs/es_ES/contracts.lang @@ -91,6 +91,7 @@ ListOfServicesToExpire=Listado de servicios activos a expirar NoteListOfYourExpiredServices=Este listado contiene solamente los servicios de contratos de terceros de los que usted es comercial StandardContractsTemplate=Modelo de contrato estandar ContactNameAndSignature=Para %s, nombre y firma: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Comercial firmante del contrato diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang index 1762411d3c8..98c4a32016d 100644 --- a/htdocs/langs/es_ES/withdrawals.lang +++ b/htdocs/langs/es_ES/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Abonada el WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado) ShowWithdraw=Ver domiciliación IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación. -DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez terminada, puede ingresar el pago en la factura para proceder a su cierre. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Archivo de la domiciliación SetToStatusSent=Clasificar como "Archivo enviado" ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificará como pagadas +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Abono de domiciliación %s por el banco diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 521306c2df7..105335add8e 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Kasuta kolmandate isikute valimiseks nimekirja asemel a ActivityStateToSelectCompany= Lisa filter, mis võimaldab filtreerida kolmandaid isikuid nende aktiivsuse järgi. UseSearchToSelectContactTooltip=Suure kolmandate isikute arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi CONTACT_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega. UseSearchToSelectContact=Kasuta kontakti valimiseks nimekirja asemel automaatsete vastete pakkumisega välju +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Otsingufiltrite seaded NumberOfKeyToSearch=Sisestatud märkide arv otsingu käivitamiseks: %s ViewFullDateActions=Näita terve päev kestvaid sündmusi kolmandal lehel @@ -208,6 +210,7 @@ ModulesJobDesc=Ärimoodulid pakuvad lihtsat, eelnevalt määratletud Dolibarri s ModulesMarketPlaceDesc=Alla laadimiseks leiad rohkem mooduleid Internetist. ModulesMarketPlaces=Rohkem mooduleid... DoliStoreDesc=DoliStore on ametlik Dolibarr ERP/CRM moodulite müümiseks kasutatav koht +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Veebimajutuse pakkujad, kust võib otsida rohkem mooduleid. URL=Link BoxesAvailable=Saadaval kastid @@ -444,7 +447,7 @@ Module55Desc=Vöötkoodide haldamine Module56Name=Telefonitehnika Module56Desc=Telefonitehnika integratsioon Module57Name=Püsikorraldused -Module57Desc=Püsikorralduste ja väljamaksete haldamine +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial süsteemiga (Asterisk jne) integreerimine Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS voog Module320Desc=Lisa RSS voog Dolibarri lehtedele Module330Name=Järjehoidjad Module330Desc=Järjehoidjate haldamine -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=WebCalendari integratsioon Module500Name=Erikulud (maksud, sotsiaalmaks, dividendid) @@ -495,6 +498,8 @@ Module1780Name=Kategooriad Module1780Desc=Kategooriate haldamine (tooted, hankijad ja kliendid) Module2000Name=WYSIWYG toimeti Module2000Desc=Luba mõnede tekstialade toimetamist võimsama toimetiga +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cro Module2300Desc=Ajastatud tegevuste haldamine Module2400Name=Päevakava @@ -503,6 +508,8 @@ Module2500Name=Dokumendihaldus Module2500Desc=Salvesta ja jaga dokumente Module2600Name=Veebiteenused Module2600Desc=Lülita Dolibarri veebiteenuste server sisse +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Kasuta Gravatar (www.gravatar.com) teenust, et näidata kasutajate/liikmete pilte (loodud nende e-posti aadresside põhjal). Vajab Interneti ligipääsu. Module2800Desc=FTP klient @@ -517,7 +524,7 @@ Module6000Desc=Töövoo haldamine Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Moodul, mis pakub online-makse võimalust krediitkaardiga PayBoxi abil Module50100Name=Kassa @@ -527,7 +534,7 @@ Module50200Desc=Moodul, mis pakub online-makse võimalust krediitkaardiga Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Trüki Cups IPP printeri abil +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Ava küsitlus Module55000Desc=Online küsitluste korraldamise moodul (nagu Doodle, Studs, Rdvz jms) Module59000Name=Marginaalid @@ -779,6 +786,7 @@ DictionaryOrderMethods=Tellimisviisid DictionarySource=Pakkumiste/tellimuste päritolu DictionaryAccountancyplan=Kontode graafik DictionaryAccountancysystem=Kontoplaani mudelid +DictionaryEMailTemplates=Emails templates SetupSaved=Seadistused salvestatud BackToModuleList=Tagasi moodulite nimekirja BackToDictionaryList=Tagasi sõnastike nimekirja @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Vasakus menüüs on alati otsingu vorm DefaultLanguage=Vaikimisi kasutatav keel (keele kood) EnableMultilangInterface=Luba mitmekeelne liides EnableShowLogo=Näita vasakul menüüs logo +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Süsteem on edukalt uuendatud CompanyInfo=Ettevõtte/ühenduse info CompanyIds=Ettevõtte/ühenduse andmed diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang index 33637161b33..743d827082a 100644 --- a/htdocs/langs/et_EE/agenda.lang +++ b/htdocs/langs/et_EE/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Tegevused, mis on seotud ActionsDoneBy=Tegevused, mille tegi ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Kõik minu tegevused/ülesanded AllActions= Kõik tegevused/ülesanded ViewList=Nimekirja vaade diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang index ef36af93d4a..4dba49aa2f3 100644 --- a/htdocs/langs/et_EE/compta.lang +++ b/htdocs/langs/et_EE/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=vastavalt hankijale, vali sobiv meetod sama reegli r TurnoverPerProductInCommitmentAccountingNotRelevant=Käibearuanne toote kaupa, kassapõhist raamatupidamist kasutades pole režiim oluline. See aruanne on saadaval vaid tekkepõhist raamatupidamist kasutades (vaata raamatupidamise mooduli seadistust). CalculationMode=Arvutusrežiim AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/et_EE/contracts.lang b/htdocs/langs/et_EE/contracts.lang index a141c00a1e9..cdf9a5c2b82 100644 --- a/htdocs/langs/et_EE/contracts.lang +++ b/htdocs/langs/et_EE/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Aktiivsete lepinguridade nimekiri ListOfRunningServices=Aktiivsete teenuste nimekiri NotActivatedServices=Mitteaktiivsed teenused (kinnitatud lepingutel) BoardNotActivatedServices=Teenused, mida aktiveerida kinnitatud lepingutel -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Viimased %s aktiveeritud teenust LastModifiedServices=Viimased %s muudetud teenust EditServiceLine=Muuda teenuse rida @@ -91,6 +91,7 @@ ListOfServicesToExpire=Aeguvate teenuste nimekiri NoteListOfYourExpiredServices=See nimekiri sisaldab vaid nende lepingute teenuseid, millega seotud kolmandate isikute kohta oled märgitud müügiesindajaks StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Lepingu allkirjastanud müügiesindaja diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang index 745184c4a4a..ade13da068e 100644 --- a/htdocs/langs/et_EE/errors.lang +++ b/htdocs/langs/et_EE/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Hankija kood on nõutud ErrorSupplierCodeAlreadyUsed=Hankija kood on juba kasutuses ErrorBadParameters=Halvad parameetrid ErrorBadValueForParameter=Vale väärtus '%s' parameetri jaoks ebaõige '%s' -ErrorBadImageFormat=Pildifaili vorming ei ole toetatud +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Väärtus '%s' on vales kuupäeva vormingus ErrorWrongDate=Kuupäev pole korrektne! ErrorFailedToWriteInDir=Ei suutnud kirjutada kausta %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Kasutajanime %s ei leitud. ErrorLoginHasNoEmail=Antud kasutajal ei ole e-posti aadressi. Protsess katkestatud. ErrorBadValueForCode=Turvakoodi halb väärtus. Proovi uuesti... ErrorBothFieldCantBeNegative=Mõlemad väljad %s ja %s ei saa olla negatiivse väärtusega +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Veebiserveri käivitamiseks kasutataval kontrol %s ei ole selleks õigusi ErrorNoActivatedBarcode=Ühtki vöötkoodi tüüpi pole aktiveeritud ErrUnzipFails=%s lahti pakkimine ZipArchivega ebaõnnestus @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Kohustuslikud seadistusparameetrid on määratlemata diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang index 69780d9c441..7eeb8340553 100644 --- a/htdocs/langs/et_EE/members.lang +++ b/htdocs/langs/et_EE/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Hilinenud SubscriptionNotReceivedShort=Pole kunagi saanud ListOfSubscriptions=Liikmemaksude nimekir SendCardByMail=Saada kaart e-postiga -AddMember=Lisa liige +AddMember=Create member NoTypeDefinedGoToSetup=Liikmetüüpe pole määratletud. Mine menüüsse "Liikmetüübid" NewMemberType=Uus liikmetüüp WelcomeEMail=E-kiri tervitamiseks @@ -125,7 +125,7 @@ Date=Kuupäev DateAndTime=Kuupäev ja kellaaeg PublicMemberCard=Liikme avalik kaar MemberNotOrNoMoreExpectedToSubscribe=Ei ole liige või ei ole oodatud liikmeks astuma -AddSubscription=Lisa liikmelisus +AddSubscription=Create subscription ShowSubscription=Kuva liikmelisus MemberModifiedInDolibarr=Liige on Dolibarris muudetud SendAnEMailToMember=Saada informatsioon e-posti teel liikmele @@ -203,3 +203,4 @@ MembersByNature=Liikmed loomuse alusel VATToUseForSubscriptions=Liikmemaksude jaoks kasutatav KM määr NoVatOnSubscription=Liikmemaksudel ei ole KM MEMBER_PAYONLINE_SENDEMAIL=E-posti aadress, kuhu saadetakse hoiatus, kui Dolibarr on saanud liikmemaksu tasumise kinnituse +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang index e37fa0d2eb5..df8001d04b8 100644 --- a/htdocs/langs/et_EE/products.lang +++ b/htdocs/langs/et_EE/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Kui toode on piiratud kestusega teenus: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Hindasid MultiPriceLevelsName=Kategooriate hinnad -AssociatedProductsAbility=Aktiveeri virtuaalsete toodete võimalus -AssociatedProducts=Virtuaalne toode -AssociatedProductsNumber=Toodete arv, millest antud virtuaalne toode koosenb -ParentProductsNumber=Antud toodet kasutavate virtuaalsete toodete arv -IfZeroItIsNotAVirtualProduct=Kui 0, siis ei ole tegu virtuaalse tootega -IfZeroItIsNotUsedByVirtualProduct=Kui 0, siis ei kasuta seda toodet ükski virtuaalne toode +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Seosta Translation=Tõlge KeywordFilter=Märksõnade filter @@ -132,7 +132,7 @@ AddDel=Lisa/kustuta Quantity=Kogus NoMatchFound=Ühtki vastet ei leitud ProductAssociationList=Seotud toodete/teenuste nimekiri: toote/teenuse nimi (mõjutatud kogusest) -ProductParentList=Virtuaalsete toodete/teenuste nimekiri, mis kasutavad ühe komponendina antud toodet +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Üks valitud toodetest kasutab antud toodet DeleteProduct=Kustuta toode/teenus ConfirmDeleteProduct=Kas oled täiesti kindel, et soovid antud toote/teenuse kustutada? @@ -179,7 +179,7 @@ CloneProduct=Klooni toode või teenus ConfirmCloneProduct=Kas oled täiesti kindel, et soovid kloonida toote või teenuse %s? CloneContentProduct=Klooni toote/teenuse kogu põhiline info ClonePricesProduct=Klooni põhiline info ja hinnad -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Seda toodet kasutatakse NewRefForClone=Uue toote/teenuse viide CustomerPrices=Klientide hinnad @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang index ecb040b20a8..2cf8253da79 100644 --- a/htdocs/langs/et_EE/projects.lang +++ b/htdocs/langs/et_EE/projects.lang @@ -14,7 +14,7 @@ TasksDesc=See vaade näitab kõiki projekte ja ülesandeid (sinu kasutajaõiguse Myprojects=Minu projektid ProjectsArea=Projektide ala NewProject=Uus projekt -AddProject=Lisa projekt +AddProject=Create project DeleteAProject=Kustuta projekt DeleteATask=Kustuta ülesanne ConfirmDeleteAProject=Kas oled kindel, et soovid selle projekti kustutada? @@ -36,6 +36,8 @@ TaskTimeSpent=Ülesannetel kulutatud aeg TaskTimeUser=Kasutaja TaskTimeNote=Märkus TaskTimeDate=Kuupäev +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Aeg kulutatud uuesti MyTimeSpent=Minu poolt kulutatud aeg MyTasks=Minu ülesanded @@ -45,7 +47,7 @@ TaskDateStart=Ülesande alguse kuupäev TaskDateEnd=Ülesande lõpu kuupäev TaskDescription=Ülesande kirjeldus NewTask=Uus ülesanne -AddTask=Lisa ülesanne +AddTask=Create task AddDuration=Lisa kestus Activity=Aktiivsus Activities=Ülesanded/toimingud diff --git a/htdocs/langs/et_EE/resource.lang b/htdocs/langs/et_EE/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/et_EE/resource.lang +++ b/htdocs/langs/et_EE/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang index 91e9f23d8db..be438a477ad 100644 --- a/htdocs/langs/et_EE/withdrawals.lang +++ b/htdocs/langs/et_EE/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Krediteeri WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Näita väljamakset IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Juhul kui arvel on vähemalt üks töötlemata väljamakse, ei märgita seda makstuks, et lubada eelnevat väljamakse haldamist. -DoStandingOrdersBeforePayments=See sakk võimaldab taotleda püsikorraldust. Pärast selle lõpetamist saad sisestada makse arve sulgemiseks. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Väljamaksete fail SetToStatusSent=Märgi staatuseks 'Fail saadetud' ThisWillAlsoAddPaymentOnInvoice=See rakendub ka arvetega seotud maksetele ja liigitab nad "Makstud" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Otsekorralduse makse %s panga poolt diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang index af502ac5720..cbdb7bc6d98 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Bilaketa-iragazien aukerak NumberOfKeyToSearch=Nbr of characters to trigger search: %s ViewFullDateActions=Show full dates events in the third sheet @@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=Modulu gehiago... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Esteka BoxesAvailable=Eskuragarri dauden kutxak @@ -444,7 +447,7 @@ Module55Desc=Barra-kodeak kudeatzea Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS kanala Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Laster-markak Module330Desc=Laster-markak kudeatzea -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Web-egutegia Module410Desc=Web-egutegiaren integrazioa Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Kategoriak Module1780Desc=Kategoriak kudeatzea (produktuak, hornitzaileak eta bezeroak) Module2000Name=WYSIWYG editorea Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Dokumentuak gorde eta partekatu Module2600Name=Web-zerbitzuak Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Bezeroa @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales @@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Marjinak @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang index 1ed4e637d14..e5470c8011a 100644 --- a/htdocs/langs/eu_ES/agenda.lang +++ b/htdocs/langs/eu_ES/agenda.lang @@ -1,22 +1,22 @@ # Dolibarr language file - Source file is en_US - agenda IdAgenda=ID event -Actions=Events +Actions=Gertaerak ActionsArea=Events area (Actions and tasks) Agenda=Agenda -Agendas=Agendas -Calendar=Calendar -Calendars=Calendars +Agendas=Agendak +Calendar=Egutegia +Calendars=Egutegiak LocalAgenda=Internal calendar ActionsOwnedBy=Event owned by AffectedTo=Assigned to DoneBy=Done by Event=Event -Events=Events -EventsNb=Number of events -MyEvents=My events +Events=Gertaerak +EventsNb=Gertaera kopurua +MyEvents=Nire gertaerak OtherEvents=Other events -ListOfActions=List of events -Location=Location +ListOfActions=Gertaeren zerrenda +Location=Kokapena EventOnFullDay=Event on all day(s) SearchAnAction= Search an event/task MenuToDoActions=All incomplete events @@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= All my events/tasks AllActions= All events/tasks ViewList=List view diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang index 81b7515a8b8..d20b6762937 100644 --- a/htdocs/langs/eu_ES/bills.lang +++ b/htdocs/langs/eu_ES/bills.lang @@ -56,28 +56,28 @@ SupplierBill=Supplier invoice SupplierBills=suppliers invoices Payment=Payment PaymentBack=Payment back -Payments=Payments +Payments=Ordainketak PaymentsBack=Payments back PaidBack=Paid back -DatePayment=Payment date -DeletePayment=Delete payment -ConfirmDeletePayment=Are you sure you want to delete this payment ? +DatePayment=Ordainketa data +DeletePayment=Ordainketa ezabatu +ConfirmDeletePayment=Ziur zaude ordainketa hay ezabatu nahi duzuna? ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?
The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer. -SupplierPayments=Suppliers payments -ReceivedPayments=Received payments -ReceivedCustomersPayments=Payments received from customers +SupplierPayments=Hornitzaileei ordainketak +ReceivedPayments=Jasotako ordainketak +ReceivedCustomersPayments=Bezeroen jasotako ordainketak PayedSuppliersPayments=Payments payed to suppliers -ReceivedCustomersPaymentsToValid=Received customers payments to validate -PaymentsReportsForYear=Payments reports for %s -PaymentsReports=Payments reports -PaymentsAlreadyDone=Payments already done +ReceivedCustomersPaymentsToValid=Balidatu beharreko bezeroen jasotako ordainketak +PaymentsReportsForYear=%s ordainketen txostena +PaymentsReports=Ordainketen txostena +PaymentsAlreadyDone=Jada egindako ordainketak PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule -PaymentMode=Payment type +PaymentMode=Ordainketa mota PaymentConditions=Payment term PaymentConditionsShort=Payment term -PaymentAmount=Payment amount -ValidatePayment=Validate payment +PaymentAmount=Ordainketaren zenbatekoa +ValidatePayment=Ordainketak balioztatu PaymentHigherThanReminderToPay=Payment higher than reminder to pay HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices. HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm. @@ -93,8 +93,8 @@ DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice SearchASupplierInvoice=Search for a supplier invoice CancelBill=Cancel an invoice -SendRemindByMail=Send reminder by EMail -DoPayment=Do payment +SendRemindByMail=Oroigarria e-postaz bidali +DoPayment=Ordainketa egin DoPaymentBack=Do payment back ConvertToReduc=Convert into future discount EnterPaymentReceivedFromCustomer=Enter payment received from customer @@ -140,13 +140,13 @@ NewBill=New invoice LastBills=Last %s invoices LastCustomersBills=Last %s customers invoices LastSuppliersBills=Last %s suppliers invoices -AllBills=All invoices +AllBills=Faktura guztiak OtherBills=Other invoices -DraftBills=Draft invoices +DraftBills=Fakturen zirriborroak CustomersDraftInvoices=Customers draft invoices SuppliersDraftInvoices=Suppliers draft invoices -Unpaid=Unpaid -ConfirmDeleteBill=Are you sure you want to delete this invoice ? +Unpaid=Ordaindu gabekoak +ConfirmDeleteBill=Ziur zaude faktura hau ezabatu nahi duzuna? ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s ? ConfirmUnvalidateBill=Are you sure you want to change invoice %s to draft status ? ConfirmClassifyPaidBill=Are you sure you want to change invoice %s to status paid ? @@ -157,7 +157,7 @@ ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. -ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer +ConfirmClassifyPaidPartiallyReasonBadCustomer=Bezero txarra ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction») @@ -171,21 +171,21 @@ ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other case ConfirmCustomerPayment=Do you confirm this payment input for %s %s ? ConfirmSupplierPayment=Do you confirm this payment input for %s %s ? ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated. -ValidateBill=Validate invoice -UnvalidateBill=Unvalidate invoice +ValidateBill=Faktura balioztatu +UnvalidateBill=Faktura baliogabeta NumberOfBills=Nb of invoices NumberOfBillsByMonth=Nb of invoices by month -AmountOfBills=Amount of invoices +AmountOfBills=Faktura kopurua AmountOfBillsByMonthHT=Amount of invoices by month (net of tax) ShowSocialContribution=Show social contribution -ShowBill=Show invoice -ShowInvoice=Show invoice +ShowBill=Faktura erakutsi +ShowInvoice=Faktura erakutsi ShowInvoiceReplace=Show replacing invoice ShowInvoiceAvoir=Show credit note ShowInvoiceDeposit=Show deposit invoice -ShowPayment=Show payment -File=File -AlreadyPaid=Already paid +ShowPayment=Ordainketa erakutsi +File=Fitxategia +AlreadyPaid=Jada ordainduta AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Abandoned diff --git a/htdocs/langs/eu_ES/bookmarks.lang b/htdocs/langs/eu_ES/bookmarks.lang index c04d25c328d..c8c45f1b49e 100644 --- a/htdocs/langs/eu_ES/bookmarks.lang +++ b/htdocs/langs/eu_ES/bookmarks.lang @@ -1,19 +1,19 @@ # Dolibarr language file - Source file is en_US - marque pages -# AddThisPageToBookmarks=Add this page to bookmarks -# Bookmark=Bookmark -# Bookmarks=Bookmarks -# NewBookmark=New bookmark -# ShowBookmark=Show bookmark -# OpenANewWindow=Open a new window -# ReplaceWindow=Replace current window -# BookmarkTargetNewWindowShort=New window -# BookmarkTargetReplaceWindowShort=Current window -# BookmarkTitle=Bookmark title -# UrlOrLink=URL -# BehaviourOnClick=Behaviour when a URL is clicked -# CreateBookmark=Create bookmark -# SetHereATitleForLink=Set a title for the bookmark -# UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL -# ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window -# BookmarksManagement=Bookmarks management -# ListOfBookmarks=List of bookmarks +AddThisPageToBookmarks=Orrialde hau laster-marketara gehitu +Bookmark=Laster-marka +Bookmarks=Laster-markak +NewBookmark=Laster-marka berria +ShowBookmark=Erakutsi laster-marka +OpenANewWindow=Leiho berria irekia +ReplaceWindow=Oraingo leihoa ordezkatu +BookmarkTargetNewWindowShort=Leiho berria +BookmarkTargetReplaceWindowShort=Oraingo leihoa +BookmarkTitle=Laster-markaren izenburua +UrlOrLink=URL +BehaviourOnClick=Behaviour when a URL is clicked +CreateBookmark=Laster-marka sortu +SetHereATitleForLink=Laster-markaren izenburua ezarri +UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL +ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window +BookmarksManagement=Laster-marken kudeaketa +ListOfBookmarks=Laster-marken zerrenda diff --git a/htdocs/langs/eu_ES/commercial.lang b/htdocs/langs/eu_ES/commercial.lang index e7d2de76503..b83fe1d4671 100644 --- a/htdocs/langs/eu_ES/commercial.lang +++ b/htdocs/langs/eu_ES/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospects DeleteAction=Delete an event/task NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete @@ -62,7 +62,7 @@ LastProspectContactDone=Contact done DateActionPlanned=Date event planned for DateActionDone=Date event done ActionAskedBy=Event reported by -ActionAffectedTo=Event assigned to +ActionAffectedTo=Event owned by ActionDoneBy=Event done by ActionUserAsk=Reported by ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%. @@ -90,7 +90,7 @@ FromTo=from %s to %s MargeOrder=Margins (validated orders) RecapAnnee=Summary of the year NoData=There is no data -StatusProsp=Prospect status +StatusProsp=Proiektuaren egoera DraftPropals=Draft commercial proposals SearchPropal=Search a commercial proposal CommercialDashboard=Commercial summary diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang index 5580d87b517..e51242ae01b 100644 --- a/htdocs/langs/eu_ES/companies.lang +++ b/htdocs/langs/eu_ES/companies.lang @@ -233,15 +233,15 @@ ProfId3RU=Prof Id 3 (KPP) ProfId4RU=Prof Id 4 (OKPO) ProfId5RU=- ProfId6RU=- -VATIntra=VAT number -VATIntraShort=VAT number -VATIntraVeryShort=VAT +VATIntra=BEZ zenbakia +VATIntraShort=BEZ zenbakia +VATIntraVeryShort=BEZ VATIntraSyntaxIsValid=Syntax is valid VATIntraValueIsValid=Value is valid ProspectCustomer=Prospect / Customer Prospect=Prospect CustomerCard=Customer Card -Customer=Customer +Customer=Bezeroa CustomerDiscount=Customer Discount CustomerRelativeDiscount=Relative customer discount CustomerAbsoluteDiscount=Absolute customer discount @@ -257,19 +257,19 @@ CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself) DefaultDiscount=Default discount AvailableGlobalDiscounts=Absolute discounts available DiscountNone=None -Supplier=Supplier +Supplier=Hornitzailea CompanyList=Company's list -AddContact=Add contact -AddContactAddress=Add contact/address -EditContact=Edit contact -EditContactAddress=Edit contact/address -Contact=Contact -ContactsAddresses=Contacts/Addresses +AddContact=Kontaktua sortu +AddContactAddress=Kontua/helbidea sortu +EditContact=Kontaktua editatu +EditContactAddress=Kontaktua/helbidea editatu +Contact=Kontaktua +ContactsAddresses=Kontaktua/helbidea NoContactDefinedForThirdParty=No contact defined for this third party NoContactDefined=No contact defined DefaultContact=Default contact/address -AddCompany=Add company -AddThirdParty=Add third party +AddCompany=Create company +AddThirdParty=Create third party DeleteACompany=Delete a company PersonalInformations=Personal data AccountancyCode=Accountancy code @@ -379,8 +379,8 @@ DeliveryAddressLabel=Delivery address label DeleteDeliveryAddress=Delete a delivery address ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address? NewDeliveryAddress=New delivery address -AddDeliveryAddress=Add address -AddAddress=Add address +AddDeliveryAddress=Create address +AddAddress=Create address NoOtherDeliveryAddress=No alternative delivery address defined SupplierCategory=Supplier category JuridicalStatus200=Independant diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang index 9fe5eff520d..878eb49b3c9 100644 --- a/htdocs/langs/eu_ES/compta.lang +++ b/htdocs/langs/eu_ES/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/eu_ES/contracts.lang b/htdocs/langs/eu_ES/contracts.lang index 511516dc755..57ba3bb15d8 100644 --- a/htdocs/langs/eu_ES/contracts.lang +++ b/htdocs/langs/eu_ES/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=List of running services NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Services to activate among validated contracts -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Last %s activated services LastModifiedServices=Last %s modified services EditServiceLine=Edit service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang index 195ad43c87c..85438821b7b 100644 --- a/htdocs/langs/eu_ES/cron.lang +++ b/htdocs/langs/eu_ES/cron.lang @@ -76,7 +76,7 @@ CronMethodHelp=The object method to launch.
For exemple to fetch method of CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef CronCommandHelp=The system command line to execute. # Info -CronInfoPage=Information +CronInfoPage=Informazioa # Common CronType=Task type CronType_method=Call method of a Dolibarr Class diff --git a/htdocs/langs/eu_ES/dict.lang b/htdocs/langs/eu_ES/dict.lang index a662b0f7573..a89480fcc0c 100644 --- a/htdocs/langs/eu_ES/dict.lang +++ b/htdocs/langs/eu_ES/dict.lang @@ -1,329 +1,327 @@ # Dolibarr language file - Source file is en_US - dict -# CountryFR=France -# CountryBE=Belgium -# CountryIT=Italy -# CountryES=Spain -# CountryDE=Germany -# CountryCH=Switzerland -# CountryGB=Great Britain -# CountryUK=United Kingdom -# CountryIE=Ireland -# CountryCN=China -# CountryTN=Tunisia -# CountryUS=United States -# CountryMA=Morocco -# CountryDZ=Algeria -# CountryCA=Canada -# CountryTG=Togo -# CountryGA=Gabon -# CountryNL=Netherlands -# CountryHU=Hungary -# CountryRU=Russia -# CountrySE=Sweden -# CountryCI=Ivoiry Coast -# CountrySN=Senegal -# CountryAR=Argentina -# CountryCM=Cameroon -# CountryPT=Portugal -# CountrySA=Saudi Arabia -# CountryMC=Monaco -# CountryAU=Australia -# CountrySG=Singapore -# CountryAF=Afghanistan -# CountryAX=Åland Islands -# CountryAL=Albania -# CountryAS=American Samoa -# CountryAD=Andorra -# CountryAO=Angola -# CountryAI=Anguilla -# CountryAQ=Antarctica -# CountryAG=Antigua and Barbuda -# CountryAM=Armenia -# CountryAW=Aruba -# CountryAT=Austria -# CountryAZ=Azerbaijan -# CountryBS=Bahamas -# CountryBH=Bahrain -# CountryBD=Bangladesh -# CountryBB=Barbados -# CountryBY=Belarus -# CountryBZ=Belize -# CountryBJ=Benin -# CountryBM=Bermuda -# CountryBT=Bhutan -# CountryBO=Bolivia -# CountryBA=Bosnia and Herzegovina -# CountryBW=Botswana -# CountryBV=Bouvet Island -# CountryBR=Brazil -# CountryIO=British Indian Ocean Territory -# CountryBN=Brunei Darussalam -# CountryBG=Bulgaria -# CountryBF=Burkina Faso -# CountryBI=Burundi -# CountryKH=Cambodia -# CountryCV=Cape Verde -# CountryKY=Cayman Islands -# CountryCF=Central African Republic -# CountryTD=Chad -# CountryCL=Chile -# CountryCX=Christmas Island -# CountryCC=Cocos (Keeling) Islands -# CountryCO=Colombia -# CountryKM=Comoros -# CountryCG=Congo -# CountryCD=Congo, The Democratic Republic of the -# CountryCK=Cook Islands -# CountryCR=Costa Rica -# CountryHR=Croatia -# CountryCU=Cuba -# CountryCY=Cyprus -# CountryCZ=Czech Republic -# CountryDK=Denmark -# CountryDJ=Djibouti -# CountryDM=Dominica -# CountryDO=Dominican Republic -# CountryEC=Ecuador -# CountryEG=Egypt -# CountrySV=El Salvador -# CountryGQ=Equatorial Guinea -# CountryER=Eritrea -# CountryEE=Estonia -# CountryET=Ethiopia -# CountryFK=Falkland Islands -# CountryFO=Faroe Islands -# CountryFJ=Fiji Islands -# CountryFI=Finland -# CountryGF=French Guiana -# CountryPF=French Polynesia -# CountryTF=French Southern Territories -# CountryGM=Gambia -# CountryGE=Georgia -# CountryGH=Ghana -# CountryGI=Gibraltar -# CountryGR=Greece -# CountryGL=Greenland -# CountryGD=Grenada -# CountryGP=Guadeloupe -# CountryGU=Guam -# CountryGT=Guatemala -# CountryGN=Guinea -# CountryGW=Guinea-Bissau -# CountryGY=Guyana -# CountryHT=Haïti -# CountryHM=Heard Island and McDonald -# CountryVA=Holy See (Vatican City State) -# CountryHN=Honduras -# CountryHK=Hong Kong -# CountryIS=Icelande -# CountryIN=India -# CountryID=Indonesia -# CountryIR=Iran -# CountryIQ=Iraq -# CountryIL=Israel -# CountryJM=Jamaica -# CountryJP=Japan -# CountryJO=Jordan -# CountryKZ=Kazakhstan -# CountryKE=Kenya -# CountryKI=Kiribati -# CountryKP=North Korea -# CountryKR=South Korea -# CountryKW=Kuwait -# CountryKG=Kyrghyztan -# CountryLA=Lao -# CountryLV=Latvia -# CountryLB=Lebanon -# CountryLS=Lesotho -# CountryLR=Liberia -# CountryLY=Libyan -# CountryLI=Liechtenstein -# CountryLT=Lituania -# CountryLU=Luxembourg -# CountryMO=Macao -# CountryMK=Macedonia, the former Yugoslav of -# CountryMG=Madagascar -# CountryMW=Malawi -# CountryMY=Malaysia -# CountryMV=Maldives -# CountryML=Mali -# CountryMT=Malta -# CountryMH=Marshall Islands -# CountryMQ=Martinique -# CountryMR=Mauritania -# CountryMU=Mauritius -# CountryYT=Mayotte -# CountryMX=Mexico -# CountryFM=Micronesia -# CountryMD=Moldova -# CountryMN=Mongolia -# CountryMS=Monserrat -# CountryMZ=Mozambique -# CountryMM=Birmania (Myanmar) -# CountryNA=Namibia -# CountryNR=Nauru -# CountryNP=Nepal -# CountryAN=Netherlands Antilles -# CountryNC=New Caledonia -# CountryNZ=New Zealand -# CountryNI=Nicaragua -# CountryNE=Niger -# CountryNG=Nigeria -# CountryNU=Niue -# CountryNF=Norfolk Island -# CountryMP=Northern Mariana Islands -# CountryNO=Norway -# CountryOM=Oman -# CountryPK=Pakistan -# CountryPW=Palau -# CountryPS=Palestinian Territory, Occupied -# CountryPA=Panama -# CountryPG=Papua New Guinea -# CountryPY=Paraguay -# CountryPE=Peru -# CountryPH=Philippines -# CountryPN=Pitcairn Islands -# CountryPL=Poland -# CountryPR=Puerto Rico -# CountryQA=Qatar -# CountryRE=Reunion -# CountryRO=Romania -# CountryRW=Rwanda -# CountrySH=Saint Helena -# CountryKN=Saint Kitts and Nevis -# CountryLC=Saint Lucia -# CountryPM=Saint Pierre and Miquelon -# CountryVC=Saint Vincent and Grenadines -# CountryWS=Samoa -# CountrySM=San Marino -# CountryST=Sao Tome and Principe -# CountryRS=Serbia -# CountrySC=Seychelles -# CountrySL=Sierra Leone -# CountrySK=Slovakia -# CountrySI=Slovenia -# CountrySB=Solomon Islands -# CountrySO=Somalia -# CountryZA=South Africa -# CountryGS=South Georgia and the South Sandwich Islands -# CountryLK=Sri Lanka -# CountrySD=Sudan -# CountrySR=Suriname -# CountrySJ=Svalbard and Jan Mayen -# CountrySZ=Swaziland -# CountrySY=Syrian -# CountryTW=Taiwan -# CountryTJ=Tajikistan -# CountryTZ=Tanzania -# CountryTH=Thailand -# CountryTL=Timor-Leste -# CountryTK=Tokelau -# CountryTO=Tonga -# CountryTT=Trinidad and Tobago -# CountryTR=Turkey -# CountryTM=Turkmenistan -# CountryTC=Turks and Cailos Islands -# CountryTV=Tuvalu -# CountryUG=Uganda -# CountryUA=Ukraine -# CountryAE=United Arab Emirates -# CountryUM=United States Minor Outlying Islands -# CountryUY=Uruguay -# CountryUZ=Uzbekistan -# CountryVU=Vanuatu -# CountryVE=Venezuela -# CountryVN=Viet Nam -# CountryVG=Virgin Islands, British -# CountryVI=Virgin Islands, U.S. -# CountryWF=Wallis and Futuna -# CountryEH=Western Sahara -# CountryYE=Yemen -# CountryZM=Zambia -# CountryZW=Zimbabwe -# CountryGG=Guernsey -# CountryIM=Isle of Man -# CountryJE=Jersey -# CountryME=Montenegro -# CountryBL=Saint Barthelemy -# CountryMF=Saint Martin +CountryFR=Frantzia +CountryBE=Belgika +CountryIT=Italia +CountryES=Espainia +CountryDE=Alemania +CountryCH=Suitza +CountryGB=Britania Handia +CountryUK=United Kingdom +CountryIE=Irlanda +CountryCN=Txina +CountryTN=Tunisia +CountryUS=Estatu Batuak +CountryMA=Morocco +CountryDZ=Algeria +CountryCA=Kanada +CountryTG=Togo +CountryGA=Gabon +CountryNL=Netherlands +CountryHU=Hungary +CountryRU=Errusia +CountrySE=Suetzia +CountryCI=Ivoiry Coast +CountrySN=Senegal +CountryAR=Argentina +CountryCM=Kamerun +CountryPT=Portugal +CountrySA=Saudi Arabia +CountryMC=Monaco +CountryAU=Australia +CountrySG=Singapore +CountryAF=Afghanistan +CountryAX=Åland Islands +CountryAL=Albania +CountryAS=American Samoa +CountryAD=Andorra +CountryAO=Angola +CountryAI=Anguilla +CountryAQ=Antarctica +CountryAG=Antigua and Barbuda +CountryAM=Armenia +CountryAW=Aruba +CountryAT=Austria +CountryAZ=Azerbaijan +CountryBS=Bahamas +CountryBH=Bahrain +CountryBD=Bangladesh +CountryBB=Barbados +CountryBY=Belarus +CountryBZ=Belize +CountryBJ=Benin +CountryBM=Bermuda +CountryBT=Bhutan +CountryBO=Bolivia +CountryBA=Bosnia and Herzegovina +CountryBW=Botswana +CountryBV=Bouvet Island +CountryBR=Brasil +CountryIO=British Indian Ocean Territory +CountryBN=Brunei Darussalam +CountryBG=Bulgaria +CountryBF=Burkina Faso +CountryBI=Burundi +CountryKH=Cambodia +CountryCV=Cape Verde +CountryKY=Cayman Islands +CountryCF=Central African Republic +CountryTD=Chad +CountryCL=Chile +CountryCX=Christmas Island +CountryCC=Cocos (Keeling) Islands +CountryCO=Colombia +CountryKM=Comoros +CountryCG=Kongo +CountryCD=Congo, The Democratic Republic of the +CountryCK=Cook Islands +CountryCR=Costa Rica +CountryHR=Kroazia +CountryCU=Kuba +CountryCY=Cyprus +CountryCZ=Txekiar Errepublika +CountryDK=Denmark +CountryDJ=Djibouti +CountryDM=Dominica +CountryDO=Dominican Republic +CountryEC=Ecuador +CountryEG=Egipto +CountrySV=El Salvador +CountryGQ=Equatorial Guinea +CountryER=Eritrea +CountryEE=Estonia +CountryET=Ethiopia +CountryFK=Falkland Islands +CountryFO=Faroe Islands +CountryFJ=Fiji Islands +CountryFI=Finland +CountryGF=French Guiana +CountryPF=French Polynesia +CountryTF=French Southern Territories +CountryGM=Gambia +CountryGE=Georgia +CountryGH=Ghana +CountryGI=Gibraltar +CountryGR=Grezia +CountryGL=Greenland +CountryGD=Grenada +CountryGP=Guadeloupe +CountryGU=Guam +CountryGT=Guatemala +CountryGN=Guinea +CountryGW=Guinea-Bissau +CountryGY=Guyana +CountryHT=Haiti +CountryHM=Heard Island and McDonald +CountryVA=Holy See (Vatican City State) +CountryHN=Honduras +CountryHK=Hong Kong +CountryIS=Icelande +CountryIN=India +CountryID=Indonesia +CountryIR=Iran +CountryIQ=Irak +CountryIL=Israel +CountryJM=Jamaica +CountryJP=Japan +CountryJO=Jordan +CountryKZ=Kazakhstan +CountryKE=Kenia +CountryKI=Kiribati +CountryKP=North Korea +CountryKR=South Korea +CountryKW=Kuwait +CountryKG=Kyrghyztan +CountryLA=Lao +CountryLV=Latvia +CountryLB=Lebanon +CountryLS=Lesotho +CountryLR=Liberia +CountryLY=Libyan +CountryLI=Liechtenstein +CountryLT=Lituania +CountryLU=Luxembourg +CountryMO=Macao +CountryMK=Macedonia, the former Yugoslav of +CountryMG=Madagaskar +CountryMW=Malawi +CountryMY=Malaysia +CountryMV=Maldives +CountryML=Mali +CountryMT=Malta +CountryMH=Marshall Islands +CountryMQ=Martinique +CountryMR=Mauritania +CountryMU=Mauritius +CountryYT=Mayotte +CountryMX=Mexico +CountryFM=Micronesia +CountryMD=Moldova +CountryMN=Mongolia +CountryMS=Monserrat +CountryMZ=Mozambique +CountryMM=Birmania (Myanmar) +CountryNA=Namibia +CountryNR=Nauru +CountryNP=Nepal +CountryAN=Netherlands Antilles +CountryNC=New Caledonia +CountryNZ=Zelanda Berria +CountryNI=Nikaragua +CountryNE=Niger +CountryNG=Nigeria +CountryNU=Niue +CountryNF=Norfolk Island +CountryMP=Northern Mariana Islands +CountryNO=Norway +CountryOM=Oman +CountryPK=Pakistan +CountryPW=Palau +CountryPS=Palestinian Territory, Occupied +CountryPA=Panama +CountryPG=Papua New Guinea +CountryPY=Paraguay +CountryPE=Peru +CountryPH=Filipinak +CountryPN=Pitcairn Islands +CountryPL=Polonia +CountryPR=Puerto Rico +CountryQA=Qatar +CountryRE=Reunion +CountryRO=Romania +CountryRW=Rwanda +CountrySH=Saint Helena +CountryKN=Saint Kitts and Nevis +CountryLC=Saint Lucia +CountryPM=Saint Pierre and Miquelon +CountryVC=Saint Vincent and Grenadines +CountryWS=Samoa +CountrySM=San Marino +CountryST=Sao Tome and Principe +CountryRS=Serbia +CountrySC=Seychelles +CountrySL=Sierra Leone +CountrySK=Slovakia +CountrySI=Slovenia +CountrySB=Solomon Islands +CountrySO=Somalia +CountryZA=Hego Afrika +CountryGS=South Georgia and the South Sandwich Islands +CountryLK=Sri Lanka +CountrySD=Sudan +CountrySR=Suriname +CountrySJ=Svalbard and Jan Mayen +CountrySZ=Swaziland +CountrySY=Syrian +CountryTW=Taiwan +CountryTJ=Tajikistan +CountryTZ=Tanzania +CountryTH=Thailand +CountryTL=Timor-Leste +CountryTK=Tokelau +CountryTO=Tonga +CountryTT=Trinidad and Tobago +CountryTR=Turkey +CountryTM=Turkmenistan +CountryTC=Turks and Cailos Islands +CountryTV=Tuvalu +CountryUG=Uganda +CountryUA=Ukrania +CountryAE=United Arab Emirates +CountryUM=United States Minor Outlying Islands +CountryUY=Uruguay +CountryUZ=Uzbekistan +CountryVU=Vanuatu +CountryVE=Venezuela +CountryVN=Viet Nam +CountryVG=Virgin Islands, British +CountryVI=Virgin Islands, U.S. +CountryWF=Wallis and Futuna +CountryEH=Western Sahara +CountryYE=Yemen +CountryZM=Zambia +CountryZW=Zimbabwe +CountryGG=Guernsey +CountryIM=Isle of Man +CountryJE=Jersey +CountryME=Montenegro +CountryBL=Saint Barthelemy +CountryMF=Saint Martin ##### Civilities ##### -# CivilityMME=Mrs. -# CivilityMR=Mr. -# CivilityMLE=Ms. -# CivilityMTRE=Master -# CivilityDR=Doctor - +CivilityMME=Mrs. +CivilityMR=Jauna +CivilityMLE=Anderea +CivilityMTRE=Master +CivilityDR=Doctor ##### Currencies ##### -# Currencyeuros=Euros -# CurrencyAUD=AU Dollars -# CurrencySingAUD=AU Dollar -# CurrencyCAD=CAN Dollars -# CurrencySingCAD=CAN Dollar -# CurrencyCHF=Swiss Francs -# CurrencySingCHF=Swiss Franc -# CurrencyEUR=Euros -# CurrencySingEUR=Euro -# CurrencyFRF=French Francs -# CurrencySingFRF=French Franc -# CurrencyGBP=GB Pounds -# CurrencySingGBP=GB Pound -# CurrencyINR=Indian rupees -# CurrencySingINR=Indian rupee -# CurrencyMAD=Dirham -# CurrencySingMAD=Dirham -# CurrencyMGA=Ariary -# CurrencySingMGA=Ariary -# CurrencyMUR=Mauritius rupees -# CurrencySingMUR=Mauritius rupee -# CurrencyNOK=Norwegian krones -# CurrencySingNOK=Norwegian krone -# CurrencyTND=Tunisian dinars -# CurrencySingTND=Tunisian dinar -# CurrencyUSD=US Dollars -# CurrencySingUSD=US Dollar -# CurrencyUAH=Hryvnia -# CurrencySingUAH=Hryvnia -# CurrencyXAF=CFA Francs BEAC -# CurrencySingXAF=CFA Franc BEAC -# CurrencyXOF=CFA Francs BCEAO -# CurrencySingXOF=CFA Franc BCEAO -# CurrencyXPF=CFP Francs -# CurrencySingXPF=CFP Franc - -# CurrencyCentSingEUR=cent -# CurrencyThousandthSingTND=thousandth - +Currencyeuros=Euroak +CurrencyAUD=AU dolarrak +CurrencySingAUD=AU dolarra +CurrencyCAD=CAN dolarrak +CurrencySingCAD=CAN dollar +CurrencyCHF=Suitzako frankoak +CurrencySingCHF=Suitzako frankoa +CurrencyEUR=Euroak +CurrencySingEUR=Euroa +CurrencyFRF=Frantziako frankoak +CurrencySingFRF=Frantziako frankoa +CurrencyGBP=GB librak +CurrencySingGBP=GB libra +CurrencyINR=Indian rupees +CurrencySingINR=Indian rupee +CurrencyMAD=Dirham +CurrencySingMAD=Dirham +CurrencyMGA=Ariary +CurrencySingMGA=Ariary +CurrencyMUR=Mauritius rupees +CurrencySingMUR=Mauritius rupee +CurrencyNOK=Norwegian krones +CurrencySingNOK=Norwegian krone +CurrencyTND=Tunisian dinars +CurrencySingTND=Tunisian dinar +CurrencyUSD=US dolarrak +CurrencySingUSD=US dolarra +CurrencyUAH=Hryvnia +CurrencySingUAH=Hryvnia +CurrencyXAF=CFA Francs BEAC +CurrencySingXAF=CFA Franc BEAC +CurrencyXOF=CFA Francs BCEAO +CurrencySingXOF=CFA Franc BCEAO +CurrencyXPF=CFP Francs +CurrencySingXPF=CFP Franc +CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=paise +CurrencyThousandthSingTND=thousandth #### Input reasons ##### -# DemandReasonTypeSRC_INTE=Internet -# DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign -# DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign -# DemandReasonTypeSRC_CAMP_PHO=Phone campaign -# DemandReasonTypeSRC_CAMP_FAX=Fax campaign -# DemandReasonTypeSRC_COMM=Commercial contact -# DemandReasonTypeSRC_SHOP=Shop contact -# DemandReasonTypeSRC_WOM=Word of mouth -# DemandReasonTypeSRC_PARTNER=Partner -# DemandReasonTypeSRC_EMPLOYEE=Employee -# DemandReasonTypeSRC_SPONSORING=Sponsorship - +DemandReasonTypeSRC_INTE=Internet +DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign +DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign +DemandReasonTypeSRC_CAMP_PHO=Phone campaign +DemandReasonTypeSRC_CAMP_FAX=Fax campaign +DemandReasonTypeSRC_COMM=Commercial contact +DemandReasonTypeSRC_SHOP=Shop contact +DemandReasonTypeSRC_WOM=Word of mouth +DemandReasonTypeSRC_PARTNER=Partner +DemandReasonTypeSRC_EMPLOYEE=Employee +DemandReasonTypeSRC_SPONSORING=Sponsorship #### Paper formats #### -# PaperFormatEU4A0=Format 4A0 -# PaperFormatEU2A0=Format 2A0 -# PaperFormatEUA0=Format A0 -# PaperFormatEUA1=Format A1 -# PaperFormatEUA2=Format A2 -# PaperFormatEUA3=Format A3 -# PaperFormatEUA4=Format A4 -# PaperFormatEUA5=Format A5 -# PaperFormatEUA6=Format A6 -# PaperFormatUSLETTER=Format Letter US -# PaperFormatUSLEGAL=Format Legal US -# PaperFormatUSEXECUTIVE=Format Executive US -# PaperFormatUSLEDGER=Format Ledger/Tabloid -# PaperFormatCAP1=Format P1 Canada -# PaperFormatCAP2=Format P2 Canada -# PaperFormatCAP3=Format P3 Canada -# PaperFormatCAP4=Format P4 Canada -# PaperFormatCAP5=Format P5 Canada -# PaperFormatCAP6=Format P6 Canada +PaperFormatEU4A0=Format 4A0 +PaperFormatEU2A0=Format 2A0 +PaperFormatEUA0=Format A0 +PaperFormatEUA1=Format A1 +PaperFormatEUA2=Format A2 +PaperFormatEUA3=Format A3 +PaperFormatEUA4=Format A4 +PaperFormatEUA5=Format A5 +PaperFormatEUA6=Format A6 +PaperFormatUSLETTER=Format Letter US +PaperFormatUSLEGAL=Format Legal US +PaperFormatUSEXECUTIVE=Format Executive US +PaperFormatUSLEDGER=Format Ledger/Tabloid +PaperFormatCAP1=Format P1 Canada +PaperFormatCAP2=Format P2 Canada +PaperFormatCAP3=Format P3 Canada +PaperFormatCAP4=Format P4 Canada +PaperFormatCAP5=Format P5 Canada +PaperFormatCAP6=Format P6 Canada diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang index a2c8ec77de2..53f8d168a55 100644 --- a/htdocs/langs/eu_ES/errors.lang +++ b/htdocs/langs/eu_ES/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/eu_ES/ftp.lang b/htdocs/langs/eu_ES/ftp.lang index 6f135997201..4997aaa1306 100644 --- a/htdocs/langs/eu_ES/ftp.lang +++ b/htdocs/langs/eu_ES/ftp.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - ftp -# FTPClientSetup=FTP Client module setup -# NewFTPClient=New FTP connection setup -# FTPArea=FTP Area -# FTPAreaDesc=This screen show you content of a FTP server view -# SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete -# FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions -# FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s) -# FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password -# FTPFailedToRemoveFile=Failed to remove file %s. -# FTPFailedToRemoveDir=Failed to remove directory %s (Check permissions and that directory is empty). -# FTPPassiveMode=Passive mode +FTPClientSetup=FTP bezero modulua konfiguratu +NewFTPClient=FTP konexio berria konfiguratu +FTPArea=FTP Area +FTPAreaDesc=This screen show you content of a FTP server view +SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete +FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions +FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s) +FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password +FTPFailedToRemoveFile=Failed to remove file %s. +FTPFailedToRemoveDir=Failed to remove directory %s (Check permissions and that directory is empty). +FTPPassiveMode=Passive mode diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang index 1116e29c21c..f0a375c7f1f 100644 --- a/htdocs/langs/eu_ES/languages.lang +++ b/htdocs/langs/eu_ES/languages.lang @@ -4,45 +4,45 @@ Language_ar_AR=Arabic Language_ar_SA=Arabic Language_bg_BG=Bulgarian Language_bs_BA=Bosnian -Language_ca_ES=Catalan +Language_ca_ES=Katalana Language_cs_CZ=Czech Language_da_DA=Danish Language_da_DK=Danish -Language_de_DE=German +Language_de_DE=Alemana Language_de_AT=German (Austria) -Language_de_CH=German (Switzerland) -Language_el_GR=Greek -Language_en_AU=English (Australia) -Language_en_GB=English (United Kingdom) -Language_en_IN=English (India) -Language_en_NZ=English (New Zealand) +Language_de_CH=Alemana (Suitza) +Language_el_GR=Greziera +Language_en_AU=Ingelesa (Australia) +Language_en_GB=Ingelesa (Erresuma Batua) +Language_en_IN=Ingelesa (India) +Language_en_NZ=Ingelesa (Zelanda Berria) Language_en_SA=English (Saudi Arabia) -Language_en_US=English (United States) +Language_en_US=Ingelesa (Estatu Batuak) Language_en_ZA=English (South Africa) -Language_es_ES=Spanish +Language_es_ES=Gaztelania Language_es_DO=Spanish (Dominican Republic) -Language_es_AR=Spanish (Argentina) +Language_es_AR=Gaztelania (Argentina) Language_es_CL=Spanish (Chile) Language_es_HN=Spanish (Honduras) Language_es_MX=Spanish (Mexico) Language_es_PY=Spanish (Paraguay) -Language_es_PE=Spanish (Peru) +Language_es_PE=Gaztelania (Peru) Language_es_PR=Spanish (Puerto Rico) Language_et_EE=Estonian -Language_eu_ES=Basque +Language_eu_ES=Euskera Language_fa_IR=Persian Language_fi_FI=Fins -Language_fr_BE=French (Belgium) -Language_fr_CA=French (Canada) -Language_fr_CH=French (Switzerland) -Language_fr_FR=French +Language_fr_BE=Frantsesa (Belgika) +Language_fr_CA=Frantsesa (Kanada) +Language_fr_CH=Frantsea (Suitza) +Language_fr_FR=Frantsesa Language_fr_NC=French (New Caledonia) Language_he_IL=Hebrew Language_hr_HR=Croatian Language_hu_HU=Hungarian Language_id_ID=Indonesian Language_is_IS=Icelandic -Language_it_IT=Italian +Language_it_IT=Italiera Language_ja_JP=Japanese Language_ko_KR=Korean Language_lt_LT=Lithuanian diff --git a/htdocs/langs/eu_ES/link.lang b/htdocs/langs/eu_ES/link.lang index 8b1efb75ef3..50b49b036b2 100644 --- a/htdocs/langs/eu_ES/link.lang +++ b/htdocs/langs/eu_ES/link.lang @@ -1,8 +1,8 @@ -LinkANewFile=Link a new file/document -LinkedFiles=Linked files and documents -NoLinkFound=No registered links -LinkComplete=The file has been linked successfully -ErrorFileNotLinked=The file could not be linked -LinkRemoved=The link %s has been removed -ErrorFailedToDeleteLink= Failed to remove link '%s' -ErrorFailedToUpdateLink= Failed to update link '%s' +LinkANewFile=Fitxategi/dokumentu berria estekatu +LinkedFiles=Estekatutako fitxategi eta dokumentuak +NoLinkFound=Ez dago gordetako estekarik +LinkComplete=Fitxategia ondo estekatu da +ErrorFileNotLinked=Ezin izan da fitxategia estekatu +LinkRemoved=%s esteka ezabatua izan da +ErrorFailedToDeleteLink= Ezin izan da '%s' esteka ezabatu +ErrorFailedToUpdateLink= Ezin izan da '%s' esteka berritu diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang index 7a211198822..697b6e3bc97 100644 --- a/htdocs/langs/eu_ES/mails.lang +++ b/htdocs/langs/eu_ES/mails.lang @@ -16,7 +16,7 @@ MailTo=Receiver(s) MailCC=Copy to MailCCC=Cached copy to MailTopic=EMail topic -MailText=Message +MailText=Mezua MailFile=Attached files MailMessage=EMail body ShowEMailing=Show emailing @@ -110,7 +110,7 @@ NbOfCompaniesContacts=Unique contacts/addresses MailNoChangePossible=Recipients for validated emailing can't be changed SearchAMailing=Search mailing SendMailing=Send emailing -SendMail=Send email +SendMail=e-posta bidali SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang index d51879601be..103789691ef 100644 --- a/htdocs/langs/eu_ES/main.lang +++ b/htdocs/langs/eu_ES/main.lang @@ -99,19 +99,19 @@ NotePublic=Note (public) NotePrivate=Note (private) PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to %s decimals. DoTest=Test -ToFilter=Filter +ToFilter=Iragazia WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay. -yes=yes -Yes=Yes -no=no -No=No +yes=bai +Yes=Bai +no=ez +No=Ez All=All Home=Home -Help=Help +Help=Laguntza OnlineHelp=Online help -PageWiki=Wiki page -Always=Always -Never=Never +PageWiki=Wiki orrialdea +Always=Beti +Never=Inoiz Under=under Period=Period PeriodEndDate=End date for period @@ -119,29 +119,29 @@ Activate=Activate Activated=Activated Closed=Closed Closed2=Closed -Enabled=Enabled +Enabled=Gaituta Deprecated=Deprecated Disable=Disable Disabled=Disabled -Add=Add -AddLink=Add link -Update=Update +Add=Gehitu +AddLink=Esteka gehitu +Update=Berritu AddActionToDo=Add event to do AddActionDone=Add event done -Close=Close -Close2=Close +Close=Itxi +Close2=Itxi Confirm=Confirm ConfirmSendCardByMail=Do you really want to send content of this card by mail to %s ? -Delete=Delete -Remove=Remove +Delete=Ezabatu +Remove=Kendu Resiliate=Resiliate -Cancel=Cancel -Modify=Modify -Edit=Edit +Cancel=Utzi +Modify=Eraldatu +Edit=Editatu Validate=Validate ToValidate=To validate -Save=Save -SaveAs=Save As +Save=Gorde +SaveAs=Gorde honela TestConnection=Test connection ToClone=Clone ConfirmClone=Choose data you want to clone : @@ -150,10 +150,10 @@ Of=of Go=Go Run=Run CopyOf=Copy of -Show=Show +Show=Erakutsi ShowCardHere=Show card -Search=Search -SearchOf=Search +Search=Bilatu +SearchOf=Bilatu Valid=Valid Approve=Approve ReOpen=Re-Open @@ -165,57 +165,57 @@ ChooseLangage=Please choose your language Resize=Resize Recenter=Recenter Author=Author -User=User -Users=Users -Group=Group -Groups=Groups -Password=Password +User=Erabiltzailea +Users=Erabiltzaileak +Group=Taldea +Groups=Taldeak +Password=Pasahitza PasswordRetype=Retype your password NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration. -Name=Name -Person=Person +Name=Izena +Person=Pertsona Parameter=Parameter Parameters=Parameters -Value=Value +Value=Balioa GlobalValue=Global value PersonalValue=Personal value -NewValue=New value +NewValue=Balio berria CurrentValue=Current value -Code=Code -Type=Type -Language=Language +Code=Kodea +Type=Mota +Language=Hizkuntza MultiLanguage=Multi-language -Note=Note +Note=Oharra CurrentNote=Current note Title=Title Label=Label RefOrLabel=Ref. or label Info=Log -Family=Family -Description=Description -Designation=Description +Family=Familia +Description=Deskribapena +Designation=Deskribapena Model=Model DefaultModel=Default model Action=Event About=About -Number=Number +Number=Zenbakia NumberByMonth=Number by month AmountByMonth=Amount by month -Numero=Number -Limit=Limit -Limits=Limits +Numero=Zenbakia +Limit=Limitea +Limits=Limiteak DevelopmentTeam=Development Team Logout=Logout NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s -Connection=Connection +Connection=Konexia Setup=Setup Alert=Alert -Previous=Previous -Next=Next +Previous=Aurrekoa +Next=Hurrengoa Cards=Cards Card=Card -Now=Now -Date=Date +Now=Orain +Date=Data DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -418,8 +418,8 @@ Paid=Paid Topic=Sujet ByCompanies=By third parties ByUsers=By users -Links=Links -Link=Link +Links=Estekak +Link=Esteka Receipts=Receipts Rejects=Rejects Preview=Preview @@ -429,81 +429,81 @@ Datas=Data None=None NoneF=None Late=Late -Photo=Picture -Photos=Pictures -AddPhoto=Add picture +Photo=Irudia +Photos=Irudiak +AddPhoto=Irudia gehitu Login=Login CurrentLogin=Current login -January=January -February=February -March=March -April=April -May=May -June=June -July=July -August=August -September=September -October=October -November=November -December=December -JanuaryMin=Jan -FebruaryMin=Feb +January=Urtarrila +February=Otsaila +March=Martxoa +April=Apirila +May=Maiatza +June=Ekaina +July=Uztaila +August=Abuztua +September=Iraila +October=Urria +November=Azaroa +December=Abendua +JanuaryMin=Urt +FebruaryMin=Ots MarchMin=Mar -AprilMin=Apr -MayMin=May -JuneMin=Jun -JulyMin=Jul -AugustMin=Aug -SeptemberMin=Sep -OctoberMin=Oct -NovemberMin=Nov -DecemberMin=Dec -Month01=January -Month02=February -Month03=March -Month04=April -Month05=May -Month06=June -Month07=July -Month08=August -Month09=September -Month10=October -Month11=November -Month12=December -MonthShort01=Jan -MonthShort02=Feb +AprilMin=Api +MayMin=Mai +JuneMin=Eka +JulyMin=Uzt +AugustMin=Abu +SeptemberMin=Ira +OctoberMin=Urr +NovemberMin=Aza +DecemberMin=Abe +Month01=Urtarrila +Month02=Otsaila +Month03=Martxoa +Month04=Apirila +Month05=Maiatza +Month06=Ekaina +Month07=Uztaila +Month08=Abuztua +Month09=Iraila +Month10=Urria +Month11=Azaroa +Month12=Abendua +MonthShort01=Urt +MonthShort02=Ots MonthShort03=Mar -MonthShort04=Apr -MonthShort05=May -MonthShort06=Jun -MonthShort07=Jul -MonthShort08=Aug -MonthShort09=Sep -MonthShort10=Oct -MonthShort11=Nov -MonthShort12=Dec +MonthShort04=Api +MonthShort05=Mai +MonthShort06=Eka +MonthShort07=Uzt +MonthShort08=Abu +MonthShort09=Ira +MonthShort10=Urr +MonthShort11=Aza +MonthShort12=Abe AttachedFiles=Attached files and documents FileTransferComplete=File was uploaded successfuly -DateFormatYYYYMM=YYYY-MM -DateFormatYYYYMMDD=YYYY-MM-DD -DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS +DateFormatYYYYMM=UUUU-HH +DateFormatYYYYMMDD=UUUU-HH-EE +DateFormatYYYYMMDDHHMM=UUUU-HH-EE OO:SS ReportName=Report name ReportPeriod=Report period ReportDescription=Description -Report=Report +Report=Txostena Keyword=Mot clé Legend=Legend FillTownFromZip=Fill city from zip -Fill=Fill +Fill=Bete Reset=Reset ShowLog=Show log -File=File -Files=Files +File=Fitxategia +Files=Fitxategiak NotAllowed=Not allowed ReadPermissionNotAllowed=Read permission not allowed AmountInCurrency=Amount in %s currency -Example=Example -Examples=Examples +Example=Adibidea +Examples=Adibideak NoExample=No example FindBug=Report a bug NbOfThirdParties=Number of third parties diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang index 9246a04ced9..40bca8e85fb 100644 --- a/htdocs/langs/eu_ES/members.lang +++ b/htdocs/langs/eu_ES/members.lang @@ -1,204 +1,206 @@ # Dolibarr language file - Source file is en_US - members -# MembersArea=Members area -# PublicMembersArea=Public members area -# MemberCard=Member card -# SubscriptionCard=Subscription card -# Member=Member -# Members=Members -# MemberAccount=Member login -# ShowMember=Show member card -# UserNotLinkedToMember=User not linked to a member -# ThirdpartyNotLinkedToMember=Third-party not linked to a member -# MembersTickets=Members Tickets -# FundationMembers=Foundation members -# Attributs=Attributes -# ErrorMemberTypeNotDefined=Member type not defined -# ListOfPublicMembers=List of public members -# ListOfValidatedPublicMembers=List of validated public members -# ErrorThisMemberIsNotPublic=This member is not public -# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). -# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. -# ThisIsContentOfYourCard=This is details of your card -# CardContent=Content of your member card -# SetLinkToUser=Link to a Dolibarr user -# SetLinkToThirdParty=Link to a Dolibarr third party -# MembersCards=Members business cards -# MembersList=List of members -# MembersListToValid=List of draft members (to be validated) -# MembersListValid=List of valid members -# MembersListUpToDate=List of valid members with up to date subscription -# MembersListNotUpToDate=List of valid members with subscription out of date -# MembersListResiliated=List of resiliated members -# MembersListQualified=List of qualified members -# MenuMembersToValidate=Draft members -# MenuMembersValidated=Validated members -# MenuMembersUpToDate=Up to date members -# MenuMembersNotUpToDate=Out of date members -# MenuMembersResiliated=Resiliated members -# MembersWithSubscriptionToReceive=Members with subscription to receive -# DateAbonment=Subscription date -# DateSubscription=Subscription date -# DateNextSubscription=Next subscription -# DateEndSubscription=Subscription end date -# EndSubscription=End subscription -# SubscriptionId=Subscription id -# MemberId=Member id -# NewMember=New member -# NewType=New member type -# MemberType=Member type -# MemberTypeId=Member type id -# MemberTypeLabel=Member type label -# MembersTypes=Members types -# MembersAttributes=Members attributes -# SearchAMember=Search a member -# MemberStatusDraft=Draft (needs to be validated) -# MemberStatusDraftShort=Draft -# MemberStatusActive=Validated (waiting subscription) -# MemberStatusActiveShort=Validated -# MemberStatusActiveLate=subscription expired -# MemberStatusActiveLateShort=Expired -# MemberStatusPaid=Subscription up to date -# MemberStatusPaidShort=Up to date -# MemberStatusResiliated=Resiliated member -# MemberStatusResiliatedShort=Resiliated -# MembersStatusToValid=Draft members -# MembersStatusToValidShort=Draft members -# MembersStatusValidated=Validated members -# MembersStatusPaid=Subscription up to date -# MembersStatusPaidShort=Up to date -# MembersStatusNotPaid=Subscription out of date -# MembersStatusNotPaidShort=Out of date -# MembersStatusResiliated=Resiliated members -# MembersStatusResiliatedShort=Resiliated members -# NewCotisation=New contribution -# PaymentSubscription=New contribution payment -# EditMember=Edit member -# SubscriptionEndDate=Subscription's end date -# MembersTypeSetup=Members type setup -# NewSubscription=New subscription -# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. -# Subscription=Subscription -# Subscriptions=Subscriptions -# SubscriptionLate=Late -# SubscriptionNotReceived=Subscription never received -# SubscriptionLateShort=Late -# SubscriptionNotReceivedShort=Never received -# ListOfSubscriptions=List of subscriptions -# SendCardByMail=Send card by Email -# AddMember=Add member -# MemberType=Member type -# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" -# NewMemberType=New member type -# WelcomeEMail=Welcome e-mail -# SubscriptionRequired=Subscription required -# EditType=Edit member type -# DeleteType=Delete -# VoteAllowed=Vote allowed -# Physical=Physical -# Moral=Moral -# MorPhy=Moral/Physical -# Reenable=Reenable -# ResiliateMember=Resiliate a member -# ConfirmResiliateMember=Are you sure you want to resiliate this member ? -# DeleteMember=Delete a member -# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? -# DeleteSubscription=Delete a subscription -# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? -# Filehtpasswd=htpasswd file -# ValidateMember=Validate a member -# ConfirmValidateMember=Are you sure you want to validate this member ? -# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. -# PublicMemberList=Public member list -# BlankSubscriptionForm=Public auto-subscription form -# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. -# EnablePublicSubscriptionForm=Enable the public auto-subscription form -# MemberPublicLinks=Public links/pages -# ExportDataset_member_1=Members and subscriptions -# ImportDataset_member_1=Members -# LastMembers=Last %s members -# LastMembersModified=Last %s modified members -# LastSubscriptionsModified=Last %s modified subscriptions -# AttributeName=Attribute name -# String=String -# Text=Text -# Int=Int -# Date=Date -# DateAndTime=Date and time -# PublicMemberCard=Member public card -# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -# AddSubscription=Add subscription -# ShowSubscription=Show subscription -# MemberModifiedInDolibarr=Member modified in Dolibarr -# SendAnEMailToMember=Send information email to member -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription -# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription -# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation -# DescADHERENT_MAIL_VALID=EMail for member validation -# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription -# DescADHERENT_MAIL_COTIS=EMail for subscription -# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation -# DescADHERENT_MAIL_RESIL=EMail for member resiliation -# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails -# DescADHERENT_ETIQUETTE_TYPE=Format of labels page -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets -# DescADHERENT_CARD_TYPE=Format of cards page -# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards -# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) -# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) -# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards -# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here -# MayBeOverwrited=This text can be overwrited by value defined for member's type -# ShowTypeCard=Show type '%s' -# HTPasswordExport=htpassword file generation -# NoThirdPartyAssociatedToMember=No third party associated to this member -# ThirdPartyDolibarr=Dolibarr third party -# MembersAndSubscriptions= Members and Subscriptions -# MoreActions=Complementary action on recording -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription -# MoreActionBankDirect=Create a direct transaction record on account -# MoreActionBankViaInvoice=Create an invoice and payment on account -# MoreActionInvoiceOnly=Create an invoice with no payment -# LinkToGeneratedPages=Generate visit cards -# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. -# DocForAllMembersCards=Generate business cards for all members -# DocForOneMemberCards=Generate business cards for a particular member -# DocForLabels=Generate address sheets -# SubscriptionPayment=Subscription payment -# LastSubscriptionDate=Last subscription date -# LastSubscriptionAmount=Last subscription amount -# MembersStatisticsByCountries=Members statistics by country -# MembersStatisticsByState=Members statistics by state/province -# MembersStatisticsByTown=Members statistics by town -# NbOfMembers=Number of members -# NoValidatedMemberYet=No validated members found -# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. -# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. -# MembersByTownDesc=This screen show you statistics on members by town. -# MembersStatisticsDesc=Choose statistics you want to read... -# MenuMembersStats=Statistics -# LastMemberDate=Last member date -# Nature=Nature -# Public=Information are public -# Exports=Exports -# NewMemberbyWeb=New member added. Awaiting approval -# NewMemberForm=New member form -# SubscriptionsStatistics=Statistics on subscriptions -# NbOfSubscriptions=Number of subscriptions -# AmountOfSubscriptions=Amount of subscriptions -# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) -# DefaultAmount=Default amount of subscription -# CanEditAmount=Visitor can choose/edit amount of its subscription -# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page -# Associations=Foundations -# Collectivités=Organizations -# Particuliers=Personal -# Entreprises=Companies -# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member +Members=Members +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions +ImportDataset_member_1=Members +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang index cb88461602d..81d217ddb54 100644 --- a/htdocs/langs/eu_ES/products.lang +++ b/htdocs/langs/eu_ES/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang index 4affd1fdc5a..c48e27fd204 100644 --- a/htdocs/langs/eu_ES/projects.lang +++ b/htdocs/langs/eu_ES/projects.lang @@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant Myprojects=My projects ProjectsArea=Projects area NewProject=New project -AddProject=Add project +AddProject=Create project DeleteAProject=Delete a project DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task -AddTask=Add task +AddTask=Create task AddDuration=Add duration Activity=Activity Activities=Tasks/activities diff --git a/htdocs/langs/eu_ES/resource.lang b/htdocs/langs/eu_ES/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/eu_ES/resource.lang +++ b/htdocs/langs/eu_ES/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang index edca71a1829..31629a4ee99 100644 --- a/htdocs/langs/eu_ES/salaries.lang +++ b/htdocs/langs/eu_ES/salaries.lang @@ -1,8 +1,12 @@ # Dolibarr language file - Source file is en_US - users -Salary=Salary -Salaries=Salaries -Employee=Employee -NewSalaryPayment=New salary payment -SalaryPayment=Salary payment -SalariesPayments=Salaries payments -ShowSalaryPayment=Show salary payment +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge +Salary=Soldata +Salaries=Soldatak +Employee=Langilea +NewSalaryPayment=Soldata ordainketa berria +SalaryPayment=Soldata ordainketa +SalariesPayments=Soldaten ordainketak +ShowSalaryPayment=Soldataren ordainketa erakutsi +THM=Batezbesteko orduko prezioa +TJM=Batezbesteko eguneko prezioa diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang index 4b0501a8346..e9d7c242e07 100644 --- a/htdocs/langs/eu_ES/trips.lang +++ b/htdocs/langs/eu_ES/trips.lang @@ -1,21 +1,21 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips +Trip=Bidaia +Trips=Bidaiak TripsAndExpenses=Trips and expenses TripsAndExpensesStatistics=Trips and expenses statistics TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips +AddTrip=Bidaia sortu +ListOfTrips=Bidaien zerrenda ListOfFees=List of fees -NewTrip=New trip -CompanyVisited=Company/foundation visited -Kilometers=Kilometers +NewTrip=Bidai berria +CompanyVisited=Bisitatutako konpania/erakundea +Kilometers=Kilometroak FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? +DeleteTrip=Bidaia ezabatu +ConfirmDeleteTrip=Ziur zaude bidai hau ezabatu nahi duzuna? TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip +TF_LUNCH=Bazkaria +TF_TRIP=Bidaia ListTripsAndExpenses=List of trips and expenses ExpensesArea=Trips and expenses area SearchATripAndExpense=Search a trip and expense diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang index e4337309084..ea32511fefb 100644 --- a/htdocs/langs/eu_ES/withdrawals.lang +++ b/htdocs/langs/eu_ES/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index 542848189c1..a5889dd5197 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=استفاده از رشته های تکمیل خودک ActivityStateToSelectCompany= اضافه کردن یک گزینه فیلتر برای نشان دادن / پنهان کن thirdparties که در حال حاضر در فعالیت و یا تا به آن متوقف شد UseSearchToSelectContactTooltip=همچنین اگر شما تعداد زیادی از اشخاص ثالث (> 100 000)، شما می توانید سرعت با تنظیم CONTACT_DONOTSEARCH_ANYWHERE ثابت به 1 در راه اندازی-> دیگر افزایش دهد. جست و جو خواهد شد و سپس محدود به شروع از رشته است. UseSearchToSelectContact=استفاده از رشته های تکمیل خودکار را انتخاب کنید تماس با (به جای استفاده از جعبه لیست). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=جستجو فیلتر گزینه NumberOfKeyToSearch=اسمشو نبر از شخصیت های به ماشه جستجو:٪ s را ViewFullDateActions=نمایش رویدادهای تاریخ های کامل در برگه سوم @@ -208,6 +210,7 @@ ModulesJobDesc=ماژول های کسب و کار راه اندازی از پی ModulesMarketPlaceDesc=شما می توانید ماژول های بیشتری برای دانلود در وب سایت های خارجی را در اینترنت پیدا کنید ... ModulesMarketPlaces=ماژول های بیشتر ... DoliStoreDesc=DoliStore، محل رسمی بازار برای ماژول های خارجی Dolibarr ERP / CRM +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=ارائه دهندگان وب سایت شما می توانید جستجو برای پیدا کردن ماژول های بیشتر ... URL=پیوند BoxesAvailable=جعبه دسترس @@ -444,7 +447,7 @@ Module55Desc=مدیریت بارکد Module56Name=تلفن Module56Desc=یکپارچه سازی تلفن Module57Name=سفارشات ایستاده -Module57Desc=ایستاده سفارشات و مدیریت خروج +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=کلیک برای تماس Module58Desc=یکپارچه سازی سیستم ClickToDial (ستاره، ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=خوراک RSS Module320Desc=اضافه کردن خوراک RSS در داخل صفحات صفحه نمایش Dolibarr Module330Name=بوک مارک ها Module330Desc=مدیریت چوب الف -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=ادغام Webcalendar Module500Name=هزینه های ویژه (مالیاتی، کمک های اجتماعی، سود سهام) @@ -495,6 +498,8 @@ Module1780Name=دسته بندی ها Module1780Desc=مدیریت گروه (محصولات، تامین کنندگان و مشتریان) Module2000Name=ویرایشگر WYSIWYG Module2000Desc=اجازه می دهد به ویرایش برخی از متن با استفاده از ویرایشگر پیشرفته +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=cron را Module2300Desc=وظیفه مدیریت برنامه ریزی Module2400Name=دستور کار @@ -503,6 +508,8 @@ Module2500Name=الکترونیکی مدیریت محتوا Module2500Desc=ذخیره و به اشتراک اسناد Module2600Name=سرویس دهنده وب Module2600Desc=فعال کردن Dolibarr خدمات وب سرور +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar در Module2700Desc=استفاده از سرویس آنلاین Gravatar در (www.gravatar.com) برای نشان دادن عکس از کاربران / کاربران (که با ایمیل های خود را). نیاز به دسترسی به اینترنت Module2800Desc=FTP کارفرما @@ -517,7 +524,7 @@ Module6000Desc=مدیریت گردش کار Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=خزانه Module50000Desc=ماژول برای ارائه یک صفحه پرداخت آنلاین از طریق کارت اعتباری با خزانه Module50100Name=نقطه ای از فروش @@ -527,7 +534,7 @@ Module50200Desc=ماژول برای ارائه یک صفحه پرداخت آنل Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=چاپ از طریق جام IPP پرینتر. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=نظرسنجی گسترش Module55000Desc=ماژول را به نظر سنجی آنلاین (مانند دودل، خاتم کاری، Rdvz، ...) Module59000Name=حاشیه @@ -779,6 +786,7 @@ DictionaryOrderMethods=مرتب سازی بر روش DictionarySource=منبع از پیشنهادات / سفارشات DictionaryAccountancyplan=نمودار حساب DictionaryAccountancysystem=مدل برای نمودار حساب +DictionaryEMailTemplates=Emails templates SetupSaved=راه اندازی نجات داد BackToModuleList=بازگشت به لیست ماژول ها BackToDictionaryList=برگشت به فهرست واژه نامه ها @@ -888,6 +896,7 @@ PermanentLeftSearchForm=فرم جستجو دائمی در منوی سمت چپ DefaultLanguage=زبان پیش فرض برای استفاده از (زبان) EnableMultilangInterface=فعال کردن رابط کاربری چند زبانه EnableShowLogo=نمایش لوگو را در منوی سمت چپ +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=سیستم شما با موفقیت به روز رسانی شده است CompanyInfo=شرکت / اطلاعات پایه CompanyIds=هویت شرکت / بنیاد diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang index 01e2beb85d5..31bd6a514ab 100644 --- a/htdocs/langs/fa_IR/agenda.lang +++ b/htdocs/langs/fa_IR/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=رویدادهای اختصاص یافته به ActionsDoneBy=رویدادهای انجام شده توسط ActionsForUser=رویدادهای ها برای کاربر ActionsForUsersGroup=رویدادها برای همه کاربران گروه +ActionAssignedTo=Event assigned to AllMyActions= همه رویدادها من / وظایف AllActions= همه رویدادها / وظایف ViewList=مشاهده لیست diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang index f7f285a021f..ecc5cfbf660 100644 --- a/htdocs/langs/fa_IR/compta.lang +++ b/htdocs/langs/fa_IR/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=با توجه به منبع، انتخاب روش م TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت حسابداری نقدی مربوط نیست. این گزارش که با استفاده از تعامل حالت حسابداری (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است. CalculationMode=حالت محاسبه AccountancyJournal=کد حسابداری مجله -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang index 2192fa807e9..66101dfbec6 100644 --- a/htdocs/langs/fa_IR/contracts.lang +++ b/htdocs/langs/fa_IR/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=فهرست در حال اجرا خطوط قرارد ListOfRunningServices=لیست خدمات در حال اجرا NotActivatedServices=خدمات غیر فعال (در قرارداد اعتبار) BoardNotActivatedServices=خدمات برای فعال سازی در قرارداد اعتبار -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=تاریخ و زمان آخرین٪ s به خدمات فعال LastModifiedServices=تاریخ و زمان آخرین٪ بازدید کنندگان خدمات اصلاح شده EditServiceLine=خط ویرایش خدمات @@ -91,6 +91,7 @@ ListOfServicesToExpire=فهرست خدمات دات کام NoteListOfYourExpiredServices=این لیست فقط شامل خدمات قرارداد برای اشخاص ثالث به شما به عنوان یک نماینده فروش مرتبط است. StandardContractsTemplate=قراردادهای استاندارد قالب ContactNameAndSignature=برای٪ s، نام و امضا: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=نمایندگی فروش امضای قرارداد diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang index 12220688262..8ac54cde918 100644 --- a/htdocs/langs/fa_IR/errors.lang +++ b/htdocs/langs/fa_IR/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=کد تامین کننده مورد نیاز ErrorSupplierCodeAlreadyUsed=کد تامین کننده در حال حاضر استفاده می شود ErrorBadParameters=پارامترهای بد ErrorBadValueForParameter=ارزش اشتباه '٪ s' را برای پارامتر نادرست '٪ s' را -ErrorBadImageFormat=فایل تصویر است نه یک فرمت پشتیبانی +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=مقدار «٪ s 'است قالب تاریخ اشتباه ErrorWrongDate=تاریخ صحیح نمی باشد! ErrorFailedToWriteInDir=برای نوشتن در پوشه٪ s شکست خورد @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=کاربر با ورود به٪ s را می تو ErrorLoginHasNoEmail=این کاربر هیچ آدرس ایمیل. فرآیند سقط شده. ErrorBadValueForCode=ارزش بد برای کد امنیتی. دوباره سعی کنید با ارزش جدید ... ErrorBothFieldCantBeNegative=زمینه های٪ s و٪ s نمی تواند هر دو منفی +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=حساب کاربری٪ s را برای اجرای وب سرور بدون اجازه که ErrorNoActivatedBarcode=بدون بارکد از نوع فعال ErrUnzipFails=برای جدا کردن٪ s با ZipArchive ناموفق @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=خطا، این عضو هنو ErrorThereIsSomeDeliveries=خطا، برخی از زایمان مرتبط با این حمل و نقل وجود دارد. حذف خودداری کرد. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=پارامترهای راه اندازی اجباری هنوز تعریف نشده diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang index 142a3e9dd00..d9b24f6e89b 100644 --- a/htdocs/langs/fa_IR/members.lang +++ b/htdocs/langs/fa_IR/members.lang @@ -16,7 +16,7 @@ ErrorMemberTypeNotDefined=نوع کاربران تعریف نشده ListOfPublicMembers=فهرست کاربران عمومی ListOfValidatedPublicMembers=فهرست کاربران عمومی معتبر ErrorThisMemberIsNotPublic=این عضو است عمومی نمی -ErrorMemberIsAlreadyLinkedToThisThirdParty=یکی دیگر از عضو (نام و نام خانوادگی:٪ S، وارد کنید:%s) در حال حاضر به شخص ثالث%s در ارتباط است. حذف این لینک برای اولین بار به دلیل یک شخص ثالث می تواند تنها به یک عضو (و بالعکس) پیوند داده نمی شود. +ErrorMemberIsAlreadyLinkedToThisThirdParty=یکی دیگر از عضو (نام و نام خانوادگی:٪ S، وارد کنید:٪ s) در حال حاضر به شخص ثالث٪ s در ارتباط است. حذف این لینک برای اولین بار به دلیل یک شخص ثالث می تواند تنها به یک عضو (و بالعکس) پیوند داده نمی شود. ErrorUserPermissionAllowsToLinksToItselfOnly=به دلایل امنیتی، شما باید مجوز اعطا شده به ویرایش تمام کاربران قادر به پیوند عضو به یک کاربر است که مال شما نیست. ThisIsContentOfYourCard=این جزئیات از کارت شما است CardContent=محتوا از کارت عضو شما @@ -85,7 +85,7 @@ SubscriptionLateShort=دیر SubscriptionNotReceivedShort=هرگز دریافت ListOfSubscriptions=فهرست اشتراک ها SendCardByMail=ارسال کارت توسط ایمیل -AddMember=اضافه کردن کاربر +AddMember=Create member NoTypeDefinedGoToSetup=هیچ نوع عضو تعریف شده است. برو به منوی "انواع کاربران" NewMemberType=نوع عضو جدید WelcomeEMail=خوش آمدید ایمیل @@ -116,7 +116,7 @@ ExportDataset_member_1=کاربران و اشتراک ImportDataset_member_1=کاربران LastMembers=عضو تاریخ و زمان آخرین٪ بازدید کنندگان LastMembersModified=تاریخ و زمان آخرین٪ اعضای اصلاح شده -LastSubscriptionsModified=تاریخ و زمان آخرین%s به اشتراک اصلاح شده +LastSubscriptionsModified=تاریخ و زمان آخرین٪ s به اشتراک اصلاح شده AttributeName=نام صفت String=رشته Text=متن @@ -125,7 +125,7 @@ Date=تاریخ DateAndTime=تاریخ و زمان PublicMemberCard=کاربران کارت های عمومی MemberNotOrNoMoreExpectedToSubscribe=کاربران بیشتری انتظار می رود نیست و یا هیچ به اشتراک -AddSubscription=اضافه کردن اشتراک +AddSubscription=Create subscription ShowSubscription=نمایش اشتراک MemberModifiedInDolibarr=کاربران تغییر در Dolibarr SendAnEMailToMember=ارسال ایمیل به اطلاعات به عضو @@ -149,7 +149,7 @@ DescADHERENT_CARD_TEXT_RIGHT=متن چاپ شده بر روی کارت های ع DescADHERENT_CARD_FOOTER_TEXT=متن چاپ شده در پایین از کارت های عضو GlobalConfigUsedIfNotDefined=متن تعریف شده در راه اندازی ماژول بنیاد استفاده خواهد شد اگر در اینجا تعریف نشده MayBeOverwrited=این متن را می توان با مقدار مشخص شده برای نوع عضو overwrited -ShowTypeCard=نمایش نوع «%s ' +ShowTypeCard=نمایش نوع «٪ s ' HTPasswordExport=نسل فایل htpassword NoThirdPartyAssociatedToMember=بدون شخص ثالث مرتبط به این کاربر ThirdPartyDolibarr=شخص ثالث Dolibarr @@ -203,3 +203,4 @@ MembersByNature=کاربران از طبیعت VATToUseForSubscriptions=نرخ مالیات بر ارزش افزوده برای استفاده از اشتراک ها NoVatOnSubscription=بدون TVA برای اشتراک MEMBER_PAYONLINE_SENDEMAIL=ایمیل برای هشدار دادن به هنگام Dolibarr دریافت تایید از پرداخت اعتبار برای اشتراک +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang index 1015252b3e2..dc472f3b7c8 100644 --- a/htdocs/langs/fa_IR/products.lang +++ b/htdocs/langs/fa_IR/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=اگر محصول یک سرویس با مدت زمان م MultiPricesAbility=سطح بسیاری از قیمت هر محصول / خدمات MultiPricesNumPrices=تعداد قیمت MultiPriceLevelsName=مقوله های قیمت -AssociatedProductsAbility=فعال محصولات مجازی از ویژگی های -AssociatedProducts=محصول مجازی -AssociatedProductsNumber=تعدادی از محصولات ساخت این محصول مجازی -ParentProductsNumber=تعداد پدر و مادر محصول مجازی -IfZeroItIsNotAVirtualProduct=اگر 0، این محصول یک محصول مجازی -IfZeroItIsNotUsedByVirtualProduct=اگر 0، این محصول با هر نوع محصول مجازی استفاده نمی شود +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=وابسته Translation=ترجمه KeywordFilter=فیلتر کلمه کلیدی @@ -132,7 +132,7 @@ AddDel=اضافه کردن / حذف Quantity=مقدار NoMatchFound=هیچ بازی یافت ProductAssociationList=فهرست محصولات مرتبط / خدمات: نام محصول / خدمات (مقدار تحت تاثیر قرار) -ProductParentList=لیست محصولات مجازی / خدمات با این محصول به عنوان یک جزء +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=یکی از محصول انتخاب پدر و مادر با محصول فعلی است DeleteProduct=حذف یک محصول / خدمات ConfirmDeleteProduct=آیا مطمئن هستید که می خواهید به حذف این محصول / خدمات؟ @@ -179,7 +179,7 @@ CloneProduct=محصول کلون یا خدمات ConfirmCloneProduct=آیا مطمئن هستید که می خواهید به کلون کردن محصول و یا خدمات از٪ s؟ CloneContentProduct=کلون تمام اطلاعات اصلی محصول / خدمات ClonePricesProduct=اطلاعات اصلی کلون و قیمت -CloneCompositionProduct=کلون مجازی محصولات / خدمات +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=این محصول مورد استفاده قرار گیرد NewRefForClone=کد عکس. محصول جدید / خدمات CustomerPrices=مشتریان قیمت @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=همان قيمت تعيين شده در شرکت ها PriceByCustomerLog=قيمت های ورود مشتری MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang index 211b2834b13..841b7ab1a35 100644 --- a/htdocs/langs/fa_IR/projects.lang +++ b/htdocs/langs/fa_IR/projects.lang @@ -14,7 +14,7 @@ TasksDesc=این دیدگاه ارائه تمام پروژه ها و وظایف Myprojects=پروژه های من ProjectsArea=منطقه پروژه ها NewProject=پروژه های جدید -AddProject=اضافه کردن پروژه +AddProject=Create project DeleteAProject=حذف یک پروژه DeleteATask=حذف کار ConfirmDeleteAProject=آیا مطمئن هستید که می خواهید این پروژه را حذف کنید؟ @@ -36,6 +36,8 @@ TaskTimeSpent=مدت زمان صرف شده در کارها TaskTimeUser=کاربر TaskTimeNote=یادداشت TaskTimeDate=تاریخ +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=زمان جدید به سر برد MyTimeSpent=وقت من صرف MyTasks=کارهای من @@ -45,7 +47,7 @@ TaskDateStart=تاریخ شروع کار TaskDateEnd=تاریخ پایان کار TaskDescription=شرح وظیفه NewTask=کار جدید -AddTask=اضافه کردن کار +AddTask=Create task AddDuration=اضافه کردن مدت زمان Activity=فعالیت Activities=وظایف / فعالیت ها diff --git a/htdocs/langs/fa_IR/resource.lang b/htdocs/langs/fa_IR/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/fa_IR/resource.lang +++ b/htdocs/langs/fa_IR/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang index 5f527bfefd6..5262a10dba1 100644 --- a/htdocs/langs/fa_IR/withdrawals.lang +++ b/htdocs/langs/fa_IR/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=در اعتباری WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=نمایش برداشت IfInvoiceNeedOnWithdrawPaymentWontBeClosed=با این حال، اگر فاکتور حداقل یک عقب نشینی پرداخت هنوز پردازش نشده، آن را مجموعه ای به عنوان پرداخت می شود اجازه می دهد تا مدیریت خروج قبل. -DoStandingOrdersBeforePayments=در این تب شما اجازه می دهد به درخواست حکم ایستاده. پس از آن کامل شده است، شما می توانید پرداخت تایپ برای بستن صورتحساب. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=فایل برداشت SetToStatusSent=تنظیم به وضعیت "فایل ارسال شد" ThisWillAlsoAddPaymentOnInvoice=این نیز خواهد پرداخت به فاکتورها اعمال می شود و آنها را طبقه بندی به عنوان "پرداخت" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=پرداخت سفارش ثابت٪ توسط بانک diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 43df8c5feb8..311fd107278 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Lisää suodin näyttää / piilottaa thirdparties jotka ovat nykyisin toimintaa tai on lopettanut sen UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Hakusuodattimiani vaihtoehtoja NumberOfKeyToSearch=Nbr merkkien laukaista haku: %s ViewFullDateActions=Näytä koko päivämäärät toimia kolmannen arkin @@ -208,6 +210,7 @@ ModulesJobDesc=Business modules antamaan yksinkertaisia ennalta asennusohjelma D ModulesMarketPlaceDesc=Löydät lisää moduuleja ladata Pat internetissä ... ModulesMarketPlaces=Lisää moduuleja ... DoliStoreDesc=DoliStore, virallinen markkinapaikka Dolibarr ERP / CRM ulkoisten moduulien +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web-sivuston tarjoajat voit etsiä löytää lisää moduuleja ... URL=Linkki BoxesAvailable=Laatikot saatavilla @@ -444,7 +447,7 @@ Module55Desc=Viivakoodi hallinto Module56Name=Puhelimet Module56Desc=Puhelimet yhdentyminen Module57Name=Pysyvän tilaukset -Module57Desc=Pysyvän tilauksista ja vetämiset hallinto +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial yhdentyminen Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Lisää RSS-syöte sisällä Dolibarr näytön sivuilla Module330Name=Kirjanmerkit Module330Desc=Kirjanmerkit hallinto -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar yhdentyminen Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Kategoriat Module1780Desc=Kategoriat hallintaa (tuotteet, tavarantoimittajat ja asiakkaat) Module2000Name=FCKeditor Module2000Desc=WYSIWYG-editori +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Sähköinen Content Management Module2500Desc=Tallentaa ja jakaa asiakirjoja Module2600Name=WebServices Module2600Desc=Ota Dolibarr verkkopalvelut palvelimen +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Käytä online Gravatar palvelu (www.gravatar.com) näyttää kuvan käyttäjät / jäsenet (löytyi niiden sähköpostit). Tarvitsetko internetyhteys Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Moduuli tarjoaa online-maksu sivun luottokortti Paybox Module50100Name=Kassa @@ -527,7 +534,7 @@ Module50200Desc=Moduuli tarjoaa online-maksu-sivulla luottokortilla PayPal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup tallennettu BackToModuleList=Palaa moduulien luetteloon BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Pysyvä hakulomake vasemmassa valikossa DefaultLanguage=Oletuskieltä käyttää (kieli-koodi) EnableMultilangInterface=Ota monikielinen käyttöliittymä EnableShowLogo=Show logo vasemmalla valikossa +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Järjestelmä on päivitetty onnistuneesti CompanyInfo=Yritys / säätiö tiedot CompanyIds=Yritys / perusta identiteettien diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang index e5976e31938..88c4c033422 100644 --- a/htdocs/langs/fi_FI/agenda.lang +++ b/htdocs/langs/fi_FI/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Toimet vaikuttaa ActionsDoneBy=Toimet tehdään ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Kaikki toimet / tehtävät AllActions= Toutes les actions / tehtävät ViewList=Näytä lista diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang index 81d6e4b52ba..8bcaee8c4c9 100644 --- a/htdocs/langs/fi_FI/bills.lang +++ b/htdocs/langs/fi_FI/bills.lang @@ -77,17 +77,17 @@ PaymentMode=Maksutapa PaymentConditions=Maksuaika PaymentConditionsShort=Maksuaika PaymentAmount=Maksusumma -ValidatePayment=Validate payment +ValidatePayment=Vahvista maksu PaymentHigherThanReminderToPay=Maksu korkeampi kuin muistutus maksaa HelpPaymentHigherThanReminderToPay=Huomio, maksusumman yhden tai useamman laskut on korkeampi kuin muualla maksamaan.
Muokkaa merkintä, muuten vahvistaa ja mieti luoda menoilmoitus sen ylittävältä osalta saatu kunkin overpaid laskut. HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm. -ClassifyPaid=Luokittele "maksetaan" -ClassifyPaidPartially=Luokittele "maksetaan osittain" +ClassifyPaid=Luokittele "Maksettu" +ClassifyPaidPartially=Luokittele "Osittain maksettu" ClassifyCanceled=Luokittele "Hylätty" ClassifyClosed=Luokittele "Suljettu" -ClassifyUnBilled=Classify 'Unbilled' +ClassifyUnBilled=Luokittele 'Laskuttamatta' CreateBill=Luo lasku -AddBill=Create invoice or credit note +AddBill=Luo lasku / hyvityslasku AddToDraftInvoices=Add to draft invoice DeleteBill=Poista lasku SearchACustomerInvoice=Haku asiakkaan laskussa @@ -294,7 +294,7 @@ ConfirmRemoveDiscount=Oletko varma, että haluat poistaa tämän edullisista? RelatedBill=Related lasku RelatedBills=Related laskut LatestRelatedBill=Latest related invoice -WarningBillExist=Warning, one or more invoice already exist +WarningBillExist=Varoitus, yksi tai useampi lasku jo olemassa # PaymentConditions PaymentConditionShortRECEP=Välittömät @@ -393,7 +393,7 @@ ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila "maksanut". ToMakePayment=Pay ToMakePaymentBack=Pay back -ListOfYourUnpaidInvoices=List of unpaid invoices +ListOfYourUnpaidInvoices=Luettelo maksamattomista laskuista NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative. RevenueStamp=Revenue stamp YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang index 35ca76fe5a4..2d006ade127 100644 --- a/htdocs/langs/fi_FI/compta.lang +++ b/htdocs/langs/fi_FI/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/fi_FI/contracts.lang b/htdocs/langs/fi_FI/contracts.lang index 2086a0d1c27..8d44a9b256e 100644 --- a/htdocs/langs/fi_FI/contracts.lang +++ b/htdocs/langs/fi_FI/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Luettelo käynnissä sopimuksen linjat ListOfRunningServices=Luettelo käynnissä olevat palvelut NotActivatedServices=Ei aktivoitu palvelut (muun muassa validoitava sopimukset) BoardNotActivatedServices=Palvelut aktivoida kesken validoitava sopimukset -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Viimeisin %s aktivoitu palvelut LastModifiedServices=Viimeisin %s muunnettu palvelut EditServiceLine=Muokkaa palvelulinja @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Myyntiedustajaasi allekirjoittamalla sopimuksen diff --git a/htdocs/langs/fi_FI/dict.lang b/htdocs/langs/fi_FI/dict.lang index 23ddc892605..759c36326b8 100644 --- a/htdocs/langs/fi_FI/dict.lang +++ b/htdocs/langs/fi_FI/dict.lang @@ -5,8 +5,8 @@ CountryIT=Italia CountryES=Espanja CountryDE=Saksa CountryCH=Sveitsi -CountryGB=Ison-Britannian -# CountryUK=United Kingdom +CountryGB=Iso-Britannia +CountryUK=United Kingdom CountryIE=Irlanti CountryCN=Kiina CountryTN=Tunisia @@ -20,7 +20,7 @@ CountryNL=Alankomaat CountryHU=Unkari CountryRU=Venäjä CountrySE=Ruotsi -CountryCI=Ivoiry Coast +CountryCI=Norsunluurannikko CountrySN=Senegal CountryAR=Argentiina CountryCM=Kamerun @@ -252,8 +252,7 @@ CivilityMME=Mrs CivilityMR=Mr. CivilityMLE=Ms CivilityMTRE=Mestari -# CivilityDR=Doctor - +CivilityDR=Doctor ##### Currencies ##### Currencyeuros=Euroa CurrencyAUD=Dollar AU @@ -290,10 +289,10 @@ CurrencyXOF=CFA-frangia BCEAO CurrencySingXOF=CFA: n frangin BCEAO CurrencyXPF=YKP Francs CurrencySingXPF=CFP-frangi - -# CurrencyCentSingEUR=cent -# CurrencyThousandthSingTND=thousandth - +CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=paise +CurrencyThousandthSingTND=thousandth #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Tietoa kampanjasta @@ -302,28 +301,27 @@ DemandReasonTypeSRC_CAMP_PHO=Puhelin kampanja DemandReasonTypeSRC_CAMP_FAX=Fax kampanja DemandReasonTypeSRC_COMM=Kaupalliset yhteystiedot DemandReasonTypeSRC_SHOP=Kauppa Yhteystiedot -# DemandReasonTypeSRC_WOM=Word of mouth -# DemandReasonTypeSRC_PARTNER=Partner -# DemandReasonTypeSRC_EMPLOYEE=Employee -# DemandReasonTypeSRC_SPONSORING=Sponsorship - +DemandReasonTypeSRC_WOM=Word of mouth +DemandReasonTypeSRC_PARTNER=Partner +DemandReasonTypeSRC_EMPLOYEE=Employee +DemandReasonTypeSRC_SPONSORING=Sponsorship #### Paper formats #### -# PaperFormatEU4A0=Format 4A0 -# PaperFormatEU2A0=Format 2A0 -# PaperFormatEUA0=Format A0 -# PaperFormatEUA1=Format A1 -# PaperFormatEUA2=Format A2 -# PaperFormatEUA3=Format A3 -# PaperFormatEUA4=Format A4 -# PaperFormatEUA5=Format A5 -# PaperFormatEUA6=Format A6 -# PaperFormatUSLETTER=Format Letter US -# PaperFormatUSLEGAL=Format Legal US -# PaperFormatUSEXECUTIVE=Format Executive US -# PaperFormatUSLEDGER=Format Ledger/Tabloid -# PaperFormatCAP1=Format P1 Canada -# PaperFormatCAP2=Format P2 Canada -# PaperFormatCAP3=Format P3 Canada -# PaperFormatCAP4=Format P4 Canada -# PaperFormatCAP5=Format P5 Canada -# PaperFormatCAP6=Format P6 Canada +PaperFormatEU4A0=Format 4A0 +PaperFormatEU2A0=Format 2A0 +PaperFormatEUA0=Format A0 +PaperFormatEUA1=Format A1 +PaperFormatEUA2=Format A2 +PaperFormatEUA3=Format A3 +PaperFormatEUA4=Format A4 +PaperFormatEUA5=Format A5 +PaperFormatEUA6=Format A6 +PaperFormatUSLETTER=Format Letter US +PaperFormatUSLEGAL=Format Legal US +PaperFormatUSEXECUTIVE=Format Executive US +PaperFormatUSLEDGER=Format Ledger/Tabloid +PaperFormatCAP1=Format P1 Canada +PaperFormatCAP2=Format P2 Canada +PaperFormatCAP3=Format P3 Canada +PaperFormatCAP4=Format P4 Canada +PaperFormatCAP5=Format P5 Canada +PaperFormatCAP6=Format P6 Canada diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang index 09fdff1071f..f685e4443c4 100644 --- a/htdocs/langs/fi_FI/errors.lang +++ b/htdocs/langs/fi_FI/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Toimittaja-koodi tarvitaan ErrorSupplierCodeAlreadyUsed=Toimittaja koodi jo käytössä ErrorBadParameters=Bad parametrit ErrorBadValueForParameter=Väärä arvo "%s" parametrien väärä "%s" -ErrorBadImageFormat=Image-tiedosto ei ole tuettu formaatti +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Arvo "%s" on väärä päivämäärä muoto ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Epäonnistui kirjoittaa hakemistoon %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Käyttäjälle sisäänkirjoittautumissivuksesi %s%s käyttää myös toteuttaa web-palvelimella ei ole lupaa, että ErrorNoActivatedBarcode=Ei viivakoodin tyyppi aktivoitu ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang index c9f0a1d0926..157c88b9941 100644 --- a/htdocs/langs/fi_FI/margins.lang +++ b/htdocs/langs/fi_FI/margins.lang @@ -1,10 +1,10 @@ # Dolibarr language file - Source file is en_US - marges -Margin=Margin -Margins=Margins -TotalMargin=Total Margin -MarginOnProducts=Margin / Products -MarginOnServices=Margin / Services +Margin=Kate +Margins=Katteet +TotalMargin=Kate yhteensä +MarginOnProducts=Kate / Tuotteet +MarginOnServices=Kate / Palvelut MarginRate=Margin rate MarkRate=Mark rate DisplayMarginRates=Display margin rates @@ -17,8 +17,8 @@ ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins ProductService=Tuote tai palvelu -AllProducts=All products and services -ChooseProduct/Service=Choose product or service +AllProducts=Kaikki tuotteet ja palvelut +ChooseProduct/Service=Valitse tuote tai palvelu StartDate=Aloituspäivämäärä EndDate=Lopetuspäivä Launch=Alku diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang index 7f090046839..ea028ebe4eb 100644 --- a/htdocs/langs/fi_FI/members.lang +++ b/htdocs/langs/fi_FI/members.lang @@ -8,7 +8,7 @@ Members=Jäsenet MemberAccount=Kirjaudu ShowMember=Näytä jäsenen kortti UserNotLinkedToMember=Käyttäjää ei liity jäseneksi -# ThirdpartyNotLinkedToMember=Third-party not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=Jäsenet Liput FundationMembers=Säätiön jäsenet Attributs=Määritteet @@ -85,8 +85,7 @@ SubscriptionLateShort=Myöhäinen SubscriptionNotReceivedShort=Koskaan saanut ListOfSubscriptions=Luettelo tilaukset SendCardByMail=Lähetä kortti -AddMember=Lisää jäsen -MemberType=Jäsen tyyppi +AddMember=Create member NoTypeDefinedGoToSetup=Jäsen tyypit määritelty. Go to setup - Jäsenet tyypit NewMemberType=Uusi jäsen tyyppi WelcomeEMail=Tervetuloa e-mail @@ -126,12 +125,12 @@ Date=Päivämäärä DateAndTime=Päivämäärä ja kellonaika PublicMemberCard=Osakkeenomistajan julkinen kortti MemberNotOrNoMoreExpectedToSubscribe=Jäsen tai ei ole enää odotettavissa tilata -AddSubscription=Lisää tilaus +AddSubscription=Create subscription ShowSubscription=Näytä tilaus MemberModifiedInDolibarr=Jäsen muutettu Dolibarr SendAnEMailToMember=Lähetä tiedot sähköpostitse jäsen -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Viestin aihe ja jäsen autosubscription DescADHERENT_AUTOREGISTER_MAIL=Sähköpostitse jäsenen autosubscription DescADHERENT_MAIL_VALID_SUBJECT=EMail aihe jäsen validointi @@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=EMail aihe jäsen résiliation DescADHERENT_MAIL_RESIL=EMail jäsenen résiliation DescADHERENT_MAIL_FROM=Sender EMail automaattisen sähköpostit DescADHERENT_ETIQUETTE_TYPE=Etiketit muodossa -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets DescADHERENT_CARD_TYPE=Muotoile korttien sivu DescADHERENT_CARD_HEADER_TEXT=Teksti painettu päälle jäsen kortit DescADHERENT_CARD_TEXT=Teksti painettu jäsen kortit @@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Kolmansista osapuolista ei näihin jäsen ThirdPartyDolibarr=Dolibarr kolmannen osapuolen MembersAndSubscriptions= Jäsenet ja Subscriptions MoreActions=Täydentäviä toimia tallennus -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription MoreActionBankDirect=Luo suoraan tiliotteensa takia MoreActionBankViaInvoice=Luo lasku ja ennakkomaksu MoreActionInvoiceOnly=Luo laskun maksua @@ -171,6 +170,8 @@ LastSubscriptionAmount=Viime merkinnän määrästä MembersStatisticsByCountries=Jäsenten tilastot maittain MembersStatisticsByState=Jäsenten tilastot valtio / lääni MembersStatisticsByTown=Jäsenten tilastot kaupunki +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=Jäsenmäärä NoValidatedMemberYet=Ei validoitu jäsenet pitivät MembersByCountryDesc=Tämä ruutu näyttää tilastoja jäseniä maittain. Graphic riippuu kuitenkin Googlen online-käyrä palvelu ja on käytettävissä vain, jos internet-yhteys toimii. @@ -196,9 +197,10 @@ Collectivités=Organisaatiot Particuliers=Henkilökohtainen Entreprises=Yritykset DOLIBARRFOUNDATION_PAYMENT_FORM=Voit tehdä tilauksen maksun avulla pankkisiirrolla sivulla http://wiki.dolibarr.org/index.php/Subscribe .
Voit maksaa luottokortilla tai PayPal, klikkaa painiketta sivun alalaidassa.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang index f5af02e9123..aa890f3d6fa 100644 --- a/htdocs/langs/fi_FI/products.lang +++ b/htdocs/langs/fi_FI/products.lang @@ -1,18 +1,18 @@ # Dolibarr language file - Source file is en_US - products -ProductRef=Tuote ref. -ProductLabel=Tuotemerkki +ProductRef=Tuote nro. +ProductLabel=Tuotenimike ProductServiceCard=Tuotteet / Palvelut kortti Products=Tuotteet Services=Palvelut Product=Tuote -Service=Service +Service=Palvelu ProductId=Tuote / palvelu id Create=Luo Reference=Viite NewProduct=Uusi tuote NewService=Uusi palvelu ProductCode=Tuotekoodi -ServiceCode=Service-koodi +ServiceCode=Palvelukoodi ProductVatMassChange=Mass VAT change ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database. MassBarcodeInit=Mass barcode init @@ -22,17 +22,17 @@ ProductAccountancySellCode=Kirjanpidon koodi (myydä) ProductOrService=Tuote tai palvelu ProductsAndServices=Tuotteet ja palvelut ProductsOrServices=Tuotteet tai palvelut -ProductsAndServicesOnSell=Tuotteet ja Palvelut myydä -ProductsAndServicesNotOnSell=Tuotteet ja palvelut pois myydä -ProductsAndServicesStatistics=Tuotteet ja palvelut tilastojen -ProductsStatistics=Tuotteet tilastot -ProductsOnSell=Tuotteita myyvät -ProductsNotOnSell=Tuotteet pois myydä +ProductsAndServicesOnSell=Myytävät Tuotteet ja Palvelut +ProductsAndServicesNotOnSell=Ei myytävät Tuotteet ja palvelut +ProductsAndServicesStatistics=Tuotteiden ja Palveluiden tilastot +ProductsStatistics=Tuotteiden tilastot +ProductsOnSell=Myytävät Tuotteet +ProductsNotOnSell=Ei Myytävät Tuotteet ProductsOnSellAndOnBuy=Products not for sale nor purchase -ServicesOnSell=Palvelut myydä -ServicesNotOnSell=Palvelut pois myydä +ServicesOnSell=Myytävät palvelut +ServicesNotOnSell=Ei Myytävät Palvelut ServicesOnSellAndOnBuy=Services not for sale nor purchase -InternalRef=Kertomus +InternalRef=Sisäinen viite LastRecorded=Uusimmat tuotteet / palvelut myydä kirjataan LastRecordedProductsAndServices=Viimeisin %s kirjataan tuotteet / palvelut LastModifiedProductsAndServices=Viimeisin %s muunneltuja tuotteita / palveluita @@ -42,10 +42,10 @@ LastProducts=Uusimmat tuotteet CardProduct0=Tuote-kortti CardProduct1=Palvelukortti CardContract=Sopimus-kortti -Warehouse=Warehouse +Warehouse=Varasto Warehouses=Varastot -WarehouseOpened=Warehouse avattu -WarehouseClosed=Warehouse suljettu +WarehouseOpened=Varasto avattu +WarehouseClosed=Varasto suljettu Stock=Kanta Stocks=Varastot Movement=Movement @@ -117,12 +117,12 @@ ServiceLimitedDuration=Jos tuote on palvelu, rajoitettu kesto: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Lukumäärä hinta MultiPriceLevelsName=Hintakategorioissa -AssociatedProductsAbility=Ota niihin liittyvät tuotteet -AssociatedProducts=Vastaavat tuotteet -AssociatedProductsNumber=Määrä vastaavat tuotteet -ParentProductsNumber=Lukumäärä emoyhtiön tuote -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Käännös KeywordFilter=Hakusanalla suodatin @@ -132,7 +132,7 @@ AddDel=Lisää / Poista Quantity=Määrä NoMatchFound=Ei hakutuloksia löytyi ProductAssociationList=Luettelo niihin liittyvät tuotteet / palvelut: nimi tuotteen / palvelun (määrä vaikuta) -ProductParentList=Luettelo tuotteista / palveluista tämän tuotteen komponentti +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Yksi valittu tuote on vanhempi nykyinen tuote DeleteProduct=Poista tuotteen / palvelun ConfirmDeleteProduct=Oletko varma, että haluat poistaa tämän tuotteen / palvelun? @@ -179,7 +179,7 @@ CloneProduct=Klooni tuotteen tai palvelun ConfirmCloneProduct=Oletko varma, että haluat klooni tuotteen tai palvelun %s? CloneContentProduct=Klooni kaikki tärkeimmät tiedot tuotteen / palvelun ClonePricesProduct=Klooni tärkeimmät tiedot ja hinnat -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Tämä tuote on käytetty NewRefForClone=Ref. uuden tuotteen tai palvelun CustomerPrices=Asiakkaat hinnat @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang index fee10556bfa..b63e1c65861 100644 --- a/htdocs/langs/fi_FI/projects.lang +++ b/htdocs/langs/fi_FI/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät (käyttäjä Myprojects=Omat hankkeet ProjectsArea=Projektit alueella NewProject=Uusi projekti -AddProject=Lisää hanke +AddProject=Create project DeleteAProject=Poista hanke DeleteATask=Poista tehtävä ConfirmDeleteAProject=Oletko varma, että haluat poistaa tämän hankkeen? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Uusi käytetty aika MyTimeSpent=Oma käytetty aika MyTasks=Omat tehtävät @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Uusi tehtävä -AddTask=Lisää tehtävä +AddTask=Create task AddDuration=Lisää kesto Activity=Toiminto Activities=Tehtävät / toiminnot diff --git a/htdocs/langs/fi_FI/resource.lang b/htdocs/langs/fi_FI/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/fi_FI/resource.lang +++ b/htdocs/langs/fi_FI/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang index 3e66966383b..9b24ab1f9d3 100644 --- a/htdocs/langs/fi_FI/withdrawals.lang +++ b/htdocs/langs/fi_FI/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Luottoa WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Näytä Nosta IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Kuitenkin, jos lasku on ainakin yksi poistamista määrä ei kuitenkaan ole vielä käsitelty, sitä ei voida määrittää koska maksoivat sallimaan hallita poistettaviksi. -DoStandingOrdersBeforePayments=Tällä välilehtien avulla voit pyytää ja kestotilauksena. Kun se on valmis, voit kirjoittaa maksun sulkea laskun. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Maksaminen kestotilaus %s pankin diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index bdb6912ebe4..13c55401371 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Utilisez un champ avec auto-complétion pour choisir le ActivityStateToSelectCompany= Ajouter une option de filtrage lors des recherches pour afficher/masquer les tiers en exercice ou ayant cessé d'exercer UseSearchToSelectContactTooltip=Si vous avez un nombre important de contacts (>100 000), vous pourrez améliorer les performances en positionnant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines. UseSearchToSelectContact=Utilisez un champ avec auto-complétion pour choisir les contacts (plutôt qu'une liste déroulante). +DelaiedFullListToSelectCompany=Attendre que vous ayez appuyez sur une touche avant de charger le contenu de la liste les tiers (Cela peut augmenter les performances si vous avez un grand nombre de tiers) +DelaiedFullListToSelectContact=Attendre que vous ayez appuyez sur une touche avant de charger le contenu de la liste les contacts (Cela peut augmenter les performances si vous avez un grand nombre de contacts) SearchFilter=Options des filtres de recherche NumberOfKeyToSearch=Nb carac. déclenchant recherche : %s ViewFullDateActions=Afficher les dates complètes des événements dans la fiche de tiers @@ -208,6 +210,7 @@ ModulesJobDesc=Les modules métiers très spécifiques permettent une préconfig ModulesMarketPlaceDesc=D'autres modules/extensions sont disponibles en téléchargement sur des sites externes sur Internet... ModulesMarketPlaces=Plus de modules... DoliStoreDesc=DoliStore, la place de marché officielle des modules et extensions complémentaires pour Dolibarr ERP/CRM +DoliPartnersDesc=Liste de quelques sociétés qui peuvent fournir/développer des modules ou fonctions sur mesure (Remarque: Toute société Open Source connaissant le langage PHP peut fournir du développement spécifique) WebSiteDesc=Sites fournisseurs à consulter pour trouver plus de modules... URL=Lien BoxesAvailable=Boîtes disponibles @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Gestion des stocks de produits Module53Name=Services Module53Desc=Gestion des services -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Contrats/Abonnements +Module54Desc=Gestion des contrats (services ou abonnements récurrents) Module55Name=Codes-barres Module55Desc=Gestion des codes-barres Module56Name=Téléphonie Module56Desc=Gestion de la téléphonie Module57Name=Prélèvements -Module57Desc=Gestion des prélèvements et retraits bancaires +Module57Desc=Gestion des paiements par prélèvements. Inclut également la génération du fichier de virement des paiements SEPA pour les pays européens. Module58Name=ClickToDial Module58Desc=Intégration d'un système de « ClickToDial » (Asterisk, …) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=Flux RSS Module320Desc=Ajout de flux d'informations RSS dans les écrans Dolibarr Module330Name=Marque-pages Module330Desc=Gestion des marque-pages -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projets/Opportunités/Affaires +Module400Desc=Gestion des projets, opportunités ou affaires. Vous pouvez ensuite assigner tous les autres éléments (facture, commande, proposition, intervention, ...) à ces projets et avoir une vue transverse depuis cette vue projet. Module410Name=Webcalendar Module410Desc=Interface avec le calendrier Webcalendar Module500Name=Dépenses spéciales (taxes, charges, dividendes) @@ -495,6 +498,8 @@ Module1780Name=Catégories Module1780Desc=Gestion des catégories (produits, fournisseurs, clients et adhérents) Module2000Name=Éditeur WYSIWYG Module2000Desc=Permet la saisie de certaines zones de textes grace à un éditeur avancé +Module2200Name=Prix calculés dynamiquement +Module2200Desc=Active l'usage d'expressions mathématiques Module2300Name=Travaux programmés Module2300Desc=Gestionnaire de travaux programmés (Cron) Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Gestion électronique de documents Module2500Desc=Permet de stocker et administrer une base de documents Module2600Name=WebServices Module2600Desc=Active le serveur de Web Services de Dolibarr +Module2650Name=WebServices (client) +Module2650Desc=Activez les Web services client (Peut être utilisé pour pousser données/requêtes vers des serveurs externes. Commandes fournisseurs prises en charge seulement pour le moment) Module2700Name=Gravatar Module2700Desc=Utilise le service en ligne Gravatar (www.gravatar.com) pour afficher les photos d'utilisateurs/membres (en fonction leur email). Besoin d'un accès Internet Module2800Desc=Client FTP @@ -517,7 +524,7 @@ Module6000Desc=Gérer le Workflow Module20000Name=Gestion de la demande de congès Module20000Desc=Déclaration et suivi des congès des employés Module39000Name=Lot -Module39000Desc=Gestion de numéro de lot ou date de péremption pour les produits +Module39000Desc=Gestion des lots et numéro de série, et date de péremption sur les produits Module50000Name=PayBox Module50000Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox Module50100Name=Point de vente @@ -527,7 +534,7 @@ Module50200Desc=Module permettant d'offrir en ligne une page de paiement par car Module50400Name=Comptabilité (avancée) Module50400Desc=Gestion de la comptabilité (doubles parties) Module54000Name=PrintIPP -Module54000Desc=Impression via Cups IPP Printer. +Module54000Desc=Impression directe (sans ouvrir les documents) en utilisant l'interface Cups IPP (l'imprimante doit être visible depuis le serveur, et CUPS doit être installé sur le serveur). Module55000Name=Sondages Module55000Desc=Module pour intégrer un sondage (comme Doodle, Studs, Rdvz, ...) Module59000Name=Marges @@ -606,11 +613,11 @@ Permission151=Consulter les prélèvements Permission152=Créer/modifier une demande de prélèvements Permission153=Émettre des bons de prélèvements Permission154=Créditer/rejeter les bons de prélèvements -Permission161=Read contracts/subscriptions -Permission162=Create/modify contracts/subscriptions -Permission163=Activate a service/subscription of a contract -Permission164=Disable a service/subscription of a contract -Permission165=Delete contracts/subscriptions +Permission161=Lire les contrats/abonnements +Permission162=Créer/modifier les contrats/abonnements +Permission163=Activer un service/abonnement +Permission164=Désactiver un service/abonnements +Permission165=Supprimer les contrats/abonnements Permission171=Lire les notes de frais (Les vôtres et les utilisateurs autorisés) Permission172=Créer/modifier les notes de frais / déplacements Permission173=Supprimer les notes de frais / déplacements @@ -672,7 +679,7 @@ Permission300=Consulter les codes-barres Permission301=Créer/modifier les codes-barres Permission302=Supprimer les codes-barres Permission311=Consulter les services -Permission312=Assign service/subscription to contract +Permission312=Affecter le service/abonnement au contrat Permission331=Lire les marque-pages Permission332=Créer/modifier les marque-pages Permission333=Supprimer les marque-pages @@ -702,8 +709,8 @@ Permission701=Consulter les dons Permission702=Créer/modifier les dons Permission703=Supprimer les dons Permission1001=Consulter les stocks -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses +Permission1002=Créer/modifier entrepôts +Permission1003=Supprimer entrepôts Permission1004=Consulter les mouvements de stocks Permission1005=Créer/modifier les mouvements de stocks Permission1101=Consulter les bons de livraison @@ -779,6 +786,7 @@ DictionaryOrderMethods=Méthodes de commandes DictionarySource=Origines des propales/commandes DictionaryAccountancyplan=Plan comptable DictionaryAccountancysystem=Modèles de plan comptable +DictionaryEMailTemplates=Modèles des courriels SetupSaved=Configuration sauvegardée BackToModuleList=Retour liste des modules BackToDictionaryList=Retour liste des dictionnaires @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zone de recherche permanente du menu de gauche DefaultLanguage=Langue à utiliser par défaut (code langue) EnableMultilangInterface=Activer l'interface multi-langue EnableShowLogo=Afficher le logo dans le menu gauche +EnableHtml5=Activer Html5 (Développement - Supporté uniquement avec le thème Eldy) SystemSuccessfulyUpdated=Votre système a été correctement mis à jour CompanyInfo=Informations sur la société/institution CompanyIds=Identifiants règlementaires @@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Possibilité de sélectionner une adresse de livraison UseOptionLineIfNoQuantity=Une ligne de produit/service ayant une quantité nulle est considérée comme une option FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide) -BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale ##### Orders ##### OrdersSetup=Configuration du module Commandes OrdersNumberingModules=Modèles de numérotation des commandes @@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Modèles de numérotation des fiches d'intervention TemplatePDFInterventions=Modèles de document des fiches d'intervention WatermarkOnDraftInterventionCards=Filigrane sur les brouillons des fiches d'intervention (aucun si vide) ##### Contracts ##### -ContractsSetup=Contracts/Subscriptions module setup +ContractsSetup=Configuration du module Contrats/Abonnements ContractsNumberingModules=Modèles de numérotation des contrats TemplatePDFContracts=Modèles de document de contrats FreeLegalTextOnContracts=Mention complémentaire sur les contrats @@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Fichiers de type %s non compressé par le serveur HTTP CacheByServer=Cache par le serveur CacheByClient=Cache par le navigateur CompressionOfResources=Compression des réponses HTTP -TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +TestNotPossibleWithCurrentBrowsers=Une détection automatique n'est pas possible avec le navigateur courant ##### Products ##### ProductSetup=Configuration du module Produits ServiceSetup=Configuration du module Services @@ -1415,9 +1424,9 @@ OSCommerceTestOk=La connexion au serveur '%s' sur la base '%s' par l'utilisateur OSCommerceTestKo1=La connexion au serveur '%s' a réussi mais la base '%s' n'a pu être atteinte. OSCommerceTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué. ##### Stock ##### -StockSetup=Warehouse module setup -UserWarehouse=Use user personal warehouses -IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. +StockSetup=Configuration du module Entrepôt +UserWarehouse=Utiliser des emplacements/entrepôts propres à chaque utilisateur +IfYouUsePointOfSaleCheckModule=Si vous utilisez un module Point de Vente (module POS fourni par défaut ou un autre module externe), cette configuration peut être ignoré par votre module point de vente. La plupart de modules Point de Vente sont conçus pour créer immédiatement une facture et de réduire les stocks par défaut quelles que soient les options ici. Donc, si vous avez besoin ou non d'avoir une diminution du stock lors de l'enregistrement d'une vente dans votre Point de Vente, vérifiez également la configuration de votre module POS. ##### Menu ##### MenuDeleted=Menu supprimé TreeMenu=Arborescence des menus @@ -1482,14 +1491,14 @@ ClickToDialDesc=Ce module permet d'ajouter la possibilité de cliquer sur les nu ##### Point Of Sales (CashDesk) ##### CashDesk=Caisse enregistreuse CashDeskSetup=Configuration du module Point de vente/caisse enregistreuse -CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskThirdPartyForSell=Tiers générique à utiliser par défaut pour les ventes CashDeskBankAccountForSell=Compte par défaut à utiliser pour l'encaissement en liquide CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en carte de crédit -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale -CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease -StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled -CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. +CashDeskDoNotDecreaseStock=Ne pas réduire le stock quand une vente est faite depuis le Point de Vente. Sinon, la réduction est faite par défaut. +CashDeskIdWareHouse=Forcer et restreindre l'emplacement/entrepôt à utiliser pour la réduction de stock +StockDecreaseForPointOfSaleDisabled=Réduction de stock lors de l'utilisation du Point de Vente désactivée +CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stocks lors de la réalisation d'une vente depuis le Point de Vente. Aussi, un entrepôt/emplacement est nécessaire. ##### Bookmark ##### BookmarkSetup=Configuration du module Marque-pages BookmarkDesc=Ce module vous permet de gérer des liens et raccourcis. Il permet aussi d'ajouter n'importe quelle page de Dolibarr ou lien web dans le menu d'accès rapide sur la gauche. diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index a4e5e7e0a03..bd3c25da359 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -29,7 +29,7 @@ ActionsToDoBy=Événements affectés à ActionsDoneBy=Événements réalisés par ActionsForUser=Evénements de l'utilisateur ActionsForUsersGroup=Evénements de tous les utilisateurs du groupe -ActionAssignedTo=Événement assigné à +ActionAssignedTo=Evénement assigné à AllMyActions= Tous mes événements AllActions= Tous les événements ViewList=Vue liste @@ -45,7 +45,7 @@ AgendaExtSitesDesc=Cette page permet d'ajouter des sources de calendriers extern ActionsEvents=Événements pour lesquels Dolibarr doit insérer un évènement dans l'agenda en automatique. PropalValidatedInDolibarr=Proposition %s validée InvoiceValidatedInDolibarr=Facture %s validée -InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceValidatedInDolibarrFromPos=Facture %s validée depuis le Point de Vente InvoiceBackToDraftInDolibarr=Facture %s repassée en brouillon InvoiceDeleteDolibarr=Facture %s supprimée OrderValidatedInDolibarr= Commande %s validée diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index fa1eff4b0af..24ebe5ff923 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -217,7 +217,7 @@ NoInvoice=Aucune facture ClassifyBill=Classer la facture SupplierBillsToPay=Factures fournisseurs à payer CustomerBillsUnpaid=Factures clients impayées -DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +DispenseMontantLettres=Les factures écrites par des procédures mecanographic sont distribuées par l'ordre en lettres NonPercuRecuperable=Non perçue réc. SetConditions=Définir conditions de règlement SetMode=Définir mode de règlement diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 5c826d54301..6b29fa82fec 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisisse TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaire par produit, dans une comptabilité en mode comptabilité de caisse n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit comptabilité d'engagement (voir la configuration du module de comptabilité). CalculationMode=Mode de calcul AccountancyJournal=Code journal comptabilité -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits -ACCOUNTING_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits ACCOUNTING_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA ACCOUNTING_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA ACCOUNTING_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang index 5f9a8b4427d..895e3c95cad 100644 --- a/htdocs/langs/fr_FR/contracts.lang +++ b/htdocs/langs/fr_FR/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Espace contrats ListOfContracts=Liste des contrats -LastModifiedContracts=Last %s modified contracts +LastModifiedContracts=Les %s derniers contrats modifiés AllContracts=Tous les contrats ContractCard=Fiche contrat ContractStatus=État du contrat @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste des lignes de contrats en service ListOfRunningServices=Liste des services actifs NotActivatedServices=Services non activés (parmi les contrats validés) BoardNotActivatedServices=Services à activer en contrat validé -LastContracts=Last % contracts +LastContracts=Les %s derniers contrats LastActivatedServices=Les %s derniers services activés LastModifiedServices=Les %s derniers services modifiés EditServiceLine=Edition ligne du service @@ -91,6 +91,7 @@ ListOfServicesToExpire=Liste des services actifs en expiration NoteListOfYourExpiredServices=Cette list ne contient que les contrats de services des tiers pour lesquels vous êtes liés comme représentant commercial. StandardContractsTemplate=Modèle standard de contrats ContactNameAndSignature=Pour %s, nom et signature: +OnlyLinesWithTypeServiceAreUsed=Seules les lignes de type "Service" seront clonées ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang index e559c9e5bcd..92deeb11c20 100644 --- a/htdocs/langs/fr_FR/cron.lang +++ b/htdocs/langs/fr_FR/cron.lang @@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser 'crontab' CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tâche pour lancer une commande toute les minutes # Menu CronJobs=Travaux programmés -CronListActive=List of active/scheduled jobs +CronListActive=Liste des travaux actifs/programmés CronListInactive=Liste des travaux inactifs # Page list CronDateLastRun=Dernier lancement diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 0ccafc3843c..e880dbdac8d 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -6,9 +6,9 @@ NoErrorCommitIsDone=Pas d'erreur, on valide Error=Erreur Errors=Erreurs ErrorButCommitIsDone=Erreurs trouvées mais on valide malgré tout -ErrorBadEMail=e-mail %s invalide +ErrorBadEMail=email %s invalide ErrorBadUrl=Url %s invalide -ErrorLoginAlreadyExists=Le login %s existe déjà. +ErrorLoginAlreadyExists=L'identifiant %s existe déjà. ErrorGroupAlreadyExists=Le groupe %s existe déjà. ErrorRecordNotFound=Enregistrement non trouvé. ErrorFailToCopyFile=Echec de la copie du fichier '%s' en '%s'. @@ -37,15 +37,15 @@ ErrorSupplierCodeRequired=Code fournisseur obligatoire ErrorSupplierCodeAlreadyUsed=Code fournisseur déjà utilisé ErrorBadParameters=Paramètres incorrects ErrorBadValueForParameter=Valeur '%s' incorrecte pour le paramètre '%s' -ErrorBadImageFormat=Cet image a un format non supporté (Votre PHP ne supporte pas les fonctions de conversion de ce format d'image). +ErrorBadImageFormat=Cet image est dans un format non pris en charge (Votre PHP ne prend pas en charge les fonctions de conversion de ce format d'image). ErrorBadDateFormat=La valeur '%s' a un format de date non reconnu ErrorWrongDate=La date est incorrecte ErrorFailedToWriteInDir=Impossible d'écrire dans le répertoire %s -ErrorFoundBadEmailInFile=Syntaxe de mail incorrecte trouvée pour %s lignes dans le fichier (exemple ligne %s avec email=%s) +ErrorFoundBadEmailInFile=Syntaxe d'email incorrecte trouvée pour %s lignes dans le fichier (exemple ligne %s avec email=%s) ErrorUserCannotBeDelete=L'utilisateur ne peut pas être supprimé. Peut-être est-il associé à des éléments de Dolibarr. ErrorFieldsRequired=Des champs obligatoires n'ont pas été renseignés ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre safe_mode a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web. -ErrorNoMailDefinedForThisUser=EMail non défini pour cet utilisateur +ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé pour fonctionner. Modifiez dans configuration - affichage. ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut avoir de menu père. Mettre 0 dans l'id père ou choisir un menu de type 'Left'. ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père. @@ -99,18 +99,18 @@ ErrorFailedToSendPassword=Échec de l'envoi du mot de passe ErrorFailedToLoadRSSFile=Echec de la récupération du flux RSS. Ajoutez la constante MAIN_SIMPLEXMLLOAD_DEBUG si le message d'erreur n'est pas assez explicite. ErrorPasswordDiffers=Les mots de passe ne sont pas identiques, veuillez les saisir à nouveau ErrorForbidden=Accès non autorisé.
Vous essayez d'accéder à une page, zone ou fonction sans être au sein d'une session authentifiée ou qui n'est pas autorisée pour votre compte utilisateur. -ErrorForbidden2=Les permissions pour ce login peuvent être attribuées par l'administrateur Dolibarr via le menu %s -> %s. +ErrorForbidden2=Les permissions pour cet identifiant peuvent être attribuées par l'administrateur Dolibarr via le menu %s -> %s. ErrorForbidden3=Dolibarr ne semble pas fonctionner au sein d'une session authentifiée. Consultez la documentation d'installation de Dolibarr pour savoir comment gérer les authentifications (htaccess, mod_auth ou autre...). ErrorNoImagickReadimage=La classe Imagick n'est pas présente sur cette installation de PHP. L'aperçu n'est donc pas disponible. Les administrateurs peuvent désactiver cet onglet dans le menu Configuration - Affichage. ErrorRecordAlreadyExists=Enregistrement déjà existant ErrorCantReadFile=Échec de lecture du fichier '%s' ErrorCantReadDir=Échec de lecture du répertoire '%s' ErrorFailedToFindEntity=Échec de lecture de l'environnement '%s' -ErrorBadLoginPassword=Identifiants login ou mot de passe incorrect +ErrorBadLoginPassword=Identifiant ou mot de passe incorrect ErrorLoginDisabled=Votre compte est désactivé ErrorFailedToRunExternalCommand=Échec de l'exécution de la commande externe. Vérifiez qu'elle est disponible et exécutable par votre serveur PHP. Si le Safe Mode PHP est actif, vérifiez que la commande se trouve dans un répertoire défini dans le paramètre safe_mode_exec_dir. ErrorFailedToChangePassword=Échec de modification du mot de passe -ErrorLoginDoesNotExists=Le compte utilisateur de login %s n'a pu être trouvé. +ErrorLoginDoesNotExists=Le compte utilisateur identifié par %s n'a pu être trouvé. ErrorLoginHasNoEmail=Cet utilisateur n'a pas d'email. Impossible de continuer. ErrorBadValueForCode=Mauvaise valeur saisie pour le code. Réessayez avec une nouvelle valeur... ErrorBothFieldCantBeNegative=Les champs %s et %s ne peuvent être tous deux négatifs @@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, cet adhérent n'est li ErrorThereIsSomeDeliveries=Erreur, il y a des bordereaux de réception liées à ces expéditions. La suppression est refusée. ErrorCantDeletePaymentReconciliated=Impossible d'effacer un paiement qui a généré une écriture bancaire qui a été rapprochée ErrorCantDeletePaymentSharedWithPayedInvoice=Impossible d'effacer un paiement qui porte sur au moins une facture qui est à l'état payée. +ErrorPriceExpression1=Ne peut assigner la constante '%s' +ErrorPriceExpression2=Ne peut redéfinir la fonction '%s' +ErrorPriceExpression3=Variable '%s' non définie dans la définition de fonction +ErrorPriceExpression4=Caractère illégal '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Nombre incorrect d'arguments (%s donné,%s attendu) +ErrorPriceExpression8=Operateur '%s' non attendu +ErrorPriceExpression9=Une erreur inattendue s'est produite +ErrorPriceExpression10=Il manque l'opérande à l'opérateur '%s' +ErrorPriceExpression11=Attendu '%s' +ErrorPriceExpression14=Division par zéro +ErrorPriceExpression17=Variable '%s' non définie +ErrorPriceExpression19=Expression introuvable +ErrorPriceExpression20=Expression vide +ErrorPriceExpression21=Résultat '%s' vide +ErrorPriceExpression22=Résultat négatif '%s' +ErrorPriceExpressionInternal=Erreur interne '%s' +ErrorPriceExpressionUnknown=Erreur inconnue '%s' # Warnings WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang index 7316d81aebe..8cb4cdcecd1 100644 --- a/htdocs/langs/fr_FR/mails.lang +++ b/htdocs/langs/fr_FR/mails.lang @@ -115,7 +115,7 @@ SentBy=Envoyé par MailingNeedCommand=Pour des raisons de sécurité, les emailings fonctionnent mieux depuis la ligne de commande. Si vous en avez un, demandez à votre administrateur de lancer la commande suivante pour envoyer l'emailing à tous les destinataires : MailingNeedCommand2=Vous pouvez toutefois quand même les envoyer par l'interface écran en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre maximum d'emails envoyés par session d'envoi. Pour cela, aller dans Accueil - Configuration - Divers. ConfirmSendingEmailing=Si vous n'en avez pas ou préferrez envoyer via votre navigateur web, confirmez simplement que vous désirez envoyer l'emailing maintenant depuis le mode web ? -LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +LimitSendingEmailing=Remarque: L'envoi d'Emailings à partir de l'interface web se fait en plusieurs fois pour des raisons de sécurité et de timeout, %s bénéficiaires à la fois pour chaque session d'envoi. TargetsReset=Vider liste ToClearAllRecipientsClickHere=Pour vider la liste des destinataires de cet emailing, cliquez sur le bouton ToAddRecipientsChooseHere=Pour ajouter des destinataires, choisir dans les listes ci-dessous @@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s notifications vont être envoyées par email AddNewNotification=Activer une nouvelle cible de notification email ListOfActiveNotifications=Liste des cibles de notifications emails actives ListOfNotificationsDone=Liste des notifications emails envoyées -MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. -MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. -MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. +MailSendSetupIs=La configuration d'envoi d'emails a été définir sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des e-mailing en masse. +MailSendSetupIs2=Vous devez d'abord aller, avec un compte d'administrateur, dans le menu %sAccueil - Configuration - EMails%s pour changer le paramètre '%s' pour utiliser le mode '%s'. Avec ce mode, vous pouvez accéder à la configuration du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email en masse. +MailSendSetupIs3=Si vous avez des questions sur la façon de configurer votre serveur SMTP, vous pouvez demander à %s. diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang index 3404ee5d3cb..849a6ad0245 100644 --- a/htdocs/langs/fr_FR/members.lang +++ b/htdocs/langs/fr_FR/members.lang @@ -5,7 +5,7 @@ MemberCard=Fiche adhérent SubscriptionCard=Fiche cotisation Member=Adhérent Members=Adhérents -MemberAccount=Login adhérent +MemberAccount=Identifiant adhérent ShowMember=Afficher fiche adhérent UserNotLinkedToMember=Utilisateur non lié à un adhérent ThirdpartyNotLinkedToMember=Tiers non lié à un adhérent @@ -16,7 +16,7 @@ ErrorMemberTypeNotDefined=Le type d'adhérent n'est pas choisi ListOfPublicMembers=Liste des adhérents publics ListOfValidatedPublicMembers=Liste des adhérents publics validés ErrorThisMemberIsNotPublic=Cet adhérent n'est pas public -ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre adhérent (nom: %s, login: %s) est déjà lié au tiers %s. Supprimer le lien existant d'abord car un tiers ne peut être lié qu'à un seul adhérent (et vice versa). +ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre adhérent (nom: %s, identifiant : %s) est déjà lié au tiers %s. Supprimer le lien existant d'abord car un tiers ne peut être lié qu'à un seul adhérent (et vice versa). ErrorUserPermissionAllowsToLinksToItselfOnly=Pour des raisons de sécurité, il faut posséder les droits de modification de tous les utilisateurs pour pouvoir lier un adhérent à un utilisateur autre que vous même. ThisIsContentOfYourCard=Voici les détails de votre fiche CardContent=Contenu de votre fiche adhérent @@ -76,7 +76,7 @@ EditMember=Édition adhérent SubscriptionEndDate=Date de fin adhésion MembersTypeSetup=Configuration des types d'adhérents NewSubscription=Nouvelle adhésion -NewSubscriptionDesc=Ce formulaire permet de vous enregistrer comme nouvel adhérent de l'association. Pour un renouvellement si vous êtes déjà adhérent, contactez plutôt l'association par mail %s. +NewSubscriptionDesc=Ce formulaire permet de vous inscrire comme nouvel adhérent de l'association. Pour un renouvellement (si vous êtes déjà adhérent), contactez plutôt l'association par email %s. Subscription=Adhésion/cotisation Subscriptions=Adhésions/cotisations SubscriptionLate=En retard @@ -84,7 +84,7 @@ SubscriptionNotReceived=Cotisation non reçue SubscriptionLateShort=En retard SubscriptionNotReceivedShort=Non reçue ListOfSubscriptions=Liste des cotisations -SendCardByMail=Envoyer fiche par mail +SendCardByMail=Envoyer fiche par email AddMember=Créer adhérent NoTypeDefinedGoToSetup=Aucun type d'adhérent défini. Allez dans le menu "Types d'adhérents" NewMemberType=Nouveau type de membre @@ -129,17 +129,17 @@ AddSubscription=Créer cotisation ShowSubscription=Afficher adhésion MemberModifiedInDolibarr=Adhérent modifié dans Dolibarr SendAnEMailToMember=Envoyer email d'information à l'adhérent -DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Sujet du mail reçu en cas d'auto-inscription d'un invité -DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Mail reçu en cas d'auto-inscription d'un invité -DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Sujet du mail envoyé en cas d'auto-inscription d'un invité -DescADHERENT_AUTOREGISTER_MAIL=Mail envoyé en cas d'auto-inscription d'un invité -DescADHERENT_MAIL_VALID_SUBJECT=Sujet du mail de validation adhérent -DescADHERENT_MAIL_VALID=Mail de validation adhérent -DescADHERENT_MAIL_COTIS_SUBJECT=Sujet du mail de validation adhésion -DescADHERENT_MAIL_COTIS=Mail de validation d'une adhésion -DescADHERENT_MAIL_RESIL_SUBJECT=Sujet du mail de résiliation -DescADHERENT_MAIL_RESIL=Mail de résiliation -DescADHERENT_MAIL_FROM=Mail émetteur pour les mails automatiques +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Sujet de l'email reçu en cas d'auto-inscription d'un invité +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Email reçu en cas d'auto-inscription d'un invité +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Sujet de l'email envoyé en cas d'auto-inscription d'un invité +DescADHERENT_AUTOREGISTER_MAIL=Email envoyé en cas d'auto-inscription d'un invité +DescADHERENT_MAIL_VALID_SUBJECT=Sujet de l'email de validation adhérent +DescADHERENT_MAIL_VALID=Email de validation adhérent +DescADHERENT_MAIL_COTIS_SUBJECT=Sujet de l'email de validation adhésion +DescADHERENT_MAIL_COTIS=Email de validation d'une adhésion +DescADHERENT_MAIL_RESIL_SUBJECT=Sujet de l'email de résiliation +DescADHERENT_MAIL_RESIL=Email de résiliation +DescADHERENT_MAIL_FROM=Email émetteur pour les mails automatiques DescADHERENT_ETIQUETTE_TYPE=Format pages étiquettes DescADHERENT_ETIQUETTE_TEXT=Texte imprimé sur les planches d'adresses adhérent DescADHERENT_CARD_TYPE=Format pages cartes d'adhérent @@ -203,3 +203,4 @@ MembersByNature=Adhérents par nature VATToUseForSubscriptions=Taux de TVA pour les adhésions NoVatOnSubscription=Pas de TVA sur les adhésions MEMBER_PAYONLINE_SENDEMAIL=Email à avertir en cas de retour de paiement validé pour une cotisation +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produit utilisé pour la ligne d'abonnement dans la facture: %s diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index 1abf48003b9..2b5cfa336ab 100644 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Une expédition existe DraftOrWaitingApproved=Brouillon ou approuvée pas encore commandée DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée MenuOrdersToBill=Commandes délivrées -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Commandes facturables SearchOrder=Rechercher une commande SearchACustomerOrder=Rechercher une commande client ShipProduct=Expédier produit diff --git a/htdocs/langs/fr_FR/printipp.lang b/htdocs/langs/fr_FR/printipp.lang index 3680b42bb87..13e24fc7408 100644 --- a/htdocs/langs/fr_FR/printipp.lang +++ b/htdocs/langs/fr_FR/printipp.lang @@ -1,9 +1,14 @@ # Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Configuration du module Impression direct IPP -PrintIPPDesc=Ce module permet d'ajouter un bouton d'impression direct des documents vers votre imprimante. Il requiert un systeme Linux équipé de Cups. -PRINTIPP_ENABLED=Affiche le logo "Impression directe" sur les listes de documents -PRINTIPP_HOST=Serveur impression +PrintIPPSetup=Réglages du module Direct Print +PrintIPPDesc=Ce module ajoute un bouton Imprimer afin d'envoyer directement les documents à une imprimante. Un système Linux installé avec CUPS est nécessaire. +PRINTIPP_ENABLED=Afficher l'icône « Impression directe » dans les listes de documents +PRINTIPP_HOST=Serveur d'impression PRINTIPP_PORT=Port -PRINTIPP_USER=Login +PRINTIPP_USER=Identifiant PRINTIPP_PASSWORD=Mot de passe -NoPrinterFound=Aucune imprimante trouvée (vérifiez votre configuration Cups) \ No newline at end of file +NoPrinterFound=Aucune imprimante trouvée (vérifiez votre configuration CUPS) +FileWasSentToPrinter=Le fichier %s a été envoyé à l'imprimante +NoDefaultPrinterDefined=Il n'y a pas d'imprimante définie par défaut +DefaultPrinter=Imprimante par défaut +Printer=Imprimante +CupsServer=Serveur CUPS diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang index 83f37508b8d..6871657b6a3 100644 --- a/htdocs/langs/fr_FR/productbatch.lang +++ b/htdocs/langs/fr_FR/productbatch.lang @@ -1,19 +1,20 @@ -# ProductBATCH language file - fr_FR - ProductBATCH -CHARSET= UTF-8 -ProductStatusOnBatch= Gérer -ProductStatusNotOnBatch= Non gérer -ProductStatusOnBatchShort= Gérer -ProductStatusNotOnBatchShort= Non gérer -Batch=Lot -atleast1batchfield= DLC ou DLUO ou Numéro de lot -batch_number= Numéro de lot -l_eatby= DLC -l_sellby= DLUO -DetailBatchNumber= Détails des lots -DetailBatchFormat= Lot/Serie: %s - C:%s - UO: %s (Qté : %d) -printBatch= Lot: %s -printEatby= DLC: %s -printSellby= DLUO: %s -printQty= Qté: %d -AddDispatchBatchLine=Ajouter une ligne de dispatch -BatchDefaultNumber= Indéfini \ No newline at end of file +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Gestion des lots/séries +ProductStatusOnBatch=Géré +ProductStatusNotOnBatch=Non géré +ProductStatusOnBatchShort=Géré +ProductStatusNotOnBatchShort=Non géré +Batch=Lot/Série +atleast1batchfield=Date de péremption ou numéro de lot/série +batch_number=Lot/Numéro de série +l_eatby=Date limite de consommation +l_sellby=Date de péremption +DetailBatchNumber=Détails Lot/Série +DetailBatchFormat=Lot/Série: %s - E:%s - S: %s (Qty : %d) +printBatch=Lot/Série: %s +printEatby=Limite de consommation : %s +printSellby=Péremption : %s +printQty=Qté: %d +AddDispatchBatchLine=Ajouter une ligne pour la répartition par durée de conservation +BatchDefaultNumber=Non défini +WhenProductBatchModuleOnOptionAreForced=Quand le module Lot/Série est activé, le mode incrémentation/décrémentation des stocks est forcé sur le dernier choix et ne peut pas être édité. D'autres options peuvent être définies comme vous le voulez. diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index 58dcbb0844e..a1af422e24b 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/htdocs/langs/fr_FR/products.lang @@ -118,7 +118,7 @@ MultiPricesAbility=Plusieurs niveaux de prix par produit/service MultiPricesNumPrices=Nombre de prix MultiPriceLevelsName=Catégorie de prix AssociatedProductsAbility=Prise en charge des produits virtuels/packs -AssociatedProducts=Produit virtual/package +AssociatedProducts=Produit virtuel/package AssociatedProductsNumber=Nbre de sous-produits constituant ce produit virtuel/package ParentProductsNumber=Nbre de produits virtuels/packages parent IfZeroItIsNotAVirtualProduct=Si 0, ce produit n'est pas un produit virtuel/package @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Définir le même prix sur les filiales des clients PriceByCustomerLog=Trace des prix par clients MinimumPriceLimit=Le prix minimum ne peut être inférieur à %s MinimumRecommendedPrice=Prix minimum recommandé : %s +PriceExpressionEditor=Éditeur d'expression de prix +PriceExpressionSelected=Expression de prix sélectionnée +PriceExpressionEditorHelp=« price = 2 + 2 » ou « 2 + 2 » afin de positionner le prix
Les champs personnalisés sont des variables de la forme « #options_macléchampperso# * 2 »
Il y a des variables spéciales telles que « #quantity# » et « #tva_tx# »
Utiliser « ; » pour séparer les expressions. +PriceMode=Mode de tarification +PriceNumeric=Nombre diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 7148ae0c1c0..29a11afec29 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -36,6 +36,8 @@ TaskTimeSpent=Temps consommé sur les tâches TaskTimeUser=Utilisateur TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tâches sur projets ouverts +WorkloadNotDefined=Charge de travail non définie NewTimeSpent=Nouveau consommé MyTimeSpent=Mon consommé MyTasks=Mes tâches diff --git a/htdocs/langs/fr_FR/resource.lang b/htdocs/langs/fr_FR/resource.lang index c7fb29d3372..3ae29d4d0b6 100644 --- a/htdocs/langs/fr_FR/resource.lang +++ b/htdocs/langs/fr_FR/resource.lang @@ -22,8 +22,8 @@ GotoDate=Aller à un date ResourceElementPage=Ressources ResourceCreatedWithSuccess=Ressource créée avec succès -RessourceLineSuccessfullyDeleted=Resource line successfully deleted -RessourceLineSuccessfullyUpdated=Resource line successfully updated +RessourceLineSuccessfullyDeleted=Ligne de ressource supprimée +RessourceLineSuccessfullyUpdated=Ligne de ressource mise à jour avec succès ResourceLinkedWithSuccess=Ressource liée avec succès TitleResourceCard=Fiche ressource @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirmer la suppression de cette ressource ? RessourceSuccessfullyDeleted=Ressource supprimée avec succès DictionaryResourceType=Type de ressource -DictionaryEMailTemplates=Modèles d'emails - SelectResource=Sélectionner ressource diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index 5aaa2672627..6b0f7772e37 100644 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -102,7 +102,7 @@ UserDisabled=Désactivation utilisateur %s UserEnabled=Activation utilisateur %s UserDeleted=Suppression utilisateur %s NewGroupCreated=Création groupe %s -GroupModified=Group %s modified +GroupModified=Groupe %s modifié GroupDeleted=Suppression groupe %s ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce contact ? ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour cet adhérent ? diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang index a8d290c25fa..d19c4909b4e 100644 --- a/htdocs/langs/fr_FR/withdrawals.lang +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -11,7 +11,7 @@ Withdrawal=Retrait WithdrawalsReceipts=Bons de prélèvements WithdrawalReceipt=Bon de prélèvement WithdrawalReceiptShort=Bon -LastWithdrawalReceipts=Les %s derniers bons de traitement +LastWithdrawalReceipts=Les %s derniers bons de prélèvements WithdrawedBills=Factures prélevées WithdrawalsLines=Lignes de prélèvements RequestStandingOrderToTreat=Demandes de prélèvements à traiter @@ -47,7 +47,7 @@ RefusedData=Date du rejet RefusedReason=Motif du rejet RefusedInvoicing=Facturation du rejet NoInvoiceRefused=Ne pas facturer le rejet -InvoiceRefused=Invoice refused (Charge the rejection to customer) +InvoiceRefused=Facture refusée (Charges de rejet imputable au client) Status=État StatusUnknown=Inconnu StatusWaiting=En attente @@ -79,10 +79,11 @@ CreditDate=Crédité le WithdrawalFileNotCapable=Impossible de générer le fichier de reçu des prélèvement pour votre pays %s (Votre pays n'est pas supporté) ShowWithdraw=Voir prélèvement IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins un paiement par prélèvement non traité, elle ne le sera pas afin de permettre la gestion du prélèvement d'abord. -DoStandingOrdersBeforePayments=Cet onglet permet de faire une demande de prélèvement bancaire. Une fois réalisé, vous pourrez saisir le paiement sur la facture pour la clôturer. +DoStandingOrdersBeforePayments=Cet onglet vous permet de demander un ordre de virement. Une fois réalisé, allez dans le menu par la Banque -> Virements pour générer l'ordre. Lorsque l'ordre de virement est clos, le paiement sur la facture sera automatiquement enregistrée, et la facture fermée si le reste à payer est nul. WithdrawalFile=Fichier de prélèvement SetToStatusSent=Mettre au statut "Fichier envoyé" ThisWillAlsoAddPaymentOnInvoice=Ceci créera également les paiements sur les factures et les classera payées +StatisticsByLineStatus=Statistiques par statut des lignes ### Notifications InfoCreditSubject=Crédit prélèvement %s à la banque diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index d43027916e7..d04253ac0d9 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= הוספת אפשרות סינון להראות / להסתיר thirdparties שהם כיום בפעילות או חדל זה UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=מסננים אפשרויות חיפוש NumberOfKeyToSearch=NBR של תווים כדי להפעיל חיפוש: %s ViewFullDateActions=הצג מלאים תאריכים לאירועים גיליון 3 @@ -208,6 +210,7 @@ ModulesJobDesc=מודולים עסקיים לספק התקנה מוגדרת מר ModulesMarketPlaceDesc=תוכל למצוא רכיבים נוספים כדי להוריד באתרי אינטרנט חיצוניים באינטרנט ... ModulesMarketPlaces=מודולים נוספים ... DoliStoreDesc=DoliStore, במקום השוק הרשמי של מודולים Dolibarr ERP / CRM חיצוניות +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=אתר ספקי האינטרנט שבהם אתה יכול לחפש למצוא מודולים נוספים ... URL=קשר BoxesAvailable=הזמינות תיבות @@ -444,7 +447,7 @@ Module55Desc=ברקוד של ההנהלה Module56Name=טלפוניה Module56Desc=שילוב טלפוניה Module57Name=הוראות קבע -Module57Desc=הוראות קבע וניהול של נסיגה +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=שילוב של מערכת ClickToDial (כוכבית, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=עדכוני RSS Module320Desc=הוסף עדכון RSS בתוך דפי Dolibarr מסך Module330Name=הסימניות Module330Desc=הפוך ההנהלה -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=לוח השנה Module410Desc=שילוב לוח השנה Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=קטגוריות Module1780Desc=Categorie ההנהלה (מוצרים, ספקים ולקוחות) Module2000Name=עורך WYSIWYG Module2000Desc=אפשר לערוך כמה אזור הטקסט באמצעות עורך מתקדם +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=סדר היום @@ -503,6 +508,8 @@ Module2500Name=תוכן אלקטרוני ניהול Module2500Desc=לשמור ולשתף מסמכים Module2600Name=WebServices Module2600Desc=אפשר האינטרנט Dolibarr שירותי שרת +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=השתמש באינטרנט בשירות Gravatar (www.gravatar.com) להראות תמונה של משתמשים / חברים (נמצא עם מיילים שלהם). צריך גישה לאינטרנט Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=מודול להציע בדף התשלום באינטרנט באמצעות כרטיס אשראי עם PayBox Module50100Name=נקודת מכירות @@ -527,7 +534,7 @@ Module50200Desc=מודול להציע בדף התשלום באינטרנט בא Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=הגדרת הציל BackToModuleList=חזרה לרשימת מודולים BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=חפש בצורה קבועה בתפריט השמאלי DefaultLanguage=ברירת המחדל של השפה להשתמש (קוד שפה) EnableMultilangInterface=אפשר ממשק רב לשוני EnableShowLogo=הצג את הלוגו בתפריט השמאלי +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=המערכת עודכנה בהצלחה CompanyInfo=החברה / בסיס מידע CompanyIds=החברה / קרן זהויות diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang index 9dac68e1252..38507100e11 100644 --- a/htdocs/langs/he_IL/agenda.lang +++ b/htdocs/langs/he_IL/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= All my events/tasks AllActions= All events/tasks ViewList=List view diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang index b0b9b337ac4..e962d4de7ce 100644 --- a/htdocs/langs/he_IL/compta.lang +++ b/htdocs/langs/he_IL/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/he_IL/contracts.lang b/htdocs/langs/he_IL/contracts.lang index 3181cfe4836..52c05d495ad 100644 --- a/htdocs/langs/he_IL/contracts.lang +++ b/htdocs/langs/he_IL/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=List of running services NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Services to activate among validated contracts -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Last %s activated services LastModifiedServices=Last %s modified services EditServiceLine=Edit service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang index a2c8ec77de2..53f8d168a55 100644 --- a/htdocs/langs/he_IL/errors.lang +++ b/htdocs/langs/he_IL/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang index b1319786708..ee28fcb125c 100644 --- a/htdocs/langs/he_IL/members.lang +++ b/htdocs/langs/he_IL/members.lang @@ -1,204 +1,206 @@ # Dolibarr language file - Source file is en_US - members -# MembersArea=Members area -# PublicMembersArea=Public members area -# MemberCard=Member card -# SubscriptionCard=Subscription card -# Member=Member +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member Members=משתמשים -# MemberAccount=Member login -# ShowMember=Show member card -# UserNotLinkedToMember=User not linked to a member -# ThirdpartyNotLinkedToMember=Third-party not linked to a member -# MembersTickets=Members Tickets -# FundationMembers=Foundation members -# Attributs=Attributes -# ErrorMemberTypeNotDefined=Member type not defined -# ListOfPublicMembers=List of public members -# ListOfValidatedPublicMembers=List of validated public members -# ErrorThisMemberIsNotPublic=This member is not public -# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). -# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. -# ThisIsContentOfYourCard=This is details of your card -# CardContent=Content of your member card -# SetLinkToUser=Link to a Dolibarr user -# SetLinkToThirdParty=Link to a Dolibarr third party -# MembersCards=Members business cards -# MembersList=List of members -# MembersListToValid=List of draft members (to be validated) -# MembersListValid=List of valid members -# MembersListUpToDate=List of valid members with up to date subscription -# MembersListNotUpToDate=List of valid members with subscription out of date -# MembersListResiliated=List of resiliated members -# MembersListQualified=List of qualified members -# MenuMembersToValidate=Draft members -# MenuMembersValidated=Validated members -# MenuMembersUpToDate=Up to date members -# MenuMembersNotUpToDate=Out of date members -# MenuMembersResiliated=Resiliated members -# MembersWithSubscriptionToReceive=Members with subscription to receive -# DateAbonment=Subscription date -# DateSubscription=Subscription date -# DateNextSubscription=Next subscription -# DateEndSubscription=Subscription end date -# EndSubscription=End subscription -# SubscriptionId=Subscription id -# MemberId=Member id -# NewMember=New member -# NewType=New member type -# MemberType=Member type -# MemberTypeId=Member type id -# MemberTypeLabel=Member type label -# MembersTypes=Members types -# MembersAttributes=Members attributes -# SearchAMember=Search a member -# MemberStatusDraft=Draft (needs to be validated) -# MemberStatusDraftShort=Draft -# MemberStatusActive=Validated (waiting subscription) -# MemberStatusActiveShort=Validated -# MemberStatusActiveLate=subscription expired -# MemberStatusActiveLateShort=Expired -# MemberStatusPaid=Subscription up to date -# MemberStatusPaidShort=Up to date -# MemberStatusResiliated=Resiliated member -# MemberStatusResiliatedShort=Resiliated -# MembersStatusToValid=Draft members -# MembersStatusToValidShort=Draft members -# MembersStatusValidated=Validated members -# MembersStatusPaid=Subscription up to date -# MembersStatusPaidShort=Up to date -# MembersStatusNotPaid=Subscription out of date -# MembersStatusNotPaidShort=Out of date -# MembersStatusResiliated=Resiliated members -# MembersStatusResiliatedShort=Resiliated members -# NewCotisation=New contribution -# PaymentSubscription=New contribution payment -# EditMember=Edit member -# SubscriptionEndDate=Subscription's end date -# MembersTypeSetup=Members type setup -# NewSubscription=New subscription -# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. -# Subscription=Subscription -# Subscriptions=Subscriptions -# SubscriptionLate=Late -# SubscriptionNotReceived=Subscription never received -# SubscriptionLateShort=Late -# SubscriptionNotReceivedShort=Never received -# ListOfSubscriptions=List of subscriptions -# SendCardByMail=Send card by Email -# AddMember=Add member -# MemberType=Member type -# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" -# NewMemberType=New member type -# WelcomeEMail=Welcome e-mail -# SubscriptionRequired=Subscription required -# EditType=Edit member type -# DeleteType=Delete -# VoteAllowed=Vote allowed -# Physical=Physical -# Moral=Moral -# MorPhy=Moral/Physical -# Reenable=Reenable -# ResiliateMember=Resiliate a member -# ConfirmResiliateMember=Are you sure you want to resiliate this member ? -# DeleteMember=Delete a member -# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? -# DeleteSubscription=Delete a subscription -# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? -# Filehtpasswd=htpasswd file -# ValidateMember=Validate a member -# ConfirmValidateMember=Are you sure you want to validate this member ? -# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. -# PublicMemberList=Public member list -# BlankSubscriptionForm=Public auto-subscription form -# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. -# EnablePublicSubscriptionForm=Enable the public auto-subscription form -# MemberPublicLinks=Public links/pages -# ExportDataset_member_1=Members and subscriptions +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions ImportDataset_member_1=משתמשים -# LastMembers=Last %s members -# LastMembersModified=Last %s modified members -# LastSubscriptionsModified=Last %s modified subscriptions -# AttributeName=Attribute name -# String=String -# Text=Text -# Int=Int -# Date=Date -# DateAndTime=Date and time -# PublicMemberCard=Member public card -# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -# AddSubscription=Add subscription -# ShowSubscription=Show subscription -# MemberModifiedInDolibarr=Member modified in Dolibarr -# SendAnEMailToMember=Send information email to member -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription -# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription -# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation -# DescADHERENT_MAIL_VALID=EMail for member validation -# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription -# DescADHERENT_MAIL_COTIS=EMail for subscription -# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation -# DescADHERENT_MAIL_RESIL=EMail for member resiliation -# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails -# DescADHERENT_ETIQUETTE_TYPE=Format of labels page -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets -# DescADHERENT_CARD_TYPE=Format of cards page -# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards -# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) -# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) -# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards -# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here -# MayBeOverwrited=This text can be overwrited by value defined for member's type -# ShowTypeCard=Show type '%s' -# HTPasswordExport=htpassword file generation -# NoThirdPartyAssociatedToMember=No third party associated to this member -# ThirdPartyDolibarr=Dolibarr third party -# MembersAndSubscriptions= Members and Subscriptions -# MoreActions=Complementary action on recording -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription -# MoreActionBankDirect=Create a direct transaction record on account -# MoreActionBankViaInvoice=Create an invoice and payment on account -# MoreActionInvoiceOnly=Create an invoice with no payment -# LinkToGeneratedPages=Generate visit cards -# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. -# DocForAllMembersCards=Generate business cards for all members -# DocForOneMemberCards=Generate business cards for a particular member -# DocForLabels=Generate address sheets -# SubscriptionPayment=Subscription payment -# LastSubscriptionDate=Last subscription date -# LastSubscriptionAmount=Last subscription amount -# MembersStatisticsByCountries=Members statistics by country -# MembersStatisticsByState=Members statistics by state/province -# MembersStatisticsByTown=Members statistics by town -# NbOfMembers=Number of members -# NoValidatedMemberYet=No validated members found -# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. -# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. -# MembersByTownDesc=This screen show you statistics on members by town. -# MembersStatisticsDesc=Choose statistics you want to read... -# MenuMembersStats=Statistics -# LastMemberDate=Last member date -# Nature=Nature -# Public=Information are public -# Exports=Exports -# NewMemberbyWeb=New member added. Awaiting approval -# NewMemberForm=New member form -# SubscriptionsStatistics=Statistics on subscriptions -# NbOfSubscriptions=Number of subscriptions -# AmountOfSubscriptions=Amount of subscriptions -# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) -# DefaultAmount=Default amount of subscription -# CanEditAmount=Visitor can choose/edit amount of its subscription -# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page -# Associations=Foundations -# Collectivités=Organizations -# Particuliers=Personal -# Entreprises=Companies -# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang index a87d7bc3003..6cc95b19193 100644 --- a/htdocs/langs/he_IL/products.lang +++ b/htdocs/langs/he_IL/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang index 481a006cb7a..a235a0df787 100644 --- a/htdocs/langs/he_IL/projects.lang +++ b/htdocs/langs/he_IL/projects.lang @@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant Myprojects=My projects ProjectsArea=Projects area NewProject=New project -AddProject=Add project +AddProject=Create project DeleteAProject=Delete a project DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task -AddTask=Add task +AddTask=Create task AddDuration=Add duration Activity=Activity Activities=Tasks/activities diff --git a/htdocs/langs/he_IL/resource.lang b/htdocs/langs/he_IL/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/he_IL/resource.lang +++ b/htdocs/langs/he_IL/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang index 1bf0cf1f42d..42b6ed1e19c 100644 --- a/htdocs/langs/he_IL/withdrawals.lang +++ b/htdocs/langs/he_IL/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang index 3cc430078af..a9ded699060 100644 --- a/htdocs/langs/hr_HR/admin.lang +++ b/htdocs/langs/hr_HR/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s ViewFullDateActions=Show full dates events in the third sheet @@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Link BoxesAvailable=Boxes available @@ -444,7 +447,7 @@ Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmark management -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales @@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang index f7775cea7e7..508164a1448 100644 --- a/htdocs/langs/hr_HR/agenda.lang +++ b/htdocs/langs/hr_HR/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Događaj dodjeljen ActionsDoneBy=Događaji završeni od strane korisnika ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Svi moji događaji/zadaci AllActions= Svi događaji/zadaci ViewList=Lista diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang index 9fe5eff520d..878eb49b3c9 100644 --- a/htdocs/langs/hr_HR/compta.lang +++ b/htdocs/langs/hr_HR/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/hr_HR/contracts.lang b/htdocs/langs/hr_HR/contracts.lang index d8a68e60e86..26ec3f1e5a4 100644 --- a/htdocs/langs/hr_HR/contracts.lang +++ b/htdocs/langs/hr_HR/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista otvorenih stavki ugovora ListOfRunningServices=Lista usluga koje se odvijaju NotActivatedServices=Neaktivne usluge(među ovjerenim ugovorima) BoardNotActivatedServices=Usluge za aktivaciju među ovjerenim ugovorima -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Zadnje %s aktivne usluge LastModifiedServices=Zadnje %s modificirane usluge EditServiceLine=Uredi liniju usluge @@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista usluga koja ističe NoteListOfYourExpiredServices=Ova lista sadrži samo usluge kontakata treće strane sa kojima ste linkani kao prodajni predstavnik StandardContractsTemplate=Predložak uobičajenog ugovora ContactNameAndSignature=Za %s, ime i potpis +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Predstavnik trgovca potpisuje ugovor diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang index a2c8ec77de2..53f8d168a55 100644 --- a/htdocs/langs/hr_HR/errors.lang +++ b/htdocs/langs/hr_HR/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang index 9246a04ced9..40bca8e85fb 100644 --- a/htdocs/langs/hr_HR/members.lang +++ b/htdocs/langs/hr_HR/members.lang @@ -1,204 +1,206 @@ # Dolibarr language file - Source file is en_US - members -# MembersArea=Members area -# PublicMembersArea=Public members area -# MemberCard=Member card -# SubscriptionCard=Subscription card -# Member=Member -# Members=Members -# MemberAccount=Member login -# ShowMember=Show member card -# UserNotLinkedToMember=User not linked to a member -# ThirdpartyNotLinkedToMember=Third-party not linked to a member -# MembersTickets=Members Tickets -# FundationMembers=Foundation members -# Attributs=Attributes -# ErrorMemberTypeNotDefined=Member type not defined -# ListOfPublicMembers=List of public members -# ListOfValidatedPublicMembers=List of validated public members -# ErrorThisMemberIsNotPublic=This member is not public -# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). -# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. -# ThisIsContentOfYourCard=This is details of your card -# CardContent=Content of your member card -# SetLinkToUser=Link to a Dolibarr user -# SetLinkToThirdParty=Link to a Dolibarr third party -# MembersCards=Members business cards -# MembersList=List of members -# MembersListToValid=List of draft members (to be validated) -# MembersListValid=List of valid members -# MembersListUpToDate=List of valid members with up to date subscription -# MembersListNotUpToDate=List of valid members with subscription out of date -# MembersListResiliated=List of resiliated members -# MembersListQualified=List of qualified members -# MenuMembersToValidate=Draft members -# MenuMembersValidated=Validated members -# MenuMembersUpToDate=Up to date members -# MenuMembersNotUpToDate=Out of date members -# MenuMembersResiliated=Resiliated members -# MembersWithSubscriptionToReceive=Members with subscription to receive -# DateAbonment=Subscription date -# DateSubscription=Subscription date -# DateNextSubscription=Next subscription -# DateEndSubscription=Subscription end date -# EndSubscription=End subscription -# SubscriptionId=Subscription id -# MemberId=Member id -# NewMember=New member -# NewType=New member type -# MemberType=Member type -# MemberTypeId=Member type id -# MemberTypeLabel=Member type label -# MembersTypes=Members types -# MembersAttributes=Members attributes -# SearchAMember=Search a member -# MemberStatusDraft=Draft (needs to be validated) -# MemberStatusDraftShort=Draft -# MemberStatusActive=Validated (waiting subscription) -# MemberStatusActiveShort=Validated -# MemberStatusActiveLate=subscription expired -# MemberStatusActiveLateShort=Expired -# MemberStatusPaid=Subscription up to date -# MemberStatusPaidShort=Up to date -# MemberStatusResiliated=Resiliated member -# MemberStatusResiliatedShort=Resiliated -# MembersStatusToValid=Draft members -# MembersStatusToValidShort=Draft members -# MembersStatusValidated=Validated members -# MembersStatusPaid=Subscription up to date -# MembersStatusPaidShort=Up to date -# MembersStatusNotPaid=Subscription out of date -# MembersStatusNotPaidShort=Out of date -# MembersStatusResiliated=Resiliated members -# MembersStatusResiliatedShort=Resiliated members -# NewCotisation=New contribution -# PaymentSubscription=New contribution payment -# EditMember=Edit member -# SubscriptionEndDate=Subscription's end date -# MembersTypeSetup=Members type setup -# NewSubscription=New subscription -# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. -# Subscription=Subscription -# Subscriptions=Subscriptions -# SubscriptionLate=Late -# SubscriptionNotReceived=Subscription never received -# SubscriptionLateShort=Late -# SubscriptionNotReceivedShort=Never received -# ListOfSubscriptions=List of subscriptions -# SendCardByMail=Send card by Email -# AddMember=Add member -# MemberType=Member type -# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" -# NewMemberType=New member type -# WelcomeEMail=Welcome e-mail -# SubscriptionRequired=Subscription required -# EditType=Edit member type -# DeleteType=Delete -# VoteAllowed=Vote allowed -# Physical=Physical -# Moral=Moral -# MorPhy=Moral/Physical -# Reenable=Reenable -# ResiliateMember=Resiliate a member -# ConfirmResiliateMember=Are you sure you want to resiliate this member ? -# DeleteMember=Delete a member -# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? -# DeleteSubscription=Delete a subscription -# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? -# Filehtpasswd=htpasswd file -# ValidateMember=Validate a member -# ConfirmValidateMember=Are you sure you want to validate this member ? -# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. -# PublicMemberList=Public member list -# BlankSubscriptionForm=Public auto-subscription form -# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. -# EnablePublicSubscriptionForm=Enable the public auto-subscription form -# MemberPublicLinks=Public links/pages -# ExportDataset_member_1=Members and subscriptions -# ImportDataset_member_1=Members -# LastMembers=Last %s members -# LastMembersModified=Last %s modified members -# LastSubscriptionsModified=Last %s modified subscriptions -# AttributeName=Attribute name -# String=String -# Text=Text -# Int=Int -# Date=Date -# DateAndTime=Date and time -# PublicMemberCard=Member public card -# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -# AddSubscription=Add subscription -# ShowSubscription=Show subscription -# MemberModifiedInDolibarr=Member modified in Dolibarr -# SendAnEMailToMember=Send information email to member -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription -# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription -# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation -# DescADHERENT_MAIL_VALID=EMail for member validation -# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription -# DescADHERENT_MAIL_COTIS=EMail for subscription -# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation -# DescADHERENT_MAIL_RESIL=EMail for member resiliation -# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails -# DescADHERENT_ETIQUETTE_TYPE=Format of labels page -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets -# DescADHERENT_CARD_TYPE=Format of cards page -# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards -# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) -# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) -# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards -# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here -# MayBeOverwrited=This text can be overwrited by value defined for member's type -# ShowTypeCard=Show type '%s' -# HTPasswordExport=htpassword file generation -# NoThirdPartyAssociatedToMember=No third party associated to this member -# ThirdPartyDolibarr=Dolibarr third party -# MembersAndSubscriptions= Members and Subscriptions -# MoreActions=Complementary action on recording -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription -# MoreActionBankDirect=Create a direct transaction record on account -# MoreActionBankViaInvoice=Create an invoice and payment on account -# MoreActionInvoiceOnly=Create an invoice with no payment -# LinkToGeneratedPages=Generate visit cards -# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. -# DocForAllMembersCards=Generate business cards for all members -# DocForOneMemberCards=Generate business cards for a particular member -# DocForLabels=Generate address sheets -# SubscriptionPayment=Subscription payment -# LastSubscriptionDate=Last subscription date -# LastSubscriptionAmount=Last subscription amount -# MembersStatisticsByCountries=Members statistics by country -# MembersStatisticsByState=Members statistics by state/province -# MembersStatisticsByTown=Members statistics by town -# NbOfMembers=Number of members -# NoValidatedMemberYet=No validated members found -# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. -# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. -# MembersByTownDesc=This screen show you statistics on members by town. -# MembersStatisticsDesc=Choose statistics you want to read... -# MenuMembersStats=Statistics -# LastMemberDate=Last member date -# Nature=Nature -# Public=Information are public -# Exports=Exports -# NewMemberbyWeb=New member added. Awaiting approval -# NewMemberForm=New member form -# SubscriptionsStatistics=Statistics on subscriptions -# NbOfSubscriptions=Number of subscriptions -# AmountOfSubscriptions=Amount of subscriptions -# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) -# DefaultAmount=Default amount of subscription -# CanEditAmount=Visitor can choose/edit amount of its subscription -# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page -# Associations=Foundations -# Collectivités=Organizations -# Particuliers=Personal -# Entreprises=Companies -# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member +Members=Members +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions +ImportDataset_member_1=Members +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang index e22304f8b38..765c7e211a2 100644 --- a/htdocs/langs/hr_HR/products.lang +++ b/htdocs/langs/hr_HR/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Ako je proizvod usluga ograničenog trajanja: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Broj cijena MultiPriceLevelsName=Grupe cijena -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtualni proizvod -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=Ako je 0, ovaj proizvod nije virtualnni proizvod -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Pridruži Translation=Prijevod KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Dodaj/izbriši Quantity=Količina NoMatchFound=Ništa slično nije pronađeno ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang index e1c66b34417..2f9a63d5319 100644 --- a/htdocs/langs/hr_HR/projects.lang +++ b/htdocs/langs/hr_HR/projects.lang @@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant Myprojects=Moji projekti ProjectsArea=Projects area NewProject=Novi projekt -AddProject=Dodaj projekt +AddProject=Create project DeleteAProject=Izbriši projekt DeleteATask=Izbriši zadatak ConfirmDeleteAProject=Jeste li sigurni da želite izbrisati ovaj projekt? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task -AddTask=Add task +AddTask=Create task AddDuration=Add duration Activity=Activity Activities=Tasks/activities diff --git a/htdocs/langs/hr_HR/resource.lang b/htdocs/langs/hr_HR/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/hr_HR/resource.lang +++ b/htdocs/langs/hr_HR/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang index e4337309084..ea32511fefb 100644 --- a/htdocs/langs/hr_HR/withdrawals.lang +++ b/htdocs/langs/hr_HR/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 61ccfb87d49..b5757284f28 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Hozzáadása lehetőséget, hogy a szűrő / elrejtése thirdparties, amelyek jelenleg a tevékenység megszűnt, vagy azt UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Keresés szűrők lehetőségek NumberOfKeyToSearch=NBR karakterek kiváltó keresés: %s ViewFullDateActions=Mutasd a teljes időpontok események a harmadik lapra @@ -208,6 +210,7 @@ ModulesJobDesc=Üzleti modulok olyan egyszerű, előre definiált beállítás a ModulesMarketPlaceDesc=Még több modult letölteni a külső internetes oldalak az interneten ... ModulesMarketPlaces=További modulok ... DoliStoreDesc=DoliStore, a hivatalos piaci hely Dolibarr ERP / CRM külső modulok +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site szolgáltatók kereshet, így több modult ... URL=Link BoxesAvailable=Dobozok elérhető @@ -444,7 +447,7 @@ Module55Desc=Vonalkód vezetése Module56Name=Telefonálás Module56Desc=Telephony Integration Module57Name=Állandó megbízás -Module57Desc=Állandó megbízások visszavonása és vezetése +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integrációja ClickToDial rendszer (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Add RSS feed belül Dolibarr képernyőre Module330Name=Könyvjelzők Module330Desc=Bookmark vezetése -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=WebCalendar Module410Desc=WebCalendar integráció Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Kategóriák Module1780Desc=Kategóriában vezetősége (termékek, szállítók és vevők) Module2000Name=WYSIWYG szerkesztő Module2000Desc=Hagyjuk szerkeszteni egy szöveget terület egy fejlett szerkesztő +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Napirend @@ -503,6 +508,8 @@ Module2500Name=Elektronikus Content Management Module2500Desc=Mentés és dokumentumok megosztása Module2600Name=WebServices Module2600Desc=Engedélyezze a Dolibarr web szerver szolgáltatás +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Használja online szolgáltatást Gravatar (www.gravatar.com), hogy fotó a felhasználók / tagok (találtak a levelek). Szüksége van egy internet-hozzáférési Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modult kínál online fizetési oldalra bankkártyáját Paybox Module50100Name=Értékesítési @@ -527,7 +534,7 @@ Module50200Desc=Modult kínál online fizetési oldalra hitelkártya Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Beállítás mentett BackToModuleList=Visszalép a modulok listáját BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Állandó keresési űrlapot baloldali menüben DefaultLanguage=Alapértelmezett nyelv használatát (nyelv kód) EnableMultilangInterface=Engedélyezze a többnyelvű interfész EnableShowLogo=Mutasd logo a bal menüben +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=A rendszer már sikeresen frissítve CompanyInfo=Cég / alapítvány adatai CompanyIds=Cég / alapítvány identitások diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang index 3a6a949b9c6..45bc191ced2 100644 --- a/htdocs/langs/hu_HU/agenda.lang +++ b/htdocs/langs/hu_HU/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Eseményeket befolyásolhatja ActionsDoneBy=Actions done by ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Az én cselekvéseim/feladataim AllActions= Az összes cselekvés/feladat ViewList=Lista megtekintése diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang index cc6dabc7a18..91d9d5fe9b7 100644 --- a/htdocs/langs/hu_HU/compta.lang +++ b/htdocs/langs/hu_HU/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang index b22dcf89dc7..df24822ebb1 100644 --- a/htdocs/langs/hu_HU/contracts.lang +++ b/htdocs/langs/hu_HU/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Futó szerződések listája ListOfRunningServices=Futó szolgáltatások listája NotActivatedServices=Inaktív szolgáltatások (a hitelesített szerződések között) BoardNotActivatedServices=Hitelesített szerződésekhez tartozó aktiválandó szolgáltatások -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Utolós %s aktivált szolgáltatás LastModifiedServices=Utolsó %s módosított szolgáltatás EditServiceLine=Szolgáltatás sor szerkesztése @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Értékesítési képviselő a szerződés aláírásakor diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang index 21b3252c7df..e79edfa3418 100644 --- a/htdocs/langs/hu_HU/errors.lang +++ b/htdocs/langs/hu_HU/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Szállító kód szükséges ErrorSupplierCodeAlreadyUsed=Szállító kód már használatban ErrorBadParameters=Hibás paraméterek ErrorBadValueForParameter=Rossz érték "%s" helytelen paraméter "%s" -ErrorBadImageFormat=Kép fájl formátuma nem támogatott +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Érték "%s" rossz a dátum formátumát ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Nem sikerült írni a könyvtárban %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Felhasználó bejelentkezési %s nem található. ErrorLoginHasNoEmail=Ennek a felhasználónak nincs e-mail címre. Folyamat megszakítva. ErrorBadValueForCode=Rossz érték a biztonsági kódot. Próbálja újra, az új érték ... ErrorBothFieldCantBeNegative=Fields %s %s és nem lehet egyszerre negatív +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Felhasználói fiók %s végrehajtására használnak web szerver nincs engedélye az adott ErrorNoActivatedBarcode=Nem vonalkód típus aktivált ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang index cff1a2c4e8f..bdac075a8b4 100644 --- a/htdocs/langs/hu_HU/members.lang +++ b/htdocs/langs/hu_HU/members.lang @@ -8,7 +8,7 @@ Members=Tagok MemberAccount=Belépés ShowMember=Mutasd tagja kártya UserNotLinkedToMember=A felhasználó nem kapcsolódik egy tagja -# ThirdpartyNotLinkedToMember=Third-party not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=Tagok Jegyek FundationMembers=Alapítvány tagjai Attributs=Attribútumok @@ -85,8 +85,7 @@ SubscriptionLateShort=Késő SubscriptionNotReceivedShort=Soha nem kapott ListOfSubscriptions=Előfizetések listája SendCardByMail=Elküldöm e-mailben -AddMember=Add tagja -MemberType=Tagság típusa +AddMember=Create member NoTypeDefinedGoToSetup=Nem tagja típust nem definiál. Lépjen be a Setup - Tagok típusok NewMemberType=Új tag írja WelcomeEMail=Üdvözöljük az e-mail @@ -126,12 +125,12 @@ Date=Dátum DateAndTime=Dátum és idő PublicMemberCard=Tagállamban közvélemény-kártya MemberNotOrNoMoreExpectedToSubscribe=Nem vagy tag többé várhatóan feliratkozáshoz -AddSubscription=Add előfizetés +AddSubscription=Create subscription ShowSubscription=Mutasd előfizetés MemberModifiedInDolibarr=Tagja módosított Dolibarr SendAnEMailToMember=Küldés e-mailben tájékoztatást tagja -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-mail tárgya a tagállamok autosubscription DescADHERENT_AUTOREGISTER_MAIL=E-mail szolgáltatás tagja autosubscription DescADHERENT_MAIL_VALID_SUBJECT=E-mail tárgya a tagállamok hitelesítési @@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=E-mail tárgya a tagállamok resiliation DescADHERENT_MAIL_RESIL=E-mail szolgáltatás tagja resiliation DescADHERENT_MAIL_FROM=Feladó e-mail címet automatikus e-maileket DescADHERENT_ETIQUETTE_TYPE=Oldal formátuma címkék -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets DescADHERENT_CARD_TYPE=Formátuma kártyák oldal DescADHERENT_CARD_HEADER_TEXT=Nyomtatott szöveg tetején tag kártyák DescADHERENT_CARD_TEXT=Nyomtatott szöveg tagja kártyák (igazítsa a bal) @@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Harmadik félnek nem társult a tag ThirdPartyDolibarr=Dolibarr harmadik fél MembersAndSubscriptions= A tagok és Subscriptions MoreActions=Kiegészítő fellépés a felvételi -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription MoreActionBankDirect=Hozzon létre egy közvetlen tranzakciós rekord miatt MoreActionBankViaInvoice=Hozzon létre egy számlát és előleg MoreActionInvoiceOnly=Hozzon létre egy számlát nem kell fizetni @@ -171,6 +170,8 @@ LastSubscriptionAmount=Utolsó előfizetés összege MembersStatisticsByCountries=Tagok statisztikája ország MembersStatisticsByState=Tagok statisztikája állam / tartomány MembersStatisticsByTown=Tagok statisztikája város +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=Tagok száma NoValidatedMemberYet=Nem hitelesített tagok található MembersByCountryDesc=Ez a képernyő megmutatja statisztikát tagok országokban. Grafikus függ azonban a Google online grafikon szolgáltatást és csak akkor elérhető, ha az internet kapcsolat működik. @@ -196,9 +197,10 @@ Collectivités=Szervezetek Particuliers=Személyes Entreprises=Cégek DOLIBARRFOUNDATION_PAYMENT_FORM=Ahhoz, hogy az előfizetés befizetését a banki átutalást, lásd http://wiki.dolibarr.org/index.php/Subscribe .
Fizetni hitelkártyával vagy PayPal, kattintson gombra a lap alján.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang index 12fca359dda..bdcddfabdcf 100644 --- a/htdocs/langs/hu_HU/products.lang +++ b/htdocs/langs/hu_HU/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Ha a termék vagy szolgáltatás időkorlátos: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Árak száma MultiPriceLevelsName=Ár kategóriák -AssociatedProductsAbility=Aktiválja a kapcsolódó termékeket -AssociatedProducts=Kapcsolódó termékek -AssociatedProductsNumber=Kapcsolódó termékek száma -ParentProductsNumber=Számos szülő termék -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Kapcsolás Translation=Fordítás KeywordFilter=Kulcsszó szűrés @@ -132,7 +132,7 @@ AddDel=Hozzáadás/Törlés Quantity=Mennyiség NoMatchFound=Nincs találat ProductAssociationList=Vonatkozó szolgáltatások/termékek listája: Termék/szolgáltatás neve (mennyiség érintett) -ProductParentList=Jegyzéke termékek / szolgáltatások ezzel a termékkel, mint egy komponens +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Az egyik kiválaszott termék szülője az aktuális terméknek DeleteProduct=Termék/szolgáltatás törlése ConfirmDeleteProduct=Biztos törölni akarja ezt a terméket/szolgáltatást? @@ -179,7 +179,7 @@ CloneProduct=Termék vagy szolgáltatás klónozása ConfirmCloneProduct=Biztos, hogy klónozni akarja ezt a szolgáltatást: %s ? CloneContentProduct=A termék/szolgáltatás minden fő információjának a klónozása ClonePricesProduct=Fő információk és árak klónozása -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Ez a termék használatban van NewRefForClone=Új termék/szolgáltatás ref#. CustomerPrices=Fogyasztói árának @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang index 535514cb225..7db1eb84ad1 100644 --- a/htdocs/langs/hu_HU/projects.lang +++ b/htdocs/langs/hu_HU/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Ez a nézet minden projektet tartalmaz. Myprojects=Projektjeim ProjectsArea=Projektek terület NewProject=Új projekt -AddProject=Projekt hozzáadása +AddProject=Create project DeleteAProject=Projekt törlése DeleteATask=Feladat törlése ConfirmDeleteAProject=Biztos törölni akarja ezt a projektet? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Új eltöltött idő MyTimeSpent=Az én eltöltött időm MyTasks=Feladataim @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Új feladat -AddTask=Feladat hozzáadása +AddTask=Create task AddDuration=Időtartam hozzáadása Activity=Aktivitás Activities=Feladatok/aktivitások diff --git a/htdocs/langs/hu_HU/resource.lang b/htdocs/langs/hu_HU/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/hu_HU/resource.lang +++ b/htdocs/langs/hu_HU/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang index 08145016926..48ef1688bc0 100644 --- a/htdocs/langs/hu_HU/withdrawals.lang +++ b/htdocs/langs/hu_HU/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Hitelt WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Mutasd Kifizetés IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Azonban, ha számlát legalább egy fizetési visszavonása még nem feldolgozott, akkor nem kell beállítani, hogy fizetni kell kezelni visszavonása előtt. -DoStandingOrdersBeforePayments=Ez a lap lehetővé teszi, hogy kérje a fennálló rendelés. Amint kész lesz, akkor írja be a fizetési zárja be a számlát. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Kifizetése érdekében állt a bank által %s diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang index c8fa072f8b1..dd797a93449 100644 --- a/htdocs/langs/id_ID/accountancy.lang +++ b/htdocs/langs/id_ID/accountancy.lang @@ -18,37 +18,37 @@ Selectmodelcsv=Pilih satu model Ekspor Modelcsv_normal=Ekspor Klasik Modelcsv_CEGID=Export towards CEGID Expert BackToChartofaccounts=Akun pembalik -Back=Retur +Back=Kembali -Definechartofaccounts=Jelaskan satu akun -Selectchartofaccounts=Pilih satu akun +Definechartofaccounts=Menetapkan bagan akun +Selectchartofaccounts=Pilih bagan akun Validate=Validasi Addanaccount=Tambahkan sebuah akun akuntansi AccountAccounting=Akun akuntansi -Ventilation=Breakdown -ToDispatch=To dispatch -Dispatched=Dispatched +Ventilation=Perincian +ToDispatch=Untuk Pengiriman +Dispatched=Dikirim -CustomersVentilation=Breakdown customers -SuppliersVentilation=Breakdown suppliers -TradeMargin=Margin Usaha +CustomersVentilation=Perincian pelanggan +SuppliersVentilation=Perincian pemasok +TradeMargin=Margin Perdagangan Reports=Laporan ByCustomerInvoice=Berdasarkan invoice langganan ByMonth=Bulanan NewAccount=Akun akuntansi baru -Update=Update +Update=Membarui List=Daftar Create=Buat -UpdateAccount=Modifikasi satu akun akuntansi +UpdateAccount=Modifikasi akun akuntansi UpdateMvts=Modification of a movement -WriteBookKeeping=Record accounts in general ledger -Bookkeeping=General ledger -AccountBalanceByMonth=Account balance by month +WriteBookKeeping=Mencatat akun di buku besar +Bookkeeping=Buku besar +AccountBalanceByMonth=Saldo per bulan -AccountingVentilation=Breakdown accounting -AccountingVentilationSupplier=Breakdown accounting supplier -AccountingVentilationCustomer=Breakdown accounting customer -Line=Line +AccountingVentilation=Perincian Akunting +AccountingVentilationSupplier=Perincian Akunting Pemasok +AccountingVentilationCustomer=Perincian Akunting Pelanggan +Line=Baris CAHTF=Total purchase supplier HT InvoiceLines=Lines of invoice to be ventilated @@ -56,17 +56,17 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic breakdown +VentilationAuto=Perincian Otomatis -Processing=Processing -EndProcessing=The end of processing +Processing=Pengolahan +EndProcessing=Akhir dari pengolahan AnyLineVentilate=Any lines to ventilate -SelectedLines=Selected lines +SelectedLines=Baris yg dipilih Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTING_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=pembatas CSV ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements @@ -78,7 +78,7 @@ ACCOUNTING_LENGTH_GACCOUNT=Panjang akun umum ACCOUNTING_LENGTH_AACCOUNT=Panjang akun pihak ketiga ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan -ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembayaran +ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian ACCOUNTING_BANK_JOURNAL=Jurnal Bank ACCOUNTING_CASH_JOURNAL=Jurnal Kas ACCOUNTING_MISCELLANEOUS_JOURNAL=Jurnal lain-lain @@ -101,36 +101,36 @@ Labelcompte=Label Akun Debit=Debet Credit=Kredit Amount=Jumlah -Sens=Sens +Sens=Sen Codejournal=Jurnal -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Hapus catatan buku besar SellsJournal=Jurnal Penjualan -PurchasesJournal=Jurnal Pembayaran +PurchasesJournal=Jurnal Pembelian DescSellsJournal=Jurnal Penjualan -DescPurchasesJournal=Jurnal Pembayaran +DescPurchasesJournal=Jurnal Pembelian BankJournal=Jurnal Bank -DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Jurnal Kas -DescCashJournal=Cash journal including the type of payment cash +DescBankJournal=Jurnal Bank termasuk semua tipe pembayaran kecuali tunai +CashJournal=Jurnal Tunai +DescCashJournal=Jurnal Tunai termasuk tipe pembayaran tunai -CashPayment=Cash Payment +CashPayment=Pembayaran Tunai -SupplierInvoicePayment=Payment of invoice supplier -CustomerInvoicePayment=Payment of invoice customer +SupplierInvoicePayment=Pembayaran Nota Pemasok +CustomerInvoicePayment=Pembayaran Nota Pelanggan ThirdPartyAccount=Akun pihak ketiga NewAccountingMvt=New movement NumMvts=Number of movement ListeMvts=List of the movement -ErrorDebitCredit=Debit and Credit cannot have a value at the same time +ErrorDebitCredit=Debet dan Kredit tidak boleh ada nilai di saat yg sama -ReportThirdParty=List thirdparty account +ReportThirdParty=Daftar akun pihak ketiga DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts -ListAccounts=List of the accounting accounts +ListAccounts=Daftar akun-akun akunting Pcgversion=Version of the plan Pcgtype=Class of account diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang index 48d4ac06c66..fbbe0bd037b 100644 --- a/htdocs/langs/id_ID/admin.lang +++ b/htdocs/langs/id_ID/admin.lang @@ -4,7 +4,7 @@ Version=Versi VersionProgram=Program Versi VersionLastInstall=Versi instalasi awal VersionLastUpgrade=Versi upgrade terakhir -VersionExperimental=Eksperimental +VersionExperimental=Percobaan VersionDevelopment=Pengembangan VersionUnknown=Tidak diketahui VersionRecommanded=Direkomendasikan @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Gunakan penyelesaian-otomatis di 'field' untuk memilih ActivityStateToSelectCompany= Tambah pilihan penyaringan / filter untuk menunjukkan / menyembunyikan pihak-ke-tiga ( third parties ) di dalam aktifitas atau yang sedang tidak aktif saat ini UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Gunakan bidang autocompletion untuk memilih kontak (bukan menggunakan kotak daftar). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Cari filter Pilihan NumberOfKeyToSearch=Nbr karakter untuk memicu pencarian:% s ViewFullDateActions=Tampilkan tanggal penuh peristiwa dalam lembar ketiga @@ -117,76 +119,76 @@ ModulesSpecial=Modul yang sangat spesifik ParameterInDolibarr=Parameter% s LanguageParameter=Parameter Bahasa% s LanguageBrowserParameter=Parameter% s -LocalisationDolibarrParameters=Localisation parameters -ClientTZ=Client Time Zone (user) -ClientHour=Client time (user) -OSTZ=Server OS Time Zone -PHPTZ=PHP server Time Zone +LocalisationDolibarrParameters=Parameter Lokalisasi +ClientTZ=Zona Waktu Klien (Pengguna) +ClientHour=Jam Klien (Pengguna) +OSTZ=Zona Waktu System Operasi Server +PHPTZ=Zona Waktu Server PHP PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds) ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds) DaylingSavingTime=Daylight saving time -CurrentHour=PHP Time (server) -CompanyTZ=Company Time Zone (main company) -CompanyHour=Company Time (main company) +CurrentHour=Jam PHP (Server) +CompanyTZ=Zona Waktu Perusahaan (Perusahaan Utama) +CompanyHour=Jam Perusahaan (Perusahaan Utama) CurrentSessionTimeOut=Current session timeout YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris" OSEnv=OS Environment -Box=Box -Boxes=Boxes +Box=Kotak +Boxes=Kotak-Kotak MaxNbOfLinesForBoxes=Max number of lines for boxes -PositionByDefault=Default order -Position=Position +PositionByDefault=Pesanan Standar +Position=Posisi MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar). MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.
Some modules add entries in the menus (in menu All in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module. -MenuForUsers=Menu for users -LangFile=.lang file -System=System -SystemInfo=System information -SystemTools=System tools -SystemToolsArea=System tools area +MenuForUsers=Menu Pengguna +LangFile=berkas .lang +System=Sistem +SystemInfo=Sistem Informasi +SystemTools=Alat-alat Sistem +SystemToolsArea=Daerah Alat-Alat Sistem SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for. -Purge=Purge +Purge=Perbersihan PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in %s directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server. PurgeDeleteLogFile=Delete log file %s defined for Syslog module (no risk to loose data) -PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data) +PurgeDeleteTemporaryFiles=Hapus semua data sementara (Tidak ada resiko data hilang) PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory %s. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted. -PurgeRunNow=Purge now -PurgeNothingToDelete=No directory or file to delete. +PurgeRunNow=Bersihkan sekarang +PurgeNothingToDelete=Tidak ada direktori atau berkas untuk di hapus PurgeNDirectoriesDeleted=%s files or directories deleted. PurgeAuditEvents=Purge all security events ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed. -NewBackup=New backup +NewBackup=Backup Baru GenerateBackup=Generate backup Backup=Backup -Restore=Restore +Restore=Mengembalikan RunCommandSummary=Backup has been launched with the following command RunCommandSummaryToLaunch=Backup can be launched with the following command WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands -BackupResult=Backup result -BackupFileSuccessfullyCreated=Backup file successfully generated -YouCanDownloadBackupFile=Generated files can now be downloaded -NoBackupFileAvailable=No backup files available. -ExportMethod=Export method -ImportMethod=Import method -ToBuildBackupFileClickHere=To build a backup file, click here. +BackupResult=Hasil Backup +BackupFileSuccessfullyCreated=Berkas backup berhasil dihasilkan +YouCanDownloadBackupFile=Berkas yg dihasilkan siap di download +NoBackupFileAvailable=Tidak ada berkas backup yang tersedia +ExportMethod=Metode ekspor +ImportMethod=Metode Impor +ToBuildBackupFileClickHere=Untuk menghasilkan berkas backup, klik disini. ImportMySqlDesc=To import a backup file, you must use mysql command from command line: ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line: ImportMySqlCommand=%s %s < mybackupfile.sql ImportPostgreSqlCommand=%s %s mybackupfile.sql -FileNameToGenerate=File name to generate -Compression=Compression +FileNameToGenerate=Nama berkas yang dihasilkan +Compression=Kompresi CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later ExportCompatibility=Compatibility of generated export file MySqlExportParameters=MySQL export parameters PostgreSqlExportParameters= PostgreSQL export parameters -UseTransactionnalMode=Use transactional mode +UseTransactionnalMode=Gunakan mode transaksi FullPathToMysqldumpCommand=Full path to mysqldump command FullPathToPostgreSQLdumpCommand=Full path to pg_dump command -ExportOptions=Export Options +ExportOptions=Opsi Ekspor AddDropDatabase=Add DROP DATABASE command AddDropTable=Add DROP TABLE command -ExportStructure=Structure +ExportStructure=Struktur Datas=Data NameColumn=Name columns ExtendedInsert=Extended INSERT @@ -194,11 +196,11 @@ NoLockBeforeInsert=No lock commands around INSERT DelayedInsert=Delayed insert EncodeBinariesInHexa=Encode binary data in hexadecimal IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE) -Yes=Yes -No=No +Yes=Ya +No=Tidak AutoDetectLang=Autodetect (browser language) FeatureDisabledInDemo=Feature disabled in demo -Rights=Permissions +Rights=Izin BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. OnlyActiveElementsAreShown=Only elements from enabled modules are shown. ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature. @@ -208,34 +210,35 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Link BoxesAvailable=Boxes available BoxesActivated=Boxes activated ActivateOn=Activate on ActiveOn=Activated on -SourceFile=Source file +SourceFile=Berkas sumber AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled -Required=Required +Required=Diperlukan UsedOnlyWithTypeOption=Used by some agenda option only -Security=Security -Passwords=Passwords +Security=Keamanan +Passwords=Kata Sandi DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended) InstrucToEncodePass=To have password encoded into the conf.php file, replace the line
$dolibarr_main_db_pass="..."
by
$dolibarr_main_db_pass="crypted:%s" InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line
$dolibarr_main_db_pass="crypted:..."
by
$dolibarr_main_db_pass="%s" ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation) ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices). -Feature=Feature -DolibarrLicense=License -DolibarrProjectLeader=Project leader -Developpers=Developers/contributors +Feature=Keistimewaan +DolibarrLicense=Lisensi +DolibarrProjectLeader=Pemimpin Proyek +Developpers=Pembangun/Penyumbang OtherDeveloppers=Other developers/contributors -OfficialWebSite=Dolibarr international official web site -OfficialWebSiteFr=French official web site -OfficialWiki=Dolibarr documentation on Wiki +OfficialWebSite=Situs resmi Dolibarr International +OfficialWebSiteFr=Situs resmi Perancis +OfficialWiki=Dokumentasi Dolibarr di Wiki OfficialDemo=Dolibarr online demo OfficialMarketPlace=Official market place for external modules/addons OfficialWebHostingService=Referenced web hosting services (Cloud hosting) @@ -249,9 +252,9 @@ CurrentTopMenuHandler=Current top menu handler CurrentLeftMenuHandler=Current left menu handler CurrentMenuHandler=Current menu handler CurrentSmartphoneMenuHandler=Current smartphone menu handler -MeasuringUnit=Measuring unit -Emails=E-mails -EMailsSetup=E-mails setup +MeasuringUnit=Unit Pengukuran +Emails=E-Mails +EMailsSetup=Setup E-Mails EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: %s) MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s) @@ -264,25 +267,25 @@ MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of prop MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos) -MAIN_MAIL_SENDMODE=Method to use to send EMails +MAIN_MAIL_SENDMODE=Metode Pengiriman EMails MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos) -MAIN_SMS_SENDMODE=Method to use to send SMS +MAIN_SMS_SENDMODE=Metode Pengiriman SMS MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on www.dolibarr.org forum. -ModuleSetup=Module setup -ModulesSetup=Modules setup -ModuleFamilyBase=System +ModuleSetup=Setup Modul +ModulesSetup=Setup Modul-Modul +ModuleFamilyBase=Sistem ModuleFamilyCrm=Customer Relation Management (CRM) ModuleFamilyProducts=Products Management ModuleFamilyHr=Human Resource Management ModuleFamilyProjects=Projects/Collaborative work -ModuleFamilyOther=Other +ModuleFamilyOther=Lainnya ModuleFamilyTechnic=Multi-modules tools -ModuleFamilyExperimental=Experimental modules +ModuleFamilyExperimental=Modul Percobaan ModuleFamilyFinancial=Financial Modules (Accounting/Treasury) ModuleFamilyECM=Electronic Content Management (ECM) MenuHandlers=Menu handlers @@ -291,16 +294,16 @@ DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=This is setup to process: StepNb=Step %s FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). -DownloadPackageFromWebSite=Download package. +DownloadPackageFromWebSite=Download Packet UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory %s SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component. NotExistsDirect=The alternative root directory is not defined.
InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).
InfDirExample=
Then declare it in the file conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*These lines are commented with "#", to uncomment only remove the character. -YouCanSubmitFile=Select module: -CurrentVersion=Dolibarr current version +YouCanSubmitFile=Pilih Modul +CurrentVersion=Versi Dolibarr saat ini CallUpdatePage=Go to the page that updates the database structure and datas: %s. -LastStableVersion=Last stable version +LastStableVersion=Versi stabil terakhir GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask.
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s.
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required.
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces are not allowed.
@@ -311,9 +314,9 @@ GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
%s on port %s ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s -DoTestServerAvailability=Test server connectivity -DoTestSend=Test sending -DoTestSendHTML=Test sending HTML +DoTestServerAvailability=Koneksi Server Test +DoTestSend=Mencoba Mengirim +DoTestSendHTML=Mencoba Mengirim HTML ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask. ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask. UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system. @@ -326,7 +329,7 @@ AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on docu ModuleDisabled=Module disabled ModuleDisabledSoNoEvent=Module disabled so event never created ConfirmPurge=Are you sure you want to execute this purge ?
This will delete definitely all your data files with no way to restore them (ECM files, attached files...). -MinLength=Minimum length +MinLength=Panjang Minimum LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory ExamplesWithCurrentSetup=Examples with current running setup ListOfDirectories=List of OpenDocument templates directories @@ -335,14 +338,14 @@ NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directo ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template -FirstnameNamePosition=Position of Name/Lastname +FirstnameNamePosition=Posisi Nama/Nama Belakang DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values: KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices) TestSubmitForm=Input test form ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours. ThemeDir=Skins directory -ConnectionTimeout=Connexion timeout -ResponseTimeout=Response timeout +ConnectionTimeout=batas waktu Koneksi +ResponseTimeout=Batas Waktu Balasan SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__ ModuleMustBeEnabledFirst=Module %s must be enabled first before using this feature. SecurityToken=Key to secure URLs @@ -354,14 +357,14 @@ HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF HideDescOnPDF=Hide products description on generated PDF HideRefOnPDF=Hide products ref. on generated PDF HideDetailsOnPDF=Hide products lines details on generated PDF -Library=Library +Library=Perpustakaan UrlGenerationParameters=Parameters to secure URLs SecurityTokenIsUnique=Use a unique securekey parameter for each URL EnterRefToBuildUrl=Enter reference for object %s GetSecuredUrl=Get calculated URL ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons -OldVATRates=Old VAT rate -NewVATRates=New VAT rate +OldVATRates=Suku VAT lama +NewVATRates=Suku VAT baru PriceBaseTypeToChange=Modify on prices with base reference value defined on MassConvert=Launch mass convert String=String @@ -369,14 +372,14 @@ TextLong=Long text Int=Integer Float=Float DateAndTime=Date and hour -Unique=Unique +Unique=Unik Boolean=Boolean (Checkbox) -ExtrafieldPhone = Phone -ExtrafieldPrice = Price +ExtrafieldPhone = Telepon +ExtrafieldPrice = Harga ExtrafieldMail = Email -ExtrafieldSelect = Select list -ExtrafieldSelectList = Select from table -ExtrafieldSeparator=Separator +ExtrafieldSelect = Daftar Pilihan +ExtrafieldSelectList = Pilih dari tabel +ExtrafieldSeparator=Pembatas ExtrafieldCheckBox=Checkbox ExtrafieldRadio=Radio button ExtrafieldParamHelpselect=Parameters list have to be like key,value

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

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key @@ -391,7 +394,7 @@ LinkToTestClickToDial=Enter a phone number to call to show a link to test the Cl RefreshPhoneLink=Refresh link LinkToTest=Clickable link generated for user %s (click phone number to test) KeepEmptyToUseDefault=Keep empty to use default value -DefaultLink=Default link +DefaultLink=Link Standar ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) ExternalModule=External module - Installed into directory %s BarcodeInitForThirdparties=Mass barcode init for thirdparties @@ -405,37 +408,37 @@ NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into bar NoRecordWithoutBarcodeDefined=No record with no barcode value defined. # Modules -Module0Name=Users & groups +Module0Name=Pengguna & Grup Module0Desc=Users and groups management -Module1Name=Third parties +Module1Name=Pihak Ketiga Module1Desc=Companies and contact management (customers, prospects...) -Module2Name=Commercial +Module2Name=Komersil Module2Desc=Commercial management -Module10Name=Accounting +Module10Name=Akunting Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching. -Module20Name=Proposals +Module20Name=Proposal Module20Desc=Commercial proposal management Module22Name=Mass E-mailings Module22Desc=Mass E-mailing management -Module23Name= Energy +Module23Name= Energi Module23Desc= Monitoring the consumption of energies -Module25Name=Customer Orders +Module25Name=Pesanan Pelanggan Module25Desc=Customer order management -Module30Name=Invoices +Module30Name=Nota Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers -Module40Name=Suppliers +Module40Name=Pemasok Module40Desc=Supplier management and buying (orders and invoices) Module42Name=Logs Module42Desc=Logging facilities (file, syslog, ...) Module49Name=Editors Module49Desc=Editor management -Module50Name=Products +Module50Name=Produk Module50Desc=Product management Module51Name=Mass mailings Module51Desc=Mass paper mailing management -Module52Name=Stocks +Module52Name=Stok Module52Desc=Stock management (products) -Module53Name=Services +Module53Name=Jasa Module53Desc=Service management Module54Name=Contracts/Subscriptions Module54Desc=Management of contracts (services or reccuring subscriptions) @@ -444,7 +447,7 @@ Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -453,11 +456,11 @@ Module70Name=Interventions Module70Desc=Intervention management Module75Name=Expense and trip notes Module75Desc=Expense and trip notes management -Module80Name=Shipments +Module80Name=Pengiriman Module80Desc=Shipments and delivery order management -Module85Name=Banks and cash +Module85Name=Bank dan Kas Module85Desc=Management of bank or cash accounts -Module100Name=External site +Module100Name=Situs luar Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame Module105Name=Mailman and SPIP Module105Desc=Mailman or SPIP interface for member module @@ -465,36 +468,38 @@ Module200Name=LDAP Module200Desc=LDAP directory synchronisation Module210Name=PostNuke Module210Desc=PostNuke integration -Module240Name=Data exports +Module240Name=Ekspor Data Module240Desc=Tool to export Dolibarr datas (with assistants) -Module250Name=Data imports +Module250Name=Impor Data Module250Desc=Tool to import datas in Dolibarr (with assistants) -Module310Name=Members +Module310Name=Anggota Module310Desc=Foundation members management Module320Name=RSS Feed Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmark management -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries Module510Name=Salaries Module510Desc=Management of employees salaries and payments -Module600Name=Notifications +Module600Name=Notifikasi Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) -Module700Name=Donations +Module700Name=Sumbangan Module700Desc=Donation management Module1200Name=Mantis Module1200Desc=Mantis integration -Module1400Name=Accounting +Module1400Name=Akunting Module1400Desc=Accounting management (double parties) -Module1780Name=Categories +Module1780Name=Kategori Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales @@ -527,32 +534,32 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) -Module59000Name=Margins +Module59000Name=Margin Module59000Desc=Module to manage margins -Module60000Name=Commissions +Module60000Name=Komisi Module60000Desc=Module to manage commissions Module150010Name=Batch number, eat-by date and sell-by date Module150010Desc=batch number, eat-by date and sell-by date management for product -Permission11=Read customer invoices -Permission12=Create/modify customer invoices +Permission11=Membaca Nota Pelanggan +Permission12=Membuat/Merubah Nota Pelanggan Permission13=Unvalidate customer invoices -Permission14=Validate customer invoices -Permission15=Send customer invoices by email -Permission16=Create payments for customer invoices -Permission19=Delete customer invoices -Permission21=Read commercial proposals -Permission22=Create/modify commercial proposals -Permission24=Validate commercial proposals -Permission25=Send commercial proposals -Permission26=Close commercial proposals -Permission27=Delete commercial proposals +Permission14=Validasi Nota Pelanggan +Permission15=Mengirim Nota Pelanggan Menggunakan EMail +Permission16=Mencatat Pembayaran Untuk Nota Pelanggan +Permission19=Menghapus Nota Pelanggan +Permission21=Membaca Proposal Komersil +Permission22=Membuat/Merubah Proposal Komersil +Permission24=Validasi Proposal Komersil +Permission25=Mengirim Proposal Komersil +Permission26=Menutup Proposal Komersil +Permission27=Menghapus Proposal Komersil Permission28=Export commercial proposals -Permission31=Read products -Permission32=Create/modify products -Permission34=Delete products +Permission31=Membaca Produk +Permission32=Membuat/Merubah produk +Permission34=Menghapus Produk Permission36=See/manage hidden products Permission38=Export products Permission41=Read projects (shared project and projects i'm contact for) @@ -562,25 +569,25 @@ Permission61=Read interventions Permission62=Create/modify interventions Permission64=Delete interventions Permission67=Export interventions -Permission71=Read members -Permission72=Create/modify members -Permission74=Delete members +Permission71=Membaca Data Anggota +Permission72=Membuat/Merubah Data Anggota +Permission74=Menghapus Data Anggota Permission75=Setup types and attributes for members Permission76=Export datas Permission78=Read subscriptions Permission79=Create/modify subscriptions -Permission81=Read customers orders -Permission82=Create/modify customers orders -Permission84=Validate customers orders -Permission86=Send customers orders -Permission87=Close customers orders -Permission88=Cancel customers orders -Permission89=Delete customers orders -Permission91=Read social contributions and vat -Permission92=Create/modify social contributions and vat -Permission93=Delete social contributions and vat +Permission81=Membaca Pesanan Pelanggan +Permission82=Membuat/Merubah Pesanan Pelanggan +Permission84=Validasi Pesanan Pelanggan +Permission86=Mengirim Pesanan Pelanggan +Permission87=Menutup Pesanan Pelanggan +Permission88=Membatalkan Pesanan Pelanggan +Permission89=Menghapus Pesanan Pelanggan +Permission91=Membaca Kontribusi Sosial dan VAT +Permission92=Membuat/Merubah Kontribusi Sosial dan VAT +Permission93=Menghapus Kontribusi Sosial dan VAT Permission94=Export social contributions -Permission95=Read reports +Permission95=Membaca Laporan Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings @@ -589,9 +596,9 @@ Permission109=Delete sendings Permission111=Read financial accounts Permission112=Create/modify/delete and compare transactions Permission113=Setup financiel accounts (create, manage categories) -Permission114=Consolidate transactions +Permission114=Konsolidasi Transaksi Permission115=Export transactions and account statements -Permission116=Transfers between accounts +Permission116=Transfer antar akun Permission117=Manage cheques dispatching Permission121=Read third parties linked to user Permission122=Create/modify third parties linked to user @@ -616,7 +623,7 @@ Permission172=Create/modify trips and expenses Permission173=Delete trips and expenses Permission174=Read all trips and expenses Permission178=Export trips and expenses -Permission180=Read suppliers +Permission180=Membaca Data Pemasok Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders @@ -649,21 +656,21 @@ Permission241=Read categories Permission242=Create/modify categories Permission243=Delete categories Permission244=See the contents of the hidden categories -Permission251=Read other users and groups -PermissionAdvanced251=Read other users -Permission252=Read permissions of other users +Permission251=Membaca Data Pengguna Lain dan Grup +PermissionAdvanced251=Membaca Data Pengguna Lain +Permission252=Membaca Izin Pengguna Lain Permission253=Create/modify other users, groups and permisssions PermissionAdvanced253=Create/modify internal/external users and permissions Permission254=Create/modify external users only -Permission255=Modify other users password +Permission255=Merubah Kata Sandi Pengguna Lain Permission256=Delete or disable other users Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves). Permission271=Read CA -Permission272=Read invoices -Permission273=Issue invoices -Permission281=Read contacts -Permission282=Create/modify contacts -Permission283=Delete contacts +Permission272=Membaca Nota +Permission273=Mengeluarkan Nota +Permission281=Membaca Kontrak +Permission282=Membuat/Merubah Kontrak +Permission283=Menghapus Kontrak Permission286=Export contacts Permission291=Read tariffs Permission292=Set permissions on the tariffs @@ -680,9 +687,9 @@ Permission341=Read its own permissions Permission342=Create/modify his own user information Permission343=Modify his own password Permission344=Modify its own permissions -Permission351=Read groups -Permission352=Read groups permissions -Permission353=Create/modify groups +Permission351=Membaca Data Grup +Permission352=Membaca Izin Grup +Permission353=Membuat/Merubah Grup Permission354=Delete or disable groups Permission358=Export users Permission401=Read discounts @@ -693,24 +700,24 @@ Permission510=Read Salaries Permission512=Create/modify salaries Permission514=Delete salaries Permission517=Export salaries -Permission531=Read services -Permission532=Create/modify services -Permission534=Delete services +Permission531=Membaca Jasa +Permission532=Membuat/Merubah Jasa +Permission534=Menghapus Jasa Permission536=See/manage hidden services Permission538=Export services -Permission701=Read donations -Permission702=Create/modify donations -Permission703=Delete donations -Permission1001=Read stocks -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses -Permission1004=Read stock movements +Permission701=Membaca Sumbangan +Permission702=Membuat/Merubah Sumbangan +Permission703=Menghapus Sumbangan +Permission1001=Membaca Stok +Permission1002=Membuat/Merubah Gudang +Permission1003=Menghapus Gudang +Permission1004=Membaca pergerakan stok Permission1005=Create/modify stock movements Permission1101=Read delivery orders Permission1102=Create/modify delivery orders Permission1104=Validate delivery orders Permission1109=Delete delivery orders -Permission1181=Read suppliers +Permission1181=Mambaca Pemasok Permission1182=Read supplier orders Permission1183=Create/modify supplier orders Permission1184=Validate supplier orders @@ -720,11 +727,11 @@ Permission1187=Acknowledge receipt of supplier orders Permission1188=Delete supplier orders Permission1201=Get result of an export Permission1202=Create/Modify an export -Permission1231=Read supplier invoices -Permission1232=Create/modify supplier invoices -Permission1233=Validate supplier invoices -Permission1234=Delete supplier invoices -Permission1235=Send supplier invoices by email +Permission1231=Mambaca Nota Pemasok +Permission1232=Membuat/Merubah Nota Pemasok +Permission1233=Validasi Nota Pemasok +Permission1234=Menghapus Nota Pemasok +Permission1235=Mengirim Nota Pemasok Melalui Email Permission1236=Export supplier invoices, attributes and payments Permission1237=Export supplier orders and their details Permission1251=Run mass imports of external data into database (data load) @@ -747,7 +754,7 @@ Permission2515=Setup documents directories Permission2801=Use FTP client in read mode (browse and download only) Permission2802=Use FTP client in write mode (delete or upload files) Permission50101=Use Point of sales -Permission50201=Read transactions +Permission50201=Membaca Data Transaksi Permission50202=Import transactions Permission54001=Print Permission55001=Read polls @@ -779,8 +786,9 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup saved -BackToModuleList=Back to modules list +BackToModuleList=Kembali Ke Daftar Modul BackToDictionaryList=Back to dictionaries list VATReceivedOnly=Special rate not charged VATManagement=VAT Management @@ -824,9 +832,9 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Label used by default if no translation can be found for code LabelOnDocuments=Label on documents NbOfDays=Nb of days -AtEndOfMonth=At end of month +AtEndOfMonth=diakhir bulan Offset=Offset -AlwaysActive=Always active +AlwaysActive=Selalu Aktif UpdateRequired=Your system needs to be updated. To do this, click on Update now. Upgrade=Upgrade MenuUpgrade=Upgrade / Extend @@ -837,17 +845,17 @@ DataRootServer=Data files directory IP=IP Port=Port VirtualServerName=Virtual server name -AllParameters=All parameters -OS=OS +AllParameters=Semua Parameter +OS=Sistem Operasi PhpEnv=Env -PhpModules=Modules +PhpModules=Modul-Modul PhpConf=Conf PhpWebLink=Web-Php link Pear=Pear PearPackages=Pear Packages Browser=Browser Server=Server -Database=Database +Database=Basis Data DatabaseServer=Database host DatabaseName=Database name DatabasePort=Database port @@ -864,12 +872,12 @@ ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry AllMustBeOk=All of these must be checked Host=Server DriverType=Driver type -SummarySystem=System information summary +SummarySystem=Ringkasan Sistem Informasi SummaryConst=List of all Dolibarr setup parameters SystemUpdate=System update SystemSuccessfulyUpdate=Your system has been updated successfuly MenuCompanySetup=Company/Foundation -MenuNewUser=New user +MenuNewUser=Pengguna Baru MenuTopManager=Top menu manager MenuLeftManager=Left menu manager MenuManager=Menu manager @@ -882,21 +890,22 @@ Skin=Skin theme DefaultSkin=Default skin theme MaxSizeList=Max length for list DefaultMaxSizeList=Default max length for list -MessageOfDay=Message of the day +MessageOfDay=Berita Hari Ini MessageLogin=Login page message PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface -EnableShowLogo=Show logo on left menu +EnableShowLogo=Tampilkan Logo dimenu kiri +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities -CompanyName=Name -CompanyAddress=Address -CompanyZip=Zip -CompanyTown=Town -CompanyCountry=Country -CompanyCurrency=Main currency +CompanyName=Nama +CompanyAddress=Alamat +CompanyZip=Kode Pos +CompanyTown=Kota +CompanyCountry=Negara +CompanyCurrency=Mata Uang Logo=Logo DoNotShow=Do not show DoNotSuggestPaymentMode=Do not suggest @@ -906,7 +915,7 @@ BankModuleNotActive=Bank accounts module not enabled ShowBugTrackLink=Show link "Report a bug" ShowWorkBoard=Show "workbench" on homepage Alerts=Alerts -Delays=Delays +Delays=Penundaan DelayBeforeWarning=Delay before warning DelaysBeforeWarning=Delays before warning DelaysOfToleranceBeforeWarning=Tolerance delays before warning diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang index 05e67508b1a..369ba05b614 100644 --- a/htdocs/langs/id_ID/agenda.lang +++ b/htdocs/langs/id_ID/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Acara ditugaskan untuk ActionsDoneBy=Acara yang dilakukan oleh ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Semua acara saya / tugas AllActions= Semua acara / tugas ViewList=Tampilan daftar diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang index 5580d87b517..15a3668333c 100644 --- a/htdocs/langs/id_ID/companies.lang +++ b/htdocs/langs/id_ID/companies.lang @@ -1,19 +1,19 @@ # Dolibarr language file - Source file is en_US - companies -ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one. +ErrorCompanyNameAlreadyExists=Nama Perusahaan %s telah terdaftar. Silahkan masukan nama lain. ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one. -ErrorSetACountryFirst=Set the country first -SelectThirdParty=Select a third party -DeleteThirdParty=Delete a third party -ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ? -DeleteContact=Delete a contact/address -ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ? -MenuNewThirdParty=New third party -MenuNewCompany=New company -MenuNewCustomer=New customer -MenuNewProspect=New prospect -MenuNewSupplier=New supplier +ErrorSetACountryFirst=Set Negara dulu +SelectThirdParty=Pilih Pihak Ketiga +DeleteThirdParty=Hapus pihak ketiga +ConfirmDeleteCompany=Apakah anda ingin menghapus perusahaan ini bersama dengan semua informasinya? +DeleteContact=Hapus kontak/alamat +ConfirmDeleteContact=Apakah anda ingin menghapus kontak ini bersama dengan semua informasinya? +MenuNewThirdParty=Pihak Ketiga Baru +MenuNewCompany=Perusahaan Baru +MenuNewCustomer=Pelanggan Baru +MenuNewProspect=Prospek Baru +MenuNewSupplier=Pemasok Baru MenuNewPrivateIndividual=New private individual -MenuSocGroup=Groups +MenuSocGroup=Grup NewCompany=New company (prospect, customer, supplier) NewThirdParty=New third party (prospect, customer, supplier) NewSocGroup=New company group @@ -21,16 +21,16 @@ NewPrivateIndividual=New private individual (prospect, customer, supplier) CreateDolibarrThirdPartySupplier=Create a third party (supplier) ProspectionArea=Prospection area SocGroup=Group of companies -IdThirdParty=Id third party -IdCompany=Company Id -IdContact=Contact Id -Contacts=Contacts/Addresses -ThirdPartyContacts=Third party contacts +IdThirdParty=ID Pihak Ketiga +IdCompany=ID Perusahaan +IdContact=ID Kontak +Contacts=Kontak/Alamat +ThirdPartyContacts=Kontak Pihak Ketiga ThirdPartyContact=Third party contact/address StatusContactValidated=Status of contact/address -Company=Company -CompanyName=Company name -Companies=Companies +Company=Perusahaan +CompanyName=Nama Perusahaan +Companies=Perusahaan CountryIsInEEC=Country is inside European Economic Community ThirdPartyName=Third party name ThirdParty=Third party @@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Absolute discounts available DiscountNone=None Supplier=Supplier CompanyList=Company's list -AddContact=Add contact -AddContactAddress=Add contact/address +AddContact=Create contact +AddContactAddress=Create contact/address EditContact=Edit contact EditContactAddress=Edit contact/address Contact=Contact @@ -268,8 +268,8 @@ ContactsAddresses=Contacts/Addresses NoContactDefinedForThirdParty=No contact defined for this third party NoContactDefined=No contact defined DefaultContact=Default contact/address -AddCompany=Add company -AddThirdParty=Add third party +AddCompany=Create company +AddThirdParty=Create third party DeleteACompany=Delete a company PersonalInformations=Personal data AccountancyCode=Accountancy code @@ -379,8 +379,8 @@ DeliveryAddressLabel=Delivery address label DeleteDeliveryAddress=Delete a delivery address ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address? NewDeliveryAddress=New delivery address -AddDeliveryAddress=Add address -AddAddress=Add address +AddDeliveryAddress=Create address +AddAddress=Create address NoOtherDeliveryAddress=No alternative delivery address defined SupplierCategory=Supplier category JuridicalStatus200=Independant diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang index 9fe5eff520d..878eb49b3c9 100644 --- a/htdocs/langs/id_ID/compta.lang +++ b/htdocs/langs/id_ID/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/id_ID/contracts.lang b/htdocs/langs/id_ID/contracts.lang index 511516dc755..57ba3bb15d8 100644 --- a/htdocs/langs/id_ID/contracts.lang +++ b/htdocs/langs/id_ID/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=List of running services NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Services to activate among validated contracts -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Last %s activated services LastModifiedServices=Last %s modified services EditServiceLine=Edit service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang index a2c8ec77de2..53f8d168a55 100644 --- a/htdocs/langs/id_ID/errors.lang +++ b/htdocs/langs/id_ID/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang index 5d0c83e3173..3e236cfac61 100644 --- a/htdocs/langs/id_ID/install.lang +++ b/htdocs/langs/id_ID/install.lang @@ -1,62 +1,62 @@ # Dolibarr language file - Source file is en_US - install -InstallEasy=Just follow the instructions step by step. -MiscellaneousChecks=Prerequisites check -DolibarrWelcome=Welcome to Dolibarr -ConfFileExists=Configuration file %s exists. -ConfFileDoesNotExists=Configuration file %s does not exist ! -ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file %s does not exist and could not be created ! -ConfFileCouldBeCreated=Configuration file %s could be created. -ConfFileIsNotWritable=Configuration file %s is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS). +InstallEasy=Ikuti setiap langkah sesuai dengan instruksi +MiscellaneousChecks=Peninjauan prasyarat +DolibarrWelcome=Selamat Datang di Dolibarr +ConfFileExists=File konfigurasi %s telah ada +ConfFileDoesNotExists=File konfigurasi %s tidak ada +ConfFileDoesNotExistsAndCouldNotBeCreated=File konfigurasi %s tidak ada dan tidak dapat dibuat +ConfFileCouldBeCreated=File konfigurasi %s dapat dibuat +ConfFileIsNotWritable=File konfigurasi %s tidak dapat ditulis ulang. Periksa hak akses file. Untuk instalasi pertama kali, web server harus dapat menulisi file tersebut selama proses konfigurasi (sebagai contoh perintah "chmod 666" pada sistem operasi berbasis Unix"). ConfFileIsWritable=Configuration file %s is writable. -ConfFileReload=Reload all information from configuration file. +ConfFileReload=memuat ulang semua informasi dari berkas konfigurasi PHPSupportSessions=This PHP supports sessions. -PHPSupportPOSTGETOk=This PHP supports variables POST and GET. +PHPSupportPOSTGETOk=PHP ini mendukung variabel POST dan GET PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter variables_order in php.ini. -PHPSupportGD=This PHP support GD graphical functions. -PHPSupportUTF8=This PHP support UTF8 functions. +PHPSupportGD=PHP ini mendukung fungsi grafik GD +PHPSupportUTF8=PHP ini mendukung fungsi UTF8 PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough. PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This should be too low. Change your php.ini to set memory_limit parameter to at least %s bytes. Recheck=Click here for a more significative test ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup. -ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available. -ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr. +ErrorPHPDoesNotSupportGD=PHP anda tidak mendukung fungsi grafik GD. Grafik tidak dapat ditampilkan +ErrorPHPDoesNotSupportUTF8=PHP anda tidak mendukung fungsi UTF8. Dolibarr tidak dapat berfungsi semestinya. Selesaikan hal tersebut sebelum proses instalasi Dolibarr ErrorDirDoesNotExists=Directory %s does not exist. ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters. ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'. ErrorFailedToCreateDatabase=Failed to create database '%s'. -ErrorFailedToConnectToDatabase=Failed to connect to database '%s'. -ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required. -ErrorPHPVersionTooLow=PHP version too old. Version %s is required. -WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported. -ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found. +ErrorFailedToConnectToDatabase=Gagal untuk terhubung pada basis data '%s' +ErrorDatabaseVersionTooLow=Versi basis data (%s) terlalu lama. Dibutuhkan versi %s atau lebih +ErrorPHPVersionTooLow=Versi PHP terlalu lama. Dibutuhkan versi %s +WarningPHPVersionTooLow=Versi PHP terlalu lama. Disarankan untuk menggunakan versi %s atau lebih. Pada versi ini proses instalasi dapat dijalankan namun tidak didukung +ErrorConnectedButDatabaseNotFound=Koneksi pada server sukses namun basis data '%s' tidak dapat ditemukan ErrorDatabaseAlreadyExists=Database '%s' already exists. IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database". IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option. -WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded. -PHPVersion=PHP Version -YouCanContinue=You can continue... -PleaseBePatient=Please be patient... -License=Using license -ConfigurationFile=Configuration file +WarningBrowserTooOld=Versi peramban terlalu lama. Sangat disarankan untuk pemutakhiran peramban Firefox, Chrome atau Opera pada versi terkini. +PHPVersion=Versi PHP +YouCanContinue=Anda dapat melanjutkan +PleaseBePatient=Mohon tunggu +License=Penggunaan lisensi +ConfigurationFile=Berkas Konfigurasi WebPagesDirectory=Directory where web pages are stored DocumentsDirectory=Directory to store uploaded and generated documents URLRoot=URL Root ForceHttps=Force secure connections (https) CheckToForceHttps=Check this option to force secure connections (https).
This requires that the web server is configured with an SSL certificate. -DolibarrDatabase=Dolibarr Database -DatabaseChoice=Database choice -DatabaseType=Database type +DolibarrDatabase=Basis Data Dolibarr +DatabaseChoice=Pilihan Basis Data +DatabaseType=Jenis Basis Data DriverType=Driver type Server=Server ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server ServerPortDescription=Database server port. Keep empty if unknown. -DatabaseServer=Database server -DatabaseName=Database name +DatabaseServer=Server Database +DatabaseName=Nama Database DatabasePrefix=Database prefix table Login=Login AdminLogin=Login for Dolibarr database owner. -Password=Password -PasswordAgain=Retype password a second time +Password=Kata kunci +PasswordAgain=Ketikkan ulang kata kunci AdminPassword=Password for Dolibarr database owner. CreateDatabase=Create database CreateUser=Create owner @@ -67,9 +67,9 @@ Experimental=(experimental) DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists. KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this) SaveConfigurationFile=Save values -ConfigurationSaving=Saving configuration file -ServerConnection=Server connection -DatabaseConnection=Database connection +ConfigurationSaving=Menyimpan berkas konfigurasi +ServerConnection=Koneksi Server +DatabaseConnection=Koneksi Database DatabaseCreation=Database creation UserCreation=User creation CreateDatabaseObjects=Database objects creation @@ -80,11 +80,11 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s OtherKeysCreation=Foreign keys and indexes creation FunctionsCreation=Functions creation AdminAccountCreation=Administrator login creation -PleaseTypePassword=Please type a password, empty passwords are not allowed ! +PleaseTypePassword=Mohon ketikkan kata kunci, tidak diperbolehkan untuk mengosongkan kata kunci ! PleaseTypeALogin=Please type a login ! PasswordsMismatch=Passwords differs, please try again ! SetupEnd=End of setup -SystemIsInstalled=This installation is complete. +SystemIsInstalled=Proses Instalasi telah selesai SystemIsUpgraded=Dolibarr has been upgraded successfully. YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below: AdminLoginCreatedSuccessfuly=Dolibarr administrator login '%s' created successfuly. @@ -92,10 +92,10 @@ GoToDolibarr=Go to Dolibarr GoToSetupArea=Go to Dolibarr (setup area) MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again. GoToUpgradePage=Go to upgrade page again -Examples=Examples +Examples=Contoh WithNoSlashAtTheEnd=Without the slash "/" at the end -DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages. -LoginAlreadyExists=Already exists +DirectoryRecommendation=Direkomendasikan untuk menggunakan direktori diluar dari direktori halaman web anda +LoginAlreadyExists=Telah ada DolibarrAdminLogin=Dolibarr admin login AdminLoginAlreadyExists=Dolibarr administrator account '%s' already exists. Go back, if you want to create another one. WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called install.lock into Dolibarr document directory, in order to avoid malicious use of it. @@ -103,22 +103,22 @@ ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to FunctionNotAvailableInThisPHP=Not available on this PHP MigrateScript=Migration script ChoosedMigrateScript=Choose migration script -DataMigration=Data migration +DataMigration=Migrasi Data DatabaseMigration=Structure database migration ProcessMigrateScript=Script processing ChooseYourSetupMode=Choose your setup mode and click "Start"... FreshInstall=Fresh install FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode. -Upgrade=Upgrade +Upgrade=Pemutakhiran UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data. -Start=Start +Start=Mulai InstallNotAllowed=Setup not allowed by conf.php permissions -NotAvailable=Not available +NotAvailable=Tidak tersedia YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process. -CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page. +CorrectProblemAndReloadPage=Mohon perbaiki kesalahan dan tekan F5 untuk memuat ulang halaman AlreadyDone=Already migrated -DatabaseVersion=Database version -ServerVersion=Database server version +DatabaseVersion=Versi Database +ServerVersion=Versi Server Database YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it. CharsetChoice=Character set choice CharacterSetClient=Character set used for generated HTML web pages @@ -151,7 +151,7 @@ NextStepMightLastALongTime=Current step may last several minutes. Please wait un MigrationCustomerOrderShipping=Migrate shipping for customer orders storage MigrationShippingDelivery=Upgrade storage of shipping MigrationShippingDelivery2=Upgrade storage of shipping 2 -MigrationFinished=Migration finished +MigrationFinished=Proses migrasi selesai LastStepDesc=Last step: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others. ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) @@ -164,8 +164,8 @@ MigrationSupplierOrder=Data migration for supplier's orders MigrationProposal=Data migration for commercial proposals MigrationInvoice=Data migration for customer's invoices MigrationContract=Data migration for contracts -MigrationSuccessfullUpdate=Upgrade successful -MigrationUpdateFailed=Failed upgrade process +MigrationSuccessfullUpdate=Proses Pemutakhiran berhasil +MigrationUpdateFailed=Proses pemutakhiran gagal MigrationRelationshipTables=Data migration for relationship tables (%s) MigrationPaymentsUpdate=Payment data correction MigrationPaymentsNumberToUpdate=%s payment(s) to update diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang index 9246a04ced9..40bca8e85fb 100644 --- a/htdocs/langs/id_ID/members.lang +++ b/htdocs/langs/id_ID/members.lang @@ -1,204 +1,206 @@ # Dolibarr language file - Source file is en_US - members -# MembersArea=Members area -# PublicMembersArea=Public members area -# MemberCard=Member card -# SubscriptionCard=Subscription card -# Member=Member -# Members=Members -# MemberAccount=Member login -# ShowMember=Show member card -# UserNotLinkedToMember=User not linked to a member -# ThirdpartyNotLinkedToMember=Third-party not linked to a member -# MembersTickets=Members Tickets -# FundationMembers=Foundation members -# Attributs=Attributes -# ErrorMemberTypeNotDefined=Member type not defined -# ListOfPublicMembers=List of public members -# ListOfValidatedPublicMembers=List of validated public members -# ErrorThisMemberIsNotPublic=This member is not public -# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). -# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. -# ThisIsContentOfYourCard=This is details of your card -# CardContent=Content of your member card -# SetLinkToUser=Link to a Dolibarr user -# SetLinkToThirdParty=Link to a Dolibarr third party -# MembersCards=Members business cards -# MembersList=List of members -# MembersListToValid=List of draft members (to be validated) -# MembersListValid=List of valid members -# MembersListUpToDate=List of valid members with up to date subscription -# MembersListNotUpToDate=List of valid members with subscription out of date -# MembersListResiliated=List of resiliated members -# MembersListQualified=List of qualified members -# MenuMembersToValidate=Draft members -# MenuMembersValidated=Validated members -# MenuMembersUpToDate=Up to date members -# MenuMembersNotUpToDate=Out of date members -# MenuMembersResiliated=Resiliated members -# MembersWithSubscriptionToReceive=Members with subscription to receive -# DateAbonment=Subscription date -# DateSubscription=Subscription date -# DateNextSubscription=Next subscription -# DateEndSubscription=Subscription end date -# EndSubscription=End subscription -# SubscriptionId=Subscription id -# MemberId=Member id -# NewMember=New member -# NewType=New member type -# MemberType=Member type -# MemberTypeId=Member type id -# MemberTypeLabel=Member type label -# MembersTypes=Members types -# MembersAttributes=Members attributes -# SearchAMember=Search a member -# MemberStatusDraft=Draft (needs to be validated) -# MemberStatusDraftShort=Draft -# MemberStatusActive=Validated (waiting subscription) -# MemberStatusActiveShort=Validated -# MemberStatusActiveLate=subscription expired -# MemberStatusActiveLateShort=Expired -# MemberStatusPaid=Subscription up to date -# MemberStatusPaidShort=Up to date -# MemberStatusResiliated=Resiliated member -# MemberStatusResiliatedShort=Resiliated -# MembersStatusToValid=Draft members -# MembersStatusToValidShort=Draft members -# MembersStatusValidated=Validated members -# MembersStatusPaid=Subscription up to date -# MembersStatusPaidShort=Up to date -# MembersStatusNotPaid=Subscription out of date -# MembersStatusNotPaidShort=Out of date -# MembersStatusResiliated=Resiliated members -# MembersStatusResiliatedShort=Resiliated members -# NewCotisation=New contribution -# PaymentSubscription=New contribution payment -# EditMember=Edit member -# SubscriptionEndDate=Subscription's end date -# MembersTypeSetup=Members type setup -# NewSubscription=New subscription -# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. -# Subscription=Subscription -# Subscriptions=Subscriptions -# SubscriptionLate=Late -# SubscriptionNotReceived=Subscription never received -# SubscriptionLateShort=Late -# SubscriptionNotReceivedShort=Never received -# ListOfSubscriptions=List of subscriptions -# SendCardByMail=Send card by Email -# AddMember=Add member -# MemberType=Member type -# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" -# NewMemberType=New member type -# WelcomeEMail=Welcome e-mail -# SubscriptionRequired=Subscription required -# EditType=Edit member type -# DeleteType=Delete -# VoteAllowed=Vote allowed -# Physical=Physical -# Moral=Moral -# MorPhy=Moral/Physical -# Reenable=Reenable -# ResiliateMember=Resiliate a member -# ConfirmResiliateMember=Are you sure you want to resiliate this member ? -# DeleteMember=Delete a member -# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? -# DeleteSubscription=Delete a subscription -# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? -# Filehtpasswd=htpasswd file -# ValidateMember=Validate a member -# ConfirmValidateMember=Are you sure you want to validate this member ? -# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. -# PublicMemberList=Public member list -# BlankSubscriptionForm=Public auto-subscription form -# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. -# EnablePublicSubscriptionForm=Enable the public auto-subscription form -# MemberPublicLinks=Public links/pages -# ExportDataset_member_1=Members and subscriptions -# ImportDataset_member_1=Members -# LastMembers=Last %s members -# LastMembersModified=Last %s modified members -# LastSubscriptionsModified=Last %s modified subscriptions -# AttributeName=Attribute name -# String=String -# Text=Text -# Int=Int -# Date=Date -# DateAndTime=Date and time -# PublicMemberCard=Member public card -# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -# AddSubscription=Add subscription -# ShowSubscription=Show subscription -# MemberModifiedInDolibarr=Member modified in Dolibarr -# SendAnEMailToMember=Send information email to member -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription -# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription -# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation -# DescADHERENT_MAIL_VALID=EMail for member validation -# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription -# DescADHERENT_MAIL_COTIS=EMail for subscription -# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation -# DescADHERENT_MAIL_RESIL=EMail for member resiliation -# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails -# DescADHERENT_ETIQUETTE_TYPE=Format of labels page -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets -# DescADHERENT_CARD_TYPE=Format of cards page -# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards -# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) -# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) -# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards -# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here -# MayBeOverwrited=This text can be overwrited by value defined for member's type -# ShowTypeCard=Show type '%s' -# HTPasswordExport=htpassword file generation -# NoThirdPartyAssociatedToMember=No third party associated to this member -# ThirdPartyDolibarr=Dolibarr third party -# MembersAndSubscriptions= Members and Subscriptions -# MoreActions=Complementary action on recording -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription -# MoreActionBankDirect=Create a direct transaction record on account -# MoreActionBankViaInvoice=Create an invoice and payment on account -# MoreActionInvoiceOnly=Create an invoice with no payment -# LinkToGeneratedPages=Generate visit cards -# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. -# DocForAllMembersCards=Generate business cards for all members -# DocForOneMemberCards=Generate business cards for a particular member -# DocForLabels=Generate address sheets -# SubscriptionPayment=Subscription payment -# LastSubscriptionDate=Last subscription date -# LastSubscriptionAmount=Last subscription amount -# MembersStatisticsByCountries=Members statistics by country -# MembersStatisticsByState=Members statistics by state/province -# MembersStatisticsByTown=Members statistics by town -# NbOfMembers=Number of members -# NoValidatedMemberYet=No validated members found -# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. -# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. -# MembersByTownDesc=This screen show you statistics on members by town. -# MembersStatisticsDesc=Choose statistics you want to read... -# MenuMembersStats=Statistics -# LastMemberDate=Last member date -# Nature=Nature -# Public=Information are public -# Exports=Exports -# NewMemberbyWeb=New member added. Awaiting approval -# NewMemberForm=New member form -# SubscriptionsStatistics=Statistics on subscriptions -# NbOfSubscriptions=Number of subscriptions -# AmountOfSubscriptions=Amount of subscriptions -# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) -# DefaultAmount=Default amount of subscription -# CanEditAmount=Visitor can choose/edit amount of its subscription -# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page -# Associations=Foundations -# Collectivités=Organizations -# Particuliers=Personal -# Entreprises=Companies -# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member +Members=Members +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions +ImportDataset_member_1=Members +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang index cb88461602d..81d217ddb54 100644 --- a/htdocs/langs/id_ID/products.lang +++ b/htdocs/langs/id_ID/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang index 4affd1fdc5a..c48e27fd204 100644 --- a/htdocs/langs/id_ID/projects.lang +++ b/htdocs/langs/id_ID/projects.lang @@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant Myprojects=My projects ProjectsArea=Projects area NewProject=New project -AddProject=Add project +AddProject=Create project DeleteAProject=Delete a project DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task -AddTask=Add task +AddTask=Create task AddDuration=Add duration Activity=Activity Activities=Tasks/activities diff --git a/htdocs/langs/id_ID/resource.lang b/htdocs/langs/id_ID/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/id_ID/resource.lang +++ b/htdocs/langs/id_ID/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang index e4337309084..ea32511fefb 100644 --- a/htdocs/langs/id_ID/withdrawals.lang +++ b/htdocs/langs/id_ID/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index 60edf794f82..a72321ea970 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Bæta síu möguleika til að sýna / fela thirdparties sem nú eru í starfsemi eða hætt henni UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Leita síur valkostir NumberOfKeyToSearch=NBR af stöfum til að kalla fram leit: %s ViewFullDateActions=Sýna fullur dagsetningar aðgerðir í þriðja blaði @@ -208,6 +210,7 @@ ModulesJobDesc=Viðskipti mát veita einfalda fyrirfram uppsetningu Dolibarr fyr ModulesMarketPlaceDesc=Þú getur fundið fleiri einingar til að hlaða niður á yfirborð vefsíðum á Internetinu ... ModulesMarketPlaces=Meira mát ... DoliStoreDesc=DoliStore, opinber markaður staður fyrir Dolibarr ERP / CRM ytri mát +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Vefsíða veitendur þú getur leitað til að finna fleiri mát ... URL=Link BoxesAvailable=Hnefaleikar boði @@ -444,7 +447,7 @@ Module55Desc=Strikamerki er stjórnun Module56Name=Símtækni Module56Desc=Símtækni sameining Module57Name=Standandi pantanir -Module57Desc=Standandi fyrirmæli og stjórnun afturköllun á +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial sameining Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Bæta við RSS straum inni Dolibarr skjár síður Module330Name=Bókamerki Module330Desc=Bókamerki í stjórnun -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar sameining Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Flokkar Module1780Desc=Stjórn Flokkur's (vörur, birgja og viðskiptavina) Module2000Name=Fckeditor Module2000Desc=WYSIWYG Editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Dagskrá @@ -503,6 +508,8 @@ Module2500Name=Rafræn Innihald Stjórnun Module2500Desc=Vista og samnýta skjöl Module2600Name=WebServices Module2600Desc=Virkja Dolibarr vefþjónusta miðlara +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Nota online Gravatar þjónusta (www.gravatar.com) til að sýna mynd af notendum og meðlimum (stofna með tölvupósti þeirra). Vantar internet Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með PayBox Module50100Name=Point of sölu @@ -527,7 +534,7 @@ Module50200Desc=Module til að bjóða upp á netinu greiðslu síðu með kredi Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Skipulag vistuð BackToModuleList=Til baka í mát lista BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Varanleg leita mynd til vinstri valmynd DefaultLanguage=Sjálfgefið tungumál til að nota (tungumálið code) EnableMultilangInterface=Virkja Fjöltyng tengi EnableShowLogo=Sýna merki á vinstri valmynd +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Vélin þín hefur verið uppfærð CompanyInfo=Fyrirtæki / stofnun upplýsingar CompanyIds=Fyrirtæki / stofnun auðkenni diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang index a5614eca50f..9426f2e6177 100644 --- a/htdocs/langs/is_IS/agenda.lang +++ b/htdocs/langs/is_IS/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Actions áhrif til ActionsDoneBy=Actions gert með því að ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Allar aðgerðir mínar / verkefni AllActions= Allar aðgerðir / verkefni ViewList=Skoða lista diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang index cf099f5789b..e793677dee7 100644 --- a/htdocs/langs/is_IS/compta.lang +++ b/htdocs/langs/is_IS/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/is_IS/contracts.lang b/htdocs/langs/is_IS/contracts.lang index e58b93f1b03..8faf347b95c 100644 --- a/htdocs/langs/is_IS/contracts.lang +++ b/htdocs/langs/is_IS/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listi yfir gangi samningur línur ListOfRunningServices=Listi af hlaupandi þjónusta NotActivatedServices=Óvirkur þjónustu (meðal gildi samninga) BoardNotActivatedServices=Þjónusta til virkja meðal gildi samninga -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Last %s virkt þjónusta LastModifiedServices=Last %s breytt þjónusta EditServiceLine=Breyta þjónustu línu @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sölufulltrúi undirrita samning diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang index a21ac67cabe..2e910c852e4 100644 --- a/htdocs/langs/is_IS/errors.lang +++ b/htdocs/langs/is_IS/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Birgir merkjamál þurfa ErrorSupplierCodeAlreadyUsed=Birgir sem notaður er þegar ErrorBadParameters=Bad breytur ErrorBadValueForParameter=Rangt gildi '%s "fyrir breytu rangt að' %s að ' -ErrorBadImageFormat=Mynd skrá hefur ekki studdur snið +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat='Á %s' gildi hefur rangt snið dagsetningar ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Tókst ekki að skrifa í möppunni %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Notandi með notandanafn %s fannst ekki. ErrorLoginHasNoEmail=Þessi notandi hefur ekki netfang. Aðferð aflýst. ErrorBadValueForCode=Bad gerðir gildi fyrir kóða. Prófaðu aftur með nýtt gildi ... ErrorBothFieldCantBeNegative=Fields %s og %s getur ekki verið bæði neikvæð +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Notandi Reikningur %s notað til að framkvæma vefur framreiðslumaður hefur ekki leyfi til að ErrorNoActivatedBarcode=Nei barcode gerð virk ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang index 4766f33b8e1..a151150fd4c 100644 --- a/htdocs/langs/is_IS/members.lang +++ b/htdocs/langs/is_IS/members.lang @@ -8,7 +8,7 @@ Members=Members MemberAccount=Aðildarríkin Innskráning ShowMember=Sýna meðlimur kort UserNotLinkedToMember=Notandi tengist ekki meðlimur -# ThirdpartyNotLinkedToMember=Third-party not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=Members Miðasala FundationMembers=Stofnun meðlimir Attributs=Eiginleiki @@ -85,8 +85,7 @@ SubscriptionLateShort=Seint SubscriptionNotReceivedShort=Aldrei fengið ListOfSubscriptions=Listi yfir áskriftir SendCardByMail=Senda kort -AddMember=Bæta við félagi -MemberType=Aðildarríkin tegund +AddMember=Create member NoTypeDefinedGoToSetup=Enginn tegundir skilgreindar. Fara til skipulag - Members tegundir NewMemberType=Nýr meðlimur tegund WelcomeEMail=Velkomin í tölvupósti @@ -126,12 +125,12 @@ Date=Dagsetning DateAndTime=Dagsetning og tími PublicMemberCard=Aðildarríkin almenningi kort MemberNotOrNoMoreExpectedToSubscribe=Aðildarríkin ekki eða ekki fleiri ráð til að gerast áskrifandi -AddSubscription=Bæta við áskrift +AddSubscription=Create subscription ShowSubscription=Sýna áskrift MemberModifiedInDolibarr=Aðildarríkin breytt í Dolibarr SendAnEMailToMember=Senda upplýsingar email til félagi -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Netfang efni fyrir aðildarríki autosubscription DescADHERENT_AUTOREGISTER_MAIL=Tölvupóstur fyrir aðild autosubscription DescADHERENT_MAIL_VALID_SUBJECT=Netfang efni fyrir aðildarríki löggilding @@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=Netfang efni fyrir aðildarríki resiliation DescADHERENT_MAIL_RESIL=Tölvupóstur fyrir aðild resiliation DescADHERENT_MAIL_FROM=Sendandi Email fyrir sjálfvirka tölvupósti DescADHERENT_ETIQUETTE_TYPE=Snið af merki síðu -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets DescADHERENT_CARD_TYPE=Snið af kortum síðu DescADHERENT_CARD_HEADER_TEXT=Texti prentuð á toppur af félagi kort DescADHERENT_CARD_TEXT=Texti prentaðir á meðlimur spil (samræma til vinstri) @@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Engar þriðja aðila í tengslum við þennan ThirdPartyDolibarr=Dolibarr þriðja aðila MembersAndSubscriptions= Aðilar og Subscriptions MoreActions=Fjölbreyttari aðgerðir á upptöku -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription MoreActionBankDirect=Búa beinni viðskipti færslu á reikning MoreActionBankViaInvoice=Búa til reikning og greiðslu á reikning MoreActionInvoiceOnly=Búa til reikning án greiðslu @@ -171,6 +170,8 @@ LastSubscriptionAmount=Síðast áskrift upphæð MembersStatisticsByCountries=Notendur tölfræði eftir landi MembersStatisticsByState=Notendur tölfræði eftir fylki / hérað MembersStatisticsByTown=Notendur tölfræði eftir bænum +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=Fjöldi félaga NoValidatedMemberYet=Engar fullgiltar meðlimir fundust MembersByCountryDesc=Þessi skjár sýnir þér tölfræði á meðlimum með löndum. Grafísk veltur þó á Google netinu línurit þjónustu og er aðeins í boði ef nettengingin er er að vinna. @@ -196,9 +197,10 @@ Collectivités=Félög Particuliers=Starfsfólk Entreprises=Stofnanir DOLIBARRFOUNDATION_PAYMENT_FORM=Til að gera áskrift greiðslu með millifærslu, sjá síðu http://wiki.dolibarr.org/index.php/Subscribe~~dobj .
Til að greiða með kreditkorti eða PayPal, smelltu á hnappinn neðst á síðunni.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang index 3838200a716..861e2f2c32e 100644 --- a/htdocs/langs/is_IS/products.lang +++ b/htdocs/langs/is_IS/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Ef varan er þjónusta við takmarkaðan tíma: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Fjöldi verð MultiPriceLevelsName=Verð flokkar -AssociatedProductsAbility=Virkja sub-vörur -AssociatedProducts=Sub-vörur -AssociatedProductsNumber=Fjöldi vara að semja þessa vöru -ParentProductsNumber=Fjöldi vara foreldra -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Félagi Translation=Þýðing KeywordFilter=Leitarorð sía @@ -132,7 +132,7 @@ AddDel=Bæta við / Eyða Quantity=Magn NoMatchFound=Engin samsvörun fannst ProductAssociationList=Listi yfir tengdum vörum / þjónustu: nafn á vöru / þjónustu (magn áhrifum) -ProductParentList=Listi yfir vörur og þjónustu með þessa vöru sem hluti +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Einn af völdum vöru er foreldri með núverandi vöru DeleteProduct=Eyða vöru / þjónustu ConfirmDeleteProduct=Ertu viss um að þú viljir eyða þessari vöru / þjónustu? @@ -179,7 +179,7 @@ CloneProduct=Klóna vöru eða þjónustu ConfirmCloneProduct=Ertu viss um að þú viljir klón vöru eða þjónustu %s ? CloneContentProduct=Klóna allar helstu upplýsingar um vöru / þjónustu ClonePricesProduct=Klóna helstu upplýsingar og verð -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Þessi vara er notuð NewRefForClone=Tilv. nýrra vara / þjónusta CustomerPrices=Viðskiptavinir verð @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang index 347428bf607..4e1de0881dc 100644 --- a/htdocs/langs/is_IS/projects.lang +++ b/htdocs/langs/is_IS/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Þetta sýnir öll verkefni og verkefni (notandi heimildir veita þér Myprojects=Verkefnin mín ProjectsArea=Verkefni area NewProject=Ný verkefni -AddProject=Bæta við verkefnið +AddProject=Create project DeleteAProject=Eyða verkefni DeleteATask=Eyða verkefni ConfirmDeleteAProject=Ertu viss um að þú viljir eyða þessu verkefni? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Nýr tími MyTimeSpent=Minn tími var MyTasks=verkefni mitt @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Ný verkefni -AddTask=Bæta við verkefni +AddTask=Create task AddDuration=Bæta við lengd Activity=Afþreying Activities=Verkefni / starfsemi diff --git a/htdocs/langs/is_IS/resource.lang b/htdocs/langs/is_IS/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/is_IS/resource.lang +++ b/htdocs/langs/is_IS/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang index 0ef7747d4a1..d73332b8408 100644 --- a/htdocs/langs/is_IS/withdrawals.lang +++ b/htdocs/langs/is_IS/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Útlán á WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Sýna Dragið IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hins vegar, ef reikningur hefur að minnsta kosti einn hætt greiðslu ekki enn afgreidd, mun það ekki vera eins og borgað til að leyfa að stjórna afturköllun áður. -DoStandingOrdersBeforePayments=Þetta tabs leyfa þér að biðja fyrir standandi röð. Þegar það verður lokið, getur þú slegið greiðslu til loka reikning. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Greiðsla standa röð %s af bankanum diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index 3efcd058a7f..b0a7137761f 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Per scegliere una terza parte usare i campi di auto-com ActivityStateToSelectCompany= Aggiungere un filtro per visualizzare/nascondere i terzi attualmente in attività o meno UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Per scegliere i contatti usare i campi di auto-completamento (invece di una lista di selezione). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Opzioni dei filtri di ricerca NumberOfKeyToSearch=N ° di caratteri per attivare ricerca: %s ViewFullDateActions=Visualizzazione di tutte le date delle azioni nel foglio dei terzi @@ -208,6 +210,7 @@ ModulesJobDesc=I moduli business forniscono delle semplici configurazioni predef ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su vari siti web esterni... ModulesMarketPlaces=Più moduli ... DoliStoreDesc=DoliStore, il mercato ufficiale dei moduli esterni per Dolibarr ERP/CRM +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Siti Web in cui è possibile cercare altri moduli ... URL=Collegamento BoxesAvailable=Caselle disponibili @@ -444,7 +447,7 @@ Module55Desc=Gestione codici a barre Module56Name=Telefonia Module56Desc=Integrazione telefonia Module57Name=Ordini permanenti -Module57Desc=Gestione ordini permanenti (RID) e domiciliazioni +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integrazione di un sistema ClickToDial (per esempio Asterisk) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=Feed RSS Module320Desc=Aggiungi feed RSS alle pagine di Dolibarr Module330Name=Segnalibri Module330Desc=Gestione segnalibri -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Calendario web Module410Desc=Integrazione calendario web Module500Name=Spese speciali (tasse, contributi sociali, dividendi) @@ -495,6 +498,8 @@ Module1780Name=Categorie Module1780Desc=Gestione Categorie (prodotti, fornitori e clienti) Module2000Name=FCKeditor Module2000Desc=Permette di usare un editor avanzato per alcune aree di testo +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Gestione dei task programmati Module2400Name=Ordine del giorno @@ -503,6 +508,8 @@ Module2500Name=Gestione dei contenuti digitali Module2500Desc=Salvare e condividere documenti Module2600Name=WebServices Module2600Desc=Attivare i webservices di Dolibarr +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Usa il servizio online Gravatar (www.gravatar.com) per mostrare le foto degli utenti/membri. Necessita dell'accesso a Internet Module2800Desc=Client FTP @@ -517,7 +524,7 @@ Module6000Desc=Gestione flussi di lavoro Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Modulo per offrire il pagamento online con PayBox Module50100Name=Punti vendita @@ -527,7 +534,7 @@ Module50200Desc=Modulo per offrire il pagamento online con Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Stampa tramite Stampante IPP Cups +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Sondaggio aperto Module55000Desc=Modulo per creare sondaggi online (Doodle, Studs, Rdvz o simili) Module59000Name=Margini @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Impostazioni salvate BackToModuleList=Torna alla lista moduli BackToDictionaryList=Torna alla lista dei dizionari @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Modulo di ricerca permanente nel menu di sinistra DefaultLanguage=La lingua da impostare come predefinita (codice lingua) EnableMultilangInterface=Attiva l'interfaccia multilingua EnableShowLogo=Abilita la visualizzazione del logo +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Il sistema è stato aggiornato con successo CompanyInfo=Informazioni società/fondazione CompanyIds=Identità società/fondazione diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang index 8e0c4d9f732..7a63495c2c1 100644 --- a/htdocs/langs/it_IT/agenda.lang +++ b/htdocs/langs/it_IT/agenda.lang @@ -2,8 +2,8 @@ IdAgenda=ID evento Actions=Azioni ActionsArea=Area eventi (azioni e compiti) -Agenda=Ordine del giorno -Agendas=Ordini del giorno +Agenda=Agenda +Agendas=Agende Calendar=Calendario Calendars=Calendari LocalAgenda=Calendario interno @@ -29,6 +29,7 @@ ActionsToDoBy=Eventi assegnati a ActionsDoneBy=Azioni fatte da ActionsForUser=Eventi per utente ActionsForUsersGroup=Eventi per tutti gli utenti del gruppo +ActionAssignedTo=Event assigned to AllMyActions= Tutte i miei compiti/azioni AllActions= Tutte i compiti/azioni ViewList=Vista elenco @@ -39,12 +40,12 @@ ViewPerUser=Visualizzazione per utente ViewWithPredefinedFilters= Vista con filtri predefiniti AutoActions= Riempimento automatico AgendaAutoActionDesc= Definire qui gli eventi che devono essere creati automaticamente da Dolibarr. Se non è selezionato nulla (impostazione predefinita), nel calendario saranno visualizzate solo azioni inserite manualmente. -AgendaSetupOtherDesc= Questa pagina consente di configurare gli altri parametri del modulo ordine del giorno. -AgendaExtSitesDesc=Questa pagina consente di configurare i calendari esterni. +AgendaSetupOtherDesc= Questa pagina consente di configurare gli altri parametri del modulo calendario. +AgendaExtSitesDesc=Questa pagina consente di configurare i calendari esterni da includere nell'agenda di dolibarr. ActionsEvents=Eventi per i quali creare un'azione PropalValidatedInDolibarr=Proposta convalidata InvoiceValidatedInDolibarr=Fattura convalidata -InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceValidatedInDolibarrFromPos=Ricevute %s validate dal POS InvoiceBackToDraftInDolibarr=Fattura %s riportata allo stato di bozza InvoiceDeleteDolibarr=La fattura %s è stata cancellata OrderValidatedInDolibarr= Ordine convalidato diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang index c3f16a3d40e..a0d411e1db6 100644 --- a/htdocs/langs/it_IT/banks.lang +++ b/htdocs/langs/it_IT/banks.lang @@ -116,8 +116,8 @@ TransferDesc=Trasferimento da un conto ad un altro, Dolibarr scriverà due recor TransferFrom=Da TransferTo=A TransferFromToDone=È stato registrato un trasferimento da %s a %s di %s %s. -CheckTransmitter=Emittente -ValidateCheckReceipt=Convalidare questo deposito di assegno? +CheckTransmitter=Ordinante +ValidateCheckReceipt=Convalidare la ricevuta dell'assegno? ConfirmValidateCheckReceipt=Vuoi davvero convalidare questa ricevuta?
Non sarà possibile fare cambiamenti una volta convalidata. DeleteCheckReceipt=Eliminare questa ricevuta? ConfirmDeleteCheckReceipt=Vuoi davvero eliminare questa ricevuta? diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang index 197311e45c0..4c3e86002d4 100644 --- a/htdocs/langs/it_IT/bills.lang +++ b/htdocs/langs/it_IT/bills.lang @@ -15,25 +15,25 @@ DisabledBecauseNotErasable=Disabilitate perché non cancellabili InvoiceStandard=Fattura Standard InvoiceStandardAsk=Fattura Standard InvoiceStandardDesc=Questo tipo di fattura è la fattura più comune. -InvoiceDeposit=Deposito fattura -InvoiceDepositAsk=Deposito fattura -InvoiceDepositDesc=Fattura emessa quando è stato ricevuto un deposito. +InvoiceDeposit=Fattura d'acconto +InvoiceDepositAsk=Fattura d'acconto +InvoiceDepositDesc=Fattura emessa quando è stato ricevuto un acconto. InvoiceProForma=Fattura proforma InvoiceProFormaAsk=Fattura proforma InvoiceProFormaDesc=La fattura proforma è uguale ad una fattura vera, ma non ha valore contabile. InvoiceReplacement=Fattura sostitutiva -InvoiceReplacementAsk=Sostituzione fattura per fattura -InvoiceReplacementDesc=La sostituzione fattura è utilizzata per annullare e sostituire completamente una fattura non ancora pagata.

Nota: Solo le fatture non pagate possono essere sostituite. Se la fattura che vuoi sostituire non è già stata chiusa, questa verrà automaticamente chiusa come "abbandonata". -InvoiceAvoir=Nota di credito a correzione +InvoiceReplacementAsk=Fattura sostitutiva +InvoiceReplacementDesc=La fattura sostitutiva è utilizzata per annullare e sostituire completamente una fattura non ancora pagata.

Nota: Solo le fatture non pagate possono essere sostituite. Se la fattura che vuoi sostituire non è ancora stata chiusa, questa verrà automaticamente chiusa come "abbandonata". +InvoiceAvoir=Nota di credito InvoiceAvoirAsk=Nota di credito per correggere fattura -InvoiceAvoirDesc=La nota di credito a correzione è una fattura con importo negativo utilizzata per risolvere il problema di una fattura emessa con importo diverso da quello realmente pagato (perché il cliente ha pagato troppo per errore, o non ha pagato completamente perché ad esempio ha restituito alcuni prodotti).

Nota: la fattura originale deve essere già chiusa ( "pagata" o "parzialmente pagata") per consentire la creazione di una nota di credito a correzione. +InvoiceAvoirDesc=La nota di credito è una fattura con importo negativo utilizzata per risolvere il problema di una fattura emessa con importo diverso da quello realmente pagato (perché il cliente ha pagato troppo per errore o non ha pagato completamente perché ad esempio ha restituito alcuni prodotti). invoiceAvoirWithLines=Crea una Nota Credito con le righe della fattura di origine. invoiceAvoirWithPaymentRestAmount=Crea nota di credito con il restante da pagare della fattura originale invoiceAvoirLineWithPaymentRestAmount=Crea nota di credito con il restante da pagare ReplaceInvoice=Sostituire fattura %s -ReplacementInvoice=Sostituzione fattura +ReplacementInvoice=Fattura sostitutiva ReplacedByInvoice=Sostituita dalla fattura %s -ReplacementByInvoice=Sostituzione della fattura +ReplacementByInvoice=Sostituita dalla fattura CorrectInvoice=Corretta fattura %s CorrectionInvoice=Correzione fattura UsedByInvoice=Usato per pagare fattura %s @@ -94,7 +94,7 @@ SearchACustomerInvoice=Cerca una fattura attiva SearchASupplierInvoice=Cerca una fattura fornitore CancelBill=Annulla una fattura SendRemindByMail=Promemoria tramite email -DoPayment=Emetti pagamento +DoPayment=Registra pagamento DoPaymentBack=Emetti rimborso ConvertToReduc=Converti in futuro sconto EnterPaymentReceivedFromCustomer=Inserisci il pagamento ricevuto dal cliente @@ -148,7 +148,7 @@ SuppliersDraftInvoices=Bozze di fattura fornitore Unpaid=Non pagato ConfirmDeleteBill=Vuoi davvero cancellare questa fattura? ConfirmValidateBill=Vuoi davvero convalidare questa fattura con riferimento %s ? -ConfirmUnvalidateBill=Vuoi davvero portare la fattura %s allo stato di progetto? +ConfirmUnvalidateBill=Sei sicuro di voler convertire la fattura %s in bozza? ConfirmClassifyPaidBill=Vuoi davvero cambiare lo stato della fattura %s in "pagata"? ConfirmCancelBill=Vuoi davvero annullare la fattura %s? ConfirmCancelBillQuestion=Perché si desidera classificare questa fattura come "abbandonata" ? @@ -167,7 +167,7 @@ ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un cattivo cliente è u ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Questa scelta viene utilizzata quando il pagamento non è completo perché alcuni dei prodotti sono stati restituiti ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilizzare questa scelta se tutte le altre opzioni sono inadeguate, per esempio:
- il pagamento non è completo, in quanto alcuni prodotti sono stati restituiti.
- l'importo richiesto è troppo oneroso per essere trasformato in uno sconto.
Per correttezza contabile dovrà essere emessa una nota di credito. ConfirmClassifyAbandonReasonOther=Altro -ConfirmClassifyAbandonReasonOtherDesc=Questa scelta sarà utilizzata in tutti gli altri casi. Perché, ad esempio, si prevede di creare una fattura in sostituzione. +ConfirmClassifyAbandonReasonOtherDesc=Questa scelta sarà utilizzata in tutti gli altri casi. Perché, ad esempio, si prevede di creare una fattura sostitutiva. ConfirmCustomerPayment=Confermare riscossione per %s %s? ConfirmSupplierPayment=Confermare riscossione per %s %s? ConfirmValidatePayment=Vuoi davvero convalidare questo pagamento? Una volta convalidato non si potranno più operare modifiche. @@ -182,7 +182,7 @@ ShowBill=Visualizza fattura ShowInvoice=Visualizza fattura ShowInvoiceReplace=Visualizza la fattura sostitutiva ShowInvoiceAvoir=Visualizza nota di credito -ShowInvoiceDeposit=Visualizza deposito fattura +ShowInvoiceDeposit=Visualizza fattura d'acconto ShowPayment=Visualizza pagamento File=File AlreadyPaid=Già pagato @@ -252,10 +252,10 @@ RelativeDiscount=Sconto relativo GlobalDiscount=Sconto assoluto CreditNote=Nota di credito CreditNotes=Note di credito -Deposit=Deposito +Deposit=Acconto Deposits=Depositi DiscountFromCreditNote=Sconto da nota di credito per %s -DiscountFromDeposit=Pagamenti dal deposito della fattura %s +DiscountFromDeposit=Pagamenti dalla fattura d'acconto %s AbsoluteDiscountUse=Questo tipo di credito può essere utilizzato su fattura prima della sua convalida CreditNoteDepositUse=La fattura deve essere convalidata per l'utilizzo di questo credito NewGlobalDiscount=Nuovo sconto globale @@ -346,8 +346,8 @@ ExtraInfos=Extra info RegulatedOn=Regolamentato su ChequeNumber=Assegno N° ChequeOrTransferNumber=Assegno/Bonifico N° -ChequeMaker=Emittente assegno -ChequeBank=Banca dell'assegno +ChequeMaker=Traente dell'assegno +ChequeBank=Banca emittente NetToBePaid=Netto a pagare PhoneNumber=Tel FullPhoneNumber=Telefono @@ -371,7 +371,7 @@ UseCreditNoteInInvoicePayment=Riduci l'ammontare del pagamento con la nota di cr MenuChequeDeposits=Depositi assegni MenuCheques=Assegni MenuChequesReceipts=Ricezione assegni -NewChequeDeposit=Nuovo deposito +NewChequeDeposit=Nuovo acconto ChequesReceipts=Ricevute assegni ChequesArea=Area assegni ChequeDeposits=Depositi assegni diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang index c0b713303fa..d32a581c27b 100644 --- a/htdocs/langs/it_IT/compta.lang +++ b/htdocs/langs/it_IT/compta.lang @@ -109,7 +109,7 @@ SuppliersProductsSellSalesTurnover=Fatturato generato dalle vendite di prodotti CheckReceipt=Ricevuta di versamento assegno CheckReceiptShort=Ricevuta assegno LastCheckReceiptShort=Last %s check receipts -NewCheckReceipt=Nuovo assegno +NewCheckReceipt=Nuovo sconto NewCheckDeposit=Nuovo deposito NewCheckDepositOn=Nuovo deposito sul conto: %s NoWaitingChecks=Nessun assegno in attesa di deposito. @@ -141,8 +141,8 @@ RulesResultDue=- Gli importi indicati sono tutti tasse incluse
- Comprendono RulesResultInOut=- Include i pagamenti reali di fatture, spese e IVA.
- Si basa sulle date di pagamento di fatture, spese e IVA. RulesCADue=- Comprende le fatture del cliente, che siano state pagate o meno.
- Si basa sulla data di tali fatture.
RulesCAIn=- Comprende le fatture effettivamente pagate dai clienti.
- Si basa sulla data dei pagamenti.
-DepositsAreNotIncluded=- Ricevute di deposito non incluse -DepositsAreIncluded=- Ricevute di deposito incluse +DepositsAreNotIncluded=- Le fatture d'acconto non sono incluse +DepositsAreIncluded=- Le fatture d'acconto sono incluse LT2ReportByCustomersInInputOutputModeES=IRPF soggetti terzi(Spagna) LT1ReportByCustomersInInputOutputModeES=Report by third party RE VATReportByCustomersInInputOutputMode=Report per IVA cliente riscossa e pagata @@ -177,7 +177,7 @@ InvoiceRef=Rif. fattura CodeNotDef=Non definito AddRemind=Invia importo disponibile RemainToDivide= Ancora da inviare: -WarningDepositsNotIncluded=Le ricevute di deposito non sono incluse in questa versione del modulo contabilità. +WarningDepositsNotIncluded=Le fatture d'acconto non sono incluse in questa versione del modulo contabilità. DatePaymentTermCantBeLowerThanObjectDate=La data termine di pagamento non può essere anteriore alla data dell'oggetto Pcg_version=Versione pcg Pcg_type=Tipo pcg @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=in accordo con il fornitore, scegliere il metodo app TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Metodo di calcolo AccountancyJournal=Codice del giornale di contabilità -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang index 31a3df9e376..30637765163 100644 --- a/htdocs/langs/it_IT/contracts.lang +++ b/htdocs/langs/it_IT/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Elenco delle righe di contratto in esecuzione ListOfRunningServices=Elenco dei servizi in esecuzione NotActivatedServices=Servizi non attivati (con contratti convalidati) BoardNotActivatedServices=Servizi da attivare con contratti convalidati -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Ultimi %s servizi attivati LastModifiedServices=Ultimi %s servizi modificati EditServiceLine=Modifica riga del servizio @@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista dei servizi in scadenza NoteListOfYourExpiredServices=Questa lista contiene i servizi relativi a contratti di terze parti per le quali siete collegati come rappresentanti commerciali. StandardContractsTemplate=Template standard per i contratti ContactNameAndSignature=Per %s, Nome e firma: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Contatto interno per la firma del contratto diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang index 63153883a4c..96edeef52f2 100644 --- a/htdocs/langs/it_IT/errors.lang +++ b/htdocs/langs/it_IT/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Il codice fornitore è obbligatorio ErrorSupplierCodeAlreadyUsed=Codice fornitore già utilizzato ErrorBadParameters=Parametri errati ErrorBadValueForParameter=Valore '%s' errato per il parametro '%s' -ErrorBadImageFormat=Formato del file immagine non supportato +ErrorBadImageFormat=Tipo file immagine non supportato (la tua installazione di PHP non supporta le funzioni per convertire le immagini di questo formato) ErrorBadDateFormat=Il valore '%s' ha un formato della data sbagliato ErrorWrongDate=La data non è corretta! ErrorFailedToWriteInDir=Impossibile scrivere nella directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Utente con accesso %s inesistente ErrorLoginHasNoEmail=Questo utente non ha alcun indirizzo email. Processo interrotto. ErrorBadValueForCode=Valore del codice errato. Riprova con un nuovo valore... ErrorBothFieldCantBeNegative=I campi %s e %s non possono essere entrambi negativi +ErrorQtyForCustomerInvoiceCantBeNegative=La quantità di ciascuna riga della fattura cliente non può essere negativa ErrorWebServerUserHasNotPermission=L'account utente %s utilizzato per eseguire il server web non ha i permessi necessari ErrorNoActivatedBarcode=Nessun tipo di codice a barre attivato ErrUnzipFails=Estrazione dell'archivio %s con ZipArchive fallita @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Errore, questo membro non è s ErrorThereIsSomeDeliveries=Errore, ci sono alcune consegne collegate a questa spedizione. Cancellazione rifiutata. ErrorCantDeletePaymentReconciliated=Impossibile cancellare un pagamento che ha generato una transazione bancaria che è stata conciliata ErrorCantDeletePaymentSharedWithPayedInvoice=Impossibile cancellare un pagamento condiviso con almeno una fattura con lo stato Pagato +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti @@ -155,5 +174,5 @@ WarningUsingThisBoxSlowDown=Attenzione: l'uso di questo box rallenterà pesantem WarningClickToDialUserSetupNotComplete=Le impostazioni di informazione del ClickToDial per il tuo utente non sono complete (vedi la scheda ClickToDial sulla tua scheda utente) WarningNotRelevant=Operazione irrilevante per questo dataset WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funzione disabilitata quando le impostazioni di visualizzazione sono ottimizzate per persone non vedenti o browser testuali. -WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. -WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters +WarningPaymentDateLowerThanInvoiceDate=La scadenza del pagamento (%s) risulta antecedente alla data di fatturazione (%s) per la fattura %s +WarningTooManyDataPleaseUseMoreFilters=Troppi risultati. Per favore applica filtri più restrittivi diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang index 6246fadfae7..ede6d91614d 100644 --- a/htdocs/langs/it_IT/exports.lang +++ b/htdocs/langs/it_IT/exports.lang @@ -22,7 +22,7 @@ ImportableFields=Campi importabili ImportedFields=Campi importati DatasetToExport=Dati da esportare DatasetToImport=Dataset da importare -NoDiscardedFields=N. campi in file di origine vengono scartate +NoDiscardedFields=Nessun campo del file sorgente sarà scartato Dataset=Dataset ChooseFieldsOrdersAndTitle=Scegli l'ordine dei campi FieldsOrder=Ordine campi @@ -66,7 +66,7 @@ SourceFileFormat=Fonte formato di file FieldsInSourceFile=Campi nel file sorgente FieldsInTargetDatabase=Campi di destinazione nel database di Dolibarr (grassetto=obbligatorio) Field=Campo -NoFields=N. campi +NoFields=Nessun campo MoveField=Spostare campo %s numero di colonna ExampleOfImportFile=Example_of_import_file SaveImportProfile=Salva questo profilo di importazione @@ -125,7 +125,7 @@ BankAccountNumber=Num. conto BankAccountNumberKey=Chiave SpecialCode=Codice speciale ExportStringFilter=%% permette di sostituire uno o più caratteri nel testo -ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days +ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtra per un anno/mese/giorno
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtra con un intervallo di anni/mesi/giorni
> YYYY, > YYYYMM, > YYYYMMDD : filtra sui seguenti anni/mesi/giorni
< YYYY, < YYYYMM, < YYYYMMDD : filtra su tutti i precedenti anni/mesi/giorni ExportNumericFilter='NNNNN' filtra per un solo valore
'NNNNN+NNNNN' filtra su un range di valori
'>NNNNN' filtra per valori inferiori
'>NNNNN' filtra per valori superiori ## filters SelectFilterFields=Se vuoi filtrare su qualche valore, inserisci qui il valore. diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang index 1dd3ff637b5..638f17657e1 100644 --- a/htdocs/langs/it_IT/members.lang +++ b/htdocs/langs/it_IT/members.lang @@ -79,13 +79,13 @@ NewSubscription=Nuova adesione NewSubscriptionDesc=Questo modulo consente di registrare l'adesione di un nuovo membro alla fondazione. Per rinnovare l'adesione (se già iscritto), si prega di contattare la fondazione per email. Subscription=Adesione Subscriptions=Adesioni -SubscriptionLate=Tardi +SubscriptionLate=Ritardi SubscriptionNotReceived=Sottoscrizione mai ricevuta -SubscriptionLateShort=Tardi +SubscriptionLateShort=Ritardi SubscriptionNotReceivedShort=Mai ricevuto ListOfSubscriptions=Elenco adesioni SendCardByMail=Invia scheda per email -AddMember=Aggiungi membro +AddMember=Crea membro NoTypeDefinedGoToSetup=Nessun tipo di membro definito. Vai su impostazioni - Tipi di membro NewMemberType=Nuovo tipo di membro WelcomeEMail=Email di benvenuto @@ -125,7 +125,7 @@ Date=Data DateAndTime=Data e ora PublicMemberCard=Scheda membro pubblico MemberNotOrNoMoreExpectedToSubscribe=Membri non iscritti o non più attesi per iscrizione -AddSubscription=Aggiungi adesione +AddSubscription=Crea sottoscrizione ShowSubscription=Visualizza adesione MemberModifiedInDolibarr=Membri modificati su Dolibarr SendAnEMailToMember=Invia email ai membri @@ -203,3 +203,4 @@ MembersByNature=Membri per natura VATToUseForSubscriptions=Aliquota IVA in uso per le sottoscrizioni NoVatOnSubscription=Nessuna IVA per gli abbonamenti MEMBER_PAYONLINE_SENDEMAIL=Email di avviso quando Dolibarr riceve la conferma della validazione di un pagamento per adesione +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang index 0e4bfada2ce..de1e4921269 100644 --- a/htdocs/langs/it_IT/orders.lang +++ b/htdocs/langs/it_IT/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Esiste una spedizione DraftOrWaitingApproved=In bozza o approvato, ma non ancora ordinato DraftOrWaitingShipped=In bozza o convalidato, ma non ancora spedito MenuOrdersToBill=Ordini spediti -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Ordini fatturabili SearchOrder=Ricerca ordine SearchACustomerOrder=Cerca un ordine cliente ShipProduct=Spedisci prodotto diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang index 35c32720c0b..82fb5481e67 100644 --- a/htdocs/langs/it_IT/products.lang +++ b/htdocs/langs/it_IT/products.lang @@ -15,8 +15,8 @@ ProductCode=Codice prodotto ServiceCode=Codice servizio ProductVatMassChange=Modifica di massa dell'IVA ProductVatMassChangeDesc=Questa pagina è utile a modificare le tariffe delle tasse definite nei prodotti o servizi da un valore ad un altro. Attenzione: questa modifica influenza l'intero database -MassBarcodeInit=Inizializzazione di massa del barcode -MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un barcode di un oggetto che non ha ancora un barcode definito. Controlla prima che il setup del modulo barcode sia completo. +MassBarcodeInit=Inizializzazione di massa dei codici a barre +MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un codice a barre di un oggetto che non ha ancora un codice a barre definito. Controlla prima che il setup del modulo Codici a barre sia completo. ProductAccountancyBuyCode=Codice contabilità (acquisto) ProductAccountancySellCode=Codice contabilità (vendita) ProductOrService=Prodotto o servizio @@ -80,12 +80,12 @@ ContractStatusClosed=Chiuso ContractStatusRunning=In corso ContractStatusExpired=Scaduto ContractStatusOnHold=In attesa -ContractStatusToRun=To get running +ContractStatusToRun=Da avviare ContractNotRunning=Il presente contratto non è attivo ErrorProductAlreadyExists=Un prodotto con riferimento %s esiste già. ErrorProductBadRefOrLabel=Il valore di riferimento o l'etichetta è sbagliato. ErrorProductClone=Si è verificato un problema cercando di cuplicare il prodotto o servizio -ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +ErrorPriceCantBeLowerThanMinPrice=Errore. Il prezzo non può essere inferiore del Prezzo minimo Suppliers=Fornitori SupplierRef=Rif. fornitore ShowProduct=Visualizza prodotto @@ -118,11 +118,11 @@ MultiPricesAbility=Livello diverso di prezzi per prodotto/servizio MultiPricesNumPrices=Numero di prezzi per il multi-prezzi MultiPriceLevelsName=Categorie di prezzo AssociatedProductsAbility=Attiva i prodotti associati -AssociatedProducts=Prodotti associati -AssociatedProductsNumber=Numero di prodotti associati -ParentProductsNumber=Numero del prodotto padre -IfZeroItIsNotAVirtualProduct=Se 0, questo non è un prodotto virtuale -IfZeroItIsNotUsedByVirtualProduct=Se 0, questo prodotto non è usata da alcun prodotto virtuale +AssociatedProducts=Prodotto associato +AssociatedProductsNumber=Numero di sottoprodotti che compongono questo prodotto associato +ParentProductsNumber=Numero di prodotti associati che includono questo sottoprodotto +IfZeroItIsNotAVirtualProduct=Se vale 0, questo non è un prodotto associato +IfZeroItIsNotUsedByVirtualProduct=Se vale 0, questo prodotto non è utilizzato da nessun prodotto associato come sottoprodotto EditAssociate=Modifica associazione Translation=Traduzione KeywordFilter=Filtro per parola chiave @@ -132,7 +132,7 @@ AddDel=Aggiungi/Elimina Quantity=Quantità NoMatchFound=Nessun risultato trovato ProductAssociationList=Elenco dei prodotti/servizi associati: nome del prodotto/servizio (quantità interessata) -ProductParentList=Elenco dei prodotti/servizi comprendenti questo prodotto +ProductParentList=Elenco dei prodotti/servizi associati che includono questo sottoprodotto ErrorAssociationIsFatherOfThis=Uno dei prodotti selezionati è padre dell'attuale prodotto DeleteProduct=Elimina un prodotto/servizio ConfirmDeleteProduct=Vuoi davvero eliminare questo prodotto/servizio? @@ -179,7 +179,7 @@ CloneProduct=Clona prodotto/servizio ConfirmCloneProduct=Vuoi davvero clonare il prodotto/servizio %s? CloneContentProduct=Clona tutte le principali informazioni del prodotto/servizio ClonePricesProduct=Clona principali informazioni e prezzi -CloneCompositionProduct=Clona prodotto/servizio virtuale +CloneCompositionProduct=Clona prodotto/servizio associato ProductIsUsed=Questo prodotto è in uso NewRefForClone=Rif. del nuovo prodotto/servizio CustomerPrices=Prezzi al cliente @@ -221,24 +221,29 @@ Quarter1=Primo trimestre Quarter2=Secondo trimestre Quarter3=Terzo trimestre Quarter4=Quarto trimestre -BarCodePrintsheet=Stampa barcode -PageToGenerateBarCodeSheets=Con questo strumento, puoi stampare fogli adesivi di barcode. Scegli il formato del foglio adesivo, tipo di barcode e valore del barcode, poi clicca sul bottone %s. +BarCodePrintsheet=Stampa codice a barre +PageToGenerateBarCodeSheets=Con questo strumento, puoi stampare fogli adesivi di codici a barre. Scegli il formato del foglio adesivo, il tipo di codice a barre e il valore del codice a barre, poi clicca sul bottone %s. NumberOfStickers=Numero di etichette da stampare sulla pagina -PrintsheetForOneBarCode=Stampa più etichette per singolo barcode +PrintsheetForOneBarCode=Stampa più etichette per singolo codice a barre BuildPageToPrint=Genera pagina da stampare -FillBarCodeTypeAndValueManually=Riempi il tipo di barcode e il valore manualmente -FillBarCodeTypeAndValueFromProduct=Riempi il tipo di barcode e valore dal barcode del prodotto -FillBarCodeTypeAndValueFromThirdParty=Riempi il tipo di barcode e il valore da un barcode di terze parti -DefinitionOfBarCodeForProductNotComplete=La definizione del tipo o del valore del barcode non è completa per il prodotto %s. -DefinitionOfBarCodeForThirdpartyNotComplete=La definizione del tipo o valore del barcode non è completa per la terzaparte %s. -BarCodeDataForProduct=Informazioni barcode del brodotto %s : -BarCodeDataForThirdparty=Informazioni barcode di terzeparti %s : -ResetBarcodeForAllRecords=Definisci il valore del barcode per tutti quelli inseriti (questo resetta anche i valori già definiti dei barcode con nuovi valori) +FillBarCodeTypeAndValueManually=Riempi il tipo di codice a barre e il valore manualmente +FillBarCodeTypeAndValueFromProduct=Riempi il tipo di codice a barre e valore dal codice a barre del prodotto +FillBarCodeTypeAndValueFromThirdParty=Riempi il tipo di codice a barre e il valore da un codice a barre di terze parti +DefinitionOfBarCodeForProductNotComplete=La definizione del tipo o del valore del codice a barre non è completa per il prodotto %s. +DefinitionOfBarCodeForThirdpartyNotComplete=La definizione del tipo o valore del codice a barre non è completa per la terzaparte %s. +BarCodeDataForProduct=Informazioni codice a barre del prodotto %s : +BarCodeDataForThirdparty=Informazioni codice a barre della terza parte %s : +ResetBarcodeForAllRecords=Definisci il valore del codice a barre per tutti quelli inseriti (questo resetta anche i valori già definiti dei codice a barre con nuovi valori) PriceByCustomer=Prezzo per cliente PriceCatalogue=Prezzo unico per prodotto/servizio PricingRule=Regole prezzi AddCustomerPrice=Aggiungi un prezzo per cliente ForceUpdateChildPriceSoc=Imposta lo stesso prezzo per i clienti sussidiari PriceByCustomerLog=Prezzo per log cliente -MinimumPriceLimit=Minimum price can't be lower that %s -MinimumRecommendedPrice=Minimum recommended price is : %s +MinimumPriceLimit=Il prezzo minimo non può essere inferiore di %s +MinimumRecommendedPrice=Il prezzo minimo raccomandato è: %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang index 22dff95f489..62d699144c6 100644 --- a/htdocs/langs/it_IT/projects.lang +++ b/htdocs/langs/it_IT/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i priv Myprojects=I miei progetti ProjectsArea=Area progetti NewProject=Nuovo progetto -AddProject=Aggiungi progetto +AddProject=Crea progetto DeleteAProject=Elimina un progetto DeleteATask=Cancella un compito ConfirmDeleteAProject=Vuoi davvero eliminare il progetto? @@ -36,6 +36,8 @@ TaskTimeSpent=Tempo speso sulle attività TaskTimeUser=Utente TaskTimeNote=Nota TaskTimeDate=Data +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Aggiungi tempo lavorato MyTimeSpent=Il mio tempo lavorato MyTasks=I miei compiti @@ -45,7 +47,7 @@ TaskDateStart=Data inizio attività TaskDateEnd=Data fine attività TaskDescription=Descrizione attività NewTask=Nuovo compito -AddTask=Aggiungere compito +AddTask=Crea attività AddDuration=Aggiungi periodo Activity=Operatività Activities=Compiti/operatività @@ -85,13 +87,13 @@ ActionsOnProject=Azioni sul progetto YouAreNotContactOfProject=Non sei tra i contatti di questo progetto privato DeleteATimeSpent=Cancella il tempo lavorato ConfirmDeleteATimeSpent=Vuoi davvero cancellare il tempo lavorato? -DoNotShowMyTasksOnly=See also tasks not assigned to me -ShowMyTasksOnly=View only tasks assigned to me +DoNotShowMyTasksOnly=Mostra anche le attività non assegnate a me +ShowMyTasksOnly=Mostra soltanto le attività assegnate a me TaskRessourceLinks=Risorse ProjectsDedicatedToThisThirdParty=Progetti dedicati a questo soggetto terzo NoTasks=Nessun compito per questo progetto LinkedToAnotherCompany=Collegato ad un altro soggetto terzo -TaskIsNotAffectedToYou=Task not assigned to you +TaskIsNotAffectedToYou=Attività non assegnate a te ErrorTimeSpentIsEmpty=Il campo tempo lavorato è vuoto ThisWillAlsoRemoveTasks=Questa azione eliminerà anche tutti i compiti del progetto (al momento ci sono %s compiti) e tutto il tempo lavorato già inserito. IfNeedToUseOhterObjectKeepEmpty=Se qualche elemento (fattura, ordine, ...), appartenente ad un altro soggetto terzo deve essere collegato al progetto da creare, non compilare il campo per assegnare il progetto a più di un soggetto terzo. @@ -120,7 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributore TypeContact_project_task_external_TASKCONTRIBUTOR=Contributore SelectElement=Seleziona elemento AddElement=Link all'elemento -UnlinkElement=Unlink element +UnlinkElement=Rimuovi collegamento # Documents models DocumentModelBaleine=Modello per il report di un progetto completo (logo, etc..) PlannedWorkload = Carico di lavoro previsto @@ -129,4 +131,4 @@ ProjectReferers=Elementi correlati SearchAProject=Cerca un progetto ProjectMustBeValidatedFirst=I progetti devono prima essere validati ProjectDraft=Progetti bozza -FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +FirstAddRessourceToAllocateTime=Associa una risorsa per allocare il tempo diff --git a/htdocs/langs/it_IT/resource.lang b/htdocs/langs/it_IT/resource.lang index d64075dfbf5..ec76b191873 100644 --- a/htdocs/langs/it_IT/resource.lang +++ b/htdocs/langs/it_IT/resource.lang @@ -1,36 +1,34 @@ -MenuResourceIndex=Resources -MenuResourceAdd=New resource +MenuResourceIndex=Risorse +MenuResourceAdd=Nuova risorsa MenuResourcePlanning=Resource planning -DeleteResource=Delete resource +DeleteResource=Elimina risorsa ConfirmDeleteResourceElement=Confirm delete the resource for this element -NoResourceInDatabase=No resource in database. -NoResourceLinked=No resource linked +NoResourceInDatabase=Nessuna risorsa nel database +NoResourceLinked=Nessuna risorsa collegata -ResourcePageIndex=Resources list -ResourceSingular=Resource +ResourcePageIndex=Elenco delle risorse +ResourceSingular=Risorsa ResourceCard=Resource card -AddResource=Create a resource -ResourceFormLabel_ref=Resource name -ResourceType=Resource type -ResourceFormLabel_description=Resource description +AddResource=Crea una risorsa +ResourceFormLabel_ref=Nome della risorsa +ResourceType=Tipo di risorsa +ResourceFormLabel_description=Descrizione della risorsa -ResourcesLinkedToElement=Resources linked to element +ResourcesLinkedToElement=Risorse collegate all'elemento ShowResourcePlanning=Show resource planning GotoDate=Go to date -ResourceElementPage=Element resources +ResourceElementPage=Risorse dell'elemento ResourceCreatedWithSuccess=Resource successfully created RessourceLineSuccessfullyDeleted=Resource line successfully deleted RessourceLineSuccessfullyUpdated=Resource line successfully updated ResourceLinkedWithSuccess=Resource linked with success TitleResourceCard=Resource card -ConfirmDeleteResource=Confirm to delete this resource -RessourceSuccessfullyDeleted=Resource successfully deleted -DictionaryResourceType=Type of resources +ConfirmDeleteResource=Conferma l'eliminazione di questa risorsa +RessourceSuccessfullyDeleted=Risorsa eliminata con successo +DictionaryResourceType=Tipo di risorse -DictionaryEMailTemplates=Modèles d'Emails - -SelectResource=Select resource +SelectResource=Seleziona risorse diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang index 9158af3aed8..ae26dee0a4c 100644 --- a/htdocs/langs/it_IT/withdrawals.lang +++ b/htdocs/langs/it_IT/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Data di accredito WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Mostra domiciliazione IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuttavia, se per la fattura ci sono ancora pagamenti da elaborare, non sarà impostata come pagata per consentire prima la gestione dei domiciliazioni. -DoStandingOrdersBeforePayments=Questa scheda consente di richiedere un ordine permanente. Una volta finito, è possibile inserire il pagamento per chiudere la fattura. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Ricevuta bancaria SetToStatusSent=Imposta stato come "file inviato" ThisWillAlsoAddPaymentOnInvoice=Verranno anche creati dei pagamenti tra le ricevuti e saranno classificati come pagati +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Il pagamento dell'ordine permanente %s da parte della banca diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index 8244aa168a4..06e48cdad56 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= 活動に現在thirdparties表示/非表示切り替えフィルタオプションを追加したり、それを停止している UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=検索フィルタのオプション NumberOfKeyToSearch=検索を開始する文字のNBR：%s ViewFullDateActions=3つ目のシートの完全な日付のイベントを表示 @@ -208,6 +210,7 @@ ModulesJobDesc=ビジネス·モジュールは、特定のビジネスのため ModulesMarketPlaceDesc=あなたは、インターネット上の外部のWebサイトでダウンロードする複数のモジュールを見つけることができます... ModulesMarketPlaces=複数のモジュール... DoliStoreDesc=DoliStore、Dolibarr ERP / CRM外部モジュールのための公式の市場の場所 +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Webサイトのプロバイダは、あなたが複数のモジュールを見つけるために検索することができます... URL=リンク BoxesAvailable=利用可能なボックス @@ -444,7 +447,7 @@ Module55Desc=バーコードの管理 Module56Name=テレフォニー Module56Desc=テレフォニー統合 Module57Name=立っている受注 -Module57Desc=立っている注文と出金の管理 +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDialシステムの統合（アスタリスク、...） Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSSフィード Module320Desc=Dolibarr画面のページ内でRSSフィードを追加 Module330Name=ブックマーク Module330Desc=ブックマークの管理 -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=のwebcalendar Module410Desc=のwebcalendar統合 Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=カテゴリー Module1780Desc=Categorieの管理（製品、サプライヤー、顧客） Module2000Name=WYSIWYGエディタ Module2000Desc=高度なエディタを使用して、いくつかのテキストエリアを編集することができます +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=議題 @@ -503,6 +508,8 @@ Module2500Name=電子コンテンツ管理 Module2500Desc=ドキュメントを保存および共有 Module2600Name=Webサービス Module2600Desc=Dolibarr Webサービスのサーバをイネーブルにします。 +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=グラバター Module2700Desc=ユーザー/メンバーの写真を（それらのメールに見られる）を表示するオンライングラバターサービス（www.gravatar.com）を使用します。インターネットへのアクセスを必要とする Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=切符売り場 Module50000Desc=切符売り場でクレジットカードによるオンライン決済のページを提供するモジュール Module50100Name=売上高のポイント @@ -527,7 +534,7 @@ Module50200Desc=Paypalとクレジットカードによるオンライン決済 Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=セットアップは、保存された BackToModuleList=モジュールリストに戻る BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム DefaultLanguage=使用する既定の言語（言語コード） EnableMultilangInterface=多言語のインターフェイスをイネーブルにします。 EnableShowLogo=左メニューのロゴを表示する +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=お使いのシステムは正常に更新されました CompanyInfo=会社概要/基礎情報 CompanyIds=会社概要/基礎アイデンティティ diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang index 8492595eac6..d2ed716615c 100644 --- a/htdocs/langs/ja_JP/agenda.lang +++ b/htdocs/langs/ja_JP/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=イベントへの影響を受けた ActionsDoneBy=によって行われたイベント ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= すべての私のイベント/タスク AllActions= すべてのイベント/タスク ViewList=リストビュー diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang index 4b385d678cd..7e09ff1ecfa 100644 --- a/htdocs/langs/ja_JP/compta.lang +++ b/htdocs/langs/ja_JP/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang index b4e2e7ca76d..3f44104d7fb 100644 --- a/htdocs/langs/ja_JP/contracts.lang +++ b/htdocs/langs/ja_JP/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=実行中の契約品目のリスト ListOfRunningServices=実行中のサービスのリスト NotActivatedServices=非アクティブなサービス（検証済みの契約の中で） BoardNotActivatedServices=検証済みの契約の中でアクティブにするサービス -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=最後%s活性化サービス LastModifiedServices=最後%sは、サービスを変更 EditServiceLine=編集サービスライン @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=営業担当者の署名の契約 diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang index fa925a3f694..9742a4ad7c7 100644 --- a/htdocs/langs/ja_JP/errors.lang +++ b/htdocs/langs/ja_JP/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=サプライヤーコードが必要です ErrorSupplierCodeAlreadyUsed=サプライヤーコードが既に使用され ErrorBadParameters=パラメータが不正で ErrorBadValueForParameter=パラメータが正しくない "%s"のために間違った値 "%s" -ErrorBadImageFormat=イメージファイルはサポートされている形式を持っていないと +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=値 '%s'に間違った日付の形式になっています ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=ディレクトリ%sの書き込みに失敗しました @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=ログイン%sを持つユーザーを見つけ ErrorLoginHasNoEmail=このユーザーは電子メールアドレスを持っていません。プロセスが中止されました。 ErrorBadValueForCode=セキュリティコードの値が正しくありません。新しい値で再試行してください... ErrorBothFieldCantBeNegative=フィールド%s %sとは負の両方にすることはできません +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザーアカウントを使用%sそのための権限を持っていない ErrorNoActivatedBarcode=活性化バーコード·タイプません ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang index 37609615f03..7455ea4d526 100644 --- a/htdocs/langs/ja_JP/members.lang +++ b/htdocs/langs/ja_JP/members.lang @@ -8,7 +8,7 @@ Members=メンバー MemberAccount=メンバーログイン ShowMember=メンバーカードを提示 UserNotLinkedToMember=ユーザーがメンバーにリンクされていません -# ThirdpartyNotLinkedToMember=Third-party not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=メンバーチケット FundationMembers=Foundationのメンバー Attributs=属性 @@ -85,8 +85,7 @@ SubscriptionLateShort=遅い SubscriptionNotReceivedShort=受信しませんでした ListOfSubscriptions=サブスクリプションのリスト SendCardByMail=メールでカードを送る -AddMember=メンバーを追加する -MemberType=メンバー型 +AddMember=Create member NoTypeDefinedGoToSetup=いいえメンバーのタイプが定義されていません。セットアップに行く - メンバーの種類 NewMemberType=新しいメンバの型 WelcomeEMail=電子メール歓迎 @@ -126,12 +125,12 @@ Date=日付 DateAndTime=日時 PublicMemberCard=メンバーパブリックカード MemberNotOrNoMoreExpectedToSubscribe=メンバーは、より多くのサブスクライブしないと予想されていないかない -AddSubscription=サブスクリプションを追加します。 +AddSubscription=Create subscription ShowSubscription=サブスクリプションを表示する MemberModifiedInDolibarr=メンバーはDolibarrで変更 SendAnEMailToMember=メンバーへの情報メールを送る -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=メンバーautosubscriptionための電子メールの件名 DescADHERENT_AUTOREGISTER_MAIL=メンバーautosubscriptionの電子メール DescADHERENT_MAIL_VALID_SUBJECT=メンバーの検証のための電子メールの件名 @@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=メンバーresiliationための電子メール DescADHERENT_MAIL_RESIL=メンバーresiliationの電子メール DescADHERENT_MAIL_FROM=自動電子メールの送信者の電子メール DescADHERENT_ETIQUETTE_TYPE=ラベルページのフォーマット -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets DescADHERENT_CARD_TYPE=カードのページのフォーマット DescADHERENT_CARD_HEADER_TEXT=メンバーカードの上に印刷されたテキスト DescADHERENT_CARD_TEXT=テキストは、（左揃え）メンバーカードに印刷 @@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=このメンバに関連付けられているサ ThirdPartyDolibarr=Dolibarrサードパーティ MembersAndSubscriptions= メンバーとSubscriptions MoreActions=記録上の相補的なアクション -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription MoreActionBankDirect=アカウントに直接トランザクション·レコードを作成します。 MoreActionBankViaInvoice=アカウントの請求書と支払いを作成します。 MoreActionInvoiceOnly=なし支払いで請求書を作成します。 @@ -171,6 +170,8 @@ LastSubscriptionAmount=最後のサブスクリプションの量 MembersStatisticsByCountries=国別メンバー統計 MembersStatisticsByState=都道府県/州によってメンバーの統計 MembersStatisticsByTown=町によってメンバーの統計 +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=会員数 NoValidatedMemberYet=いいえ検証メンバーが見つかりませんでした MembersByCountryDesc=この画面には、国によるメンバーの統計情報を表示します。グラフィックは、Googleのオンライングラフサービスに依存しますが、インターネット接続が機能している場合にのみ使用できます。 @@ -196,9 +197,10 @@ Collectivités=組織 Particuliers=個人的な Entreprises=企業 DOLIBARRFOUNDATION_PAYMENT_FORM=銀行振込を使用してサブスクリプション費用の支払いを行うには、ページ参照http://wiki.dolibarr.org/index.php/Subscribeを 。
クレジットカードまたはPayPalでお支払いには、このページの下部にあるボタンをクリックします。
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang index d02dfb5bad9..8753a3c1353 100644 --- a/htdocs/langs/ja_JP/products.lang +++ b/htdocs/langs/ja_JP/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=製品は、限られた期間を持つサービスの場 MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=価格数 MultiPriceLevelsName=価格カテゴリ -AssociatedProductsAbility=サブプロダクトをアクティブにする -AssociatedProducts=サブプロダクト -AssociatedProductsNumber=この製品を構成する製品の数 -ParentProductsNumber=親製品の数 -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=関連付ける Translation=翻訳 KeywordFilter=キーワードフィルタ @@ -132,7 +132,7 @@ AddDel=追加/削除 Quantity=量 NoMatchFound=マッチするものが見つからない ProductAssociationList=関連製品/サービスのリスト：製品/サービスの名前（量の影響） -ProductParentList=コンポーネントとしては、この製品と製品/サービスのリスト +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=選択した製品の一つは、現在の製品を持つ親です。 DeleteProduct=製品/サービスを削除します。 ConfirmDeleteProduct=この製品/サービスを削除してもよろしいですか？ @@ -179,7 +179,7 @@ CloneProduct=クローン製品やサービス ConfirmCloneProduct=あなたが製品やサービス%sのクローンを作成してもよろしいですか？ CloneContentProduct=製品/サービスのすべての主要な情報のクローンを作成する ClonePricesProduct=主な情報と価格のクローンを作成する -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=本製品が使用されます NewRefForClone=REF。新製品/サービスの CustomerPrices=お客様の価格 @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang index ad6075c0514..5c876e6dd1b 100644 --- a/htdocs/langs/ja_JP/projects.lang +++ b/htdocs/langs/ja_JP/projects.lang @@ -14,7 +14,7 @@ TasksDesc=このビューは、すべてのプロジェクトとタスク（あ Myprojects=私のプロジェクト ProjectsArea=プロジェクトエリア NewProject=新しいプロジェクト -AddProject=プロジェクトを追加する +AddProject=Create project DeleteAProject=プロジェクトを削除します。 DeleteATask=タスクを削除する ConfirmDeleteAProject=このプロジェクトを削除してもよろしいですか？ @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=新たに費やされた時間は MyTimeSpent=私の時間を費やし MyTasks=私の仕事 @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=新しいタスク -AddTask=タスクを追加する +AddTask=Create task AddDuration=期間を追加します。 Activity=アクティビティ Activities=タスク/活動 diff --git a/htdocs/langs/ja_JP/resource.lang b/htdocs/langs/ja_JP/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/ja_JP/resource.lang +++ b/htdocs/langs/ja_JP/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang index c8d4567a644..17e7c8c42b5 100644 --- a/htdocs/langs/ja_JP/withdrawals.lang +++ b/htdocs/langs/ja_JP/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=クレジットで WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=引き出しを表示 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=請求書は、まだ少なくとも一つの引き出しの支払いを処理していない場合、前に撤退を管理できるようにするために支払ったとして、しかし、それが設定されません。 -DoStandingOrdersBeforePayments=このタブでは、立っている順序のために要求することができます。それが終了されますしたら、請求書を閉じるには、支払を入力することができます。 +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=銀行によって立っている順序%sの支払い diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index a8873ee150c..c8f846c9e55 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s ViewFullDateActions=Show full dates events in the third sheet @@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Link BoxesAvailable=Boxes available @@ -444,7 +447,7 @@ Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmark management -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales @@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang index 35a7cd38655..b2ab74c91bc 100644 --- a/htdocs/langs/ko_KR/agenda.lang +++ b/htdocs/langs/ko_KR/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= All my events/tasks AllActions= All events/tasks ViewList=List view diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang index 9fe5eff520d..878eb49b3c9 100644 --- a/htdocs/langs/ko_KR/compta.lang +++ b/htdocs/langs/ko_KR/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/ko_KR/contracts.lang b/htdocs/langs/ko_KR/contracts.lang index 511516dc755..57ba3bb15d8 100644 --- a/htdocs/langs/ko_KR/contracts.lang +++ b/htdocs/langs/ko_KR/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=List of running services NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Services to activate among validated contracts -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Last %s activated services LastModifiedServices=Last %s modified services EditServiceLine=Edit service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang index cf892ddac82..259ba9c91ec 100644 --- a/htdocs/langs/ko_KR/errors.lang +++ b/htdocs/langs/ko_KR/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang index 9246a04ced9..40bca8e85fb 100644 --- a/htdocs/langs/ko_KR/members.lang +++ b/htdocs/langs/ko_KR/members.lang @@ -1,204 +1,206 @@ # Dolibarr language file - Source file is en_US - members -# MembersArea=Members area -# PublicMembersArea=Public members area -# MemberCard=Member card -# SubscriptionCard=Subscription card -# Member=Member -# Members=Members -# MemberAccount=Member login -# ShowMember=Show member card -# UserNotLinkedToMember=User not linked to a member -# ThirdpartyNotLinkedToMember=Third-party not linked to a member -# MembersTickets=Members Tickets -# FundationMembers=Foundation members -# Attributs=Attributes -# ErrorMemberTypeNotDefined=Member type not defined -# ListOfPublicMembers=List of public members -# ListOfValidatedPublicMembers=List of validated public members -# ErrorThisMemberIsNotPublic=This member is not public -# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). -# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. -# ThisIsContentOfYourCard=This is details of your card -# CardContent=Content of your member card -# SetLinkToUser=Link to a Dolibarr user -# SetLinkToThirdParty=Link to a Dolibarr third party -# MembersCards=Members business cards -# MembersList=List of members -# MembersListToValid=List of draft members (to be validated) -# MembersListValid=List of valid members -# MembersListUpToDate=List of valid members with up to date subscription -# MembersListNotUpToDate=List of valid members with subscription out of date -# MembersListResiliated=List of resiliated members -# MembersListQualified=List of qualified members -# MenuMembersToValidate=Draft members -# MenuMembersValidated=Validated members -# MenuMembersUpToDate=Up to date members -# MenuMembersNotUpToDate=Out of date members -# MenuMembersResiliated=Resiliated members -# MembersWithSubscriptionToReceive=Members with subscription to receive -# DateAbonment=Subscription date -# DateSubscription=Subscription date -# DateNextSubscription=Next subscription -# DateEndSubscription=Subscription end date -# EndSubscription=End subscription -# SubscriptionId=Subscription id -# MemberId=Member id -# NewMember=New member -# NewType=New member type -# MemberType=Member type -# MemberTypeId=Member type id -# MemberTypeLabel=Member type label -# MembersTypes=Members types -# MembersAttributes=Members attributes -# SearchAMember=Search a member -# MemberStatusDraft=Draft (needs to be validated) -# MemberStatusDraftShort=Draft -# MemberStatusActive=Validated (waiting subscription) -# MemberStatusActiveShort=Validated -# MemberStatusActiveLate=subscription expired -# MemberStatusActiveLateShort=Expired -# MemberStatusPaid=Subscription up to date -# MemberStatusPaidShort=Up to date -# MemberStatusResiliated=Resiliated member -# MemberStatusResiliatedShort=Resiliated -# MembersStatusToValid=Draft members -# MembersStatusToValidShort=Draft members -# MembersStatusValidated=Validated members -# MembersStatusPaid=Subscription up to date -# MembersStatusPaidShort=Up to date -# MembersStatusNotPaid=Subscription out of date -# MembersStatusNotPaidShort=Out of date -# MembersStatusResiliated=Resiliated members -# MembersStatusResiliatedShort=Resiliated members -# NewCotisation=New contribution -# PaymentSubscription=New contribution payment -# EditMember=Edit member -# SubscriptionEndDate=Subscription's end date -# MembersTypeSetup=Members type setup -# NewSubscription=New subscription -# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. -# Subscription=Subscription -# Subscriptions=Subscriptions -# SubscriptionLate=Late -# SubscriptionNotReceived=Subscription never received -# SubscriptionLateShort=Late -# SubscriptionNotReceivedShort=Never received -# ListOfSubscriptions=List of subscriptions -# SendCardByMail=Send card by Email -# AddMember=Add member -# MemberType=Member type -# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" -# NewMemberType=New member type -# WelcomeEMail=Welcome e-mail -# SubscriptionRequired=Subscription required -# EditType=Edit member type -# DeleteType=Delete -# VoteAllowed=Vote allowed -# Physical=Physical -# Moral=Moral -# MorPhy=Moral/Physical -# Reenable=Reenable -# ResiliateMember=Resiliate a member -# ConfirmResiliateMember=Are you sure you want to resiliate this member ? -# DeleteMember=Delete a member -# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? -# DeleteSubscription=Delete a subscription -# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? -# Filehtpasswd=htpasswd file -# ValidateMember=Validate a member -# ConfirmValidateMember=Are you sure you want to validate this member ? -# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. -# PublicMemberList=Public member list -# BlankSubscriptionForm=Public auto-subscription form -# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. -# EnablePublicSubscriptionForm=Enable the public auto-subscription form -# MemberPublicLinks=Public links/pages -# ExportDataset_member_1=Members and subscriptions -# ImportDataset_member_1=Members -# LastMembers=Last %s members -# LastMembersModified=Last %s modified members -# LastSubscriptionsModified=Last %s modified subscriptions -# AttributeName=Attribute name -# String=String -# Text=Text -# Int=Int -# Date=Date -# DateAndTime=Date and time -# PublicMemberCard=Member public card -# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -# AddSubscription=Add subscription -# ShowSubscription=Show subscription -# MemberModifiedInDolibarr=Member modified in Dolibarr -# SendAnEMailToMember=Send information email to member -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription -# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription -# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation -# DescADHERENT_MAIL_VALID=EMail for member validation -# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription -# DescADHERENT_MAIL_COTIS=EMail for subscription -# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation -# DescADHERENT_MAIL_RESIL=EMail for member resiliation -# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails -# DescADHERENT_ETIQUETTE_TYPE=Format of labels page -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets -# DescADHERENT_CARD_TYPE=Format of cards page -# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards -# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) -# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) -# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards -# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here -# MayBeOverwrited=This text can be overwrited by value defined for member's type -# ShowTypeCard=Show type '%s' -# HTPasswordExport=htpassword file generation -# NoThirdPartyAssociatedToMember=No third party associated to this member -# ThirdPartyDolibarr=Dolibarr third party -# MembersAndSubscriptions= Members and Subscriptions -# MoreActions=Complementary action on recording -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription -# MoreActionBankDirect=Create a direct transaction record on account -# MoreActionBankViaInvoice=Create an invoice and payment on account -# MoreActionInvoiceOnly=Create an invoice with no payment -# LinkToGeneratedPages=Generate visit cards -# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. -# DocForAllMembersCards=Generate business cards for all members -# DocForOneMemberCards=Generate business cards for a particular member -# DocForLabels=Generate address sheets -# SubscriptionPayment=Subscription payment -# LastSubscriptionDate=Last subscription date -# LastSubscriptionAmount=Last subscription amount -# MembersStatisticsByCountries=Members statistics by country -# MembersStatisticsByState=Members statistics by state/province -# MembersStatisticsByTown=Members statistics by town -# NbOfMembers=Number of members -# NoValidatedMemberYet=No validated members found -# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. -# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. -# MembersByTownDesc=This screen show you statistics on members by town. -# MembersStatisticsDesc=Choose statistics you want to read... -# MenuMembersStats=Statistics -# LastMemberDate=Last member date -# Nature=Nature -# Public=Information are public -# Exports=Exports -# NewMemberbyWeb=New member added. Awaiting approval -# NewMemberForm=New member form -# SubscriptionsStatistics=Statistics on subscriptions -# NbOfSubscriptions=Number of subscriptions -# AmountOfSubscriptions=Amount of subscriptions -# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) -# DefaultAmount=Default amount of subscription -# CanEditAmount=Visitor can choose/edit amount of its subscription -# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page -# Associations=Foundations -# Collectivités=Organizations -# Particuliers=Personal -# Entreprises=Companies -# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member +Members=Members +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions +ImportDataset_member_1=Members +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang index cb88461602d..81d217ddb54 100644 --- a/htdocs/langs/ko_KR/products.lang +++ b/htdocs/langs/ko_KR/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang index 4affd1fdc5a..c48e27fd204 100644 --- a/htdocs/langs/ko_KR/projects.lang +++ b/htdocs/langs/ko_KR/projects.lang @@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant Myprojects=My projects ProjectsArea=Projects area NewProject=New project -AddProject=Add project +AddProject=Create project DeleteAProject=Delete a project DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task -AddTask=Add task +AddTask=Create task AddDuration=Add duration Activity=Activity Activities=Tasks/activities diff --git a/htdocs/langs/ko_KR/resource.lang b/htdocs/langs/ko_KR/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/ko_KR/resource.lang +++ b/htdocs/langs/ko_KR/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang index e4337309084..ea32511fefb 100644 --- a/htdocs/langs/ko_KR/withdrawals.lang +++ b/htdocs/langs/ko_KR/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index 5039352d999..3d1cd8a7cb2 100644 --- a/htdocs/langs/lt_LT/admin.lang +++ b/htdocs/langs/lt_LT/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Parodyti/paslėpti trečiasias šalis vykdančias ar nutraukusias veiklą, pridėkite filtro pasirinkimą UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Paieškos filtrų nustatymai NumberOfKeyToSearch=Paieškai paleisti reikalingas simbolių skaičius: %s ViewFullDateActions=Rodyti pilnas įvykių datas trečiajame lape @@ -208,6 +210,7 @@ ModulesJobDesc=Verslo moduliuose yra paprastos iš anksto nustatytos Dolibarr nu ModulesMarketPlaceDesc=Galite rasti daugiau modulių ir atsisiųsti iš išorinių web svetainių internete ... ModulesMarketPlaces=Daugiau modulių ... DoliStoreDesc=DoliStore, oficiali Dolibarr ERP / CRM išorinių modulių parduotuvė +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Galite ieškoti ir rasti daugiau modulių per Web svetainių tiekėjus... URL=Nuoroda BoxesAvailable=Prieinami langeliai @@ -444,7 +447,7 @@ Module55Desc=Brūkšninių kodų valdymas Module56Name=Telefonija Module56Desc=Telefonijos integracija Module57Name=Pastovūs užsakymai -Module57Desc=Pastovių užsakymų ir atšaukimų valdymas +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial sistemos integracija (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS mechanizmas Module320Desc=Pridėti RSS mechanizmą Dolibarr ekrano puslapių viduje Module330Name=Žymekliai Module330Desc=Žymeklių valdymas -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Web kalendorius Module410Desc=Web kalendoriaus integracija Module500Name=Specialiosios išlaidos (mokesčiai, socialinės įmokos, dividendai) @@ -495,6 +498,8 @@ Module1780Name=Kategorijos Module1780Desc=Kategorijų valdymas (produktai, tiekėjai ir klientai) Module2000Name=WYSIWYG redaktorius Module2000Desc=Leisti redaguoti tam tikrą teksto sritį naudojant pažangų redaktorių +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Numatomų užduočių valdymas Module2400Name=Darbotvarkė @@ -503,6 +508,8 @@ Module2500Name=Elektroninis Turinio Valdymas Module2500Desc=Išsaugoti dokumentus ir dalintis jais Module2600Name=WebServices Module2600Desc=Įjungti Dolibarr interneto paslaugas serveryje +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Naudokite Gravatar interneto paslaugą (www.gravatar.com) kad parodyti nuotrauką vartotojams/nariams (surandami prie jų laiškų). Reikalinga interneto prieiga. Module2800Desc=FTP klientas @@ -517,7 +524,7 @@ Module6000Desc=Darbo eigos valdymas Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per Paybox puslapį Module50100Name=Pardavimų taškas @@ -527,7 +534,7 @@ Module50200Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per PayP Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Spausdinti per Cups IPP spausdintuvą. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Atidaryti apklausą Module55000Desc=Modulis interneto apklausų sudarymui (pvz.: Doodle, Studs, Rdvz, ...) Module59000Name=Paraštės @@ -779,6 +786,7 @@ DictionaryOrderMethods=Užsakymų metodai DictionarySource=Pasiūlymų/užsakymų kilmė DictionaryAccountancyplan=Sąskaitų planas DictionaryAccountancysystem=Sąskaitų plano modeliai +DictionaryEMailTemplates=Emails templates SetupSaved=Nustatymai išsaugoti BackToModuleList=Atgal į modulių sąrašą BackToDictionaryList=Atgal į žodynų sąrašą @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Nuolatinė paieškos forma kairiajame meniu DefaultLanguage=Naudojama kalba pagal nutylėjimą (kalbos kodas) EnableMultilangInterface=Įjungti daugiakalbę sąsają EnableShowLogo=Rodyti logotipą kairiajame meniu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Jūsų sistema sėkmingai atnaujinta CompanyInfo=Įmonės/Organizacijos informacija CompanyIds=Įmonės/Organizacijos tapatybės diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang index e56ed276d04..3d2da4f6b67 100644 --- a/htdocs/langs/lt_LT/agenda.lang +++ b/htdocs/langs/lt_LT/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Įvykiai priskirti ActionsDoneBy=Įvykiai atlikti ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Visi mano įvykiai/užduotys AllActions= Visi įvykiai/užduotys ViewList=Sąrašo vaizdas diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang index f07b82c6e96..f029909d1db 100644 --- a/htdocs/langs/lt_LT/compta.lang +++ b/htdocs/langs/lt_LT/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=Priklausomai nuo tiekėjo, pasirinkti tinkamą metod TurnoverPerProductInCommitmentAccountingNotRelevant=Apyvartos ataskaita pagal produktą, kai naudojamas Pinigų apskaita būdas nėra tinkamas. Ši ataskaita yra prieinama tik tada, kai naudojama Įsipareigojimų apskaita režimas (žr. Apskaitos modulio nustatymus). CalculationMode=Skaičiavimo metodas AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/lt_LT/contracts.lang b/htdocs/langs/lt_LT/contracts.lang index bc325523e1c..669a370db74 100644 --- a/htdocs/langs/lt_LT/contracts.lang +++ b/htdocs/langs/lt_LT/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Veikiančių sutarčių eilučių sąrašas ListOfRunningServices=Veikiančių paslaugų sąrašas NotActivatedServices=Neaktyvios paslaugos (tarp patvirtintų sutarčių) BoardNotActivatedServices=Paslaugos aktyvavimui iš patvirtintų sutarčių -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Paskutinės %s aktyvuotos paslaugos LastModifiedServices=Paskutinės %s modifikuotos paslaugos EditServiceLine=Redaguoti paslaugos eilutę @@ -91,6 +91,7 @@ ListOfServicesToExpire=Paslaugų, kurios baigiasi, sąrašas NoteListOfYourExpiredServices=Šiame sąraše yra tik paslaugos sutarčių trečiosioms šalims, su kuriom Jūs susijęs kaip pardavimo atstovas. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Pardavimų atstovas pasirašantis sutartį diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang index 3393282345b..785d3b9be28 100644 --- a/htdocs/langs/lt_LT/errors.lang +++ b/htdocs/langs/lt_LT/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Tiekėjo kodas reikalingas ErrorSupplierCodeAlreadyUsed=Tiekėjo kodas jau naudojamas ErrorBadParameters=Blogi parametrai ErrorBadValueForParameter=Nekorektiško parametro '%s' neteisinga reikšmė '%s' -ErrorBadImageFormat=Paveikslėlio failo nepalaikomas formatas +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Reikšmė '%s' turi neteisingą datos formatą ErrorWrongDate=Data yra neteisinga ! ErrorFailedToWriteInDir=Nepavyko įrašyti į katalogą %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Vartotojas su prisijungimu %s nerastas ErrorLoginHasNoEmail=Šis vartotojas neturi e-pašto adreso. Procesas nutrauktas. ErrorBadValueForCode=Netinkama saugumo kodo reikšmė. Pabandykite dar kartą su nauja reikšme ... ErrorBothFieldCantBeNegative=Laukai %s ir %s negali būti abu neigiami +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Vartotojo sąskaita %s naudojama web serverio vykdymui neturi leidimo tam. ErrorNoActivatedBarcode=Nėra įjungta brūkšninio kodo tipo ErrUnzipFails=Nepavyko išpakuoti %s su ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Klaida, šis narys nėra susij ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Privalomi nustatymų parametrai dar nėra apibrėžti diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang index 9246a04ced9..ac6e97831b8 100644 --- a/htdocs/langs/lt_LT/members.lang +++ b/htdocs/langs/lt_LT/members.lang @@ -1,204 +1,206 @@ # Dolibarr language file - Source file is en_US - members -# MembersArea=Members area -# PublicMembersArea=Public members area -# MemberCard=Member card -# SubscriptionCard=Subscription card -# Member=Member -# Members=Members -# MemberAccount=Member login -# ShowMember=Show member card -# UserNotLinkedToMember=User not linked to a member -# ThirdpartyNotLinkedToMember=Third-party not linked to a member -# MembersTickets=Members Tickets -# FundationMembers=Foundation members -# Attributs=Attributes -# ErrorMemberTypeNotDefined=Member type not defined -# ListOfPublicMembers=List of public members -# ListOfValidatedPublicMembers=List of validated public members -# ErrorThisMemberIsNotPublic=This member is not public -# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). -# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. -# ThisIsContentOfYourCard=This is details of your card -# CardContent=Content of your member card -# SetLinkToUser=Link to a Dolibarr user -# SetLinkToThirdParty=Link to a Dolibarr third party -# MembersCards=Members business cards -# MembersList=List of members -# MembersListToValid=List of draft members (to be validated) -# MembersListValid=List of valid members -# MembersListUpToDate=List of valid members with up to date subscription -# MembersListNotUpToDate=List of valid members with subscription out of date -# MembersListResiliated=List of resiliated members -# MembersListQualified=List of qualified members -# MenuMembersToValidate=Draft members -# MenuMembersValidated=Validated members -# MenuMembersUpToDate=Up to date members -# MenuMembersNotUpToDate=Out of date members -# MenuMembersResiliated=Resiliated members -# MembersWithSubscriptionToReceive=Members with subscription to receive -# DateAbonment=Subscription date -# DateSubscription=Subscription date -# DateNextSubscription=Next subscription -# DateEndSubscription=Subscription end date -# EndSubscription=End subscription -# SubscriptionId=Subscription id -# MemberId=Member id -# NewMember=New member -# NewType=New member type -# MemberType=Member type -# MemberTypeId=Member type id -# MemberTypeLabel=Member type label -# MembersTypes=Members types -# MembersAttributes=Members attributes -# SearchAMember=Search a member -# MemberStatusDraft=Draft (needs to be validated) -# MemberStatusDraftShort=Draft -# MemberStatusActive=Validated (waiting subscription) -# MemberStatusActiveShort=Validated -# MemberStatusActiveLate=subscription expired -# MemberStatusActiveLateShort=Expired -# MemberStatusPaid=Subscription up to date -# MemberStatusPaidShort=Up to date -# MemberStatusResiliated=Resiliated member -# MemberStatusResiliatedShort=Resiliated -# MembersStatusToValid=Draft members -# MembersStatusToValidShort=Draft members -# MembersStatusValidated=Validated members -# MembersStatusPaid=Subscription up to date -# MembersStatusPaidShort=Up to date -# MembersStatusNotPaid=Subscription out of date -# MembersStatusNotPaidShort=Out of date -# MembersStatusResiliated=Resiliated members -# MembersStatusResiliatedShort=Resiliated members -# NewCotisation=New contribution -# PaymentSubscription=New contribution payment -# EditMember=Edit member -# SubscriptionEndDate=Subscription's end date -# MembersTypeSetup=Members type setup -# NewSubscription=New subscription -# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. -# Subscription=Subscription -# Subscriptions=Subscriptions -# SubscriptionLate=Late -# SubscriptionNotReceived=Subscription never received -# SubscriptionLateShort=Late -# SubscriptionNotReceivedShort=Never received -# ListOfSubscriptions=List of subscriptions -# SendCardByMail=Send card by Email -# AddMember=Add member -# MemberType=Member type -# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" -# NewMemberType=New member type -# WelcomeEMail=Welcome e-mail -# SubscriptionRequired=Subscription required -# EditType=Edit member type -# DeleteType=Delete -# VoteAllowed=Vote allowed -# Physical=Physical -# Moral=Moral -# MorPhy=Moral/Physical -# Reenable=Reenable -# ResiliateMember=Resiliate a member -# ConfirmResiliateMember=Are you sure you want to resiliate this member ? -# DeleteMember=Delete a member -# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? -# DeleteSubscription=Delete a subscription -# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? -# Filehtpasswd=htpasswd file -# ValidateMember=Validate a member -# ConfirmValidateMember=Are you sure you want to validate this member ? -# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. -# PublicMemberList=Public member list -# BlankSubscriptionForm=Public auto-subscription form -# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. -# EnablePublicSubscriptionForm=Enable the public auto-subscription form -# MemberPublicLinks=Public links/pages -# ExportDataset_member_1=Members and subscriptions -# ImportDataset_member_1=Members -# LastMembers=Last %s members -# LastMembersModified=Last %s modified members -# LastSubscriptionsModified=Last %s modified subscriptions -# AttributeName=Attribute name -# String=String -# Text=Text -# Int=Int -# Date=Date -# DateAndTime=Date and time -# PublicMemberCard=Member public card -# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -# AddSubscription=Add subscription -# ShowSubscription=Show subscription -# MemberModifiedInDolibarr=Member modified in Dolibarr -# SendAnEMailToMember=Send information email to member -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription -# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription -# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation -# DescADHERENT_MAIL_VALID=EMail for member validation -# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription -# DescADHERENT_MAIL_COTIS=EMail for subscription -# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation -# DescADHERENT_MAIL_RESIL=EMail for member resiliation -# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails -# DescADHERENT_ETIQUETTE_TYPE=Format of labels page -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets -# DescADHERENT_CARD_TYPE=Format of cards page -# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards -# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) -# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) -# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards -# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here -# MayBeOverwrited=This text can be overwrited by value defined for member's type -# ShowTypeCard=Show type '%s' -# HTPasswordExport=htpassword file generation -# NoThirdPartyAssociatedToMember=No third party associated to this member -# ThirdPartyDolibarr=Dolibarr third party -# MembersAndSubscriptions= Members and Subscriptions -# MoreActions=Complementary action on recording -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription -# MoreActionBankDirect=Create a direct transaction record on account -# MoreActionBankViaInvoice=Create an invoice and payment on account -# MoreActionInvoiceOnly=Create an invoice with no payment -# LinkToGeneratedPages=Generate visit cards -# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. -# DocForAllMembersCards=Generate business cards for all members -# DocForOneMemberCards=Generate business cards for a particular member -# DocForLabels=Generate address sheets -# SubscriptionPayment=Subscription payment -# LastSubscriptionDate=Last subscription date -# LastSubscriptionAmount=Last subscription amount -# MembersStatisticsByCountries=Members statistics by country -# MembersStatisticsByState=Members statistics by state/province -# MembersStatisticsByTown=Members statistics by town -# NbOfMembers=Number of members -# NoValidatedMemberYet=No validated members found -# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. -# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. -# MembersByTownDesc=This screen show you statistics on members by town. -# MembersStatisticsDesc=Choose statistics you want to read... -# MenuMembersStats=Statistics -# LastMemberDate=Last member date -# Nature=Nature -# Public=Information are public -# Exports=Exports -# NewMemberbyWeb=New member added. Awaiting approval -# NewMemberForm=New member form -# SubscriptionsStatistics=Statistics on subscriptions -# NbOfSubscriptions=Number of subscriptions -# AmountOfSubscriptions=Amount of subscriptions -# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) -# DefaultAmount=Default amount of subscription -# CanEditAmount=Visitor can choose/edit amount of its subscription -# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page -# Associations=Foundations -# Collectivités=Organizations -# Particuliers=Personal -# Entreprises=Companies -# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +MembersArea=Narių sritis +PublicMembersArea=Vieša narių sritis +MemberCard=Nario kortelė +SubscriptionCard=Prenumeratos kortelė +Member=Narys +Members=Nariai +MemberAccount=Nario prisijungimas +ShowMember=Rodyti nario kortelę +UserNotLinkedToMember=Vartotojas nėra susietas su nariu +ThirdpartyNotLinkedToMember=Trečioji šalis nesusieta su nariu +MembersTickets=Narių kortelės +FundationMembers=Organizacijos nariai +Attributs=Atributai +ErrorMemberTypeNotDefined=Nario tipas nėra apibrėžtas +ListOfPublicMembers=Viešųjų narių sąrašas +ListOfValidatedPublicMembers=Patvirtintų viešųjų narių sąrašas +ErrorThisMemberIsNotPublic=Šis narys nėra viešas +ErrorMemberIsAlreadyLinkedToThisThirdParty=Kitas narys (pavadinimas/vardas: %s, prisijungimas: %s) jau yra susietas su trečiąja šalimi %s. Pirmiausia pašalinti šį saitą, nes trečioji šalis negali būti susieta tik su nariu (ir atvirkščiai). +ErrorUserPermissionAllowsToLinksToItselfOnly=Saugumo sumetimais, Jums turi būti suteikti leidimai redaguoti visus vartotojus, kad galėtumėte susieti narį su vartotoju, kuris yra ne Jūsų. +ThisIsContentOfYourCard=Tai yra Jūsų kortelės detalės +CardContent=Jūsų nario kortelės turinys +SetLinkToUser=Saitas su Dolibarr vartotoju +SetLinkToThirdParty=Saitas su Dolibarr trečiąja šalimi +MembersCards=Narių vizitinės kortelės +MembersList=Narių sąrašas +MembersListToValid=Numatomų narių sąrašas (tvirtinimui) +MembersListValid=Patvirtintų galiojančių narių sąrašas +MembersListUpToDate=Patvirtintų galiojančių narių su atnaujintu pasirašymu sąrašas +MembersListNotUpToDate=Patvirtintų galiojančių narių su pasenusiu pasirašymu sąrašas +MembersListResiliated=Atkurtų narių sąrašas +MembersListQualified=Slaptų narių sąrašas (qualified) +MenuMembersToValidate=Numatomi nariai +MenuMembersValidated=Patvirtinti galiojantys nariai +MenuMembersUpToDate=Atnaujinti nariai +MenuMembersNotUpToDate=Pasenę nariai +MenuMembersResiliated=Atkurti nariai +MembersWithSubscriptionToReceive=Nariai, kurių pasirašymą reikia gauti +DateAbonment=Pasirašymo data +DateSubscription=Pasirašymo data +DateNextSubscription=Sekantis pasirašymas +DateEndSubscription=Pasirašymo pabaigos data +EndSubscription=Pasirašymo pabaiga +SubscriptionId=Pasirašymo ID +MemberId=Nario ID +NewMember=Naujas narys +NewType=Naujo nario tipas +MemberType=Nario tipas +MemberTypeId=Nario tipo ID +MemberTypeLabel=Nario tipo etiketė +MembersTypes=Narių tipai +MembersAttributes=Narių atributai +SearchAMember=Ieškoti nario +MemberStatusDraft=Projektas (turi būti patvirtintas) +MemberStatusDraftShort=Projektas +MemberStatusActive=Patvirtintas (laukiama pasirašymo) +MemberStatusActiveShort=Patvirtintas +MemberStatusActiveLate=Pasirašymas pasibaigęs +MemberStatusActiveLateShort=Pasibaigęs +MemberStatusPaid=Pasirašymas atnaujintas +MemberStatusPaidShort=Atnaujintas +MemberStatusResiliated=Atkurtas narys +MemberStatusResiliatedShort=Atkurtas +MembersStatusToValid=Projektiniai nariai +MembersStatusToValidShort=Projektiniai nariai +MembersStatusValidated=Patvirtinti nariai +MembersStatusPaid=Pasirašymas atnaujintas +MembersStatusPaidShort=Atnaujinta +MembersStatusNotPaid=Pasirašymas pasenęs +MembersStatusNotPaidShort=Pasenusi +MembersStatusResiliated=Atkurti nariai +MembersStatusResiliatedShort=Atkurti nariai +NewCotisation=Nauja įmoka +PaymentSubscription=Naujas įmokos mokėjimas +EditMember=Redaguoti narį +SubscriptionEndDate=Pasirašymo pabaigos data +MembersTypeSetup=Narių tipo nustatymai +NewSubscription=Naujas pasirašymas +NewSubscriptionDesc=Ši forma leidžia įrašyti Jūsų pasirašymą kaip naują organizacijos narį. Jei norite atnaujinti savo pasirašymą (jei jau narys), prašome vietoj susisiekti su Organizacijos valdyba e-paštu %s. +Subscription=Pasirašymas +Subscriptions=Pasirašymai +SubscriptionLate=Vėlai +SubscriptionNotReceived=Pasirašymas negautas +SubscriptionLateShort=Vėlai +SubscriptionNotReceivedShort=Niekada negautas +ListOfSubscriptions=Pasirašymų sąrašas +SendCardByMail=Siųsti kortelę E-paštu +AddMember=Create member +NoTypeDefinedGoToSetup=Nė apibrėžtų nario tipų. Eiti į meniu "Narių tipai" +NewMemberType=Naujas nario tipas +WelcomeEMail=Sveikinimo e-laiškas +SubscriptionRequired=Reikalingas pasirašymas +EditType=Redaguoti nario tipą +DeleteType=Ištrinti +VoteAllowed=Balsuoti leidžiama +Physical=Fizinis +Moral=Moralinis +MorPhy=Moralinis/Fizinis +Reenable=Įjungti vėl +ResiliateMember=Atkurti narį +ConfirmResiliateMember=Ar tikrai norite atkurti šį narį ? +DeleteMember=Ištrinti narį +ConfirmDeleteMember=Ar tikrai norite ištrinti šį narį (nario ištrynimas kartu ištrins visus jo pasirašymus) ? +DeleteSubscription=Ištrinti pasirašymą +ConfirmDeleteSubscription=Ar tikrai norite ištrinti šį pasirašymą ? +Filehtpasswd=htpasswd failas +ValidateMember=Patvirtinti narį +ConfirmValidateMember=Ar tikrai norite patvirtinti šį narį ? +FollowingLinksArePublic=Sekantys saitai yra atidaryti puslapiai neapsaugoti jokiais Dolibarr leidimais. Jie nėra suformatuoti puslapiai, pateikti kaip pavyzdys, kad parodyti, kaip vartyti narių duomenų bazę. +PublicMemberList=Viešų narių sąrašas +BlankSubscriptionForm=Viešo auto pasirašymo forma +BlankSubscriptionFormDesc=Dolibarr gali suteikti Jums viešą URL ir leisti išorinius lankytojus pateikti užklausimus dėl pasirašymo į organizaciją. Jei mokėjimo internetu modulis įjungtas, mokėjimo forma bus pateikiama automatiškai. +EnablePublicSubscriptionForm=Įjungti viešą auto pasirašymo formą +MemberPublicLinks=Vieši saitai/puslapiai +ExportDataset_member_1=Nariai ir pasirašymai +ImportDataset_member_1=Nariai +LastMembers=Paskutiniai %s nariai +LastMembersModified=Paskutiniai %s modifikuoti nariai +LastSubscriptionsModified=Paskutiniai %s modifikuoti pasirašymai +AttributeName=Atributo pavadinimas +String=Sąlyga +Text=Tekstas +Int=Vidinis +Date=Data +DateAndTime=Data ir laikas +PublicMemberCard=Nario vieša kortelė +MemberNotOrNoMoreExpectedToSubscribe=Narys, kurio pasirašymo nėra ir daugiau nesitikima +AddSubscription=Create subscription +ShowSubscription=Rodyti pasirašymą +MemberModifiedInDolibarr=Narys modifikuotas Dolibarr +SendAnEMailToMember=Nusiųsti informacinį e-laišką nariui +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Gauto e-laiško subjektas svečio auto įrašo atveju +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Gautas e-laiškas svečio auto įrašo atveju +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-laiško tema nario auto pasirašymui +DescADHERENT_AUTOREGISTER_MAIL=E-laiškas nario auto pasirašymui +DescADHERENT_MAIL_VALID_SUBJECT=E-laiško tema nario patvirtinimui +DescADHERENT_MAIL_VALID=E-laiškas nario patvirtinimui +DescADHERENT_MAIL_COTIS_SUBJECT=E-laiško tema pasirašymui +DescADHERENT_MAIL_COTIS=E-laiškas pasirašymui +DescADHERENT_MAIL_RESIL_SUBJECT=E-laiško tema nario atstatymui +DescADHERENT_MAIL_RESIL=E-laiškas nario atstatymui +DescADHERENT_MAIL_FROM=Siuntėjo e-paštas automatiniams e-laiškams +DescADHERENT_ETIQUETTE_TYPE=Etikečių puslapio formatas +DescADHERENT_ETIQUETTE_TEXT=Spausdinamas tekstas ant nario adreso puslapių +DescADHERENT_CARD_TYPE=Kortelių puslapio formatas +DescADHERENT_CARD_HEADER_TEXT=Spausdinamas tekstas ant nario kortelių viršuje +DescADHERENT_CARD_TEXT=Spausdinamas tekstas ant nario kortelių (lygiuoti į kairę) +DescADHERENT_CARD_TEXT_RIGHT=Spausdinamas tekstas ant nario kortelių (lygiuoti į dešinę) +DescADHERENT_CARD_FOOTER_TEXT=Spausdinamas tekstas ant nario kortelių apačioje +GlobalConfigUsedIfNotDefined=Bus naudojamas Organizacijos modulyje apibrėžtas tekstas, jei čia neapibrėžiama kitaip +MayBeOverwrited=Šis tekstas gali būti perrašomas pagal apibrėžtą reikšmę šiam nario tipui +ShowTypeCard=Rodyti tipą '%s' +HTPasswordExport=htpassword failo generavimas +NoThirdPartyAssociatedToMember=Nė viena trečioji šalis nėra asocijuota su šiuo nariu +ThirdPartyDolibarr=Dolibarr trečioji šalis +MembersAndSubscriptions= Nariai ir Pasirašymai +MoreActions=Papildomi veiksmai įrašomi +MoreActionsOnSubscription=Papildomi veiksmai siūlomi pagal nutylėjimą, kai registruojamas pasirašymas +MoreActionBankDirect=Sukurti tiesioginį operacijos įrašą sąskaitoje +MoreActionBankViaInvoice=Sukurti sąskaitą-faktūrą ir mokėjimą sąskaitoje +MoreActionInvoiceOnly=Sukurti sąskaitą-faktūrą be mokėjimo +LinkToGeneratedPages=Sukurti apsilankymų korteles +LinkToGeneratedPagesDesc=Šis ekranas leidžia Jums sukurti PDF failus su vizitinėmis kortelėmis visiems Jūsų nariams ar tik tam tikriems nariams. +DocForAllMembersCards=Sukurti vizitines korteles visiems nariams +DocForOneMemberCards=Sukurti vizitines korteles tam tikriems nariams +DocForLabels=Sukurti adresų lapus +SubscriptionPayment=Pasirašymo apmokėjimas +LastSubscriptionDate=Paskutinio pasirašymo data +LastSubscriptionAmount=Paskutinio pasirašymo suma +MembersStatisticsByCountries=Narių statistiniai duomenys pagal šalį +MembersStatisticsByState=Narių statistiniai duomenys pagal valstybę/regioną +MembersStatisticsByTown=Narių statistiniai duomenys pagal miestus +MembersStatisticsByRegion=Narių statistika pagal regionus +MemberByRegion=Nariai pagal regionus +NbOfMembers=Narių skaičius +NoValidatedMemberYet=Patvirtintų narių nerasta +MembersByCountryDesc=Šis ekranas rodo narių statistiką pagal šalis. Grafika priklauso nuo Google interneto grafikos ir yra prieinamas tik tada, kai interneto ryšys veikia. +MembersByStateDesc=Šis ekranas rodo narių statistiką pagal valstybes/regionus +MembersByTownDesc=Šis ekranas rodo narių statistiką pagal miestus +MembersStatisticsDesc=Pasirinkite statistiką, kurią norite skaityti +MenuMembersStats=Statistika +LastMemberDate=Paskutinio nario data +Nature=Kilmė +Public=Informacija yra vieša +Exports=Eksportai +NewMemberbyWeb=Naujas narys pridėtas. Laukiama patvirtinimo +NewMemberForm=Naujo nario forma +SubscriptionsStatistics=Pasirašymų statistika +NbOfSubscriptions=Pasirašymų skaičius +AmountOfSubscriptions=Pasirašymų apimtis +TurnoverOrBudget=Apyvarta (įmonės) arba Biudžeto (organizacijos) +DefaultAmount=Pasirašymo apimtis (pagal nutylėjimą) +CanEditAmount=Lankytojas gali pasirinkti/redaguoti savo pasirašymo apimtį +MEMBER_NEWFORM_PAYONLINE=Peršokti į integruotą interneto mokėjimo puslapį +Associations=Organizacijos +Collectivités=Organizacijos +Particuliers=Asmens +Entreprises=Įmonės +DOLIBARRFOUNDATION_PAYMENT_FORM=Norint atlikti pasirašymo apmokėjimą naudojant banko pervedimą, žiūrėti psl.: http://wiki.dolibarr.org/index.php/Subscribe.
Mokėti naudojant kreditinę kortelę arba PayPal, spauskite mygtuką šio puslapio apačioje.
+ByProperties=Pagal savybes +MembersStatisticsByProperties=Narių statistiniai duomenys pagal savybes +MembersByNature=Nariai pagal kilmę +VATToUseForSubscriptions=Pasirašymams naudojamas PVM tarifas +NoVatOnSubscription=Pasirašymams nėra PVM +MEMBER_PAYONLINE_SENDEMAIL=Įspėti, kai Dolibarr gauna patvirtinimą apie mokėjimą už pasirašymą, nusiunčiant e-laišką +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang index a9db1492e92..d2b0da1e0f3 100644 --- a/htdocs/langs/lt_LT/products.lang +++ b/htdocs/langs/lt_LT/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Jei produktas yra paslauga su ribota trukme: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Kainų skaičius MultiPriceLevelsName=Kainų kategorijos -AssociatedProductsAbility=Įjungti virtualią produktų funkciją -AssociatedProducts=Virtualus produktas -AssociatedProductsNumber=Produktų, sudarančių šį virtualų produktą, skaičius -ParentProductsNumber=Patronuojančio virtualaus produkto skaičius -IfZeroItIsNotAVirtualProduct=Jei 0, šis produktas nėra virtualus produktas -IfZeroItIsNotUsedByVirtualProduct=Jei 0, šis produktas nėra naudojamas nei vieno virtualaus produkto +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Prisijungti Translation=Vertimas KeywordFilter=Raktažodižio filtras @@ -132,7 +132,7 @@ AddDel=Pridėti/Ištrinti Quantity=Kiekis NoMatchFound=Atitikimų nerasta ProductAssociationList=Susijusių produktų/paslaugų sąrašas: produkto/paslaugos pavadinimas (paveiktas kiekis) -ProductParentList=Virtualių prekių/paslaugų su šiuo produktu, kaip komponentu, sąrašas +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Vienas iš pasirinkto produkto yra patronuojantis einamam produktui DeleteProduct=Ištrinti produktą/paslaugą ConfirmDeleteProduct=Ar tikrai norite ištrinti šį produktą/paslaugą ? @@ -179,7 +179,7 @@ CloneProduct=Klonuoti produktą ar paslaugą ConfirmCloneProduct=Ar tikrai norite klonuoti produktą ar paslaugą %s ? CloneContentProduct=Klonuoti visą pagrindinę produkto/paslaugos informaciją ClonePricesProduct=Klonuoti pagrindinę informaciją ir kainas -CloneCompositionProduct=Klonuoti virtualų produktą/paslaugą +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Šis produktas naudojamas NewRefForClone=Naujo produkto/paslaugos nuoroda CustomerPrices=Klientų kainos @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Nustatykite tą pačią kainą ir kliento dukterinėms PriceByCustomerLog=Kaina pagal kliento žurnalą MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang index 77744b81fd3..357d4516d4b 100644 --- a/htdocs/langs/lt_LT/projects.lang +++ b/htdocs/langs/lt_LT/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Šis vaizdas rodo visus projektus ir užduotis (Jūsų vartotojo teis Myprojects=Mano projektai ProjectsArea=Projektų sritis NewProject=Naujas projektas -AddProject=Pridėti projektą +AddProject=Create project DeleteAProject=Ištrinti projektą DeleteATask=Ištrinti užduotį ConfirmDeleteAProject=Ar tikrai norite ištrinti šį projektą? @@ -36,6 +36,8 @@ TaskTimeSpent=Laikas, praleistas vykdant užduotis TaskTimeUser=Vartotojas TaskTimeNote=Pastaba TaskTimeDate=Data +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Naujas praleistas laikas MyTimeSpent=Mano praleistas laikas MyTasks=Mano užduotys @@ -45,7 +47,7 @@ TaskDateStart=Užduoties pradžios data TaskDateEnd=Užduoties pabaigos data TaskDescription=Užduoties aprašymas NewTask=Nauja užduotis -AddTask=Pridėti užduotį +AddTask=Create task AddDuration=Pridėti trukmę Activity=Veikla Activities=Užduotys/veikla diff --git a/htdocs/langs/lt_LT/resource.lang b/htdocs/langs/lt_LT/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/lt_LT/resource.lang +++ b/htdocs/langs/lt_LT/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang index 57893855393..9181af3d105 100644 --- a/htdocs/langs/lt_LT/withdrawals.lang +++ b/htdocs/langs/lt_LT/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Kreditą WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Rodyti Išėmimą IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jei sąskaita-faktūra turi mažiausiai vieną išėmimo mokėjimą dar apdorojamą, tai nebus nustatyta kaip apmokėta, kad pirmiausia leisti išėmimo valdymą. -DoStandingOrdersBeforePayments=Ši kortelė leidžia prašyti periodinio užsakymo. Kai jis bus įvykdytas, galite įvesti mokėjimą sąskaitos-faktūros uždarymui. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Išėmimo failas SetToStatusSent=Nustatyti būklę "Failas išsiųstas" ThisWillAlsoAddPaymentOnInvoice=Tai taip pat taikoma sąskaitų-faktūrų mokėjimams ir jų priskyrimui "Apmokėtos" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Periodinio užsakymo %s banko mokėjimas diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index 36406135905..5debf8efd8c 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Izmantojiet automātiskos laukus, lai izvēlētos treš ActivityStateToSelectCompany= Pievienot filtru iespēja parādīt / slēpt thirdparties kas pašlaik darbībā vai ir pārtraucis to UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Izmantojiet automātiskos laukus, lai izvēlētos kontaktu (tā vietā, lai izmantojot sarakstlodziņu). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Meklēšanas filtru iespējas NumberOfKeyToSearch=Rakstzīmju skaits, lai iedarbinātu meklēšanu: %s ViewFullDateActions=Rādīt pilnu datumus notikumus trešajā lapā @@ -208,6 +210,7 @@ ModulesJobDesc=Biznesa moduļi nodrošina vienkāršu iepriekš iestatīšanu Do ModulesMarketPlaceDesc=Jūs varat atrast vairāk moduļus, lai lejupielādētu uz ārējām tīmekļa vietnēm internetā ... ModulesMarketPlaces=Papildus moduļi ... DoliStoreDesc=DoliStore ir oficiālā mājaslapa Dolibarr ERP / CRM papildus moduļiem +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Tīmekļa vietnes pakalpojumu sniedzēji, jūs varat meklēt, lai atrastu jaunus moduļus ... URL=Saite BoxesAvailable=Pieejamie logi @@ -444,7 +447,7 @@ Module55Desc=Svītrkodu vadība Module56Name=Telefonija Module56Desc=Telefonijas integrācija Module57Name=Regulārie maksājumi -Module57Desc=Regulārie maksājumi un atsaukšana vadība +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=NospiedLaiSavienotos Module58Desc=Integrācija ar ClickToDial sistēmas (zvaigznīte, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS barotne Module320Desc=Pievienot RSS plūsmu Dolibarr lapās Module330Name=Grāmatzīmes Module330Desc=Grāmatzīmju pārvaldība -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Vebkalendārs Module410Desc=Web kalendāra integrācija Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Sadaļas Module1780Desc=Kategoriju vadība (produktiem, piegādātājiem un klientiem) Module2000Name=WYSIWYG redaktors Module2000Desc=Ļauj rediģēt kādu teksta apgabalu, izmantojot uzlabotas redaktoru +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Plānotais uzdevumu pārvaldība Module2400Name=Darba kārtība @@ -503,6 +508,8 @@ Module2500Name=Elektroniskā satura pārvaldība Module2500Desc=Saglabāt un nošārēt dokumentus Module2600Name=WEB pakalpojumi Module2600Desc=Ļautu Dolibarr tīmekļa pakalpojumu serveri +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Izmantot tiešsaistes Gravatar pakalpojumu (www.gravatar.com), lai parādītu fotogrāfijas lietotāju / dalībnieku (atrasts ar saviem e-pastiem). Nepieciešams interneta piekļuves Module2800Desc=FTP klients @@ -517,7 +524,7 @@ Module6000Desc=Plūsmas vadība Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modulis piedāvā tiešsaistes maksājumu lapā, ar kredītkarti, ar Paybox Module50100Name=Tirdzniecības punkts @@ -527,7 +534,7 @@ Module50200Desc=Modulis piedāvā tiešsaistes maksājumu lapā ar kredītkarti Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Drukāt ar Kausi IPP printeri. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Atvērta aptauja Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Malas @@ -779,6 +786,7 @@ DictionaryOrderMethods=Pasūtījumu veidi DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Kontu līknes DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Iestatījumi saglabāti BackToModuleList=Atpakaļ uz moduļu sarakstu BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Pastāvīgā meklēšanas forma kreisajā izvēlnē DefaultLanguage=Noklusējuma izmantošanas valoda (valodas kods) EnableMultilangInterface=Iespējot daudzvalodu interfeisu EnableShowLogo=Rādīt logotipu kreisajā izvēlnē +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Jūsu sistēma ir veiksmīgi atjaunināta CompanyInfo=Uzņēmuma / nodibinājums informācija CompanyIds=Uzņēmuma / nodibinājums identitātes diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang index ac398549ce7..f6a8e0897fd 100644 --- a/htdocs/langs/lv_LV/agenda.lang +++ b/htdocs/langs/lv_LV/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Pasākums piešķirts ActionsDoneBy=Pasākumi, ko veikuši ActionsForUser=Lietotāja notikumi ActionsForUsersGroup=Notikumi visiem grupas lietotājiem +ActionAssignedTo=Event assigned to AllMyActions= Visi mani notikumi/uzdevumi AllActions= Visi notikumi/uzdevumi ViewList=Saraksta skats diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang index 8c1e60218e2..51818210e66 100644 --- a/htdocs/langs/lv_LV/compta.lang +++ b/htdocs/langs/lv_LV/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=no piegādātāja, izvēlēties piemērotu metodi pi TurnoverPerProductInCommitmentAccountingNotRelevant=Apgrozījums ziņojums par produktu, izmantojot skaidras naudas uzskaites režīmu nav nozīmes. Šis ziņojums ir pieejams tikai tad, ja izmanto saderināšanās grāmatvedības režīmu (skat. iestatīšanu grāmatvedības moduli). CalculationMode=Aprēķinu režīms AccountancyJournal=Kontu žurnāls -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang index 9ba92ea73c9..47372bde2af 100644 --- a/htdocs/langs/lv_LV/contracts.lang +++ b/htdocs/langs/lv_LV/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Saraksts darbojas līguma līniju ListOfRunningServices=Saraksts ar aktīvajiem pakalpojumiem NotActivatedServices=Neaktīvais pakalpojumi (starp apstiprinātiem līgumiem) BoardNotActivatedServices=Pakalpojumi aktivizēt starp apstiprinātiem līgumiem -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Pēdējais %s aktivizētais pakalpojums LastModifiedServices=Pēdējais %s labotais pakalpojums EditServiceLine=Edit servisa līnija @@ -91,6 +91,7 @@ ListOfServicesToExpire=Saraksts pakalpojumu beigsies NoteListOfYourExpiredServices=Šajā sarakstā ir tikai pakalpojumu līgumi par trešo pušu jums ir saistītas kā pārdošanas pārstāvis. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Tirdzniecības pārstāvis, parakstot līgumu, diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang index c0a9555b153..257f6ce5e0e 100644 --- a/htdocs/langs/lv_LV/errors.lang +++ b/htdocs/langs/lv_LV/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Piegādātāja kods nepieciešams ErrorSupplierCodeAlreadyUsed=Piegādātāja kods jau tiek izmantots ErrorBadParameters=Slikts parametrs ErrorBadValueForParameter=Nepareiza vērtība '%s' parametrs nepareizs '%s' -ErrorBadImageFormat=Attēla fails nav pareizā formātā +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Vērtībai '%s' ir nepareizs datuma formāts ErrorWrongDate=Datums nav pareizs ErrorFailedToWriteInDir=Neizdevās ierakstīt direktorijā %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Lietotājs ar pieteikšanās %s nevar atrast. ErrorLoginHasNoEmail=Šim lietotājam nav e-pasta adrese. Process atcelts. ErrorBadValueForCode=Nepareiza drošības koda vērtība. Mēģiniet vēlreiz ar jauno vērtību ... ErrorBothFieldCantBeNegative=Lauki %s un %s nevar būt abi negatīvi +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Lietotāja konts %s izmantot, lai veiktu web serveri nav atļauja, kas ErrorNoActivatedBarcode=Nav svītrkodu veids aktivizēts ErrUnzipFails=Neizdevās atarhivēt %s izmantojot ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas @@ -156,4 +175,4 @@ WarningClickToDialUserSetupNotComplete=Iestatīšana ClickToDial informāciju pa WarningNotRelevant=Nozīmes operācija šajā datu WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Iespēja bloķēta kad iestatījumi ir optimizēti aklai persionai vai teksta pārlūkprogrammām WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. -WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters +WarningTooManyDataPleaseUseMoreFilters=Par daudz datu, lūdzu izmantojiet vairāk filtru diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang index 4038bc8ad6b..027c6024f71 100644 --- a/htdocs/langs/lv_LV/members.lang +++ b/htdocs/langs/lv_LV/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Vēlu SubscriptionNotReceivedShort=Nekad nav saņemts ListOfSubscriptions=Saraksts abonementu SendCardByMail=Nosūtīt kartiņu pa e-pastu -AddMember=Pievienot dalībnieku +AddMember=Create member NoTypeDefinedGoToSetup=Neviens dalībnieka veids nav definēts. Iet uz izvēlnes "Dalībnieku veidi" NewMemberType=Jauns dalībnieka veids WelcomeEMail=Welcome e-pastu @@ -125,7 +125,7 @@ Date=Datums DateAndTime=Datums un laiks PublicMemberCard=Dalībnieku publiskā kartiņa MemberNotOrNoMoreExpectedToSubscribe=Dalībvalsts nevar vai vairs sagaidāms, ka parakstīties -AddSubscription=Pievienot abonementu +AddSubscription=Create subscription ShowSubscription=Rādīt abonementu MemberModifiedInDolibarr=Dalībvalsts grozīts Dolibarr SendAnEMailToMember=Sūtīt informāciju e-pastu loceklim @@ -203,3 +203,4 @@ MembersByNature=Dalībnieki pēc būtības VATToUseForSubscriptions=PVN likme izmantot abonementu NoVatOnSubscription=Nav TVA par abonēšanu MEMBER_PAYONLINE_SENDEMAIL=E-pastu, lai brīdinātu, kad Dolibarr saņem apstiprinājumu par apstiprinātu maksājuma parakstīšanas +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/lv_LV/printipp.lang b/htdocs/langs/lv_LV/printipp.lang index 4a1fa4d4ed3..835e6827f12 100644 --- a/htdocs/langs/lv_LV/printipp.lang +++ b/htdocs/langs/lv_LV/printipp.lang @@ -1,18 +1,14 @@ -/* - * Language code: lv_LV - * Automatic generated via autotranslator.php tool - * Generation date 2013-11-09 12:40:15 - */ - - -// START - Lines generated via autotranslator.php tool (2013-11-09 12:40:15). -// Reference language: en_US -> lv_LV -PrintIPPSetup=Setup moduļa Direct Print -PrintIPPDesc=Ce modulis Përmet d'Ajouter ANO Bouton d'iespaids tieši des dokumenti vers votre imprimante. Il requiert ANO systeme Linux équipé de Kausi. -PRINTIPP_ENABLED=Rādīt Picto "Direct print" par dokumentu saraksts -PRINTIPP_HOST=Drukas serveris -PRINTIPP_PORT=Osta +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port PRINTIPP_USER=Login -PRINTIPP_PASSWORD=Parole -NoPrinterFound=Nav printeri atrasts (pārbaudiet savu tases etup) -// STOP - Lines generated via autotranslator.php tool (2013-11-09 12:49:40). +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang index b575e82a1c9..d81b413812e 100644 --- a/htdocs/langs/lv_LV/products.lang +++ b/htdocs/langs/lv_LV/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Ja produkts ir pakalpojums ir ierobežots darbības laiks MultiPricesAbility=Vairāku pakāpju cenas precēm / pakalpojumiem MultiPricesNumPrices=Cenu skaits MultiPriceLevelsName=Cenu sadaļa -AssociatedProductsAbility=Aktivizētu virtuālo produktu funkciju -AssociatedProducts=Virtuāls produkts -AssociatedProductsNumber=Produktu skaits kas veido šo virtuālo produktu -ParentProductsNumber=Skaits mātes virtuālā produkta -IfZeroItIsNotAVirtualProduct=Ja 0, šis produkts ir ne virtuālā produkts -IfZeroItIsNotUsedByVirtualProduct=Ja 0, šis produkts netiek izmantots ar jebkuru virtuālo produkta +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Asociēt Translation=Tulkojums KeywordFilter=Atslēgvārda filtru @@ -132,7 +132,7 @@ AddDel=Pievienot / Dzēst Quantity=Daudzums NoMatchFound=Nekas netika atrasts ProductAssociationList=Saraksts saistītu produktu / pakalpojumu: nosaukums, produkta / pakalpojuma (daudzums ietekmē) -ProductParentList=Saraksts virtuālo produktu / pakalpojumu ar šo produktu kā sastāvdaļu +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Viens no izvēlētā produkta mātes ar pašreizējo produktu DeleteProduct=Dzēst produktu / pakalpojumu ConfirmDeleteProduct=Vai tiešām vēlaties dzēst šo produktu / pakalpojumu? @@ -179,7 +179,7 @@ CloneProduct=Klonēt produktu vai pakalpojumu ConfirmCloneProduct=Vai jūs tiešām vēlaties klonēt šo produktu vai pakalpojumu %s? CloneContentProduct=Klons visus galvenos informations par produktu / pakalpojumu ClonePricesProduct=Klons galvenos informations un cenas -CloneCompositionProduct=Klonēt virtuālo preci / pakalpojumu +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Šis produkts tiek izmantots NewRefForClone=Ref. jaunu produktu / pakalpojumu CustomerPrices=Klientu cenas @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimālā cena nevar būt zemāka par %s MinimumRecommendedPrice=Minimālā rekomendējamā cena : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang index 6e826e0f93d..63affb41543 100644 --- a/htdocs/langs/lv_LV/projects.lang +++ b/htdocs/langs/lv_LV/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Šo viedokli iepazīstina visus projektus un uzdevumus (jūsu lietotā Myprojects=Mani projekti ProjectsArea=Projektu sadaļa NewProject=Jauns projekts -AddProject=Pievienot projektu +AddProject=Izveidot projektu DeleteAProject=Dzēst projektu DeleteATask=Izdzēst uzdevumu ConfirmDeleteAProject=Vai tiešām vēlaties dzēst šo projektu? @@ -36,6 +36,8 @@ TaskTimeSpent=Pavadītais laiks veicot uzdevumus TaskTimeUser=Lietotājs TaskTimeNote=Piezīme TaskTimeDate=Datums +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Jauns pavadītais laiks MyTimeSpent=Mans pavadīts laiks MyTasks=Mani uzdevumi @@ -45,7 +47,7 @@ TaskDateStart=Uzdevuma sākuma datums TaskDateEnd=Uzdevuma beigu datums TaskDescription=Uzdevuma apraksts NewTask=Jauns uzdevums -AddTask=Pievienot uzdevumu +AddTask=Izveidot uzdevumu AddDuration=Pievienot ilgumu Activity=Aktivitāte Activities=Uzdevumi/aktivitātes diff --git a/htdocs/langs/lv_LV/resource.lang b/htdocs/langs/lv_LV/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/lv_LV/resource.lang +++ b/htdocs/langs/lv_LV/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang index df6d59bd321..5341718719f 100644 --- a/htdocs/langs/lv_LV/withdrawals.lang +++ b/htdocs/langs/lv_LV/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Kredīts WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Rādīt izņemšana IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tomēr, ja rēķins satur vismaz vienu maksājums, kas nav apstrādāts, to nevar noteikt kā apmaksātu. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Izstāšanās fails SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts" ThisWillAlsoAddPaymentOnInvoice=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Maksājumu pastāvīgā rīkojuma %s banka diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang index b5d84a0aca7..f12efa61626 100644 --- a/htdocs/langs/mk_MK/admin.lang +++ b/htdocs/langs/mk_MK/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s ViewFullDateActions=Show full dates events in the third sheet @@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Link BoxesAvailable=Boxes available @@ -444,7 +447,7 @@ Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmark management -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales @@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang index 1ed4e637d14..a24c678a2e5 100644 --- a/htdocs/langs/mk_MK/agenda.lang +++ b/htdocs/langs/mk_MK/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= All my events/tasks AllActions= All events/tasks ViewList=List view diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang index 9fe5eff520d..878eb49b3c9 100644 --- a/htdocs/langs/mk_MK/compta.lang +++ b/htdocs/langs/mk_MK/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/mk_MK/contracts.lang b/htdocs/langs/mk_MK/contracts.lang index 511516dc755..57ba3bb15d8 100644 --- a/htdocs/langs/mk_MK/contracts.lang +++ b/htdocs/langs/mk_MK/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=List of running services NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Services to activate among validated contracts -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Last %s activated services LastModifiedServices=Last %s modified services EditServiceLine=Edit service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang index a2c8ec77de2..53f8d168a55 100644 --- a/htdocs/langs/mk_MK/errors.lang +++ b/htdocs/langs/mk_MK/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang index 9246a04ced9..40bca8e85fb 100644 --- a/htdocs/langs/mk_MK/members.lang +++ b/htdocs/langs/mk_MK/members.lang @@ -1,204 +1,206 @@ # Dolibarr language file - Source file is en_US - members -# MembersArea=Members area -# PublicMembersArea=Public members area -# MemberCard=Member card -# SubscriptionCard=Subscription card -# Member=Member -# Members=Members -# MemberAccount=Member login -# ShowMember=Show member card -# UserNotLinkedToMember=User not linked to a member -# ThirdpartyNotLinkedToMember=Third-party not linked to a member -# MembersTickets=Members Tickets -# FundationMembers=Foundation members -# Attributs=Attributes -# ErrorMemberTypeNotDefined=Member type not defined -# ListOfPublicMembers=List of public members -# ListOfValidatedPublicMembers=List of validated public members -# ErrorThisMemberIsNotPublic=This member is not public -# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). -# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. -# ThisIsContentOfYourCard=This is details of your card -# CardContent=Content of your member card -# SetLinkToUser=Link to a Dolibarr user -# SetLinkToThirdParty=Link to a Dolibarr third party -# MembersCards=Members business cards -# MembersList=List of members -# MembersListToValid=List of draft members (to be validated) -# MembersListValid=List of valid members -# MembersListUpToDate=List of valid members with up to date subscription -# MembersListNotUpToDate=List of valid members with subscription out of date -# MembersListResiliated=List of resiliated members -# MembersListQualified=List of qualified members -# MenuMembersToValidate=Draft members -# MenuMembersValidated=Validated members -# MenuMembersUpToDate=Up to date members -# MenuMembersNotUpToDate=Out of date members -# MenuMembersResiliated=Resiliated members -# MembersWithSubscriptionToReceive=Members with subscription to receive -# DateAbonment=Subscription date -# DateSubscription=Subscription date -# DateNextSubscription=Next subscription -# DateEndSubscription=Subscription end date -# EndSubscription=End subscription -# SubscriptionId=Subscription id -# MemberId=Member id -# NewMember=New member -# NewType=New member type -# MemberType=Member type -# MemberTypeId=Member type id -# MemberTypeLabel=Member type label -# MembersTypes=Members types -# MembersAttributes=Members attributes -# SearchAMember=Search a member -# MemberStatusDraft=Draft (needs to be validated) -# MemberStatusDraftShort=Draft -# MemberStatusActive=Validated (waiting subscription) -# MemberStatusActiveShort=Validated -# MemberStatusActiveLate=subscription expired -# MemberStatusActiveLateShort=Expired -# MemberStatusPaid=Subscription up to date -# MemberStatusPaidShort=Up to date -# MemberStatusResiliated=Resiliated member -# MemberStatusResiliatedShort=Resiliated -# MembersStatusToValid=Draft members -# MembersStatusToValidShort=Draft members -# MembersStatusValidated=Validated members -# MembersStatusPaid=Subscription up to date -# MembersStatusPaidShort=Up to date -# MembersStatusNotPaid=Subscription out of date -# MembersStatusNotPaidShort=Out of date -# MembersStatusResiliated=Resiliated members -# MembersStatusResiliatedShort=Resiliated members -# NewCotisation=New contribution -# PaymentSubscription=New contribution payment -# EditMember=Edit member -# SubscriptionEndDate=Subscription's end date -# MembersTypeSetup=Members type setup -# NewSubscription=New subscription -# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. -# Subscription=Subscription -# Subscriptions=Subscriptions -# SubscriptionLate=Late -# SubscriptionNotReceived=Subscription never received -# SubscriptionLateShort=Late -# SubscriptionNotReceivedShort=Never received -# ListOfSubscriptions=List of subscriptions -# SendCardByMail=Send card by Email -# AddMember=Add member -# MemberType=Member type -# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" -# NewMemberType=New member type -# WelcomeEMail=Welcome e-mail -# SubscriptionRequired=Subscription required -# EditType=Edit member type -# DeleteType=Delete -# VoteAllowed=Vote allowed -# Physical=Physical -# Moral=Moral -# MorPhy=Moral/Physical -# Reenable=Reenable -# ResiliateMember=Resiliate a member -# ConfirmResiliateMember=Are you sure you want to resiliate this member ? -# DeleteMember=Delete a member -# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? -# DeleteSubscription=Delete a subscription -# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? -# Filehtpasswd=htpasswd file -# ValidateMember=Validate a member -# ConfirmValidateMember=Are you sure you want to validate this member ? -# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. -# PublicMemberList=Public member list -# BlankSubscriptionForm=Public auto-subscription form -# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. -# EnablePublicSubscriptionForm=Enable the public auto-subscription form -# MemberPublicLinks=Public links/pages -# ExportDataset_member_1=Members and subscriptions -# ImportDataset_member_1=Members -# LastMembers=Last %s members -# LastMembersModified=Last %s modified members -# LastSubscriptionsModified=Last %s modified subscriptions -# AttributeName=Attribute name -# String=String -# Text=Text -# Int=Int -# Date=Date -# DateAndTime=Date and time -# PublicMemberCard=Member public card -# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -# AddSubscription=Add subscription -# ShowSubscription=Show subscription -# MemberModifiedInDolibarr=Member modified in Dolibarr -# SendAnEMailToMember=Send information email to member -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription -# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription -# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation -# DescADHERENT_MAIL_VALID=EMail for member validation -# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription -# DescADHERENT_MAIL_COTIS=EMail for subscription -# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation -# DescADHERENT_MAIL_RESIL=EMail for member resiliation -# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails -# DescADHERENT_ETIQUETTE_TYPE=Format of labels page -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets -# DescADHERENT_CARD_TYPE=Format of cards page -# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards -# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) -# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) -# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards -# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here -# MayBeOverwrited=This text can be overwrited by value defined for member's type -# ShowTypeCard=Show type '%s' -# HTPasswordExport=htpassword file generation -# NoThirdPartyAssociatedToMember=No third party associated to this member -# ThirdPartyDolibarr=Dolibarr third party -# MembersAndSubscriptions= Members and Subscriptions -# MoreActions=Complementary action on recording -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription -# MoreActionBankDirect=Create a direct transaction record on account -# MoreActionBankViaInvoice=Create an invoice and payment on account -# MoreActionInvoiceOnly=Create an invoice with no payment -# LinkToGeneratedPages=Generate visit cards -# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. -# DocForAllMembersCards=Generate business cards for all members -# DocForOneMemberCards=Generate business cards for a particular member -# DocForLabels=Generate address sheets -# SubscriptionPayment=Subscription payment -# LastSubscriptionDate=Last subscription date -# LastSubscriptionAmount=Last subscription amount -# MembersStatisticsByCountries=Members statistics by country -# MembersStatisticsByState=Members statistics by state/province -# MembersStatisticsByTown=Members statistics by town -# NbOfMembers=Number of members -# NoValidatedMemberYet=No validated members found -# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. -# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. -# MembersByTownDesc=This screen show you statistics on members by town. -# MembersStatisticsDesc=Choose statistics you want to read... -# MenuMembersStats=Statistics -# LastMemberDate=Last member date -# Nature=Nature -# Public=Information are public -# Exports=Exports -# NewMemberbyWeb=New member added. Awaiting approval -# NewMemberForm=New member form -# SubscriptionsStatistics=Statistics on subscriptions -# NbOfSubscriptions=Number of subscriptions -# AmountOfSubscriptions=Amount of subscriptions -# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) -# DefaultAmount=Default amount of subscription -# CanEditAmount=Visitor can choose/edit amount of its subscription -# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page -# Associations=Foundations -# Collectivités=Organizations -# Particuliers=Personal -# Entreprises=Companies -# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member +Members=Members +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions +ImportDataset_member_1=Members +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang index cb88461602d..81d217ddb54 100644 --- a/htdocs/langs/mk_MK/products.lang +++ b/htdocs/langs/mk_MK/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang index 4affd1fdc5a..c48e27fd204 100644 --- a/htdocs/langs/mk_MK/projects.lang +++ b/htdocs/langs/mk_MK/projects.lang @@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant Myprojects=My projects ProjectsArea=Projects area NewProject=New project -AddProject=Add project +AddProject=Create project DeleteAProject=Delete a project DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task -AddTask=Add task +AddTask=Create task AddDuration=Add duration Activity=Activity Activities=Tasks/activities diff --git a/htdocs/langs/mk_MK/resource.lang b/htdocs/langs/mk_MK/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/mk_MK/resource.lang +++ b/htdocs/langs/mk_MK/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang index e4337309084..ea32511fefb 100644 --- a/htdocs/langs/mk_MK/withdrawals.lang +++ b/htdocs/langs/mk_MK/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index c84d2eba95a..af6294c16fe 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Bruk autofullfør-felt for å velge tredjepart, i stede ActivityStateToSelectCompany= Legg til en filter alternativ for å vise / skjule thirdparties som i dag er i aktivitet eller har opphørt det UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Bruk autofullfør-felt for å velge kontakt (i stedet for å bruke listeboks). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Søkefiltrene alternativer NumberOfKeyToSearch=NBR tegn til å utløse søk: %s ViewFullDateActions=Vis fulle datoer i tredje ark @@ -208,6 +210,7 @@ ModulesJobDesc=Forretningsmoduler gir et enkelt forhåndsinnstilt oppsett av Dol ModulesMarketPlaceDesc=Du kan finne flere moduler for å laste ned på eksterne nettsider på Internett ... ModulesMarketPlaces=Flere moduler ... DoliStoreDesc=DoliStore, den offisielle markedsplassen for Dolibarr ERP / CRM eksterne moduler +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Webområde leverandører du kan søke å finne flere moduler ... URL=Link BoxesAvailable=Tilgjengelige bokser @@ -444,7 +447,7 @@ Module55Desc=Behandling av strekkoder Module56Name=Telefoni Module56Desc=Telefoniintegrasjon Module57Name=Standing orders -Module57Desc=Standing orders and withdrawals' management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial integrasjon Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS nyhetsstrøm Module320Desc=Legg til RSS nyhetsstrøm på Dolibarrsider Module330Name=Bookmerker Module330Desc=Behandling av bokmerker -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webkalender Module410Desc=Intergrasjon med webkalender Module500Name=Spesielle utgifter (skatt, sosiale bidrag, utbytte) @@ -495,6 +498,8 @@ Module1780Name=Kategorier Module1780Desc=Behandling av kategorier (varer, leverandører og kunder) Module2000Name=Fckeditor Module2000Desc=WYSIWYG Editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Behandle planlagte oppgaver Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Lagre og dele dokumenter Module2600Name=SOAP baserte WebServices Module2600Desc=Aktiver Dolibarr webtjenester server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Bruke elektronisk Gravatar tjeneste (www.gravatar.com) for å vise bilde av brukere / medlemmer (funnet med e-post). Trenger du en Internett-tilgang Module2800Desc=FTP-klient @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PAYBOX Module50000Desc=Modul å tilby en online betaling side med kredittkort med PAYBOX Module50100Name=Kassaapparat @@ -527,7 +534,7 @@ Module50200Desc=Modul å tilby en online betaling side med kredittkort med Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Marginer @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordremetoder DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Innstillinger lagret BackToModuleList=Tilbake til moduloversikt BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent søkeskjema i venstre meny DefaultLanguage=Ønsket standardspråk (språkkode) EnableMultilangInterface=Aktiver flerspråklig grensesnitt EnableShowLogo=Vis logo på venstre meny +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Systemet ditt er oppdatert! CompanyInfo=Firma/organisasjonsinformasjon CompanyIds=Firma/organisasjons IDer diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang index 5f9c624b305..b277a015704 100644 --- a/htdocs/langs/nb_NO/agenda.lang +++ b/htdocs/langs/nb_NO/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Handlinger relatert til ActionsDoneBy=Handlinger utført av ActionsForUser=Hendelser for brukere ActionsForUsersGroup=Hendelser for alle brukerene i gruppen +ActionAssignedTo=Event assigned to AllMyActions= Alle mine handlinger/oppgaver AllActions= Alle handlinger/oppgaver ViewList=Vis liste diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang index 98d6fdd4f5f..a2c7df48a4d 100644 --- a/htdocs/langs/nb_NO/compta.lang +++ b/htdocs/langs/nb_NO/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang index 65aa8892fc3..e8fe7fe9637 100644 --- a/htdocs/langs/nb_NO/contracts.lang +++ b/htdocs/langs/nb_NO/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Oversikt over løpende kontraktslinjer ListOfRunningServices=Overikt over løpende tjenster NotActivatedServices=Ikke aktiverte tjenester (blant godkjente kontrakter) BoardNotActivatedServices=Tjenester til aktivering blant godkjente kontrakter -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Siste %s aktiverte tjenester LastModifiedServices=Siste %s endrede tjenester EditServiceLine=Rediger tjenestelinje @@ -91,6 +91,7 @@ ListOfServicesToExpire=Liste over utløpende tjenester NoteListOfYourExpiredServices=Denne listen inneholder kun tjenester av kontrakter for tredjeparter du er koblet til som salgsrepresentant. StandardContractsTemplate=Standard kontraktskjema ContactNameAndSignature=For %s, navn og signatur: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Salgsrepresentant som signerer kontrakten diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang index 1e993ae8706..5b4f25054b9 100644 --- a/htdocs/langs/nb_NO/errors.lang +++ b/htdocs/langs/nb_NO/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Leverandørkode påkrevet ErrorSupplierCodeAlreadyUsed=Leverandørkode allerede brukt ErrorBadParameters=Ugyldige parametere ErrorBadValueForParameter=Feil verdi "%s 'for parameter feil' Choice %s 'Choice -ErrorBadImageFormat=Bildet filen har ikke et støttet format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Verdien '%s' har feil dato format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Kan ike skrive til mappen %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Bruker med logg %s kunne ikke bli funnet. ErrorLoginHasNoEmail=Denne brukeren har ingen e-postadresse. Behandle avbrutt. ErrorBadValueForCode=Bad verdi for sikkerhetskode. Prøv igjen med ny verdi ... ErrorBothFieldCantBeNegative=Fields %s og %s kan ikke være både negativt +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Brukerkonto %s brukes til å utføre web-server har ikke tillatelse til at ErrorNoActivatedBarcode=Ingen strekkodetype aktivert ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang index 1d4c388b824..ad0d955a3cf 100644 --- a/htdocs/langs/nb_NO/members.lang +++ b/htdocs/langs/nb_NO/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Late SubscriptionNotReceivedShort=Fikk aldri ListOfSubscriptions=Liste av abonnementer SendCardByMail=Send kortet via e-post -AddMember=Legg medlem +AddMember=Create member NoTypeDefinedGoToSetup=Ingen medlemmer typer definert. Gå til setup - Medlemmer typer NewMemberType=Nytt medlem type WelcomeEMail=Velkommen e-post @@ -125,7 +125,7 @@ Date=Dato DateAndTime=Dato og tid PublicMemberCard=Medlem offentlige kort MemberNotOrNoMoreExpectedToSubscribe=Medlem ikke eller ikke mer forventes å abonnere -AddSubscription=Legg abonnement +AddSubscription=Create subscription ShowSubscription=Vis abonnement MemberModifiedInDolibarr=Medlem endret i Dolibarr SendAnEMailToMember=Send informasjon epost til medlem @@ -203,3 +203,4 @@ MembersByNature=Medlemmer av natur VATToUseForSubscriptions=Mva-sats som skal brukes for abonnementer NoVatOnSubscription=Ingen TVA for abonnementer MEMBER_PAYONLINE_SENDEMAIL=Send e-post når Dolibarr mottar en bekreftelse på en validert betaling for abonnement +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang index 0abab5ff6f6..6590ee183f2 100644 --- a/htdocs/langs/nb_NO/products.lang +++ b/htdocs/langs/nb_NO/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Hvis varen er en tjeneste med begrenset varighet: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Prisnummer MultiPriceLevelsName=Priskategorier -AssociatedProductsAbility=Aktiver tilknyttede varer -AssociatedProducts=Tilknyttede varer -AssociatedProductsNumber=Antall tilknyttede varer -ParentProductsNumber=Antall foreldre produkt -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Tilknytninger Translation=Oversettelse KeywordFilter=Nøkkelordfilter @@ -132,7 +132,7 @@ AddDel=Ny/slett Quantity=Mengde NoMatchFound=Ingen treff ProductAssociationList=Overikt over tilknyttede varer/tjenester: navn på vare/tjeneste (mengdepåvirket) -ProductParentList=Liste over produkter / tjenester med dette produktet som en komponent +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=En av de valgte varene er foreldre til gjeldende vare DeleteProduct=Slett vare/tjeneste ConfirmDeleteProduct=Er du sikker på at du vil slette valgte vare/tjeneste? @@ -155,11 +155,11 @@ QtyMin=Minimum Qty PriceQty=Pris for dette kvantum PriceQtyMin=Price for this min. qty (w/o discount) VATRateForSupplierProduct=VAT Rate (for this supplier/product) -DiscountQtyMin=Default discount for qty +DiscountQtyMin=Standard NoPriceDefinedForThisSupplier=Ingen pris/mengde definert for denne leverandør/varekombinasjonen NoSupplierPriceDefinedForThisProduct=Ingen leverandørpris/mengde definert for varen RecordedProducts=Registrerte varer -RecordedServices=Services recorded +RecordedServices=Registrerte tjenester RecordedProductsAndServices=Registrete varer/tjenester PredefinedProductsToSell=Predefined products to sell PredefinedServicesToSell=Predefined services to sell @@ -179,7 +179,7 @@ CloneProduct=Klon produkt eller tjeneste ConfirmCloneProduct=Er du sikker på at du vil klone produktet eller tjenesten %s? CloneContentProduct=Klon alle de viktigste informasjoner av produkt / tjeneste ClonePricesProduct=Klone viktigste informasjon og priser -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Dette produktet brukes NewRefForClone=Ref. av nye produkt / tjeneste CustomerPrices=Kunder priser @@ -191,9 +191,9 @@ HiddenIntoCombo=Gjemt i enkelte lister Nature=Natur ProductCodeModel=Product ref template ServiceCodeModel=Service ref template -AddThisProductCard=Create product card +AddThisProductCard=Opprett produktkort HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist. -AddThisServiceCard=Create service card +AddThisServiceCard=Opprett tjenestekort HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist. CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang index 62e4b1ce453..7b9132b42fb 100644 --- a/htdocs/langs/nb_NO/projects.lang +++ b/htdocs/langs/nb_NO/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukerti Myprojects=Mine prosjekter ProjectsArea=Prosjektområde NewProject=Nytt prosjekt -AddProject=Legg til prosjekt +AddProject=Create project DeleteAProject=Slett et prosjekt DeleteATask=Slette en oppgave ConfirmDeleteAProject=Er du sikker på at du vil slette dette prosjektet? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Ny tid brukt MyTimeSpent=Mitt tidsforbruk MyTasks=Mine oppgaver @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Ny oppgave -AddTask=Legg til oppgave +AddTask=Create task AddDuration=Legg til varighet Activity=Aktivitet Activities=Oppgaver / aktiviteter diff --git a/htdocs/langs/nb_NO/resource.lang b/htdocs/langs/nb_NO/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/nb_NO/resource.lang +++ b/htdocs/langs/nb_NO/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang index 92614725008..5de436e0476 100644 --- a/htdocs/langs/nb_NO/withdrawals.lang +++ b/htdocs/langs/nb_NO/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Kreditt på WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Vis Angrerett IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Men hvis faktura har minst én tilbaketrekning betaling ennå ikke behandlet, vil det ikke bli satt som utbetales å tillate å administrere uttak før. -DoStandingOrdersBeforePayments=Dette faner lar deg for å be om en stående ordre. Når det blir ferdig, kan du skrive inn betaling for å lukke fakturaen. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Betaling av fast oppdrag %s av banken diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 2594d6c0ff3..91728e6f234 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Gebruik automatisch aanvullende velden om relaties te k ActivityStateToSelectCompany= Voeg een filter optie voor het tonen / verbergen thirdparties die momenteel in de activiteiten of niet langer het UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Gebruik automatisch aanvullende velden om contacten te kiezen ipv een lijst. +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Zoekfilters opties NumberOfKeyToSearch=Aantal karakters om een zoekopdracht te initiëren: %s ViewFullDateActions=Toon volledige data-acties in het derden 'sheet' @@ -208,6 +210,7 @@ ModulesJobDesc=Bedrijfsmodules zorgen voor een eenvoudige voorgeconfigureerde in ModulesMarketPlaceDesc=U kunt meer downloadbare modules vinden op externe websites op het internet. ModulesMarketPlaces=Meer modules DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Websiteaanbieders waarop u naar meer modules kunt zoeken URL=Link BoxesAvailable=Beschikbare vakken @@ -444,7 +447,7 @@ Module55Desc=Streepjescodesbeheer Module56Name=Telefonie Module56Desc=Telefoniebeheer Module57Name=Tekenen -Module57Desc=Beheer van heffingen en bankonttrekkingen +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integratie van een 'ClickToDial' systeem (Asterisk, etc) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS-feeds Module320Desc=Voeg een RSS feed toe in de informatieschermen van Dolibarr Module330Name=Weblinks (Favouriete internetpagina's in het menu weergeven) Module330Desc=weblinkbeheer -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webkalender Module410Desc=Integratie van een webkalender Module500Name=Bijzondere uitgaven (BTW, sociale lasten, dividenden) @@ -495,6 +498,8 @@ Module1780Name=Categorieën Module1780Desc=Categoriebeheer (producten, leveranciers en afnemers) Module2000Name=Fckeditor Module2000Desc=Een WYSIWYG editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Beheer taakplanning Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Opslaan en delen van documenten Module2600Name=Webdiensten Module2600Desc=Activeer de Dolibarr webdienstenserver +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Gebruik de online dienst 'Gravatar' (www.gravatar.com) voor het posten van afbeeldingen van gebruikers / leden (gevonden door hun e-mails). Internet toegang vereist. Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow beheer Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Module om een ​​online betaling pagina te bieden door creditcard met Paybox Module50100Name=Verkooppunt @@ -527,7 +534,7 @@ Module50200Desc=Module om een ​​online betaling pagina te bieden per credit Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module om online polls (zoals Doodle, Studs, Rdvz, ...) te maken Module59000Name=Marges @@ -779,6 +786,7 @@ DictionaryOrderMethods=Bestel methodes DictionarySource=Oorsprong van offertes / bestellingen DictionaryAccountancyplan=Rekeningschema DictionaryAccountancysystem=Modellen voor rekeningschema +DictionaryEMailTemplates=Emails templates SetupSaved=Instellingen opgeslagen BackToModuleList=Terug naar moduleoverzicht BackToDictionaryList=Terug naar de woordenboeken lijst @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent zoekformulier in linker menu DefaultLanguage=Standaard te gebruiken taal (taal-code) EnableMultilangInterface=Inschakelen meertalige interface EnableShowLogo=Toon logo in het linker menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Uw systeem is bijgewerkt CompanyInfo=Bedrijf / stichting informatie CompanyIds=Bedrijf / stichting identiteiten diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang index 8c50ac2720c..7ba26ccd595 100644 --- a/htdocs/langs/nl_NL/agenda.lang +++ b/htdocs/langs/nl_NL/agenda.lang @@ -6,7 +6,7 @@ Agenda=Agenda Agendas=Agenda's Calendar=Kalender Calendars=Kalenders -LocalAgenda=Internal calendar +LocalAgenda=Interne kalender ActionsOwnedBy=Event owned by AffectedTo=Geaffecteerden DoneBy=Gedaan door @@ -23,12 +23,13 @@ MenuToDoActions=Alle openstaande acties MenuDoneActions=Alle beëindigde acties MenuToDoMyActions=Mijn openstaande acties MenuDoneMyActions=Mijn beëindigde acties -ListOfEvents=List of events (internal calendar) +ListOfEvents=Lijst van evenement (interne kalender) ActionsAskedBy=Acties geregistreerd door ActionsToDoBy=Acties toegewezen aan ActionsDoneBy=Acties gedaan door ActionsForUser=Evenementen voor gebruiker ActionsForUsersGroup=Evenementen voor alle gebruikers van de groep +ActionAssignedTo=Event assigned to AllMyActions= Al mijn acties / taken AllActions= Alle acties / taken ViewList=Bekijk de lijst diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang index 0ff141ea1ed..1819c47be8f 100644 --- a/htdocs/langs/nl_NL/categories.lang +++ b/htdocs/langs/nl_NL/categories.lang @@ -109,4 +109,4 @@ CategoriesSetup=Opzetten categorieën CategorieRecursiv=Automatisch linken met bovenliggende categorie CategorieRecursivHelp=Indien geactiveerd zal het product ook gelinkt worden met de bovenliggende categorie wanneer een subcategorie toegevoegd wordt. AddProductServiceIntoCategory=Voeg het volgende product/dienst toe -ShowCategory=Show category +ShowCategory=Laat categorie zien diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang index 37631e3b272..807bdccd23b 100644 --- a/htdocs/langs/nl_NL/commercial.lang +++ b/htdocs/langs/nl_NL/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospecten DeleteAction=Verwijder een actie NewAction=Nieuwe actie -AddAction=Toevoegen actie -AddAnAction=Voeg een actie toe -AddActionRendezVous=Voeg een vergadering toe +AddAction=Creëer gebeurtenis/taak +AddAnAction=Creëer een gebeurtenis/taak +AddActionRendezVous=Creëer een afspraak Rendez-Vous=Vergadering ConfirmDeleteAction=Weet u zeker dat u deze actie wilt verwijderen? CardAction=Actiedetails @@ -44,8 +44,8 @@ DoneActions=Voltooide acties DoneActionsFor=Voltooide acties voor %s ToDoActions=Onvolledige acties ToDoActionsFor=Onvolledige acties voor %s -SendPropalRef=Stuur offerte %s -SendOrderRef=Stuur Opdracht %s +SendPropalRef=Indienen van commerciëel voorstel %s +SendOrderRef=Indienen van de order %s StatusNotApplicable=Niet van toepassing StatusActionToDo=Te doen StatusActionDone=Gedaan @@ -62,7 +62,7 @@ LastProspectContactDone=Contact opgevolgd DateActionPlanned=Datum actie gepland voor DateActionDone=Datum actie uitgevoerd ActionAskedBy=Actie gevraagd door -ActionAffectedTo=Toewijzen aan +ActionAffectedTo=Gebeurtenis is eigendom van ActionDoneBy=Actie gedaan door ActionUserAsk=Geregistreerd door ErrorStatusCantBeZeroIfStarted=Als veld 'Datum uitgevoerd' is gevuld, is de actie gestart (of afgelopen), dus veld 'Status' kan niet 0%% worden. diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang index 66c85f33f0e..2a093d76225 100644 --- a/htdocs/langs/nl_NL/compta.lang +++ b/htdocs/langs/nl_NL/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=volgens de leverancier, kiest u geschikte methode om TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een kas boukhoudings-modus is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van betrokkenheid accountancy-modus (zie setup van boukhoud module). CalculationMode=Berekeningswijze AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang index 5178ce872a3..80c0173ed8d 100644 --- a/htdocs/langs/nl_NL/contracts.lang +++ b/htdocs/langs/nl_NL/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lijst van de lopende contractregels ListOfRunningServices=Lijst van lppende diensten NotActivatedServices=Inactieve diensten (onder gevalideerde contracten) BoardNotActivatedServices=Diensten te activeren onder gevalideerde contracten -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Laatste %s geactiveerd diensten LastModifiedServices=Laatste %s bewerkte diensten EditServiceLine=Bewerk dienstenregel @@ -91,6 +91,7 @@ ListOfServicesToExpire=Lijst van Diensten te vervallen NoteListOfYourExpiredServices=Deze lijst bevat alleen de diensten van contracten voor relatiesdie zijn gekoppeld aan een vertegenwoordiger. StandardContractsTemplate=Standaard contracten sjabloon ContactNameAndSignature=Voor %s, naam en handtekening: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Vertegenwoordiger ondertekening contract diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang index 2f63daa41a1..e12bceca15f 100644 --- a/htdocs/langs/nl_NL/cron.lang +++ b/htdocs/langs/nl_NL/cron.lang @@ -1,63 +1,63 @@ # Dolibarr language file - Source file is en_US - cron # About page About = Over -CronAbout = About Cron -CronAboutPage = Cron about page +CronAbout = Over Cron +CronAboutPage = Over Cron pagina # Right -Permission23101 = Read Scheduled task -Permission23102 = Create/update Scheduled task -Permission23103 = Delete Scheduled task -Permission23104 = Execute Scheduled task +Permission23101 = Lees geplande taak +Permission23102 = Maak/wijzig geplande taak +Permission23103 = Verwijder geplande taak +Permission23104 = Voer geplande taak uit # Admin -CronSetup= Scheduled job management setup +CronSetup= Beheer taakplanning URLToLaunchCronJobs=URL to check and launch cron jobs if required OrToLaunchASpecificJob=Or to check and launch a specific job KeyForCronAccess=Security key for URL to launch cron jobs -FileToLaunchCronJobs=Command line to launch cron jobs -CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +FileToLaunchCronJobs=Commando regel om cron jobs uit te voeren +CronExplainHowToRunUnix=In een Unix omgeving dien je de crontab te gebruiken om commando's geplanned uit te voeren CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes # Menu -CronJobs=Scheduled jobs -CronListActive=List of active/scheduled jobs +CronJobs=Geplande taken +CronListActive=Lijst van active/geplande taken CronListInactive=List of disabled jobs # Page list CronDateLastRun=Last run CronLastOutput=Last run output CronLastResult=Last result code CronListOfCronJobs=List of scheduled jobs -CronCommand=Command +CronCommand=Commando CronList=Jobs list CronDelete= Delete cron jobs -CronConfirmDelete= Are you sure you want to delete this cron job ? -CronExecute=Launch job -CronConfirmExecute= Are you sure to execute this job now +CronConfirmDelete= Weet je zker dat je deze cron taak wilt verwijderen? +CronExecute=Voer taak uit +CronConfirmExecute= Weet je zeker dat je deze taak nu uit wilt voeren CronInfo= Jobs allow to execute task that have been planned -CronWaitingJobs=Wainting jobs -CronTask=Job +CronWaitingJobs=Wachtende taken +CronTask=Taak CronNone= Geen CronDtStart=Begindatum CronDtEnd=Einddatum -CronDtNextLaunch=Next execution -CronDtLastLaunch=Last execution -CronFrequency=Frequancy -CronClass=Classe +CronDtNextLaunch=Volgende uitvoering +CronDtLastLaunch=Laatste uitvoering +CronFrequency=Frequentie +CronClass=Klasse CronMethod=Methode CronModule=Module -CronAction=Action +CronAction=Aktie CronStatus=Status CronStatusActive=Ingeschakeld CronStatusInactive=Uitgeschakeld -CronNoJobs=No jobs registered +CronNoJobs=Geen taken opgenomen CronPriority=Prioriteit CronLabel=Beschrijving CronNbRun=Nb. launch -CronEach=Every -JobFinished=Job launched and finished +CronEach=Elke +JobFinished=Taak gestart en be-eindigd #Page card -CronAdd= Add jobs -CronHourStart= Start Hour and date of task -CronEvery= And execute task each -CronObject= Instance/Object to create +CronAdd= Taak toevoegen +CronHourStart= Start uur en datum van de taak +CronEvery= Taak uitvoeren elke +CronObject= Instantie/Object om te creeren CronArgs=Instellingen CronSaveSucess=Save succesfully CronNote=Reactie @@ -76,11 +76,11 @@ CronMethodHelp=The object method to launch.
For exemple to fetch method of CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef CronCommandHelp=The system command line to execute. # Info -CronInfoPage=Information +CronInfoPage=Informatie # Common -CronType=Task type -CronType_method=Call method of a Dolibarr Class -CronType_command=Shell command +CronType=Taak type +CronType_method=Aanroep methode van Dolibarr Class +CronType_command=Shell commando CronMenu=Cron -CronCannotLoadClass=Cannot load class %s or object %s +CronCannotLoadClass=Kan klasse %s of object %s niet laden UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang index f56a053b476..6f146184c81 100644 --- a/htdocs/langs/nl_NL/errors.lang +++ b/htdocs/langs/nl_NL/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Leverancierscode vereist ErrorSupplierCodeAlreadyUsed=Leverancierscode al gebruikt ErrorBadParameters=Verkeerde parameters ErrorBadValueForParameter=Verkeerde waarde %s voor parameter incorrect %s -ErrorBadImageFormat=Image-bestand heeft niet een ondersteund formaat +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Waarde %s heeft verkeerde datum formaat ErrorWrongDate=Datum is niet correct! ErrorFailedToWriteInDir=Schrijven in de map %s mislukt @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Gebruiker met gebruikersnaam %s kon niet worden g ErrorLoginHasNoEmail=Deze gebruiker heeft geen e-mail adres. Proces afgebroken. ErrorBadValueForCode=Onjuist waardetypen voor code. Probeer het opnieuw met een nieuwe waarde ErrorBothFieldCantBeNegative=Velden %s %s en kan niet beide negatief +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s gebruikt om web-server uit te voeren heeft geen toestemming voor die ErrorNoActivatedBarcode=Geen geactiveerde barcode soort ErrUnzipFails=uitpakken %s mislukt met ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Fout, er sommige leveringen gekoppeld met deze verzending. Schrapping geweigerd. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Verplichte setup parameters zijn nog niet gedefinieerd diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang index 2e424ae3638..3e29b8dd217 100644 --- a/htdocs/langs/nl_NL/members.lang +++ b/htdocs/langs/nl_NL/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Laat SubscriptionNotReceivedShort=Nooit ontvangen ListOfSubscriptions=Abonnementenlijst SendCardByMail=Stuur kaart per e-mail -AddMember=Lid toevoegen +AddMember=Create member NoTypeDefinedGoToSetup=Geen lidtypes ingesteld. Ga naar Home->Setup->Ledentypes NewMemberType=Nieuw lidtype WelcomeEMail=Welkomst e-mail @@ -125,7 +125,7 @@ Date=Datum DateAndTime=Datum en tijd PublicMemberCard=Publieke lidmaatschapskaart MemberNotOrNoMoreExpectedToSubscribe=Lid niet geabonneerd of niet langer verwacht te abonneren -AddSubscription=Abonnement toevoegen +AddSubscription=Create subscription ShowSubscription=Toon abonnement MemberModifiedInDolibarr=Lid gewijzigd in Dolibarr SendAnEMailToMember=Stuur een informatieve e-mail naar lid @@ -203,3 +203,4 @@ MembersByNature=Leden volgens aard VATToUseForSubscriptions=BTW tarief voor inschrijvingen NoVatOnSubscription=Geen BTW bij inschrijving MEMBER_PAYONLINE_SENDEMAIL=E-mail om te verwittigen dat Dolibarr een bericht ontvangen heeft voor een bevestigde betaling van een inschrijving +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang index 56a94002352..a1af668f2a6 100644 --- a/htdocs/langs/nl_NL/orders.lang +++ b/htdocs/langs/nl_NL/orders.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - orders -OrdersArea=Afnemersopdrachtenoverzicht -SuppliersOrdersArea=Leveranciersopdrachtenoverzicht +OrdersArea=Klantenorders overzicht +SuppliersOrdersArea=Leverancierorders overzicht OrderCard=Opdrachtenkaart OrderId=Ordernr -Order=Opdracht -Orders=Opdrachten -OrderLine=Opdrachtregel +Order=Order +Orders=Orders +OrderLine=Orderregel OrderFollow=Opvolging OrderDate=Opdrachtdatum OrderToProcess=Te verwerken opdracht diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang index 64c7b084a83..0902653a39e 100644 --- a/htdocs/langs/nl_NL/products.lang +++ b/htdocs/langs/nl_NL/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Als product een dienst is met een beperkte houdbaarheid: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Aantal prijzen MultiPriceLevelsName=Prijscategorieën -AssociatedProductsAbility=Activeer de onderliggende producten -AssociatedProducts=Onderliggende producten -AssociatedProductsNumber=Aantal producten waaruit dit product bestaat -ParentProductsNumber=Aantal ouder product -IfZeroItIsNotAVirtualProduct=Bij 0 is dit geen virtueel product -IfZeroItIsNotUsedByVirtualProduct=Bij 0 is dit product niet in gebruik voor een virtueel product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associatie Translation=Vertaling KeywordFilter=Trefwoord filter @@ -132,7 +132,7 @@ AddDel=Toevoegen / verwijderen Quantity=Hoeveelheid NoMatchFound=Geen resultaten gevonden ProductAssociationList=Lijst van gerelateerde producten / diensten: naam van het product / de dienst (hoeveelheid geaffecteerd) -ProductParentList=Lijst van producten / diensten met dit product als een onderdeel +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is de ouder van het huidige product DeleteProduct=Verwijderen een product / dienst ConfirmDeleteProduct=Weet u zeker dat u dit product / deze dienst wilt verwijderen? @@ -179,7 +179,7 @@ CloneProduct=Kopieer product of dienst ConfirmCloneProduct=Weet u zeker dat u het product of de dienst %s wilt klonen? CloneContentProduct=Kloon alle hoofdinformatie van het product / de dienst ClonePricesProduct=Kloon hoofdinformatie en prijzen -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Dit product wordt gebruikt NewRefForClone=Referentie naar nieuw produkt / dienst CustomerPrices=Consumentenprijs @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang index 3f6d56447eb..3485fa3faec 100644 --- a/htdocs/langs/nl_NL/projects.lang +++ b/htdocs/langs/nl_NL/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staa Myprojects=Mijn projecten ProjectsArea=Projectenoverzicht NewProject=Nieuw project -AddProject=Project toevoegen +AddProject=Create project DeleteAProject=Project verwijderen DeleteATask=Taak verwijderen ConfirmDeleteAProject=Weet u zeker dat u dit project wilt verwijderen? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Nieuwe bestede tijd MyTimeSpent=Mijn bestede tijd MyTasks=Mijn taken @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Nieuwe taak -AddTask=Taak toevoegen +AddTask=Create task AddDuration=Duur toevoegen Activity=Activiteit Activities=Taken / activiteiten diff --git a/htdocs/langs/nl_NL/resource.lang b/htdocs/langs/nl_NL/resource.lang index ead6e558dd8..2f498d486b8 100644 --- a/htdocs/langs/nl_NL/resource.lang +++ b/htdocs/langs/nl_NL/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Bevestig verwijderen van deze resource RessourceSuccessfullyDeleted=Resource met succes verwijderd DictionaryResourceType=Type resources -DictionaryEMailTemplates=E-mail modellen - SelectResource=Kies resource diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang index 152e287db16..191a09d27f3 100644 --- a/htdocs/langs/nl_NL/withdrawals.lang +++ b/htdocs/langs/nl_NL/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Crediteer op WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Toon intrekking IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Echter, als factuur is ten minste een terugtrekking betaling nog niet verwerkt, zal het niet worden ingesteld als betaald om tot terugtrekking te beheren voor. -DoStandingOrdersBeforePayments=Deze tabs kunt u aanvraag voor een permanente opdracht. Zodra het zal worden afgewerkt, kunt u de betaling aan de factuur te sluiten. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Betaling van periodieke overboeking %s door de bank diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 359ed174113..9dd96d2668b 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Dodaj filtr opcję aby pokazać / ukryć thirdparties, które są aktualnie w działalności lub przestał go UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Opcje filtrów wyszukiwania NumberOfKeyToSearch=NBR znaków do uruchomienia wyszukiwania: %s ViewFullDateActions=Pokaż pełny terminy działań w trzecim arkusza @@ -208,6 +210,7 @@ ModulesJobDesc=Biznes moduły zapewniają prostą konfigurację predefiniowanych ModulesMarketPlaceDesc=Mogą Państwo znaleźć więcej modułów do pobrania na zewnętrznych stron internetowych w internecie ... ModulesMarketPlaces=Więcej modułów ... DoliStoreDesc=DoliStore, urzędowy rynek dla Dolibarr ERP / CRM modułów zewnętrznych +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=dostawców sieci Web można szukać, aby znaleźć więcej modułów ... URL=Łącze BoxesAvailable=Pola dostępne @@ -444,7 +447,7 @@ Module55Desc=Kody kreskowe zarządzania Module56Name=Telefonia Module56Desc=Telefonia integracji Module57Name=Zlecenia stałe -Module57Desc=Zlecenia stałe i wycofań zarządzania +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial integracji Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Dodaj kanał RSS Dolibarr wewnątrz ekranu stron Module330Name=Zakładki Module330Desc=Zakładki zarządzania -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integracji Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Kategorie Module1780Desc=Kategorie zarządzania (produktów, dostawców i klientów) Module2000Name=FCKeditor Module2000Desc=Edytor WYSIWYG +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Porządek obrad @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Zapisz i udostępniania dokumentów Module2600Name=WebServices Module2600Desc=Włącz serwer usług internetowych Dolibarr +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Użyj Gravatar usług online (www.gravatar.com), aby pokazać zdjęcia użytkowników / członków (znaleziono ich e-maile). Konieczność dostępu do Internetu Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paybox Module50100Name=Kasa @@ -527,7 +534,7 @@ Module50200Desc=Moduł oferują online strony płatności za pomocą karty kredy Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Konfiguracja zapisana BackToModuleList=Powrót do listy modułów BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Stałe formularz wyszukiwania na lewym menu DefaultLanguage=Domyślny język do użytku (kod języka) EnableMultilangInterface=Włącz wielojęzyczny interfejs EnableShowLogo=logo Pokaż na menu po lewej stronie +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=System został zaktualizowany CompanyInfo=Firma / fundacja informacji CompanyIds=Firma / fundament tożsamości diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang index 773b9217b95..35b55585299 100644 --- a/htdocs/langs/pl_PL/agenda.lang +++ b/htdocs/langs/pl_PL/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Zdarzenia przypisane do ActionsDoneBy=Zdarzenia wykonane przez ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Wszystkie moje zdarzenia/zadania AllActions= Wszystkie zdarzenia/zadania ViewList=Widok listy diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang index 7d6459d8408..32f6c94a9ef 100644 --- a/htdocs/langs/pl_PL/compta.lang +++ b/htdocs/langs/pl_PL/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang index 634bdf42361..04e1d26974d 100644 --- a/htdocs/langs/pl_PL/contracts.lang +++ b/htdocs/langs/pl_PL/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listę uruchomionych linii zamówienia ListOfRunningServices=Lista uruchomionych usług NotActivatedServices=Nie aktywacji usług (wśród zatwierdzonych umów) BoardNotActivatedServices=Usługi uaktywnić wśród zatwierdzonych umów -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Ostatnia %s aktywacji usługi LastModifiedServices=Ostatnia %s zmodyfikowane usług EditServiceLine=Edycja usługa linii @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Podpisanie umowy sprzedaży diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang index 696634a340e..43efc8be99c 100644 --- a/htdocs/langs/pl_PL/errors.lang +++ b/htdocs/langs/pl_PL/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Dostawca kod wymagane ErrorSupplierCodeAlreadyUsed=Dostawca kod już używane ErrorBadParameters=Bad parametry ErrorBadValueForParameter=Wrong wartość '%s "dla parametrów nieprawidłowe" %s spacerem -ErrorBadImageFormat=Plik obrazu ma nie obsługiwanym formacie +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Wartość '%s "ma zły format daty ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Nie można zapisać w katalogu %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Użytkownik z logowania %s nie może zostać znal ErrorLoginHasNoEmail=Ten użytkownik nie ma adresu e-mail. Proces przerwany. ErrorBadValueForCode=Zła wartość typy kodu. Spróbuj ponownie z nową wartość ... ErrorBothFieldCantBeNegative=Pola %s i %s nie może być zarówno negatywny +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Konto użytkownika %s wykorzystywane do wykonywania serwer WWW nie ma zgody na który ErrorNoActivatedBarcode=Nie Typ aktywny kodów kreskowych ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang index 8573e0e86bf..ec066499c2c 100644 --- a/htdocs/langs/pl_PL/members.lang +++ b/htdocs/langs/pl_PL/members.lang @@ -8,7 +8,7 @@ Members=Członkowie MemberAccount=Member Login ShowMember=Pokaż Państwa karty UserNotLinkedToMember=Użytkownik nie wiąże się z członkiem -# ThirdpartyNotLinkedToMember=Third-party not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=Członkowie Bilety FundationMembers=Fundacja użytkowników Attributs=Atrybuty @@ -85,8 +85,7 @@ SubscriptionLateShort=Późno SubscriptionNotReceivedShort=Nigdy nie otrzymała ListOfSubscriptions=Lista subskrypcji SendCardByMail=Wyślij kartę -AddMember=Dodaj członków -MemberType=Państwa typ +AddMember=Create member NoTypeDefinedGoToSetup=Żaden członek typów zdefiniowanych. Przejdź do konfiguracji - Członkowie typy NewMemberType=Nowy członek typu WelcomeEMail=Zapraszamy e-mail @@ -126,12 +125,12 @@ Date=Data DateAndTime=Data i czas PublicMemberCard=Państwa publiczne karty MemberNotOrNoMoreExpectedToSubscribe=Państwa nie są lub nie oczekuje, aby subskrybować -AddSubscription=Dodaj abonament +AddSubscription=Create subscription ShowSubscription=Pokaż subskrypcji MemberModifiedInDolibarr=Państwa zmodyfikowany w Dolibarr SendAnEMailToMember=Wyślij e-mail informacji na członka -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Temat wiadomości dla członka autosubscription DescADHERENT_AUTOREGISTER_MAIL=E-mail dotyczące członka autosubscription DescADHERENT_MAIL_VALID_SUBJECT=EMail temat członkiem walidacji @@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=EMail temat członka resiliation DescADHERENT_MAIL_RESIL=EMail dla członka resiliation DescADHERENT_MAIL_FROM=Nadawca wiadomości e-mail do automatycznych wiadomości e-mail DescADHERENT_ETIQUETTE_TYPE=Etykiety formacie -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets DescADHERENT_CARD_TYPE=Format karty stronę DescADHERENT_CARD_HEADER_TEXT=Tekst wydrukowany na górę członka karty DescADHERENT_CARD_TEXT=Tekst wydrukowany na członka karty @@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Nr trzeciej związane do tego członka ThirdPartyDolibarr=Dolibarr trzeciej MembersAndSubscriptions= Członkowie i Subscriptions MoreActions=Działanie uzupełniające na nagrywanie -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription MoreActionBankDirect=Stworzenie bezpośredniego zapisu na rachunku transakcji MoreActionBankViaInvoice=Tworzenie faktury i wpłaty na rachunek MoreActionInvoiceOnly=Tworzenie faktury bez zapłaty @@ -171,6 +170,8 @@ LastSubscriptionAmount=Ostatnio kwota subskrypcji MembersStatisticsByCountries=Użytkownicy statystyki według kraju MembersStatisticsByState=Użytkownicy statystyki na State / Province MembersStatisticsByTown=Użytkownicy statystyki na miasto +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=Liczba członków NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników MembersByCountryDesc=Ten ekran pokaże statystyki członków przez poszczególne kraje. Graficzny zależy jednak na Google usługi online grafów i jest dostępna tylko wtedy, gdy połączenie internetowe działa. @@ -196,9 +197,10 @@ Collectivités=Organizacje Particuliers=Osobisty Entreprises=Firmy DOLIBARRFOUNDATION_PAYMENT_FORM=Aby dokonać płatności abonamentu za pomocą przelewu bankowego, patrz strona http://wiki.dolibarr.org/index.php/Subscribe~~dobj .
Aby zapłacić za pomocą karty kredytowej lub PayPal, kliknij przycisk na dole tej strony.
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang index cba9264669d..a334b7f2828 100644 --- a/htdocs/langs/pl_PL/products.lang +++ b/htdocs/langs/pl_PL/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Jeśli produkt jest usługą z ograniczonym czasem trwani MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Ilość cen MultiPriceLevelsName=Kategorie cenowe -AssociatedProductsAbility=Aktywuj wirtualne cechy produktów -AssociatedProducts=Produkt wirtualny -AssociatedProductsNumber=Liczba produktów tworzących ten produkt wirtualny -ParentProductsNumber=Ilość nadrzędnych produktów wirtualnych -IfZeroItIsNotAVirtualProduct=Jeśli 0, produkt nie jest produktem wirtualnym -IfZeroItIsNotUsedByVirtualProduct=Jeśli 0, to ten produkt nie jest używany przez żaden produkt wirtualny +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Współpracownik Translation=Tłumaczenie KeywordFilter=Filtr słów kluczowych @@ -132,7 +132,7 @@ AddDel=Dodaj / Usuń Quantity=Ilość NoMatchFound=Nie znaleziono odpowiednika ProductAssociationList=Lista powiązanych produktów / usług: nazwa produktu / usługi (ma wpływ na ilość) -ProductParentList=Lista wirtualnych produktów / usług z tym produktem jako komponentem +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Jeden z wybranych produktów jest nadrzędny dla produktu bierzącego DeleteProduct=Usuń produkt / usługę ConfirmDeleteProduct=Czy na pewno chcesz usunąć ten produkt / usługę? @@ -179,7 +179,7 @@ CloneProduct=Duplikuj produkt lub usługę ConfirmCloneProduct=Czy na pewno chcesz wykonać duplikat produktu lub usługi %s?? CloneContentProduct=Sklonuj wszystkie główne informacje dot. produktu / usługi ClonePricesProduct=Clone główne informacje i ceny -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Ten produkt jest używany NewRefForClone=Ref. nowych produktów / usług CustomerPrices=Ceny klientów @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang index 24c44a6fe67..9acde90020b 100644 --- a/htdocs/langs/pl_PL/projects.lang +++ b/htdocs/langs/pl_PL/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Ten widok przedstawia wszystkich projektów i zadań (uprawnień użyt Myprojects=Moje projekty ProjectsArea=Projekty obszaru NewProject=Nowy projekt -AddProject=Dodaj projekt +AddProject=Create project DeleteAProject=Usuń projektu DeleteATask=Usuń zadanie ConfirmDeleteAProject=Czy na pewno chcesz usunąć ten projekt? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Nowy czas spędzony MyTimeSpent=Mój czas spędzony MyTasks=Moje zadania @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Nowe zadania -AddTask=Dodaj zadanie +AddTask=Create task AddDuration=Dodaj czas Activity=Aktywność Activities=Zadania / działania diff --git a/htdocs/langs/pl_PL/resource.lang b/htdocs/langs/pl_PL/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/pl_PL/resource.lang +++ b/htdocs/langs/pl_PL/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang index 9c6354451a2..f4a7f570e6b 100644 --- a/htdocs/langs/pl_PL/withdrawals.lang +++ b/htdocs/langs/pl_PL/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Kredyt na WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Pokaż Wypłata IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jeśli jednak faktura nie co najmniej jeden wypłaty płatności jeszcze przetworzone, nie będzie ustawiony jako zapłaci, aby umożliwić zarządzanie wycofanie wcześniej. -DoStandingOrdersBeforePayments=Te karty pozwala z prośbą o zlecenia stałego. Gdy będzie gotowy, możesz wpisać płatność zamknąć faktury. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Płatność z %s zamówienia stojących przez bank diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 11a91816da8..3e195800e80 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Adicionar uma opção de filtro para mostrar / esconder terceiros que estão atualmente em atividade ou deixaram de UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Filtros opções de pesquisa NumberOfKeyToSearch=Nr palavras chave para adicionar á pesquisa: %s ViewFullDateActions=Ver as datas das acções na totalidade na ficha do terceiro @@ -208,6 +210,7 @@ ModulesJobDesc=Os módulos oficios permitem uma preconfiguração simplificada d ModulesMarketPlaceDesc=Você pode encontrar mais módulos para download em sites externos na Internet ... ModulesMarketPlaces=mais módulos... DoliStoreDesc=DoliStore, o mercado oficial para Dolibarr ERP / CRM módulos externos +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Prestadores do site, você pode pesquisar para encontrar os módulos mais ... URL=Link BoxesAvailable=Caixas disponiveis @@ -444,7 +447,7 @@ Module55Desc=Gestão dos códigos de barras Module56Name=Central Telefónica Module56Desc=Gestão da Central Telefónica Module57Name=Débitos Directos -Module57Desc=Gestão de débitos directos e créditos bancários +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integração com ClickToDial Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=Ligações RSS Module320Desc=Criação de ligações de informação RSS nas janelas do ERP Module330Name=Favoritos Module330Desc=Gestão de Favoritos -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Interface com calendario Webcalendar Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Categorías Module1780Desc=Gestão de categorías (produtos, Fornecedores e clientes) Module2000Name=FCKeditor Module2000Desc=Editor WYSIWYG +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Gestão de tarefas agendadas Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Gestão Electrónica de Documentos Module2500Desc=Permite administrar uma base de documentos Module2600Name=WebServices Module2600Desc=O servidor de serviços web ERP/CRM está Disponível +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Usar o serviço online Gravatar (www.gravatar.com) para mostrar as fotos dos utilizadores / membros (que encontrar nos seus e-mails). Necessita de um acesso à Internet Module2800Desc=Cliente FTP @@ -517,7 +524,7 @@ Module6000Desc=Gestão do fluxo de trabalho Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com paybox Module50100Name=Caixa @@ -527,7 +534,7 @@ Module50200Desc=Módulo para oferecer uma página de pagamento online por cartã Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margens @@ -779,6 +786,7 @@ DictionaryOrderMethods=Métodos de encomenda DictionarySource=Origem das propostas/ordens DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Configuração guardada BackToModuleList=Voltar à lista de módulos BackToDictionaryList=Voltar à lista de dicionários @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zona de pesquisa permanente do menu esquerdo DefaultLanguage=Idioma por defeito a utilizar (código idioma) EnableMultilangInterface=Activar interface Multi Idioma EnableShowLogo=Mostrar o logotipo no menu da esquerda +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=O seu sistema está actualizado CompanyInfo=Informação da Empresa/Instituição CompanyIds=Identificação regulamentação diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang index 2b8af93edae..37be1a827f9 100644 --- a/htdocs/langs/pt_PT/agenda.lang +++ b/htdocs/langs/pt_PT/agenda.lang @@ -6,7 +6,7 @@ Agenda=Agenda Agendas=Agendas Calendar=Calendário Calendars=Calendários -LocalAgenda=Internal calendar +LocalAgenda=Calendário interno ActionsOwnedBy=Event owned by AffectedTo=Afecta o DoneBy=Realizado por @@ -23,12 +23,13 @@ MenuToDoActions=Acções a fazer MenuDoneActions=Todos os eventos terminados MenuToDoMyActions=Os meus eventos incompletos MenuDoneMyActions=Os meus eventos terminados -ListOfEvents=List of events (internal calendar) +ListOfEvents=Lista de eventos (Calendário interno) ActionsAskedBy=Os meus eventos reportados ActionsToDoBy=Eventos atribuídos a ActionsDoneBy=Eventos realizados por ActionsForUser=Eventos para utilizadores ActionsForUsersGroup=Eventos para todos os utilizadores do grupo +ActionAssignedTo=Event assigned to AllMyActions= Todas as minhas acções AllActions= Todas as Acções ViewList=Ver Lista diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang index c3e51b1883c..e28633c2e24 100644 --- a/htdocs/langs/pt_PT/compta.lang +++ b/htdocs/langs/pt_PT/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Modo de cálculo AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang index 24c9d555928..2c51fe50855 100644 --- a/htdocs/langs/pt_PT/contracts.lang +++ b/htdocs/langs/pt_PT/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista de linhas de contractos em serviço ListOfRunningServices=Lista de serviços activos NotActivatedServices=Serviços não activados (com os contractos validados) BoardNotActivatedServices=Serviços a activar com os contractos validados -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Os %s últimos serviços activados LastModifiedServices=Os %s últimos sevicios modificados EditServiceLine=Edição linha do serviço @@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista de Serviços para expirar NoteListOfYourExpiredServices=Esta lista contém apenas os serviços de contratos de terceiros aos quais está ligado como representante de vendas. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Comercial assinante do contrato diff --git a/htdocs/langs/pt_PT/dict.lang b/htdocs/langs/pt_PT/dict.lang index c13bacf30ff..ea99bec3e23 100644 --- a/htdocs/langs/pt_PT/dict.lang +++ b/htdocs/langs/pt_PT/dict.lang @@ -252,8 +252,7 @@ CivilityMME=Sra. CivilityMR=Sr. CivilityMLE=Dr. CivilityMTRE=Eng. -# CivilityDR=Doctor - +CivilityDR=Doutor ##### Currencies ##### Currencyeuros=Euros CurrencyAUD=Dólar UA @@ -290,10 +289,10 @@ CurrencyXOF=Francos CFA BCEAO CurrencySingXOF=Franco CFA BCEAO CurrencyXPF=PCP Francos CurrencySingXPF=Franco CFP - -# CurrencyCentSingEUR=cent -# CurrencyThousandthSingTND=thousandth - +CurrencyCentSingEUR=Cêntimos +CurrencyCentINR=paisa +CurrencyCentSingINR=paisa +CurrencyThousandthSingTND=milésimo #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Campanha de mala direta @@ -302,11 +301,10 @@ DemandReasonTypeSRC_CAMP_PHO=Campanha de telefone DemandReasonTypeSRC_CAMP_FAX=Campanha Fax DemandReasonTypeSRC_COMM=Contato comercial DemandReasonTypeSRC_SHOP=Loja contato -# DemandReasonTypeSRC_WOM=Word of mouth +DemandReasonTypeSRC_WOM=Palavra de boca DemandReasonTypeSRC_PARTNER=Parceiro DemandReasonTypeSRC_EMPLOYEE=Empregado DemandReasonTypeSRC_SPONSORING=Patrocínio - #### Paper formats #### PaperFormatEU4A0=Formato 4A0 PaperFormatEU2A0=Formato 2A0 diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang index ed6a020fa81..625f05a06b8 100644 --- a/htdocs/langs/pt_PT/errors.lang +++ b/htdocs/langs/pt_PT/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Código fornecedor obrigatório ErrorSupplierCodeAlreadyUsed=Código de fornecedor já utilizado ErrorBadParameters=Parâmetros incorrectos ErrorBadValueForParameter="%s" valor incorreto para parâmetro incorreto dos %s dos -ErrorBadImageFormat=Arquivo de imagem não tem um formato suportado +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat="%s" Valor tem formato de data errado ErrorWrongDate=A data não está correcta! ErrorFailedToWriteInDir=Impossivel escrever na pasta %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=a conta de utilizador de %s não foi encontrado. ErrorLoginHasNoEmail=Este utilizador não tem e-mail. impossivel continuar. ErrorBadValueForCode=Valor incorrecto para o código. volte a \ttentar com um Novo valor... ErrorBothFieldCantBeNegative=Campos %s %s e não pode ser tanto negativo +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Conta de usuário utilizada para executar %s servidor web não tem permissão para que ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado ErrUnzipFails=Falha ao extrair %s com o ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Os parâmetros de configuração obrigatórios ainda não estão definidos diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang index 12ca0b0b0ed..2881be0fc16 100644 --- a/htdocs/langs/pt_PT/install.lang +++ b/htdocs/langs/pt_PT/install.lang @@ -207,5 +207,5 @@ MigrationActioncommElement=Atualizar os dados sobre as ações MigrationPaymentMode=A migração de dados para o modo de pagamento MigrationCategorieAssociation=Migração de categorias -ShowNotAvailableOptions=Show not available options -HideNotAvailableOptions=Hide not available options +ShowNotAvailableOptions=Mostrar opções ocultas +HideNotAvailableOptions=Esconder opções ocultas diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 1b9c268819a..4d6bfc4b519 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -62,8 +62,8 @@ SetDate=Definir data SelectDate=Seleccionar uma data SeeAlso=Ver também %s BackgroundColorByDefault=Cor de fundo por omissão -FileNotUploaded=The file was not uploaded -FileUploaded=The file was successfully uploaded +FileNotUploaded=O ficheiro não foi enviado +FileUploaded=O ficheiro foi enviado com sucesso FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não foi carregado. Clique em 'Adicionar este Ficheiro' para anexar. NbOfEntries=Nº de entradas GoToWikiHelpPage=Ler ajuda on-line (é necessário acesso à Internet) @@ -341,7 +341,7 @@ FullList=Lista completa Statistics=Estatísticas OtherStatistics=Outras estatísticas Status=Estado -Favorite=Favorite +Favorite=Favoritos ShortInfo=Informação Ref=Ref. RefSupplier=Ref. fornecedor @@ -367,7 +367,7 @@ ActionsOnCompany=Acções nesta sociedade ActionsOnMember=Eventos sobre este membro NActions=%s acções NActionsLate=%s em atraso -RequestAlreadyDone=Request already recorded +RequestAlreadyDone=O pedido já foi realizado anteriormente Filter=Filtro RemoveFilter=Eliminar filtro ChartGenerated=Gráficos gerados @@ -648,7 +648,7 @@ OptionalFieldsSetup=Configuração de atributos extra URLPhoto=Url da foto / logotipo SetLinkToThirdParty=Link para um terceiro CreateDraft=Criar Rascunho -SetToDraft=Back to draft +SetToDraft=Voltar para o rascunho ClickToEdit=Clique para editar ObjectDeleted=%s objeto removido ByCountry=Por país @@ -682,7 +682,7 @@ ViewPrivateNote=Ver notas XMoreLines=%s linhas(s) ocultas PublicUrl=URL público AddBox=Adicionar Caixa -SelectElementAndClickRefresh=Select an element and click Refresh +SelectElementAndClickRefresh=Selecione um elemento e actualize a pagina # Week day Monday=Segunda-feira Tuesday=Terça-feira diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang index 224c0921c35..b30a848fa5a 100644 --- a/htdocs/langs/pt_PT/members.lang +++ b/htdocs/langs/pt_PT/members.lang @@ -26,8 +26,8 @@ MembersCards=Cartões de Membros MembersList=Lista de Membros MembersListToValid=Lista de Membros rascunho (a Confirmar) MembersListValid=Lista de Membros validados -MembersListUpToDate=Lista dos Membros válidos ao día de adesão -MembersListNotUpToDate=Lista dos Membros válidos não ao día de adesão +MembersListUpToDate=Lista dos Membros válidos ao dia de adesão +MembersListNotUpToDate=Lista dos Membros válidos não ao dia de adesão MembersListResiliated=Lista dos Membros dados de baixa MembersListQualified=Lista dos Membros qualificados MenuMembersToValidate=Membros rascunho @@ -57,17 +57,17 @@ MemberStatusActive=Validado (em espera de filiação ) MemberStatusActiveShort=Validado MemberStatusActiveLate=Filiação não actualizada MemberStatusActiveLateShort=Não actualizada -MemberStatusPaid=Filiação em día -MemberStatusPaidShort=Em día +MemberStatusPaid=Subscrição em dia +MemberStatusPaidShort=Em dia MemberStatusResiliated=Membro dado de baixa MemberStatusResiliatedShort=De baixa MembersStatusToValid=Membros rascunho MembersStatusToValidShort=Membros rascunho MembersStatusValidated=Membros validados -MembersStatusPaid=Filicações em día -MembersStatusPaidShort=Em día -MembersStatusNotPaid=Filicações não em día -MembersStatusNotPaidShort=Não em día +MembersStatusPaid=Subscrições em dia +MembersStatusPaidShort=Em dia +MembersStatusNotPaid=Subscrição não em dia +MembersStatusNotPaidShort=Não em dia MembersStatusResiliated=Membros dados de baixa MembersStatusResiliatedShort=Membros dados de baixa NewCotisation=Nova filiação @@ -85,7 +85,7 @@ SubscriptionLateShort=Em atraso SubscriptionNotReceivedShort=Não recebida ListOfSubscriptions=Lista de Filicações SendCardByMail=Enviar ficha -AddMember=Adicionar membro +AddMember=Create member NoTypeDefinedGoToSetup=Nenhum tipo de membro definido. ir a configuração -> Tipos de Membros NewMemberType=Novo tipo de membro WelcomeEMail=E-mail @@ -125,7 +125,7 @@ Date=data DateAndTime=data e hora PublicMemberCard=Ficha pública membro MemberNotOrNoMoreExpectedToSubscribe=Não sometida a cotação -AddSubscription=Adicionar filiação +AddSubscription=Create subscription ShowSubscription=Mostrar filiação MemberModifiedInDolibarr=Membro modificado em Dolibarr SendAnEMailToMember=Enviar e-mail de informação à membro (E-mail: %s) @@ -203,3 +203,4 @@ MembersByNature=Membros, por categoria VATToUseForSubscriptions=Taxa de IVA a utilizar para assinaturas NoVatOnSubscription=Sem TVA para assinaturas MEMBER_PAYONLINE_SENDEMAIL=Enviar e-mail para avisar quando Dolibarr receber uma confirmação de pagamento validados por assinatura +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang index d2a0cababf2..a8d228293be 100644 --- a/htdocs/langs/pt_PT/products.lang +++ b/htdocs/langs/pt_PT/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Sim o serviço é de Duração limitada : MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Nº de preços MultiPriceLevelsName=Categoría de preços -AssociatedProductsAbility=Activar produtos associados -AssociatedProducts=Produtos associados -AssociatedProductsNumber=Nº de produtos associados -ParentProductsNumber=Número de produto pai -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associar Translation=Tradução KeywordFilter=Filtro por Chave @@ -132,7 +132,7 @@ AddDel=Adicionar/Retirar Quantity=Quantidade NoMatchFound=Não foram encontrados resultados ProductAssociationList=Lista de produtos/serviços associados : Nome do produto/serviço (quantidade afectada) -ProductParentList=Lista de produtos e serviços com este produto como um componente +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Um dos produtos seleccionados é pai do produto em curso DeleteProduct=Eliminar um produto/serviço ConfirmDeleteProduct=Está seguro de querer eliminar este produto/serviço? @@ -179,7 +179,7 @@ CloneProduct=Copie produto ou serviço ConfirmCloneProduct=Tem certeza de que pretende copiar produto ou serviço %s? CloneContentProduct=Copie todas as principais informações do produto / serviço ClonePricesProduct=Copie principais informações e preços -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Este produto é utilizado NewRefForClone=Ref. do novo produto / serviço CustomerPrices=preços de Clientes @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Preço por registo de cliente MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang index cd2b63fb250..37d32c854d4 100644 --- a/htdocs/langs/pt_PT/projects.lang +++ b/htdocs/langs/pt_PT/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Essa visão apresenta todos os projetos e tarefas (as permissões de u Myprojects=Meus Projetos ProjectsArea=Área de Projetos NewProject=Novo Projeto -AddProject=Adicionar Projeto +AddProject=Create project DeleteAProject=Eliminar um Projeto DeleteATask=Eliminar uma Tarefa ConfirmDeleteAProject=Tem a certeza que quer eliminar este projeto? @@ -36,6 +36,8 @@ TaskTimeSpent=Tempo despendido nas tarefas TaskTimeUser=Utilizador TaskTimeNote=Nota TaskTimeDate=Data +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Novo Tempo Dispendido MyTimeSpent=Meu Tempo Dispendido MyTasks=Minhas Tarefas @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Descrição da tarefa NewTask=Nova Tarefa -AddTask=Adicionar Tarefa +AddTask=Create task AddDuration=Adicionar Duração Activity=Atividade Activities=Tarefas/Atividades diff --git a/htdocs/langs/pt_PT/resource.lang b/htdocs/langs/pt_PT/resource.lang index d64075dfbf5..18177ed2c6a 100644 --- a/htdocs/langs/pt_PT/resource.lang +++ b/htdocs/langs/pt_PT/resource.lang @@ -1,36 +1,34 @@ -MenuResourceIndex=Resources -MenuResourceAdd=New resource +MenuResourceIndex=Recursos +MenuResourceAdd=Novo recurso MenuResourcePlanning=Resource planning -DeleteResource=Delete resource -ConfirmDeleteResourceElement=Confirm delete the resource for this element -NoResourceInDatabase=No resource in database. -NoResourceLinked=No resource linked +DeleteResource=Apagar recurso +ConfirmDeleteResourceElement=Confirme apagar o recurso para este elemento +NoResourceInDatabase=Nenhum recurso na base de dados +NoResourceLinked=Nenhum recurso interligado -ResourcePageIndex=Resources list -ResourceSingular=Resource -ResourceCard=Resource card -AddResource=Create a resource -ResourceFormLabel_ref=Resource name -ResourceType=Resource type -ResourceFormLabel_description=Resource description +ResourcePageIndex=Lista de recursos +ResourceSingular=Recurso +ResourceCard=Cartão de recurso +AddResource=Crie um recurso +ResourceFormLabel_ref=Nome do recurso +ResourceType=Tipo de recurso +ResourceFormLabel_description=Descrição do recurso -ResourcesLinkedToElement=Resources linked to element +ResourcesLinkedToElement=Recursos interligados ao elemento ShowResourcePlanning=Show resource planning -GotoDate=Go to date +GotoDate=Ir para a data -ResourceElementPage=Element resources +ResourceElementPage=Recursos do elemento ResourceCreatedWithSuccess=Resource successfully created RessourceLineSuccessfullyDeleted=Resource line successfully deleted RessourceLineSuccessfullyUpdated=Resource line successfully updated ResourceLinkedWithSuccess=Resource linked with success -TitleResourceCard=Resource card -ConfirmDeleteResource=Confirm to delete this resource -RessourceSuccessfullyDeleted=Resource successfully deleted -DictionaryResourceType=Type of resources +TitleResourceCard=Cartão de recurso +ConfirmDeleteResource=Confirme para apagar este recurso +RessourceSuccessfullyDeleted=Recurso apagado com sucesso +DictionaryResourceType=Tipo de recursos -DictionaryEMailTemplates=Modèles d'Emails - -SelectResource=Select resource +SelectResource=Selecione o recurso diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang index ec8d6c3fda5..e227553e4c9 100644 --- a/htdocs/langs/pt_PT/withdrawals.lang +++ b/htdocs/langs/pt_PT/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Crédito em WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Mostrar levantamento IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se não tiver factura, pelo menos, um pagamento levantamento ainda processado, que não irá ser definido como pago para permitir o levantamento antes de administrar. -DoStandingOrdersBeforePayments=Estas abas permitem a você pedir uma ordem permanente. Uma vez que ele será terminado, você pode digitar o pagamento para fechar a fatura. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=arquivo retirado SetToStatusSent=Definir o estado como "arquivo enviado" ThisWillAlsoAddPaymentOnInvoice=Isso também irá criar pagamentos em facturas e classificá-los para pagar +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Pagamento de %s ordem permanente pelo banco diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index fbabb4f7401..82af6b13bb6 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Utilizați autocompletarea câmpurilor pentru alegerea ActivityStateToSelectCompany= Adaugă o opţiune de filtru pentru a afişa / ascunde thirdparties, care sunt în prezent în activitate sau le-a încetat UseSearchToSelectContactTooltip=De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului. UseSearchToSelectContact=Utilizați un câmp cu autocompletare pentru a selecta un contact (în loc de lista derulantă). +DelaiedFullListToSelectCompany=Aşteaptă să tastaţi o tastă înaintea încărcării a listei combo de terţi (Acest lucru poate crește performanța dacă aveți un număr mare de terţi) +DelaiedFullListToSelectContact=Aşteaptă să tastaţi o tastă înaintea încărcării a listei combo de contacte (Acest lucru poate crește performanța dacă aveți un număr mare de contacte) SearchFilter=Opţiuni filtre de căutare NumberOfKeyToSearch=Nr caractere pentru a declanşa căutare: %s ViewFullDateActions=Arata complet datele de acţiuni în cea de-a treia foaie @@ -125,7 +127,7 @@ PHPTZ=Time Zone Server PHP PHPServerOffsetWithGreenwich=Offset pentru PHP server de latime Greenwich (secondes) ClientOffsetWithGreenwich=Client / Browser offset lăţime Greenwich (secunde) DaylingSavingTime=Ora de vară (utilizator) -CurrentHour=Current oră +CurrentHour=Timp PHP (server) CompanyTZ=Time Zone companie (principale companiei) CompanyHour=Ora companiei (principale companiei) CurrentSessionTimeOut=Sesiunea curentă timeout @@ -163,7 +165,7 @@ RunCommandSummary=Backup poate fi lansat cu următoarea comandă RunCommandSummaryToLaunch=Backup poate fi lansat cu următoarea comandă WebServerMustHavePermissionForCommand=Serverul de web trebuie să aibă permisiunea de a rula astfel de comenzi BackupResult=Backup rezultat -BackupFileSuccessfullyCreated=Fişier backup generat cu succes +BackupFileSuccessfullyCreated=Fişier backup generat YouCanDownloadBackupFile=Fişiere generate pot fi acum descarcate NoBackupFileAvailable=Niciun fişier backup disponibil. ExportMethod=Metodă Export @@ -178,8 +180,8 @@ Compression=Compresie CommandsToDisableForeignKeysForImport=Comandă pentru a dezactiva cheile străine la import CommandsToDisableForeignKeysForImportWarning=Necesar dacă doriți să puteţi restaura sql dump -ul dvs mai târziu ExportCompatibility=Compatibilitatea fişierului de export generat -MySqlExportParameters=MySQL parametrii export -PostgreSqlExportParameters= PostgreSQL parametrii export +MySqlExportParameters=Parametrii export MySQL +PostgreSqlExportParameters= Parametrii export PostgreSQL UseTransactionnalMode=Utilizaţi mod tranzacţional FullPathToMysqldumpCommand=Calea completă la comanda mysqldump FullPathToPostgreSQLdumpCommand=Calea completă la comanda pg_dump @@ -208,6 +210,7 @@ ModulesJobDesc=Business furniza module simple predefinite de configurare de Doli ModulesMarketPlaceDesc=Puteţi găsi mai multe module pentru descărcare pe site-uri web externe de pe Internet ... ModulesMarketPlaces=Module mai multe ... DoliStoreDesc=DoliStore, market place oficial pentru module externe Dolibarr ERP / CRM +DoliPartnersDesc=Listă cu unele companii care pot furniza / dezvolta module la cerere sau noi funcţionalităţi (Notă: orice companie Open Source cunoscând limbajul PHP vă poate oferi dezvoltări specifice) WebSiteDesc=Site-ul Web al furnizorilor unde puteţi căuta şi găsi mai multe module ... URL=Link BoxesAvailable=Căsuţe disponibile @@ -229,7 +232,7 @@ InstrucToClearPass=Pentru a avea parola decodificate (clare) în conf.php ProtectAndEncryptPdfFiles=Protecţie a generat pdf (nu recommandd, pauzele de masă PDF Generation) ProtectAndEncryptPdfFilesDesc=De protecţie a unui document PDF păstrează disponibil pentru a citi şi de a imprima cu orice browser PDF. Cu toate acestea, editarea şi copierea nu este posibil acum. Reţineţi că utilizarea acestei funcţii face construirea unui globale cumulate pdf nu de lucru (cum ar fi facturile unpaid). Feature=Funcţionalitate -DolibarrLicense=Licenta +DolibarrLicense=Licenţa DolibarrProjectLeader=Sef Proiect Developpers=Dezvoltatori / colaboratori OtherDeveloppers=Altele dezvoltatori / colaboratori @@ -269,12 +272,12 @@ MAIN_MAIL_SMTPS_ID=SMTP ID-ul de autentificare necesare în cazul în MAIN_MAIL_SMTPS_PW=SMTP parola, dacă se cere autentificare MAIN_MAIL_EMAIL_TLS= Utilizaţi TLS (SSL) cripta MAIN_DISABLE_ALL_SMS=Dezactivaţi toate trimiteri SMS (în scopuri de testare sau demo-uri) -MAIN_SMS_SENDMODE=Metoda de a utiliza pentru a trimite SMS-uri -MAIN_MAIL_SMS_FROM=De telefon expeditor numărul implicit pentru trimiterea de SMS +MAIN_SMS_SENDMODE=Metoda de utilizare pentru trimiterea SMS-urilor +MAIN_MAIL_SMS_FROM=Numărul de telefon expeditor implicit pentru trimiterea de SMS FeatureNotAvailableOnLinux=Caracteristicã nu sunt disponibile pe Unix, cum ar fi sisteme. Testaţi-vă sendmail program la nivel local. SubmitTranslation=Dacă traducere pentru această limbă nu este completă sau găsiţi erori, puteţi corecta acest lucru prin editarea fişierelor în langs directorul / %s şi prezintă fişiere modificare www.dolibarr.org forum. -ModuleSetup=Modulul de configurare -ModulesSetup=Module de configurare +ModuleSetup=Configurare Modul +ModulesSetup=Configurare Module ModuleFamilyBase=Sistem ModuleFamilyCrm=Clientul Ressource Management (CRM) ModuleFamilyProducts=Managementul Produselor @@ -323,11 +326,11 @@ UseACacheDelay= Întârziere pentru caching de export de răspuns în câteva se DisableLinkToHelpCenter=Ascundere link-ul "Aveţi nevoie de ajutor sau sprijin" de la pagina de login DisableLinkToHelp=Ascundere link-ul " %s Online Help" de la stânga meniul AddCRIfTooLong=Nu exista un ambalaj, aşa că, dacă este linia de documente pe pagină, pentru că prea mult timp, trebuie să adăugaţi-vă revine transportului în textarea. -ModuleDisabled=Modulul cu handicap +ModuleDisabled=Modulul dezactivat ModuleDisabledSoNoEvent=Modul de persoane atât de eveniment nu a creat ConfirmPurge=Sunteţi sigur că doriţi să execute acest purge?
Aceasta va şterge definitiv toate fişiere de date cu nici un mod de a le restaura (ECM imagini, fişiere ataşate ...). MinLength=Lungimea minimă -LanguageFilesCachedIntoShmopSharedMemory=Fişiere. Lang încărcate în memorie partajata +LanguageFilesCachedIntoShmopSharedMemory=Fişierele .lang încărcate în memorie partajata ExamplesWithCurrentSetup=Exemple cu care rulează curent setup ListOfDirectories=Lista de directoare OpenDocument template-uri ListOfDirectoriesForModelGenODT=Listă de directoare, template-uri care conţin fişiere cu formatul OpenDocument.

Pune aici plin patetic de directoare.
Adauga un retur de car între directorul eah.
Pentru a adăuga un director a modulului GED, adăugaţi aici DOL_DATA_ROOT / ECM / yourdirectoryname.

Fişierele din aceste directoare trebuie să se termine cu. Odt. @@ -374,7 +377,7 @@ Boolean=Boolean (Checkbox) ExtrafieldPhone = Telefon ExtrafieldPrice = Preţ ExtrafieldMail = Email -ExtrafieldSelect = Listă Select +ExtrafieldSelect = Select Listă ExtrafieldSelectList = Select din tabel ExtrafieldSeparator=Separator ExtrafieldCheckBox=Checkbox @@ -425,7 +428,7 @@ Module30Name=Facturi Module30Desc=Facturi şi note de credit "de management pentru clienţi. Facturi de gestionare pentru furnizorii Module40Name=Furnizori Module40Desc=Managementul Furnizorilor şi aprovizionării (comenzi si facturi) -Module42Name=Syslog +Module42Name=Loguri Module42Desc=Jurnalizarea facilităţi (syslog) Module49Name=Editori Module49Desc=Managementul Editorilor @@ -437,14 +440,14 @@ Module52Name=Stocuri Module52Desc=Managementul Stocurilor (produse) Module53Name=Servicii Module53Desc=Managementul Serviciilor -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Contracte / Abonamente +Module54Desc=Managementul contractelor (servicii sau abonamente periodice) Module55Name=Coduri de bare Module55Desc=Coduri de bare "de gestionare a Module56Name=Telefonie Module56Desc=Telefonie integrare Module57Name=Ordine de plată -Module57Desc=Ordine de plată şi retrageri "de gestionare a +Module57Desc=Managementul Ordinelor de plată şi al retragerilor . De asemenea, include generarea fișierului SEPA pentru țările europene. Module58Name=ClickToDial Module58Desc=ClickToDial integrare Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=Feed RSS Module320Desc=Adauga RSS feed interiorul Dolibarr ecran pagini Module330Name=Marcaje Module330Desc=Marcaje "de gestionare a -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Proiecte / Oportunitati / Prospecți +Module400Desc=Managementul de proiecte, oportunități sau potențiali. Puteți, apoi, atribui apoi orice element (factură, comanda, propunere, intervenție, ...), la un proiect și a obține o vedere transversală din punctul de vedere al proiectului. Module410Name=Webcalendar Module410Desc=Webcalendar integrare Module500Name=Cheltuieli speciale( taxe, contributii sociale, dividende) @@ -495,6 +498,8 @@ Module1780Name=Categorii Module1780Desc=Categorii de "management (produse, furnizori şi clienţi) Module2000Name=Fckeditor Module2000Desc=WYSIWYG Editor +Module2200Name=Preţuri dinamice +Module2200Desc=Activați utilizarea expresii matematice pentru prețuri Module2300Name=Cron Module2300Desc=Managementul taskurilor programate Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Salvaţi şi partaja documente Module2600Name=Servicii web Module2600Desc=Activarea serviciilor Dolibarr serverul web +Module2650Name=Servicii web (client) +Module2650Desc=Activați Servicii web a clientului Dolibarr (Poate fi folosit pentru a da date / cererile de servere externe. Doar Comenzi Furnizor sunt acceptate pentru moment) Module2700Name=Gravatar Module2700Desc=Folosiţi serviciul online Gravatar (www.gravatar.com) pentru a arăta fotografie de utilizatori / membri (găsit cu mesajele de poştă electronică). Aveţi nevoie de un acces la internet Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Managementul fluxului de lucru Module20000Name=Managementul cererilor de concedii Module20000Desc=Declară şi urmăreşte cererile de concedii ale angajaţilor Module39000Name=Lot Produs -Module39000Desc=Management Număr lot și data de expirare pentru produse +Module39000Desc=Management Număr lot sau număr de serie , data de expirare şi vânzare pentru produse Module50000Name=Paybox Module50000Desc=Modul de a oferi o pagina de plata online prin card de credit cu Paybox Module50100Name=Punct de Vanzare @@ -527,7 +534,7 @@ Module50200Desc=Modul de a oferi o pagina de plata online prin card de credit cu Module50400Name=Contabilitate (avansat) Module50400Desc=Management Contabilitate (partidă dublă) Module54000Name=Print lP IPrinter -Module54000Desc=Printează prin serviciul Cups cu ajutorul imprimantei IPP +Module54000Desc=Imprimare directă (fără a deschide documentele) folosind interfața CUPS IPP (imprimanta trebuie să fie vizibilă de pe server și CUPS trebuie să fie instalat pe server). Module55000Name=Deschide Sondaj Module55000Desc=Modul pentru a face sondaje online (ca Doodle, Studs, Rdvz, ...) Module59000Name=Marje @@ -538,8 +545,8 @@ Module150010Name=Număr lot, data de expirare şi data vânzare Module150010Desc=Management Număr lot și data de expirare pentru produse Permission11=Citeşte facturi Permission12=Creaţi/Modificare facturi -Permission13=Unvalidate facturi -Permission14=Validate facturi +Permission13=Facturi client nevalidate +Permission14=Facturi client validate Permission15=Trimite facturi prin e-mail Permission16=Crearea de plăţi pentru facturile Permission19=Ştergere facturi @@ -558,11 +565,11 @@ Permission38=Exportul de produse Permission41=Citiţi cu proiecte şi sarcini Permission42=Creare / Modificare de proiecte, pentru a edita sarcinile mele de proiecte Permission44=Ştergere proiecte -Permission61=Citiţi cu intervenţii +Permission61=Citeşte intervenţii Permission62=Creare / Modificare intervenţii Permission64=Ştergere intervenţii Permission67=Export intervenţii -Permission71=Citiţi cu membrii +Permission71=Citeşte membrii Permission72=Creare / Modificare membri Permission74=Ştergere membri Permission75=Configurare tipuri şi atribute pentru membri @@ -606,11 +613,11 @@ Permission151=Citiţi cu ordine de plată Permission152=Setup ordine de plată Permission153=Citiţi cu ordine de plată încasări Permission154=De credit / refuza încasări Ordinele de plată -Permission161=Read contracts/subscriptions -Permission162=Create/modify contracts/subscriptions -Permission163=Activate a service/subscription of a contract -Permission164=Disable a service/subscription of a contract -Permission165=Delete contracts/subscriptions +Permission161=Citește contracte / abonamente +Permission162=Creare / modificare contracte / abonamente +Permission163=Activează un serviciu / abonament al unui contract +Permission164=Dezactivarea unui serviciu / abonament al unui contract +Permission165=Ștergeți contracte / abonamente Permission171=Citeşte deconturile si cheltuielile( proprii şi ale subordonaţilor) Permission172=Creare / Modificare ordin de deplasare şi cheltuieli Permission173=Ştergere ordin de deplasare şi cheltuieli @@ -672,7 +679,7 @@ Permission300=Citiţi cu coduri de bare Permission301=Creare / Modificare coduri de bare Permission302=Ştergere coduri de bare Permission311=Citeşte servicii -Permission312=Assign service/subscription to contract +Permission312=Atribuire serviciu / abonament la contract Permission331=Citiţi cu marcaje Permission332=Creare / Modificare marcaje Permission333=Ştergeţi marcaje @@ -698,12 +705,12 @@ Permission532=Creare / Modificare servicii Permission534=Ştergere servicii Permission536=A se vedea / administra serviciile ascunse Permission538=Exportul de servicii -Permission701=Citiţi cu donaţii +Permission701=Citiţi donaţii Permission702=Creare / Modificare donaţii Permission703=Ştergere donaţii Permission1001=Citeşte stocuri -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses +Permission1002=Creare / modificare depozite +Permission1003=Ștergere depozite Permission1004=Citeşte stoc deplasările Permission1005=Creare / Modificare stoc deplasările Permission1101=Citiţi cu livrare comenzi @@ -779,6 +786,7 @@ DictionaryOrderMethods=Metode de comandă DictionarySource=Originea de propuneri / comenzi DictionaryAccountancyplan=Plan de conturi DictionaryAccountancysystem=Model pentru plan de conturi +DictionaryEMailTemplates=Șabloane e-mailuri SetupSaved=Setup salvate BackToModuleList=Inapoi la lista de module BackToDictionaryList=Inapoi la lista de dicţionare @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent formularul de căutare de pe stânga de meniu DefaultLanguage=Implicit de a folosi limba (limba) EnableMultilangInterface=Activaţi multilingv interfaţă EnableShowLogo=logo-ul Afişare meniu în stânga +EnableHtml5=Activare HTML5 (Dezvoltare - disponibil doar pe șablonul ELDY) SystemSuccessfulyUpdated=Sistemul dumneavoastră a fost actualizat cu succes CompanyInfo=Companie / fundaţie informaţii CompanyIds=Companie / fundaţie identităţi @@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Adauga data de capacitatea de livrare UseOptionLineIfNoQuantity=O linie de produse / servicii cu o suma de zero este considerat ca fiind o opţiune FreeLegalTextOnProposal=Free text pe comercial propuneri WatermarkOnDraftProposal=Filigranul pe propunerile comerciale ciornă (niciunul daca e gol) -BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al propuneri ##### Orders ##### OrdersSetup=Ordinele de gestionare setup OrdersNumberingModules=Ordinele de numerotare module @@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Modulele de intervenţie de numerotare TemplatePDFInterventions=Carte de modele de documente de intervenţie WatermarkOnDraftInterventionCards=Filigranul pe documentele fişelor de intervenţie (niciunul daca e gol) ##### Contracts ##### -ContractsSetup=Contracts/Subscriptions module setup +ContractsSetup=Configurare modul Contracte / Abonamente ContractsNumberingModules=Contracte de numerotare module TemplatePDFContracts=Modele documente contracte FreeLegalTextOnContracts=Free text pe contracte @@ -1269,7 +1278,7 @@ LDAPFieldFirstName=Prenume LDAPFieldFirstNameExample=Exemplu: givenname LDAPFieldMail=Adresa de e-mail LDAPFieldMailExample=Exemplu: mail -LDAPFieldPhone=Professional numărul de telefon +LDAPFieldPhone=Numărul de telefon profesional LDAPFieldPhoneExample=Exemplu: telephonenumber LDAPFieldHomePhone=Personale numărul de telefon LDAPFieldHomePhoneExample=Exemplu: homephone @@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Fișierele de tip %s nu sunt comprimate de serverul HTT CacheByServer=Cache pe server CacheByClient=Cache pe browser CompressionOfResources=Compresie a răspunsului HTTP -TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +TestNotPossibleWithCurrentBrowsers=O astfel de detectare automată nu este posibilă cu browserele curente ##### Products ##### ProductSetup=Produse modul de configurare ServiceSetup=Servicii de modul de configurare @@ -1415,11 +1424,11 @@ OSCommerceTestOk=Conectarea la server ' %s' pe bază de date " %s" cu utilizator OSCommerceTestKo1=Conectarea la server ' %s' reuseste, dar baza de date " %s" nu a putut fi atins. OSCommerceTestKo2=Conectarea la server ' %s' cu utilizatorul " %s" nu a reuşit. ##### Stock ##### -StockSetup=Warehouse module setup -UserWarehouse=Use user personal warehouses -IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. +StockSetup=Configurare modul Depozite +UserWarehouse=Folosiţi depozite personale utilizator +IfYouUsePointOfSaleCheckModule=Dacă utilizați unmodul punct de vânzare (modulul POS furnizat în mod implicit sau un alt modul extern), acest setup poate fi ignorat de către modul punctul de vânzare . Cele mai multe module de puncte de vânzări sunt concepute pentru a crea imediat o factură și reduce stocul implicit indiferent de ce optiune aveţi aici. Deci, dacă aveți nevoie sau nu de a avea o scădere de stoc la înregistrarea unei vinzări din punctul dvs. de vânzare, verificați de asemenea modulul POS configurat. ##### Menu ##### -MenuDeleted=Meniu elimină +MenuDeleted=Meniu eliminat TreeMenu=Tree meniuri Menus=Meniuri TreeMenuPersonalized=Meniuri personalizate @@ -1482,14 +1491,14 @@ ClickToDialDesc=Acest modul permite să adăugaţi o pictogramă după numărul ##### Point Of Sales (CashDesk) ##### CashDesk=Punctul de vânzare CashDeskSetup=Casierie modul de configurare -CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskThirdPartyForSell=Terț generic implicit utilizat pentru vânzări CashDeskBankAccountForSell=Case de cont pentru a utiliza pentru vinde CashDeskBankAccountForCheque= Cont pentru a utiliza pentru a primi plăţi prin cec CashDeskBankAccountForCB= Cont pentru a folosi pentru a primi plăţi în numerar de carduri de credit -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale -CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease -StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled -CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. +CashDeskDoNotDecreaseStock=Dezactivați scădere stoc atunci când o vinzare se face de la Point of Sale +CashDeskIdWareHouse=Forţează și limitează depozitul să folosească scăderea stocului +StockDecreaseForPointOfSaleDisabled=Scădere stoc de la Point of Sale dezactivat +CashDeskYouDidNotDisableStockDecease=Nu ai dezactivați scăderea de stocului atunci când se face o vinzare de la Point Of Sale. Astfel, este necesar un depozit. ##### Bookmark ##### BookmarkSetup=Bookmark modul de configurare BookmarkDesc=Acest modul vă permite să gestionaţi marcaje. De asemenea, puteţi adăuga comenzi rapide pentru orice Dolibarr pagini sau site-uri web externale pe partea stanga de meniu. @@ -1549,7 +1558,7 @@ NbNumMin=Numărul minim al caracterelor minuscule NbSpeMin=Numărul minim al caracterelor speciale NbIteConsecutive=Numărul maxim al caracterelor care se repetă NoAmbiCaracAutoGeneration=Nu utiliza caractere ambigue ("1","l","i","|","0","O") pentru generare automată -SalariesSetup=Setup of module salaries -SortOrder=Sort order +SalariesSetup=Configurare modul salarii +SortOrder=Ordine sortare Format=Format TypePaymentDesc=0:Tip plata Client, 1:Tip plata Furnizor, 2:Ambele tipuri plata Client sau Furnizor diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang index dec69f5b654..d73a2321e91 100644 --- a/htdocs/langs/ro_RO/agenda.lang +++ b/htdocs/langs/ro_RO/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Evenimente atribuite lui ActionsDoneBy=Evenimente efectuate de ActionsForUser=Evenimente pentru utilizator ActionsForUsersGroup=Evenimente pentru toți utilizatorii din grup +ActionAssignedTo=Eveniment atribuit la AllMyActions= Toate evenimentele / sarcinile mele AllActions= Toate evenimentele / sarcini ViewList=Vezi listă @@ -44,7 +45,7 @@ AgendaExtSitesDesc=Această pagină vă permite să declaraţi sursele externe d ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat PropalValidatedInDolibarr=Propunerea %s validată InvoiceValidatedInDolibarr=Factura %s validată -InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceValidatedInDolibarrFromPos=Factura %s validată din POS InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul nevalidată InvoiceDeleteDolibarr=Factura %s ştearsă OrderValidatedInDolibarr= Comanda %s validată diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang index 3032165936b..5782f2b37f2 100644 --- a/htdocs/langs/ro_RO/banks.lang +++ b/htdocs/langs/ro_RO/banks.lang @@ -155,6 +155,6 @@ BankDashboard=Sinteză conturi bancare DefaultRIB=IBAN Implicit AllRIB=Tot BAN LabelRIB=Etichetă BAN -NoBANRecord=Nici o înregistrare BAN +NoBANRecord=Nicio înregistrare BAN DeleteARib=Ștergeți înregistrarea BAN ConfirmDeleteRib=Sigur doriţi să ştergeţi această înregistrare BAN ? diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang index dcd7b8f56e0..287171e92b8 100644 --- a/htdocs/langs/ro_RO/bills.lang +++ b/htdocs/langs/ro_RO/bills.lang @@ -35,7 +35,7 @@ ReplacementInvoice=Înlocuire factură ReplacedByInvoice=Înlocuită de factura %s ReplacementByInvoice=Înlocuită de factura CorrectInvoice=Corecţie factura %s -CorrectionInvoice=Rectificarea facturii +CorrectionInvoice=Factură corecţie UsedByInvoice=Aplicată pe factura %s ConsumedBy=Consumat de NotConsumed=Neconsumat @@ -217,7 +217,7 @@ NoInvoice=Nici o factură ClassifyBill=Clasează factura SupplierBillsToPay=Facturi furnizori de plată CustomerBillsUnpaid=Facturi clienţi neîncasate -DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +DispenseMontantLettres=Facturile emise prin proceduri mecanographic sunt distribuite prin ordinea alfabetică NonPercuRecuperable=Nerecuperabilă SetConditions=Setează termenii de plata SetMode=Setează modul de plată diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang index aadcee9b18d..f40aaeae237 100644 --- a/htdocs/langs/ro_RO/cashdesk.lang +++ b/htdocs/langs/ro_RO/cashdesk.lang @@ -1,38 +1,38 @@ # Language file - Source file is en_US - cashdesk CashDeskMenu=Punctul de vânzare CashDesk=Punctul de vânzare -CashDesks=Punctul de vânzare +CashDesks=Punct de vânzări CashDeskBank=Cont bancar CashDeskBankCash=Cont bancar (cash) -CashDeskBankCB=Cont bancar (carte) -CashDeskBankCheque=Cont bancar (check) +CashDeskBankCB=Cont bancar (card) +CashDeskBankCheque=Cont bancar (cec) CashDeskWarehouse=Depozit -CashdeskShowServices=Vânzarea de servicii +CashdeskShowServices=Servicii disponibile CashDeskProducts=Produse CashDeskStock=Stoc CashDeskOn=pe -CashDeskThirdParty=A treia parte +CashDeskThirdParty=Terţ CashdeskDashboard=Acces Punct de vânzare ShoppingCart=Cosul de cumparaturi -NewSell=Vindem nou +NewSell=Vânzare nouă BackOffice=Back office AddThisArticle=Adauga acest articol RestartSelling=Du-te inapoi la vânzare -SellFinished=Vindem terminat -PrintTicket=Print bilet +SellFinished=Vânzare terminată +PrintTicket=Print bon NoProductFound=Nici un articol gasit -ProductFound=produsul care se găseşte +ProductFound=produs găsit ProductsFound=produse găsite NoArticle=Nici un articol Identification=Identificare Article=Articol Difference=Diferenţă -TotalTicket=Total de bilet -NoVAT=Nici TVA-ul pentru această vânzare -Change=Excesul de primit +TotalTicket=Total bon +NoVAT=Fără TVA pentru această vânzare +Change=Primit în plus CalTip=Click pentru a vizualiza calendarul CashDeskSetupStock=Vă rugăm să scadă stoc pe crearea de factură, dar pentru acest depozit este nu a fost definit
Schimba modul de configurare stoc, sau alege un depozit -BankToPay=Taxa de cont +BankToPay=Comision cont ShowCompany=Afişare companie ShowStock=Arată depozit DeleteArticle=Faceţi clic pentru a elimina acest articol diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang index 9323b0a493f..5fe76b345ce 100644 --- a/htdocs/langs/ro_RO/compta.lang +++ b/htdocs/langs/ro_RO/compta.lang @@ -37,13 +37,13 @@ Withdrawal=Retragere Withdrawals=Retrageri AmountHTVATRealReceived=TVA colectat AmountHTVATRealPaid=TVA platit -VATToPay=La plata TVA-ului -VATReceived=TVA-ul a primit -VATToCollect=TVA-ul pentru a colecta -VATSummary=TVA Sumar -LT2SummaryES=Balanţa IRPF +VATToPay=TVA vânzări +VATReceived=TVA recuperat +VATToCollect=TVA colectat +VATSummary=Sold TVA +LT2SummaryES=Sold IRPF LT1SummaryES=RE Sold -VATPaid=Plata TVA-ului +VATPaid=TVA plătit SalaryPaid=Plata salariu LT2PaidES=IRPF plătit LT1PaidES=RE Platit @@ -82,10 +82,10 @@ DatePayment=Data Plata DateStartPeriod=Dată început perioadă DateEndPeriod=Dată sfârşit perioadă NewVATPayment=Plata nouă TVA -newLT2PaymentES=Nou IRPF plată +newLT2PaymentES=Plată nouă IRPF newLT1PaymentES=Plată nouă RE LT2PaymentES=IRPF de plata -LT2PaymentsES=IRPF Plăţi +LT2PaymentsES=Plăţi IRPF LT1PaymentES=RE Plată LT1PaymentsES=RE Plăţi VATPayment=Plată TVA @@ -99,10 +99,10 @@ SupplierAccountancyCode=Cont contabil furnizor AccountNumberShort=Numărul de cont AccountNumber=Numărul de cont NewAccount=Cont nou -SalesTurnover=Vanzari cifra de afaceri +SalesTurnover=Cifra de afaceri Vanzari SalesTurnoverMinimum=Cifra de afaceri vânzări minimă ByThirdParties=Pe terţi -ByUserAuthorOfInvoice=Prin factura autor +ByUserAuthorOfInvoice=După autorul facturii AccountancyExport=Export Contabilitate ErrorWrongAccountancyCodeForCompany=Bad client contabile cod pentru %s SuppliersProductsSellSalesTurnover=A cifrei de afaceri generate de vânzările de furnizorii de produse. @@ -167,7 +167,7 @@ OrderStats=Statistici privind comenzile InvoiceStats=Statistici privind facturile Dispatch=Dispecerizare Dispatched=Expediate -ToDispatch=Pentru a expedierii +ToDispatch=De expediat ThirdPartyMustBeEditAsCustomer=A treia parte trebuie să fie definit ca un client SellsJournal=Jurnalul de vânzări PurchasesJournal=Jurnalul de cumpărări @@ -176,7 +176,7 @@ DescPurchasesJournal=Jurnalul de cumpărări InvoiceRef=Factură ref. CodeNotDef=Nedefinit AddRemind=Expedierea Suma disponibilă -RemainToDivide= Ramaneti la expediere: +RemainToDivide= Ramane da expediere: WarningDepositsNotIncluded=Facturile în avans nu sunt incluse in aceasta versiune cu acest modul de contabilitate. DatePaymentTermCantBeLowerThanObjectDate=Termenul de plată nu poate fi mai mic decât data obiectului. Pcg_version=Pcg versiune @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=în funcție de furnizor, alege metoda potrivită pe TurnoverPerProductInCommitmentAccountingNotRelevant=Raportul cifra de afaceri pe produs, atunci când se utilizează modul contabilitate de casă nu este relevant. Acest raport este disponibil numai atunci când se utilizează modul contabilitate de angajament (a se vedea configurarea modulului de contabilitate). CalculationMode=Mod calcul AccountancyJournal=Jurnal cod contabilitate -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru produsele cumpărate -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru produsele vândute -ACCOUNTING_SERVICE_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru serviciile cumpărate -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru serviciile vândute ACCOUNTING_VAT_ACCOUNT=Cont Contabilitate Predefinit pentru TVA Colectată ACCOUNTING_VAT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru TVA Platită ACCOUNTING_ACCOUNT_CUSTOMER=Cont Contabilitate Predefinit pentru terţi Clienţi diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang index 195c077ba07..c955006df8d 100644 --- a/htdocs/langs/ro_RO/contracts.lang +++ b/htdocs/langs/ro_RO/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Zona Contracte ListOfContracts=Lista contracte -LastModifiedContracts=Last %s modified contracts +LastModifiedContracts=Ultimele %s contracte modificare AllContracts=Toate contractele ContractCard=Fişă Contract ContractStatus=Status Contract @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista liniilor contractului in service ListOfRunningServices=Lista servicii active NotActivatedServices=Servicii inactive (printre contracte validate ) BoardNotActivatedServices=Servicii de activat în contractele validate -LastContracts=Last % contracts +LastContracts=Ultimele %s contracte LastActivatedServices=Ultimele %s servicii activate LastModifiedServices=Ultimele %s servicii modificate EditServiceLine=Editează linie serviciu @@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista servicii care expiră NoteListOfYourExpiredServices=Această listă conține numai serviciile pentru terții la care sunteţi reprezentant de vânzării. StandardContractsTemplate=Model standard Contracte ContactNameAndSignature=Pentru %s nume şi semnătura: +OnlyLinesWithTypeServiceAreUsed=Numai liniile cu tipul "Service" va fi clonat. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Reprezentant vanzari de semnare a contractului diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang index 26edf119a79..c774dfce023 100644 --- a/htdocs/langs/ro_RO/cron.lang +++ b/htdocs/langs/ro_RO/cron.lang @@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Pe mediul Unix veţi utiliza instrumentul crontab pentr CronExplainHowToRunWin=Pe mediul Microsoft(tm) Windows puteţi utiliza instrumentul Scheduled task pentru a rula linia de comanda la fiecare minut # Menu CronJobs=Joburi programate -CronListActive=List of active/scheduled jobs +CronListActive=Lista activelor/programatelor joburi CronListInactive=Lista joburilor dezactivate # Page list CronDateLastRun=Ultima rulare diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang index 7f2399e4129..c392d15d66f 100644 --- a/htdocs/langs/ro_RO/donations.lang +++ b/htdocs/langs/ro_RO/donations.lang @@ -31,8 +31,8 @@ DonationRecipient=Beneficiar donaţie ThankYou=Vă multumim IConfirmDonationReception=Beneficiarul declară primirea, ca donaţie , a următoarei sume MinimumAmount=Valoarea minimă este %s -FreeTextOnDonations=Free text to show in footer -FrenchOptions=Options for France -DONATION_ART200=Show article 200 from CGI if you are concerned -DONATION_ART238=Show article 238 from CGI if you are concerned -DONATION_ART885=Show article 885 from CGI if you are concerned +FreeTextOnDonations=Text liber afişat în subsol +FrenchOptions=Opțiuni pentru Franța +DONATION_ART200=Afiseaza articolului 200 din CGI dacă sunteți îngrijorat +DONATION_ART238=Afiseaza articolului 238 din CGI dacă sunteți îngrijorat +DONATION_ART885=Afiseaza articol 885 din CGI dacă sunteți îngrijorat diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang index 21d11c437ac..e83f98969fc 100644 --- a/htdocs/langs/ro_RO/errors.lang +++ b/htdocs/langs/ro_RO/errors.lang @@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Eroare, acest membru nu este ErrorThereIsSomeDeliveries=Eroare, există unele livrări legate de acest transport. Ștergere refuzată. ErrorCantDeletePaymentReconciliated=Nu se poate șterge o plată care a generat o tranzacție bancară care a fost conciliată ErrorCantDeletePaymentSharedWithPayedInvoice=Nu se poate șterge o plată partajată de cel puțin un factură cu statutul platită +ErrorPriceExpression1=Nu se poate atribui la constanta '%s' +ErrorPriceExpression2=Nu se poate redefini funcția built-in '%s' +ErrorPriceExpression3=Variabila nedefinita '%s' în definiția funcției +ErrorPriceExpression4=Caracter ilegal '%s' +ErrorPriceExpression5=Neașteptat '%s' +ErrorPriceExpression6=Număr greșit de argumente (%s dat, %s așteptat) +ErrorPriceExpression8=Operator neașteptat '%s' +ErrorPriceExpression9=A apărut o eroare neașteptată +ErrorPriceExpression10=Iperator '%s' lipsă operand +ErrorPriceExpression11=Asteptam '%s' +ErrorPriceExpression14=Împărţirea la zero, +ErrorPriceExpression17=Variabila '%s' nedefinită +ErrorPriceExpression19=Expresia nu a fost găsită +ErrorPriceExpression20=Expresie goală +ErrorPriceExpression21=Rezultat gol '%s' +ErrorPriceExpression22=Rezultat negativ '%s' +ErrorPriceExpressionInternal=Eroare internă '%s' +ErrorPriceExpressionUnknown=Eroare Necunoscută '%s' # Warnings WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi diff --git a/htdocs/langs/ro_RO/externalsite.lang b/htdocs/langs/ro_RO/externalsite.lang index 25f72b0bed9..a66dc1f4189 100644 --- a/htdocs/langs/ro_RO/externalsite.lang +++ b/htdocs/langs/ro_RO/externalsite.lang @@ -2,4 +2,4 @@ ExternalSiteSetup=Link-ul de instalare pentru site-ul extern ExternalSiteURL=URL-ul site-ului extern ExternalSiteModuleNotComplete=Modulul Site extern nu a fost configurat corespunzător. -ExampleMyMenuEntry=My menu entry +ExampleMyMenuEntry=Intrare Meniul meu diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang index 1e4ceeea37d..7001d1c09c5 100644 --- a/htdocs/langs/ro_RO/install.lang +++ b/htdocs/langs/ro_RO/install.lang @@ -1,35 +1,35 @@ # Dolibarr language file - Source file is en_US - install InstallEasy=Doar urmaţi instrucţiunile pas cu pas. -MiscellaneousChecks=Cerinţe preliminare a verifica +MiscellaneousChecks=Verificare Cerinţe preliminare DolibarrWelcome=Bine ati venit la Dolibarr ConfFileExists=%s fişierul de configurare există. ConfFileDoesNotExists=%s fişier de configurare nu exista! ConfFileDoesNotExistsAndCouldNotBeCreated=%s de fişiere de configurare nu există şi nu a putut fi creat! -ConfFileCouldBeCreated=%s fişier de configurare ar putea fi creat. +ConfFileCouldBeCreated=Fişier de configurare %s ar putea fi creat. ConfFileIsNotWritable=%s fişier de configurare nu poate fi scris. Verificaţi permisiunile. Pentru prima de instalare, serverul de web trebuie să fie acordate pentru a putea scrie în acest fişier în timpul procesului de configurare ("chmod 666", de exemplu, pe un Unix ca OS). ConfFileIsWritable=%s fişier de configurare este de scriere. ConfFileReload=Reîncarcă toate informaţiile din fişierul de configurare. PHPSupportSessions=Acest PHP susţine sesiuni. PHPSupportPOSTGETOk=Acest PHP suportă variabile POST si GET. PHPSupportPOSTGETKo=Este posibil de configurare PHP nu suporta variabile POST şi / sau GET. Verificaţi variables_order de parametru în php.ini. -PHPSupportGD=Acest sprijin PHP functii grafice HG nr. -PHPSupportUTF8=Acest sprijin PHP funcţii utf8. +PHPSupportGD=Acest PHP suportă functii grafice GD. +PHPSupportUTF8=Acest PHP suportă funcţii UTF8. PHPMemoryOK=PHP max memorie sesiune este setată la %s. Acest lucru ar trebui să fie suficient. PHPMemoryTooLow=PHP max memorie sesiune este setată la octeţi %s. Acest lucru ar trebui să fie prea mic. Modificarea php.ini pentru a seta parametrul memory_limit de bytes %s cel puţin. Recheck=Click aici pentru un test mult mai semnificativ ErrorPHPDoesNotSupportSessions=Instalarea dvs. PHP nu are suport pentru sesiuni. Această caracteristică este necesar pentru a face Dolibarr de lucru. Verificaţi configurarea PHP. ErrorPHPDoesNotSupportGD=Instalarea dvs. PHP nu are suport pentru funcţia de grafică HG nr. Graficul nu va fi disponibil. ErrorPHPDoesNotSupportUTF8=Instalarea dvs. PHP nu are suport pentru funcţii utf8. Dolibarr nu poate funcţiona corect. Rezolva acest lucru înainte de a instala Dolibarr. -ErrorDirDoesNotExists=%s director nu există. +ErrorDirDoesNotExists=Directorul %s nu există. ErrorGoBackAndCorrectParameters=Du-te înapoi şi de a corecta parametrii greşite. ErrorWrongValueForParameter=Este posibil să fi tastat greşit o valoare pentru parametrul "%s". -ErrorFailedToCreateDatabase=Nu a reuşit să creeze "%s" bază de date. -ErrorFailedToConnectToDatabase=Nu a reuşit să se conecteze la "%s" bază de date. +ErrorFailedToCreateDatabase=Eşec la crearea bazei de date '%s'. +ErrorFailedToConnectToDatabase=Eşec la conectarea la baza de date '%s'. ErrorDatabaseVersionTooLow=Versiunea bazei de date (%s) prea veche. Versiunea %s este necesară. ErrorPHPVersionTooLow=PHP versiune prea veche. %s versiune este necesar. WarningPHPVersionTooLow=PHP versiune prea veche. %s versiune sau mai mult este de aşteptat. Această versiune ar trebui să permită instalarea, dar nu este acceptat. ErrorConnectedButDatabaseNotFound=Conectarea la serverul de succes, dar "%s" bază de date nu a fost găsit. -ErrorDatabaseAlreadyExists="%s" baza de date există deja. +ErrorDatabaseAlreadyExists=Baza de date '%s' există deja. IfDatabaseNotExistsGoBackAndUncheckCreate=Dacă baza de date nu există, du-te înapoi şi a verifica opţiunea "Creare bază de date". IfDatabaseExistsGoBackAndCheckCreate=Dacă baza de date există deja, du-te înapoi şi debifaţi "Crearea bazei de date" opţiune. WarningBrowserTooOld=Versiune prea veche a browser-ului. Actualizarea browser-ul dvs. la o versiune recentă a Firefox, Chrome sau Opera este foarte recomandată. @@ -40,19 +40,19 @@ License=Utilizarea de licenţă ConfigurationFile=Fişier de configurare WebPagesDirectory=Director în cazul în care paginile web sunt stocate DocumentsDirectory=Director pentru a stoca documentele încărcate şi a generat -URLRoot=URL-ul Root +URLRoot=URL Rădăcină ForceHttps=Forţarea conexiuni securizate (HTTPS) CheckToForceHttps=Bifaţi această opţiune pentru a forţa conexiuni securizate (HTTPS).
Acest lucru presupune faptul că serverul de web este configurat cu un certificat SSL. DolibarrDatabase=Baza de date Dolibarr -DatabaseChoice=Baza de date alegere -DatabaseType=Baza de date de tip -DriverType=Sterownik typu +DatabaseChoice= Alegere Baza de date +DatabaseType=Tip Baza de date +DriverType=Tip driver Server=Server ServerAddressDescription=Numele sau adresa IP pentru serverul de baze de date, de obicei "localhost", atunci când serverul de baze de date este găzduit pe acelaşi server decât serverul de web ServerPortDescription=Port-ul serverului de baze de date. Păstraţi gol, dacă necunoscut. -DatabaseServer=Date de pe server -DatabaseName=Nazwa bazy danych -DatabasePrefix=Baza de date prefix de masă +DatabaseServer=Server baze de date +DatabaseName=Nume bază de date +DatabasePrefix=Prefix Tabel Baza de date Login=Login AdminLogin=Autentifica-te pentru proprietarul bazei de date Dolibarr. Password=Parolă @@ -71,20 +71,20 @@ ConfigurationSaving=Salvarea fişier de configurare ServerConnection=Conexiune server DatabaseConnection=Baza de date a conexiunii DatabaseCreation=Baza de date crearea de -UserCreation=Ghid de creaţie +UserCreation=Creare utilizator CreateDatabaseObjects=Baza de date crearea de obiecte ReferenceDataLoading=Date de referinta de încărcare TablesAndPrimaryKeysCreation=Mese si primar cheile de creare -CreateTableAndPrimaryKey=Crearea %s de masă +CreateTableAndPrimaryKey=Creare tabel %s CreateOtherKeysForTable=Crearea cheile străine şi indicii pentru %s de masă OtherKeysCreation=Cheile străine şi crearea de indici -FunctionsCreation=Funcţii crearea de +FunctionsCreation=Creare Funcţii AdminAccountCreation=Administrator crearea de autentificare PleaseTypePassword=Vă rugăm să introduceţi o parolă, parole goale nu sunt permise! PleaseTypeALogin=Vă rugăm să introduceţi un login! PasswordsMismatch=Parolele diferă, vă rugăm să încercaţi din nou! SetupEnd=Sfârşitul de configurare -SystemIsInstalled=Această instalaţie este completă. +SystemIsInstalled=Această instalare este completă. SystemIsUpgraded=Dolibarr a fost actualizat cu succes. YouNeedToPersonalizeSetup=Trebuie să vă configuraţi Dolibarr pentru a se potrivi nevoilor dumneavoastră (aspect, caracteristici, ...). Pentru a face acest lucru, va rugam sa urmati link-ul de mai jos: AdminLoginCreatedSuccessfuly="%s" Dolibarr administrator de autentificare a creat cu succes. @@ -107,7 +107,7 @@ DataMigration=Migrarea datelor DatabaseMigration=Structura bazei de date a migraţiei ProcessMigrateScript=Script de prelucrare ChooseYourSetupMode=Alegeţi modul de configurare şi faceţi clic pe "Start" ... -FreshInstall=Proaspete de instalare +FreshInstall=Instalare proaspătă FreshInstallDesc=Utilizaţi acest mod în cazul în care aceasta este prima de instalare. Dacă nu, acest mod se poate repara o instalare incompleta anterior, dar dacă doriţi să faceţi upgrade versiunii dvs., alegeţi "Upgrade" modul. Upgrade=Uaktualnij UpgradeDesc=Utilizaţi acest mod, dacă aţi înlocuit fişierele vechi Dolibarr cu fişiere dintr-o versiune mai nouă. Acest lucru se va actualiza baza de date şi de date. @@ -120,7 +120,7 @@ AlreadyDone=Migrat deja DatabaseVersion=Versiunea bazei de date ServerVersion=Baza de date server de versiune YouMustCreateItAndAllowServerToWrite=Trebuie să creaţi acest director şi pentru a permite serverului de web pentru a scrie în ea. -CharsetChoice=Set de caractere alegere +CharsetChoice=Alegere Set de caractere CharacterSetClient=Setul de caractere utilizat pentru paginile web generate HTML CharacterSetClientComment=Alegeţi setul de caractere pentru afişarea Web.
Set de caractere implicit propusă este una din baza de date. DBSortingCollation=Caracter de sortare pentru @@ -144,14 +144,14 @@ InstallChoiceSuggested=Instalaţi alegere sugerat de instalator. MigrateIsDoneStepByStep=Versiunea ţintă (%s) are un deficit de mai multe versiuni, astfel încât instalaţi expertul va reveni pentru a sugera migraţiei viitor, după ce acesta va fi terminat. CheckThatDatabasenameIsCorrect=Verificaţi că numele bazei de date "%s" este corectă. IfAlreadyExistsCheckOption=În cazul în care acest nume este corectă şi că baza de date nu există încă, trebuie să verificaţi opţiunea "Creare bază de date". -OpenBaseDir=PHP openbasedir parametru +OpenBaseDir= Parametru openbasedir PHP YouAskToCreateDatabaseSoRootRequired=Ai verificat caseta "Crearea bazei de date". Pentru aceasta, aveţi nevoie pentru a oferi autentificare user / parola de superuser (partea de jos a formularului). YouAskToCreateDatabaseUserSoRootRequired=Ai verificat caseta "Crearea bazei de date proprietar". Pentru aceasta, aveţi nevoie pentru a oferi autentificare user / parola de superuser (partea de jos a formularului). NextStepMightLastALongTime=Pasul curent poate dura câteva minute. Vă rugăm să aşteptaţi până când este afişat următorul ecran complet înainte de a continua. MigrationCustomerOrderShipping=Migrarea de transport maritim pentru depozitare client comenzi MigrationShippingDelivery=Upgrade de depozitare de transport maritim MigrationShippingDelivery2=Upgrade de depozitare de transport 2 -MigrationFinished=Migraţia terminat +MigrationFinished=Migraţia terminată LastStepDesc=Ultimul pas: Definirea aici nume de utilizator şi parola pe care intenţionaţi să îl utilizaţi pentru conectarea la software-ul. Nu pierde aceasta ca este cont pentru a administra toate celelalte. ActivateModule=Activaţi modul %s ShowEditTechnicalParameters=Click aici pentru a vedea / edita parametrii avansaţi (mod expert) @@ -167,7 +167,7 @@ MigrationContract=Migrarea datelor pentru contracte MigrationSuccessfullUpdate=Upgrade de succes MigrationUpdateFailed=Procesul de actualizare a eşuat MigrationRelationshipTables=Migrare a datelor pentru tabelele relaţie (%s) -MigrationPaymentsUpdate=De plată de date de corecţie +MigrationPaymentsUpdate=Corecţie dată de plată MigrationPaymentsNumberToUpdate=De plată %s (e) pentru a actualiza MigrationProcessPaymentUpdate=Actualizaţi plată (e) %s MigrationPaymentsNothingToUpdate=Nu există mai multe lucruri de făcut @@ -189,23 +189,23 @@ MigrationContractsIncoherentCreationDateUpdate=Bad contract de crearea de valoar MigrationContractsIncoherentCreationDateUpdateSuccess=Bad contract de crearea de valoare data de corecţie făcut cu succes MigrationContractsIncoherentCreationDateNothingToUpdate=Nici o valoare rău pentru data de creare contractului pentru a corecta MigrationReopeningContracts=Contract de deschis închis de eroare -MigrationReopenThisContract=Redeschide %s contractuale -MigrationReopenedContractsNumber=Contracte de %s modificate +MigrationReopenThisContract=Redeschide contract %s +MigrationReopenedContractsNumber=%s Contracte modificate MigrationReopeningContractsNothingToUpdate=Nici un contract închis pentru a deschide MigrationBankTransfertsUpdate=Actualizaţi legături între tranzacţie bancară şi un transfer bancar MigrationBankTransfertsNothingToUpdate=Toate link-uri sunt de până la zi MigrationShipmentOrderMatching=Trimiteri la data primirii de actualizare MigrationDeliveryOrderMatching=Livrare la primirea de actualizare -MigrationDeliveryDetail=Livrare de actualizare +MigrationDeliveryDetail=Actualizare Livrare MigrationStockDetail=Actualizarea valoarea stocului de produse MigrationMenusDetail=Actualizaţi tabelele de meniuri dinamice MigrationDeliveryAddress=Actualizaţi adresa de livrare în transporturi MigrationProjectTaskActors=Migrare de date pentru tabel llx_projet_task_actors MigrationProjectUserResp=Migrarea datelor domeniul fk_user_resp de llx_projet la llx_element_contact MigrationProjectTaskTime=Actualizare de timp petrecut în secunde -MigrationActioncommElement=Actualiza datele privind acţiunile +MigrationActioncommElement=Actualizare date pe acţiuni MigrationPaymentMode=Migrare de date pentru modul de plată MigrationCategorieAssociation=Migrarea categoriilor -ShowNotAvailableOptions=Show not available options -HideNotAvailableOptions=Hide not available options +ShowNotAvailableOptions=Afişează opţiunile nedisponibile +HideNotAvailableOptions=Acunde opţiunile nedisponibile diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang index 1ab3e168ebb..12c12ea721a 100644 --- a/htdocs/langs/ro_RO/mails.lang +++ b/htdocs/langs/ro_RO/mails.lang @@ -115,7 +115,7 @@ SentBy=Trimis de MailingNeedCommand=Din motive de securitate, trimiterea unui email-uri este mai bine cand este efectuată de la linia de comandă. Dacă aveți unul, întrebați administratorul pentru a lansa următoarea comandă pentru a trimite email-uri la toți destinatarii: MailingNeedCommand2=Puteţi, totuşi, trimite-le on-line, prin adăugarea parametrului MAILING_LIMIT_SENDBYWEB cu valoare de numărul maxim de mesaje de poştă electronică pe care doriţi să o trimiteţi prin sesiuni. ConfirmSendingEmailing=Dacă nu puteţi sau preferaţi să le trimiteţi cu browser-ul web, vă rugăm să confirmați că sunteți sigur că doriți să trimiteți emailurile acum de la browser-ul dvs.? -LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +LimitSendingEmailing=Notă: Trimiterea de emailurilor din interfata web se face de mai multe ori din motive de securitate și pauze, %s beneficiari la un moment dat pentru fiecare sesiune trimitere. TargetsReset=Cer senin lista ToClearAllRecipientsClickHere=Pentru a goli beneficiarilor lista pentru acest email-uri, faceţi clic pe butonul ToAddRecipientsChooseHere=Pentru a adăuga destinatari, alegeţi din aceste liste @@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s notificări vor fi trimise prin e-mail AddNewNotification=Activaţi un nou target email notificari ListOfActiveNotifications=Lista tuturor targetelor emailurilor de notificare ListOfNotificationsDone=Lista toate notificările e-mail trimis -MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. -MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. -MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. +MailSendSetupIs=Configurarea trimiterii e-mail a fost de configurat la '%s'. Acest mod nu poate fi utilizat pentru a trimite email-uri în masă. +MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniu%sHome - Setup - EMails%s pentru a schimba parametrul '%s' de utilizare în modul '%s'. Cu acest mod, puteți introduce configurarea serverului SMTP furnizat de furnizorul de servicii Internet și de a folosi facilitatea Mass email . +MailSendSetupIs3=Daca aveti intrebari cu privire la modul de configurare al serverului SMTP, puteți cere la %s. diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang index 95203b0641a..a60474b8897 100644 --- a/htdocs/langs/ro_RO/members.lang +++ b/htdocs/langs/ro_RO/members.lang @@ -85,8 +85,7 @@ SubscriptionLateShort=Întârziate SubscriptionNotReceivedShort=Neîncasată ListOfSubscriptions=Lista cotizaţii SendCardByMail=Trimite fişa pe email -AddMember=Adaugă membru -MemberType=Tip Membru +AddMember=Creare membru NoTypeDefinedGoToSetup=Nici un tip de membru definit. Du-te la meniull "Tipuri Membri" NewMemberType=Tip nou Membru WelcomeEMail=Email de bun venit @@ -126,7 +125,7 @@ Date=Dată DateAndTime=Data şi ora PublicMemberCard=Fişa Membru public MemberNotOrNoMoreExpectedToSubscribe=Membrii care n-au plătit cotizaţia -AddSubscription=Adaugă cotizaţie +AddSubscription=Creare adeziune ShowSubscription=Afişează adeziune MemberModifiedInDolibarr=Membrii modificaţi în Dolibarr SendAnEMailToMember=Trimite e-mail de informare membrului @@ -171,6 +170,8 @@ LastSubscriptionAmount=Valoarea ultimei cotizaţii MembersStatisticsByCountries=Statistici Membri după ţară MembersStatisticsByState=Statistici Membri după regiune / judeţ MembersStatisticsByTown=Statistici Membri după oraşe +MembersStatisticsByRegion=Statistici Membri după regiune +MemberByRegion=Membrii după regiune NbOfMembers=Număr membri NoValidatedMemberYet=Nici un membru validat găsit MembersByCountryDesc=Acest ecran vă arată statisticile cu privire la membrii după ţări. Graficul depinde serviciul on-line Google grafic şi este disponibil numai în cazul în care conexiunea la internet este activă. @@ -202,3 +203,4 @@ MembersByNature=Membri după personalitate juridică VATToUseForSubscriptions=Rata TVA utilizată pentru înscrieri NoVatOnSubscription=Fără TVA la adeziuni MEMBER_PAYONLINE_SENDEMAIL=Email de avertizare atunci când Dolibarr primeşte o confirmare a unei plăți validate pentru înscriere +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produs folosit pentru linia abonamentului în factura: %s diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang index 579ae622ecc..52e5bd348e1 100644 --- a/htdocs/langs/ro_RO/orders.lang +++ b/htdocs/langs/ro_RO/orders.lang @@ -53,7 +53,7 @@ ShippingExist=O expediţie există DraftOrWaitingApproved=Comenzi Schiţe sau încă neaprobate DraftOrWaitingShipped=Comenzi Schiţe sau validate încă neexpediate MenuOrdersToBill=Comenzi livrate -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Comenzi facturabile SearchOrder=Caută Comanda SearchACustomerOrder=Caută o comandă client ShipProduct=Expediază produs diff --git a/htdocs/langs/ro_RO/paybox.lang b/htdocs/langs/ro_RO/paybox.lang index 5e7b247ee58..864c5f70c35 100644 --- a/htdocs/langs/ro_RO/paybox.lang +++ b/htdocs/langs/ro_RO/paybox.lang @@ -35,6 +35,6 @@ MessageKO=Mesaj de pe pagina anulat schimbul de plată NewPayboxPaymentReceived=O nouă plată Paybox primită NewPayboxPaymentFailed=O plată nouă Paybox încercată dar eşuată PAYBOX_PAYONLINE_SENDEMAIL=Email pentru avertizare după o plată (realizată sau nu) -PAYBOX_PBX_SITE=Value for PBX SITE -PAYBOX_PBX_RANG=Value for PBX Rang -PAYBOX_PBX_IDENTIFIANT=Value for PBX ID +PAYBOX_PBX_SITE=Valoare pentru PBX SITE +PAYBOX_PBX_RANG=Valoare pentru PBX Rang +PAYBOX_PBX_IDENTIFIANT=Valoare pentru PBX ID diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang index 94de8dd384d..f2e97e17072 100644 --- a/htdocs/langs/ro_RO/products.lang +++ b/htdocs/langs/ro_RO/products.lang @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Setează acelasi preţ pe subsidiarele clientuli PriceByCustomerLog=Log Preţ pe client MinimumPriceLimit=Preţul minim nu poate fi mai mic decat %s MinimumRecommendedPrice=Preţul minim recomandat este: %s +PriceExpressionEditor=Editor expresie preț +PriceExpressionSelected=Expresie preț selectatată +PriceExpressionEditorHelp="preț = 2 + 2" sau "2 + 2" pentru stabilirea prețului
Extra câmpurile sunt variabile, cum ar fi ""#options_myextrafieldkey# * 2"
Există variabile speciale, cum ar fi#quantity# and #tva_tx#
Folosiți ; pentru a separa expresiile +PriceMode=Mod preț +PriceNumeric=Număr diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang index 8d89f5a4f9d..e5fb1a57e8c 100644 --- a/htdocs/langs/ro_RO/projects.lang +++ b/htdocs/langs/ro_RO/projects.lang @@ -36,6 +36,8 @@ TaskTimeSpent=Timp consumat pe task TaskTimeUser=Utilizator TaskTimeNote=Nota TaskTimeDate=Data +TasksOnOpenedProject=Sarcini la proiectele deschise +WorkloadNotDefined=Volumul de muncă nu este definit NewTimeSpent=Timp nou consumat MyTimeSpent=Timpul meu consumat MyTasks=TAskurile mele diff --git a/htdocs/langs/ro_RO/resource.lang b/htdocs/langs/ro_RO/resource.lang index d64075dfbf5..8a2f531d677 100644 --- a/htdocs/langs/ro_RO/resource.lang +++ b/htdocs/langs/ro_RO/resource.lang @@ -1,36 +1,34 @@ -MenuResourceIndex=Resources -MenuResourceAdd=New resource -MenuResourcePlanning=Resource planning -DeleteResource=Delete resource -ConfirmDeleteResourceElement=Confirm delete the resource for this element -NoResourceInDatabase=No resource in database. -NoResourceLinked=No resource linked +MenuResourceIndex=Resurse +MenuResourceAdd=Resursă nouă +MenuResourcePlanning=Planificare resursă +DeleteResource=Şterge resursa +ConfirmDeleteResourceElement=Confirmaţi ştergerea resursei pentru acest element +NoResourceInDatabase=Nici o resursă în baza de date. +NoResourceLinked=Nici o resursă legată -ResourcePageIndex=Resources list -ResourceSingular=Resource -ResourceCard=Resource card -AddResource=Create a resource -ResourceFormLabel_ref=Resource name -ResourceType=Resource type -ResourceFormLabel_description=Resource description +ResourcePageIndex=Lista resurse +ResourceSingular=Resursă +ResourceCard=Fişă resursă +AddResource=Crează resursă +ResourceFormLabel_ref=Nume resursă +ResourceType=Tip resursă +ResourceFormLabel_description=Descriere resursă -ResourcesLinkedToElement=Resources linked to element +ResourcesLinkedToElement=Resurse legate de elementul -ShowResourcePlanning=Show resource planning -GotoDate=Go to date +ShowResourcePlanning=Arată planificare resursă +GotoDate=Mergi la data -ResourceElementPage=Element resources -ResourceCreatedWithSuccess=Resource successfully created -RessourceLineSuccessfullyDeleted=Resource line successfully deleted -RessourceLineSuccessfullyUpdated=Resource line successfully updated -ResourceLinkedWithSuccess=Resource linked with success +ResourceElementPage=Element resurse +ResourceCreatedWithSuccess=Resursă creată +RessourceLineSuccessfullyDeleted=Linie resursă ștearsă +RessourceLineSuccessfullyUpdated=Linie resursă actualizată +ResourceLinkedWithSuccess=Resursă legată cu succes -TitleResourceCard=Resource card -ConfirmDeleteResource=Confirm to delete this resource -RessourceSuccessfullyDeleted=Resource successfully deleted -DictionaryResourceType=Type of resources +TitleResourceCard=Fişă resursă +ConfirmDeleteResource=Confirmaţi ştergerea acestei resurse +RessourceSuccessfullyDeleted=Resursă ştearsă +DictionaryResourceType=Tipuri resurse -DictionaryEMailTemplates=Modèles d'Emails - -SelectResource=Select resource +SelectResource=Selectează resursa diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang index 24f32791525..b951fc80a47 100644 --- a/htdocs/langs/ro_RO/stocks.lang +++ b/htdocs/langs/ro_RO/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Eticheta Depozit este obligatorie CorrectStock=Corectează stoc ListOfWarehouses=Lista depozite ListOfStockMovements=Lista mişcări de stoc -StocksArea=Warehouses area +StocksArea=Zona Depozite Location=Locație LocationSummary=Nume scurt locaţie NumberOfDifferentProducts=Numărul de produse diferite diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang index 31d08174920..e6a719a0b0e 100644 --- a/htdocs/langs/ro_RO/users.lang +++ b/htdocs/langs/ro_RO/users.lang @@ -102,7 +102,7 @@ UserDisabled=User %s cu handicap UserEnabled=User %s activat UserDeleted=User %s eliminat NewGroupCreated=Grupul creat %s -GroupModified=Group %s modified +GroupModified=Grup %s modificat GroupDeleted=Grupul %s eliminat ConfirmCreateContact=Yu Sunteţi sigur că doriţi să creaţi un cont pentru acest Dolibarr de contact? ConfirmCreateLogin=Sunteţi sigur că doriţi să creaţi un cont pentru acest Dolibarr membru? diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang index 38374aafce8..0793f5019ea 100644 --- a/htdocs/langs/ro_RO/withdrawals.lang +++ b/htdocs/langs/ro_RO/withdrawals.lang @@ -47,7 +47,7 @@ RefusedData=Data respingerii RefusedReason=Motivul respingerii RefusedInvoicing=Facturare respingerea NoInvoiceRefused=Nu încărcaţi respingerea -InvoiceRefused=Invoice refused (Charge the rejection to customer) +InvoiceRefused=Factura refuzată (Încărcați refuzul la client) Status=Status StatusUnknown=Necunoscut StatusWaiting=Aşteptare @@ -79,10 +79,11 @@ CreditDate=Credit pe WithdrawalFileNotCapable=Imposibil de a genera fișierul chitanţă de retragere pentru țara dvs %s (Țara dvs. nu este acceptată) ShowWithdraw=Arată Retragere IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Cu toate acestea, dacă factura are cel puțin o plată de retragere încă neprelucrată, aceasta nu va fi setată ca plătită permite în prealabil gestionarea retragerii. -DoStandingOrdersBeforePayments=Acest tab vă permite să solicitaţi un ordin de plată. Odată ce este complet, puteți introduce plata pentru a închide factura. +DoStandingOrdersBeforePayments=Acest tab vă permite să solicitaţi un ordin de plată. Odată ce este dat intră în meniul Bancă> Retragerea de a gestiona ordinul de plată. Când ordinul de plată este închis, plata pe factura va fi înregistrată în mod automat, iar factura închisă dacă restul de plata este nul. WithdrawalFile=Fişier Retragere SetToStatusSent=Setează statusul "Fişier Trimis" ThisWillAlsoAddPaymentOnInvoice=Aceasta se va aplica, de asemenea, plății facturilor și vor fi clasificate ca "Plătit" +StatisticsByLineStatus=Statistici după starea liniilor ### Notifications InfoCreditSubject=Plata %s comandă în picioare de către bancă diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index fce5cff17a9..d85f4bd7539 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Использовать автодополнение ActivityStateToSelectCompany= Добавить в фильтр опцию показать / скрыть контрагентов, которые в настоящее время бездействуют или отстранились UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Использовать автодополнение для выбора контакта (вместо списка) +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Настройки поискового фильтра NumberOfKeyToSearch=Кол-во символов для запуска поиска: %s ViewFullDateActions=Показать полный даты действия в третий лист @@ -208,6 +210,7 @@ ModulesJobDesc=Бизнес модули обеспечивают простую ModulesMarketPlaceDesc=Вы сможете найти больше модулей для загрузки на внешних веб-сайтах в Интернете ... ModulesMarketPlaces=Еще модули ... DoliStoreDesc=DoliStore, официальный рынок для внешних модулей Dolibarr ERP / CRM +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Веб-сайты, где Вы можете найти еще модули ... URL=Ссылка BoxesAvailable=Доступные боксы @@ -444,7 +447,7 @@ Module55Desc=Штрих-коды управления Module56Name=Телефония Module56Desc=Телефония интеграции Module57Name=Постоянные заказы -Module57Desc=Постоянные приказы и снятие управления +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial интеграции Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Подача Module320Desc=Добавить RSS канал внутри Dolibarr экране страниц Module330Name=Закладки Module330Desc=Закладки управления -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar интеграции Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Категории Module1780Desc=Категории управления (продукции, поставщиков и заказчиков) Module2000Name=FCKeditor Module2000Desc=WYSIWYG редактор +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Управление запланированными заданиями Module2400Name=Повестка дня @@ -503,6 +508,8 @@ Module2500Name=Электронное управление Module2500Desc=Сохранение и обмен документами Module2600Name=WebServices Module2600Desc=Включить сервер услуг Dolibarr Сети +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Использование онлайн Gravatar службы (www.gravatar.com), чтобы показать фото пользователей / участников (нашли с их электронной почты). Необходимость доступа в Интернет Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с PayBox Module50100Name=Кассовое @@ -527,7 +534,7 @@ Module50200Desc=Модуль предлагает онлайн страницу Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Управление Бизнес-Процессами Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Наценки @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Происхождение Коммерческих предложений / Заказов DictionaryAccountancyplan=План счетов DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Настройки сохранены BackToModuleList=Вернуться к списку модулей BackToDictionaryList=Назад к списку словарей @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Постоянный поиск формы на лево DefaultLanguage=Язык по умолчанию (код языка) EnableMultilangInterface=Включить многоязычный интерфейс EnableShowLogo=Показать логотип на левом меню +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Система была успешно обновлена CompanyInfo=Информация о Компании / фонде CompanyIds=Компания / фундамент тождествам diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang index fbe2fb1cfcf..ff1b49742b4 100644 --- a/htdocs/langs/ru_RU/agenda.lang +++ b/htdocs/langs/ru_RU/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=События назначенные ActionsDoneBy=Действия, проделанную ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Все мои действия / задачи AllActions= Все ле действия / задачи ViewList=Посмотреть список diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang index 9c6f18e7213..ba15732dac1 100644 --- a/htdocs/langs/ru_RU/compta.lang +++ b/htdocs/langs/ru_RU/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Режим вычислений AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang index 0e2e79dd3c3..16b0b7d4c85 100644 --- a/htdocs/langs/ru_RU/contracts.lang +++ b/htdocs/langs/ru_RU/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Список запуска контракта ли ListOfRunningServices=Список запущенных служб NotActivatedServices=Не активируется услуг (в том числе утверждены контракты) BoardNotActivatedServices=Услуги для активации среди утверждены контракты -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Последнее %s активированных услуг LastModifiedServices=Последнее% с измененными услуги EditServiceLine=Изменить направление @@ -91,6 +91,7 @@ ListOfServicesToExpire=Список истекающих услуг NoteListOfYourExpiredServices=Этот список содержит только услуги по договорам с Контрагентами, с которыми связаны как торговый представитель StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Торговый представитель подписания контракта diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang index a4f06909eab..34a00865c83 100644 --- a/htdocs/langs/ru_RU/errors.lang +++ b/htdocs/langs/ru_RU/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Требуется код Поставщика ErrorSupplierCodeAlreadyUsed=Код Поставщика уже используется ErrorBadParameters=Неверные параметры ErrorBadValueForParameter=Неверное значение %s для параметра неправильной %s -ErrorBadImageFormat=Файл изображения имеет не поддерживаемый формат +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat= Значение '%s' имеет неверный формат даты ErrorWrongDate=Дата некорректна! ErrorFailedToWriteInDir=Не удалось записать в директорию %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Пользователь с логином %s н ErrorLoginHasNoEmail=Этот пользователь не имеет адреса электронной почты. Процесс прерван. ErrorBadValueForCode=Плохо значения типов кода. Попробуйте еще раз с новой стоимости ... ErrorBothFieldCantBeNegative=Поля %s и %s не может быть и отрицательным +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Учетная запись пользователя %s используется для выполнения веб-сервер не имеет разрешения для этого ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Обязательные параметры не определены diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang index 9d4f302eb56..b7750075fd8 100644 --- a/htdocs/langs/ru_RU/members.lang +++ b/htdocs/langs/ru_RU/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Поздно SubscriptionNotReceivedShort=Никогда не получил ListOfSubscriptions=Список подписчиков SendCardByMail=Отправить карту -AddMember=Добавить члена +AddMember=Create member NoTypeDefinedGoToSetup=Ни один из членов определенных типов. Переход к установке - членов типов NewMemberType=Новый член типа WelcomeEMail=Приветственное Email-письмо @@ -125,7 +125,7 @@ Date=Свидание DateAndTime=Дата и время PublicMemberCard=Член общественного карту MemberNotOrNoMoreExpectedToSubscribe=Члены, не больше и не ожидается, подписаться -AddSubscription=Добавить подписку +AddSubscription=Create subscription ShowSubscription=Показать подписки MemberModifiedInDolibarr=Член Изменения в Dolibarr SendAnEMailToMember=Отправить по электронной почте информацию члена @@ -203,3 +203,4 @@ MembersByNature=Members by nature VATToUseForSubscriptions=VAT rate to use for subscriptions NoVatOnSubscription=No TVA for subscriptions MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang index 27b43d63d39..c94b0a8803c 100644 --- a/htdocs/langs/ru_RU/products.lang +++ b/htdocs/langs/ru_RU/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Если продукт является услугой MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Кол-во Цена MultiPriceLevelsName=Цена категорий -AssociatedProductsAbility=Включить связанные продукты -AssociatedProducts=Связанные продукты -AssociatedProductsNumber=Количество продукции -ParentProductsNumber=Количество родителей продукт -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Ассоциированные Translation=Перевод KeywordFilter=Ключевое слово фильтр @@ -132,7 +132,7 @@ AddDel=Добавить / Удалить Quantity=Кол-во NoMatchFound=Не найдено соответствия ProductAssociationList=Список продуктов / услуг: Наименование товара / услуги (количество пострадавших) -ProductParentList=Список продуктов / услуг с этим продуктом в качестве компонента +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Один из выбранного продукта родителей с действующим продукта DeleteProduct=Удалить товар / услугу ConfirmDeleteProduct=Вы уверены, что хотите удалить этот продукт / услугу? @@ -179,7 +179,7 @@ CloneProduct=Клон продукт или услугу ConfirmCloneProduct=Вы уверены, что хотите клонировать продукт или услуга %s? CloneContentProduct=Клон все основные данные о продукции / услуг ClonePricesProduct=Клон основные данные и цены -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Этот продукт используется NewRefForClone=Ссылка нового продукта / услуги CustomerPrices=Клиенты цены @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang index 85f329b89b2..ec8ab9c70d4 100644 --- a/htdocs/langs/ru_RU/projects.lang +++ b/htdocs/langs/ru_RU/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Эта точка зрения представляет всех пр Myprojects=Мои проекты ProjectsArea=Проекты области NewProject=Новый проект -AddProject=Добавить проект +AddProject=Create project DeleteAProject=Удаление проекта DeleteATask=Удалить задание ConfirmDeleteAProject=Вы уверены, что хотите удалить этот проект? @@ -36,6 +36,8 @@ TaskTimeSpent=Время, потраченное на задачи TaskTimeUser=Пользователь TaskTimeNote=Заметка TaskTimeDate=Дата +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Новое время MyTimeSpent=Мое время MyTasks=Мои задачи @@ -45,7 +47,7 @@ TaskDateStart=Дата начала задачи TaskDateEnd=Дата завершения задачи TaskDescription=Описание задачи NewTask=Новые задачи -AddTask=Добавить задачу +AddTask=Create task AddDuration=Добавить продолжительность Activity=Мероприятие Activities=Задачи / мероприятия diff --git a/htdocs/langs/ru_RU/resource.lang b/htdocs/langs/ru_RU/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/ru_RU/resource.lang +++ b/htdocs/langs/ru_RU/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang index 4e8a688b7ce..1e27c270b19 100644 --- a/htdocs/langs/ru_RU/withdrawals.lang +++ b/htdocs/langs/ru_RU/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Кредит на WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Показать Вывод IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однако, если счет-фактура имеет по крайней мере один вывод оплаты еще не обработан, то он не будет установлен, как оплачиваются, чтобы управлять снятие ранее. -DoStandingOrdersBeforePayments=Это вкладок позволяет запросить за постоянного платежного поручения. Как только она будет закончена, вы можете ввести оплату, чтобы закрыть счета. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Оплата постоянных %s порядке банк diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index 06473396026..c726f320ec8 100644 --- a/htdocs/langs/sk_SK/admin.lang +++ b/htdocs/langs/sk_SK/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Pridať možnosť filtra pre zobrazenie / skrytie thirdparties, ktoré sú v súčasnej dobe v činnosti alebo prestal ju UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Hľadať filtre možnosti NumberOfKeyToSearch=Predradníka znaky na spustenie hľadania: %s ViewFullDateActions=Všetky dáta udalosti v tretí list @@ -208,6 +210,7 @@ ModulesJobDesc=Obchodné moduly poskytujú jednoduché preddefinované nastaveni ModulesMarketPlaceDesc=Môžete si nájsť viac modulov k stiahnutiu na externých webových stránok na internete ... ModulesMarketPlaces=Viac moduly ... DoliStoreDesc=DoliStore, oficiálny trh pre Dolibarr ERP / CRM externých modulov +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Poskytovatelia webových stránok môžete vyhľadávať nájsť viac modulov ... URL=Odkaz BoxesAvailable=Trezory sú k dispozícii @@ -444,7 +447,7 @@ Module55Desc=Barcode riadenie Module56Name=Telefónia Module56Desc=Telefónia integrácia Module57Name=Trvalé príkazy -Module57Desc=Trvalé príkazy a abstinenčné riadenie +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integrácia ClickToDial systému (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Pridať RSS kanál vnútri obrazoviek Dolibarr Module330Name=Záložky Module330Desc=Správa záložiek -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=WebCalendar Module410Desc=WebCalendar integrácia Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Kategórie Module1780Desc=Category management (produkty, dodávatelia a odberatelia) Module2000Name=WYSIWYG editor Module2000Desc=Nechajte upraviť niektoré textové pole pomocou pokročilého editora +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Plánované správu úloh Module2400Name=Program rokovania @@ -503,6 +508,8 @@ Module2500Name=Elektronický Redakčný Module2500Desc=Uložiť a zdieľať dokumenty Module2600Name=WebServices Module2600Desc=Povoliť Dolibarr webových služieb servera +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Pomocou on-line služby (Gravatar www.gravatar.com) ukázať fotku užívateľov / členov (nájdený s ich e-maily). Potrebujete prístup k internetu Module2800Desc=FTP klient @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Paybox Module50100Name=Bod predaja @@ -527,7 +534,7 @@ Module50200Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Payp Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Tlač cez poháre tlačiarne IPP. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Okraje @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Nastavenie uložené BackToModuleList=Späť na zoznam modulov BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanentný vyhľadávací formulár na ľavom menu DefaultLanguage=Predvolený jazyk používať (kód jazyka) EnableMultilangInterface=Povoliť viacjazyčné rozhranie EnableShowLogo=Zobraziť logo na ľavom menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Systém bol úspešne aktualizovaný CompanyInfo=Spoločnosti / Nadácia informácie CompanyIds=Spoločnosť / nadácie identity diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang index b267c89fb22..6aaa3b7800d 100644 --- a/htdocs/langs/sk_SK/agenda.lang +++ b/htdocs/langs/sk_SK/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Akcia priradené ActionsDoneBy=Akcie vykonané ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= Všetky moje akcie / úlohy AllActions= Všetky udalosti / úlohy ViewList=Zobrazenie zoznamu diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang index a3dd3513e49..05c32f0d35a 100644 --- a/htdocs/langs/sk_SK/compta.lang +++ b/htdocs/langs/sk_SK/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=podľa dodávateľa zvoliť vhodnú metódu použiť TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat správa za tovar, pri použití hotovosti evidencia režim nie je relevantná. Táto správa je k dispozícii len pri použití zásnubný evidencia režimu (pozri nastavenie účtovného modulu). CalculationMode=Výpočet režim AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/sk_SK/contracts.lang b/htdocs/langs/sk_SK/contracts.lang index d69c3405dd9..9ed7ccf7da6 100644 --- a/htdocs/langs/sk_SK/contracts.lang +++ b/htdocs/langs/sk_SK/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Zoznam bežiacich zmlúv liniek ListOfRunningServices=Zoznam spustených služieb NotActivatedServices=Neaktívne služby (u overených zmlúv) BoardNotActivatedServices=Služby pre aktiváciu u overených zmlúv -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Posledné %s aktiváciu služby LastModifiedServices=Posledné %s upravené služby EditServiceLine=Upraviť linka @@ -91,6 +91,7 @@ ListOfServicesToExpire=Zoznam služieb vyprší NoteListOfYourExpiredServices=Tento zoznam obsahuje iba služby zmlúv pre tretie strany si sú prepojené ako obchodného zástupcu. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Obchodný zástupca podpise zmluvy diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang index 06bdb2b3b44..1b9648f54a2 100644 --- a/htdocs/langs/sk_SK/errors.lang +++ b/htdocs/langs/sk_SK/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Dodávateľ povinný kód ErrorSupplierCodeAlreadyUsed=Dodávateľ kód už používaný ErrorBadParameters=Bad parametre ErrorBadValueForParameter=Chybná hodnota "%s" pre nastavenie parametrov nesprávnych "%s" -ErrorBadImageFormat=Obrazový súbor nemá podporovaný formát +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Hodnota "%s" má nesprávny formát dátumu ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Nepodarilo sa zapísať do adresára %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Užívateľ s prihlásením %s nebol nájdený. ErrorLoginHasNoEmail=Tento užívateľ nemá žiadnu e-mailovú adresu. Proces prerušená. ErrorBadValueForCode=Bad hodnota bezpečnostného kódu. Skúste to znova s ​​novou hodnotou ... ErrorBothFieldCantBeNegative=Polia %s a %s nemôžu byť negatívna +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Užívateľský účet %s použiť na spustenie webový server nemá oprávnenie pre ktoré ErrorNoActivatedBarcode=Žiaden čiarový kód aktivovaný typ ErrUnzipFails=Nepodarilo sa rozbaliť %s s ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Povinné parametre sú doteraz stanovené diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang index 473092c87c0..eec0d8666a4 100644 --- a/htdocs/langs/sk_SK/members.lang +++ b/htdocs/langs/sk_SK/members.lang @@ -85,8 +85,7 @@ SubscriptionLateShort=Neskoro SubscriptionNotReceivedShort=Nikdy nedostal ListOfSubscriptions=Zoznam predplatné SendCardByMail=Poslať kartu e-mailom -AddMember=Pridať člena -MemberType=Členské typ +AddMember=Create member NoTypeDefinedGoToSetup=Žiadny člen definované typy. Choď na menu "Členovia typy" NewMemberType=Nový člen typu WelcomeEMail=Vitajte e-mail @@ -126,7 +125,7 @@ Date=Dátum DateAndTime=Dátum a čas PublicMemberCard=Členské verejné karta MemberNotOrNoMoreExpectedToSubscribe=Člen, ktorý alebo nie viac očakáva, že k odberu -AddSubscription=Pridať predplatné +AddSubscription=Create subscription ShowSubscription=Zobraziť predplatné MemberModifiedInDolibarr=Člen upravený v Dolibarr SendAnEMailToMember=Poslať e-mail Informácie o členovi @@ -171,6 +170,8 @@ LastSubscriptionAmount=Posledný úpisu MembersStatisticsByCountries=Členovia Štatistiky podľa krajiny MembersStatisticsByState=Členovia štatistika štát / provincia MembersStatisticsByTown=Členovia štatistika podľa mesta +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=Počet členov NoValidatedMemberYet=Žiadne overené členmi nájdených MembersByCountryDesc=Táto obrazovka vám ukáže štatistiku členov jednotlivých krajinách. Grafika však závisí od Google on-line služby grafu a je k dispozícii iba v prípade, je pripojenie k internetu funguje. @@ -202,3 +203,4 @@ MembersByNature=Členovia od prírody VATToUseForSubscriptions=Sadzba DPH sa má použiť pre predplatné NoVatOnSubscription=Nie TVA za upísané vlastné imanie MEMBER_PAYONLINE_SENDEMAIL=E-mail upozorniť pri Dolibarr obdržíte potvrdenie o overenú platby za predplatné +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/sk_SK/printipp.lang b/htdocs/langs/sk_SK/printipp.lang index 1b051dae6cb..835e6827f12 100644 --- a/htdocs/langs/sk_SK/printipp.lang +++ b/htdocs/langs/sk_SK/printipp.lang @@ -1,18 +1,14 @@ -/* - * Language code: sk_SK - * Automatic generated via autotranslator.php tool - * Generation date 2013-11-08 23:25:26 - */ - - -// START - Lines generated via autotranslator.php tool (2013-11-08 23:25:26). -// Reference language: en_US -> sk_SK -PrintIPPSetup=Nastavenie modulu Priama tlač -PrintIPPDesc=Ce modul Permet d'un ajouter Bouton d'dojem priame des dokumenty vers votre imprimante. Il requiert un systeme Linux Equipe de poháre. -PRINTIPP_ENABLED=Zobraziť Piktogram "Priama tlač" do zoznamu dokumentov -PRINTIPP_HOST=Tlačový server -PRINTIPP_PORT=Prístav -PRINTIPP_USER=Prihlásenie -PRINTIPP_PASSWORD=Heslo -NoPrinterFound=Žiadne tlačiarne nájdené (skontrolujte poháre Nasta) -// STOP - Lines generated via autotranslator.php tool (2013-11-08 23:48:51). +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang index 6df1806e58a..c8e4d892a18 100644 --- a/htdocs/langs/sk_SK/products.lang +++ b/htdocs/langs/sk_SK/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=Je-li výrobok je služba s obmedzeným trvaním: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Počet cien MultiPriceLevelsName=Cenové kategórie -AssociatedProductsAbility=Aktivácia virtuálne produkty sa vyznačujú -AssociatedProducts=Virtuálne produkt -AssociatedProductsNumber=Počet výrobkov tvoriacich tento virtuálny produkt -ParentProductsNumber=Počet materskej virtuálneho produktu -IfZeroItIsNotAVirtualProduct=Ak je 0, tento produkt nie virtuálneho produktu -IfZeroItIsNotUsedByVirtualProduct=Je-li 0, je tento výrobok nie je používaný žiadnym virtuálneho produktu +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Asociovať Translation=Preklad KeywordFilter=Kľúčové slovo filter @@ -132,7 +132,7 @@ AddDel=Pridať / Odstrániť Quantity=Množstvo NoMatchFound=Nie nájdená zhoda ProductAssociationList=Zoznam súvisiacich produktov / služieb: názov produktu / služby (množstvo ovplyvnené) -ProductParentList=Zoznam virtuálnych produktov / služieb s týmto produktom ako súčasť +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=Jedným z vybraného produktu je rodič s aktuálnou produkt DeleteProduct=Odstránenie produktu / služby ConfirmDeleteProduct=Ste si istí, že chcete zmazať tento výrobok / službu? @@ -179,7 +179,7 @@ CloneProduct=Clone produkt alebo službu ConfirmCloneProduct=Ste si istí, že chcete klonovať produktov alebo služieb %s? CloneContentProduct=Klon všetky hlavné informácie o produkte / služby ClonePricesProduct=Klonovať hlavné informácie a ceny -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=Tento produkt sa používa NewRefForClone=Ref nového produktu / služby CustomerPrices=Zákazníci ceny @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang index 1772c61049f..8639f46b4fa 100644 --- a/htdocs/langs/sk_SK/projects.lang +++ b/htdocs/langs/sk_SK/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Tento názor predstavuje všetky projekty a úlohy (vaše užívateľs Myprojects=Moje projekty ProjectsArea=Projekty oblasť NewProject=Nový projekt -AddProject=Pridať projekt +AddProject=Create project DeleteAProject=Odstránenie projektu DeleteATask=Ak chcete úlohu ConfirmDeleteAProject=Ste si istí, že chcete zmazať tento projekt? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Nový čas strávený MyTimeSpent=Môj čas strávený MyTasks=Moje úlohy @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=Nová úloha -AddTask=Pridať úloha +AddTask=Create task AddDuration=Pridať trvania Activity=Činnosť Activities=Úlohy / aktivity diff --git a/htdocs/langs/sk_SK/resource.lang b/htdocs/langs/sk_SK/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/sk_SK/resource.lang +++ b/htdocs/langs/sk_SK/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang index f7fc78cb9af..4bb8cdd1569 100644 --- a/htdocs/langs/sk_SK/withdrawals.lang +++ b/htdocs/langs/sk_SK/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Kredit na WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Zobraziť Natiahnite IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Odstúpenie súbor SetToStatusSent=Nastavte na stav "odoslaný súbor" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Platba %s trvalého príkazu bankou diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index b72bb07c101..dc018fa38c8 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Za izbiranje partnerjev uporabite polja z avtomatsko iz ActivityStateToSelectCompany= Dodaj opcijo filtra za prikaz/skritje partnerjev, ki so trenutno neaktivni ali so prekinili aktivnosti UseSearchToSelectContactTooltip=Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza. UseSearchToSelectContact=Zaizbiro kontakta uporabite polja z avtomatsko izpolnitvijo (namesto uporabe seznama). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Opcije iskalnega filtra NumberOfKeyToSearch=Število znakov za sproženje iskanja: %s ViewFullDateActions=Prikaži celotne datume aktivnosti na tretjem listu ViewFullDateActions=Prikaz polnih datumov aktivnosti v tretjem zavihku @@ -208,6 +210,7 @@ ModulesJobDesc=Poslovni moduli zagotavljajo enostavne prednastavitve aplikacije ModulesMarketPlaceDesc=Več modulov si lahko naložite preko zunanjih web strani na internetu... ModulesMarketPlaces=Več modulov... DoliStoreDesc=DoliStore, uradna tržnica za Dolibarr ERP/CRM zunanje module +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Ponudniki spletnih strani, na katerih lahko poiščete več modulov... URL=Link BoxesAvailable=Polja, ki so na voljo @@ -437,14 +440,14 @@ Module52Name=Zaloge Module52Desc=Upravljanje zalog proizvodov Module53Name=Storitve Module53Desc=Upravljanje storitev -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Pogodbe/naročnine +Module54Desc=Upravljanje pogodb (storitev ali ponavljajočih naročnin) Module55Name=Črtne kode Module55Desc=Upravljanje črtnih kod Module56Name=Telefonija Module56Desc=Integracija telefonije Module57Name=Trajniki -Module57Desc=Upravljanje trajnikov in dvigov +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=Klic s klikom Module58Desc=Integracija klica s klikom Module59Name=Vaš zaznamek @@ -475,8 +478,8 @@ Module320Name=Vir RSS Module320Desc=Dodajanje vira RSS na prikazane Dolibarr strani Module330Name=Zaznamki Module330Desc=Upravljanje zaznamkov -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projekti/priložnosti/možnosti +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Internetni koledar Module410Desc=Integracija internetnega koledarja Module500Name=Posebni stroški (davki, socialni prispevki, dividende) @@ -484,7 +487,7 @@ Module500Desc=Upravljanje posebnih stroškov, kot so davki, socialni prispevki, Module510Name=Plače Module510Desc=Upravljanje plač in plačil zaposlenim Module600Name=Obvestila -Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) +Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih (nastavitev je določena za vsakega partnerja) Module700Name=Donacije Module700Desc=Upravljanje donacij Module1200Name=Mantis @@ -495,6 +498,8 @@ Module1780Name=Kategorije Module1780Desc=Upravljanje kategorij (proizvodi, dobavitelji in kupci) Module2000Name=Fck urejevalnik Module2000Desc=WYSIWYG urejevalnik +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Periodično opravilo Module2300Desc=Načrtovano upravljanje nalog Module2400Name=Dnevni red @@ -503,6 +508,8 @@ Module2500Name=Upravljanje elektronskih vsebin Module2500Desc=Shranjevanje dokumentov in dajanje v skupno rabo Module2600Name=Spletne storitve Module2600Desc=Omogočanje Dolibarr strežnika za spletne storitve +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Uporaba online Gravatar storitev (www.gravatar.com) za prikaz fotografij uporabnikov/članov (na osnovi njihovih emailov). Potreben je internetni dostop Module2800Desc=FTP Client @@ -514,10 +521,10 @@ Module5000Name=Skupine podjetij Module5000Desc=Omogoča upravljaje skupine podjetij Module6000Name=Potek dela Module6000Desc=Upravljanje poteka dela -Module20000Name=Leave Requests management -Module20000Desc=Declare and follow employees leaves requests +Module20000Name=Upravljanje zahtevkov za dopust +Module20000Desc=Določitev in sledenje zahtevkov za dopustov zaposlenih Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Modul za omogočanje strani za spletno plačevanje s kreditno kartico - PayBox Module50100Name=Prodajalne @@ -527,7 +534,7 @@ Module50200Desc=Modul za omogočanje strani za spletno plačevanje s kreditno ka Module50400Name=Računovodstvo (napredno) Module50400Desc=Upravljanje računovodstva (dvostavno) Module54000Name=Tiskanje IPP -Module54000Desc=Tiskanje preko Cups IPP tiskalnika +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Odpri anketo Module55000Desc=Modul za online ankete (kot Doodle, Studs, Rdvz, ...) Module59000Name=Marže @@ -606,16 +613,16 @@ Permission151=Branje tekočih naročil Permission152=Nastavitve tekočih naročil Permission153=Prenos prejema tekočih naročil Permission154=Odobritev/zavrnitev prejema tekočih naročil -Permission161=Read contracts/subscriptions -Permission162=Create/modify contracts/subscriptions -Permission163=Activate a service/subscription of a contract -Permission164=Disable a service/subscription of a contract -Permission165=Delete contracts/subscriptions -Permission171=Read trips and expenses (own and his subordinates) -Permission172=Create/modify trips and expenses -Permission173=Delete trips and expenses +Permission161=Branje pogodb/naročnin +Permission162=Kreiranje/spreminjanje pogodb/naročnin +Permission163=Aktiviranje pogodbene storitve/naročnine +Permission164=Onemogočenje pogodbene storitve/naročnine +Permission165=Brisanje pogodb/naročnin +Permission171=Branje potnih nalogov in stroškov (lastnih in podrejenih) +Permission172=Kreiranje/spreminjanje potnih nalogov in stroškov +Permission173=Brisanje potnih nalogov in stroškov Permission174=Read all trips and expenses -Permission178=Export trips and expenses +Permission178=Izvoz potnih nalogov in stroškov Permission180=Branje dobaviteljev Permission181=Branje naročil pri dobaviteljih Permission182=Kreiranje/spreminjanje naročil pri dobaviteljih @@ -672,7 +679,7 @@ Permission300=Branje črtnih kod Permission301=Kreiranje/spreminjanje črtnih kod Permission302=Brisanje črtnih kod Permission311=Branje storitev -Permission312=Assign service/subscription to contract +Permission312=Dodelitev storitve/naročnine pogodbi Permission331=Branje zaznamkov Permission332=Kreiranje/spreminjanje zaznamkov Permission333=Brisanje zaznamkov @@ -702,8 +709,8 @@ Permission701=Branje donacij Permission702=Kreiranje/spreminjanje donacij Permission703=Delete donacij Permission1001=Branje zalog -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses +Permission1002=Kreiranje/spreminjanje skladišč +Permission1003=Brisanje skladišč Permission1004=Branje gibanja zalog Permission1005=Kreiranje/spreminjanje gibanja zalog Permission1101=Branje dobavnic @@ -779,6 +786,7 @@ DictionaryOrderMethods=Metode naročanja DictionarySource=Izvor ponudb/naročil DictionaryAccountancyplan=Tabela računov DictionaryAccountancysystem=Modeli tabel računov +DictionaryEMailTemplates=Emails templates SetupSaved=Nastavitve shranjene BackToModuleList=Nazaj na seznam modulov BackToDictionaryList=Nazaj na seznam slovarjev @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Stalno polje za iskanje na levem meniju DefaultLanguage=Privzet jezik uporabe (koda jezika) EnableMultilangInterface=Omogočen večjezični vmesnik EnableShowLogo=Prikaži logo na levem meniju +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Vaš sistem je bil uspešno posodobljen CompanyInfo=Informacije o podjetju/ustanovi CompanyIds=Registracijski podatki o podjetju/ustanovi diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang index 81fa94bf320..db29ff08f42 100644 --- a/htdocs/langs/sl_SI/agenda.lang +++ b/htdocs/langs/sl_SI/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Dogoki, ki se nanašajo na ActionsDoneBy=Dogodke izvedel ActionsForUser=Aktivnosti za uporabnika ActionsForUsersGroup=Aktivnosti za vse uporabnike v skupini +ActionAssignedTo=Event assigned to AllMyActions= Vsi moji dogodki/naloge AllActions= Vse dogodki/naloge ViewList=Glej seznam @@ -44,7 +45,7 @@ AgendaExtSitesDesc=Ta stran omogoča določitev zunanjih virov koledarjev za ogl ActionsEvents=Dogodki, za katere bo Dolibarr avtomatsko kreiral aktivnost v urniku PropalValidatedInDolibarr=Potrjena ponudba %s InvoiceValidatedInDolibarr=Potrjen račun %s -InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceValidatedInDolibarrFromPos=Račun %s je potrjen preko POS InvoiceBackToDraftInDolibarr=Račun %s se vrača v status osnutka InvoiceDeleteDolibarr=Račun %s izbrisan OrderValidatedInDolibarr= Potrjeno naročilo %s @@ -68,9 +69,9 @@ DateActionStart= Začetni datum DateActionEnd= Končni datum AgendaUrlOptions1=V filtriran izhod lahko dodate tudi naslednje parametre: AgendaUrlOptions2=login=%s za omejitev izhoda na aktivnosti, ki se nanašajo, ali jih je naredil uporabnik %s. -AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. +AgendaUrlOptions3=logina=%s za omejitev izhoda na aktivnosti v lasti uporabnika %s. AgendaUrlOptions4=logint=%s za omejitev izhoda na aktivnosti, ki se nanašajo na uporabnika %s. -AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. +AgendaUrlOptionsProject=projekt=PROJECT_ID za omejitev izhoda na aktivnosti povezane s projektomPROJECT_ID. AgendaShowBirthdayEvents=Prikaži rojstni dan kontakta AgendaHideBirthdayEvents=Skrij rojstni dan kontakta Busy=Zaseden diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang index 7a3cd7e1b25..a2d5facd9e2 100644 --- a/htdocs/langs/sl_SI/bills.lang +++ b/htdocs/langs/sl_SI/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Dobropis InvoiceAvoirAsk=Dobropis za korekcijo računa InvoiceAvoirDesc=Dobropis je negativni račun, ki se uporabi za rešitev problema, ko je znesek na računu drugačen od dejansko plačanega zneska (ker je kupec pomotoma plačal preveč, ali ne bo plačal v celoti, ker je na primer vrnil nekatere proizvode). invoiceAvoirWithLines=Ustvari dobropis z vrsticami iz originalnega računa -invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice -invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount +invoiceAvoirWithPaymentRestAmount=Ustvari dobropis iz neplačanega preostanka osnovnega računa +invoiceAvoirLineWithPaymentRestAmount=Dobropis za preostali neplačan znesek ReplaceInvoice=Zamenjava računa %s ReplacementInvoice=Nadomestni račun ReplacedByInvoice=Zamenjan z računom %s @@ -154,9 +154,9 @@ ConfirmCancelBill=Ali zares želite preklicati račun %s ? ConfirmCancelBillQuestion=Zakaj želite označiti ta račun kot 'opuščen' ? ConfirmClassifyPaidPartially=Ali zares želite spremeniti račun %s v status 'plačano' ? ConfirmClassifyPaidPartiallyQuestion=Ta račun ni bil plačan v celoti. Zakaj želite kljub temu zaključiti ta račun ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Neplačan preostanek (%s %s) je popust zaradi predčasnega plačila. DDV je bil popravljen z dobropisom. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Neplačan preostanek (%s %s) je popust zaradi predčasnega plačila. Strinjam se z izgubo DDV zaradi tega popusta. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Neplačan preostanek (%s %s) je popust zaradi predčasnega plačila. DDV na ta popust bo vrnjen brez dobropisa. ConfirmClassifyPaidPartiallyReasonBadCustomer=Slab kupec ConfirmClassifyPaidPartiallyReasonProductReturned=Delno vračilo proizvodov ConfirmClassifyPaidPartiallyReasonOther=Znesek opuščen zaradi drugih razlogov @@ -189,9 +189,9 @@ AlreadyPaid=Že plačano AlreadyPaidBack=Že vrnjeno plačilo AlreadyPaidNoCreditNotesNoDeposits=Že plačano (brez dobropisa in avansa) Abandoned=Opuščeno -RemainderToPay=Remaining unpaid -RemainderToTake=Remaining amount to take -RemainderToPayBack=Remaining amount to pay back +RemainderToPay=Neplačan preostanek +RemainderToTake=Preostanek vrednosti za odtegljaj +RemainderToPayBack=Preostanek vrednosti za vrnitev Rest=Na čakanju AmountExpected=Reklamiran znesek ExcessReceived=Prejet presežek @@ -217,18 +217,18 @@ NoInvoice=Ni računa ClassifyBill=Klacificiraj račun SupplierBillsToPay=Računi dobaviteljev za plačilo CustomerBillsUnpaid=Neplačani računi kupcev -DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +DispenseMontantLettres=Izpisani računi se pošiljajo po pošti NonPercuRecuperable=Nepovratno SetConditions=Nastavitev plačilnih pogojev SetMode=Nastavitev načina plačila Billed=Zaračunano -RepeatableInvoice=Template invoice -RepeatableInvoices=Template invoices -Repeatable=Template -Repeatables=Templates -ChangeIntoRepeatableInvoice=Convert into template invoice -CreateRepeatableInvoice=Create template invoice -CreateFromRepeatableInvoice=Create from template invoice +RepeatableInvoice=Predloga računa +RepeatableInvoices=Predloga računov +Repeatable=Predloga +Repeatables=Predloge +ChangeIntoRepeatableInvoice=Pretvori v predlogo računa +CreateRepeatableInvoice=Ustvari predlogo računa +CreateFromRepeatableInvoice=Ustvari iz predloge računa CustomersInvoicesAndInvoiceLines=Računi za kupce in vrstice v računih CustomersInvoicesAndPayments=Računi za kupce in plačila ExportDataset_invoice_1=Seznam računov za kupce in vrstic v računih diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang index 31a939fea21..53f17b73fa9 100644 --- a/htdocs/langs/sl_SI/categories.lang +++ b/htdocs/langs/sl_SI/categories.lang @@ -109,4 +109,4 @@ CategoriesSetup=Nastavitve kategorij CategorieRecursiv=Avtomatsko poveži z nadrejeno kategorijo CategorieRecursivHelp=Če je aktivirano, bo proizvod po dodajanju v podkategorijo povezan tudi z nadrejeno kategorijo AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev -ShowCategory=Show category +ShowCategory=Prikaži kategorijo diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang index b0cc63b9a96..8d61bb9401a 100644 --- a/htdocs/langs/sl_SI/compta.lang +++ b/htdocs/langs/sl_SI/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/sl_SI/contracts.lang b/htdocs/langs/sl_SI/contracts.lang index 102524da201..1575ee36695 100644 --- a/htdocs/langs/sl_SI/contracts.lang +++ b/htdocs/langs/sl_SI/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Področje pogodb ListOfContracts=Seznam pogodb -LastModifiedContracts=Last %s modified contracts +LastModifiedContracts=Zadnjih %s spremenjenih pogodb AllContracts=Vse pogodbe ContractCard=Kartica pogodbe ContractStatus=Status pogodbe @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Seznam aktivnih vrstic pogodbe ListOfRunningServices=Seznam aktivnih storitev NotActivatedServices=Neaktivne storitve (med potrjenimi pogodbami) BoardNotActivatedServices=Storitve, ki jih je potrebno aktivirati (med potrjenimi pogodbami) -LastContracts=Last % contracts +LastContracts=Zadnjih %s pogodb LastActivatedServices=Zadnjih %s aktiviranih storitev LastModifiedServices=Zadnjih %s spremenjenih storitev EditServiceLine=Ureditev storitvene vrstice @@ -91,6 +91,7 @@ ListOfServicesToExpire=Seznam storitev, ki potečejo NoteListOfYourExpiredServices=Ta seznam vsebuje samo storitve po pogodbah s partnerji, ki so povezane z referentom. StandardContractsTemplate=Predloga standardnih pogodb ContactNameAndSignature=Za %s, ime in podpis: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Podpisnik pogodbe diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang index d0b1d69bfb5..7f9f857ec3a 100644 --- a/htdocs/langs/sl_SI/errors.lang +++ b/htdocs/langs/sl_SI/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Obvezna koda dobavitelja ErrorSupplierCodeAlreadyUsed=Koda dobavitelja je že uporabljena ErrorBadParameters=Napačni parametri ErrorBadValueForParameter=Napačna vrednost '%s' za nepravilen parameter '%s' -ErrorBadImageFormat=Format slikovne datoteke ni podprt +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Vrednost '%s "je napačen zapis datuma ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Napaka pri pisanju v mapo %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Uporabnik s prijavo %s ni bilo mogoče najti. ErrorLoginHasNoEmail=Ta uporabnik nima e-poštni naslov. Obdelati prekinjena. ErrorBadValueForCode=Slaba vrednost za varnostno kodo. Poskusite znova z novo vrednost ... ErrorBothFieldCantBeNegative=Polja %s in %s ne more biti tako negativna +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Uporabniški račun %s uporablja za izvedbo spletni strežnik nima dovoljenja za to ErrorNoActivatedBarcode=Noben tip črtne kode ni aktiviran ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang index c2cdfde4b96..a3ba9144853 100644 --- a/htdocs/langs/sl_SI/main.lang +++ b/htdocs/langs/sl_SI/main.lang @@ -367,7 +367,7 @@ ActionsOnCompany=Aktivnosti v zvezi s tem partnerjem ActionsOnMember=Dogodki okoli tega člana NActions=%s aktivnosti NActionsLate=%s zamujenih -RequestAlreadyDone=Request already recorded +RequestAlreadyDone=Zahtevek je bil že zabeležen Filter=Filter RemoveFilter=Odstrani filter ChartGenerated=Grafikon je ustvarjen diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang index 291108ce99a..a70ea086a12 100644 --- a/htdocs/langs/sl_SI/members.lang +++ b/htdocs/langs/sl_SI/members.lang @@ -40,7 +40,7 @@ DateAbonment=Datum prijave DateSubscription=Datum vpisa DateNextSubscription=Datum naslednje članarine DateEndSubscription=Datum zadnje članarine -EndSubscription=Zadnja članarina +EndSubscription=Veljavnost članarine SubscriptionId=ID članarine MemberId=ID člana NewMember=Nov član @@ -85,7 +85,7 @@ SubscriptionLateShort=Zamujen SubscriptionNotReceivedShort=Nikoli prejeto ListOfSubscriptions=Spisek članarin SendCardByMail=Pošlji kartico -AddMember=Dodaj člana +AddMember=Ustvari člana NoTypeDefinedGoToSetup=Tipi članov niso določeni. Pojdite v Nastavitve – ipi članov NewMemberType=Nov tip člana WelcomeEMail=e-pošta za dobrodošlico @@ -125,7 +125,7 @@ Date=Datum DateAndTime=Datum in ura PublicMemberCard=Javna kartica člana MemberNotOrNoMoreExpectedToSubscribe=Član nima več naročnine in se tudi ne pričakuje -AddSubscription=Dodaj naročnino +AddSubscription=Ustvari naročnino ShowSubscription=Prikaži naročnino MemberModifiedInDolibarr=Član je spremenjen v Dolibarr SendAnEMailToMember=Pošlji članu informativno e-pošto @@ -203,3 +203,4 @@ MembersByNature=Naravni člani VATToUseForSubscriptions=Stopnja DDV za naročnine NoVatOnSubscription=Ni davka za naročnine MEMBER_PAYONLINE_SENDEMAIL=Opozorilno e-sporočilo, ko Dilibarr prejme potrdilo potrjenega plačila za naročnino +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod uporabljen za naročniško vrstico v računu: %s diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang index 51ef2f75c91..4aa5b74d03c 100644 --- a/htdocs/langs/sl_SI/orders.lang +++ b/htdocs/langs/sl_SI/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Pošiljka ne obstaja DraftOrWaitingApproved=Osnutek ali odobritev, še ne naročen DraftOrWaitingShipped=Osnutek ali potrditev, še ne odposlan MenuOrdersToBill=Naročila za fakturiranje -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Naročila za fakturiranje SearchOrder=Iskanje naročila SearchACustomerOrder=Iskanje naročila kupca ShipProduct=Pošlji izdelek diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang index 6a7bf7aa912..1975819eb8e 100644 --- a/htdocs/langs/sl_SI/products.lang +++ b/htdocs/langs/sl_SI/products.lang @@ -13,10 +13,10 @@ NewProduct=Nov proizvod NewService=Nova storitev ProductCode=Koda proizvoda ServiceCode=Koda storitve -ProductVatMassChange=Mass VAT change -ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database. -MassBarcodeInit=Mass barcode init -MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete. +ProductVatMassChange=Masovna sprememba DDV +ProductVatMassChangeDesc=Na tej strani lahko spremenite stopnjo DDV za proizvode in storitve iz ene na drugo vrednost. Pozor, ta sprememba se izvrši v celotni bazi podatkov. +MassBarcodeInit=Vzpostavitev masovne črtne kode +MassBarcodeInitDesc=Na tej strani lahko vzpostavite črtno kodo za objekte, ki črtne kode nimajo določene. Pred tem preverite, da je zaključena nastavitev modula za črtne kode. ProductAccountancyBuyCode=Računovodski konto (nakup) ProductAccountancySellCode=Računovodski konto (prodaja) ProductOrService=Proizvod ali storitev @@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Statistika proizvodov in storitev ProductsStatistics=Statistika proizvodov ProductsOnSell=Proizvodi, ki so na voljo ProductsNotOnSell=Opuščeni proizvodi -ProductsOnSellAndOnBuy=Products not for sale nor purchase +ProductsOnSellAndOnBuy=Proizvodi niti za prodajo, niti za nakup ServicesOnSell=Storitve, ki so na voljo ServicesNotOnSell=Opuščene storitve -ServicesOnSellAndOnBuy=Services not for sale nor purchase +ServicesOnSellAndOnBuy=Storitve niti za prodajo, niti za nakup InternalRef=Interna referenca LastRecorded=Zadnji vneseni proizvodi/storitve za prodajo LastRecordedProductsAndServices=Zadnjih %s vnesenih proizvodov/storitev @@ -72,20 +72,20 @@ PublicPrice=Javna cena CurrentPrice=Trenutna cena NewPrice=Nova cena MinPrice=Minimalna Prodajna cena -MinPriceHT=Minim. selling price (net of tax) -MinPriceTTC=Minim. selling price (inc. tax) +MinPriceHT=Minimalna prodajna cena (brez DDV) +MinPriceTTC=Minimalna prodajna cena (z DDV) CantBeLessThanMinPrice=Prodajna cena ne more biti nižja od minimalne za ta proizvod (%s brez DDV). To sporočilo se pojavi lahko tudi, če vnesete prevelik popust ContractStatus=Status pogodbe ContractStatusClosed=Zaprta ContractStatusRunning=V obdelavi ContractStatusExpired=Pretečena ContractStatusOnHold=V mirovanju -ContractStatusToRun=To get running +ContractStatusToRun=Zagnana ContractNotRunning=Ta pogodba miruje ErrorProductAlreadyExists=Proizvod z referenco %s že obstaja. ErrorProductBadRefOrLabel=Napačna vrednost reference ali naziva. -ErrorProductClone=There was a problem while trying to clone the product or service. -ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +ErrorProductClone=Prišlo je do težave pri poskusu kloniranja proizvoda ali storitve. +ErrorPriceCantBeLowerThanMinPrice=Napaka, cena ne mora biti nižja od minimalne cene. Suppliers=Dobavitelji SupplierRef=Referenca dobavitelja ShowProduct=Prikaži proizvod @@ -114,17 +114,17 @@ BarcodeValue=Vrednost črtne kode NoteNotVisibleOnBill=Opomba (ni vidna na računih, ponudbah...) CreateCopy=Kreiraj kopijo ServiceLimitedDuration=Če ima proizvod storitev z omejenim trajanjem: -MultiPricesAbility=Several level of prices per product/service +MultiPricesAbility=Več nivojev cen za proizvode/storitve MultiPricesNumPrices=Število cen MultiPriceLevelsName=Kategorije cen -AssociatedProductsAbility=Aktiviranje povezanih proizvodov -AssociatedProducts=Povezani proizvodi -AssociatedProductsNumber=Število povezanih proizvodov -ParentProductsNumber=Število izdelkov matične -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Vklopi možnost navidezne sestave izdelka +AssociatedProducts=Sestavljen izdelek +AssociatedProductsNumber=Število izdelkov, ki sestavljajo navidezni sestavljeni izdelek +ParentProductsNumber=Število nadrejenih sestavljenih izdelkov +IfZeroItIsNotAVirtualProduct=Če je 0, ta izdelek ni navidezno sestavljen +IfZeroItIsNotUsedByVirtualProduct=Če je 0, ta izdelek ni uporabljen v nobenem navideznem sestavljenem izdelku EditAssociate=Poveži -Translation=Prenos +Translation=Prevod KeywordFilter=Filter ključnih besed CategoryFilter=Filter kategorij ProductToAddSearch=Iskanje proizvoda za dodajanje @@ -132,7 +132,7 @@ AddDel=Dodaj/briši Quantity=Količina NoMatchFound=Ni ujemanja ProductAssociationList=Seznam odvisnih proizvodov/storitev: ime proizvoda/storitve (količina, na katero se nanaša) -ProductParentList=Seznam izdelkov / storitev, pri tem izdelku, kot sestavnega dela +ProductParentList=Seznam zavitkov izdelkov / storitev, pri tem izdelku, kot sestavnega dela ErrorAssociationIsFatherOfThis=Eden od izbranih proizvodov je nadrejen trenutnemu proizvodu DeleteProduct=Izbriši proizvod/storitev ConfirmDeleteProduct=Ali zares želite izbrisati ta proizvod/storitev? @@ -151,22 +151,22 @@ NoStockForThisProduct=Tega proizvoda ni na zalogi NoStock=Ni zaloge Restock=Obnovitev zaloge ProductSpecial=Specialni -QtyMin=Minimum Qty +QtyMin=Minimalna količina PriceQty=Cena za to količino -PriceQtyMin=Price for this min. qty (w/o discount) -VATRateForSupplierProduct=VAT Rate (for this supplier/product) -DiscountQtyMin=Default discount for qty +PriceQtyMin=Cena za to min. količino (brez popusta) +VATRateForSupplierProduct=Stopnja DDV (za tega dobavitelja/proizvod) +DiscountQtyMin=Privzet popust za količino NoPriceDefinedForThisSupplier=Za tega dobavitelja/storitev ni definirana cena/količina NoSupplierPriceDefinedForThisProduct=Za ta proizvod ni definirana cena dobavitelja/količina RecordedProducts=Proizvod vnesen -RecordedServices=Services recorded +RecordedServices=Zabeležena storitev RecordedProductsAndServices=Proizvod/storitev vnesen -PredefinedProductsToSell=Predefined products to sell -PredefinedServicesToSell=Predefined services to sell -PredefinedProductsAndServicesToSell=Predefined products/services to sell -PredefinedProductsToPurchase=Predefined product to purchase -PredefinedServicesToPurchase=Predefined services to purchase -PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase +PredefinedProductsToSell=Vnaprej določeni proizvodi za prodajo +PredefinedServicesToSell=Vnaprej določene storitve za prodajo +PredefinedProductsAndServicesToSell=Vnaprej določeni proizvodi/storitve za prodajo +PredefinedProductsToPurchase=Vnaprej določen proizvodi za nakup +PredefinedServicesToPurchase=Vnaprej določene storitve za nakup +PredefinedProductsAndServicesToPurchase=Vnaprej določeni proizvodi/storitve za nakup GenerateThumb=Generiraj sličico ProductCanvasAbility=Uporabi posebni "canvas" dodatek ServiceNb=Storitev št. %s @@ -179,66 +179,71 @@ CloneProduct=Kloniraj proizvod ali storitev ConfirmCloneProduct=Ali zares želite klonirati ta proizvod ali storitev %s ? CloneContentProduct=Klonirajte vse osnovne podatke proizvoda/storitve ClonePricesProduct=Klonirajte osnovne podatke in cene -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Kloniraj sestavljen izdelek/storitev ProductIsUsed=Ta proizvod je rabljen NewRefForClone=Ref. novega proizvoda/storitve CustomerPrices=Cene za kupce SuppliersPrices=Nabavne cene -SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) +SuppliersPricesOfProductsOrServices=Cene dobaviteljev (proizvodov ali storitev) CustomCode=Carinska tarifa CountryOrigin=Država porekla HiddenIntoCombo=Skrito v izbranem seznamu Nature=Narava -ProductCodeModel=Product ref template -ServiceCodeModel=Service ref template -AddThisProductCard=Create product card -HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist. -AddThisServiceCard=Create service card -HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist. -CurrentProductPrice=Current price -AlwaysUseNewPrice=Always use current price of product/service -AlwaysUseFixedPrice=Use the fixed price -PriceByQuantity=Price by quantity -PriceByQuantityRange=Quantity range -ProductsDashboard=Products/Services summary -UpdateOriginalProductLabel=Modify original label -HelpUpdateOriginalProductLabel=Allows to edit the name of the product +ProductCodeModel=Predloga za referenco proizvoda +ServiceCodeModel=Predloga za referenco storitve +AddThisProductCard=Ustvari kartico proizvoda +HelpAddThisProductCard=Ta opcija omogoča ustvarjanje ali kloniranje proizvoda, če še ne obstaja. +AddThisServiceCard=Ustvari kartico storitve +HelpAddThisServiceCard=Ta opcija omogoča ustvarjanje ali kloniranje storitve, če še ne obstaja. +CurrentProductPrice=Trenutna cena +AlwaysUseNewPrice=Vedno uporabi trenutno ceno proizvoda/storitve +AlwaysUseFixedPrice=Uporabi fiksno ceno +PriceByQuantity=Cena na količino +PriceByQuantityRange=Območje količin +ProductsDashboard=Povzetek proizvodov/storitev +UpdateOriginalProductLabel=Spremeni originalni naziv +HelpUpdateOriginalProductLabel=Vedno uredi ime proizvoda ### composition fabrication -Building=Production and items dispatchment -Build=Produce -BuildIt=Produce & Dispatch -BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action) +Building=Proizvodnja in odprema +Build=Proizvodnja +BuildIt=Proizvodnja & odprema +BuildindListInfo=Količina, ki je na voljo za proizvodnjo po skladišču (postavi na 0, če ni bodočih aktivnosti) QtyNeed=Kol. -UnitPmp=Net unit VWAP -CostPmpHT=Net total VWAP -ProductUsedForBuild=Auto consumed by production -ProductBuilded=Production completed -ProductsMultiPrice=Product multi-price -ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) -ProductSellByQuarterHT=Products turnover quarterly VWAP -ServiceSellByQuarterHT=Services turnover quarterly VWAP -Quarter1=1st. Quarter -Quarter2=2nd. Quarter -Quarter3=3rd. Quarter -Quarter4=4th. Quarter -BarCodePrintsheet=Print bar code -PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s. -NumberOfStickers=Number of stickers to print on page -PrintsheetForOneBarCode=Print several stickers for one barcode -BuildPageToPrint=Generate page to print -FillBarCodeTypeAndValueManually=Fill barcode type and value manually. -FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product. -FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty. -DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s. -DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s. -BarCodeDataForProduct=Barcode information of product %s : -BarCodeDataForThirdparty=Barcode information of thirdparty %s : -ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) -PriceByCustomer=Price by customer -PriceCatalogue=Unique price per product/service -PricingRule=Pricing Rules -AddCustomerPrice=Add price by customers -ForceUpdateChildPriceSoc=Set same price on customer subsidiaries -PriceByCustomerLog=Price by customer log -MinimumPriceLimit=Minimum price can't be lower that %s -MinimumRecommendedPrice=Minimum recommended price is : %s +UnitPmp=Neto VWAP na enoto +CostPmpHT=Neto skupna VWAP +ProductUsedForBuild=Lastna poraba za proizvodnjo +ProductBuilded=Zaključena proizvodnja +ProductsMultiPrice=Večcenovni proizvod +ProductsOrServiceMultiPrice=Cene za kupce (proizvodov ali storitev, različne cene) +ProductSellByQuarterHT=Četrtletni prihodek prooizvoda po VWAP +ServiceSellByQuarterHT=Četrtletni prihodek storitev po VWAP +Quarter1=1. četrtletje +Quarter2=2. četrtletje +Quarter3=3. četrtletje +Quarter4=4. četrtletje +BarCodePrintsheet=Tiskanje črtne kode +PageToGenerateBarCodeSheets=S tem orodjem lahko natisnete liste z nalepkami črtnih kod. Izberite format lista z nalepkami, tip črtne kode in vrednost črtne kode, nato kliknite gumb %s. +NumberOfStickers=Število nalepk za tiskanje na stran +PrintsheetForOneBarCode=Tiskaj več nalepk za eno črtno kodo +BuildPageToPrint=Generiraj stran za tiskanje +FillBarCodeTypeAndValueManually=Ročno vnesi tip črtne kode in vrednost. +FillBarCodeTypeAndValueFromProduct=Vnesi tip črtne kode in vrednost iz črtne kode proizvoda. +FillBarCodeTypeAndValueFromThirdParty=Vnesi tip črtne kode in vrednost iz črtne kode partnerja. +DefinitionOfBarCodeForProductNotComplete=Definicija tipa ali vrednosti črtne kode za proizvod %s ni popolna. +DefinitionOfBarCodeForThirdpartyNotComplete=Definicija tipa ali vrednosti črtne kode za partnerja %s ni popolna. +BarCodeDataForProduct=Informacija o črtni kodi proizvoda %s : +BarCodeDataForThirdparty=Informacija o črtni kodi partnerja %s : +ResetBarcodeForAllRecords=Določite vrednost črtnih kod za vse zapise (s tem boste tudi resetirali že določene vrednosti črtnih kod na novo vrednost) +PriceByCustomer=Cena po stranki +PriceCatalogue=Enolična cena po proizvodu/storitvi +PricingRule=Cenovna pravila +AddCustomerPrice=Dodaj ceno po strankah +ForceUpdateChildPriceSoc=Določi enako ceno za podružnice stranke +PriceByCustomerLog=Cena po imenu stranke +MinimumPriceLimit=Minimalna cena ne more biti nižja od %s +MinimumRecommendedPrice=Minimalna priporočena cena je : %s +PriceExpressionEditor=Urejevalnik prikaza cene +PriceExpressionSelected=Izbran prikaz cene +PriceExpressionEditorHelp="cena = 2 + 2" ali "2 + 2" za nastavitev cene
Posebna polja so spremenljivke kot "#opcije_mojaposebnapolja# * 2"
Tukaj so uporabljene posebne spremenljivke kot #količina# in #tva_tx#
; za ločitev prikazov +PriceMode=Način cene +PriceNumeric=Številka diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang index ccad08cebaf..d41603e6827 100644 --- a/htdocs/langs/sl_SI/projects.lang +++ b/htdocs/langs/sl_SI/projects.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - projects RefProject=Ref. project -ProjectId=Project Id +ProjectId=Id projekta Project=Projekt Projects=Projekti SharedProject=Projekti v skupni rabi @@ -14,7 +14,7 @@ TasksDesc=Ta pogled predstavlja vse projekte in naloge (vaše uporabniško dovol Myprojects=Moji projekti ProjectsArea=Področje projektov NewProject=Nov projekt -AddProject=Dodaj projekt +AddProject=Ustvari projekt DeleteAProject=Izbriši projekt DeleteATask=Izbriši nalogo ConfirmDeleteAProject=Ali zares želite izbrisati ta projekt ? @@ -33,19 +33,21 @@ TimesSpent=Porabljen čas RefTask=Referenčna naloga LabelTask=Naziv naloge TaskTimeSpent=Time spent on tasks -TaskTimeUser=User -TaskTimeNote=Note -TaskTimeDate=Date +TaskTimeUser=Uporabnik +TaskTimeNote=Beležka +TaskTimeDate=Datum +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Nov porabljen čas MyTimeSpent=Moj porabljen čas MyTasks=Moje naloge Tasks=Naloge Task=Naloga -TaskDateStart=Task start date -TaskDateEnd=Task end date -TaskDescription=Task description +TaskDateStart=Datum začetka naloge +TaskDateEnd=Datum konca naloge +TaskDescription=Opis naloge NewTask=Nova naloga -AddTask=Dodaj nalogo +AddTask=Ustvari nalogo AddDuration=Dodaj trajanje Activity=Aktivnost Activities=Naloge/aktivnosti @@ -118,15 +120,15 @@ TypeContact_project_task_internal_TASKEXECUTIVE=Odgovorna oseba TypeContact_project_task_external_TASKEXECUTIVE=Odgovorna oseba TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor -SelectElement=Select element -AddElement=Link to element -UnlinkElement=Unlink element +SelectElement=Izberi element +AddElement=Povezava do elementa +UnlinkElement=Nepovezan element # Documents models DocumentModelBaleine=Model poročila za celoten projekt (logo...) PlannedWorkload = Planirana delovna obremenitev WorkloadOccupation= Pretvarjanje delovne obremenitve ProjectReferers=Referenčni objekti -SearchAProject=Search a project -ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Draft projects +SearchAProject=Iskanje projekta +ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen +ProjectDraft=Osnutek projekta FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/sl_SI/resource.lang b/htdocs/langs/sl_SI/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/sl_SI/resource.lang +++ b/htdocs/langs/sl_SI/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang index 7a0c4fd1f16..79ebbecc62d 100644 --- a/htdocs/langs/sl_SI/stocks.lang +++ b/htdocs/langs/sl_SI/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Obvezen je naziv skladišča CorrectStock=Popravi zalogo ListOfWarehouses=Spisek skladišč ListOfStockMovements=Seznam gibanja zaloge -StocksArea=Warehouses area +StocksArea=Področje skladišč Location=Lokacija LocationSummary=Kratko ime lokacije NumberOfDifferentProducts=Število različnih proizvodov diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang index 778e491156b..1f41a6282af 100644 --- a/htdocs/langs/sl_SI/users.lang +++ b/htdocs/langs/sl_SI/users.lang @@ -102,7 +102,7 @@ UserDisabled=Uporabnik %s je onemogočen UserEnabled=Uporabnik %s je aktiviran UserDeleted=Uporabnik %s je odstranjen NewGroupCreated=Skupina %s je kreirana -GroupModified=Group %s modified +GroupModified=Skupina %s je spremenjena GroupDeleted=Skupina %s je odstranjena ConfirmCreateContact=Ali zares želite kreirati Dolibarr dostop za ta kontakt ? ConfirmCreateLogin=Ali zares želite kreirati Dolibarr dostop za tega člana ? diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang index a8f6547afae..2e32208fc92 100644 --- a/htdocs/langs/sl_SI/withdrawals.lang +++ b/htdocs/langs/sl_SI/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Datum kredita WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Prikaži nakazilo IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Vendar, če ima račun najmanj eno neizvršeno nakazilo, ne bo označeno kot plačano, da bi bilo pred tem možno izvršiti nakazilo. -DoStandingOrdersBeforePayments=Ti zavihki omogočajo zahtevo za trajnik. Ko je končano, lahko vnesete plačilo in zaprete račun. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Datoteka nakazila SetToStatusSent=Nastavi status na "Datoteka poslana" ThisWillAlsoAddPaymentOnInvoice=S tem bodo plačila povezana z računi, ki bodo spremenili status v "Plačano" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Plačilo odprtega naročila %s s strani banke diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang index b5d84a0aca7..f12efa61626 100644 --- a/htdocs/langs/sq_AL/admin.lang +++ b/htdocs/langs/sq_AL/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s ViewFullDateActions=Show full dates events in the third sheet @@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Link BoxesAvailable=Boxes available @@ -444,7 +447,7 @@ Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmark management -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales @@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang index 1ed4e637d14..a24c678a2e5 100644 --- a/htdocs/langs/sq_AL/agenda.lang +++ b/htdocs/langs/sq_AL/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= All my events/tasks AllActions= All events/tasks ViewList=List view diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang index 9fe5eff520d..878eb49b3c9 100644 --- a/htdocs/langs/sq_AL/compta.lang +++ b/htdocs/langs/sq_AL/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang index 511516dc755..57ba3bb15d8 100644 --- a/htdocs/langs/sq_AL/contracts.lang +++ b/htdocs/langs/sq_AL/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=List of running services NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Services to activate among validated contracts -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Last %s activated services LastModifiedServices=Last %s modified services EditServiceLine=Edit service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang index a2c8ec77de2..53f8d168a55 100644 --- a/htdocs/langs/sq_AL/errors.lang +++ b/htdocs/langs/sq_AL/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang index b2de3a851d4..40bca8e85fb 100644 --- a/htdocs/langs/sq_AL/members.lang +++ b/htdocs/langs/sq_AL/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Late SubscriptionNotReceivedShort=Never received ListOfSubscriptions=List of subscriptions SendCardByMail=Send card by Email -AddMember=Add member +AddMember=Create member NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" NewMemberType=New member type WelcomeEMail=Welcome e-mail @@ -125,7 +125,7 @@ Date=Date DateAndTime=Date and time PublicMemberCard=Member public card MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -AddSubscription=Add subscription +AddSubscription=Create subscription ShowSubscription=Show subscription MemberModifiedInDolibarr=Member modified in Dolibarr SendAnEMailToMember=Send information email to member @@ -170,6 +170,8 @@ LastSubscriptionAmount=Last subscription amount MembersStatisticsByCountries=Members statistics by country MembersStatisticsByState=Members statistics by state/province MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=Number of members NoValidatedMemberYet=No validated members found MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. @@ -201,3 +203,4 @@ MembersByNature=Members by nature VATToUseForSubscriptions=VAT rate to use for subscriptions NoVatOnSubscription=No TVA for subscriptions MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang index cb88461602d..81d217ddb54 100644 --- a/htdocs/langs/sq_AL/products.lang +++ b/htdocs/langs/sq_AL/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang index 4affd1fdc5a..c48e27fd204 100644 --- a/htdocs/langs/sq_AL/projects.lang +++ b/htdocs/langs/sq_AL/projects.lang @@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant Myprojects=My projects ProjectsArea=Projects area NewProject=New project -AddProject=Add project +AddProject=Create project DeleteAProject=Delete a project DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task -AddTask=Add task +AddTask=Create task AddDuration=Add duration Activity=Activity Activities=Tasks/activities diff --git a/htdocs/langs/sq_AL/resource.lang b/htdocs/langs/sq_AL/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/sq_AL/resource.lang +++ b/htdocs/langs/sq_AL/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang index e4337309084..ea32511fefb 100644 --- a/htdocs/langs/sq_AL/withdrawals.lang +++ b/htdocs/langs/sq_AL/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang index 7d53386ea9d..9e3a4d80c03 100644 --- a/htdocs/langs/sv_SE/accountancy.lang +++ b/htdocs/langs/sv_SE/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Välj en kontoplan Validate=Validera Addanaccount=Lägg till ett redovisningskonto AccountAccounting=Redovisningskonto -Ventilation=Breakdown +Ventilation=Fördelning ToDispatch=Avsändandet Dispatched=Levereras -CustomersVentilation=Breakdown customers -SuppliersVentilation=Breakdown suppliers +CustomersVentilation=Fördelning kunder +SuppliersVentilation=Fördelning leverantörerna TradeMargin=Handelsmarginal Reports=Rapporter ByCustomerInvoice=Enligt faktura kunder @@ -45,9 +45,9 @@ WriteBookKeeping=Record konton i huvudboken Bookkeeping=Huvudbok AccountBalanceByMonth=Saldo per månad -AccountingVentilation=Breakdown accounting -AccountingVentilationSupplier=Breakdown accounting supplier -AccountingVentilationCustomer=Breakdown accounting customer +AccountingVentilation=Uppdelning redovisning +AccountingVentilationSupplier=Uppdelning redovisnings leverantör +AccountingVentilationCustomer=Uppdelning redovisnings kund Line=Linje CAHTF=Totala köpesleverantörs HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilerade linjer faktura IntoAccount=I bokföringskonto Ventilate=Ventilera -VentilationAuto=Automatic breakdown +VentilationAuto=Automatisk uppdelning Processing=Bearbetning EndProcessing=I slutet av behandlingen @@ -68,9 +68,9 @@ NotVentilatedinAccount=Inte ventilerad i redovisningskonto ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Antal element att vara uppdelning framgår av sidan (max rekommenderad: 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sortering av nedbrytnings sidor "Måste uppdelning" av de senaste element +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Börja sorteringen av nedbrytnings sidor "Breakdown" av de senaste element AccountLength=Längd på redovisningen redovisning i Dolibarr AccountLengthDesc=Funktion som gör det möjligt att låtsas en längd av bokföringskonto genom att ersätta mellanslag med noll siffra. Den här funktionen berör endast displayen, det ändrar inte redovisningskonton registrerade i Dolibarr. För export, är nödvändigt denna funktion för att vara kompatibel med viss programvara. @@ -140,14 +140,14 @@ Active=Uttalande NewFiscalYear=Nytt räkenskapsår -DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers +DescVentilCustomer=Rådgör här den årliga fördelningen redovisning av era fakturor kunder TotalVente=Total omsättning HT TotalMarge=Total försäljning marginal DescVentilDoneCustomer=Konsul här listan med linjerna av fakturor kunder och deras bokföringskonto DescVentilTodoCustomer=Ventilera dina rader av kundfaktura med en redovisningskonto ChangeAccount=Ändra bokföringskonto för linjer som valts ut av kontot: Vide=- -DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers +DescVentilSupplier=Rådgör här den årliga fördelningen redovisning av dina fakturor leverantörer DescVentilTodoSupplier=Ventilera dina rader av leverantörsfaktura med en redovisningskonto DescVentilDoneSupplier=Konsul här listan med linjerna av fakturor leverantör och deras bokföringskonto @@ -155,4 +155,4 @@ ValidateHistory=Validera Automatiskt ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskonto eftersom den används -FicheVentilation=Breakdown card +FicheVentilation=Uppdelning kort diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 3043c9406a5..264a54e753c 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -37,14 +37,14 @@ GUISetup=Visa SetupArea=Setup område FormToTestFileUploadForm=Formulär för att testa filuppladdning (enligt inställningar) IfModuleEnabled=Anm: ja effektivt endast om modul %s är aktiverat -RemoveLock=Ta bort filen %s om den finns så att uppdatera verktyget. -RestoreLock=Ersätt en fil %s med läsbehörighet bara på filen för att stänga av någon användning av uppdatering verktyg. -SecuritySetup=Säkerhet setup +RemoveLock=Ta bort filen %s om den finns godkänns uppdatering verktyget. +RestoreLock=Ersätt en fil %s med läsbehörighet bara på filen för att stänga av all användning av uppdaterings verktyg. +SecuritySetup=Säkerhets inställning ErrorModuleRequirePHPVersion=Fel, kräver denna modul PHP version %s eller högre ErrorModuleRequireDolibarrVersion=Fel, kräver denna modul Dolibarr version %s eller högre ErrorDecimalLargerThanAreForbidden=Fel, en precision högre än %s stöds inte. DictionarySetup=Lexikon inställnings -Dictionary=Ordböcker +Dictionary=Ordlista Chartofaccounts=Kontoplan Fiscalyear=Räkenskapsår ErrorReservedTypeSystemSystemAuto=Värdena "system" och "systemauto" för typ är reserverade. Du kan använda "user" som värde för att lägga till en egen post. @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Använd automatisk komplettering fält för att välja ActivityStateToSelectCompany= Lägg till ett filter alternativ för att visa / dölja thirdparties som för närvarande är i aktivitet eller har upphört att UseSearchToSelectContactTooltip=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant CONTACT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen. UseSearchToSelectContact=Använd automatisk komplettering fält för att välja kontakt (istället för att använda en listruta). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Sök filter alternativ NumberOfKeyToSearch=NBR tecken för att utlösa Sök: %s ViewFullDateActions=Visa fullständig datum åtgärder i tredje blad @@ -90,7 +92,7 @@ AntiVirusParam= Fler parametrar på kommandoraden AntiVirusParamExample= Exempel för ClamWin - databas = "C: \\ Program Files (x86) \\ ClamWin \\ lib" ComptaSetup=Redovisning modul setup UserSetup=Användarens hantering setup -MenuSetup=Meny ledning setup +MenuSetup=Meny hanterings inställningar MenuLimits=Gränser och noggrannhet MenuIdParent=Överordnade menyn ID DetailMenuIdParent=ID överordnade menyn (0 för en toppmenyn) @@ -98,12 +100,12 @@ DetailPosition=Sortera nummer att definiera menyposition PersonalizedMenusNotSupported=Personliga menyer stöds inte AllMenus=Alla NotConfigured=Inte konfigurerad -Setup=Setup +Setup=Inställning Activation=Aktiveringen Active=Aktiv -SetupShort=Setup +SetupShort=Inställning OtherOptions=Andra alternativ -OtherSetup=Andra setup +OtherSetup=Andra inställningar CurrentValueSeparatorDecimal=Decimaltecken CurrentValueSeparatorThousand=Tusentalsavgränsare Destination=Destination @@ -125,7 +127,7 @@ PHPTZ=Tidszon PHP server PHPServerOffsetWithGreenwich=PHP server offset bredd Greenwich (sekunder) ClientOffsetWithGreenwich=Klient / Browser offset bredd Greenwich (sekunder) DaylingSavingTime=Sommartid (användare) -CurrentHour=PHP server timme +CurrentHour=PHP Tid (server) CompanyTZ=Tidszon företag (huvudföretag) CompanyHour=Hour företag (huvudföretag) CurrentSessionTimeOut=Aktuell session timeout @@ -171,7 +173,7 @@ ImportMethod=Import metoden ToBuildBackupFileClickHere=Att bygga en backup fil, klicka här . ImportMySqlDesc=För att importera en backup fil måste du använda mysql kommandot från kommandoraden: ImportPostgreSqlDesc=Om du vill importera en backup fil måste du använda pg_restore kommando från kommandoraden: -ImportMySqlCommand=%s %s <mybackupfile.sql +ImportMySqlCommand=%s %s < mybackupfile.sql ImportPostgreSqlCommand=%s %s mybackupfile.sql FileNameToGenerate=Filnamn för att generera Compression=Komprimering @@ -195,11 +197,11 @@ DelayedInsert=Fördröjd in EncodeBinariesInHexa=Koda binära data i hexadecimal IgnoreDuplicateRecords=Ignorera fel dubblettposter (INSERT ignorera) Yes=Ja -No=Nr +No=Nej AutoDetectLang=Autodetektera (webbläsare språk) FeatureDisabledInDemo=Funktion avstängd i demo Rights=Behörigheter -BoxesDesc=Fälten är skärmytan som visar en bit av information om vissa sidor. Du kan välja mellan att visa rutan eller inte genom att välja målsidan och klicka på "Aktivera" eller genom att klicka på soptunnan till att stänga av den. +BoxesDesc=Fälten är skärmytan som visar en bit av information om vissa sidor. Du kan välja mellan att visa rutan eller inte genom att välja målsidan och klicka på "Aktivera" eller genom att klicka på soptunnan till att stänga av den. OnlyActiveElementsAreShown=Endast delar av aktiverade moduler visas. ModulesDesc=Dolibarr moduler definiera vilka funktionen är aktiverad i programvaran. Vissa moduler kräver behörigheter som du skall ge till användare efter möjliggör modul. ModulesInterfaceDesc=Den Dolibarr moduler gränssnittet kan du lägga till funktioner beroende på yttre programvara, system eller tjänster. @@ -208,6 +210,7 @@ ModulesJobDesc=Business moduler ge enkla fördefinierade inställningar för Dol ModulesMarketPlaceDesc=Du kan hitta fler moduler för att ladda ner på externa webbplatser på Internet ... ModulesMarketPlaces=Fler moduler ... DoliStoreDesc=DoliStore, den officiella marknadsplatsen för Dolibarr ERP / CRM externa moduler +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Webbplats leverantörer kan du söka för att hitta fler moduler ... URL=Länk BoxesAvailable=Rutor @@ -437,14 +440,14 @@ Module52Name=Lager Module52Desc=Lager hantering av produkter Module53Name=Tjänster Module53Desc=Service ledning -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Avtal / Prenumerationer +Module54Desc=Förvaltning av kontrakt (tjänster eller reccuring abonnemang) Module55Name=Streckkoder Module55Desc=Barcode ledning Module56Name=Telefoni Module56Desc=Telefoni integration Module57Name=Stående order -Module57Desc=Stående order och återkallelse ledning +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integrering av ett ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS-flöde Module320Desc=Lägg till RSS feed inne Dolibarr skärm sidor Module330Name=Bokmärken Module330Desc=Bokmärk ledning -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=WebCalendar Module410Desc=WebCalendar integration Module500Name=Speciella utgifter (skatt, sociala avgifter, utdelningar) @@ -495,6 +498,8 @@ Module1780Name=Kategorier Module1780Desc=Categorie ledning (produkter, leverantörer och kunder) Module2000Name=FCKeditor Module2000Desc=WYSIWYG Editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Hantera planlagda uppgifter Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Spara och dela dokument Module2600Name=WebServices Module2600Desc=Aktivera Dolibarr webbtjänster server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Använder online Gravatar tjänst (www.gravatar.com) för att visa foto av användare / medlemmar (hittade med sin e-post). Behöver en internet Module2800Desc=FTP-klient @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Lämna Framställningar förvaltning Module20000Desc=Deklarera och följ de anställda lämnar förfrågningar Module39000Name=Produktsats -Module39000Desc=Batchnummer, äter-by och bäst före-datum hantering av produkter +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modul för att erbjuda en online-betalning sidan genom kreditkort med Paybox Module50100Name=Point of sales @@ -527,7 +534,7 @@ Module50200Desc=Modul för att erbjuda en online-betalning sidan med kreditkort Module50400Name=Redovisning (avancerad) Module50400Desc=Bokföring och redovisning (dubbla parter) Module54000Name=PrintIPP -Module54000Desc=Skriv ut via Cups IPP-skrivare. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Öppen Poll Module55000Desc=Modul för att göra online omröstningar (som Doodle, öar Rdvz, ...) Module59000Name=Marginaler @@ -606,11 +613,11 @@ Permission151=Läs stående order Permission152=Skapa / ändra en stående order begäran Permission153=Läs stående order kvitton Permission154=Kredit / vägrar stående order kvitton -Permission161=Read contracts/subscriptions -Permission162=Create/modify contracts/subscriptions -Permission163=Activate a service/subscription of a contract -Permission164=Disable a service/subscription of a contract -Permission165=Delete contracts/subscriptions +Permission161=Läs kontrakt / abonnemang +Permission162=Skapa / ändra avtal / abonnemang +Permission163=Aktivera en tjänst / teckning av ett kontrakt +Permission164=Inaktivera en tjänst / teckning av ett kontrakt +Permission165=Radera kontrakt / abonnemang Permission171=Läs resor och utgifter (eget och hans underordnade) Permission172=Skapa / ändra resor och kostnader Permission173=Ta bort resor och kostnader @@ -672,7 +679,7 @@ Permission300=Läs streckkoder Permission301=Skapa / modifiera streckkoder Permission302=Ta bort streckkoder Permission311=Läs tjänster -Permission312=Assign service/subscription to contract +Permission312=Tilldela tjänst / abonnemang att ingå avtal Permission331=Läs bokmärken Permission332=Skapa / ändra bokmärken Permission333=Ta bort bokmärken @@ -702,8 +709,8 @@ Permission701=Läs donationer Permission702=Skapa / ändra donationer Permission703=Ta bort donationer Permission1001=Läs lager -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses +Permission1002=Skapa / ändra lager +Permission1003=Radera lager Permission1004=Läs lager rörelser Permission1005=Skapa / ändra lager rörelser Permission1101=Läs leveransorder @@ -779,9 +786,10 @@ DictionaryOrderMethods=Beställningsmetoder DictionarySource=Ursprung av affärsförslag / beställning DictionaryAccountancyplan=Kontoplan DictionaryAccountancysystem=Modeller för kontoplan +DictionaryEMailTemplates=Emails templates SetupSaved=Setup sparas BackToModuleList=Tillbaka till moduler lista -BackToDictionaryList=Tillbaka till ordböcker listan +BackToDictionaryList=Tillbaka till ordlistan VATReceivedOnly=Särskilda räntesats inte VATManagement=Moms Management VATIsUsedDesc=Den momssats som standard när du skapar framtidsutsikter, fakturor, order etc följa aktiva standard regeln:
Om säljaren är föremål för mervärdesskatt, då moms som standard = 0. Slut på regeln.
Om (den som säljer land = köparlandet), sedan den mervärdesskatt som standard = mervärdesskatt av produkten vid försäljning landet. Slut på regeln.
Om säljaren och köparen i Europeiska gemenskapen och varor transporttjänster (bil, fartyg, flygplan), standard moms = 0 (Den mervärdesskatt som skall betalas av köparen vid customoffice av sitt land och inte på säljaren). Slut på regeln.
Om säljaren och köparen i Europeiska gemenskapen och köparen är inte ett företag, sedan den mervärdesskatt som standard = moms på produkt som säljs. Slut på regeln.
Om säljaren och köparen i Europeiska gemenskapen och köparen är ett företag, då moms som standard = 0. Slut på regeln.
Else föreslagna standard moms = 0. Slut på regeln. @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent sökformuläret på menyn till vänster DefaultLanguage=Default språk att använda (språkkod) EnableMultilangInterface=Aktivera flerspråkigt gränssnitt EnableShowLogo=Visa logotypen på vänstra menyn +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Att ditt system har uppdaterats CompanyInfo=Företag / stiftelse information CompanyIds=Företag / stiftelse identiteter @@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Lägg förmåga leveranstid UseOptionLineIfNoQuantity=En rad av produkt / tjänst med en nolla belopp anses som ett alternativ FreeLegalTextOnProposal=Fri text på affärsförslag WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom) -BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto destination förslag ##### Orders ##### OrdersSetup=Beställ ledning setup OrdersNumberingModules=Beställningar numrering moduler @@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Intervention numrering moduler TemplatePDFInterventions=Intervention kort dokument modeller WatermarkOnDraftInterventionCards=Vattenstämpel på åtgärdskort dokument (ingen om tom) ##### Contracts ##### -ContractsSetup=Contracts/Subscriptions module setup +ContractsSetup=Avtal / Prenumerationer modul installation ContractsNumberingModules=Kontrakt numrering moduler TemplatePDFContracts=Contract documents modeller FreeLegalTextOnContracts=Fritext om avtal @@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Filer av typen %s är inte komprimerade av HTTP-server CacheByServer=Cache med server CacheByClient=Cache med browser CompressionOfResources=Komprimering av HTTP-svar -TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +TestNotPossibleWithCurrentBrowsers=En sådan automatisk detektering är inte möjligt med nuvarande webbläsare ##### Products ##### ProductSetup=Produkter modul setup ServiceSetup=Tjänster modul konfiguration @@ -1415,9 +1424,9 @@ OSCommerceTestOk=Anslutning till servern "%s" på databas %s "med OSCommerceTestKo1=Anslutning till servern "%s" lyckas, men databas %s "kunde inte nås. OSCommerceTestKo2=Anslutning till servern "%s" med användare "%s" misslyckades. ##### Stock ##### -StockSetup=Warehouse module setup -UserWarehouse=Use user personal warehouses -IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. +StockSetup=Lagermodul inställnings +UserWarehouse=Använd användar personliga lager +IfYouUsePointOfSaleCheckModule=Om du använder en Point of Sale-modul (POS modul som standard eller annan extern modul), kan denna inställning ignoreras av din Point Of Sale modul. De flesta point of sales moduler är utformade för att skapa omedelbart en faktura och minska lager som standard oavsett är alternativ här. Så, om du behöver eller inte ha ett bestånd minskar när du registrerar en sälja från din Point of Sale, kolla även din POS-modul inrättas. ##### Menu ##### MenuDeleted=Meny utgår TreeMenu=Tree menyer @@ -1482,14 +1491,14 @@ ClickToDialDesc=Denna modul gör det möjligt att lägga till en ikon efter tele ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales modul setup -CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskThirdPartyForSell=Standard generiska tredje part att använda för Sells CashDeskBankAccountForSell=Konto som ska användas för att ta emot kontant betalning CashDeskBankAccountForCheque= Konto som ska användas för att ta emot betalningar med check CashDeskBankAccountForCB= Konto som ska användas för att ta emot kontant betalning med kreditkort -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale -CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease -StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled -CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. +CashDeskDoNotDecreaseStock=Inaktivera lager minskning när en sälja görs från Point of Sale +CashDeskIdWareHouse=Tvinga och begränsa lager att använda för aktie minskning +StockDecreaseForPointOfSaleDisabled=Stock minskning från Point of Sale inaktiv +CashDeskYouDidNotDisableStockDecease=Du har inte inaktivera lager minskning när du gör en sälja från Point of Sale. Så ett lager krävs. ##### Bookmark ##### BookmarkSetup=Bokmärk modul setup BookmarkDesc=Den här modulen kan du hantera bokmärken. Du kan också lägga genvägar till alla Dolibarr sidor eller externale webbplatser på din vänstra menyn. @@ -1543,13 +1552,13 @@ ConfirmDeleteFiscalYear=Är du säker på att du vill ta bort detta verksamhets Opened=Öppnad Closed=Stängt AlwaysEditable=Kan alltid redigeras -MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) -NbMajMin=Minimum number of uppercase characters -NbNumMin=Minimum number of numeric characters -NbSpeMin=Minimum number of special characters -NbIteConsecutive=Maximum number of repeating same characters -NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation -SalariesSetup=Setup of module salaries -SortOrder=Sort order +MAIN_APPLICATION_TITLE=Tvinga synliga namn ansökan (varning: ställa ditt eget namn här kan bryta funktionen Autofyll inloggning när du använder DoliDroid mobil applikation) +NbMajMin=Minsta antal versaler +NbNumMin=Minsta antal numeriska tecken +NbSpeMin=Minsta antal specialtecken +NbIteConsecutive=Maximalt antal upprepa samma tecken +NoAmbiCaracAutoGeneration=Använd inte tvetydiga tecken ("1", "l", "i", "|", "0", "O") för automatisk generering +SalariesSetup=Inställning av modul löner +SortOrder=Sorteringsordning Format=Format TypePaymentDesc=0: Kundbetalning typ, 1: Leverantörsbetalnings typ, 2: Både kunder och leverantörer betalnings typ diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang index d05899c5119..df18edf920f 100644 --- a/htdocs/langs/sv_SE/agenda.lang +++ b/htdocs/langs/sv_SE/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Åtgärder påverkas ActionsDoneBy=Åtgärder som utförs av ActionsForUser=Händelser för användaren ActionsForUsersGroup=Händelser för alla användare av grupp +ActionAssignedTo=Event assigned to AllMyActions= Alla mina handlingar och uppgifter AllActions= Alla åtgärder / uppgifter ViewList=Visa lista @@ -44,7 +45,7 @@ AgendaExtSitesDesc=Den här sidan gör det möjligt att deklarera externa kalend ActionsEvents=Händelser som Dolibarr kommer att skapa en talan i agenda automatiskt PropalValidatedInDolibarr=Förslag %s validerade InvoiceValidatedInDolibarr=Faktura %s validerade -InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceValidatedInDolibarrFromPos=Faktura %s validerats från POS InvoiceBackToDraftInDolibarr=Faktura %s gå tillbaka till förslaget status InvoiceDeleteDolibarr=Faktura %s raderas OrderValidatedInDolibarr= Beställ %s validerade diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang index 34167669685..77a566b712f 100644 --- a/htdocs/langs/sv_SE/banks.lang +++ b/htdocs/langs/sv_SE/banks.lang @@ -147,10 +147,10 @@ BackToAccount=Tillbaka till konto ShowAllAccounts=Visa för alla konton FutureTransaction=Transaktioner i Futur. Inget sätt att blidka. SelectChequeTransactionAndGenerate=Välj / Filtret kontrollerar att inkludera i kontrollen insättning kvittot och klicka på "Skapa". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) -EventualyAddCategory=Eventually, specify a category in which to classify the records +InputReceiptNumber=Välj kontoutdrag samband med förlikningen. Använd en sorterbar numeriskt värde (t.ex., ÅÅÅÅMM) +EventualyAddCategory=Så småningom, ange en kategori där för att klassificera de register ToConciliate=För att förena? -ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click +ThenCheckLinesAndConciliate=Kontrollera sedan linjerna som finns i kontoutdraget och klicka BankDashboard=Bankkonton sammandrag DefaultRIB=Standard BAN AllRIB=Alla BAN diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang index af80a05d97f..46d04601dc3 100644 --- a/htdocs/langs/sv_SE/bills.lang +++ b/htdocs/langs/sv_SE/bills.lang @@ -21,8 +21,8 @@ InvoiceDepositDesc=Denna typ av faktura sker när en insättning har mottagits. InvoiceProForma=Proforma faktura InvoiceProFormaAsk=Proforma faktura InvoiceProFormaDesc=Proforma faktura är en bild av en sann faktura men har ingen bokföring värde. -InvoiceReplacement=Ersättning faktura -InvoiceReplacementAsk=Ersättning faktura för faktura +InvoiceReplacement=Ersättnings faktura +InvoiceReplacementAsk=Ersättnings faktura för faktura InvoiceReplacementDesc= Ersättning faktura används för att avbryta och byta helt en faktura utan betalningar.

Anmärkning: Endast fakturor utan betalningar kan bytas ut. Om fakturan du ersätter är ännu inte avslutat, kommer den automatiskt att stängas av "övergivna". InvoiceAvoir=Kreditnota InvoiceAvoirAsk=Kreditnota att korrigera fakturan @@ -30,12 +30,12 @@ InvoiceAvoirDesc=Den kreditnota är en negativ faktura används för att invoiceAvoirWithLines=Skapa kreditnota med innehållet i originalfakturan invoiceAvoirWithPaymentRestAmount=Skapa kreditnota med återstående obetald faktura ursprung invoiceAvoirLineWithPaymentRestAmount=Kredit notering för återstående obetalda beloppet -ReplaceInvoice=Byt faktura %s +ReplaceInvoice=Ersätt faktura %s ReplacementInvoice=Ersättning faktura ReplacedByInvoice=Ersatt av faktura %s ReplacementByInvoice=Ersatt av faktura CorrectInvoice=Korrekt faktura %s -CorrectionInvoice=Korrigering faktura +CorrectionInvoice=Korrigerings faktura UsedByInvoice=Användas för att betala fakturan %s ConsumedBy=Förbrukas av NotConsumed=Inte förbrukas @@ -111,30 +111,30 @@ BillStatusCanceled=Övergiven BillStatusValidated=Validerad (måste betalas) BillStatusStarted=Påbörjad BillStatusNotPaid=Inte betalas -BillStatusClosedUnpaid=Stängt (obetalda) -BillStatusClosedPaidPartially=Betalt (delvis) -BillShortStatusDraft=Förslag +BillStatusClosedUnpaid=Stängd (obetald) +BillStatusClosedPaidPartially=Betald (delvis) +BillShortStatusDraft=Utkast BillShortStatusPaid=Betald -BillShortStatusPaidBackOrConverted=Bearbetade -BillShortStatusConverted=Bearbetade +BillShortStatusPaidBackOrConverted=Bearbetad +BillShortStatusConverted=Bearbetad BillShortStatusCanceled=Övergiven BillShortStatusValidated=Validerad BillShortStatusStarted=Började BillShortStatusNotPaid=Inte betalas BillShortStatusClosedUnpaid=Stängt -BillShortStatusClosedPaidPartially=Betalt (delvis) +BillShortStatusClosedPaidPartially=Betald (delvis) PaymentStatusToValidShort=För att validera ErrorVATIntraNotConfigured=Intracommunautary momsregistreringsnummer ännu inte definierat ErrorNoPaiementModeConfigured=Ingen utebliven betalning läge definieras. Gå till Faktura-modulen setup att fixa detta. ErrorCreateBankAccount=Skapa ett bankkonto, då gå till Setup panel Faktura-modul för att definiera betalningssätten ErrorBillNotFound=Faktura %s finns inte -ErrorInvoiceAlreadyReplaced=Misstag, försök dig för att godkänna en faktura för att ersätta faktura %s. Men denna har redan ersatts av faktura %s. +ErrorInvoiceAlreadyReplaced=Fel, du försöker dig på att godkänna en faktura för att ersätta faktura %s. Men denna har redan ersatts av faktura %s. ErrorDiscountAlreadyUsed=Fel, rabatt som redan används ErrorInvoiceAvoirMustBeNegative=Fel, måste korrigera fakturan ett negativt belopp ErrorInvoiceOfThisTypeMustBePositive=Fel, skall denna typ av faktura har ett positivt belopp ErrorCantCancelIfReplacementInvoiceNotValidated=Fel, kan inte avbryta en faktura som har ersatts av en annan faktura som fortfarande i utkast status BillFrom=Från -BillTo=Bill till +BillTo=Fakturamottagare ActionsOnBill=Åtgärder mot faktura NewBill=Ny faktura LastBills=Senaste %s fakturor @@ -157,7 +157,7 @@ ConfirmClassifyPaidPartiallyQuestion=Denna faktura inte har betalats helt. Vad f ConfirmClassifyPaidPartiallyReasonAvoir=Återstående obetalt (%s %s) är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag reglerar momsen med en kreditnota. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Återstående obetalt (%s %s) är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag godkänner förlust av momsen på denna rabatt. ConfirmClassifyPaidPartiallyReasonDiscountVat=Återstående obetalt (%s %s) är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag återskapar momsen på denna rabatt med en kreditnota. -ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad kund +ConfirmClassifyPaidPartiallyReasonBadCustomer=Dålig kund ConfirmClassifyPaidPartiallyReasonProductReturned=Produkter som returneras delvis ConfirmClassifyPaidPartiallyReasonOther=Belopp övergivna av annan orsak ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Detta val är möjligt om din faktura har försetts med lämplig kommentar. (Exempel «Endast den skatt som motsvarar det pris som verkligen har betalats ger rätt till avdrag») @@ -172,9 +172,9 @@ ConfirmCustomerPayment=Har du bekräfta denna betalning ingång för %s % ConfirmSupplierPayment=Bekräftar du denna betalning för %s %s? ConfirmValidatePayment=Är du säker på att du vill godkänna denna betalning? Inga ändringar kan göras efter det att betalning är godkänd. ValidateBill=Validera faktura -UnvalidateBill=Unvalidate faktura -NumberOfBills=Nb av fakturor -NumberOfBillsByMonth=Nb av fakturor per månad +UnvalidateBill=Ovaliderade faktura +NumberOfBills=Antal av fakturor +NumberOfBillsByMonth=Antal av fakturor per månad AmountOfBills=Belopp för fakturor AmountOfBillsByMonthHT=Mängd av fakturor per månad (netto efter skatt) ShowSocialContribution=Visa sociala avgifter @@ -205,7 +205,7 @@ NoOtherDraftBills=Inga andra förslag fakturor NoDraftInvoices=Inget faktura-utkast RefBill=Faktura ref ToBill=Fakturamottagare -RemainderToBill=Återstår att räkningen +RemainderToBill=Återstår att fakturan SendBillByMail=Skicka faktura via e-post SendReminderBillByMail=Skicka påminnelse via e-post RelatedCommercialProposals=Relaterade kommersiella förslag @@ -217,7 +217,7 @@ NoInvoice=Ingen faktura ClassifyBill=Klassificera faktura SupplierBillsToPay=Leverantörer fakturor att betala CustomerBillsUnpaid=Obetalda kunder fakturor -DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +DispenseMontantLettres=De skriftliga fakturor genom mecanographic förfaranden dispens av ordning i brev NonPercuRecuperable=Icke återvinningsbara SetConditions=Ställ betalningsvillkor SetMode=Ställ betalningssätt @@ -390,7 +390,7 @@ ExpectedToPay=Förväntad utbetalning PayedByThisPayment=Betalas av denna betalning ClosePaidInvoicesAutomatically=Klassificera "betalade" alla standard eller fakturor ersättning entirely betalt. ClosePaidCreditNotesAutomatically=Beteckna "Betalda" alla fullständigt återbetalda kreditnotor. -AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstår att betala kommer automatiskt stängd för status "betald". +AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstående att betala kommer automatiskt stängd för status "betald". ToMakePayment=Betala ToMakePaymentBack=Återbetala ListOfYourUnpaidInvoices=Lista över obetalda fakturor diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang index 3c949332eb6..a8fadb4e77b 100644 --- a/htdocs/langs/sv_SE/boxes.lang +++ b/htdocs/langs/sv_SE/boxes.lang @@ -24,7 +24,7 @@ BoxSalesTurnover=Omsättningen BoxTotalUnpaidCustomerBills=Totalt obetalda kundens fakturor BoxTotalUnpaidSuppliersBills=Totalt obetalda leverantörs fakturor BoxTitleLastBooks=Senaste %s inspelade böcker -BoxTitleNbOfCustomers=Nombre de klient +BoxTitleNbOfCustomers=Antal klienter BoxTitleLastRssInfos=Senaste %s nyheter från %s BoxTitleLastProducts=Senast %s modifierade produkter / tjänster BoxTitleProductsAlertStock=Produkter i lager alert diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang index 527dcf7d7a4..8d653226bc1 100644 --- a/htdocs/langs/sv_SE/categories.lang +++ b/htdocs/langs/sv_SE/categories.lang @@ -109,4 +109,4 @@ CategoriesSetup=Kategorier, inställningar CategorieRecursiv=Länka automatiskt med förälderkategori CategorieRecursivHelp=Om aktiverad kommer produkten även länkas till förälderkategori när den läggs i en underkategori AddProductServiceIntoCategory=Lägg till följande produkt / tjänst -ShowCategory=Show category +ShowCategory=Visa kategori diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang index 681b9e10d30..d51e041b7e2 100644 --- a/htdocs/langs/sv_SE/compta.lang +++ b/htdocs/langs/sv_SE/compta.lang @@ -3,8 +3,8 @@ Accountancy=Bokföring AccountancyCard=Bokföringskort Treasury=Treasury MenuFinancial=Finansiella -TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation -TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation +TaxModuleSetupToModifyRules=Gå till skatt modul inställning att ändra reglerna för beräkning +TaxModuleSetupToModifyRulesLT=Gå till Företag inställning att ändra reglerna för beräkning OptionMode=Alternativ för bokföring OptionModeTrue=Alternativ Input-Output OptionModeVirtual=Alternativ Credits-Utdebitering @@ -12,15 +12,15 @@ OptionModeTrueDesc=I detta sammanhang skall omsättningen beräknas över utbeta OptionModeVirtualDesc=I detta sammanhang skall omsättningen beräknas på fakturor (datum för godkännandet). När dessa fakturor betalas, om de har betalats eller inte, de är förtecknade i omsättning produktionen. FeatureIsSupportedInInOutModeOnly=Funktionen bara tillgänglig i PROV-FORDRINGAR bokförings-läge (Se redovisning modul konfiguration) VATReportBuildWithOptionDefinedInModule=Belopp som anges här beräknas enligt regler som fastställts av Skatteverket modul setup. -LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. +LTReportBuildWithOptionDefinedInModule=Belopp som visas här är beräknade med hjälp av regler som fastställts av bolagets inställning. Param=Setup RemainingAmountPayment=Belopp som skall erläggas resterande: AmountToBeCharged=Totalt belopp att betala: AccountsGeneral=Konton Account=Konto Accounts=Konton -Accountparent=Account parent -Accountsparent=Accounts parent +Accountparent=Konto förälder +Accountsparent=Konto förälder BillsForSuppliers=Räkningar för leverantörer Income=Inkomst Outcome=Expense @@ -32,7 +32,7 @@ Profit=Resultat Balance=Balans Debit=Debet Credit=Credit -Piece=Accounting Doc. +Piece=Redovisning Doc. Withdrawal=Återkallande Withdrawals=Uttag AmountHTVATRealReceived=Net insamlade @@ -42,25 +42,25 @@ VATReceived=Mervärdesskatt som VATToCollect=Moms inköp VATSummary=Moms Balance LT2SummaryES=IRPF Balans -LT1SummaryES=RE Balance +LT1SummaryES=RE Balans VATPaid=Mervärdesskatten -SalaryPaid=Salary paid +SalaryPaid=Lön LT2PaidES=IRPF Betald LT1PaidES=RE Paid LT2CustomerES=IRPF omsättning LT2SupplierES=IRPF inköp -LT1CustomerES=RE sales -LT1SupplierES=RE purchases +LT1CustomerES=RE försäljning +LT1SupplierES=RE inköp VATCollected=Momsintäkterna ToPay=Att betala ToGet=För att komma tillbaka -SpecialExpensesArea=Area for all special payments +SpecialExpensesArea=Område för alla special betalningar TaxAndDividendsArea=Skatt, sociala avgifter och utdelningar område SocialContribution=Sociala avgifter SocialContributions=Sociala avgifter -MenuSpecialExpenses=Special expenses +MenuSpecialExpenses=Särskilda kostnader MenuTaxAndDividends=Skatter och utdelning -MenuSalaries=Salaries +MenuSalaries=Löner MenuSocialContributions=Sociala avgifter MenuNewSocialContribution=Nya bidrag NewSocialContribution=Nya sociala bidrag @@ -73,21 +73,21 @@ PaymentCustomerInvoice=Kundfaktura betalning PaymentSupplierInvoice=Leverantörsfaktura betalning PaymentSocialContribution=Sociala avgifter betalas PaymentVat=Moms betalning -PaymentSalary=Salary payment +PaymentSalary=Lön betalning ListPayment=Lista över betalningar ListOfPayments=Lista över betalningar ListOfCustomerPayments=Förteckning över kundbetalningar ListOfSupplierPayments=Förteckning över leverantörsbetalningar DatePayment=Betalningsdag -DateStartPeriod=Date start period -DateEndPeriod=Date end period +DateStartPeriod=Datum startperiod +DateEndPeriod=Slutdatum perioden NewVATPayment=Ny moms betalning newLT2PaymentES=Ny IRPF betalning -newLT1PaymentES=New RE payment +newLT1PaymentES=Ny RE betalning LT2PaymentES=IRPF Betalning LT2PaymentsES=IRPF betalningar -LT1PaymentES=RE Payment -LT1PaymentsES=RE Payments +LT1PaymentES=RE Betalning +LT1PaymentsES=RE Betalningar VATPayment=Moms Betalning VATPayments=Momsbetalningar SocialContributionsPayments=Sociala avgifter betalningar @@ -108,7 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad kund bokföring kod för %s SuppliersProductsSellSalesTurnover=Den omsättning som försäljningen av leverantörens produkter. CheckReceipt=Kontrollera insättning CheckReceiptShort=Kontrollera insättning -LastCheckReceiptShort=Last %s check receipts +LastCheckReceiptShort=Senaste% s check kvitton NewCheckReceipt=Ny rabatt NewCheckDeposit=Nya kontrollera insättning NewCheckDepositOn=Skapa kvitto för insättning på konto: %s @@ -120,42 +120,42 @@ ConfirmPaySocialContribution=Är du säker på att du vill klassificera denna so DeleteSocialContribution=Ta bort en social avgift ConfirmDeleteSocialContribution=Är du säker på att du vill ta bort denna sociala avgifter? ExportDataset_tax_1=Sociala avgifter och betalningar -CalcModeVATDebt=Mode %sVAT on commitment accounting%s. -CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s. -CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting. -CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting -CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s -CalcModeLT1Debt=Mode %sRE on customer invoices%s -CalcModeLT1Rec= Mode %sRE on suppliers invoices%s -CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s -CalcModeLT2Debt=Mode %sIRPF on customer invoices%s -CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s -AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary -AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary +CalcModeVATDebt=Läge% svat på redovisning engagemang% s. +CalcModeVATEngagement=Läge% svat på inkomster-utgifter% s. +CalcModeDebt=Läges% sClaims-Skulder% s sa Åtagande redovisning. +CalcModeEngagement=Läge% sIncomes-Kostnader% s sa kassaredovisning +CalcModeLT1= Läge% SRE på kundfakturor - leverantörerna fakturerar% s +CalcModeLT1Debt=Läge% SRE på kundfakturor% s +CalcModeLT1Rec= Läge% SRE på leverantörerna fakturerar% s +CalcModeLT2= Läge% sIRPF på kundfakturor - leverantörer fakturor% s +CalcModeLT2Debt=Läge% sIRPF på kundfakturor% s +CalcModeLT2Rec= Läge% sIRPF på leverantörernas fakturor% s +AnnualSummaryDueDebtMode=Överskott av intäkter och kostnader, årliga sammanfattande +AnnualSummaryInputOutputMode=Överskott av intäkter och kostnader, årliga sammanfattande AnnualByCompaniesDueDebtMode=Överskott av intäkter och kostnader, detalj av tredje part, mode %sClaims-Debts%s sa Åtagande redovisning. AnnualByCompaniesInputOutputMode=Överskott av intäkter och kostnader, detalj av tredje part, mode %sRevenues-Expenses%s sa redovisning enligt kontantmetoden. SeeReportInInputOutputMode=Se rapporten %sIncomes-Expenses%s sa kontanter står för en beräkning på faktiska betalningar SeeReportInDueDebtMode=Se rapporten %sClaims-Debts%s sa åtagande står för en beräkning på utfärdade fakturor -RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included +RulesAmountWithTaxIncluded=- Belopp som visas är med alla skatter inkluderade RulesResultDue=- Belopp som anges är med alla skatter inkluderade
- Det omfattar utestående fakturor, utlägg och mervärdesskatt oavsett om de betalas eller inte.
- Den bygger på validering datum för fakturor och moms och på förfallodagen för kostnader. -RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses and VAT. +RulesResultInOut=- Den innehåller de verkliga utbetalningarna på fakturor, kostnader och moms.
- Den bygger på datum för fakturor, kostnader och moms betalning. RulesCADue=- Det omfattar kundens förfallna fakturor oavsett om de betalas eller inte.
- Den bygger på valideringen dagen för dessa fakturor.
RulesCAIn=- Den innehåller alla faktiska utbetalningar av fakturor från kunder.
- Den bygger på betalningsdagen för dessa fakturor
DepositsAreNotIncluded=- Deposit fakturor eller ingår DepositsAreIncluded=- Deposit fakturor ingår LT2ReportByCustomersInInputOutputModeES=Rapport från tredje part IRPF -LT1ReportByCustomersInInputOutputModeES=Report by third party RE -VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid -VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid -VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid -LT1ReportByQuartersInInputOutputMode=Report by RE rate -LT2ReportByQuartersInInputOutputMode=Report by IRPF rate -VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid -LT1ReportByQuartersInDueDebtMode=Report by RE rate -LT2ReportByQuartersInDueDebtMode=Report by IRPF rate +LT1ReportByCustomersInInputOutputModeES=Rapport från tredje part RE +VATReportByCustomersInInputOutputMode=Rapport av kunden moms samlas och betalas +VATReportByCustomersInDueDebtMode=Rapport av kunden moms samlas och betalas +VATReportByQuartersInInputOutputMode=Rapport från graden av mervärdesskatten och en betald +LT1ReportByQuartersInInputOutputMode=Rapport från RE hastighet +LT2ReportByQuartersInInputOutputMode=Betänkande av IRPF hastighet +VATReportByQuartersInDueDebtMode=Rapport från graden av mervärdesskatten och en betald +LT1ReportByQuartersInDueDebtMode=Rapport från RE hastighet +LT2ReportByQuartersInDueDebtMode=Betänkande av IRPF hastighet SeeVATReportInInputOutputMode=Se rapporten %sVAT encasement%s en vanlig beräkning SeeVATReportInDueDebtMode=Se rapporten %sVAT om flow%s för en beräkning med en option på flödet -RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment. +RulesVATInServices=- För tjänster innehåller rapporten de momsregler som faktiskt mottagits eller utfärdats på grundval av betalningsdagen. RulesVATInProducts=- För materiella tillgångar, innehåller den för mervärdesskatt fakturor på grundval av fakturadatum. RulesVATDueServices=- För tjänster inkluderar redovisa moms fakturor på grund, har betalats eller inte, baserat på fakturadatum. RulesVATDueProducts=- För materiella tillgångar, innehåller den för mervärdesskatt fakturor, baserat på fakturadatum. @@ -178,33 +178,29 @@ CodeNotDef=Inte definierad AddRemind=Dispatch tillgängliga beloppet RemainToDivide= Återstår att sända: WarningDepositsNotIncluded=Insättningar fakturor ingår inte i denna version med denna redovisning modul. -DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date. +DatePaymentTermCantBeLowerThanObjectDate=Betalning sikt datum kan inte vara lägre än objektdatum. Pcg_version=Pcg version -Pcg_type=Pcg type -Pcg_subtype=Pcg subtype -InvoiceLinesToDispatch=Invoice lines to dispatch -InvoiceDispatched=Dispatched invoices -AccountancyDashboard=Accountancy summary -ByProductsAndServices=By products and services -RefExt=External ref -ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=Link to order -ReCalculate=Recalculate -Mode1=Method 1 -Mode2=Method 2 -CalculationRuleDesc=To calculate total VAT, there is two methods:
Method 1 is rounding vat on each line, then summing them.
Method 2 is summing all vat on each line, then rounding result.
Final result may differs from few cents. Default mode is mode %s. -CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier. -TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). -CalculationMode=Calculation mode -AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT -ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties -CloneTax=Clone a social contribution -ConfirmCloneTax=Confirm the clone of a social contribution -CloneTaxForNextMonth=Clone it for next month +Pcg_type=Pcg typ +Pcg_subtype=Pcg subtyp +InvoiceLinesToDispatch=Faktura linjer avsändandet +InvoiceDispatched=Skickas fakturor +AccountancyDashboard=Bokförings sammandrag +ByProductsAndServices=Genom produkter och tjänster +RefExt=Extern ref +ToCreateAPredefinedInvoice=För att skapa en fördefinierad faktura, skapa en standard faktura då, utan att validera den, klicka på knappen "Konvertera till fördefinierad faktura". +LinkedOrder=Länk för att beställa +ReCalculate=Räkna +Mode1=Metod 1 +Mode2=Metod 2 +CalculationRuleDesc=För att beräkna den totala mervärdesskatt, finns det två metoder:
Metod 1 är avrundning moms på varje rad, sedan summera dem.
Metod 2 är summera all moms på varje rad, sedan avrundning resultatet.
Slutresultat kan skiljer sig från några cent. Standardläget är läget% s. +CalculationRuleDescSupplier=enligt leverantör, väljer lämplig metod att tillämpa samma beräkningsregel och få samma resultat som förväntas av din leverantör. +TurnoverPerProductInCommitmentAccountingNotRelevant=Omsättning rapport per produkt, när du använder en kontantredovisningsläge inte är relevant. Denna rapport är endast tillgänglig när du använder engagemang bokföring läge (se inställning av bokföring modul). +CalculationMode=Beräkning läge +AccountancyJournal=Bokförings kod tidskrift +ACCOUNTING_VAT_ACCOUNT=Standard bokföring kod för uppbörden av moms +ACCOUNTING_VAT_BUY_ACCOUNT=Standard bokföring kod för att betala moms +ACCOUNTING_ACCOUNT_CUSTOMER=Bokföring kod som standard för kund thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Bokföring kod som standard för leverantörs thirdparties +CloneTax=Klona en social avgift +ConfirmCloneTax=Bekräfta klon av en social bidrag +CloneTaxForNextMonth=Klona det för nästa månad diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang index f011f836ba8..0d5b012104f 100644 --- a/htdocs/langs/sv_SE/contracts.lang +++ b/htdocs/langs/sv_SE/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Kontrakt område ListOfContracts=Förteckning över avtal -LastModifiedContracts=Last %s modified contracts +LastModifiedContracts=Senaste %s modifierade kontrakt AllContracts=Alla kontrakt ContractCard=Kontrakt kort ContractStatus=Kontrakt status @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Förteckning över löpande kontrakt linjer ListOfRunningServices=Förteckning över löpande tjänster NotActivatedServices=Inaktiva tjänster (bland validerade kontrakt) BoardNotActivatedServices=Tjänster att aktivera bland validerade kontrakt -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Senaste %s aktiverade tjänster LastModifiedServices=Senast %s uppdaterade tjänster EditServiceLine=Redigera servicelinjen @@ -91,6 +91,7 @@ ListOfServicesToExpire=Förteckning över tjänster som löper ut NoteListOfYourExpiredServices=Denna förteckning omfattar endast tjänster från avtal med tredje part i förhållande till vilka du är säljare. StandardContractsTemplate=Standardkontrakt mall ContactNameAndSignature=För %s, namn och underskrift: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Säljare som tecknar avtal diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang index 75eaafb3990..cf4ed34e6ae 100644 --- a/htdocs/langs/sv_SE/cron.lang +++ b/htdocs/langs/sv_SE/cron.lang @@ -18,7 +18,7 @@ CronExplainHowToRunUnix=På Unix-miljö bör du använda crontab för att köra CronExplainHowToRunWin=På Microsoft (tm) Windows environement kan du använda schemalagd aktivitet verktyg för att köra kommandoraden varje minuter # Menu CronJobs=Schemalagda jobb -CronListActive=List of active/scheduled jobs +CronListActive=Lista över aktiva / schemalagda jobb CronListInactive=Lista över handikappade jobb # Page list CronDateLastRun=Senaste körning diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang index 2e0f351d082..a66b54ae5af 100644 --- a/htdocs/langs/sv_SE/donations.lang +++ b/htdocs/langs/sv_SE/donations.lang @@ -31,8 +31,8 @@ DonationRecipient=Donation mottagaren ThankYou=Tack IConfirmDonationReception=Mottagaren förklarar mottagning, som en donation, av följande belopp MinimumAmount=Minsta belopp är% s -FreeTextOnDonations=Free text to show in footer -FrenchOptions=Options for France -DONATION_ART200=Show article 200 from CGI if you are concerned -DONATION_ART238=Show article 238 from CGI if you are concerned -DONATION_ART885=Show article 885 from CGI if you are concerned +FreeTextOnDonations=Fri text för att visa i sidfoten +FrenchOptions=Alternativ för Frankrike +DONATION_ART200=Visar artikel 200 från CGI om du är orolig +DONATION_ART238=Visar artikel 238 från CGI om du är orolig +DONATION_ART885=Visar artikel 885 från CGI om du är orolig diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang index 230f6f74889..e05970fa6f1 100644 --- a/htdocs/langs/sv_SE/errors.lang +++ b/htdocs/langs/sv_SE/errors.lang @@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fel, denna medlem ännu koppla ErrorThereIsSomeDeliveries=Fel, det finns några leveranser kopplade till denna sändning. Radering vägrade. ErrorCantDeletePaymentReconciliated=Kan inte ta bort en betalning som hade genererat en banktransaktion som conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Kan inte ta bort en betalning som delas av minst en faktura med status betalt +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang index e511fc6c590..5cbc416231e 100644 --- a/htdocs/langs/sv_SE/exports.lang +++ b/htdocs/langs/sv_SE/exports.lang @@ -8,7 +8,7 @@ ImportableDatas=Importeras dataset SelectExportDataSet=Välj uppsättning data du vill exportera ... SelectImportDataSet=Välj uppsättning data du vill importera ... SelectExportFields=Välj fält du vill exportera, eller välj en fördefinierad export profil -SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile: +SelectImportFields=Välj fil fält du vill importera och deras mål fält i databasen genom att flytta dem upp och ner med ankar %s, eller välj en fördefinierad importprofil: NotImportedFields=Fält av källfil importeras inte SaveExportModel=Spara den här exportera profilen om du tänker återanvända det senare ... SaveImportModel=Spara denna import profil om du planerar att återanvända den senare ... @@ -64,7 +64,7 @@ ChooseFormatOfFileToImport=Välj filformat som ska användas som importera filfo ChooseFileToImport=Ladda upp filer klicka sedan på Picto %s för att välja fil som källa importera filen ... SourceFileFormat=Källa filformat FieldsInSourceFile=Fält i källfilen -FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory) +FieldsInTargetDatabase=Target fält i Dolibarr databas (fetstil = obligatorisk) Field=Fält NoFields=Inga fält MoveField=Flytta fält %s kolumn nummer @@ -81,7 +81,7 @@ DoNotImportFirstLine=Importera inte första raden i källfilen NbOfSourceLines=Antal rader i källfilen NowClickToTestTheImport=Kontrollera importera parametrar som du har definierat. Om de är korrekta, klicka på knappen "%s" för att starta en simulering av importprocessen (inga data kommer att ändras i databasen, det är bara en simulering för tillfället) ... RunSimulateImportFile=Starta import simulering -FieldNeedSource=This field requires data from the source file +FieldNeedSource=Detta fält kräver data från källfilen SomeMandatoryFieldHaveNoSource=Vissa obligatoriska fält inte har någon källa från datafil InformationOnSourceFile=Information om källfil InformationOnTargetTables=Information om mål fält @@ -102,33 +102,33 @@ NbOfLinesImported=Antal rader importerades: %s. DataComeFromNoWhere=Värde att infoga kommer från ingenstans i källfilen. DataComeFromFileFieldNb=Värde att infoga kommer från nummer %s fältet i källfilen. DataComeFromIdFoundFromRef=Värde som kommer från flera %s på källfil kommer att användas för att hitta ID förälder motsätta sig att använda (Så objet %s som har ref. Från källfilen måste finns i Dolibarr). -DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary %s). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases. +DataComeFromIdFoundFromCodeId=Kod som kommer från fältnummer %s av källfilen kommer att användas för att hitta id ordnade objekt för att använda (Så koden från källfilen måste existerar i ordlistan %s). Observera att om du vet id, kan du även använda den till källfilen istället för kod. Importera bör arbeta i båda fallen. DataIsInsertedInto=Uppgifter från källfilen kommer att införas i följande område: DataIDSourceIsInsertedInto=ID på överordnat objekt hittas med hjälp av data i källfilen kommer att införas i följande område: DataCodeIDSourceIsInsertedInto=Id av förälder linje hittades från kod, kommer att införas i följande fält: SourceRequired=Data värde är obligatoriskt SourceExample=Exempel på möjliga datavärde ExampleAnyRefFoundIntoElement=Varje ref för element %s -ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s +ExampleAnyCodeOrIdFoundIntoDictionary=Varje kod (eller id) fann i ordlistan% s CSVFormatDesc=Semikolonavgränsade filformat (. Csv).
Detta är en text filformat där separeras fält av separator [%s]. Om separator finns inuti ett fält innehållet är området rundad med rund karaktär [%s]. Escape karaktär att fly rund karaktär är [%s]. -Excel95FormatDesc=Excel file format (.xls)
This is native Excel 95 format (BIFF5). -Excel2007FormatDesc=Excel file format (.xlsx)
This is native Excel 2007 format (SpreadsheetML). -TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text file format where fields are separated by a tabulator [tab]. -ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ). +Excel95FormatDesc=Excel-format (.xls)
Detta är Excel 95-format (BIFF5). +Excel2007FormatDesc=Excel-format (.xlsx)
Detta är Excel 2007-format (SpreadsheetML). +TsvFormatDesc=Tab Separerad Värde filformat (.tsv)
Detta är en textfil format där fälten skiljs åt av en tabulator [flik]. +ExportFieldAutomaticallyAdded=Fält %s lades automatiskt. Den kommer att undvika dig att ha liknande linjer som ska behandlas som dubbla poster (med det här fältet till, kommer alla linjer äga sin egen id och kan skilja). CsvOptions=Csv alternativ Separator=Avdelare -Enclosure=Enclosure +Enclosure=Inneslutning SuppliersProducts=Levedrantörsprodukter BankCode=Bankkod DeskCode=Reception kod BankAccountNumber=Kontonummer BankAccountNumberKey=Nyckel -SpecialCode=Special code -ExportStringFilter=%% allows replacing one or more characters in the text -ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days -ExportNumericFilter='NNNNN' filters by one value
'NNNNN+NNNNN' filters over a range of values
'>NNNNN' filters by lower values
'>NNNNN' filters by higher values +SpecialCode=Specialkod +ExportStringFilter=%% Tillåter ersätta ett eller flera tecken i texten +ExportDateFilter=ÅÅÅÅ, ÅÅÅÅMM, ÅÅÅÅMMDD: filter efter ett år / månad / dag
ÅÅÅÅ + ÅÅÅÅ, ÅÅÅÅMM + ÅÅÅÅMM, ÅÅÅÅMMDD + ÅÅÅÅMMDD: filter över en rad år / månader / dagar
> ÅÅÅÅ,> ÅÅÅÅMM,> ÅÅÅÅMMDD: filter på alla följande år / månader / dagar
<ÅÅÅÅ, <ÅÅÅÅMM, <ÅÅÅÅMMDD: filter på alla tidigare år / månader / dagar +ExportNumericFilter='NNNNN "filter med en värde
'NNNNN + NNNNN' filter över ett intervall av värden
"> NNNNN" filter med lägre värden
"> NNNNN" filter med högre värden ## filters -SelectFilterFields=If you want to filter on some values, just input values here. +SelectFilterFields=Om du vill filtrera på vissa värderingar, fyll i ingångsvärden här. FilterableFields=Champs Filtrables -FilteredFields=Filtered fields -FilteredFieldsValues=Value for filter +FilteredFields=Filtrerad fält +FilteredFieldsValues=Värde för filter diff --git a/htdocs/langs/sv_SE/externalsite.lang b/htdocs/langs/sv_SE/externalsite.lang index c912ae72dd0..e8162ce8502 100644 --- a/htdocs/langs/sv_SE/externalsite.lang +++ b/htdocs/langs/sv_SE/externalsite.lang @@ -2,4 +2,4 @@ ExternalSiteSetup=Setup länk till extern webbplats ExternalSiteURL=Extern webbplats URL ExternalSiteModuleNotComplete=Modul ExternalSite var inte korrekt konfigurerad. -ExampleMyMenuEntry=My menu entry +ExampleMyMenuEntry=Min meny posten diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang index b97e7592c6a..425f3245245 100644 --- a/htdocs/langs/sv_SE/interventions.lang +++ b/htdocs/langs/sv_SE/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Insatser InterventionCard=Intervention kort NewIntervention=Nya insatser -AddIntervention=Create intervention +AddIntervention=Skapa ingripande ListOfInterventions=Förteckning över åtgärder EditIntervention=Redigera ingripande ActionsOnFicheInter=Åtgärder för ingripande @@ -23,22 +23,22 @@ ConfirmDeleteInterventionLine=Är du säker på att du vill ta bort detta ingrip NameAndSignatureOfInternalContact=Namn och underskrift ingripa: NameAndSignatureOfExternalContact=Namn och underskrift av kund: DocumentModelStandard=Standarddokument modell för insatser -InterventionCardsAndInterventionLines=Interventions and lines of interventions -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +InterventionCardsAndInterventionLines=Ingrepp och linjer av interventioner +InterventionClassifyBilled=Klassificera "Fakturerad" +InterventionClassifyUnBilled=Classify "ofakturerade" StatusInterInvoiced=Fakturerade RelatedInterventions=Insatserna ShowIntervention=Visar ingripande -SendInterventionRef=Submission of intervention %s -SendInterventionByMail=Send intervention by Email -InterventionCreatedInDolibarr=Intervention %s created -InterventionValidatedInDolibarr=Intervention %s validated -InterventionModifiedInDolibarr=Intervention %s modified -InterventionClassifiedBilledInDolibarr=Intervention %s set as billed -InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled -InterventionSentByEMail=Intervention %s sent by EMail -InterventionDeletedInDolibarr=Intervention %s deleted -SearchAnIntervention=Search an intervention +SendInterventionRef=Inlämning av ingrepp %s +SendInterventionByMail=Skicka ingripa Email +InterventionCreatedInDolibarr=Ingrepp %s skapad +InterventionValidatedInDolibarr=Ingrepp %s validerade +InterventionModifiedInDolibarr=Ingrepp %s modifierade +InterventionClassifiedBilledInDolibarr=Ingrepp %s uppsättning som faktureras +InterventionClassifiedUnbilledInDolibarr=Ingrepp %s uppsättning som ofakturerade +InterventionSentByEMail=Ingrepp %s skickas via e-post +InterventionDeletedInDolibarr=Ingrepp %s raderad +SearchAnIntervention=Sök en intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representanten uppföljning ingripande TypeContact_fichinter_internal_INTERVENING=Ingripa @@ -49,5 +49,5 @@ ArcticNumRefModelDesc1=Generic nummer modell ArcticNumRefModelError=Misslyckades med att aktivera PacificNumRefModelDesc1=Återgå numero med format %syymm-nnnn där YY är år, mm månaden och nnnn är en sekvens utan avbrott och ingen återgång till 0 PacificNumRefModelError=En intervention kort börjar med $ syymm finns redan och är inte förenligt med denna modell för sekvens. Ta bort den eller byta namn på den för att aktivera denna modul. -PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Trycksaker på interventionskort +PrintProductsOnFichinterDetails=forinterventions genereras från order diff --git a/htdocs/langs/sv_SE/ldap.lang b/htdocs/langs/sv_SE/ldap.lang index caea335f633..fe63de5bc39 100644 --- a/htdocs/langs/sv_SE/ldap.lang +++ b/htdocs/langs/sv_SE/ldap.lang @@ -25,5 +25,5 @@ UserSynchronized=Användare synkroniseras GroupSynchronized=Grupp synkroniseras MemberSynchronized=Medlem synkroniseras ContactSynchronized=Kontakta synkroniseras -ForceSynchronize=Force synkronisera Dolibarr -> LDAP +ForceSynchronize=Tvinga synkronisering Dolibarr -> LDAP ErrorFailedToReadLDAP=Misslyckades med att läsa LDAP-databas. Kontrollera LDAP-modul setup och databas tillgänglighet. diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang index 5837916e0aa..73f612bb83f 100644 --- a/htdocs/langs/sv_SE/mails.lang +++ b/htdocs/langs/sv_SE/mails.lang @@ -15,10 +15,10 @@ MailReply=Svara MailTo=Mottagare (s) MailCC=Kopiera till MailCCC=Cachad kopia till -MailTopic=EMail ämne +MailTopic=E-post ämne MailText=Meddelande MailFile=Bifogade filer -MailMessage=EMail kropp +MailMessage=E-post huvuddel ShowEMailing=Visa e-post ListOfEMailings=Lista över emailings NewMailing=Ny e-post @@ -43,20 +43,20 @@ MailingStatusSentCompletely=Skickade helt MailingStatusError=Fel MailingStatusNotSent=Skickas inte MailSuccessfulySent=E-post skickad (från %s till %s) -MailingSuccessfullyValidated=EMailing successfully validated -MailUnsubcribe=Unsubscribe -Unsuscribe=Unsubscribe -MailingStatusNotContact=Don't contact anymore +MailingSuccessfullyValidated=E-post validerades +MailUnsubcribe=Avanmälan +Unsuscribe=Avanmälan +MailingStatusNotContact=Kontakta inte längre ErrorMailRecipientIsEmpty=E-postmottagare är tom WarningNoEMailsAdded=Inga nya E-posta lägga till mottagarens lista. ConfirmValidMailing=Är du säker på att du vill godkänna denna e-post? -ConfirmResetMailing=Varning, genom reinitializing skicka e-post %s, kan du göra en massa utskick av detta e-postmeddelande annan gång. Är du säker på att du detta är vad du vill göra? +ConfirmResetMailing=Varning, genom att återinitialisera e-post %s, kan du göra en massa utskick av detta e-postmeddelande en annan gång. Är du säker på att detta är vad du vill göra? ConfirmDeleteMailing=Är du säker på att du vill ta bort denna emailling? NbOfRecipients=Antal mottagare -NbOfUniqueEMails=Nb av unika e-post -NbOfEMails=Nb av e-post +NbOfUniqueEMails=Antal av unika e-post +NbOfEMails=Antal e-post TotalNbOfDistinctRecipients=Antal skilda mottagare -NoTargetYet=Inga stödmottagare ännu (Gå på fliken "mottagare") +NoTargetYet=Inga stödmottagare ännu (Gå på fliken "mottagare" ) AddRecipients=Lägg till mottagare RemoveRecipient=Ta bort mottagare CommonSubstitutions=Vanliga substitutioner @@ -67,37 +67,37 @@ NoAttachedFiles=Inga bifogade filer BadEMail=Dåligt värde för e-post CloneEMailing=Klon Email ConfirmCloneEMailing=Är du säker på att du vill klona denna e-post? -CloneContent=Klon meddelande +CloneContent=Klona meddelande CloneReceivers=Cloner mottagare DateLastSend=Datum för senaste sändning DateSending=Datum skicka SentTo=Skickat till %s MailingStatusRead=Läsa -CheckRead=Read Receipt -YourMailUnsubcribeOK=The email %s is correctly unsubcribe from mailing list -MailtoEMail=Hyper link to email -ActivateCheckRead=Allow to use the "Unsubcribe" link -ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature -EMailSentToNRecipients=EMail sent to %s recipients. -XTargetsAdded=%s recipients added into target list -EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email. -MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s) -SendRemind=Send reminder by EMails -RemindSent=%s reminder(s) sent -AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent) -NoRemindSent=No EMail reminder sent -ResultOfMassSending=Result of mass EMail reminders sending +CheckRead=Läs Kvitto +YourMailUnsubcribeOK=E-post %s är korrekt avbeställt från sändlistan +MailtoEMail=Hyper länk till e-post +ActivateCheckRead=Låt använd länken "Unsubcribe" +ActivateCheckReadKey=Key bruk för att kryptera URL användning för "Läs Kvitto" och "Unsubcribe" -funktionen +EMailSentToNRecipients=EMail skickas till% s mottagare. +XTargetsAdded=% s mottagare läggs in i målet listan +EachInvoiceWillBeAttachedToEmail=Ett dokument med standardfakturadokumentmall kommer att skapas och bifogas varje e-postmeddelande. +MailTopicSendRemindUnpaidInvoices=Påminnelse om faktura% s (% s) +SendRemind=Skicka påminnelse av e-post +RemindSent=% S påminnelse (er) skickas +AllRecipientSelectedForRemind=Alla thirdparties väljs och om ett e-post sätts (observera att en post per faktura skickas) +NoRemindSent=Ingen EMail påminnelse +ResultOfMassSending=Resultat av massa e påminnelser skicka # Libelle des modules de liste de destinataires mailing MailingModuleDescContactCompanies=Kontakter av alla tredje parter (kund, prospekt, leverantör, ...) MailingModuleDescDolibarrUsers=Alla Dolibarr användare med e-post MailingModuleDescFundationMembers=Stiftelsen medlemmar med e-post MailingModuleDescEmailsFromFile=E-post från en textfil (email, namn, efternamn, kommentarer) -MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other) +MailingModuleDescEmailsFromUser=E-post från användarens input (email, efternamn, förnamn, andra) MailingModuleDescContactsCategories=Tredje part med e-post (per kategori) MailingModuleDescDolibarrContractsLinesExpired=Tredje part med utgångna avtalets linjer MailingModuleDescContactsByCompanyCategory=Kontakter med tredje part (av tredje part kategori) -MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category +MailingModuleDescContactsByCategory=Kontakter / adresser från tredje part efter kategori MailingModuleDescMembersCategories=Foundation medlemmar (per kategori) MailingModuleDescContactsByFunction=Kontakter från tredje part (i position / funktion) LineInFile=Line %s i filen @@ -112,30 +112,30 @@ SearchAMailing=Sök utskick SendMailing=Skicka e-post SendMail=Skicka e-post SentBy=Skickat av -MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: +MailingNeedCommand=Av säkerhetsskäl, skicka ett email är bättre när de utförs från kommandoraden. Om du har en, be din serveradministratör för att lansera följande kommando för att skicka e-post till alla mottagare: MailingNeedCommand2=Du kan dock skicka dem online genom att lägga till parametern MAILING_LIMIT_SENDBYWEB med värde av maximalt antal e-postmeddelanden du vill skicka genom sessionen. För detta, gå hem - Setup - Annat. -ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +ConfirmSendingEmailing=Om du inte kan eller föredrar att skicka dem med din webbläsare, bekräfta att du är säker på att du vill skicka e-post nu från din webbläsare? +LimitSendingEmailing=Obs: Sänder av email från webbgränssnitt sker i flera gånger för säkerhets- och timeout skäl,% s mottagare i taget för varje sändning session. TargetsReset=Rensa lista ToClearAllRecipientsClickHere=Klicka här för att rensa listor över mottagare av detta e-post ToAddRecipientsChooseHere=Lägg till mottagare genom att välja från listorna NbOfEMailingsReceived=Massa emailings fått -NbOfEMailingsSend=Mass emailings sent +NbOfEMailingsSend=Massemail skickas IdRecord=ID rekord DeliveryReceipt=Leveranskvitto YouCanUseCommaSeparatorForSeveralRecipients=Du kan använda kommateckenavgränsare att ange flera mottagare. -TagCheckMail=Track mail opening -TagUnsubscribe=Unsubscribe link -TagSignature=Signature sending user -TagMailtoEmail=Recipient EMail +TagCheckMail=Spår post öppning +TagUnsubscribe=Avanmälan länk +TagSignature=Signatur sändande användarens +TagMailtoEmail=Mottagarens EMail # Module Notifications Notifications=Anmälningar NoNotificationsWillBeSent=Inga e-postmeddelanden planeras för detta evenemang och företag ANotificationsWillBeSent=En anmälan kommer att skickas via e-post SomeNotificationsWillBeSent=%s anmälningar kommer att skickas via e-post -AddNewNotification=Activate a new email notification target -ListOfActiveNotifications=List all active email notification targets +AddNewNotification=Aktivera ett nytt mål e-postmeddelande +ListOfActiveNotifications=Lista alla aktiva mål för e-postmeddelanden ListOfNotificationsDone=Lista alla e-postmeddelanden skickas -MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. -MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. -MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. +MailSendSetupIs=Konfiguration av e-post att skicka har ställts in till "% s". Detta läge kan inte användas för att skicka massutskick. +MailSendSetupIs2=Du måste först gå, med ett administratörskonto, i meny% Shome - Setup - e-post% s för att ändra parameter '% s' för att använda läget "% s". Med det här läget kan du ange inställningar för SMTP-servern från din internetleverantör och använda Mass mejla funktionen. +MailSendSetupIs3=Om du har några frågor om hur man ställer in din SMTP-server, kan du be att% s. diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang index a14984c379e..facd4e8651d 100644 --- a/htdocs/langs/sv_SE/main.lang +++ b/htdocs/langs/sv_SE/main.lang @@ -290,8 +290,8 @@ UnitPrice=Pris per enhet UnitPriceHT=Pris per enhet (netto) UnitPriceTTC=Pris per enhet PriceU=Styckpris -PriceUHT=Styckpris (netto) -PriceUTTC=Styckpris +PriceUHT=St.pris(net) +PriceUTTC=St.pris Amount=Belopp AmountInvoice=Fakturabelopp AmountPayment=Betalningsbelopp @@ -367,7 +367,7 @@ ActionsOnCompany=Åtgärder om denna tredje part ActionsOnMember=Händelser om denna medlem NActions=%s åtgärder NActionsLate=%s sent -RequestAlreadyDone=Request already recorded +RequestAlreadyDone=Begär redan registrerats Filter=Filter RemoveFilter=Ta bort filtret ChartGenerated=Diagram genererat diff --git a/htdocs/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang index 2579ca249f1..82c57619fd6 100644 --- a/htdocs/langs/sv_SE/margins.lang +++ b/htdocs/langs/sv_SE/margins.lang @@ -8,7 +8,7 @@ MarginOnServices=Marginal / Tjänster MarginRate=Marginalsats MarkRate=Markera sats DisplayMarginRates=Visa marginalsatser -DisplayMarkRates=Display mark rates +DisplayMarkRates=Display markera hastigheter InputPrice=Inpris margin=Hantering av vinstmarginaler margesSetup=Inställningar för vinstmarginalhantering @@ -23,22 +23,22 @@ StartDate=Startdatum EndDate=Slutdatum Launch=Start ForceBuyingPriceIfNull=Tvinga inköpspris om tom -ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) +ForceBuyingPriceIfNullDetails=Om "ON", kommer marginalen att vara noll på linjen (köp pris = försäljningspris), annars ("OFF"), marge kommer vara lika med försäljningspris (köp pris = 0) MARGIN_METHODE_FOR_DISCOUNT=Marginalmetod för globala rabatter UseDiscountAsProduct=Som produkt UseDiscountAsService=Som tjänst UseDiscountOnTotal=På delsumma -MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definierar om en global rabatt behandlas som en produkt, en tjänst, eller bara på delsumman för beräkning marginal. MARGIN_TYPE=Typ av marginal MargeBrute=Bruttomarginal MargeNette=Nettomarginal MARGIN_TYPE_DETAILS=Bruttomarginal: Säljpris - Inköpspris
Nettomarginal: Säljpris - Kostnadspris CostPrice=Kostnadspris BuyingCost=Kostnadspris -UnitCharges=Unit charges -Charges=Charges -AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative -rateMustBeNumeric=Rate must be a numeric value -markRateShouldBeLesserThan100=Mark rate should be lower than 100 -ShowMarginInfos=Show margin infos +UnitCharges=Enhetsladdningar +Charges=Avgifter +AgentContactType=Handelsagent kontakttyp +AgentContactTypeDetails=Definiera vad kontakttyp (länkad på fakturor) kommer att användas för marginalrapport per försäljning representant +rateMustBeNumeric=Betyg måste vara ett numeriskt värde +markRateShouldBeLesserThan100=Mark takt bör vara lägre än 100 +ShowMarginInfos=Visa marginal information diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang index 6110d5aa422..1fcf12f9f2b 100644 --- a/htdocs/langs/sv_SE/members.lang +++ b/htdocs/langs/sv_SE/members.lang @@ -203,3 +203,4 @@ MembersByNature=Medlemmar på sort VATToUseForSubscriptions=Moms-sats för prenumeration NoVatOnSubscription=Ingen moms för prenumeration MEMBER_PAYONLINE_SENDEMAIL=E-post för att varna när Dolibarr mottager en bekräftelse för en validerad betalning för en prenumeration +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/sv_SE/opensurvey.lang b/htdocs/langs/sv_SE/opensurvey.lang index c5403b5cff7..97ea739efce 100644 --- a/htdocs/langs/sv_SE/opensurvey.lang +++ b/htdocs/langs/sv_SE/opensurvey.lang @@ -5,27 +5,27 @@ OrganizeYourMeetingEasily=Organisera dina möten och enkäter lätt. Först väl NewSurvey=Ny enkät NoSurveysInDatabase=%s enkät (er) i databasen. OpenSurveyArea=Enkät område -AddACommentForPoll=You can add a comment into poll... +AddACommentForPoll=Du kan lägga till en kommentar till enkät ... AddComment=Lägg till kommentar CreatePoll=Skapa enkät PollTitle=Enkät titel -ToReceiveEMailForEachVote=Receive an email for each vote +ToReceiveEMailForEachVote=Få ett mail för varje omröstning TypeDate=Typ Datum TypeClassic=Typ standard -OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it +OpenSurveyStep2=Välj datum amoung de fria dagarna (grå). De utvalda dagar är gröna. Du kan avmarkera en dag tidigare valts genom att klicka igen på det RemoveAllDays=Ta bort alla dagar CopyHoursOfFirstDay=Kopiera timmar av första dagen -RemoveAllHours=Remove all hours -SelectedDays=Selected days -TheBestChoice=The best choice currently is -TheBestChoices=The best choices currently are +RemoveAllHours=Ta bort alla timmar +SelectedDays=Valda dagar +TheBestChoice=Det bästa valet för närvarande är +TheBestChoices=De bästa valen för närvarande with=med -OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. -CommentsOfVoters=Comments of voters -ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes) +OpenSurveyHowTo=Om du går med på att rösta i den här omröstningen, måste du ge ditt namn väljer de värden som passar bäst för dig och bekräfta med plusknappen i slutet av raden. +CommentsOfVoters=Kommentarer väljare +ConfirmRemovalOfPoll=Är du säker på att du vill ta bort den här omröstningen (och alla röster) RemovePoll=Radera enkäten -UrlForSurvey=URL to communicate to get a direct access to poll -PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: +UrlForSurvey=URL för att kommunicera för att få direkt tillgång till poll +PollOnChoice=Du skapar en omröstning för att göra en multi-val för en omröstning. Först in alla möjliga val för din enkät: CreateSurveyDate=Skapa en datum enkät CreateSurveyStandard=Skapa en vanlig enkät CheckBox=Enkel checkbox @@ -33,34 +33,34 @@ YesNoList=List (tom/ja/nej) PourContreList=Lista (tom/för/emot) AddNewColumn=Lägg till ny kolumn TitleChoice=Val av etikett -ExportSpreadsheet=Export result spreadsheet +ExportSpreadsheet=Export resultat kalkylblad ExpireDate=Begränsa datum NbOfSurveys=Antal enkäter NbOfVoters=Antal av väljarna SurveyResults=Resultat -PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. -5MoreChoices=5 more choices -Abstention=Abstention +PollAdminDesc=Det är tillåtet att ändra alla tycker linjer här omröstningen med knappen "Edit". Du kan, liksom, ta bort en kolumn eller en rad med% s. Du kan också lägga till en ny kolumn med% s. +5MoreChoices=5 fler alternativ +Abstention=Avhållsamhet Against=Mot -YouAreInivitedToVote=You are invited to vote for this poll -VoteNameAlreadyExists=This name was already used for this poll -ErrorPollDoesNotExists=Error, poll %s does not exists. +YouAreInivitedToVote=Du är inbjuden att rösta på den här omröstningen +VoteNameAlreadyExists=Detta namn används redan för den här omröstningen +ErrorPollDoesNotExists=Fel, inte enkät% s inte existerar. OpenSurveyNothingToSetup=Det finns ingen specifik inställning att göra. -PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. +PollWillExpire=Din enkät förfaller automatiskt% s dagar efter den sista dagen för din enkät. AddADate=Lägg till ett datum AddStartHour=Lägg till start tid AddEndHour=Lägg till slut tid votes=röst (er) -NoCommentYet=No comments have been posted for this poll yet -CanEditVotes=Can change vote of others -CanComment=Voters can comment in the poll -CanSeeOthersVote=Voters can see other people's vote -SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. -BackToCurrentMonth=Back to current month -ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation +NoCommentYet=Inga kommentarer har lagts till den här omröstningen ännu +CanEditVotes=Kan ändra röst andras +CanComment=Väljarna kan kommentera i omröstningen +CanSeeOthersVote=Väljarna kan se andra människors röst +SelectDayDesc=För varje vald dag kan du välja, eller inte, mötes timmar i följande format:
- Tom,
- "8h", "8H" eller "08:00" för att ge ett möte start timme,
- "8-11", "8h-11h", "8H-11H" eller "8: 00-11: 00" för att ge en mötets början och slut timme,
- "8h15-11h15", "8H15-11H15" eller "8: 15-11: 15" för samma sak men med några minuter. +BackToCurrentMonth=Tillbaka till aktuella månaden +ErrorOpenSurveyFillFirstSection=Du har inte fyllt den första sektionen av röstningen skapande ErrorOpenSurveyOneChoice=Ange minst ett val ErrorOpenSurveyDateFormat=Datum måste ha formatet ÅÅÅÅ-MM-DD ErrorInsertingComment=Det uppstod ett fel när du skapa din kommentar -MoreChoices=Enter more choices for the voters -SurveyExpiredInfo=The voting time of this poll has expired. -EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s +MoreChoices=Ange fler alternativ för väljarna +SurveyExpiredInfo=Den omröstningen i denna enkät har gått ut. +EmailSomeoneVoted=% S har fyllt en rad. Du kan hitta din enkät på länken:% s diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang index 43df2e39b0b..ad1112357ea 100644 --- a/htdocs/langs/sv_SE/orders.lang +++ b/htdocs/langs/sv_SE/orders.lang @@ -53,7 +53,7 @@ ShippingExist=En sändning föreligger DraftOrWaitingApproved=Förslag eller godkänts ännu ej beställas DraftOrWaitingShipped=Förslag eller godkännas ännu inte sändas MenuOrdersToBill=Order till faktura -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Fakturerbara order SearchOrder=Sök ordning SearchACustomerOrder=Sök en kundorder ShipProduct=Ship produkt diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang index ab030a8c9ac..326d05f3b36 100644 --- a/htdocs/langs/sv_SE/other.lang +++ b/htdocs/langs/sv_SE/other.lang @@ -5,7 +5,7 @@ Tools=Verktyg ToolsDesc=Detta område är avsedd för gruppen diverse verktyg som inte finns i andra menyposter.

Dessa verktyg kan nås från menyn på sidan. Birthday=Födelsedag BirthdayDate=Födelsedag -DateToBirth=Datum för födelse +DateToBirth=Födelsedatum BirthdayAlertOn= födelsedag alert aktiva BirthdayAlertOff= födelsedag alert inaktiv Notify_FICHINTER_VALIDATE=Intervention validerade @@ -55,11 +55,11 @@ AttachANewFile=Bifoga en ny fil / dokument LinkedObject=Länkat objekt Miscellaneous=Diverse NbOfActiveNotifications=Antal anmälningar -PredefinedMailTest=Detta är en test post. \\ NDet två linjerna är åtskilda av en vagnretur. +PredefinedMailTest=Detta är en test post. \nDet två linjerna är åtskilda av en vagnretur.\n\n__SIGNATURE__ PredefinedMailTestHtml=Detta är en test post (ordet Provningen skall i fetstil).
De två linjerna är åtskilda av en vagnretur. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Vi vill varna er att fakturan __FACREF__ tycks inte betalt. Så detta är fakturan i bilagan igen, som en påminnelse. __PERSONALIZED__Sincerely __SIGNATURE__ -PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Här hittar du det kommersiella förslaget __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \nHär hittar du det kommersiella förslaget __PROPREF__\n__PERSONALIZED__mvh\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Här hittar ordern __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Här hittar du vår ordning __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ @@ -203,26 +203,26 @@ ForgetIfNothing=Om du inte har begärt denna förändring, bara glömma detta ma ##### Calendar common ##### AddCalendarEntry=Lägg till post i kalendern %s -NewCompanyToDolibarr=Company %s added -ContractValidatedInDolibarr=Contract %s validated -ContractCanceledInDolibarr=Contract %s canceled -ContractClosedInDolibarr=Contract %s closed -PropalClosedSignedInDolibarr=Proposal %s signed -PropalClosedRefusedInDolibarr=Proposal %s refused -PropalValidatedInDolibarr=Proposal %s validated -PropalClassifiedBilledInDolibarr=Proposal %s classified billed -InvoiceValidatedInDolibarr=Invoice %s validated -InvoicePaidInDolibarr=Invoice %s changed to paid -InvoiceCanceledInDolibarr=Invoice %s canceled -PaymentDoneInDolibarr=Payment %s done -CustomerPaymentDoneInDolibarr=Customer payment %s done -SupplierPaymentDoneInDolibarr=Supplier payment %s done -MemberValidatedInDolibarr=Member %s validated -MemberResiliatedInDolibarr=Member %s resiliated -MemberDeletedInDolibarr=Member %s deleted -MemberSubscriptionAddedInDolibarr=Subscription for member %s added -ShipmentValidatedInDolibarr=Shipment %s validated -ShipmentDeletedInDolibarr=Shipment %s deleted +NewCompanyToDolibarr=Företag %s tillsatt +ContractValidatedInDolibarr=Kontrakt %s validerade +ContractCanceledInDolibarr=Kontrakt %s annulleras +ContractClosedInDolibarr=Kontrakt %s stängd +PropalClosedSignedInDolibarr=Förslag %s undertecknade +PropalClosedRefusedInDolibarr=Förslag %s vägrade +PropalValidatedInDolibarr=Förslag %s validerade +PropalClassifiedBilledInDolibarr=Förslag %s klassificerad faktureras +InvoiceValidatedInDolibarr=Faktura %s validerade +InvoicePaidInDolibarr=Faktura %s ändrades till betald +InvoiceCanceledInDolibarr=Faktura %s annulleras +PaymentDoneInDolibarr=Betalning %s klar +CustomerPaymentDoneInDolibarr=Kundbetalning %s klar +SupplierPaymentDoneInDolibarr=Leverantör betalning %s klar +MemberValidatedInDolibarr=Medlem %s validerade +MemberResiliatedInDolibarr=Medlem %s resiliated +MemberDeletedInDolibarr=Medlem %s raderad +MemberSubscriptionAddedInDolibarr=Teckning av medlem %s tillades +ShipmentValidatedInDolibarr=Frakten %s validerad +ShipmentDeletedInDolibarr=Frakten %s raderad ##### Export ##### Export=Exportera ExportsArea=Export område diff --git a/htdocs/langs/sv_SE/paybox.lang b/htdocs/langs/sv_SE/paybox.lang index af4eacf9828..bbef3fa717e 100644 --- a/htdocs/langs/sv_SE/paybox.lang +++ b/htdocs/langs/sv_SE/paybox.lang @@ -32,9 +32,9 @@ VendorName=Namn på leverantör CSSUrlForPaymentForm=CSS-formatmall URL för inbetalningskort MessageOK=Meddelande på validerade betalning återvänder sida MessageKO=Meddelande om avbokning betalning återvänder sida -NewPayboxPaymentReceived=New Paybox payment received -NewPayboxPaymentFailed=New Paybox payment tried but failed -PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) -PAYBOX_PBX_SITE=Value for PBX SITE -PAYBOX_PBX_RANG=Value for PBX Rang -PAYBOX_PBX_IDENTIFIANT=Value for PBX ID +NewPayboxPaymentReceived=Ny Paybox betalning mottagen +NewPayboxPaymentFailed=Ny Paybox betalnings försök men misslyckats +PAYBOX_PAYONLINE_SENDEMAIL=EMail varnar efter en betalning (lyckade eller misslyckade) +PAYBOX_PBX_SITE=Värde för PBX SITE +PAYBOX_PBX_RANG=Värde för PBX Rang +PAYBOX_PBX_IDENTIFIANT=Värde för PBX-ID diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang index d0d98e3e1f9..d9456de8b17 100644 --- a/htdocs/langs/sv_SE/products.lang +++ b/htdocs/langs/sv_SE/products.lang @@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Produkter och tjänster statistik ProductsStatistics=Produkter statistik ProductsOnSell=Tillgängliga produkter ProductsNotOnSell=Föråldrade produkter -ProductsOnSellAndOnBuy=Products not for sale nor purchase +ProductsOnSellAndOnBuy=Produkter inte till salu eller köp ServicesOnSell=Tillgängliga tjänster ServicesNotOnSell=Föråldrade tjänster -ServicesOnSellAndOnBuy=Services not for sale nor purchase +ServicesOnSellAndOnBuy=Tjänster som inte till salu eller köp InternalRef=Intern hänvisning LastRecorded=Senaste produkter / tjänster att sälja in LastRecordedProductsAndServices=Senaste %s inspelade produkter / tjänster @@ -72,20 +72,20 @@ PublicPrice=Offentliga pris CurrentPrice=Nuvarande pris NewPrice=Nytt pris MinPrice=Halvnot. försäljningspris -MinPriceHT=Minim. selling price (net of tax) -MinPriceTTC=Minim. selling price (inc. tax) +MinPriceHT=Minim. försäljningspris (netto efter skatt) +MinPriceTTC=Minim. försäljningspris (inkl. moms) CantBeLessThanMinPrice=Försäljningspriset kan inte vara lägre än lägsta tillåtna för denna bok (%s utan skatt) ContractStatus=Kontrakt status ContractStatusClosed=Stängt ContractStatusRunning=Running ContractStatusExpired=löpt ut ContractStatusOnHold=Inte kör -ContractStatusToRun=To get running +ContractStatusToRun=För att få igång ContractNotRunning=Detta kontrakt är inte igång ErrorProductAlreadyExists=En produkt med hänvisning %s finns redan. ErrorProductBadRefOrLabel=Felaktigt värde för referens eller etikett. ErrorProductClone=Ett problem uppstod vid kloning av produkten eller tjänsten. -ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +ErrorPriceCantBeLowerThanMinPrice=Fel Pris Kan inte vara lägre än Lägsta pris. Suppliers=Leverantörer SupplierRef=Leverantör ref. ShowProduct=Visa produkt @@ -117,12 +117,12 @@ ServiceLimitedDuration=Om produkten är en tjänst med begränsad varaktighet: MultiPricesAbility=Flera prisnivåer per produkt eller tjänst MultiPricesNumPrices=Antal pris MultiPriceLevelsName=Pris kategorier -AssociatedProductsAbility=Aktivera biprodukter -AssociatedProducts=Biprodukter -AssociatedProductsNumber=Antal produkter komponera denna produkt -ParentProductsNumber=Antal förälder produkt -IfZeroItIsNotAVirtualProduct=Om 0 är denna produkt inte en virtuell produkt -IfZeroItIsNotUsedByVirtualProduct=Om 0 är denna produkt inte använd i någon virtuell produkt +AssociatedProductsAbility=Aktivera virtuellt paket funktionen +AssociatedProducts=Paket produkt +AssociatedProductsNumber=Antal produkter komponera denna virtuellt paket produkt +ParentProductsNumber=Antal förälder förpackningsartikel +IfZeroItIsNotAVirtualProduct=Om 0 är denna produkt inte ett virtuellt paket produkt +IfZeroItIsNotUsedByVirtualProduct=Om 0 är denna produkt inte används av någon virtuellt paket produkt EditAssociate=Associate Translation=Översättning KeywordFilter=Nyckelord filter @@ -132,7 +132,7 @@ AddDel=Lägg till / Ta bort Quantity=Kvantitet NoMatchFound=Ingen matchning hittades ProductAssociationList=Lista över relaterade produkter / tjänster: namn på produkten / tjänsten (kvantitet påverkas) -ProductParentList=Förteckning över produkter och tjänster med denna produkt som en komponent +ProductParentList=Lista över paket produkter / tjänster med denna produkt som en komponent ErrorAssociationIsFatherOfThis=Ett av valda produkten är förälder med nuvarande produkt DeleteProduct=Ta bort en produkt / tjänst ConfirmDeleteProduct=Är du säker på att du vill ta bort denna produkt / tjänst? @@ -179,12 +179,12 @@ CloneProduct=Klon produkt eller tjänst ConfirmCloneProduct=Är du säker på att du vill klona produkt eller tjänst %s? CloneContentProduct=Klona alla viktiga informationer av produkt / tjänst ClonePricesProduct=Klona viktigaste informationer och priser -CloneCompositionProduct=Klona virtuell produkt / tjänst +CloneCompositionProduct=Klon förpackad produkt / tjänster ProductIsUsed=Denna produkt används NewRefForClone=Ref. av ny produkt / tjänst CustomerPrices=Kunder priser SuppliersPrices=Leverantörer priser -SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) +SuppliersPricesOfProductsOrServices=Leverantörer priser (av produkter eller tjänster) CustomCode=Tullkodex CountryOrigin=Ursprungsland HiddenIntoCombo=Dold i vissa utvalda listor @@ -209,14 +209,14 @@ Build=Tillverka BuildIt=Tillverka och sänd BuildindListInfo=Tillgänglig mängd för tillverkning per lager (ställ till 0 för ingen åtgärd) QtyNeed=Antal -UnitPmp=Net unit VWAP -CostPmpHT=Net total VWAP +UnitPmp=Netto enhet VWAP +CostPmpHT=Totalt netto VWAP ProductUsedForBuild=Automatiskt förbrukad för tillverkning ProductBuilded=Tillverkning klar ProductsMultiPrice=Produkt multi-priser -ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) -ProductSellByQuarterHT=Products turnover quarterly VWAP -ServiceSellByQuarterHT=Services turnover quarterly VWAP +ProductsOrServiceMultiPrice=Kunder priser (av produkter eller tjänster, multi-priser) +ProductSellByQuarterHT=Produkter omsättning kvartalsvis VWAP +ServiceSellByQuarterHT=Tjänster omsättning kvartalsvis VWAP Quarter1=1:a kvartalet Quarter2=2:a kvartalet Quarter3=3:e kvartalet @@ -240,5 +240,10 @@ PricingRule=Prisregler AddCustomerPrice=Lägg till pris per kund ForceUpdateChildPriceSoc=Sätt samma pris på kunds filialer PriceByCustomerLog=Pris per kundlogg -MinimumPriceLimit=Minimum price can't be lower that %s -MinimumRecommendedPrice=Minimum recommended price is : %s +MinimumPriceLimit=Minimipris kan inte vara lägre än %s +MinimumRecommendedPrice=Minsta rekommenderade priset är : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang index d5d0379b62f..b771cfecc0b 100644 --- a/htdocs/langs/sv_SE/projects.lang +++ b/htdocs/langs/sv_SE/projects.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - projects -RefProject=Ref. project -ProjectId=Project Id +RefProject=Ref. projekt +ProjectId=Projekt Id Project=Projekt Projects=Projekt SharedProject=Alla @@ -14,7 +14,7 @@ TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din använda Myprojects=Mina projekt ProjectsArea=Projekt område NewProject=Nytt projekt -AddProject=Lägg till projektet +AddProject=Skapa projekt DeleteAProject=Ta bort ett projekt DeleteATask=Ta bort en uppgift ConfirmDeleteAProject=Är du säker på att du vill ta bort detta projekt? @@ -32,20 +32,22 @@ TimeSpent=Tid som tillbringas TimesSpent=Tid RefTask=Ref. uppgift LabelTask=Label uppgift -TaskTimeSpent=Time spent on tasks -TaskTimeUser=User -TaskTimeNote=Note -TaskTimeDate=Date +TaskTimeSpent=Tid som ägnas åt uppgifter +TaskTimeUser=Användare +TaskTimeNote=Anmärkning +TaskTimeDate=Datum +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Ny tid MyTimeSpent=Min tid MyTasks=Mina uppgifter Tasks=Uppgifter Task=Uppgift -TaskDateStart=Task start date -TaskDateEnd=Task end date -TaskDescription=Task description +TaskDateStart=Uppgift startdatum +TaskDateEnd=Uppgift slutdatum +TaskDescription=Uppgiftsbeskrivning NewTask=Ny uppgift -AddTask=Lägg till uppgift +AddTask=Skapa uppgift AddDuration=Lägg varaktighet Activity=Aktivitet Activities=Uppgifter / aktiviteter @@ -54,8 +56,8 @@ MyActivities=Mina uppgifter / aktiviteter MyProjects=Mina projekt DurationEffective=Effektiv längd Progress=Framsteg -ProgressDeclared=Declared progress -ProgressCalculated=Calculated progress +ProgressDeclared=Förklarades framsteg +ProgressCalculated=Beräknat framsteg Time=Tid ListProposalsAssociatedProject=Förteckning över de kommersiella förslag i samband med projektet ListOrdersAssociatedProject=Förteckning över kundens order i samband med projektet @@ -85,48 +87,48 @@ ActionsOnProject=Åtgärder för projektet YouAreNotContactOfProject=Du är inte en kontakt på denna privata projekt DeleteATimeSpent=Ta bort tid ConfirmDeleteATimeSpent=Är du säker på att du vill ta bort denna tid? -DoNotShowMyTasksOnly=See also tasks not assigned to me -ShowMyTasksOnly=View only tasks assigned to me +DoNotShowMyTasksOnly=Se även uppgifter som inte tilldelats mig +ShowMyTasksOnly=Visa bara aktiviteter för mig TaskRessourceLinks=Resurser ProjectsDedicatedToThisThirdParty=Projekt som arbetat med denna tredje part NoTasks=Inga uppgifter för detta projekt LinkedToAnotherCompany=Kopplat till annan tredje part -TaskIsNotAffectedToYou=Task not assigned to you +TaskIsNotAffectedToYou=Uppgift inte tilldelats dig ErrorTimeSpentIsEmpty=Tid är tom ThisWillAlsoRemoveTasks=Denna åtgärd kommer också att ta bort alla aktiviteter av projekt (%s uppgifter på för tillfället) och alla ingångar för nedlagd tid. IfNeedToUseOhterObjectKeepEmpty=Om vissa objekt (faktura, order, ...), som tillhör en annan tredje part, måste kopplas till projektet för att skapa, hålla denna tomt för att få projektet att flera tredje part. -CloneProject=Clone project -CloneTasks=Clone tasks -CloneContacts=Clone contacts -CloneNotes=Clone notes -CloneProjectFiles=Clone project joined files -CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) -ConfirmCloneProject=Are you sure to clone this project ? -ProjectReportDate=Change task date according project start date -ErrorShiftTaskDate=Impossible to shift task date according to new project start date -ProjectsAndTasksLines=Projects and tasks -ProjectCreatedInDolibarr=Project %s created -TaskCreatedInDolibarr=Task %s created -TaskModifiedInDolibarr=Task %s modified -TaskDeletedInDolibarr=Task %s deleted +CloneProject=Klon projekt +CloneTasks=Klon uppgifter +CloneContacts=Klon kontakter +CloneNotes=Klon anteckningar +CloneProjectFiles=Klon projekt fogade filer +CloneTaskFiles=Klon uppgift(er) anslöt filer (om uppgiften(s) klonad) +ConfirmCloneProject=Är du säker på att klona detta projekt? +ProjectReportDate=Ändra uppgift datum enligt projektets startdatum +ErrorShiftTaskDate=Omöjligt att flytta datum på uppgiften enligt nytt projekt startdatum +ProjectsAndTasksLines=Projekt och uppdrag +ProjectCreatedInDolibarr=Projekt %s skapad +TaskCreatedInDolibarr=Uppgift %s skapad +TaskModifiedInDolibarr=Uppgift %s modifierade +TaskDeletedInDolibarr=Uppgift %s raderad ##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Projektledare TypeContact_project_external_PROJECTLEADER=Projektledare -TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor -TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_internal_PROJECTCONTRIBUTOR=Bidragsgivare +TypeContact_project_external_PROJECTCONTRIBUTOR=Bidragsgivare TypeContact_project_task_internal_TASKEXECUTIVE=Uppgift verkställande TypeContact_project_task_external_TASKEXECUTIVE=Uppgift verkställande -TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor -TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor -SelectElement=Select element -AddElement=Link to element -UnlinkElement=Unlink element +TypeContact_project_task_internal_TASKCONTRIBUTOR=Bidragsgivare +TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragsgivare +SelectElement=Välj elementet +AddElement=Länk till inslag +UnlinkElement=Ta bort länk elementet # Documents models DocumentModelBaleine=En fullständig projektets rapport modellen (logo. ..) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation -ProjectReferers=Refering objects -SearchAProject=Search a project -ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Draft projects -FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +PlannedWorkload = Planerad arbetsbelastning +WorkloadOccupation= Arbetsbelastning affektation +ProjectReferers=Med hänvisning objekt +SearchAProject=Sök ett projekt +ProjectMustBeValidatedFirst=Projekt måste valideras först +ProjectDraft=Utkast projekt +FirstAddRessourceToAllocateTime=Associera en resurse att avsätta tid diff --git a/htdocs/langs/sv_SE/resource.lang b/htdocs/langs/sv_SE/resource.lang index d64075dfbf5..38588c87528 100644 --- a/htdocs/langs/sv_SE/resource.lang +++ b/htdocs/langs/sv_SE/resource.lang @@ -1,36 +1,34 @@ -MenuResourceIndex=Resources -MenuResourceAdd=New resource -MenuResourcePlanning=Resource planning -DeleteResource=Delete resource -ConfirmDeleteResourceElement=Confirm delete the resource for this element -NoResourceInDatabase=No resource in database. -NoResourceLinked=No resource linked +MenuResourceIndex=Resurser +MenuResourceAdd=Ny resurs +MenuResourcePlanning=Resursplanering +DeleteResource=Radera resurs +ConfirmDeleteResourceElement=Bekräfta radera resurs för detta element +NoResourceInDatabase=Ingen resurs i databasen. +NoResourceLinked=Ingen resurs kopplad -ResourcePageIndex=Resources list -ResourceSingular=Resource -ResourceCard=Resource card -AddResource=Create a resource -ResourceFormLabel_ref=Resource name -ResourceType=Resource type -ResourceFormLabel_description=Resource description +ResourcePageIndex=Listan över resurser +ResourceSingular=Resurs +ResourceCard=Resurs kort +AddResource=Skapa en resurs +ResourceFormLabel_ref=Resursnamn +ResourceType=Resurs typ +ResourceFormLabel_description=Resursbeskrivning -ResourcesLinkedToElement=Resources linked to element +ResourcesLinkedToElement=Resurser kopplade till elementet -ShowResourcePlanning=Show resource planning -GotoDate=Go to date +ShowResourcePlanning=Visa resursplanering +GotoDate=Gå till datum -ResourceElementPage=Element resources -ResourceCreatedWithSuccess=Resource successfully created -RessourceLineSuccessfullyDeleted=Resource line successfully deleted -RessourceLineSuccessfullyUpdated=Resource line successfully updated -ResourceLinkedWithSuccess=Resource linked with success +ResourceElementPage=Element resurser +ResourceCreatedWithSuccess=Resursen har skapats +RessourceLineSuccessfullyDeleted=Resurslinje har tagits bort +RessourceLineSuccessfullyUpdated=Resurs linje har uppdaterats +ResourceLinkedWithSuccess=Resurs kopplat med framgång -TitleResourceCard=Resource card -ConfirmDeleteResource=Confirm to delete this resource -RessourceSuccessfullyDeleted=Resource successfully deleted -DictionaryResourceType=Type of resources +TitleResourceCard=Resurs kort +ConfirmDeleteResource=Bekräfta radera denna resurs +RessourceSuccessfullyDeleted=Resurs tagits bort +DictionaryResourceType=Typ av resurser -DictionaryEMailTemplates=Modèles d'Emails - -SelectResource=Select resource +SelectResource=Välj resurs diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang index 79bd2f814a7..5c4e735ad88 100644 --- a/htdocs/langs/sv_SE/sendings.lang +++ b/htdocs/langs/sv_SE/sendings.lang @@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=För närvarande är skapandet av en ny leverans RelatedShippings=Relaterade sändningar ShipmentLine=Transport linje CarrierList=Lista över transportörer -SendingRunning=Product from customer order already sent -SuppliersReceiptRunning=Product from supplier order already received +SendingRunning=Produkten från kundorder redan skickad +SuppliersReceiptRunning=Produkten från leverantörs beställning redan mottaget # Sending methods SendingMethodCATCH=Fångst av kunden diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang index 33a5ae1a790..947f99a1ccd 100644 --- a/htdocs/langs/sv_SE/stocks.lang +++ b/htdocs/langs/sv_SE/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Lagrets etikett krävs CorrectStock=Rätt lager ListOfWarehouses=Lista över lager ListOfStockMovements=Lista över lagerförändringar -StocksArea=Warehouses area +StocksArea=Lager område Location=Plats LocationSummary=Kortnamn plats NumberOfDifferentProducts=Antal olika produkter @@ -94,13 +94,13 @@ DesiredStock=Önskat lager StockToBuy=Att beställa Replenishment=Påfyllning ReplenishmentOrders=Påfyllningsbeställningar -VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs -UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature +VirtualDiffersFromPhysical=Enligt öka / minska aktieoptioner, fysiska lagret och virtuella lager (fysiska + aktuella beställningar) kan skilja +UseVirtualStockByDefault=Använd virtuellt lager som standard, i stället för fysiska lager, för påfyllning funktion UseVirtualStock=Använd virtuellt lager -UsePhysicalStock=Use physical stock -CurentSelectionMode=Curent selection mode +UsePhysicalStock=Använd fysiskt lager +CurentSelectionMode=Curent urvalsläget CurentlyUsingVirtualStock=Virtuell lager -CurentlyUsingPhysicalStock=Physical stock +CurentlyUsingPhysicalStock=Fysiskt lager RuleForStockReplenishment=Regel för påfyllning av lager SelectProductWithNotNullQty=Välj minst en produkt med antal skilt från noll samt leverantör AlertOnly= Endast larm @@ -113,13 +113,13 @@ Replenishments=Påfyllningar NbOfProductBeforePeriod=Antal av produkt %s i lager före vald period (< %s) NbOfProductAfterPeriod=Antal av produkt %s i lager efter vald period (> %s) MassMovement=Massrörelse -MassStockMovement=Mass stock movement +MassStockMovement=Mass lager rörelse SelectProductInAndOutWareHouse=Välj produkt, antal, ursprungslager och mållager och klicka "%s". När det är gjort för alla lageröverföringar klicka på "%s". RecordMovement=Spela in överföring ReceivingForSameOrder=Godsmottagning för denna order StockMovementRecorded=Sparade lageröverföringar -RuleForStockAvailability=Rules on stock requirements -StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice -StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order -StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment +RuleForStockAvailability=Regler om krav på lagerhållning +StockMustBeEnoughForInvoice=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i faktura +StockMustBeEnoughForOrder=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i beställning +StockMustBeEnoughForShipment= Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i transporten diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang index 1d0aac29844..712bdc678b6 100644 --- a/htdocs/langs/sv_SE/suppliers.lang +++ b/htdocs/langs/sv_SE/suppliers.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Leverantörer Supplier=Leverantör -AddSupplier=Lägg till en leverantör +AddSupplier=Skapa en leverantör SupplierRemoved=Leverantör bort SuppliersInvoice=Leverantörer faktura NewSupplier=Ny leverantör @@ -12,8 +12,8 @@ OrderDate=Beställ datum BuyingPrice=BETALKURS BuyingPriceMin=Lägsta köpkurs BuyingPriceMinShort=Min köpkurs -TotalBuyingPriceMin=Total of subproducts buying prices -SomeSubProductHaveNoPrices=Some sub-products have no price defined +TotalBuyingPriceMin=Totalt subprodukter köper priserna +SomeSubProductHaveNoPrices=Vissa under produkter har inget pris definierat AddSupplierPrice=Lägg leverantör pris ChangeSupplierPrice=Byta leverantör pris ErrorQtyTooLowForThisSupplier=Kvantitet för låg för denna leverantör eller något pris som anges på denna produkt för denna leverantör @@ -27,7 +27,7 @@ RefSupplierShort=Ref. leverantör Availability=Tillgänglighet ExportDataset_fournisseur_1=Leverantörsfakturor listan och fakturornas linjer ExportDataset_fournisseur_2=Leverantörsfakturor och betalningar -ExportDataset_fournisseur_3=Supplier orders and order lines +ExportDataset_fournisseur_3=Leverantörs order och orderrader ApproveThisOrder=Godkänna denna ordning ConfirmApproveThisOrder=Är du säker på att du vill godkänna att %s? DenyingThisOrder=Att förneka denna beställning @@ -39,6 +39,6 @@ AddSupplierOrder=Skapa leverantör för AddSupplierInvoice=Skapa leverantörsfaktura ListOfSupplierProductForSupplier=Förteckning över produkter och priser för leverantör %s NoneOrBatchFileNeverRan=Ingen eller parti %s sprang inte nyligen -SentToSuppliers=Sent to suppliers -ListOfSupplierOrders=List of supplier orders -MenuOrdersSupplierToBill=Supplier orders to invoice +SentToSuppliers=Skickas till leverantörer +ListOfSupplierOrders=Lista över leverantörsorder +MenuOrdersSupplierToBill=Leverantörs order att fakturera diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang index 638626eeab7..888f20ddd2d 100644 --- a/htdocs/langs/sv_SE/trips.lang +++ b/htdocs/langs/sv_SE/trips.lang @@ -4,7 +4,7 @@ Trips=Resor TripsAndExpenses=Resor och kostnader TripsAndExpensesStatistics=Resor och kostnader statistik TripCard=Trip-kort -AddTrip=Lägg resa +AddTrip=Skapa resa ListOfTrips=Förteckning över resor ListOfFees=Prislista för NewTrip=Ny resa @@ -19,4 +19,4 @@ TF_TRIP=Trip ListTripsAndExpenses=Förteckning över resor och kostnader ExpensesArea=Resor och kostnader område SearchATripAndExpense=Sök en resa och kostnader -ClassifyRefunded=Classify 'Refunded' +ClassifyRefunded=Klassificerad 'Återbetalas' diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang index 0220079b20d..34a10699b5c 100644 --- a/htdocs/langs/sv_SE/users.lang +++ b/htdocs/langs/sv_SE/users.lang @@ -102,7 +102,7 @@ UserDisabled=Användare %s funktionshindrade UserEnabled=Användare %s aktiverad UserDeleted=Användare %s bort NewGroupCreated=Grupp %s skapade -GroupModified=Group %s modified +GroupModified=Grupp% s modifierade GroupDeleted=Grupp %s bort ConfirmCreateContact=Är du säker på att du vill skapa en Dolibarr konto för denna kontakt? ConfirmCreateLogin=Är du säker på att du vill skapa en Dolibarr konto för denna medlem? diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang index 29af1f4babb..49cab6a2f77 100644 --- a/htdocs/langs/sv_SE/withdrawals.lang +++ b/htdocs/langs/sv_SE/withdrawals.lang @@ -14,13 +14,13 @@ WithdrawalReceiptShort=Kvitto LastWithdrawalReceipts=Senaste %s tillbakadragande kvitton WithdrawedBills=Indragna fakturor WithdrawalsLines=Återkallelse linjer -RequestStandingOrderToTreat=Request for standing orders to process -RequestStandingOrderTreated=Request for standing orders processed -NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. +RequestStandingOrderToTreat=Begäran om stående order att bearbeta +RequestStandingOrderTreated=Begäran om stående order bearbetas +NotPossibleForThisStatusOfWithdrawReceiptORLine=Ännu inte möjligt. Uttag status måste vara inställd på "kredit" innan den förklarar förkastar på specifika linjer. CustomersStandingOrders=Kunden stående order CustomerStandingOrder=Kunden stående order -NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request -NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information +NbOfInvoiceToWithdraw=St. av faktura med återkallnings begäran +NbOfInvoiceToWithdrawWithInfo=St. av faktura med återkallande begäran för kunder som har definierat bankkontouppgifter InvoiceWaitingWithdraw=Faktura väntar på återkalla AmountToWithdraw=Belopp att dra tillbaka WithdrawsRefused=Återkallar vägrade @@ -47,7 +47,7 @@ RefusedData=Datum för avslag RefusedReason=Orsak till avslag RefusedInvoicing=Fakturering avslaget NoInvoiceRefused=Ladda inte avslaget -InvoiceRefused=Invoice refused (Charge the rejection to customer) +InvoiceRefused=Faktura vägrade (Ladda avslag till kunden) Status=Status StatusUnknown=Okänd StatusWaiting=Väntar @@ -76,13 +76,14 @@ WithBankUsingRIB=För bankkonton med hjälp av RIB WithBankUsingBANBIC=För bankkonton som använder IBAN / BIC / SWIFT BankToReceiveWithdraw=Bankkonto för att ta emot drar CreditDate=Krediter på -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) +WithdrawalFileNotCapable=Det går inte att skapa uttags kvitto fil för ditt land %s (ditt land stöds inte) ShowWithdraw=Visa Dra IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Om faktura har minst ett uttag betalning som ännu inte behandlats, kommer det inte anges som betalas för att hantera uttag innan. -DoStandingOrdersBeforePayments=Detta flikar gör att du kan begära en stående order. När det kommer att vara färdig, kan du skriva betalningen för att stänga fakturan. -WithdrawalFile=Withdrawal file -SetToStatusSent=Set to status "File Sent" -ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. +WithdrawalFile=Utträde fil +SetToStatusSent=Ställ in på status "File Skickat" +ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att gälla utbetalningar till fakturor och kommer att klassificera dem som "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Betalning av %s stående order av banken @@ -92,5 +93,5 @@ InfoTransMessage=Den stående beställning %s har transmited till bank med %s %s InfoTransData=Belopp: %s
Metode: %s
Datum: %s InfoFoot=Detta är ett automatiskt meddelande skickas av Dolibarr InfoRejectSubject=Stående order vägrade -InfoRejectMessage=Hello,

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

--
%s +InfoRejectMessage=Hej,

den stående beställning av faktura %s relaterad till bolagets %s, med en mängd %s har avslagits av banken.

--
%s ModeWarning=Alternativ på riktigt läget inte var satt, sluta vi efter denna simulering diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang index d56158cf973..dc3223565db 100644 --- a/htdocs/langs/sv_SE/workflow.lang +++ b/htdocs/langs/sv_SE/workflow.lang @@ -6,6 +6,6 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Skapa en kundorder automatiskt efter en kom descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter en kommersiell förslag undertecknas descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter ett avtal validerad descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter en kundorder är stängd -# descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid -# descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid -# descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassificera länkad förslag källa att faktureras när kundorder är inställd på betald +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassificera länkade källa kundorder (s) för att faktureras när kundfaktura är inställd på betald +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassificera länkade källa kundorder (s) för att faktureras när kundfaktura valideras diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index 36d25ed38ed..df4ca8e96de 100644 --- a/htdocs/langs/th_TH/admin.lang +++ b/htdocs/langs/th_TH/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s ViewFullDateActions=Show full dates events in the third sheet @@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Link BoxesAvailable=Boxes available @@ -444,7 +447,7 @@ Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmark management -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales @@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang index 1ed4e637d14..a24c678a2e5 100644 --- a/htdocs/langs/th_TH/agenda.lang +++ b/htdocs/langs/th_TH/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= All my events/tasks AllActions= All events/tasks ViewList=List view diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang index 9fe5eff520d..878eb49b3c9 100644 --- a/htdocs/langs/th_TH/compta.lang +++ b/htdocs/langs/th_TH/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang index 511516dc755..57ba3bb15d8 100644 --- a/htdocs/langs/th_TH/contracts.lang +++ b/htdocs/langs/th_TH/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=List of running services NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Services to activate among validated contracts -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Last %s activated services LastModifiedServices=Last %s modified services EditServiceLine=Edit service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang index a2c8ec77de2..53f8d168a55 100644 --- a/htdocs/langs/th_TH/errors.lang +++ b/htdocs/langs/th_TH/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang index eb2063c629c..40bca8e85fb 100644 --- a/htdocs/langs/th_TH/members.lang +++ b/htdocs/langs/th_TH/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Late SubscriptionNotReceivedShort=Never received ListOfSubscriptions=List of subscriptions SendCardByMail=Send card by Email -AddMember=Add member +AddMember=Create member NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" NewMemberType=New member type WelcomeEMail=Welcome e-mail @@ -125,7 +125,7 @@ Date=Date DateAndTime=Date and time PublicMemberCard=Member public card MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -AddSubscription=Add subscription +AddSubscription=Create subscription ShowSubscription=Show subscription MemberModifiedInDolibarr=Member modified in Dolibarr SendAnEMailToMember=Send information email to member @@ -203,3 +203,4 @@ MembersByNature=Members by nature VATToUseForSubscriptions=VAT rate to use for subscriptions NoVatOnSubscription=No TVA for subscriptions MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang index cb88461602d..81d217ddb54 100644 --- a/htdocs/langs/th_TH/products.lang +++ b/htdocs/langs/th_TH/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang index 4affd1fdc5a..c48e27fd204 100644 --- a/htdocs/langs/th_TH/projects.lang +++ b/htdocs/langs/th_TH/projects.lang @@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant Myprojects=My projects ProjectsArea=Projects area NewProject=New project -AddProject=Add project +AddProject=Create project DeleteAProject=Delete a project DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task -AddTask=Add task +AddTask=Create task AddDuration=Add duration Activity=Activity Activities=Tasks/activities diff --git a/htdocs/langs/th_TH/resource.lang b/htdocs/langs/th_TH/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/th_TH/resource.lang +++ b/htdocs/langs/th_TH/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang index e4337309084..ea32511fefb 100644 --- a/htdocs/langs/th_TH/withdrawals.lang +++ b/htdocs/langs/th_TH/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 90cb9765785..f1710cd2aad 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -12,7 +12,7 @@ SessionId=Oturum Kimliği SessionSaveHandler=Oturum kayıt yürütücüsü SessionSavePath=Oturum kayıt konumu PurgeSessions=Oturum Temizleme -ConfirmPurgeSessions=Gerçekten tüm oturumları temizlemek istiyor musunuz? Bu (kendiniz hariç), tüm kullanıcıların bağlantılarını kesecektir. +ConfirmPurgeSessions=Tüm oturumları gerçekten temizlemek istiyor musunuz? Bu (kendiniz hariç), tüm kullanıcıların bağlantılarını kesecektir. NoSessionListWithThisHandler=PHP nizde yapılandırılmış olan oturum kayıt işlemcisi çalışmakta olan tüm oturumların listelenmesine izin vermiyor. LockNewSessions=Yeni bağlantıları kilitle ConfirmLockNewSessions=Herhangi bir yeni Dolibarr bağlantısını yalnız kendinizle kısıtlamak istediğinizden emin misiniz? Bundan sonra yalnızca %s kullanıcısı bağlanabilecektir. @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Üçüncü parti seçimi için liste kutusu kullanmak y ActivityStateToSelectCompany= Halen faaliyette olan olan ya da durdurulmuş olan üçüncü partilerin görünmesi/gizlenmesi için bir süzgeç seçeneği ekleyin UseSearchToSelectContactTooltip=Ayrıca çok fazla sayıda üçüncü partiniz varsa (>100 000), Kurulum->Diğer den CONTACT_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır. UseSearchToSelectContact=Kişi seçimi için oto tamamlamalı alan kullanın (liste kutusu kullanmak yerine). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Arama süzgeçi seçenekleri NumberOfKeyToSearch=Aramayı başlatacak karakter sayısı: %s ViewFullDateActions=Üçüncü sayfada tam gün etkinliklerini göster @@ -82,7 +84,7 @@ NextValueForReplacements=Sonraki değer (yenileme) MustBeLowerThanPHPLimit=Not: PHP niz yüklenen her dosyanın boyutunu, parametrelerin değeri ne olursa olsun %s %s ile sınırlandırır NoMaxSizeByPHPLimit=Not: PHP yapılandırmanızda hiç sınır ayarlanmamış MaxSizeForUploadedFiles=Yüklenen dosyalar için ençok boyut (herhangi bir yüklemeye izin vermemek için 0 a ayarlayın) -UseCaptchaCode=Giriş sayfasında grafiksel kod (CAPTCHA) kullan +UseCaptchaCode=Kullanıcı girişi sayfasında grafiksel kod (CAPTCHA) kullan UseAvToScanUploadedFiles=Yüklenen dosyaların taranması için anti-virüs kullan AntiVirusCommand= Antivirüs komutu tam yolu AntiVirusCommandExample= ClamWin için örnek: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
ClamAv için örnek: /usr/bin/clamscan @@ -208,6 +210,7 @@ ModulesJobDesc=İş modülleri belirli bir iş için önceden tanımlanmış bas ModulesMarketPlaceDesc=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz... ModulesMarketPlaces=Daha çok modül... DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Daha çok modül arayabileceğiniz Web sitesi sağlayıcıları... URL=Bağlantı BoxesAvailable=Kutular mevcut @@ -320,7 +323,7 @@ UMask=Unix/Linux/BSD dosya sisteminde yeni dosyalar için Umask parametresi. UMaskExplanation=Bu parametre Dolibarr tarafından sunucuda oluşturulan dosyaların izinlerini varsayılan olarak tanımlamanıza (örneğin yükleme sırasında) izin verir.
Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).
Bu parametre Windows sunucusunda kullanılmaz. SeeWikiForAllTeam=Tüm oyuncular ve kuruluşlarının tam listesi için wiki sayfalarına bir göz atın UseACacheDelay= Saniye olarak önbellek aktarması tepki gecikmesi (hiç önbellek yoksa 0 ya da boş) -DisableLinkToHelpCenter=Giriş sayfasında "Yardım ya da destek gerekli" bağlantısını gizle +DisableLinkToHelpCenter=Kullanıcı girişi sayfasında "Yardım ya da destek gerekli" bağlantısını gizle DisableLinkToHelp=Sol menüde "%s Çevrimiçi yardım" bağlantısını gizle AddCRIfTooLong=Otomatik kaydırma yoktur, yani belge üzerinde çok uzun olmasından dolayı satır sayfa sınırı dışına çıkmışsa metin alanında kendiniz satırbaşı yapmalısınız. ModuleDisabled=Modül devre dışı @@ -444,7 +447,7 @@ Module55Desc=Barkod yönetimi Module56Name=Telefon Module56Desc=Telefon entegrasyonu Module57Name=Ödeme talimatları -Module57Desc=Ödeme talimatları ve para çekme yönetimi +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=TıklaAra Module58Desc=TıklaAra entegrasyonu Module59Name=Bookmark4u @@ -465,7 +468,7 @@ Module200Name=LDAP Module200Desc=LDAP dizin senkronizasyonu Module210Name=PostNuke Module210Desc=PostNuke entegrasyonu -Module240Name=Veri verme +Module240Name=Veri dışaaktarma Module240Desc=Dolibarr verilerini dışaaktarma aracı (yardımlı) Module250Name=Veri içeaktarımı Module250Desc=Dolibarr verilerini içeaktarma aracı (yardımlı) @@ -475,8 +478,8 @@ Module320Name=RSS Besleme Module320Desc=Dolibarr ekran sayfaları içine RSS ekle Module330Name=Yerimleri Module330Desc=Yerimi yönetimi -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projeler/Fırsatlar/Adaylar +Module400Desc=Projlerin, fırsatların ve adayların yönetimi. Daha sonra bir projeye herhangi bir unsur (fatura, sipariş, teklif, müdahale, ...) atayabilirsiniz ve proje görünümünde bir çapraz bir görünüm elde edebilirsiniz. Module410Name=Web Takvimi Module410Desc=WebT akvimi entegrasyonu Module500Name=Özel giderler (vergi, sosyal katkı payları, temettüler) @@ -495,6 +498,8 @@ Module1780Name=Kategoriler Module1780Desc=Kategori yönetimi (ürünler, tedarikçiler ve müşteriler) Module2000Name=FCKdüzenleyici (FCKeditor) Module2000Desc=Gelişmiş editör kullanarak bazı metin alanlarının düzenlenmesini sağlar +Module2200Name=Dinamik Fiyatlar +Module2200Desc=Fiyatlar için matematik ifadelerin kullanımını etkinleştir Module2300Name=Kron Module2300Desc=Planlı görev yönetimi Module2400Name=Gündem @@ -503,6 +508,8 @@ Module2500Name=Elektronik İçerik Yönetimi Module2500Desc=Belgeleri saklayın ve yönetin Module2600Name=Web Hizmetleri Module2600Desc=Dolibarr web hizmetleri sunucusunu etkinleştirin +Module2650Name=WebHizmetleri (istemci) +Module2650Desc=Dolibarr web hizmetleri istemcisini etkinleştir (Dış sunuculara veri/istek iteklemek için kullanılabilir. Tedarikçi siparişleri yalnızca anında desteklenir Module2700Name=Gravatar Module2700Desc=Kullanıcıların/Üyelerin resimlerini (epostalarında bulunan) göstermek için çevrimiçi Gravatar hizmetini kullanın (www.gravatar.com). İnternet erişimi gerektirir. Module2800Desc=FTP İstemcisi @@ -517,7 +524,7 @@ Module6000Desc=İş akışı yönetimi Module20000Name=İzin İstekleri yönetimi Module20000Desc=Çalışanların izin isteklerini bildirin ve izleyin Module39000Name=Ürün kümesi -Module39000Desc=Parti numarası, ürünlerin yenme ve satış tarihi yönetiminde +Module39000Desc=Parti ya da seri numarası, ürünlerin son yenme tarihi ve son satma tarihi yönetimi Module50000Name=PayBox Module50000Desc=PayBox modülü ile kredi kartı ile çevrimiçi ödeme sayfası sunmak için Module50100Name=Satış Noktaları @@ -527,15 +534,15 @@ Module50200Desc=Kredi kartı ya da Paypal ile ödeme sağlayan çevrimiçi ödem Module50400Name=Muhasebe (gelişmiş) Module50400Desc=Muhasebe yönetimi (çift taraf) Module54000Name=IPP Yazdır -Module54000Desc=Cup'a IPP Yazıcıyla yazdır. +Module54000Desc=Cups IPP aryüzü kullanılarak doğrudan yazdırma (belgeler açılmadan) (Yazıcı sunucudan görülmeli ve sunucuda CUPS kurulu olmalı) Module55000Name=Anket aç Module55000Desc=Çevrimiçi anketler yapmak için modül (Doodle, Studs, Rdvz gibi) Module59000Name=Oranlar Module59000Desc=Oran yönetimi modülü Module60000Name=Komisyonlar Module60000Desc=Komisyon yönetimi modülü -Module150010Name=Parti no, son yeme tarihi ve son kullanma tarihi -Module150010Desc=toplu numaralandırma, ürün için kullanma tarihi ve satma tarihi yönetimi +Module150010Name=Parti numarası, son yenme tarihi ve son satış tarihi +Module150010Desc=ürünün parti numarası, son yenme tarihi ve son satış tarihi yönetimi Permission11=Müşteri faturalarını oku Permission12=Müşteri faturaları oluştur/düzenle Permission13=Müşteri faturalarının doğrulamasını kaldır @@ -606,11 +613,11 @@ Permission151=Ödeme talimatlarını oku Permission152=Ödeme talimatı isteği oluştur/değiştir Permission153=Ödeme talimatı fişleri aktarımı Permission154=Ödeme talimatı fişleri alacaklandır/reddet -Permission161=Read contracts/subscriptions -Permission162=Create/modify contracts/subscriptions -Permission163=Activate a service/subscription of a contract -Permission164=Disable a service/subscription of a contract -Permission165=Delete contracts/subscriptions +Permission161=Sözleşme/abonelik oku +Permission162=Sözleşme/abonelik oluştur/değiştir +Permission163=Bir sözleşmeye ait bir hizmet/abonelik etkinleştir +Permission164=Bir sözleşmeye ait bir hizmet/abonelik engelle +Permission165=Sözleşme/abonelik sil Permission171=Seyahat ve giderleri okuyun (kendi ve astlarının) Permission172=Gezi ve gider oluştur/değiştir Permission173=Gezi ve gider sil @@ -672,7 +679,7 @@ Permission300=Bar kod oku Permission301=Bar kod oluştur/değiştir Permission302=Bar kod sil Permission311=Hizmet oku -Permission312=Assign service/subscription to contract +Permission312=Sözleşmeye hizmet/abonelik ata Permission331=Yerimi oku Permission332=Yerimi oluştur/değiştir Permission333=Yerimi sil @@ -702,8 +709,8 @@ Permission701=Bağış oluştur/değiştir Permission702=Bağış sil Permission703=Bağış sil Permission1001=Stok oku -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses +Permission1002=Depo oluştur/değiştir +Permission1003=Depo sil Permission1004=Stok hareketlerini oku Permission1005=Stok hareketleri oluştur/değiştir Permission1101=Teslimat emirlerini oku @@ -718,7 +725,7 @@ Permission1185=Tedarikçi siparişi onayla Permission1186=Tedarikçi siparişi ver Permission1187=Tedarikçi siparişi alındı fişi Permission1188=Tedarikçi siparişi kapat -Permission1201=Bir verme sonucu al +Permission1201=Bir dışaaktarma sonucu al Permission1202=Dışaaktarma oluştur/değiştir Permission1231=Tedarikçi faturalarını oku Permission1232=Tedarikçi faturaları oluştur/değiştir @@ -779,6 +786,7 @@ DictionaryOrderMethods=Sipariş yöntemleri DictionarySource=Teklifin/siparişin kökeni DictionaryAccountancyplan=Hesap planı DictionaryAccountancysystem=Hesap planı modelleri +DictionaryEMailTemplates=Eposta şablonları SetupSaved=Kurulum kaydedildi BackToModuleList=Modül listesine geri git BackToDictionaryList=Sözlük listesine dön @@ -883,11 +891,12 @@ DefaultSkin=Varsayılan dış görünüm teması MaxSizeList=Listenin ençok uzunluğu DefaultMaxSizeList=Liste için varsayılan ençok uzunluk MessageOfDay=Günün mesajı -MessageLogin=Giriş sayfası mesajı +MessageLogin=Kullanıcı girişi sayfası mesajı PermanentLeftSearchForm=Sol menüdeki sabit arama formu DefaultLanguage=Kullanılan varsayılan dil (dil kodu) EnableMultilangInterface=Çoklu dil arayüzünü etkinleştir EnableShowLogo=Logoyu sol menüde göster +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Sisteminiz başarıyla güncellendi CompanyInfo=Firma/dernek bilgileri CompanyIds=Firma/dernek kimlikleri @@ -985,13 +994,13 @@ BackupDescY=Üretilen bilgi döküm dosyası güvenli bir yerde korunmalıdır. BackupPHPWarning=Bu yöntemle yedekleme garanti edilmez. Öncekini yeğleyin RestoreDesc=Bir Dolibarr yedeklemesini geri yüklemek için şunları yapmalısınız: RestoreDesc2=Yeni Dolibarr kurulum dizini belgeleri dosyaların ağaç ayıklamak için veya bu belgeleri geçerli dizinle içine (% s) listesi arşiv dosyası belgeleri (örneğin zip dosyası) Restore. * Belge dizini arşiv dosyalarını yeni Dolibarr kurulumundaki ya da bu geçerli belge dizinindeki dizine ayıklamak için geri yükleyin(%s). -RestoreDesc3=* Bir yedek dökümü dosyasından, yeni Dolibarr yükleme veritabanına verileri geri yükleyin veya bu geçerli yükleme veritabanına geri yükleyin. Uyarı, geri yükleme bir kez tamamlandığında, yeniden bağlanmak için yedekleme yapılırken varolan bir giriş / parola kullanmanız gerekir. Bu geçerli yükleme içine yedekleme veritabanını geri yüklemek için, bu yardımcıyı takip edebilirsiniz. +RestoreDesc3=* Bir yedek dökümü dosyasından, yeni Dolibarr yükleme veritabanına verileri geri yükleyin veya bu geçerli yükleme veritabanına geri yükleyin. Uyarı, geri yükleme bir kez tamamlandığında, yeniden bağlanmak için yedekleme yapılırken varolan bir Kullanıcı girişi / parola kullanmanız gerekir. Bu geçerli yükleme içine yedekleme veritabanını geri yüklemek için, bu yardımcıyı takip edebilirsiniz. RestoreMySQL=MySQL içeaktar ForcedToByAModule= Bu kural bir aktif modül tarafından s ye zorlanır PreviousDumpFiles=Mevcut veritabanı yedekleme dosyaları dökümü WeekStartOnDay=Haftanın ilk günü RunningUpdateProcessMayBeRequired=Yükseltme işlemini çalıştırmak gerekli gibi görünüyor (Program sürümü %s veritabanı sürümü %s ten farklı) -YouMustRunCommandFromCommandLineAfterLoginToUser=Bu komutu %s kullanıcısı ile bir kabuğa (to a shell) giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı elde etmek için komut satırının sonuna –W seçeneğini ekleyebilirsiniz. +YouMustRunCommandFromCommandLineAfterLoginToUser=Bu komutu %s kullanıcısı ile bir kabuğa giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı %s elde etmek için komut satırının sonuna –W seçeneğini ekleyebilirsiniz. YourPHPDoesNotHaveSSLSupport=SSL fonksiyonları PHP nizde mevcut değildir DownloadMoreSkins=Daha fazla kaplama indirin SimpleNumRefModelDesc=Referans sayısını %syymm-nnnn biçimi ile girin; yy yıl mm ay ve nnnn deliksiz ve sıfırlanamayan bir dizidir @@ -1001,7 +1010,7 @@ TranslationUncomplete=Kısmi çeviri SomeTranslationAreUncomplete=Bazı diller kısmi olarak çevrilmiş ya da hatalar içeriyor olabilir. Bazılarını belirlerseniz, dil dosyalarını buraya kayıt ederek düzeltebilirsiniz http://transifex.com/projects/p/dolibarr/. MenuUseLayout=Dikey menüyü gizlenebilir yap (javascript seçeneği devre dışı olmamalıdır) MAIN_DISABLE_METEO=Meteo görünümünü engelle -TestLoginToAPI=API giriş testi +TestLoginToAPI=API kullanıcı girişi denemesi ProxyDesc=Dolibarr’ın bazı özelliklerinin çalışması için internet erişimi olması gerekir. Bunun için burada parametreleri tanımlayın. Dolibarr sunucusu bir proxy sunucu arkasında ise, bu parametreler üzerinden Internet erişiminin nasıl olacağını Dolibarr’a söyler. ExternalAccess=Dış erişim MAIN_PROXY_USE=Bir proxy sunucusu kullan (aksi takdirde internete doğrudan erişin) @@ -1063,7 +1072,7 @@ GeneratePassword=Oluşturulmuş bir şifre önerin RuleForGeneratedPasswords=Önerilen parola oluşturmak ya da parola doğrulamak için kural DoNotSuggest=Herhangi bir parola önermeyin EncryptedPasswordInDatabase=Veritabanındaki parolanın şifrelendirilmesine izin vermek için -DisableForgetPasswordLinkOnLogonPage=Giriş sayfasında “Parolayı unut” bağlantısını gösterme +DisableForgetPasswordLinkOnLogonPage=Kullanıcı girişi sayfasında “Parola unutuldu” bağlantısını gösterme UsersSetup=Kullanıcılar modülü kurulumu UserMailRequired=Yeni bir kullanıcı oluşturmak için gerekli EPosta ##### Company setup ##### @@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Teslim tarihi özelliği ekle UseOptionLineIfNoQuantity=Sıfır tutarında olan ürün/hizmet satırını bir seçenek olarak kabul et FreeLegalTextOnProposal=Teklifler üzerinde serbest metin WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur) -BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste ##### Orders ##### OrdersSetup=Sipariş yönetimi kurulumu OrdersNumberingModules=Sipariş numaralandırma modülü @@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Müdahale numaralandırma modülü TemplatePDFInterventions=Müdahale kartı belgesi modelleri WatermarkOnDraftInterventionCards=Taslak müdahale kartı belgelerinde filigran (boşsa yoktur) ##### Contracts ##### -ContractsSetup=Contracts/Subscriptions module setup +ContractsSetup=Sözleşme/Abonelik modül ayarları ContractsNumberingModules=Sözleşme numaralandırma modülleri TemplatePDFContracts=Sözleşme belge modelleri FreeLegalTextOnContracts=Sözleşmeler üzerinde serbest metin @@ -1169,7 +1178,7 @@ WatermarkOnDraftContractCards=Taslak sözleşmeler üzerinde filigran (boşsa yo MembersSetup=Üye modülü kurulumu MemberMainOptions=Ana seçenekler AddSubscriptionIntoAccount=Yeni bir ödentili abonelik eklerken, banka modülünde varsayılan olarak bir banka işlemi öner -AdherentLoginRequired= Her üye için bir Giriş yönetin +AdherentLoginRequired= Her üye için bir Kullanıcı girişi yönetin AdherentMailRequired=Yeni ü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 ##### LDAP setup ##### @@ -1249,11 +1258,11 @@ LDAPSetupForVersion3=LDAP sunucusu sürüm 3 için yapılandırılmış LDAPSetupForVersion2=LDAP sunucusu sürüm 2 için yapılandırılmış LDAPDolibarrMapping=Dolibarr Eşleme LDAPLdapMapping=LDAP Eşleme -LDAPFieldLoginUnix=Giriş (Unix) +LDAPFieldLoginUnix=Kullanıcı girişi (Unix) LDAPFieldLoginExample=Örnek: uid LDAPFilterConnection=Arama süzgeçi LDAPFilterConnectionExample=Örnek: &(objectClass = InetOrgPerson) -LDAPFieldLoginSamba=Giriş (samba, activedirectory) +LDAPFieldLoginSamba=Kullanıcı girişi (samba, activedirectory) LDAPFieldLoginSambaExample=Örnek: sAMAccountName LDAPFieldFullname=İlk Adı LDAPFieldFullnameExample=Örnek: cn @@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=%s türündeki dosyalar HTTP sunucusu tarafından sık CacheByServer=Sunucu önbelleği CacheByClient=Tarayıcı önbelleği CompressionOfResources=HTTP yanıtlarının sıkıştırılması -TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +TestNotPossibleWithCurrentBrowsers=Böyle bir otomatik algılama mevcut tarayıcılar için olası değildir ##### Products ##### ProductSetup=Ürünler modülü kurulumu ServiceSetup=Hizmetler modülü kurulumu @@ -1415,9 +1424,9 @@ OSCommerceTestOk='%s' Sunucusuna '%s' veritabanında kullanıcı '% s' ile bağl OSCommerceTestKo1='%s' Sunucusuna bağlantı başarılı ancak veritabanı '% s' e ulaşılamadı. OSCommerceTestKo2=’%s’ Sunucusuna ‘%s’ kullanıcısı ile bağlantı başarısız oldu. ##### Stock ##### -StockSetup=Warehouse module setup -UserWarehouse=Use user personal warehouses -IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. +StockSetup=Depo modülü ayarları +UserWarehouse=Kullanıcı kişisel deposunu kullan +IfYouUsePointOfSaleCheckModule=Eğer bir Satış Noktası modülü kullanıyorsanız (varsayılan olarak sağlanan ya da başka bir dış POS modülü), bu ayarlar Satış Noktası modülünüz tarafından gözardı edilebilir. Buradaki seçenekler ne olursa olsun çoğu satış notası modülü ön tanımlı olarak anında fatura oluşturacak ve stok eksiltecek şeklide tasarlanmıştır. Yani, Satış Noktanızdan bir satış kaydederken stok eksiltme gereksiniminiz varsa da yoksa da, aynı zamanda POS modülünüzün ayarlarını da denetleyin. ##### Menu ##### MenuDeleted=Menü silindi TreeMenu=Ağaç menüler @@ -1471,7 +1480,7 @@ AccountancyCodeSell=Satış hesap. kodu AccountancyCodeBuy=Alış hesap. kodu ##### Agenda ##### AgendaSetup=Etkinlik ve gündem modülü kurulumu -PasswordTogetVCalExport=Verme bağlantısı yetki anahtarı +PasswordTogetVCalExport=Dışaaktarma bağlantısı yetki anahtarı PastDelayVCalExport=Bundan daha büyük etkinliği dışaaktarma AGENDA_USE_EVENT_TYPE=Etkinlik türlerini kullan (Ayarlar -> Sözlük -> Gündem etkinlik türleri) menüsünden yönetilir AGENDA_DEFAULT_FILTER_TYPE=Gündem görünümü arama süzgeçinde, etkinlikler için otomatik olarak bu etkinlik türünü ayarlar @@ -1482,14 +1491,14 @@ ClickToDialDesc=Bu modül, telefon numaraları ardına bir simge eklemenizi sağ ##### Point Of Sales (CashDesk) ##### CashDesk=Satış Noktası CashDeskSetup=Satış Noktası kurulum modülü -CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskThirdPartyForSell=Satışlar için kullanılacak varsayılan genel üçüncü parti CashDeskBankAccountForSell=Nakit ödemeleri almak için kullanılan varsayılan hesap CashDeskBankAccountForCheque= Ödemeleri çek ile almak için kullanılan varsayılan hesap CashDeskBankAccountForCB= Nakit ödemeleri kredi kartıyla almak için kullanılan varsayılan hesap -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale -CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease -StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled -CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. +CashDeskDoNotDecreaseStock=Satış Noktasından satış yapıldığında stok eksiltilmesini engelle +CashDeskIdWareHouse=Depoyu stok azaltmada kullanmak için zorla ve sınırla +StockDecreaseForPointOfSaleDisabled=Satış Noktasından stok eksiltme engelli +CashDeskYouDidNotDisableStockDecease=Satış Noktasından satış yapılırken stok eksiltilmesini engellemediniz. Bu durumda depo gereklidir. ##### Bookmark ##### BookmarkSetup=Yerimi modülü kurulumu BookmarkDesc=Bu modül yerimlerini yönetmenize olanak sağlar. Ayrıca, soldaki menüden herhangi Dolibarr sayfaları veya dış web siteleri için kısayollar ekleyebilirsiniz. diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang index 18a36d5b8d3..4dc82ae066f 100644 --- a/htdocs/langs/tr_TR/agenda.lang +++ b/htdocs/langs/tr_TR/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Etkinlikten etkilenen ActionsDoneBy=Etkinliği yapan ActionsForUser=Kullanıcı etkinlikleri ActionsForUsersGroup=Grupun tüm üyelerine ait etkinlikler +ActionAssignedTo=Event assigned to AllMyActions= Tüm etkinliklerim/görevlerim AllActions= Tüm etkinlikler/görevler ViewList=Liste görünümü @@ -44,7 +45,7 @@ AgendaExtSitesDesc=Bu sayfa takvimlerin dış kaynaklarında Dolibarr gündemind ActionsEvents=Dolibarr'ın otomatik olarak gündemde bir etkinlik oluşturacağı eylemler PropalValidatedInDolibarr=%s Teklifi doğrulandı InvoiceValidatedInDolibarr=%s Faturası doğrulandı -InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceValidatedInDolibarrFromPos=POS tan doğrulanan fatura %s InvoiceBackToDraftInDolibarr=%s Faturasını taslak durumuna geri götür InvoiceDeleteDolibarr=%s faturası silindi OrderValidatedInDolibarr= %s Siparişi doğrulandı @@ -67,8 +68,8 @@ DateActionDoneEnd= Gerçek bitiş tarihi DateActionStart= Başlama tarihi DateActionEnd= Bitiş tarihi AgendaUrlOptions1=Süzgeç çıktısına ayrıca aşağıdaki parametreleri ekleyebilirsiniz: -AgendaUrlOptions2=Eylem çıktılarını eylem, oluşturan, eylemden etkilenen ya da eylemi yapan kullanıcı login=%s sınırlayacak kullanıcı %s. -AgendaUrlOptions3=kullanıcı=%s, bir %s kullanıcısına ait eylemlerin çıkışlarını sınırlamak içindir. +AgendaUrlOptions2=Eylem çıktılarını eylem, oluşturan, eylemden etkilenen ya da eylemi yapan kullanıcı kullanıcı girişi=%s sınırlayacak kullanıcı %s. +AgendaUrlOptions3=kullanıcı girişi=%s, bir %s kullanıcısına ait eylemlerin çıkışlarını sınırlamak içindir. AgendaUrlOptions4=Çıktıyı kullanıcı %s tarafından etkilenen etkinliklerle sınırlamak içinlogint=%s. AgendaUrlOptionsProject=proje=PROJECT_ID, bu PROJECT_ID projesi ile ilişkilendirilmiş eylemlerin çıkışını çıkışını sınırlamak içindir. AgendaShowBirthdayEvents=Kişilerin doğum günlerini göster @@ -78,7 +79,7 @@ ExportDataset_event1=Gündem etkinlikleri listesi DefaultWorkingDays=Varsayılan haftalık çalışma günleri aralığı (Örnek: 1-5, 1-6) DefaultWorkingHours=Varsayılan günlük çalışma saatleri (Örnek: 9-18) # External Sites ical -ExportCal=Takvim ver +ExportCal=Takvim dışaaktar ExtSites=Dış takvimleri içeaktar ExtSitesEnableThisTool=Gündemde dış takvimleri (genel ayarlarda tanımlanan) göster. Kullanıcılar tarafından tanımlanan dış takvimleri etkilemez. ExtSitesNbOfAgenda=Takvimlerin sayısı diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang index d855c5c73e3..643815b8abe 100644 --- a/htdocs/langs/tr_TR/bills.lang +++ b/htdocs/langs/tr_TR/bills.lang @@ -217,7 +217,7 @@ NoInvoice=Fatura yok ClassifyBill=Fatura sınıflandır SupplierBillsToPay=Ödenecek tedarikçi faturaları CustomerBillsUnpaid=Ödenmemiş müşteri faturaları -DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +DispenseMontantLettres=Mekanografik işlemlerle yazılmış faturalar harf sırasına göre dağıtılırlar NonPercuRecuperable=Kurtarılamaz SetConditions=Ödeme koşullarını ayarla SetMode=Ödeme biçimini ayarla diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang index 7fffe687d62..94e1b382509 100644 --- a/htdocs/langs/tr_TR/companies.lang +++ b/htdocs/langs/tr_TR/companies.lang @@ -277,8 +277,8 @@ CustomerCode=Müşteri kodu SupplierCode=Tedarikçi kodu CustomerAccount=Müşteri hesabı SupplierAccount=Tedarikçi hesabı -CustomerCodeDesc=Tüm müşteriler için müşteri kodu eşsiz olmalı -SupplierCodeDesc=Tüm tedarikçiler için tedarikçi kodu eşsiz olmalı +CustomerCodeDesc=Tüm müşteriler için müşteri kodu benzersiz olmalı +SupplierCodeDesc=Tüm tedarikçiler için tedarikçi kodu benzersiz olmalı RequiredIfCustomer=Eğer üçüncü parti bir müşteri ya da aday ise gereklidir RequiredIfSupplier=Eğer üçüncü bir tedarikçi ise gereklidir ValidityControledByModule=Doğrulama modülü tarafından denetlenir @@ -365,7 +365,7 @@ NoParentCompany=Hiçbiri ExportImport=İçeaktar-Dışaaktar ExportCardToFormat=Biçimlenip dışaaktarılacak kart ContactNotLinkedToCompany=Kişi herhangi bir üçüncü partiye bağlı değil -DolibarrLogin=Dolibarr girişi +DolibarrLogin=Dolibarr kullanıcı girişi NoDolibarrAccess=Dolibarr erişimi yok ExportDataset_company_1=Üçüncü partiler (Firmalar/dernekler/kişiler) ve özellikleri ExportDataset_company_2=Kişiler ve özellikleri diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang index a97057a7824..20a21a9f512 100644 --- a/htdocs/langs/tr_TR/compta.lang +++ b/htdocs/langs/tr_TR/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kulla TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, nakit muhasebesimodu için uygun değildir. Bu rapor yalnızca, tahakkuk muhasebesi modu için uygundur (muhasebe modülü ayarlarına bakın). CalculationMode=Hesaplama modu AccountancyJournal=Muhasebe kodu günlüğü -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Ürün alımı için varsayılan muhasebe kodu -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Ürün satışı için varsayılan muhasebe kodu -ACCOUNTING_SERVICE_BUY_ACCOUNT=Hizmet alımı için varsayılan muhasebe kodu -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Hizmet satışı için varsayılan muhasebe kodu ACCOUNTING_VAT_ACCOUNT=Alınan KDV için varsayılan muhasebe kodu ACCOUNTING_VAT_BUY_ACCOUNT=Ödenen KDV için varsayılan muhasebe kodu ACCOUNTING_ACCOUNT_CUSTOMER=Müşteri üçüncü partiler için varsayılan muhasebe kodu diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang index 7a4c4151b2f..d5b9448378c 100644 --- a/htdocs/langs/tr_TR/contracts.lang +++ b/htdocs/langs/tr_TR/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Sözleşmeler alanı ListOfContracts=Sözleşme Listesi -LastModifiedContracts=Last %s modified contracts +LastModifiedContracts=Değiştirilen son %s sözleşme AllContracts=Bütün sözleşmeler ContractCard=Sözleşme kartı ContractStatus=Sözleşme durumu @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Yürürlükte olan hizmet kalemleri ListOfRunningServices=Yürürlükteki hizmetler listesi NotActivatedServices=Etkin olmayan hizmetler (doğrulanmış sözleşmeler arasından) BoardNotActivatedServices=Doğrulanmış sözleşmelerden etkinleştirilecek hizmetler -LastContracts=Last % contracts +LastContracts=Son %s sözleşme LastActivatedServices=Etkinleştirilen son %s hizmet LastModifiedServices=Değiştirilen son %s hizmet EditServiceLine=Hizmet kalemi düzenle @@ -91,6 +91,7 @@ ListOfServicesToExpire=Süresi dolacak Hizmetler Listesi NoteListOfYourExpiredServices=Bu listede yalnızca satış temsilcisi olarak atandığınız üçüncü partilere ait hizmet sözleşmeleri bulunur. StandardContractsTemplate=Standart sözleşme kalıbı ContactNameAndSignature=%s için, ad ve imza +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sözleşmeyi imzalalayacak satış temsilcisi diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang index f2fe6338f23..2e5755e83e9 100644 --- a/htdocs/langs/tr_TR/cron.lang +++ b/htdocs/langs/tr_TR/cron.lang @@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Unix ortamında her dakika Komut satırını çalıştı CronExplainHowToRunWin=Microsoft (tm) Windows ortamında her dakika Komut satırı çalıştırmak için Planlı görev araçlarını kullanabilirsiniz # Menu CronJobs=Planlı işler -CronListActive=List of active/scheduled jobs +CronListActive=Etkin/programlı işler listesi CronListInactive=Etkin olmayan işler listesi # Page list CronDateLastRun=Son çalıştırma diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang index 0111fb8633e..df96ebb71d0 100644 --- a/htdocs/langs/tr_TR/errors.lang +++ b/htdocs/langs/tr_TR/errors.lang @@ -8,7 +8,7 @@ Errors=Hatalar ErrorButCommitIsDone=Hatalar bulundu, buna rağmen doğruluyoruz ErrorBadEMail=%s EPostası yanlış ErrorBadUrl=URL %s yanlış -ErrorLoginAlreadyExists=%s girişi zaten var. +ErrorLoginAlreadyExists=%s kullanıcı adı zaten var. ErrorGroupAlreadyExists=%s Grubu zaten var. ErrorRecordNotFound=Kayıt bulunamadı. ErrorFailToCopyFile='%s' dosyası '%s' içine kopyalanamadı. @@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz bir üç ErrorThereIsSomeDeliveries=Hata, bu sevkiyata bağlı bazı teslimatlar var. Silme işlemi reddedildi. ErrorCantDeletePaymentReconciliated=Uzlaştırılmış bir banka işlemi oluşturulmuş bir ödeme silinemez ErrorCantDeletePaymentSharedWithPayedInvoice=Ödendi durumunda olan en az bir faturayla paylaşılan bir ödeme silinemez +ErrorPriceExpression1='%s' Değişkenine atama yapılamıyor +ErrorPriceExpression2='%s' Dahili işlevi yeniden tanımlanamıyor +ErrorPriceExpression3=İşlev tanımındaki '%s' değişkeni tanımlanmamış +ErrorPriceExpression4=Geçersi karakter '%s' +ErrorPriceExpression5=Beklenmeyen '%s' +ErrorPriceExpression6=Hatalı argüman sayısı (verilen %s, beklenen %s) +ErrorPriceExpression8=Beklenmeyen işlemci '%s' +ErrorPriceExpression9=Beklenmeyen bir hata oldu +ErrorPriceExpression10='%s' İşlemcisinin işleneni yok +ErrorPriceExpression11=Beklenen '%s' +ErrorPriceExpression14=Sıfıra bölünme +ErrorPriceExpression17=Beklenmeyen değişken '%s' +ErrorPriceExpression19=İfade bulunamadı +ErrorPriceExpression20=Boş ifade +ErrorPriceExpression21=Boş sonuç '%s' +ErrorPriceExpression22=Eksi sonuç '%s' +ErrorPriceExpressionInternal=İç hata '%s' +ErrorPriceExpressionUnknown=Bilinmeyen hata '%s' # Warnings WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang index c4baa85d1b9..f08d37906d7 100644 --- a/htdocs/langs/tr_TR/exports.lang +++ b/htdocs/langs/tr_TR/exports.lang @@ -14,10 +14,10 @@ SaveExportModel=Yeniden kullanmak için bu dışaaktarma profilini kaydedebilirs SaveImportModel=Yeniden kullanmak için bu içeaktarma profilini kaydedebilirsiniz... ExportModelName=Dışaaktarma profili adı ExportModelSaved=İçeaktarma profili %s adıyla kaydedildi. -ExportableFields=Verilebilir alanlar -ExportedFields=Verilen alanlar -ImportModelName=Alma profili adı -ImportModelSaved=Alma profili %s adıyla kaydedildi. +ExportableFields=Dışaaktarılabilir alanlar +ExportedFields=Dışaaktarılan alanlar +ImportModelName=İçeaktarma profili adı +ImportModelSaved=İçeaktarma profili %s adıyla kaydedildi. ImportableFields=İçeaktarılabilir alanlar ImportedFields=İçeaktarılan alanlar DatasetToExport=Dışaaktarılacak veri kümesi @@ -56,7 +56,7 @@ LineTotalHT=Satırın vergi hariç tutarı LineTotalTTC=Satırın vergi dahil tutarı LineTotalVAT=Satırın KDV tutarı TypeOfLineServiceOrProduct=Satır türü (0 = ürün, 1 = hizmet) -FileWithDataToImport=Alınacak verileri içeren dosya +FileWithDataToImport=İçeaktarılacak verileri içeren dosya FileToImport=İçeaktarılacak kaynak dosya FileMustHaveOneOfFollowingFormat=İçeaktarılacak dosya aşağıdaki biçimlerden birinde olmalıdır DownloadEmptyExample=Örnek boş kaynak dosyasını indirin @@ -68,7 +68,7 @@ FieldsInTargetDatabase=Dolibarr veritabanındaki hedef alanlar (koyu=zorunlu) Field=Alan NoFields=Alan sayısı MoveField=%s numaralı alan sütununu taşıyın -ExampleOfImportFile=İçeaktarılacak_dosya_örneği +ExampleOfImportFile=İçeaktarma_dosya_örneği SaveImportProfile=Bu içeaktarma profilini kaydedin ErrorImportDuplicateProfil=Bu içeaktarma profili bu ad ile kaydedilemedi. Aynı adlı bir profil zaten var. ImportSummary=İçeaktarma ayarlarının özeti @@ -85,20 +85,20 @@ FieldNeedSource=Bu alanlar kaynak dosyadan bir veri gerektirir SomeMandatoryFieldHaveNoSource=Veri dosyasında, bazı zorunlu alanların kaynağı yok InformationOnSourceFile=Kaynak dosya bilgileri InformationOnTargetTables=Hedef alan bilgileri -SelectAtLeastOneField=En az bir kaynak alanı verilecek alanlar bölümüne koyun -SelectFormat=Bu alma dosya biçimini seçin -RunImportFile=Dosya almayı başlatın -NowClickToRunTheImport=Alma provasının sonucunu denetleyin. Herşey yolundaysa, kesin almayı başlatın. -DataLoadedWithId=Tüm veriler şu alma kodu ile yüklenecek: %s +SelectAtLeastOneField=En az bir kaynak alanı dışaaktarılacak alanlar bölümüne koyun +SelectFormat=Bu içeaktarma dosya biçimini seçin +RunImportFile=Dosya içeaktarmayı başlatın +NowClickToRunTheImport=İçeaktarma denemesi sonucunu denetleyin. Herşey yolundaysa, kesin içeaktarmayı başlatın. +DataLoadedWithId=Tüm veriler şu içeaktarma kodu ile yüklenecek: %s ErrorMissingMandatoryValue=Kaynak dosyada alan için zorunlu veri boş %s. TooMuchErrors=Kaynak dosyasında, liste sınırlandığından görüntülenmeyen %s hatalı satır daha var. TooMuchWarnings=Kaynak dosyasında, liste sınırlandığından görüntülenmeyen %s uyarı içeren satır daha var. EmptyLine=Boş satır (atlanacak) CorrectErrorBeforeRunningImport=Kesin alma işleminden önce tüm hataları düzeltmelisiniz. FileWasImported=Dosya %s sayısı ile alındı. -YouCanUseImportIdToFindRecord=Veritabanınızı import_key='%s' ölçütü ile süzerseniz alınmış tüm kayıtları görebilirsiniz. +YouCanUseImportIdToFindRecord=Veritabanınızı import_key='%s' ölçütü ile süzerseniz içeaktarılmış tüm kayıtları görebilirsiniz. NbOfLinesOK=Hatasız ve uyarı içermeyen satır sayısı:%s. -NbOfLinesImported=Sorunsuz alınan satır sayısı:%s. +NbOfLinesImported=Sorunsuz içeaktarılan satır sayısı:%s. DataComeFromNoWhere=Eklenecek değer kaynak dosyada hiç bir yerden gelmiyor. DataComeFromFileFieldNb=Eklenecek değer kaynak dosyada %s numaralı alandan geliyor. DataComeFromIdFoundFromRef=Kaynak dosyanın %s numaralı alanından gelen değer, üst nesne kodunun bulunması için kullanılacak (yani kaynak dosyadaki ilgili %s nesnesi önceden Dolibarr içinde bulunmalıdır). diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang index 9210e6a384d..128034c94d7 100644 --- a/htdocs/langs/tr_TR/mails.lang +++ b/htdocs/langs/tr_TR/mails.lang @@ -115,7 +115,7 @@ SentBy=Gönderen MailingNeedCommand=Güvenlik nedeni ile, Eposta gönderiminin komut satırından yapılması daha iyidir. Bütün posta alıcılarına eposta göndermek için sunucu yönetcisinden aşağıdaki komutu başlatmasını isteyin: MailingNeedCommand2=Bunula birlikte, oturum tarafından gönderilecek ençok Eposta sayılı MAILING_LIMIT_SENDBYWEB parametresini ekleyerek çevrim içi olarak gönderebilirsiniz. Bunu için Giriş-Kurulum-Diğer menüsüne gidin. ConfirmSendingEmailing=Eğer www tarayıcınız ile gönderemiyor ya da yeğlemiyorsanız, lütfen kendi tarayıcınızdan eposta göndermek istediğinizden emin olduğunuzu onaylayın. -LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +LimitSendingEmailing=Not: Web arayüzünden eposta gönderimi güvenlik ve süre aşımı yüzünden birçok kez yapılmıştır, her gönderme oturumu başına %s alıcıya TargetsReset=Listeyi temizle ToClearAllRecipientsClickHere=Bu e-posta Alıcı listesini temizlemek için burayı tıkla ToAddRecipientsChooseHere=Listeden seçerek alıcıları ekle @@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=Epostayala %s bildirim gönderilecektir AddNewNotification=Yeni bir eposta bildirim hedefi etkinleştir ListOfActiveNotifications=Bütün etkin eposta bildirim hedeflerini listele ListOfNotificationsDone=Gönderilen tüm e-posta bildirimleri listesi -MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. -MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. -MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. +MailSendSetupIs=Yapılandırma e postası '%s' için ayarlandı. Bu mod toplu epostalama için kullanılamaz. +MailSendSetupIs2='%s' Modunu kullanmak için '%s' parametresini değiştirecekseniz, önce yönetici hesabı ile %sGiriş - Ayarlar - Epostalar%s menüsüne gitmelisiniz. Bu mod ile İnternet Servis Sağlayıcınız tarafından sağlanan SMTP sunucusu ayarlarını girebilir ve Toplu eposta özelliğini kullanabilirsiniz. +MailSendSetupIs3=SMTP sunucusunun nasıl yapılandırılacağı konusunda sorunuz varsa, %s e sorabilirsiniz. diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang index c475724245b..d5e3a2636d5 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -131,7 +131,7 @@ AddActionDone=Bitmiş etkinlik ekle Close=Kapat Close2=Kapat Confirm=Onayla -ConfirmSendCardByMail=Gerçekten bu kartı posta ile buna %s göndermek istiyor musunuz? +ConfirmSendCardByMail=Bu kartın içeriğini posta ile gerçekten buna %s göndermek istiyor musunuz? Delete=Sil Remove=Kaldır Resiliate=Sonlandır diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang index 098079e7015..44e74af7fa6 100644 --- a/htdocs/langs/tr_TR/members.lang +++ b/htdocs/langs/tr_TR/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Gecikmiş SubscriptionNotReceivedShort=Hiç alınmadı ListOfSubscriptions=Abonelikler listesi SendCardByMail=Kartı Eposta ile gönder -AddMember=Üye ekle +AddMember=Üye oluştur NoTypeDefinedGoToSetup=Hiçbir üyelik türü tanımlanmamıştır. Kurulum - Üye türlerine git NewMemberType=Yeni üye türü WelcomeEMail=Hoşgeldiniz e-postası @@ -125,7 +125,7 @@ Date=Tarih DateAndTime=Tarih ve saat PublicMemberCard=Genel üyelik kartı MemberNotOrNoMoreExpectedToSubscribe=Artık üyelik ya da abonelike beklenmiyor -AddSubscription=Abonelik ekle +AddSubscription=Abonelik oluştur ShowSubscription=Abonelik göster MemberModifiedInDolibarr=Üyelik Dolibarr'da değiştirilmiş SendAnEMailToMember=Üyelere bilgi e-postası gönder @@ -203,3 +203,4 @@ MembersByNature=Doğal üyeler VATToUseForSubscriptions=Abonelikler için kullanılacak KDV oranı NoVatOnSubscription=Abonelikler için KDV yok MEMBER_PAYONLINE_SENDEMAIL=Dolibarr'ın bir doğrulanmış abonelik ödeme onayını almasıyla gönderilecek uyarı epostası +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Faturada abonelik kalemi olarak kullanılan ürün: %s diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang index 26268de14f1..140d9f1f08e 100644 --- a/htdocs/langs/tr_TR/orders.lang +++ b/htdocs/langs/tr_TR/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Bir sevkiyat var DraftOrWaitingApproved=Taslak veya onaylanmış henüz sipariş verilmemiş DraftOrWaitingShipped=Taslak veya onaylanmış henüz sevkedilmemiş MenuOrdersToBill=Teslim edilen siparişler -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Faturalanabilir siparişler SearchOrder=Sipariş ara SearchACustomerOrder=Müşteri siparişi ara ShipProduct=Ürünü sevket diff --git a/htdocs/langs/tr_TR/printipp.lang b/htdocs/langs/tr_TR/printipp.lang index af623b6b2ad..82d85eaae0c 100644 --- a/htdocs/langs/tr_TR/printipp.lang +++ b/htdocs/langs/tr_TR/printipp.lang @@ -1,9 +1,14 @@ -# Dolibarr language file - tr_TR - printipp -PrintIPPSetup=Doğrudan Yazdırma modülü kurulumu -PrintIPPDesc=Bu modül, yazıcıya doğrudan belge yazdırma düğmesi ekler. Bu bir Cups içeren bir Linux sistemi gerektirir. -PRINTIPP_ENABLED=Belge listesinde "Doğrudan yazdır" resim ikonunu göster -PRINTIPP_HOST=Yazdırma sunucusu +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Doğrudan Yazdırma modülü ayarı +PrintIPPDesc=Bu modül belgeleri doğrudan yazıcıya gönderecek bir Yazdır düğmesi ekler. CUPS kurulmuş bir Linux sistemi gerektirir. +PRINTIPP_ENABLED=Belge listelerinde "Doğrudan yazdır" simgesini göster +PRINTIPP_HOST=Yazıcı sunucusu PRINTIPP_PORT=Port -PRINTIPP_USER=Giriş +PRINTIPP_USER=Kullanıcı girişi PRINTIPP_PASSWORD=Parola -NoPrinterFound=Yazıcı bulnamadı (Cups ayarını denetleyin) +NoPrinterFound=Hiç yazıcı bulunamadı (CUPS ayarlarınızı denetleyin) +FileWasSentToPrinter=%s Dosyası yazıcıya gönderildi +NoDefaultPrinterDefined=Tanımlı varsayılan yazıcı yok +DefaultPrinter=Varsayılan yazıcı +Printer=Yazıcı +CupsServer=CUPS Sunucusu diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang index 23c2de284d3..9ec2f349d3b 100644 --- a/htdocs/langs/tr_TR/products.lang +++ b/htdocs/langs/tr_TR/products.lang @@ -27,15 +27,15 @@ ProductsAndServicesNotOnSell=Eski Ürünler ve Hizmetler ProductsAndServicesStatistics=Ürün ve Hizme istatistikleri ProductsStatistics=Ürün istatistikleri ProductsOnSell=Varolan ürünler -ProductsNotOnSell=Eskimiş ürünler -ProductsOnSellAndOnBuy=Ürünler satılamaz ve satın alınamaz +ProductsNotOnSell=Kullanılmayan ürünler +ProductsOnSellAndOnBuy=Satılmaz ve satınalınmaz ürünler ServicesOnSell=Varolan hizmetler -ServicesNotOnSell=Eskimiş hizmetler -ServicesOnSellAndOnBuy=Hizmetler satılamaz ve satın alınamaz +ServicesNotOnSell=Kullanılmayan hizmetler +ServicesOnSellAndOnBuy=Satılmaz ve satınalınmaz hizmetler InternalRef=İç referans LastRecorded=Satışta kaydedilen son ürünler/hizmetler -LastRecordedProductsAndServices=Son kaydedilen %s ürünler/hizmetler -LastModifiedProductsAndServices=Son değiştirilen %s ürünler/hizmetler +LastRecordedProductsAndServices=Son kaydedilen %s ürün/hizmet +LastModifiedProductsAndServices=Son değiştirilen %s ürün/hizmet LastRecordedProducts=Son %s ürün kaydedildi LastRecordedServices=Son %s hizmet kaydedildi LastProducts=Son ürünler @@ -171,7 +171,7 @@ GenerateThumb=Kararlama (thumb) oluştur ProductCanvasAbility=Özel “kanvas” eklentileri kullan ServiceNb=Hizmet sayısı #%s ListProductServiceByPopularity=Popülerliğine göre ürün/hizmet listesi -ListProductByPopularity=Popülerliğine göre ürünler/hizmetler Listesi +ListProductByPopularity=Popülerliğine göre ürün listesi ListServiceByPopularity=Popülerliğine göre hizmetler listesi Finished=Üretilen ürünler RowMaterial=İlk malzeme @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Müşterinin ortaklılarına aynı fiyatı uygula PriceByCustomerLog=Müşteri fiyat günlüğü MinimumPriceLimit=Enaz fiyat bundan düşük olamaz %s MinimumRecommendedPrice=Önerilen enaz fiyat: %s +PriceExpressionEditor=Fiyat ifadesi düzenleyici +PriceExpressionSelected=Seçili fiyat ifadesi +PriceExpressionEditorHelp=Fiyatı ayarlamak için "fiyat = 2 + 2" ya da "2 + 2"
EkAlanlar "#options_myextrafieldkey# * 2" benzeri değişkenlerdir
#quantity# and #tva_tx# benzeri özel değişkenler vardır
İfadeleri ayırmak için ; kullanın +PriceMode=Fiyat biçimi +PriceNumeric=Sayı diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang index 09343d28968..3fc2b0041c6 100644 --- a/htdocs/langs/tr_TR/projects.lang +++ b/htdocs/langs/tr_TR/projects.lang @@ -36,6 +36,8 @@ TaskTimeSpent=Göreve harcanan süre TaskTimeUser=Kullanıcı TaskTimeNote=Not TaskTimeDate=Tarih +TasksOnOpenedProject=Açık projelerdeki görevler +WorkloadNotDefined=İşyükü tanımlanmamış NewTimeSpent=Yeni harcanan süre MyTimeSpent=Harcadığım sürelerim MyTasks=Grevlerim @@ -66,7 +68,7 @@ ListSupplierInvoicesAssociatedProject=Proje ile ilgili tedarikçi faturalarını ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi ListTripAssociatedProject=Proje ile ilgili geziler ve giderlerin listesi -ListActionsAssociatedProject=Proje ile ilgili eylemlerin listesi +ListActionsAssociatedProject=Proje ile ilgili etkinliklerin listesi ActivityOnProjectThisWeek=Projede bu haftaki etkinlik ActivityOnProjectThisMonth=Projede bu ayki etkinlik ActivityOnProjectThisYear=Projede bu yılki etkinlik diff --git a/htdocs/langs/tr_TR/resource.lang b/htdocs/langs/tr_TR/resource.lang index e8adc0a0e76..f593c7e0fe4 100644 --- a/htdocs/langs/tr_TR/resource.lang +++ b/htdocs/langs/tr_TR/resource.lang @@ -22,8 +22,8 @@ GotoDate=Tarihe git ResourceElementPage=Öğe kaynağı ResourceCreatedWithSuccess=Kaynak oluşturma başarılı -RessourceLineSuccessfullyDeleted=Resource line successfully deleted -RessourceLineSuccessfullyUpdated=Resource line successfully updated +RessourceLineSuccessfullyDeleted=Kaynak satır silinmesi başarılı +RessourceLineSuccessfullyUpdated=Kaynak satır güncellemesi başarılı ResourceLinkedWithSuccess=Kaynak bağlantılama başarılı TitleResourceCard=Kaynak kartı @@ -31,6 +31,4 @@ ConfirmDeleteResource=Bu kaynağı silmeyi onayla RessourceSuccessfullyDeleted=Kaynak silme başarılı DictionaryResourceType=Kaynak türleri -DictionaryEMailTemplates=E-posta modelleri - SelectResource=Kaynak seç diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang index edbf7dc5df3..b160e4cc1c7 100644 --- a/htdocs/langs/tr_TR/users.lang +++ b/htdocs/langs/tr_TR/users.lang @@ -102,7 +102,7 @@ UserDisabled=Kullanıcı %s engellendi UserEnabled=Kullanıcı %s etkinleştirildi UserDeleted=Kullanıcı %s kaldırıldı NewGroupCreated=Grup %s oluşturuldu -GroupModified=Group %s modified +GroupModified=Değiştirilen grup %s GroupDeleted=Grubu %s kaldırıldı ConfirmCreateContact=Bu kişi için bir Dolibarr hesabı oluşturmak istediğinizden emin misiniz? ConfirmCreateLogin=Bu üye için Dolibarr hesabı oluşturmak istediğinizden emin misiniz? diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang index d62f8661f0c..ed188e7fdb8 100644 --- a/htdocs/langs/tr_TR/withdrawals.lang +++ b/htdocs/langs/tr_TR/withdrawals.lang @@ -47,7 +47,7 @@ RefusedData=Ret Tarihi RefusedReason=Ret nedeni RefusedInvoicing=Rettin faturalandırılması NoInvoiceRefused=Reddi borç yazmayın -InvoiceRefused=Invoice refused (Charge the rejection to customer) +InvoiceRefused=Fatura reddedildi (Reddedileni müşterinin hesabına yaz) Status=Durum StatusUnknown=Bilinmeyen StatusWaiting=Bekliyor @@ -79,10 +79,11 @@ CreditDate=Alacak tarihi WithdrawalFileNotCapable=Ülkeniz %s için para çekme makbuzu oluşturulamıyor (Ülkeniz desteklenmiyor) ShowWithdraw=Para çekme göster IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Faturaya henüz enaz bir ödeme tahsilatı işlenmemişse, para çekme yönetimine izin vermek için ödendi olarak ayarlanamaz. -DoStandingOrdersBeforePayments=Bu sekmeler ödeme talimatı istemenizi sağlar. Bitirildiğinde, faturayı kapatmak için ödemeyi yazabilirsiniz. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Para çekme dosyası SetToStatusSent="Dosya Gönderildi" durumuna ayarla ThisWillAlsoAddPaymentOnInvoice=Bu aynı zamanda faturalara ödeme oluşturur ve onları "ödendi" olarak sınıflandırır +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Banka tarafından ödenen %s ödeme talimatı diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang index 37e41038659..d68844d9f62 100644 --- a/htdocs/langs/uk_UA/admin.lang +++ b/htdocs/langs/uk_UA/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s ViewFullDateActions=Show full dates events in the third sheet @@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Link BoxesAvailable=Boxes available @@ -444,7 +447,7 @@ Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmark management -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales @@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang index 43252eb188c..13d9dea3c7e 100644 --- a/htdocs/langs/uk_UA/agenda.lang +++ b/htdocs/langs/uk_UA/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= All my events/tasks AllActions= All events/tasks ViewList=List view diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang index 9fe5eff520d..878eb49b3c9 100644 --- a/htdocs/langs/uk_UA/compta.lang +++ b/htdocs/langs/uk_UA/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang index 511516dc755..57ba3bb15d8 100644 --- a/htdocs/langs/uk_UA/contracts.lang +++ b/htdocs/langs/uk_UA/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=List of running services NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Services to activate among validated contracts -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Last %s activated services LastModifiedServices=Last %s modified services EditServiceLine=Edit service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang index a2c8ec77de2..53f8d168a55 100644 --- a/htdocs/langs/uk_UA/errors.lang +++ b/htdocs/langs/uk_UA/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang index eb2063c629c..40bca8e85fb 100644 --- a/htdocs/langs/uk_UA/members.lang +++ b/htdocs/langs/uk_UA/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Late SubscriptionNotReceivedShort=Never received ListOfSubscriptions=List of subscriptions SendCardByMail=Send card by Email -AddMember=Add member +AddMember=Create member NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" NewMemberType=New member type WelcomeEMail=Welcome e-mail @@ -125,7 +125,7 @@ Date=Date DateAndTime=Date and time PublicMemberCard=Member public card MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -AddSubscription=Add subscription +AddSubscription=Create subscription ShowSubscription=Show subscription MemberModifiedInDolibarr=Member modified in Dolibarr SendAnEMailToMember=Send information email to member @@ -203,3 +203,4 @@ MembersByNature=Members by nature VATToUseForSubscriptions=VAT rate to use for subscriptions NoVatOnSubscription=No TVA for subscriptions MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang index cb88461602d..81d217ddb54 100644 --- a/htdocs/langs/uk_UA/products.lang +++ b/htdocs/langs/uk_UA/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang index 4affd1fdc5a..c48e27fd204 100644 --- a/htdocs/langs/uk_UA/projects.lang +++ b/htdocs/langs/uk_UA/projects.lang @@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant Myprojects=My projects ProjectsArea=Projects area NewProject=New project -AddProject=Add project +AddProject=Create project DeleteAProject=Delete a project DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task -AddTask=Add task +AddTask=Create task AddDuration=Add duration Activity=Activity Activities=Tasks/activities diff --git a/htdocs/langs/uk_UA/resource.lang b/htdocs/langs/uk_UA/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/uk_UA/resource.lang +++ b/htdocs/langs/uk_UA/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang index e4337309084..ea32511fefb 100644 --- a/htdocs/langs/uk_UA/withdrawals.lang +++ b/htdocs/langs/uk_UA/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index b5d84a0aca7..f12efa61626 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s ViewFullDateActions=Show full dates events in the third sheet @@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... ModulesMarketPlaces=More modules... DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Web site providers you can search to find more modules... URL=Link BoxesAvailable=Boxes available @@ -444,7 +447,7 @@ Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmark management -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name=WebServices Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales @@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Default language to use (language code) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Your system has been updated successfully CompanyInfo=Company/foundation information CompanyIds=Company/foundation identities diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang index 1ed4e637d14..a24c678a2e5 100644 --- a/htdocs/langs/uz_UZ/agenda.lang +++ b/htdocs/langs/uz_UZ/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to ActionsDoneBy=Events done by ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= All my events/tasks AllActions= All events/tasks ViewList=List view diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang index 9fe5eff520d..878eb49b3c9 100644 --- a/htdocs/langs/uz_UZ/compta.lang +++ b/htdocs/langs/uz_UZ/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang index 511516dc755..57ba3bb15d8 100644 --- a/htdocs/langs/uz_UZ/contracts.lang +++ b/htdocs/langs/uz_UZ/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=List of running services NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Services to activate among validated contracts -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Last %s activated services LastModifiedServices=Last %s modified services EditServiceLine=Edit service line @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang index a2c8ec77de2..53f8d168a55 100644 --- a/htdocs/langs/uz_UZ/errors.lang +++ b/htdocs/langs/uz_UZ/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required ErrorSupplierCodeAlreadyUsed=Supplier code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' -ErrorBadImageFormat=Image file has not a supported format +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang index eb2063c629c..40bca8e85fb 100644 --- a/htdocs/langs/uz_UZ/members.lang +++ b/htdocs/langs/uz_UZ/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Late SubscriptionNotReceivedShort=Never received ListOfSubscriptions=List of subscriptions SendCardByMail=Send card by Email -AddMember=Add member +AddMember=Create member NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" NewMemberType=New member type WelcomeEMail=Welcome e-mail @@ -125,7 +125,7 @@ Date=Date DateAndTime=Date and time PublicMemberCard=Member public card MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe -AddSubscription=Add subscription +AddSubscription=Create subscription ShowSubscription=Show subscription MemberModifiedInDolibarr=Member modified in Dolibarr SendAnEMailToMember=Send information email to member @@ -203,3 +203,4 @@ MembersByNature=Members by nature VATToUseForSubscriptions=VAT rate to use for subscriptions NoVatOnSubscription=No TVA for subscriptions MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang index cb88461602d..81d217ddb54 100644 --- a/htdocs/langs/uz_UZ/products.lang +++ b/htdocs/langs/uz_UZ/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=Number of prices MultiPriceLevelsName=Price categories -AssociatedProductsAbility=Activate the virtual products feature -AssociatedProducts=Virtual product -AssociatedProductsNumber=Number of products composing this virtual product -ParentProductsNumber=Number of parent virtual product -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=Associate Translation=Translation KeywordFilter=Keyword filter @@ -132,7 +132,7 @@ AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found ProductAssociationList=List of related products/services: name of product/service (quantity affected) -ProductParentList=List of virtual products/services with this product as a component +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service ConfirmDeleteProduct=Are you sure you want to delete this product/service? @@ -179,7 +179,7 @@ CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s ? CloneContentProduct=Clone all main informations of product/service ClonePricesProduct=Clone main informations and prices -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=This product is used NewRefForClone=Ref. of new product/service CustomerPrices=Customers prices @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang index 4affd1fdc5a..c48e27fd204 100644 --- a/htdocs/langs/uz_UZ/projects.lang +++ b/htdocs/langs/uz_UZ/projects.lang @@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant Myprojects=My projects ProjectsArea=Projects area NewProject=New project -AddProject=Add project +AddProject=Create project DeleteAProject=Delete a project DeleteATask=Delete a task ConfirmDeleteAProject=Are you sure you want to delete this project ? @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=New task -AddTask=Add task +AddTask=Create task AddDuration=Add duration Activity=Activity Activities=Tasks/activities diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang index e4337309084..ea32511fefb 100644 --- a/htdocs/langs/uz_UZ/withdrawals.lang +++ b/htdocs/langs/uz_UZ/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Show Withdraw IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index 01fe161a7d1..52535054170 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Sử dụng các lĩnh vực tự động gõ để l ActivityStateToSelectCompany= Thêm tùy chọn bộ lọc để ẩn/hiện các nhà phát triển thứ ba hiện đang hoạt động hoặc đã bị xóa UseSearchToSelectContactTooltip=Ngoài ra nếu bạn có một số lượng lớn các bên thứ ba (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập CONTACT_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi. UseSearchToSelectContact=Sử dụng các trường để lựa chọn năng tự động gõ liên lạc (thay vì sử dụng một hộp danh sách). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=Tùy chọn bộ lọc tìm kiếm NumberOfKeyToSearch=Ký tự nbr để tìm: %s ViewFullDateActions=Hiển thị ngày tháng đầy đủ của sự kiện ở bảng tính thứ ba @@ -208,6 +210,7 @@ ModulesJobDesc=Module kinh doanh cung cấp thiết lập được xác định ModulesMarketPlaceDesc=Bạn có thể tìm thấy các mô-đun tải bên ngoài trang web trên Internet ... ModulesMarketPlaces=Nhiều mô-đun ... DoliStoreDesc=DoliStore, trên thị trường chính thức cho Dolibarr ERP / CRM module bên ngoài +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=Cung cấp dịch vụ trang web, bạn có thể tìm kiếm để tìm các mô-đun ... URL=Liên kết BoxesAvailable=Hộp có sẵn @@ -444,7 +447,7 @@ Module55Desc=Quản lý mã vạch Module56Name=Điện thoại Module56Desc=Tích hợp điện thoại Module57Name=Chỉ thị thanh toán định kỳ -Module57Desc=Quảng lý rút tiền và chỉ thị thanh toán định kỳ +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=Tích hợp hệ thống ClickToDial (Asterisk, ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS Feed Module320Desc=Thêm nguồn cấp dữ liệu RSS trong trang màn hình Dolibarr Module330Name=Đánh dấu Module330Desc=Quản lý Bookmark -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar tích hợp Module500Name=Chi phí đặc biệt (thuế, đóng góp xã hội, cổ tức) @@ -495,6 +498,8 @@ Module1780Name=Loại Module1780Desc=Quản lý danh mục (sản phẩm, nhà cung cấp và khách hàng) Module2000Name=Trình soạn thảo WYSIWYG Module2000Desc=Cho phép chỉnh sửa một số vùng văn bản bằng cách sử dụng một biên tập viên cao cấp +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Quản lý công việc theo lịch trình Module2400Name=Chương trình nghị sự @@ -503,6 +508,8 @@ Module2500Name=Quản lý nội dung điện tử Module2500Desc=Lưu và chia sẻ tài liệu Module2600Name=WebServices Module2600Desc=Cho phép các máy chủ dịch vụ web Dolibarr +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Sử dụng dịch vụ trực tuyến Gravatar (www.gravatar.com) để hiển thị hình ảnh của người sử dụng / thành viên (được tìm thấy với các email của họ). Cần truy cập internet Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Quản lý công việc Module20000Name=Để lại yêu cầu quản lý Module20000Desc=Khai báo và nhân viên theo yêu cầu nghỉ phép Module39000Name=Hàng loạt sản phẩm -Module39000Desc=Số lô, ăn theo và bán theo quản lý ngày sản phẩm +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=Nơi trả tiền Module50000Desc=Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với nơi trả tiền Module50100Name=Điểm bán hàng @@ -527,7 +534,7 @@ Module50200Desc=Module để cung cấp một trang thanh toán trực tuyến b Module50400Name=Kế toán (nâng cao) Module50400Desc=Kế toán quản trị (đôi bên) Module54000Name=PrintIPP -Module54000Desc=In qua Cup IPP in. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Mở Poll Module55000Desc=Mô-đun để thực hiện các cuộc thăm dò trực tuyến (như Doodle, Studs, Rdvz, ...) Module59000Name=Lợi nhuận @@ -779,6 +786,7 @@ DictionaryOrderMethods=Phương pháp đặt hàng DictionarySource=Nguồn gốc của các đề xuất / đơn đặt hàng DictionaryAccountancyplan=Biểu đồ tài khoản DictionaryAccountancysystem=Mô hình biểu đồ của tài khoản +DictionaryEMailTemplates=Emails templates SetupSaved=Thiết lập lưu BackToModuleList=Trở lại danh sách các mô-đun BackToDictionaryList=Trở lại danh sách từ điển @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Hình thức tìm kiếm thường xuyên trên menu bê DefaultLanguage=Ngôn ngữ mặc định để sử dụng (mã ngôn ngữ) EnableMultilangInterface=Kích hoạt giao diện đa ngôn ngữ EnableShowLogo=Hiển thị biểu tượng trên menu bên trái +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Hệ thống của bạn đã được cập nhật thành công CompanyInfo=Thông tin Công ty / cơ sở CompanyIds=Xác định Công ty/ Cơ sở diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang index 3f6a2a0afa0..d382aef3a06 100644 --- a/htdocs/langs/vi_VN/agenda.lang +++ b/htdocs/langs/vi_VN/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=Sự kiện được giao ActionsDoneBy=Sự kiện được thực hiện bởi ActionsForUser=Sự kiện cho người sử dụng ActionsForUsersGroup=Sự kiện cho tất cả người dùng của nhóm +ActionAssignedTo=Event assigned to AllMyActions= Tất cả các sự kiện của tôi / nhiệm vụ AllActions= Tất cả các sự kiện / nhiệm vụ ViewList=Danh sách xem diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang index 6894f90a149..c169fe2afbc 100644 --- a/htdocs/langs/vi_VN/compta.lang +++ b/htdocs/langs/vi_VN/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=theo nhà cung cấp, lựa chọn phương pháp th TurnoverPerProductInCommitmentAccountingNotRelevant=Báo cáo doanh thu mỗi sản phẩm, khi sử dụng chế độ kế toán tiền mặt là không có liên quan. Báo cáo này chỉ có sẵn khi sử dụng chế độ kế toán tham gia (xem thiết lập của module kế toán). CalculationMode=Chế độ tính toán AccountancyJournal=Đang kế toán tạp chí -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Mã kế toán mặc định để mua sản phẩm -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Mã kế toán mặc định để bán sản phẩm -ACCOUNTING_SERVICE_BUY_ACCOUNT=Mã kế toán mặc định để mua dịch vụ -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Mã kế toán mặc định để bán các dịch vụ ACCOUNTING_VAT_ACCOUNT=Kế toán mã mặc định cho thu thuế GTGT ACCOUNTING_VAT_BUY_ACCOUNT=Kế toán mã mặc định để nộp thuế GTGT ACCOUNTING_ACCOUNT_CUSTOMER=Kế toán mã bằng cách mặc định cho khách hàng thirdparties diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang index 2cafa5e8b81..e5d7db9f1bb 100644 --- a/htdocs/langs/vi_VN/contracts.lang +++ b/htdocs/langs/vi_VN/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Danh sách các đường chạy hợp đồng ListOfRunningServices=Danh sách các dịch vụ đang chạy NotActivatedServices=Dịch vụ không hoạt động (trong hợp đồng xác nhận) BoardNotActivatedServices=Dịch vụ để kích hoạt các hợp đồng xác nhận -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=Dịch vụ kích hoạt cuối% s LastModifiedServices=Dịch vụ biến đổi cuối cùng% s EditServiceLine=Dòng Chỉnh sửa dịch vụ @@ -91,6 +91,7 @@ ListOfServicesToExpire=Danh sách Dịch vụ hết hạn NoteListOfYourExpiredServices=Danh sách này chỉ bao gồm các dịch vụ hợp đồng cho các bên thứ ba mà bạn đang kết nối như là một đại diện bán hàng. StandardContractsTemplate=Hợp đồng tiêu chuẩn mẫu ContactNameAndSignature=Đối với% s, tên, chữ ký: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Bán hàng ký kết hợp đồng đại diện diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang index 8f3f349ff81..b8c8e2d59a3 100644 --- a/htdocs/langs/vi_VN/ecm.lang +++ b/htdocs/langs/vi_VN/ecm.lang @@ -24,7 +24,7 @@ ECMCreationDate=Ngày tạo ECMNbOfFilesInDir=Số lượng hồ sơ trong thư mục ECMNbOfSubDir=Số thư mục con ECMNbOfFilesInSubDir=Số ảnh trong thư mục con -ECMCreationUser=Đấng Tạo Hóa +ECMCreationUser=Người tạo ECMArea=Khu vực EDM ECMAreaDesc=Các (quản lý tài liệu điện tử) khu vực EDM cho phép bạn lưu, chia sẻ và tìm kiếm một cách nhanh chóng tất cả các loại tài liệu trong Dolibarr. ECMAreaDesc2=* Thư mục tự động được điền tự động khi thêm tài liệu từ thẻ của một phần tử.
* Hướng dẫn sử dụng các thư mục có thể được sử dụng để lưu các tài liệu không liên quan đến một yếu tố cụ thể. diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang index 2d435e1bd08..a949fb6453e 100644 --- a/htdocs/langs/vi_VN/errors.lang +++ b/htdocs/langs/vi_VN/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Mã nhà cung cấp yêu cầu ErrorSupplierCodeAlreadyUsed=Mã nhà cung cấp đã được sử dụng ErrorBadParameters=Thông số xấu ErrorBadValueForParameter=Sai giá trị '% s' cho tham số không chính xác '% s' -ErrorBadImageFormat=Tập tin hình ảnh đã không phải là một định dạng được hỗ trợ +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=Giá trị '% s' có định dạng sai ngày ErrorWrongDate=Ngày là không đúng! ErrorFailedToWriteInDir=Không thể viết trong thư mục% s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Người sử dụng có đăng nhập% s không ErrorLoginHasNoEmail=Thành viên này không có địa chỉ email. Quá trình hủy bỏ. ErrorBadValueForCode=Bad giá trị so với mã bảo vệ. Hãy thử lại với giá trị mới ... ErrorBothFieldCantBeNegative=Fields% s và% s không thể được cả hai tiêu cực +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=Tài khoản người dùng% s được sử dụng để thực hiện các máy chủ web không có sự cho phép cho điều đó ErrorNoActivatedBarcode=Không có loại mã vạch kích hoạt ErrUnzipFails=Không thể giải nén% s với ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Lỗi, thành viên này chưa ErrorThereIsSomeDeliveries=Lỗi, có một số việc giao hàng có liên quan đến lô hàng này. Xóa từ chối. ErrorCantDeletePaymentReconciliated=Không thể xóa một khoản thanh toán đã tạo ra một giao dịch ngân hàng đã được hoà giải ErrorCantDeletePaymentSharedWithPayedInvoice=Không thể xóa một khoản thanh toán được chia sẻ bởi ít nhất một hóa đơn với tình trạng payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Thiết lập các thông số bắt buộc chưa được xác định diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang index 7f11e9e529b..eb2687751c6 100644 --- a/htdocs/langs/vi_VN/members.lang +++ b/htdocs/langs/vi_VN/members.lang @@ -26,8 +26,8 @@ MembersCards=Thành viên danh thiếp MembersList=Danh sách thành viên MembersListToValid=Danh sách thành viên dự thảo (được xác nhận) MembersListValid=Danh sách thành viên hợp lệ -MembersListUpToDate=Danh sách thành viên hợp lệ lên đến thuê bao ngày -MembersListNotUpToDate=Danh sách thành viên hợp lệ với các thuê bao trong ngày +MembersListUpToDate=Danh sách thành viên hợp lệ lên đến mô tả ngày +MembersListNotUpToDate=Danh sách thành viên hợp lệ với các mô tả trong ngày MembersListResiliated=Danh sách thành viên resiliated MembersListQualified=Danh sách các thành viên đủ điều kiện MenuMembersToValidate=Dự thảo các thành viên @@ -38,7 +38,7 @@ MenuMembersResiliated=Thành viên Resiliated MembersWithSubscriptionToReceive=Thành viên có đăng ký để nhận được DateAbonment=Ngày đăng ký DateSubscription=Ngày đăng ký -DateNextSubscription=Thuê bao tiếp theo +DateNextSubscription=Mô tả tiếp theo DateEndSubscription=Ngày kết thúc đăng ký EndSubscription=Kết thúc đăng ký SubscriptionId=Id đăng ký @@ -55,7 +55,7 @@ MemberStatusDraft=Dự thảo (cần phải được xác nhận) MemberStatusDraftShort=Dự thảo MemberStatusActive=Xác nhận (đăng ký chờ đợi) MemberStatusActiveShort=Xác nhận -MemberStatusActiveLate=thuê bao hết hạn +MemberStatusActiveLate=mô tả hết hạn MemberStatusActiveLateShort=Hết hạn MemberStatusPaid=Đăng ký cập nhật MemberStatusPaidShort=Cho đến nay @@ -75,17 +75,17 @@ PaymentSubscription=Thanh toán khoản đóng góp mới EditMember=Chỉnh sửa thành viên SubscriptionEndDate=Ngày kết thúc đăng ký của MembersTypeSetup=Loại thành viên thiết lập -NewSubscription=Thuê bao mới -NewSubscriptionDesc=Hình thức này cho phép bạn ghi lại các thuê bao của bạn như là một thành viên mới của nền tảng. Nếu bạn muốn gia hạn thuê bao của bạn (nếu đã là thành viên), xin liên lạc với hội đồng quản trị nền tảng thay vì qua email% s. +NewSubscription=Mô tả mới +NewSubscriptionDesc=Hình thức này cho phép bạn ghi lại các mô tả của bạn như là một thành viên mới của nền tảng. Nếu bạn muốn gia hạn mô tả của bạn (nếu đã là thành viên), xin liên lạc với hội đồng quản trị nền tảng thay vì qua email% s. Subscription=Đăng ký Subscriptions=Đăng ký SubscriptionLate=Cuối -SubscriptionNotReceived=Thuê bao không bao giờ nhận được +SubscriptionNotReceived=Mô tả không bao giờ nhận được SubscriptionLateShort=Cuối SubscriptionNotReceivedShort=Không bao giờ nhận được ListOfSubscriptions=Danh sách đăng ký SendCardByMail=Gửi thẻ qua Email -AddMember=Thêm thành viên +AddMember=Tạo thành viên NoTypeDefinedGoToSetup=Không có loại thành viên được xác định. Tới menu "Thành viên loại" NewMemberType=Loại thành viên mới WelcomeEMail=Chào mừng e-mail @@ -100,8 +100,8 @@ Reenable=Bật lại ResiliateMember=Resiliate thành viên ConfirmResiliateMember=Bạn Bạn có chắc chắn muốn resiliate thành viên này? DeleteMember=Xóa thành viên -ConfirmDeleteMember=Bạn có chắc chắn muốn xóa thành viên này (Xóa một thành viên sẽ xóa tất cả các thuê bao của mình)? -DeleteSubscription=Xóa một thuê bao +ConfirmDeleteMember=Bạn có chắc chắn muốn xóa thành viên này (Xóa một thành viên sẽ xóa tất cả các mô tả của mình)? +DeleteSubscription=Xóa một mô tả ConfirmDeleteSubscription=Bạn Bạn có chắc chắn muốn xóa đăng ký này? Filehtpasswd=tập tin htpasswd ValidateMember=Xác nhận thành viên @@ -125,8 +125,8 @@ Date=Ngày DateAndTime=Ngày và thời gian PublicMemberCard=Thẻ thành viên công cộng MemberNotOrNoMoreExpectedToSubscribe=Thành viên không hoặc không mong đợi để đăng ký -AddSubscription=Thêm thuê bao -ShowSubscription=Hiện thuê bao +AddSubscription=Tạo mô tả +ShowSubscription=Hiện mô tả MemberModifiedInDolibarr=Thành viên sửa đổi trong Dolibarr SendAnEMailToMember=Gửi email thông tin cho các thành viên DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Chủ đề của e-mail nhận được trong trường hợp tự động ghi của khách @@ -135,8 +135,8 @@ DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Tiêu đề thư điện tử cho thành DescADHERENT_AUTOREGISTER_MAIL=Thư điện tử của thành viên autosubscription DescADHERENT_MAIL_VALID_SUBJECT=Tiêu đề thư điện tử để xác nhận thành viên DescADHERENT_MAIL_VALID=Thư điện tử để xác nhận thành viên -DescADHERENT_MAIL_COTIS_SUBJECT=Tiêu đề thư điện tử cho thuê bao -DescADHERENT_MAIL_COTIS=Thư điện tử cho thuê bao +DescADHERENT_MAIL_COTIS_SUBJECT=Tiêu đề thư điện tử cho mô tả +DescADHERENT_MAIL_COTIS=Thư điện tử cho mô tả DescADHERENT_MAIL_RESIL_SUBJECT=Tiêu đề thư điện tử cho thành viên resiliation DescADHERENT_MAIL_RESIL=Thư điện tử của thành viên resiliation DescADHERENT_MAIL_FROM=Tên người gửi thư điện tử cho email tự động @@ -155,7 +155,7 @@ NoThirdPartyAssociatedToMember=Không có bên thứ ba liên quan đến thành ThirdPartyDolibarr=Bên thứ ba Dolibarr MembersAndSubscriptions= Thành viên và theo dõi MoreActions=Hành động bổ sung vào thu -MoreActionsOnSubscription=Hành động bổ sung, đề nghị theo mặc định khi ghi âm một thuê bao +MoreActionsOnSubscription=Hành động bổ sung, đề nghị theo mặc định khi ghi âm một mô tả MoreActionBankDirect=Tạo một bản ghi giao dịch trực tiếp trên tài khoản MoreActionBankViaInvoice=Tạo hóa đơn và thanh toán trên tài khoản MoreActionInvoiceOnly=Tạo hóa đơn không có thanh toán @@ -164,7 +164,7 @@ LinkToGeneratedPagesDesc=Màn hình này cho phép bạn tạo ra các tập tin DocForAllMembersCards=Tạo danh thiếp cho tất cả các thành viên DocForOneMemberCards=Tạo danh thiếp cho một thành viên đặc biệt DocForLabels=Tạo tờ địa chỉ -SubscriptionPayment=Thanh toán thuê bao +SubscriptionPayment=Thanh toán mô tả LastSubscriptionDate=Cuối ngày đăng ký LastSubscriptionAmount=Số lượng đăng ký cuối cùng MembersStatisticsByCountries=Thành viên thống kê của đất nước @@ -180,17 +180,17 @@ MembersByTownDesc=Màn hình này hiển thị cho bạn số liệu thống kê MembersStatisticsDesc=Chọn thống kê mà bạn muốn đọc ... MenuMembersStats=Thống kê LastMemberDate=Ngày thành viên cuối cùng -Nature=Thiên nhiên +Nature=Tự nhiên Public=Thông tin được công khai Exports=Xuất khẩu NewMemberbyWeb=Thành viên mới được bổ sung. Đang chờ phê duyệt NewMemberForm=Hình thức thành viên mới -SubscriptionsStatistics=Thống kê về thuê bao +SubscriptionsStatistics=Thống kê về mô tả NbOfSubscriptions=Số đăng ký -AmountOfSubscriptions=Số tiền thuê bao +AmountOfSubscriptions=Số tiền mô tả TurnoverOrBudget=Doanh thu (cho một công ty) hay Ngân sách nhà nước (đối với một nền tảng) -DefaultAmount=Số lượng mặc định của thuê bao -CanEditAmount=Khách có thể chọn / chỉnh sửa số lượng thuê bao của mình +DefaultAmount=Số lượng mặc định của mô tả +CanEditAmount=Khách có thể chọn / chỉnh sửa số lượng mô tả của mình MEMBER_NEWFORM_PAYONLINE=Nhảy vào trang tích hợp thanh toán trực tuyến Associations=Cơ sở Collectivités=Tổ chức @@ -199,7 +199,8 @@ Entreprises=Các công ty DOLIBARRFOUNDATION_PAYMENT_FORM=Để thực hiện thanh toán đăng ký của bạn bằng cách sử dụng chuyển khoản ngân hàng, xem trang http://wiki.dolibarr.org/index.php/Subscribe .
Để thanh toán bằng cách sử dụng thẻ tín dụng hoặc Paypal, bấm vào nút ở dưới cùng của trang này.
ByProperties=Bởi đặc điểm MembersStatisticsByProperties=Thành viên thống kê theo các đặc điểm -MembersByNature=Thành viên của thiên nhiên -VATToUseForSubscriptions=Thuế suất thuế GTGT để sử dụng cho thuê bao -NoVatOnSubscription=Không TVA cho thuê bao -MEMBER_PAYONLINE_SENDEMAIL=Gửi email cảnh báo khi Dolibarr nhận được xác nhận của một xác nhận thanh toán cho thuê bao +MembersByNature=Thành viên của tự nhiên +VATToUseForSubscriptions=Thuế suất thuế GTGT để sử dụng cho mô tả +NoVatOnSubscription=Không TVA cho mô tả +MEMBER_PAYONLINE_SENDEMAIL=Gửi email cảnh báo khi Dolibarr nhận được xác nhận của một xác nhận thanh toán cho mô tả +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang index 38a20e0037d..6229c7c4a90 100644 --- a/htdocs/langs/vi_VN/products.lang +++ b/htdocs/langs/vi_VN/products.lang @@ -17,8 +17,8 @@ ProductVatMassChange=Thay đổi thuế GTGT hàng loạt ProductVatMassChangeDesc=Trang này có thể được sử dụng để sửa đổi một thuế suất thuế GTGT được xác định trên sản phẩm hoặc dịch vụ từ một giá trị khác. Cảnh báo, sự thay đổi này được thực hiện trên tất cả các cơ sở dữ liệu. MassBarcodeInit=Khối lượng mã vạch init MassBarcodeInitDesc=Trang này có thể được sử dụng để khởi tạo một mã vạch trên các đối tượng mà không có mã vạch xác định. Kiểm tra trước đó thiết lập các mô-đun mã vạch hoàn tất. -ProductAccountancyBuyCode=Đang Toán (mua) -ProductAccountancySellCode=Đang kế toán (bán) +ProductAccountancyBuyCode=Mã kế toán (mua) +ProductAccountancySellCode=Mã kế toán (bán) ProductOrService=Sản phẩm hoặc dịch vụ ProductsAndServices=Sản phẩm và dịch vụ ProductsOrServices=Sản phẩm hoặc dịch vụ @@ -46,10 +46,10 @@ Warehouse=Kho Warehouses=Các kho hàng WarehouseOpened=Kho mở WarehouseClosed=Kho đóng -Stock=Cổ -Stocks=Cổ phiếu -Movement=Phong trào -Movements=Biến động +Stock=tồn kho +Stocks=tồn kho phiếu +Movement=Chuyển kho +Movements=Danh sách chuyển kho Sell=Bán hàng Buy=Mua OnSell=Bán @@ -117,12 +117,12 @@ ServiceLimitedDuration=Nếu sản phẩm là một dịch vụ với thời gia MultiPricesAbility=Một số mức giá cho mỗi sản phẩm / dịch vụ MultiPricesNumPrices=Số giá MultiPriceLevelsName=Loại giá -AssociatedProductsAbility=Kích hoạt tính năng sản phẩm ảo -AssociatedProducts=Sản phẩm ảo -AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm ảo này -ParentProductsNumber=Số phụ huynh sản phẩm ảo -IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm ảo -IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm ảo +AssociatedProductsAbility=Kích hoạt tính năng gói ảo +AssociatedProducts=Sản phẩm trọn gói +AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm này gói ảo +ParentProductsNumber=Số sản phẩm bao bì mẹ +IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm trọn gói ảo +IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm gói ảo EditAssociate=Phó Translation=Dịch KeywordFilter=Bộ lọc từ khóa @@ -132,7 +132,7 @@ AddDel=Thêm / Xóa Quantity=Số lượng NoMatchFound=Không có trận đấu được tìm thấy ProductAssociationList=Danh sách sản phẩm / dịch vụ liên quan: tên của sản phẩm / dịch vụ (số lượng bị ảnh hưởng) -ProductParentList=Danh sách sản phẩm ảo / dịch vụ với sản phẩm này như một thành phần +ProductParentList=Danh sách sản phẩm / dịch vụ trọn gói với sản phẩm này như là một thành phần ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được lựa chọn là cha mẹ với sản phẩm hiện tại DeleteProduct=Xóa một sản phẩm / dịch vụ ConfirmDeleteProduct=Bạn Bạn có chắc chắn muốn xóa sản phẩm này / dịch vụ? @@ -147,13 +147,13 @@ DeleteProductLine=Xóa dòng sản phẩm ConfirmDeleteProductLine=Bạn Bạn có chắc chắn muốn xóa dòng sản phẩm này? NoProductMatching=Không có sản phẩm / dịch vụ phù hợp với tiêu chí của bạn MatchingProducts=Phù hợp với sản phẩm / dịch vụ -NoStockForThisProduct=Không có cổ phiếu nào cho sản phẩm này -NoStock=Không Cổ -Restock=Trồng cây +NoStockForThisProduct=Không có tồn kho nào cho sản phẩm này +NoStock=Không tồn kho +Restock=Restock ProductSpecial=Đặc biệt QtyMin=Số lượng tối thiểu PriceQty=Giá cho số lượng này -PriceQtyMin=Giá cho min này. SL (w / o giảm giá) +PriceQtyMin=Giá cho tối thiểu này. SL (w / o giảm giá) VATRateForSupplierProduct=Tỷ lệ thuế GTGT (đối với nhà cung cấp / sản phẩm) DiscountQtyMin=Mặc định giảm giá cho SL NoPriceDefinedForThisSupplier=Không có giá / SL xác định cho nhà cung cấp / sản phẩm @@ -175,11 +175,11 @@ ListProductByPopularity=Danh sách sản phẩm nổi tiếng ListServiceByPopularity=Danh sách các dịch vụ nổi tiếng Finished=Sản phẩm sản xuất RowMaterial=Nguyên liệu -CloneProduct=Sản phẩm hoặc dịch vụ Clone +CloneProduct=Sản phẩm hoặc dịch vụ sao chép ConfirmCloneProduct=Bạn có chắc chắn bạn muốn nhân bản sản phẩm hoặc dịch vụ% s? CloneContentProduct=Sao lưu tất cả thông tin chính của sản phẩm / dịch vụ -ClonePricesProduct=Thông tin chính Clone và giá cả -CloneCompositionProduct=Ảo sản phẩm / dịch vụ Clone +ClonePricesProduct=Thông tin chính sao chép và giá cả +CloneCompositionProduct=sao chép đóng gói sản phẩm / dịch vụ ProductIsUsed=Sản phẩm này được sử dụng NewRefForClone=Tài liệu tham khảo. các sản phẩm mới / dịch vụ CustomerPrices=Giá khách hàng @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Đặt giá trên cùng một công ty con của khách PriceByCustomerLog=Giá bán của khách hàng đăng nhập MinimumPriceLimit=Giá tối thiểu không thấp hơn% s MinimumRecommendedPrice=Giá đề nghị tối thiểu là:% s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang index 53fbbdafe60..a6ccfac4cf2 100644 --- a/htdocs/langs/vi_VN/projects.lang +++ b/htdocs/langs/vi_VN/projects.lang @@ -14,7 +14,7 @@ TasksDesc=Phần xem này hiển thị tất cả các dự án và tác vụ (q Myprojects=Dự án của tôi ProjectsArea=Khu vực dự án NewProject=Dự án mới -AddProject=Thêm dự án +AddProject=Tạo dự án DeleteAProject=Xóa một dự án DeleteATask=Xóa một tác vụ ConfirmDeleteAProject=Bạn có chắc muốn xóa dự án này? @@ -36,6 +36,8 @@ TaskTimeSpent=Thời gian dành cho công việc TaskTimeUser=Người sử dụng TaskTimeNote=Lưu ý TaskTimeDate=Ngày +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=Thời gian đã qua mới MyTimeSpent=Thời gian đã qua của tôi MyTasks=Tác vụ của tôi @@ -45,7 +47,7 @@ TaskDateStart=Nhiệm vụ ngày bắt đầu TaskDateEnd=Nhiệm vụ ngày kết thúc TaskDescription=Mô tả công việc NewTask=Tác vụ mới -AddTask=Thêm tác vụ +AddTask=Tạo công việc AddDuration=Thêm độ dài thời gian Activity=Hoạt động Activities=Tác vụ/hoạt động @@ -85,13 +87,13 @@ ActionsOnProject=Các sự kiện liên quan đến dự án YouAreNotContactOfProject=Bạn không thuộc phần liên lạc đối với chủ đề thuộc phạm vi riêng tư này DeleteATimeSpent=Xóa thời gian đã bỏ ra ConfirmDeleteATimeSpent=Bạn có chắc muốn xóa thời gian đã bỏ ra? -DoNotShowMyTasksOnly=See also tasks not assigned to me -ShowMyTasksOnly=View only tasks assigned to me +DoNotShowMyTasksOnly=Xem thêm nhiệm vụ không được gán cho tôi +ShowMyTasksOnly=Xem chỉ nhiệm vụ được giao với tôi TaskRessourceLinks=Các nguồn tài nguyên ProjectsDedicatedToThisThirdParty=Các dự án được dành riêng cho bên thứ ba này NoTasks=Không có tác vụ nào cho dự án này LinkedToAnotherCompany=Được liên kết đến các bên thứ ba -TaskIsNotAffectedToYou=Task not assigned to you +TaskIsNotAffectedToYou=Nhiệm vụ không được giao cho bạn ErrorTimeSpentIsEmpty=Thời gian đã qua hiện đang rỗng ThisWillAlsoRemoveTasks=Thao tác này sẽ xóa toàn bộ các tác vụ của dự án (%s các tác vụ ở thời điểm hiện tại) và toàn bộ dữ liệu đã nhập vào trong suốt thời gian vừa qua. IfNeedToUseOhterObjectKeepEmpty=Nếu một số đối tượng (đơn hàng, đơn đặt hàng, ...), thuộc về một bên thứ ba khác, phải có đường liên kết đến dự án để tạo, duy trì phần này rỗng để dự án có thể có sự tham gia của nhiều bên thứ ba khác @@ -120,7 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Đóng góp TypeContact_project_task_external_TASKCONTRIBUTOR=Đóng góp SelectElement=Chọn phần AddElement=Liên kết đến yếu tố -UnlinkElement=Unlink element +UnlinkElement=Yếu tố Bỏ liên kết # Documents models DocumentModelBaleine=Mô hình báo cáo hoàn chỉnh của dự án (lôgô...) PlannedWorkload = Tải tiến trình công việc đã dự định @@ -129,4 +131,4 @@ ProjectReferers=Các đối tượng tham chiếu SearchAProject=Tìm kiếm một dự án ProjectMustBeValidatedFirst=Dự án phải được xác nhận đầu tiên ProjectDraft=Dự thảo dự án -FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +FirstAddRessourceToAllocateTime=Kết hợp một ressource để phân bổ thời gian diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang index bb544bbfc61..6e9b8aef50b 100644 --- a/htdocs/langs/vi_VN/propal.lang +++ b/htdocs/langs/vi_VN/propal.lang @@ -16,7 +16,7 @@ Prospect=Triển vọng ProspectList=Danh sách khách hàng tiềm năng DeleteProp=Xóa đề nghị thương mại ValidateProp=Xác nhận đề nghị thương mại -AddProp=Thêm đề nghị +AddProp=Tạo đề xuất ConfirmDeleteProp=Bạn Bạn có chắc chắn muốn xóa đề nghị thương mại này? ConfirmValidateProp=Bạn có chắc chắn bạn muốn xác nhận đề nghị thương mại này dưới tên% s? LastPropals=Cuối% s đề xuất @@ -55,8 +55,6 @@ NoOpenedPropals=Không có đề xuất thương mại mở NoOtherOpenedPropals=Không có đề xuất thương mại mở khác RefProposal=Đề nghị ref thương mại SendPropalByMail=Gửi đề nghị thương mại qua đường bưu điện -FileNotUploaded=Các tập tin không được tải lên -FileUploaded=Các tập tin được tải lên thành công AssociatedDocuments=Các tài liệu liên quan đến đề nghị: ErrorCantOpenDir=Không thể mở thư mục DatePropal=Ngày đề nghị @@ -76,7 +74,7 @@ CopyPropalFrom=Tạo đề nghị thương mại bằng cách sao chép đề ng CreateEmptyPropal=Tạo ra sản phẩm nào đề xuất thương mại Vierge hoặc từ danh sách các sản phẩm / dịch vụ DefaultProposalDurationValidity=Mặc định thời hạn đề nghị thương mại (trong ngày) UseCustomerContactAsPropalRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ đề nghị người nhận -ClonePropal=Đề nghị thương mại Clone +ClonePropal=Đề nghị thương mại sao chép ConfirmClonePropal=Bạn có chắc chắn bạn muốn nhân bản đề nghị thương mại% s? ConfirmReOpenProp=Bạn có chắc chắn bạn muốn mở lại đề nghị thương mại% s? ProposalsAndProposalsLines=Đề nghị thương mại và dòng diff --git a/htdocs/langs/vi_VN/resource.lang b/htdocs/langs/vi_VN/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/vi_VN/resource.lang +++ b/htdocs/langs/vi_VN/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang index a8c8d228906..39ad630c510 100644 --- a/htdocs/langs/vi_VN/suppliers.lang +++ b/htdocs/langs/vi_VN/suppliers.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Nhà cung cấp Supplier=Nhà cung cấp -AddSupplier=Thêm một nhà cung cấp +AddSupplier=Tạo một nhà cung cấp SupplierRemoved=Nhà cung cấp loại bỏ SuppliersInvoice=Nhà cung cấp hóa đơn NewSupplier=Nhà cung cấp mới @@ -11,7 +11,7 @@ ShowSupplier=Hiện nhà cung cấp OrderDate=Ngày đặt hàng BuyingPrice=Giá mua BuyingPriceMin=Giá mua tối thiểu -BuyingPriceMinShort=Min giá mua +BuyingPriceMinShort=Tối thiểu giá mua TotalBuyingPriceMin=Tổng số subproducts giá mua SomeSubProductHaveNoPrices=Một số phụ phẩm đã có giá quy định AddSupplierPrice=Thêm giá nhà cung cấp @@ -40,5 +40,5 @@ AddSupplierInvoice=Tạo nhà cung cấp hóa đơn ListOfSupplierProductForSupplier=Danh sách sản phẩm và giá cả cho nhà cung cấp% s NoneOrBatchFileNeverRan=Không có hoặc hàng loạt% s không chạy gần đây SentToSuppliers=Gửi đến nhà cung cấp -ListOfSupplierOrders=List of supplier orders -MenuOrdersSupplierToBill=Supplier orders to invoice +ListOfSupplierOrders=Danh sách các đơn đặt hàng nhà cung cấp +MenuOrdersSupplierToBill=Đơn đặt hàng nhà cung cấp cho hóa đơn diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang index 9a2f990f6b0..846f80ab12d 100644 --- a/htdocs/langs/vi_VN/withdrawals.lang +++ b/htdocs/langs/vi_VN/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=Về tín dụng WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=Hiện Rút IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuy nhiên, nếu hóa đơn có ít nhất một thanh toán rút chưa qua chế biến, nó sẽ không được thiết lập như là trả tiền để cho phép quản lý thu hồi trước. -DoStandingOrdersBeforePayments=Thẻ này cho phép bạn yêu cầu để đứng. Sau khi hoàn tất, bạn có thể gõ thanh toán để đóng hóa đơn. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Thu hồi tập tin SetToStatusSent=Thiết lập để tình trạng "File gửi" ThisWillAlsoAddPaymentOnInvoice=Điều này cũng sẽ áp dụng chi trả cho các hóa đơn và sẽ phân loại là "Đã thanh toán" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Thanh toán đứng thứ tự% s của ngân hàng diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 7cc1e718e38..aa7361675a0 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=使用自动填充字段来选择第三方(而不是使 ActivityStateToSelectCompany= 添加一个筛选器选项来显示/隐藏当前有往来或已停止往来的客户/供应商。 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=使用自动填充字段来选择联系人（而不是使用一个列表框）。 +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=搜索过滤选项 NumberOfKeyToSearch=触发搜索的字符数量：%s ViewFullDateActions=在第三表中显示全天事件 @@ -208,6 +210,7 @@ ModulesJobDesc=业务模块为特定业务提供简单的 Dolibarr 预制设置 ModulesMarketPlaceDesc=您可以在一些外部网站上找到更多的模块(安全性未知)... ModulesMarketPlaces=更多模块... DoliStoreDesc=DoliStore，为 Dolibarr 的 ERP/CRM 的外部模块官方市场 +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=网站提供者可以搜索找到更多模块... URL=链接 BoxesAvailable=资讯框可用 @@ -444,7 +447,7 @@ Module55Desc=条码的管理 Module56Name=电话 Module56Desc=电话整合 Module57Name=长期订单 -Module57Desc=长期订单和提款管理 +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=单击拨号 Module58Desc=单击拨号系统集成(Asterisk ...) Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS 源 Module320Desc=添加 RSS 源至 Dolibarr 主屏幕页面 Module330Name=书签 Module330Desc=书签的管理 -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar 整合 Module500Name=特别费用（税，社会公益，股息） @@ -495,6 +498,8 @@ Module1780Name=分类 Module1780Desc=分类的管理(产品、供应商和客户) Module2000Name=所见即所得编辑器 Module2000Desc=允许在一些文本编辑区中使用所见即所得编辑器 +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=任务排程管理 Module2400Name=日程 @@ -503,6 +508,8 @@ Module2500Name=电子内容管理 Module2500Desc=保存和共享文件 Module2600Name=SOAP WebServices Module2600Desc=启用 Dolibarr Web 服务的服务器 +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=使用网上的 Gravatar 服务(www.gravatar.com)，显示 用户/成员的头像(通过电邮搜索)。需要互联网连接。 Module2800Desc=FTP 客户端 @@ -517,7 +524,7 @@ Module6000Desc=工作流管理 Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=产品批号 -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=出纳 Module50000Desc=模块通过 PayBox 提供信用卡网上支付页面 Module50100Name=POS @@ -527,7 +534,7 @@ Module50200Desc=模块提供信用卡与Paypal网上支付页面 Module50400Name=财会(高级) Module50400Desc=会计管理(双方) Module54000Name=IPP打印 -Module54000Desc=通过CUPS IPP 打印机打印 . 注：CUPS IPP:支持Internet协议的Unix打印系统 +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=利润空间 @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=设定值已储存 BackToModuleList=返回模块列表 BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=常驻左侧菜单搜寻框 DefaultLanguage=默认语言使用(语言代码) EnableMultilangInterface=启用多语言界面 EnableShowLogo=左侧菜单中显示公司标志 +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=您的系统已成功更新 CompanyInfo=公司资讯 CompanyIds=公司/协会的编号 diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang index f0baa362ff1..50054428dab 100644 --- a/htdocs/langs/zh_CN/agenda.lang +++ b/htdocs/langs/zh_CN/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=受影响的行动 ActionsDoneBy=做的动作 ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= 我所有的事件/任务 AllActions= 所有/任务行动 ViewList=查看列表 diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang index cc7916bbd7d..1386b63e55c 100644 --- a/htdocs/langs/zh_CN/compta.lang +++ b/htdocs/langs/zh_CN/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=根据供应商，选择适当的方法来套用相 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=计算模式 AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=购货缺省会计代码 -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=卖货缺省会计代码 -ACCOUNTING_SERVICE_BUY_ACCOUNT=购买服务缺省会计编码 -ACCOUNTING_SERVICE_SOLD_ACCOUNT=出售服务缺省会计代码 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=第三方客户缺省会计代码 diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang index d24baa68199..b5ccca60cad 100644 --- a/htdocs/langs/zh_CN/contracts.lang +++ b/htdocs/langs/zh_CN/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=名单合同线运行 ListOfRunningServices=运行服务的列表 NotActivatedServices=不活跃的服务（除验证合同） BoardNotActivatedServices=服务激活验证合同之间 -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=上次%s的激活服务 LastModifiedServices=最后%S修饰服务 EditServiceLine=编辑服务项目 @@ -91,6 +91,7 @@ ListOfServicesToExpire=服务到期列表 NoteListOfYourExpiredServices=此列表只包含你作为一个销售代表与第三方的服务合同 。 StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=销售代表签订合同 diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang index abbf725b3f9..1a9cf940bfd 100644 --- a/htdocs/langs/zh_CN/errors.lang +++ b/htdocs/langs/zh_CN/errors.lang @@ -27,7 +27,7 @@ ErrorProdIdIsMandatory=%s 是强制性的 ErrorBadCustomerCodeSyntax=坏客户代码的语法 ErrorBadBarCodeSyntax=Bad syntax for bar code ErrorCustomerCodeRequired=客户代码需要 -ErrorBarCodeRequired=Bar code required +ErrorBarCodeRequired=需要条形码 ErrorCustomerCodeAlreadyUsed=客户代码已被使用 ErrorBarCodeAlreadyUsed=Bar code already used ErrorPrefixRequired=前缀要求 @@ -37,9 +37,9 @@ ErrorSupplierCodeRequired=要求供应商代码 ErrorSupplierCodeAlreadyUsed=供应商代码已被使用 ErrorBadParameters=错误的参数 ErrorBadValueForParameter=错误值“参数不正确”%s %s'“ -ErrorBadImageFormat=图像文件有不支持的格式 +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=值“%s”有错误的日期格式 -ErrorWrongDate=Date is not correct! +ErrorWrongDate=日期不正确！ ErrorFailedToWriteInDir=无法写在目录%s ErrorFoundBadEmailInFile=找到%S的语法不正确的电子邮件文件中的行（例如行%的电子邮件s =%s）的 ErrorUserCannotBeDelete=用户不能被删除。也许它是相关联的Dolibarr实体。 @@ -74,7 +74,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=无法储存与行动“规约未启动 ErrorRefAlreadyExists=号的创作已经存在。 ErrorPleaseTypeBankTransactionReportName=请输入银行收据的名字在交易报告（格式YYYYMM或采用YYYYMMDD） ErrorRecordHasChildren=删除记录失败，因为它有一些儿童。 -ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object. +ErrorRecordIsUsedCantDelete=不能删除记录。它已被使用或者包含在其他对象中。 ErrorModuleRequireJavascript=不能禁用JavaScript必须有此功能的工作。要启用/禁用JavaScript，进入菜单首页->安装->“显示。 ErrorPasswordsMustMatch=这两种类型的密码必须相互匹配 ErrorContactEMail=一个技术性错误发生。请联系管理员，以下连接提供错误代码%s在您的邮件，甚至更好，加入了这个页面的屏幕拷贝的电子邮件%s。 @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=如何正确使用手机与登录%找不 ErrorLoginHasNoEmail=这位用户没有电子邮件地址。进程中止。 ErrorBadValueForCode=代码有错误的值类型。再次尝试以新的价值... ErrorBothFieldCantBeNegative=领域的%s及%s可以不消极 +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=%s用来执行Web服务器用户帐户没有该权限 ErrorNoActivatedBarcode=没有激活的条码类型 ErrUnzipFails=%s 无法解压缩与解压缩 @@ -132,11 +133,29 @@ ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setu ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature. ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs -ErrorBadFormat=Bad format! +ErrorBadFormat=格式错误！ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=强制设置参数尚未定义 diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang index 77941da84a9..c1f903270ce 100644 --- a/htdocs/langs/zh_CN/members.lang +++ b/htdocs/langs/zh_CN/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=晚 SubscriptionNotReceivedShort=从未收到 ListOfSubscriptions=订阅名单 SendCardByMail=发送卡 -AddMember=加入会员 +AddMember=Create member NoTypeDefinedGoToSetup=任何成员类型定义。前往设置 - 会员类型 NewMemberType=新会员类型 WelcomeEMail=欢迎电子邮件 @@ -125,7 +125,7 @@ Date=日期 DateAndTime=日期和时间 PublicMemberCard=市民卡会员 MemberNotOrNoMoreExpectedToSubscribe=会员没有或没有更多的预期订阅 -AddSubscription=添加订阅 +AddSubscription=Create subscription ShowSubscription=显示订阅 MemberModifiedInDolibarr=会员修改Dolibarr SendAnEMailToMember=向会员发送信息的电子邮件 @@ -170,6 +170,8 @@ LastSubscriptionAmount=最后认购金额 MembersStatisticsByCountries=成员由国家统计 MembersStatisticsByState=成员由州/省的统计信息 MembersStatisticsByTown=成员由镇统计 +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=成员数 NoValidatedMemberYet=没有验证的成员发现 MembersByCountryDesc=该屏幕显示您成员国的统计数字。然而，图形取决于谷歌在线图服务，可只有一个互联网连接工作。 @@ -201,3 +203,4 @@ MembersByNature=会员按性质 VATToUseForSubscriptions=增值税率，用于订阅 NoVatOnSubscription=没有增值税订阅 MEMBER_PAYONLINE_SENDEMAIL=通过电子邮件发送警告Dolibarr时收到一个确认的验证支付认购 +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang index cdd5034bf78..d308f2dbaa5 100644 --- a/htdocs/langs/zh_CN/products.lang +++ b/htdocs/langs/zh_CN/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=如果产品是有限期的服务： MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=价格个数 MultiPriceLevelsName=价格分类 -AssociatedProductsAbility=启用虚拟产品功能 -AssociatedProducts=虚拟产品 -AssociatedProductsNumber=组成此虚拟产品的产品数量 -ParentProductsNumber=父虚拟产品的数量 -IfZeroItIsNotAVirtualProduct=0 表示非虚拟产品 -IfZeroItIsNotUsedByVirtualProduct=0 表示此产品未被任何虚拟产品引用。 +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=关联 Translation=翻译 KeywordFilter=关键词筛选 @@ -132,7 +132,7 @@ AddDel=添加/删除 Quantity=数量 NoMatchFound=未发现匹配项目 ProductAssociationList=相关产品/服务列表: 产品/服务名称 (按数量) -ProductParentList=由此产品组成的虚拟产品或服务 +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=所选产品中有当前产品的父产品 DeleteProduct=删除产品/服务 ConfirmDeleteProduct=您确定要删除此产品/服务吗？ @@ -179,7 +179,7 @@ CloneProduct=复制产品/服务 ConfirmCloneProduct=您确定要复制产品或服务 %s 吗? CloneContentProduct=复制产品/服务的所有主要信息 ClonePricesProduct=复制主要信息/价格 -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=此产品已使用 NewRefForClone=新产品/服务的编号 CustomerPrices=销售价格 @@ -217,11 +217,11 @@ ProductsMultiPrice=产品多重价格 ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) ProductSellByQuarterHT=Products turnover quarterly VWAP ServiceSellByQuarterHT=Services turnover quarterly VWAP -Quarter1=1st. Quarter -Quarter2=2nd. Quarter -Quarter3=3rd. Quarter -Quarter4=4th. Quarter -BarCodePrintsheet=Print bar code +Quarter1=第1季度 +Quarter2=第2季度 +Quarter3=第3季度 +Quarter4=第4季度 +BarCodePrintsheet=打印条形码 PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s. NumberOfStickers=Number of stickers to print on page PrintsheetForOneBarCode=Print several stickers for one barcode @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang index e9fd2afcaeb..cb9cecbc481 100644 --- a/htdocs/langs/zh_CN/projects.lang +++ b/htdocs/langs/zh_CN/projects.lang @@ -14,7 +14,7 @@ TasksDesc=这种观点提出的所有项目和任务（您的用户权限批准 Myprojects=我的项目 ProjectsArea=项目领域 NewProject=新项目 -AddProject=新增项目 +AddProject=Create project DeleteAProject=删除一个项目 DeleteATask=删除任务 ConfirmDeleteAProject=你确定要删除此项目吗？ @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=新的时间 MyTimeSpent=我的时间花 MyTasks=我的任务 @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=新任务 -AddTask=新增任务 +AddTask=Create task AddDuration=添加时间 Activity=活动 Activities=任务/活动 diff --git a/htdocs/langs/zh_CN/resource.lang b/htdocs/langs/zh_CN/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/zh_CN/resource.lang +++ b/htdocs/langs/zh_CN/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang index 0c7d34a38f5..fa4949d1971 100644 --- a/htdocs/langs/zh_CN/withdrawals.lang +++ b/htdocs/langs/zh_CN/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=信贷 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=显示撤柜 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=然而，如果发票已至少有一个撤出支付尚未处理的，它不会被设置为支付最高允许管理撤出之前。 -DoStandingOrdersBeforePayments=这个标签允许你为一个固定的订单要求。一旦完成，你可以键入付款，收发票。 +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=撤回文件 SetToStatusSent=设置状态“发送的文件” ThisWillAlsoAddPaymentOnInvoice=这也将创造在付款发票上，将它们归类支付 +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=由银行支付的长期订单%s diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 001aa613e7e..55ae292a37f 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste ActivityStateToSelectCompany= 添加一個篩選器的選項，以顯示/隱藏thirdparties，這是在目前的活動或已停止 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) SearchFilter=搜尋過濾選項 NumberOfKeyToSearch=需要 %s 個字元來觸發搜尋 ViewFullDateActions=充分顯示行動的日期，第三表 @@ -208,6 +210,7 @@ ModulesJobDesc=業務模組提供特定業務簡單的Dolibarr預定義設置。 ModulesMarketPlaceDesc=你可以找到更多的模組，以在互聯網上下載的外部網站的... ModulesMarketPlaces=更多的模組... DoliStoreDesc=DoliStore，為Dolibarr的ERP / CRM的外部模組官方市場 +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) WebSiteDesc=網站提供者可以搜尋找到更多的模組... URL=連結 BoxesAvailable=資訊框可用 @@ -444,7 +447,7 @@ Module55Desc=條碼的管理 Module56Name=電話 Module56Desc=電話整合 Module57Name=長期訂購 -Module57Desc=長期訂購和提款管理 +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. Module58Name=ClickToDial Module58Desc=ClickToDial一體化 Module59Name=Bookmark4u @@ -475,8 +478,8 @@ Module320Name=RSS饋送 Module320Desc=添加RSS飼料內Dolibarr屏幕頁面 Module330Name=書籤 Module330Desc=書籤的管理 -Module400Name=Projects/Opportunity -Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar一體化 Module500Name=Special expenses (tax, social contributions, dividends) @@ -495,6 +498,8 @@ Module1780Name=分類 Module1780Desc=分類的管理（產品，供應商和客戶） Module2000Name=fckeditor的 Module2000Desc=所見即所得的編輯器 +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron Module2300Desc=Scheduled task management Module2400Name=議程 @@ -503,6 +508,8 @@ Module2500Name=電子內容管理 Module2500Desc=保存和共享文件 Module2600Name=的WebServices Module2600Desc=啟用Web服務的服務器Dolibarr +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=的Gravatar Module2700Desc=使用網上的Gravatar服務（www.gravatar.com），以顯示/成員（與他們的電子郵件用戶發現照片）。需要一個互聯網接入 Module2800Desc=FTP Client @@ -517,7 +524,7 @@ Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=出納 Module50000Desc=模組提供信用卡網上支付頁面與出納 Module50100Name=銷售點 @@ -527,7 +534,7 @@ Module50200Desc=模組提供信用卡與Paypal網上支付頁面 Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=Print via Cups IPP Printer. +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). Module55000Name=Open Poll Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=設定值已儲存 BackToModuleList=返回模組列表 BackToDictionaryList=Back to dictionaries list @@ -888,6 +896,7 @@ PermanentLeftSearchForm=常駐左搜尋列表菜單 DefaultLanguage=預設語言使用（語言代碼） EnableMultilangInterface=啟用多語言界面 EnableShowLogo=在菜單上顯示的標誌 +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=您的系統已成功更新 CompanyInfo=公司/基本資訊 CompanyIds=公司/基本ID diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang index eaa4f1ff00d..65870ed6994 100644 --- a/htdocs/langs/zh_TW/agenda.lang +++ b/htdocs/langs/zh_TW/agenda.lang @@ -29,6 +29,7 @@ ActionsToDoBy=受影響的行動 ActionsDoneBy=做的動作 ActionsForUser=Events for user ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to AllMyActions= 我所有的行動/任務 AllActions= 所有/任務行動 ViewList=查看列表 diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang index 0550676f5a9..90a7651497b 100644 --- a/htdocs/langs/zh_TW/compta.lang +++ b/htdocs/langs/zh_TW/compta.lang @@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties diff --git a/htdocs/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang index 65b0b67e7fa..d513a4f4b35 100644 --- a/htdocs/langs/zh_TW/contracts.lang +++ b/htdocs/langs/zh_TW/contracts.lang @@ -53,7 +53,7 @@ ListOfRunningContractsLines=名單合同線運行 ListOfRunningServices=運行服務的列表 NotActivatedServices=不活躍的服務（除驗證合同） BoardNotActivatedServices=服務激活驗證合同之間 -LastContracts=Last % contracts +LastContracts=Last %s contracts LastActivatedServices=上次%s的激活服務 LastModifiedServices=最後%S修飾服務 EditServiceLine=編輯服務項目 @@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. StandardContractsTemplate=Standard contracts template ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=銷售代表簽訂合同 diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang index 8562dccaf35..4fab2ab4b90 100644 --- a/htdocs/langs/zh_TW/errors.lang +++ b/htdocs/langs/zh_TW/errors.lang @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=錯誤!需要提供供應商代號 ErrorSupplierCodeAlreadyUsed=錯誤!供應商代號已被使用 ErrorBadParameters=錯誤的參數 ErrorBadValueForParameter=錯誤值“參數不正確”%s %s'“ -ErrorBadImageFormat=圖像文件有不支持的格式 +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) ErrorBadDateFormat=值“%s”有錯誤的日期格式 ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=無法寫在目錄%s @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=如何正確使用手機與登錄%找不 ErrorLoginHasNoEmail=這位用戶沒有電子郵件地址。進程中止。 ErrorBadValueForCode=代碼有錯誤的值類型。再次嘗試以新的價值... ErrorBothFieldCantBeNegative=領域的%s及%s可以不消極 +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=%s用來執行Web服務器用戶帳戶沒有該權限 ErrorNoActivatedBarcode=沒有激活的條碼類型 ErrUnzipFails=Failed to unzip %s with ZipArchive @@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang index ea9fd8a62b4..5caf80e18e8 100644 --- a/htdocs/langs/zh_TW/members.lang +++ b/htdocs/langs/zh_TW/members.lang @@ -8,7 +8,7 @@ Members=成員 MemberAccount=會員登錄 ShowMember=出示會員卡 UserNotLinkedToMember=用戶成員沒有聯系 -# ThirdpartyNotLinkedToMember=Third-party not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=成員的機票 FundationMembers=基金會成員 Attributs=屬性 @@ -85,8 +85,7 @@ SubscriptionLateShort=晚 SubscriptionNotReceivedShort=從未收到 ListOfSubscriptions=訂閱名單 SendCardByMail=發送卡 -AddMember=加入會員 -MemberType=會員類型 +AddMember=Create member NoTypeDefinedGoToSetup=任何成員類型定義。前往設置 - 會員類型 NewMemberType=新會員類型 WelcomeEMail=歡迎電子郵件 @@ -126,12 +125,12 @@ Date=日期 DateAndTime=日期和時間 PublicMemberCard=市民卡會員 MemberNotOrNoMoreExpectedToSubscribe=會員沒有或沒有更多的預期訂閱 -AddSubscription=添加訂閱 +AddSubscription=Create subscription ShowSubscription=顯示訂閱 MemberModifiedInDolibarr=會員修改Dolibarr SendAnEMailToMember=向會員發送信息的電子郵件 -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=電郵題目會員autosubscription DescADHERENT_AUTOREGISTER_MAIL=電子郵箱會員autosubscription DescADHERENT_MAIL_VALID_SUBJECT=電郵題目會員驗證 @@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=電郵題目會員resiliation DescADHERENT_MAIL_RESIL=電子郵箱會員resiliation DescADHERENT_MAIL_FROM=發件人的電子郵件自動電子郵件 DescADHERENT_ETIQUETTE_TYPE=標簽的格式頁 -# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets DescADHERENT_CARD_TYPE=卡的格式頁 DescADHERENT_CARD_HEADER_TEXT=文字印在會員卡頂部 DescADHERENT_CARD_TEXT=文字印在（會員卡，左對齊） @@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=無關聯的第三方該會員 ThirdPartyDolibarr=Dolibarr第三者 MembersAndSubscriptions= 議員和Subscriptions MoreActions=補充行動記錄 -# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription MoreActionBankDirect=創建一個直接交易記錄的帳戶 MoreActionBankViaInvoice=建立發票和付款帳戶 MoreActionInvoiceOnly=創建一個沒有付款發票 @@ -171,6 +170,8 @@ LastSubscriptionAmount=最後認購金額 MembersStatisticsByCountries=成員由國家統計 MembersStatisticsByState=成員由州/省的統計信息 MembersStatisticsByTown=成員由鎮統計 +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region NbOfMembers=成員數 NoValidatedMemberYet=沒有驗證的成員發現 MembersByCountryDesc=該屏幕顯示您成員國的統計數字。然而，圖形取決於谷歌在線圖服務，可只有一個互聯網連接工作。 @@ -196,9 +197,10 @@ Collectivités=組織 Particuliers=個人 Entreprises=公司 DOLIBARRFOUNDATION_PAYMENT_FORM=為了使您的訂閱使用銀行轉帳支付，請參閱頁http://wiki.dolibarr.org/index.php/Subscribe 。
使用信用卡或PayPal支付，點擊此頁底部的按鈕。
-# ByProperties=By characteristics -# MembersStatisticsByProperties=Members statistics by characteristics -# MembersByNature=Members by nature -# VATToUseForSubscriptions=VAT rate to use for subscriptions -# NoVatOnSubscription=No TVA for subscriptions -# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang index d6b4c7fc7d0..e7406e70399 100644 --- a/htdocs/langs/zh_TW/products.lang +++ b/htdocs/langs/zh_TW/products.lang @@ -117,12 +117,12 @@ ServiceLimitedDuration=如果產品是一種有期限的服務，請指定服務 MultiPricesAbility=Several level of prices per product/service MultiPricesNumPrices=多種價格的數量 MultiPriceLevelsName=價格分類 -AssociatedProductsAbility=啟用子階產品功能 -AssociatedProducts=相關聯的產品 -AssociatedProductsNumber=此產品需要其他子產品(下階)的數量 -ParentProductsNumber=影響上階(母)產品的數量 -IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product -IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product EditAssociate=編輯關聯性 Translation=產品描述翻譯 KeywordFilter=關鍵字過濾 @@ -132,7 +132,7 @@ AddDel=新增或刪除 Quantity=數量 NoMatchFound=沒有找到匹配 ProductAssociationList=以下為下階子產品(服務)清單，及所需下階數量和庫存數量 -ProductParentList=此產品(服務)是用來組成以下產品(服務)的 +ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=選定的產品之一，是家長與當前的產品 DeleteProduct=刪除一個產品/服務 ConfirmDeleteProduct=你確定要刪除這個產品/服務？ @@ -179,7 +179,7 @@ CloneProduct=複製產品/服務 ConfirmCloneProduct=你確定要複製一份 %s 產品/服務單嗎 ？ CloneContentProduct=複製此產品/服務的所有資訊內容 ClonePricesProduct=複製此產品/服務的價格資訊 -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clone packaged product/services ProductIsUsed=該產品是用於 NewRefForClone=新的產品/服務編號 CustomerPrices=銷售價格 @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Price by customer log MinimumPriceLimit=Minimum price can't be lower that %s MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price
ExtraFields are variables like "#options_myextrafieldkey# * 2"
There are special variables like #quantity# and #tva_tx#
Use ; to separate expressions +PriceMode=Price mode +PriceNumeric=Number diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang index 3f4b27b3793..3fa7e273657 100644 --- a/htdocs/langs/zh_TW/projects.lang +++ b/htdocs/langs/zh_TW/projects.lang @@ -14,7 +14,7 @@ TasksDesc=這種觀點提出的所有項目和任務（您的用戶權限批準 Myprojects=我的項目 ProjectsArea=項目領域 NewProject=新項目 -AddProject=新增項目 +AddProject=Create project DeleteAProject=刪除一個項目 DeleteATask=刪除任務 ConfirmDeleteAProject=你確定要刪除此項目嗎？ @@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks TaskTimeUser=User TaskTimeNote=Note TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined NewTimeSpent=新的時間 MyTimeSpent=我的時間花 MyTasks=我的任務 @@ -45,7 +47,7 @@ TaskDateStart=Task start date TaskDateEnd=Task end date TaskDescription=Task description NewTask=新任務 -AddTask=新增任務 +AddTask=Create task AddDuration=添加時間 Activity=活動 Activities=任務/活動 diff --git a/htdocs/langs/zh_TW/resource.lang b/htdocs/langs/zh_TW/resource.lang index d64075dfbf5..32bdd92f884 100644 --- a/htdocs/langs/zh_TW/resource.lang +++ b/htdocs/langs/zh_TW/resource.lang @@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource RessourceSuccessfullyDeleted=Resource successfully deleted DictionaryResourceType=Type of resources -DictionaryEMailTemplates=Modèles d'Emails - SelectResource=Select resource diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang index 40e93a15a5a..06d3f9d694c 100644 --- a/htdocs/langs/zh_TW/withdrawals.lang +++ b/htdocs/langs/zh_TW/withdrawals.lang @@ -79,10 +79,11 @@ CreditDate=信貸 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) ShowWithdraw=顯示撤櫃 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=然而，如果發票已至少有一個撤出支付尚未處理的，它不會被設置為支付最高允許管理撤出之前。 -DoStandingOrdersBeforePayments=這個標簽允許你為一個固定的訂單要求。一旦完成，你可以鍵入付款，收發票。 +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=由銀行支付的長期訂單%s diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 99d5495ef58..35460af92e3 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -100,12 +100,12 @@ $colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17); // card $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15); -$colorbacklineimpair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line impair -$colorbacklineimpair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line impair -$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair -$colorbacklinepair1='255,255,255'; // line pair -$colorbacklinepair2='255,255,255'; // line pair -$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); +$colorbacklineimpair1='255,255,255'; // line pair +$colorbacklineimpair2='255,255,255'; // line pair +$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); +$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line impair +$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line impair +$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair $colorbackbody='#f9f9f9'; $colortext='40,40,40'; $fontsize='12'; @@ -125,12 +125,12 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234'; $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234'; $conf->global->THEME_ELDY_BACKBODY='#f9f9f9;'; - $conf->global->THEME_ELDY_LINEPAIR1='242,242,242'; - $conf->global->THEME_ELDY_LINEPAIR2='248,248,248'; - $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252'; $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255'; $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255'; $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252'; + $conf->global->THEME_ELDY_LINEPAIR1='242,242,242'; + $conf->global->THEME_ELDY_LINEPAIR2='248,248,248'; + $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252'; $conf->global->THEME_ELDY_TEXT='50,50,130'; $conf->global->THEME_ELDY_FONT_SIZE1='12'; $conf->global->THEME_ELDY_FONT_SIZE2='11'; From bdf8189d20d3c797c79f3b317d307565af1c2e18 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Dec 2014 10:40:39 +0100 Subject: [PATCH 053/172] Fixed: CSS --- htdocs/theme/eldy/style.css.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 35460af92e3..143b76b00ed 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -100,12 +100,12 @@ $colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17); // card $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15); -$colorbacklineimpair1='255,255,255'; // line pair -$colorbacklineimpair2='255,255,255'; // line pair -$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); -$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line impair -$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line impair -$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair +$colorbacklineimpair1='255,255,255'; // line impair +$colorbacklineimpair2='255,255,255'; // line impair +$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair +$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line pair +$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line pair +$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line pair $colorbackbody='#f9f9f9'; $colortext='40,40,40'; $fontsize='12'; @@ -1840,7 +1840,7 @@ table.liste td { } */ -.impair:hover { +.impair:hover, td.nohover { background: rgb(); @@ -1866,7 +1866,7 @@ table.liste td { min-height: 18px; /* seems to not be used */ } -td.nohover, .pair:hover { +.pair:hover { background: rgb(); From fedd05cbcc3b30cbdd6e7c4bd1179a539742d224 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 15 Dec 2014 11:05:47 +0100 Subject: [PATCH 054/172] button should be within form --- htdocs/accountancy/admin/export.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index a5f54d5c431..d35e6e8ddf6 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -156,9 +156,9 @@ foreach ( $list as $key ) { } print "
'.$langs->trans("Ref").'
'.$langs->trans("Ref").'
'.$langs->trans("Label").'
\n"; -print ''; print '
'; +print ''; llxFooter(); $db->close(); \ No newline at end of file From 3d510ef3464038da4635d8c7cdc1b6e952fd939a Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 15 Dec 2014 11:19:14 +0100 Subject: [PATCH 055/172] closing tag twice --- htdocs/accountancy/admin/journaux.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php index d97af918f90..bec3fee45e9 100644 --- a/htdocs/accountancy/admin/journaux.php +++ b/htdocs/accountancy/admin/journaux.php @@ -163,7 +163,6 @@ $db->free($resql); print "
\n"; -print '
'; print ''; print '
'; From 574502994246f9664931bfddb6d0b2ffaaec6bf7 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 15 Dec 2014 11:33:09 +0100 Subject: [PATCH 056/172] Change credential test data in WS demo --- htdocs/webservices/demo_wsclient_actioncomm.php-NORUN | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN index 32df64218d3..1e14c07a5bf 100755 --- a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN +++ b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN @@ -53,8 +53,8 @@ if ($soapclient) $authentication=array( 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, 'sourceapplication'=>'DEMO', - 'login'=>'admin_dolibarDev', - 'password'=>'homedread', + 'login'=>'admin', + 'password'=>'changeme', 'entity'=>'1'); From a4a1a991b85b88e418740837bcf4b0f5e0a846a1 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Mon, 15 Dec 2014 14:13:57 +0100 Subject: [PATCH 057/172] FIX: avoid milestones in margin calculation --- htdocs/margin/agentMargins.php | 1 + htdocs/margin/customerMargins.php | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 51166bc472b..30adf727318 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -119,6 +119,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ", ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND sc.fk_soc = f.fk_soc"; +$sql.= " AND (d.product_type = 0 OR d.product_type = 1)"; if (! empty($conf->global->AGENT_CONTACT_TYPE)) $sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))"; else diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 6675753d4d6..38691d4f43b 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -173,6 +173,7 @@ $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND f.fk_statut > 0"; $sql.= " AND s.entity = ".$conf->entity; $sql.= " AND d.fk_facture = f.rowid"; +$sql.= " AND (d.product_type = 0 OR d.product_type = 1)"; if ($client) $sql.= " AND f.fk_soc = ".$socid; if (!empty($startdate)) From 71c5f81bdf2f9bb8a0b1bc1045d37357313130d7 Mon Sep 17 00:00:00 2001 From: "Ying-Chun Liu (PaulLiu)" Date: Tue, 16 Dec 2014 00:48:35 +0800 Subject: [PATCH 058/172] Handle updates for Taiwan VAT. Signed-off-by: Ying-Chun Liu (PaulLiu) --- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index a190f102023..755195c2a61 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -27,3 +27,6 @@ create table llx_c_price_expression )ENGINE=innodb; ALTER TABLE llx_product_fournisseur_price ADD fk_price_expression integer DEFAULT NULL; + +-- Taiwan VAT Rates +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2131, 213, '5', '0', 'VAT 5%', 1); From 27c0e6b4d3cd5cb03398570af23d49a39e412c6b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 15 Dec 2014 19:15:26 +0100 Subject: [PATCH 059/172] balise form should close after table --- htdocs/adherents/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index b70e212d2d2..b88a39c76af 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -263,8 +263,7 @@ if ($resql) print ''; print '
\n"; + print ''; if ($num > $conf->liste_limit) { From 1850ebe33a6db0f788d78754894a5cdc149b7590 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Dec 2014 01:41:49 +0100 Subject: [PATCH 060/172] VAT setup for canada was rong --- htdocs/langs/en_CA/admin.lang | 5 +++++ htdocs/langs/en_CA/companies.lang | 5 +++++ htdocs/langs/en_CA/main.lang | 28 ++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 htdocs/langs/en_CA/admin.lang create mode 100644 htdocs/langs/en_CA/companies.lang create mode 100644 htdocs/langs/en_CA/main.lang diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang new file mode 100644 index 00000000000..cee56c0f791 --- /dev/null +++ b/htdocs/langs/en_CA/admin.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - admin +VATManagement=GST Management +LocalTax1IsUsedDesc=Use a second tax (PST) +LocalTax1IsNotUsedDesc=Do not use second tax (PST) +LocalTax1Management=PST Management diff --git a/htdocs/langs/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang new file mode 100644 index 00000000000..985f125d7de --- /dev/null +++ b/htdocs/langs/en_CA/companies.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - companies +VATIsUsed=GST is used +VATIsNotUsed=GST is not use +LocalTax1IsUsedES=PST is used +LocalTax1IsNotUsedES=GST is not used diff --git a/htdocs/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang new file mode 100644 index 00000000000..fca2906cd12 --- /dev/null +++ b/htdocs/langs/en_CA/main.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 +SeparatorDecimal=, +SeparatorThousand=None +FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y +FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy +FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d.%m.%Y %H:%M +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M +ErrorNoVATRateDefinedForSellerCountry=Error, no vat rate defined for country '%s'. +AmountVAT=Amount GST +AmountLT1=Amount PST +TotalVAT=Total GST +TotalLT1=Total PST +IncludedVAT=Including GST +VAT=GST +VATRate=GST rate From 174428ad3145991d8e2afb51af784d826da55c1f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Dec 2014 01:55:03 +0100 Subject: [PATCH 061/172] Data init for canada vat --- htdocs/install/mysql/data/llx_c_tva.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 01d2894bca6..a2e1cb6bbb3 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -66,7 +66,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2 -- CANADA (id country=14) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141, 14, '7','0','VAT standard rate',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142, 14, '0','0','VAT Rate 0',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','TPS and TVQ rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Province',1); +--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Quebec',1); +--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (144, 14,'5','0','7','1','GST/TPS and PST/TVQ rate for British Columbia',1); +--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (149, 14,'5','0',null,null,'GST/TPS and PST/TVQ rate for Yukon',1); -- CAMEROUN (id country=24) From dd6d6bc054e731ba285dfca759b22d4cde9853e0 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 16 Dec 2014 14:43:28 +0100 Subject: [PATCH 062/172] open form was at the wrong place missing close form --- htdocs/admin/bank.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index de1f7662373..32e4750009c 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -1,7 +1,7 @@ * Copyright (C) 2010-2013 Juanjo Menent - * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2013-2014 Philippe Grand * * 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 @@ -88,7 +88,9 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup'); print '
'; - +print '
'; +print ''; +print ''; print ''; print ''; print ''; @@ -98,9 +100,7 @@ print "\n"; $var=true; $var=! $var; -print ''; -print ''; -print ''; + print '
'.$langs->trans("Parameters").'
'; print $langs->trans("FreeLegalTextOnChequeReceipts").' ('.$langs->trans("AddCRIfTooLong").')
'; print ''; @@ -183,7 +183,7 @@ while ($i < $nbofbank) } print '
'."\n"; - +print '
'; $db->close(); llxFooter(); From e40ef3f9cee675987b7dc8c6f9967ccf46e44a23 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 16 Dec 2014 14:49:07 +0100 Subject: [PATCH 063/172] form closed at the wrong place --- htdocs/admin/barcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 11341f632a2..00a84fc5cbc 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -318,7 +318,6 @@ if (! isset($_SERVER['WINDIR'])) print ''; print ''; print ''; - print ''; } // Module products @@ -350,6 +349,7 @@ if (! empty($conf->societe->enabled)) } print "\n"; +print ''; print '
'; From 69c1de3fe12e6134e511febcd7617755cd9f00fb Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 16 Dec 2014 15:07:23 +0100 Subject: [PATCH 064/172] one close form too much, an other at the wrong place --- htdocs/admin/compta.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index b5aed0c683e..7b041fa3991 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -135,7 +135,6 @@ print ''.nl2br($langs->trans('OptionModeTrueDesc')); print "\n"; print ' '.$langs->trans('OptionModeVirtual').''; print ''.nl2br($langs->trans('OptionModeVirtualDesc'))."\n"; -print ''; print "\n"; @@ -163,11 +162,10 @@ foreach ($list as $key) print ''; } -print ''; print "\n"; print '

'; - +print ''; $db->close(); llxFooter(); From cf196c77fb17a1cc34701ffbd0f3c9d99436ce15 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 16 Dec 2014 15:15:03 +0100 Subject: [PATCH 065/172] one close form too much --- htdocs/admin/contract.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 6905156990b..817ac84d768 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -1,6 +1,6 @@ - * Copyright (C) 2011-2013 Philippe Grand + * Copyright (C) 2011-2014 Philippe Grand * * 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 @@ -509,7 +509,6 @@ print ''; print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')
'; print ''; print ''."\n"; -print ''; //Use draft Watermark $var=!$var; From 8878ef601f5acd1f1a90a2f4029e706fe3eb34e5 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 16 Dec 2014 15:34:56 +0100 Subject: [PATCH 066/172] form should open before table --- htdocs/admin/dons.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php index ac0fe715c99..dcac1079422 100644 --- a/htdocs/admin/dons.php +++ b/htdocs/admin/dons.php @@ -186,6 +186,9 @@ print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup'); */ print_titre($langs->trans("Options")); +print '
'; +print ''; +print ''; print ''; print ''; print ''; @@ -194,9 +197,7 @@ print "\n"; $var=true; $var=! $var; -print ''; -print ''; -print ''; + print ''; // Label diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 50763f839f7..03ca7bae452 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -209,7 +209,7 @@ if ($object->id > 0) $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; - print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param); print ''; print ''; diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index a6f8846ce0e..04e92c7c7f2 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -181,7 +181,7 @@ if ($object->id > 0) $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; - print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param); print ''; // Label diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 7136ffc43c5..8f72510adba 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -72,7 +72,7 @@ if ($action == 'addtimespent' && $user->rights->projet->creer) if (! $error) { - $object->fetch($id); + $object->fetch($id, $ref); $object->timespent_note = $_POST["timespent_note"]; $object->timespent_duration = $_POST["timespent_durationhour"]*60*60; // We store duration in seconds @@ -109,7 +109,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree if (! $error) { - $object->fetch($id); + $object->fetch($id, $ref); $object->timespent_id = $_POST["lineid"]; $object->timespent_note = $_POST["timespent_note_line"]; @@ -183,7 +183,7 @@ if ($id > 0 || ! empty($ref)) /* * Fiche projet en mode visu */ - if ($object->fetch($id) >= 0) + if ($object->fetch($id, $ref) >= 0) { $result=$projectstatic->fetch($object->fk_project); if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); @@ -277,7 +277,7 @@ if ($id > 0 || ! empty($ref)) $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; - print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param); print ''; // Label From 56eddeade17904ddd5eb55dc6f0b23cc4a152d39 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 02:36:01 +0100 Subject: [PATCH 122/172] Fix merge changelog --- ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a169a80654b..5f468fa452d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,9 +2,6 @@ English Dolibarr ChangeLog -------------------------------------------------------------- -***** ChangeLog for 3.5.7 compared to 3.5.6 ***** -Fix: Paypal link were broken dur to SSL v3 closed. - ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. - Fix: bug 1588 : relative discount. @@ -154,6 +151,9 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f - Remove add_photo_web() that is ot used anymore by core code. +***** ChangeLog for 3.5.7 compared to 3.5.6 ***** +Fix: Paypal link were broken dur to SSL v3 closed. + ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 Fix: Can't update phone_pro from web service From 3212fd2b27973d248e8ab7e36746a7ee63186a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 23 Dec 2014 11:00:18 +0100 Subject: [PATCH 123/172] Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify --- ChangeLog | 1 + htdocs/comm/fiche.php | 30 +++++++++++++++++++----------- htdocs/fourn/fiche.php | 20 ++++++++++++-------- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f468fa452d..0e00afbbda0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ English Dolibarr ChangeLog - Fix: Show sender Country on PDF docs when sender Country <> receiver Country - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS - Fix: [ bug #1749 ] Undefined $mailchimp +- Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 7ba1cc8bc48..307a8c57385 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -79,17 +79,21 @@ $object = new Societe($db); $parameters = array('socid' => $id); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some +//Some actions show a "cancel" input submit button with name="cancel" +$cancelbutton = GETPOST('cancel'); if ($action == 'setcustomeraccountancycode') { - $result=$object->fetch($id); - $object->code_compta=$_POST["customeraccountancycode"]; - $result=$object->update($object->id,$user,1,1,0); - if ($result < 0) - { - $mesgs[]=join(',',$object->errors); + if (!$cancelbutton) { + $result=$object->fetch($id); + $object->code_compta=$_POST["customeraccountancycode"]; + $result=$object->update($object->id,$user,1,1,0); + if ($result < 0) + { + $mesgs[]=join(',',$object->errors); + } + $action=""; } - $action=""; } // conditions de reglement @@ -139,10 +143,14 @@ if ($action == 'cstc') // Update communication level if ($action == 'setOutstandingBill') { - $object->fetch($id); - $object->outstanding_limit=GETPOST('OutstandingBill'); - $result=$object->set_OutstandingBill($user); - if ($result < 0) setEventMessage($object->error,'errors'); + if (!$cancelbutton) { + $object->fetch($id); + $object->outstanding_limit = GETPOST('OutstandingBill'); + $result = $object->set_OutstandingBill($user); + if ($result < 0) { + setEventMessage($object->error, 'errors'); + } + } } diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 2719f9e0a9b..b4ceb2ae1b0 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -60,14 +60,18 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action if ($action == 'setsupplieraccountancycode') { - $result=$object->fetch($id); - $object->code_compta_fournisseur=$_POST["supplieraccountancycode"]; - $result=$object->update($object->id,$user,1,0,1); - if ($result < 0) - { - $mesg=join(',',$object->errors); - } - $action=""; + $cancelbutton = GETPOST('cancel'); + + if (!$cancelbutton) { + + $result = $object->fetch($id); + $object->code_compta_fournisseur = $_POST["supplieraccountancycode"]; + $result = $object->update($object->id, $user, 1, 0, 1); + if ($result < 0) { + $mesg = join(',', $object->errors); + } + $action = ""; + } } // conditions de reglement if ($action == 'setconditions' && $user->rights->societe->creer) From 8a1440997403cf077ebdd8ee4ddd503edbd38e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 23 Dec 2014 11:39:43 +0100 Subject: [PATCH 124/172] Fix: [ bug #1533 ] Links triggers do not show trigger error message --- ChangeLog | 1 + htdocs/core/class/link.class.php | 3 ++- htdocs/core/tpl/document_actions_pre_headers.tpl.php | 9 +++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ec86761300..de2f3618cc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ For users: - Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action - Fix: [ bug #1506, #1507 ] ECM trigger error problem - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message +- Fix: [ bug #1533 ] Links triggers do not show trigger error message - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe. - Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown - Fix: datepicker first day of week can be monday by setting into display setup diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php index dce575a1d47..0cdc6a8c4a8 100644 --- a/htdocs/core/class/link.class.php +++ b/htdocs/core/class/link.class.php @@ -187,7 +187,7 @@ class Link extends CommonObject { // Call trigger $result=$this->call_trigger('LINK_MODIFY',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } @@ -197,6 +197,7 @@ class Link extends CommonObject $this->db->commit(); return 1; } else { + setEventMessages('', $this->errors, 'errors'); $this->db->rollback(); return -1; } diff --git a/htdocs/core/tpl/document_actions_pre_headers.tpl.php b/htdocs/core/tpl/document_actions_pre_headers.tpl.php index a4d97e7defb..36b6ce75fe1 100644 --- a/htdocs/core/tpl/document_actions_pre_headers.tpl.php +++ b/htdocs/core/tpl/document_actions_pre_headers.tpl.php @@ -72,11 +72,16 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') $link->id = $linkid; $link->fetch(); $res = $link->delete($user); + $langs->load('link'); - if ($res) { + if ($res > 0) { setEventMessage($langs->trans("LinkRemoved", $link->label)); } else { - setEventMessage($langs->trans("ErrorFailedToDeleteLink", $link->label), 'errors'); + if (count($link->errors)) { + setEventMessages('', $link->errors, 'errors'); + } else { + setEventMessage($langs->trans("ErrorFailedToDeleteLink", $link->label), 'errors'); + } } } header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id.(!empty($withproject)?'&withproject=1':'')); From e8addcb8ba2df0c292f47cd14fe2b6fdcb9e968f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 12:25:21 +0100 Subject: [PATCH 125/172] Fixed: [ bug #1756 ] PHP error while removing an import profile --- htdocs/core/tpl/extrafields_view.tpl.php | 15 ++++++++------- htdocs/imports/class/import.class.php | 7 ++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index ad2fa068757..7f0115b83bc 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -33,13 +33,13 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) { if ($action == 'edit_extras') { - $value = (isset($_POST ["options_" . $key]) ? $_POST ["options_" . $key] : $object->array_options ["options_" . $key]); + $value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]); } else { - $value = $object->array_options ["options_" . $key]; + $value = $object->array_options["options_" . $key]; } - if ($extrafields->attribute_type [$key] == 'separate') + if ($extrafields->attribute_type[$key] == 'separate') { print $extrafields->showSeparator($key); } @@ -47,7 +47,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) { print '
'.$langs->trans("Parameter").'
'; print $langs->trans("FreeTextOnDonations").'
'; print ''; From c9f69279c7ca0eca48e436e48f0e5570c4738305 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Tue, 16 Dec 2014 16:21:31 +0100 Subject: [PATCH 067/172] FIX: pagebreak on fichinter like in other documents --- .../fichinter/doc/pdf_soleil.modules.php | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 6a0feda2e9d..ad5516f2bf6 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -255,19 +255,44 @@ class pdf_soleil extends ModelePDFFicheinter $txt=''.dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".convertSecondToTime($objectligne->duration),1,$outputlangs->charset_output).''; $desc=dol_htmlentitiesbr($objectligne->desc,1); - $pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txt,$desc), 0, 1, 0); - + $pdf->startTransaction(); + $pdf->writeHTMLCell(0, 0, $curX, $curY, $txt.'
'.$desc, LR, 1, 0); + $pageposafter=$pdf->getPage(); + if ($pageposafter > $pageposbefore) // There is a pagebreak + { + $pdf->rollbackTransaction(true); + $pageposafter=$pageposbefore; + //print $pageposafter.'-'.$pageposbefore;exit; + $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it. + $pdf->writeHTMLCell(0, 0, $curX, $curY, $txt.'
'.$desc, LR, 1, 0); + $pageposafter=$pdf->getPage(); + $posyafter=$pdf->GetY(); + //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit; + if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) // There is no space left for total+free text + { + if ($i == ($nblines-1)) // No more lines, and no space left to show total, so we create a new page + { + $pdf->AddPage('','',true); + $pdf->setPage($pageposafter+1); + } + } + } + else // No pagebreak + { + $pdf->commitTransaction(); + } + $nexY = $pdf->GetY(); $pageposafter=$pdf->getPage(); $pdf->setPage($pageposbefore); $pdf->setTopMargin($this->marge_haute); $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it. - + // We suppose that a too long description is moved completely on next page if ($pageposafter > $pageposbefore) { $pdf->setPage($pageposafter); $curY = $tab_top_newpage; } - + $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut // Detect if some page were added automatically and output _tableau for past pages From 849628f02051070a35f368ee35a570af08fe2c6c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 17 Dec 2014 01:56:36 +0100 Subject: [PATCH 068/172] Fix: Typo and translation --- htdocs/expedition/card.php | 2 +- htdocs/langs/ar_SA/printipp.lang | 14 ++++++++++++ htdocs/langs/ar_SA/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/bg_BG/printipp.lang | 14 ++++++++++++ htdocs/langs/bg_BG/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/bs_BA/printipp.lang | 14 ++++++++++++ htdocs/langs/bs_BA/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/ca_ES/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/cs_CZ/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/da_DK/printipp.lang | 14 ++++++++++++ htdocs/langs/da_DK/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/de_DE/printipp.lang | 14 ++++++++++++ htdocs/langs/de_DE/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/el_GR/printipp.lang | 14 ++++++++++++ htdocs/langs/el_GR/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/et_EE/printipp.lang | 14 ++++++++++++ htdocs/langs/et_EE/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/eu_ES/printipp.lang | 14 ++++++++++++ htdocs/langs/eu_ES/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/fa_IR/printipp.lang | 14 ++++++++++++ htdocs/langs/fa_IR/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/fi_FI/printipp.lang | 14 ++++++++++++ htdocs/langs/fi_FI/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/he_IL/printipp.lang | 14 ++++++++++++ htdocs/langs/he_IL/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/hr_HR/printipp.lang | 14 ++++++++++++ htdocs/langs/hr_HR/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/hu_HU/printipp.lang | 14 ++++++++++++ htdocs/langs/hu_HU/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/id_ID/printipp.lang | 14 ++++++++++++ htdocs/langs/id_ID/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/is_IS/printipp.lang | 14 ++++++++++++ htdocs/langs/is_IS/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/it_IT/printipp.lang | 14 ++++++++++++ htdocs/langs/it_IT/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/ja_JP/printipp.lang | 14 ++++++++++++ htdocs/langs/ja_JP/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/ko_KR/printipp.lang | 14 ++++++++++++ htdocs/langs/ko_KR/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/lt_LT/printipp.lang | 14 ++++++++++++ htdocs/langs/lt_LT/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/lv_LV/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/mk_MK/printipp.lang | 14 ++++++++++++ htdocs/langs/mk_MK/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/nb_NO/printipp.lang | 14 ++++++++++++ htdocs/langs/nb_NO/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/nl_NL/printipp.lang | 14 ++++++++++++ htdocs/langs/nl_NL/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/pl_PL/printipp.lang | 14 ++++++++++++ htdocs/langs/pl_PL/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/pt_PT/printipp.lang | 14 ++++++++++++ htdocs/langs/pt_PT/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/ro_RO/printipp.lang | 14 ++++++++++++ htdocs/langs/ro_RO/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/ru_RU/printipp.lang | 14 ++++++++++++ htdocs/langs/ru_RU/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/sk_SK/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/sl_SI/printipp.lang | 14 ++++++++++++ htdocs/langs/sl_SI/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/sq_AL/printipp.lang | 14 ++++++++++++ htdocs/langs/sq_AL/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/sv_SE/printipp.lang | 14 ++++++++++++ htdocs/langs/sv_SE/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/th_TH/printipp.lang | 14 ++++++++++++ htdocs/langs/th_TH/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/tr_TR/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/uk_UA/printipp.lang | 14 ++++++++++++ htdocs/langs/uk_UA/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/vi_VN/printipp.lang | 14 ++++++++++++ htdocs/langs/vi_VN/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/zh_CN/printipp.lang | 14 ++++++++++++ htdocs/langs/zh_CN/productbatch.lang | 20 ++++++++++++++++++ htdocs/langs/zh_TW/printipp.lang | 14 ++++++++++++ htdocs/langs/zh_TW/productbatch.lang | 20 ++++++++++++++++++ .../theme/dolibarr_preferred_partner_int.png | Bin 0 -> 9804 bytes 75 files changed, 1257 insertions(+), 1 deletion(-) create mode 100644 htdocs/langs/ar_SA/printipp.lang create mode 100644 htdocs/langs/ar_SA/productbatch.lang create mode 100644 htdocs/langs/bg_BG/printipp.lang create mode 100644 htdocs/langs/bg_BG/productbatch.lang create mode 100644 htdocs/langs/bs_BA/printipp.lang create mode 100644 htdocs/langs/bs_BA/productbatch.lang create mode 100644 htdocs/langs/ca_ES/productbatch.lang create mode 100644 htdocs/langs/cs_CZ/productbatch.lang create mode 100644 htdocs/langs/da_DK/printipp.lang create mode 100644 htdocs/langs/da_DK/productbatch.lang create mode 100644 htdocs/langs/de_DE/printipp.lang create mode 100644 htdocs/langs/de_DE/productbatch.lang create mode 100644 htdocs/langs/el_GR/printipp.lang create mode 100644 htdocs/langs/el_GR/productbatch.lang create mode 100644 htdocs/langs/et_EE/printipp.lang create mode 100644 htdocs/langs/et_EE/productbatch.lang create mode 100644 htdocs/langs/eu_ES/printipp.lang create mode 100644 htdocs/langs/eu_ES/productbatch.lang create mode 100644 htdocs/langs/fa_IR/printipp.lang create mode 100644 htdocs/langs/fa_IR/productbatch.lang create mode 100644 htdocs/langs/fi_FI/printipp.lang create mode 100644 htdocs/langs/fi_FI/productbatch.lang create mode 100644 htdocs/langs/he_IL/printipp.lang create mode 100644 htdocs/langs/he_IL/productbatch.lang create mode 100644 htdocs/langs/hr_HR/printipp.lang create mode 100644 htdocs/langs/hr_HR/productbatch.lang create mode 100644 htdocs/langs/hu_HU/printipp.lang create mode 100644 htdocs/langs/hu_HU/productbatch.lang create mode 100644 htdocs/langs/id_ID/printipp.lang create mode 100644 htdocs/langs/id_ID/productbatch.lang create mode 100644 htdocs/langs/is_IS/printipp.lang create mode 100644 htdocs/langs/is_IS/productbatch.lang create mode 100644 htdocs/langs/it_IT/printipp.lang create mode 100644 htdocs/langs/it_IT/productbatch.lang create mode 100644 htdocs/langs/ja_JP/printipp.lang create mode 100644 htdocs/langs/ja_JP/productbatch.lang create mode 100644 htdocs/langs/ko_KR/printipp.lang create mode 100644 htdocs/langs/ko_KR/productbatch.lang create mode 100644 htdocs/langs/lt_LT/printipp.lang create mode 100644 htdocs/langs/lt_LT/productbatch.lang create mode 100644 htdocs/langs/lv_LV/productbatch.lang create mode 100644 htdocs/langs/mk_MK/printipp.lang create mode 100644 htdocs/langs/mk_MK/productbatch.lang create mode 100644 htdocs/langs/nb_NO/printipp.lang create mode 100644 htdocs/langs/nb_NO/productbatch.lang create mode 100644 htdocs/langs/nl_NL/printipp.lang create mode 100644 htdocs/langs/nl_NL/productbatch.lang create mode 100644 htdocs/langs/pl_PL/printipp.lang create mode 100644 htdocs/langs/pl_PL/productbatch.lang create mode 100644 htdocs/langs/pt_PT/printipp.lang create mode 100644 htdocs/langs/pt_PT/productbatch.lang create mode 100644 htdocs/langs/ro_RO/printipp.lang create mode 100644 htdocs/langs/ro_RO/productbatch.lang create mode 100644 htdocs/langs/ru_RU/printipp.lang create mode 100644 htdocs/langs/ru_RU/productbatch.lang create mode 100644 htdocs/langs/sk_SK/productbatch.lang create mode 100644 htdocs/langs/sl_SI/printipp.lang create mode 100644 htdocs/langs/sl_SI/productbatch.lang create mode 100644 htdocs/langs/sq_AL/printipp.lang create mode 100644 htdocs/langs/sq_AL/productbatch.lang create mode 100644 htdocs/langs/sv_SE/printipp.lang create mode 100644 htdocs/langs/sv_SE/productbatch.lang create mode 100644 htdocs/langs/th_TH/printipp.lang create mode 100644 htdocs/langs/th_TH/productbatch.lang create mode 100644 htdocs/langs/tr_TR/productbatch.lang create mode 100644 htdocs/langs/uk_UA/printipp.lang create mode 100644 htdocs/langs/uk_UA/productbatch.lang create mode 100644 htdocs/langs/vi_VN/printipp.lang create mode 100644 htdocs/langs/vi_VN/productbatch.lang create mode 100644 htdocs/langs/zh_CN/printipp.lang create mode 100644 htdocs/langs/zh_CN/productbatch.lang create mode 100644 htdocs/langs/zh_TW/printipp.lang create mode 100644 htdocs/langs/zh_TW/productbatch.lang create mode 100755 htdocs/theme/dolibarr_preferred_partner_int.png diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 979ed0491a1..4e795005abb 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -95,7 +95,7 @@ if (! empty($conf->productbatch->enabled)) if (! (GETPOST('entrepot_id','int') > 0)) { $langs->load("errors"); - setEventMessage($langs->trans("WarhouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); + setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id); exit; } diff --git a/htdocs/langs/ar_SA/printipp.lang b/htdocs/langs/ar_SA/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/ar_SA/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/ar_SA/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/bg_BG/printipp.lang b/htdocs/langs/bg_BG/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/bg_BG/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/bg_BG/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/bs_BA/printipp.lang b/htdocs/langs/bs_BA/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/bs_BA/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/bs_BA/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/ca_ES/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/cs_CZ/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/da_DK/printipp.lang b/htdocs/langs/da_DK/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/da_DK/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/da_DK/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/de_DE/printipp.lang b/htdocs/langs/de_DE/printipp.lang new file mode 100644 index 00000000000..c4ce34ef962 --- /dev/null +++ b/htdocs/langs/de_DE/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Einstellungen des DirektDruck-Moduls +PrintIPPDesc=Dieses Modul fügt einen "Drucken"-Button zu, um Dokumente direkt zu einen Drucker zu senden. Dies erfordert ein Linux-System mit installiertem CUPS. +PRINTIPP_ENABLED="Direktdruck"-Symbol in Dokumentlisten anzeigen +PRINTIPP_HOST=Druckserver +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Passwort +NoPrinterFound=Keine Drucker gefunden (CUPS-Konfiguration prüfen) +FileWasSentToPrinter=Datei %s zum Drucker gesandt +NoDefaultPrinterDefined=Kein Standarddrucker defininert +DefaultPrinter=Standarddrucker +Printer=Drucker +CupsServer=CUPS-Server diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang new file mode 100644 index 00000000000..a78b3a8302c --- /dev/null +++ b/htdocs/langs/de_DE/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Charge/Seriennr. verwalten +ProductStatusOnBatch=Verwaltet +ProductStatusNotOnBatch=Nicht Verwaltet +ProductStatusOnBatchShort=Verwaltet +ProductStatusNotOnBatchShort=Nicht verwaltet +Batch=Charge/Seriennr +atleast1batchfield=Verzehren-bis-, verkaufen-bis-Datum oder Chargennr +batch_number=Charge/Seriennr +l_eatby=Verzehren-bis-Datum +l_sellby=Verkaufen-bis-Datum +DetailBatchNumber=Chargen-/Seriennummern-Details +DetailBatchFormat=Charge/Seriennr: %s - E: %s - S: %s (Menge: %d) +printBatch=Charge: %s +printEatby=Verzehren bis: %s +printSellby=Verkaufen bis: %s +printQty=Menge: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Nicht definiert +WhenProductBatchModuleOnOptionAreForced=Wenn das Modul Chargen/Seriennr eingeschaltet ist, wird der Modus für Lagerbestands-Erhöhungen / -Senkungen auf die letzte Auswahl festgelegt und kann nicht geändert werden. Andere Optionen können nach Wunsch eingestellt werden. diff --git a/htdocs/langs/el_GR/printipp.lang b/htdocs/langs/el_GR/printipp.lang new file mode 100644 index 00000000000..04a8bfda5b9 --- /dev/null +++ b/htdocs/langs/el_GR/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Ρύθμιση του module Άμεση Εκτύπωση +PrintIPPDesc=Το module αυτό προσθέτει ένα κουμπί Εκτύπωσης για να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή. Απαιτεί ένα σύστημα Linux με εγκατεστημένο CUPS. +PRINTIPP_ENABLED=Εμφάνιση εικονιδίου "Απευθείας εκτύπωση" στις λίστες εγγράφων +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Σύνδεση +PRINTIPP_PASSWORD=Κωδικός +NoPrinterFound=Δεν βρέθηκαν εκτυπωτές (ελέγξτε τη ρύθμιση του CUPS) +FileWasSentToPrinter=Το αρχείο %s στάλθηκε στον εκτυπωτή +NoDefaultPrinterDefined=Δεν έχει οριστεί προεπιλεγμένος εκτυπωτής +DefaultPrinter=Προεπιλογμένος εκτυπωτής +Printer=Εκτυπωτής +CupsServer=CUPS Server diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/el_GR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/et_EE/printipp.lang b/htdocs/langs/et_EE/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/et_EE/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/et_EE/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/eu_ES/printipp.lang b/htdocs/langs/eu_ES/printipp.lang new file mode 100644 index 00000000000..f9c36810b91 --- /dev/null +++ b/htdocs/langs/eu_ES/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Direct Print modulua konfiguratu +PrintIPPDesc=Modulu honek "Inprimatu" botoia gehitzen du dokumentuak zuzenean inprimagailu batera bidaltzeko. CUPS instalatuta duen Linux sistema behar du. +PRINTIPP_ENABLED=Dokumentuen zerrendetan "Direct Print" ikonoa erakutsi +PRINTIPP_HOST=Inprimatzeko zerbitzaria +PRINTIPP_PORT=Ataka +PRINTIPP_USER=Hasi saioa honela +PRINTIPP_PASSWORD=Pasahitza +NoPrinterFound=Ez da inprimagailurik aurkitu (CUPS konfigurazioa egiaztatu) +FileWasSentToPrinter=%s fitxategia inprimagailura bidali da +NoDefaultPrinterDefined=Ez da lehenetsitako inprimagailurik ezarri +DefaultPrinter=Lehenetsitako inprimagailua +Printer=Inprimagailua +CupsServer=CUPS zerbitzaria diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/eu_ES/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/fa_IR/printipp.lang b/htdocs/langs/fa_IR/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/fa_IR/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/fa_IR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/fi_FI/printipp.lang b/htdocs/langs/fi_FI/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/fi_FI/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/fi_FI/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/he_IL/printipp.lang b/htdocs/langs/he_IL/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/he_IL/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/he_IL/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/hr_HR/printipp.lang b/htdocs/langs/hr_HR/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/hr_HR/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/hr_HR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/hu_HU/printipp.lang b/htdocs/langs/hu_HU/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/hu_HU/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/hu_HU/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/id_ID/printipp.lang b/htdocs/langs/id_ID/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/id_ID/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/id_ID/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/is_IS/printipp.lang b/htdocs/langs/is_IS/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/is_IS/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/is_IS/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/it_IT/printipp.lang b/htdocs/langs/it_IT/printipp.lang new file mode 100644 index 00000000000..7c597de10e1 --- /dev/null +++ b/htdocs/langs/it_IT/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Server di stampa +PRINTIPP_PORT=Porta +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=Nessuna stampante trovata (controlla la tua installazione di CUPS) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang new file mode 100644 index 00000000000..39171461732 --- /dev/null +++ b/htdocs/langs/it_IT/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Gestito +ProductStatusNotOnBatch=Non gestito +ProductStatusOnBatchShort=Gestito +ProductStatusNotOnBatchShort=Non gestito +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Quantità: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Non definito +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/ja_JP/printipp.lang b/htdocs/langs/ja_JP/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/ja_JP/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/ja_JP/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/ko_KR/printipp.lang b/htdocs/langs/ko_KR/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/ko_KR/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/ko_KR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/lt_LT/printipp.lang b/htdocs/langs/lt_LT/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/lt_LT/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/lt_LT/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/lv_LV/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/mk_MK/printipp.lang b/htdocs/langs/mk_MK/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/mk_MK/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/mk_MK/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/nb_NO/printipp.lang b/htdocs/langs/nb_NO/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/nb_NO/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/nb_NO/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/nl_NL/printipp.lang b/htdocs/langs/nl_NL/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/nl_NL/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/nl_NL/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/pl_PL/printipp.lang b/htdocs/langs/pl_PL/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/pl_PL/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/pl_PL/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/pt_PT/printipp.lang b/htdocs/langs/pt_PT/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/pt_PT/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/pt_PT/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/ro_RO/printipp.lang b/htdocs/langs/ro_RO/printipp.lang new file mode 100644 index 00000000000..a1734576be5 --- /dev/null +++ b/htdocs/langs/ro_RO/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Configurarea modulului Imprimare directă +PrintIPPDesc=Acest modul adauga un buton de imprimare pentru a trimite documentele direct la o imprimantă. Este nevoie de un sistem Linux cu CUPS instalat. +PRINTIPP_ENABLED=Afișare pictogramă "Print Direct" în listele de documente +PRINTIPP_HOST=Server print +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Parolă +NoPrinterFound=Nu există imprimante (verificați setarea CUPS) +FileWasSentToPrinter=Fișierul %s a fost trimis la imprimantă +NoDefaultPrinterDefined=Nicio imprimantă implicită definită +DefaultPrinter=Imprimantă implicită +Printer=Imprimanta +CupsServer=Server CUPS diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang new file mode 100644 index 00000000000..fe1147cc7b1 --- /dev/null +++ b/htdocs/langs/ro_RO/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Gestionează lot/serie +ProductStatusOnBatch=Gestionat +ProductStatusNotOnBatch=Negestionat +ProductStatusOnBatchShort=Gestionat +ProductStatusNotOnBatchShort=Negestionat +Batch=Lot / Serie +atleast1batchfield=Data expirare sau data de vânzare sau numărul de lot +batch_number=Lot / Număr de serie +l_eatby=Data expirare +l_sellby=Data vânzare +DetailBatchNumber=Detalii Lot / Serie +DetailBatchFormat=Lot / Serie:%s - E:%s - S:%s (Cant.: %d) +printBatch=Lot: %s +printEatby=Expiră : %s +printSellby=Vanzare: %s +printQty=Cant: %d +AddDispatchBatchLine=Adauga o linie pentru Perioada de valabilitate expediere +BatchDefaultNumber=Nedefinit +WhenProductBatchModuleOnOptionAreForced=Când modulul de lot / serial este pornit, modul de creștere / scădere a stocului este fortat la ultima alegere și nu poate fi editat. Alte opțiuni pot fi definite după cum doriți. diff --git a/htdocs/langs/ru_RU/printipp.lang b/htdocs/langs/ru_RU/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/ru_RU/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/ru_RU/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/sk_SK/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/sl_SI/printipp.lang b/htdocs/langs/sl_SI/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/sl_SI/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/sl_SI/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/sq_AL/printipp.lang b/htdocs/langs/sq_AL/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/sq_AL/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/sq_AL/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/sv_SE/printipp.lang b/htdocs/langs/sv_SE/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/sv_SE/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/sv_SE/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/th_TH/printipp.lang b/htdocs/langs/th_TH/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/th_TH/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/th_TH/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang new file mode 100644 index 00000000000..61b366364b3 --- /dev/null +++ b/htdocs/langs/tr_TR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Parti/seri yönetimi +ProductStatusOnBatch=Yapıldı +ProductStatusNotOnBatch=Yapılmadı +ProductStatusOnBatchShort=Yapıldı +ProductStatusNotOnBatchShort=Yapılmadı +Batch=Parti/Seri +atleast1batchfield=Son yenme tarihi ya da Son satış tarihi ya da Parti numarası +batch_number=Parti/Seri numarası +l_eatby=Son yenme tarihi +l_sellby=Son satış tarihi +DetailBatchNumber=Parti/Seri ayrıntıları +DetailBatchFormat=Parti/Seri: %s - Y: %s - S: %s (Mik : %d) +printBatch=Parti: %s +printEatby=Son Yenme: %s +printSellby=Son satış: %s +printQty=Mik: %d +AddDispatchBatchLine=Dağıtımda bir Raf Ömrü satırı ekle +BatchDefaultNumber=Tanımlanmamış +WhenProductBatchModuleOnOptionAreForced=Parti/Seri devredeyken, stok arttırma/eksiltme modu son seçime zorlanır ve düzenlenemez. Diğer seçenekler istediğiniz gibi yapılandırılabilir. diff --git a/htdocs/langs/uk_UA/printipp.lang b/htdocs/langs/uk_UA/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/uk_UA/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/uk_UA/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/vi_VN/printipp.lang b/htdocs/langs/vi_VN/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/vi_VN/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/vi_VN/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/zh_CN/printipp.lang b/htdocs/langs/zh_CN/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/zh_CN/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/zh_CN/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/zh_TW/printipp.lang b/htdocs/langs/zh_TW/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/zh_TW/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang new file mode 100644 index 00000000000..ca3e49749ab --- /dev/null +++ b/htdocs/langs/zh_TW/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Manage batch/serial +ProductStatusOnBatch=Managed +ProductStatusNotOnBatch=Not Managed +ProductStatusOnBatchShort=Managed +ProductStatusNotOnBatchShort=Not Managed +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/theme/dolibarr_preferred_partner_int.png b/htdocs/theme/dolibarr_preferred_partner_int.png new file mode 100755 index 0000000000000000000000000000000000000000..c72d6153ddccee77e666b2ca86a4dea35967f885 GIT binary patch literal 9804 zcmch7gfS834!lKHrg7hpxb|s+}5H*poP@qxv4iW!qmSfScNYG0W=c7 z(bQEVo+G9wB@wLdykiJ7vAj_;dGpNO)z!}J4d|Jdo%I{L*Ia(^H;!Bynz}EH!>E`* zATE%m>eH8q*_|x^kMt9bw@O7#4q?{Gb|&3?>W`hcKR2jyJ5jLa|9n&b`Lmx*#gBoy zJXc2EfS3Tfm{@ywU6SLgCr=GL3yJ6RnBO_RqRs0zr&q(;YuJCR+q$~>{B}w7NXO6E zZ}=i4yNL7Su3?d0Ythho_OSvN$=m<$mrA|z+67TELysXcvAOZC_zPkeFt+K|jYv^M zILQ>aYZ<<(;5mB6Bx&wP-Pq!2{*UO6I5ePJ}lV5 z7)mcfm`!{GZh^o!oaqfo-;PX)b`xap_&)HE*vF$OE#r%Q38m-cDx@WN8o;g6L_t&m zdQ@4)7eZBqY)?(;b$J}aMKVf93sD0X;pv0-fX+EwJV0kv)&0&-xK3aK8Ulh*y-_j* zPibgrTRa}^TidA}hyZQLAD__>(9+&BCj!-j4}k{a|J#XY9|m-~u_1d(qpC_E!j9Ks zYHARa@KNR8A3Deb!NdRV!&gZ2zwV;~9%BEd`Z)ZbWN(>>z{5}|eH@b^usYn_h)>KW zFH8;Ob#(5LyhWpz!>_}ddnn#=q0uB3X$GbS?03XS-i{=0oKP`G#AP3S)9jeZ@)Av& z#Hu(GTFng#%V8^B=i83S0}WkFJJK1*dtK&ggE&VT=Y2x_fGOsU{+%ZBmmmaW`-XQN zrM}CztrX;CJm2g%vKY-Qmv#`bz0I{zxw$3z=+@(#<>pf8*5du2!j$2rZEGY}j9dzL zp3(#mJjqOEbb8UAM;oCpdy~F8)b6F$^-YY!JSo-kW$Ic6fuLYi9Gw|CAkS#&u_`4? z%^s=YaN||}VBp?ut6w$y<%EsZKcp_+f+=qs65rOe`yZXUStRv1>H`aSQ)prg;1;iF z(@UE8NcP5T>1L+AdSVzH^3a|E0I*;$mq)L0bNZT!swEk7HdI{3w`e>dK%(NOK4dcd zsExm9LFS}iKfBx+zG#pHe}xMLx6{^;MT!pYJ1z?>J7y+|r{cd4L))n-(vXvm(*22C zpzV^n_^)Pn80!AI(B!3~hVl?W3fOwt#EMIlw1EK8FW$uznN08}vY=xWqg`CuA5>R9 zyxz5UD&{!Cg`&Fq-6C*D&BDS0<{3S+*X>TtDtpski4Br`)b&f}a~YpvUadU#fd<15 z>0CZ?gPt&=T#mEv)!e#}THl#7P`z=Qz;O!0Ik#peFZj^o_t2dmoCutFS4;{++SpTh zd}QlbP(fV^!wip%;E^otH^u`*CPID)Maec@)iEQj=&`I!CBLtHak`h|B<`PBXmR)_ z&z~u-UnM~gl=5rC^Y-`G9Nk(tN(#>z8He->!{E64qsC7>TFDu0UL z?QSV6!@P^&C?**6wX0lv=oCZ#n+B4z(sBB?=;y31OKn;8OCcGgbUdOiCQd`Xy}{Sx z*H8ZlHE5>IcMV`Xd>7+DRQUD{OHvv3XGY79mml{>xui(-)2-uOVwinJmY*!c9%p2%t+PCC;~~!ge&J7qpoMe#3bC%3{L{s<+H+|7 z%G!t+u7>g00a?N;bR8I@LEfmoufrW)VVs z67P4wGe&W1uvkT9imWM+HOgj8B<1E__<%y8UcN2vyy>d>QfP5}Z_EOozB0E)sU2;n zwg@hxe>Y_UeINh@W*Sg|elg-+DfqEZVJ-C`+!cIEAB5zdvnM|)Qj))@3-UV`=h$MVJa2zgD4g>dXg3M@(C@R z-r1jy{ee$75oAUW{oN={ z{6CemcK|D_D9Fv_f{PF=mk#DoGCJFJ8x^v&$z|x>>WGygSERLzG*+ZPMX#J)!W>L# z|0wX(uXyA#GviSZwR!E-PgZjun`dHGq%1X7&xGfG{oV`ckJ{cK!m|A?bQO=S8IZs^ zaoL;3BZv+d!M5{=2r%0MVyc0Xk~V%<)!N$WlBC|<{4t~~nf4hn2T#i0#3KT)2U>0e#JFm&Sc$e*1TEADTY6S8R&Y-p?VGJ;P z6X-8%+ITnBkdP38j?Hvd?D5y^K8oBOd9`@6$JAXiQ$P8*%rb;UBnJ0&Qy6}5knPbd z%i_Az95hj3tEU4|?JIFOjW;+D~Y&_Y0i@>f{}6YW7C z5{#dKitNppOl<0%$nH)oeiNrF79{RbY-T0qKXpP>2ofnWMfQ8>q1bm1+K6Je4)2Un zSd!20sP$b)Yk(>nY_7BcBOQRO$y1%>&yk%*QLocfrWLYOfZT>&OY=Wv4Fz94>iMcI zd%&@Ga@5qr7a??ToYxYf)YH?W*(D+6HaD8O^V&3CN=WeU{blASe(kh6`5)FY>=BZ& zy~``6h@^XN&efyhU8DP2oZ+h;hm>O!al!XbyXV>4h5-w(s<+@>3rtuHm^nWf;xjuqYu*zixB+K=?9w;~?tv(lszr^-8%XxTJ;&Tx=NrJ`JQ<>K!VB{-v3DHrX6y|htSolx;gG9t!G?c<~in*JL)d|ULgCCqk2KHmH>1* z-}Huq@EfFhzROU5)b{;d4_TYq-8YcEV(tq_^V0`id-@GNr;Vp)7PSJ=@#?+))i)kt zZ5({kxo*?=Uu%3au9rh(sWM9iOFi^tct{mY-Q+F$R>~d_P@Qb0qSG|#c-6%Y;8T9oZ zTlLwwn}69Zt+DGX83?xiHWb}3RF0f0%_PQC+RCfFyEo)n(CMdnyYcg7H(Z(bv}&wy zO2{}<+LL=Z^Ie-E1;q11LqrK{+Scag@Xh%wcCf!l>w4soh14#?L%!FSKeyL51Ud^@ zVojj0OJA4rQi1W5eTd8VE95yY)^Uye|B?UNxZ%Zr*W^uflAevWW@bi(0nvN?aOdK7 zXwUHab=0KqHiq|+jLIg8YG(VONp+z^a3k~Eg}u=zCk%tI>v-MeWC z`Inqi3u5}Hn(Bd{Ocmxo=3mMw3;nofv6I;M@anX=QdJgzIedO zWEvPhGbFx2PpJ{RQop*$?nNkqW3gp@`hbDv+Ntfgfe_>qBkDPe%U_AZWiaga!X8L`I*_xa4Spea|8Sj?1RWTy z(0p^wPyhYIWa9VUI|Xd!FmPXvwiaM!DR9&~92*C#$x^2$=aTW6r?W%&E(^D}j@T7r zRT9B_u7nSL4Bw>`3Y^(Ik^tJ~mWVByUrn*>nvuw%y5v1y=zp>&z26GmTcO)6lCTJ@ zH-7Cx@tOQFG9I1Ngbgk!ve%ZjzalcCu4)m+HLmmgTcS%a-Tquq_u%CUG_=ILk zWbSIGCv>z-6>k*w+yjLjwNthH-hI-t(3D)Cx^Q)WPF(WBpN1P*YDWG%qc)i8B?9ej zlCaeJ@?_ZWh{K-7y}b9-ShXP0(aq5@=ybw(3GoLz=jNWNa2a2$tE)?Dc_e$8dw+AA zv@+`3iO?^WSC`fq?e7)34_=X3-^9ZoP8-UOa#XN<CLz`ThF%@na3s~2=^r`aqEIA=f zHq)CErKj%jNX~R8_KbA>>{l=M4~RyBOOj_f3Rx7{q!(A$=IGGq)F?Ry{Z7sRv>$?c z;Eu>4lcv5AzzWpIC@S^ELa(H|RLq`i%(S|j(#mPhZt9A)WFGO91xp_a%*>M~mC}jH zT|XGIxX+Dsb#FMHRJuEwHCpgZ@IoMDI^k(s{bdWff%v77Jx$L~0*3!mYg!^emIX9C z=Bxo$SVS?s#`*|HxpA+*sX?7^kB6XU=)@RK=>78wo+i0#0zH_vl=R=QKZH+jY zXy_2}1B|TlSrDw?C(dhcNLDA?`IvVQjr~VVuT|XIU z|1>S4McN1&)5Gu4(T84oksny9yX)yb$LKRl;!Z8x>7&Nx8H>Wi?B(el8dga%b&)ep1uZtF z@xyn5+P^+~WeBM2v;L^7x~!#8R6Pc>6#%<2g}w#|fYSZzV7WB_c99?chr2{0X7Udl zf-`C*fH*1mhf-KznW|-v^A12*d36K!NTpX#TV0p>^urA0Ruuhe53l<L^*``YScDU)%H`>A#l2mSWu*$8Y_&n?~io9cB?c+(8CTt?dPF%>)#4l zvWc(ys<|`FFs_zXBK=W9$*h{H1-+jh|8==&b$FpRC$@sQ1}h@sDb%0g}Q2A~`1aTo*wcx_9jLq@J&L zDNNu}7)*bks5d3>nom7&HC18S4g_+^regF_V#@G9UQ1#IeNZgjz%c0EESe>CglDFtG9_#f+tm8$ zq#;#Ou>M~fI!pJ*k_-AgO-@KKA@&xd;fYd|&0rE1{QFv83Tvn46lVFRqdX%avZ@(; zz{r1xn>(08xBbQ@Jn5r$x<+18Ydp00jNPU+id;1qWt*B4wJa``!cA-zfd<-+9TUeEnu!-uLp66w;VnLFn;eSf9GZ( zafw2spL0qc#matBX`aT_;i$z-1)NRe9TqI2hdg1r{ZTE`b5A;|xpVM%@iV-FN{x{@ z1!-7aWtu%+UH||Ew)PTt8o>v@$TR5{-L$M9LIsiscW`R2eSiA}iZ?2JP&%C)@Q6q) zj5m*~E04tE4U{?TR1n>k!#VLw0wPl781NRc@9N=uuz6GgLZz)mRo!uz@{$~GS|ZDI zGL3I+Rj_?E#ig-|An4=q13A?DCjY$W+K;r=+CdLCxy=J6QFdw;#6tl8 z1hH3k72#dt*)C8^uWpxmvY%YvMM!G57KkBR#5;L2q}$L(Lq~3XZ?7joQedex`!l{= zg0m*)uHc2EGH)ekBtUP0JYe^~mKbm<@T-> zDwxTY>0FUH=PAMa9@M|W)R6(v*VV4f#{(|J8P=pUAook&SeTq4P))FNFC2RdsyJ z9PZxbOjbH&$SF}!>_T%02*-Wtbu=x}`~OHiYV3`pdS{kGDbdVk&S zbP185Dd%Ssv#+-k67IWpAvk&+5+-5Jn54z?`b+pEER;YYkQhdPFP%6eURdku=o1V!YJWz zJ;Pkvm!`tsrx3A7^brYJjL}})K*qXpEqhw{hLcvmE$4B;dYs^zu_(dE7}rVzPylsK zVEA`Y9z3Nf*f0eFUXgnK4{F)QQ_tGT0L3bH>6WIZiyg&_?^KT=e(LA9mouIEr6X zPhQwBCnY2#Jd-m!4Rht@%1Rin#BT=|620sAW<&cY@(n4aoaBjf+0vC>wMPtPUEOue zu%!Lo5Ozn(i7jYc@^ajFP9y7YX(idU(`8sLH6GRXj@1gnijDiiGZD#Ec`N8y}B?)A;pxf!su_G~A6Dwkxzrm7b-HQN2Q`X|W|!h(W^TT_+B zC)q`kB`>%<(xIEYIH|DKFkKw4)>gzJIXUM?F$cZXAzX*mzOq%x=mnyDykpu|N3f2* zL5Vd6>!&=ttjx7Pl@-cdRV%>Sn(u@BGgd_X?eIJnzt9O2I|i!<2_`|}V%TN=Hk#Jh z?|4Gi{FTl+atk{<--mhEPF@OPhy=@xoiHgZ*z2NRXD5qU7HmPmuNRnc2CZU#T!?bw zXh7p+z|&V-N&^{E?o&@K#Ow!{XGTZ8S|CmWLo@4hVfslBY9k|~x8tatS#`juP_}b+u;Loz zfpmm*IS!lZgbCq{QBVC(606i@^nI6%&`1l-wk4q+5w1xUj*5D9^VU>#Po8 zy?F@vkhvEB!?x{6JJa8)O~jl(G*DlBtKAlwJdsPtVSsa275w5TA2-z63J&8%k|#|{ z@s-=cij~HvrZ|_QJ}A+X3=k(t=EoTx8G{63M8&D9rNFJ|2^h2z~>ob}4} zkG7XiFRz_zA=J*8HY)j&qyTdn!Psnz_K<6_qMVQbgA6S@9YgCCn`Qg*V_(cmRp;RB z$qPlyv6M@L&ulGRQR>EmCP ztd2oXvY6v~nebEbEp6u3a7Go+EoXk7wsTSt6=BPfb(8MSn2JeQr7>)&tX9zyeof;M z4cR2}yK6P4sex|lYZb2|<;#!TDbHT;`_w`=eanxVJFKc&?s~S( zh(-@5L!=sho-w%uQi?uvZWW>@xe^FNX5t9}Yx_hCV*W-M#{?pAHZ$WM|c1z8vfqWe1d0OboAu zDKFz;#$3Nz^bgC&NJi$B8}72(?dph zZoa?ZI|?XYTju57<;PRW5Kefxi0hbH%iPYVD?|7-sF^x!p``B7 zQO~M|qGIUHrR%oYV_!Mu? zsk}%n|Hoi?Mc`+^{QdIPV`gXH^;eICyWr~y3&#cjNac{FA<2AaeTDbAq@v=cVM2e2 z=;!x!ZA7LQ;L|I@>9n@qhxN?WyD#0}E;FrhXO<6}c8;}*-#-^U zQSuu9yaaZitKh0{+SRh+M|m0@xPQk@+mIxcEx3SogDiM zYCJ43YRilpK4Z2a&2%k%%)_cx&`Gh}XOzs$dB;#|$3^+UD%bKmfG;FRhGa@OL$$eR z5FO>yAU}(*q9;bMB?BY#h0Ly?wnu<96=VfH0=7d=3}Nl>t^ZRHuW)p8b5n>|HH3vu znC=~H&(v%IF~}Gx@-+KO&;TE_{DU`pnx2AaX&lB`b=Z7$6=W&Tq2Xt90c1f+X2^d5 zO5~)|fvvobV_J`LHro2?8N8Lb3z1t`$Yby@^-bMiG>e#e_v%5AA79lqnOSiiu1|bS zNfO=yt2EO3F+VTwRfKL}aQ-eBPBEv)3WX~`1?!$@RvF=zU+|5$my|eZ0Q(~Km)oUs z_i`@%J`9tGEv+*#E-nS!Q{~wZ-_CgU)n=|V;di8UkXYFM$@k>f+}v5i5jYkA`?c1C zmD))r-nlQ?{DXsowv=5UW)6T)ZEy*rMrYrn#eL{2!GX?25au*PGXV)GytO3178D2u zW@~_R@XT>9!*iJ%Dn>J7gV$CiBv{Vb$-`AN0QD>b+txzf!LG$W$+gYx2AL{h#*q*9 z%s)Y#-dGlosH)1Qw&SlS0|7shf3{N2kXei0<2Eo0vf1|+#@CUkxq&-=4EK5 z@EXF&n!Fa`z$bk_yz1IKOmGxw&Fr%v@ea^RMc7tv-J}LT#)Xn|Stx#C2A>U+JbTzl zAK>1oDj~_Ze43x!q|;&dtur+_`P^YJePVR8v4EEwQ3!4zJu`><4={Sa=HV_UvumUj z@tL-fjOL++BNnnUcN_N4t~vd6o2{8;dmMrWPzBk(!HP=`3ZLs`IhXK3av%`l$A4!5 zm?<-7r>7fwuT(^tukMi!js940kluin`{-6H*Vqrvy0#7NV%YAhsd^0?;?@Aj8Em42 zC^5{aW|8PP^IM%6#xJfi=qcOa(kYCX{O9EAEcNE{Cfmj2q@-;^otLoNG6B}$3f@+~ zLB$;3n5Mjp7EW&N)=UN*Lol2vfcHdIvPro4lT5>{y8PGDG3E+%?<&7S5yZ(P9d1&Y z)F~Przwp@m5ZDy#NgLK`Hkg>88$(&U{3FxHq9RkLlaW3%ya~Y;#DL1*0e_1@i%UsW z`jW3r$9C#wND3>_lVR2uyG;GZtXu5t?7klT86%%rhF?hLHs@L(NjkPfv|4?2)2MxPy^{i zdbd!cHNfg9rL~=@H$QVxvx-{DU=`#BfB)9XMO+;Hc{WRa=Y3De>b=k$#S%bZ=Y} zgx^P5L!}{Pp=l7bRUh-2Z!ZepnxHw?Y(R27f~>s@1z{T%VXi zCmQWtwPT*xLe40J7A$w~6@5fWfYi14batZX3X z^XcbgSqvsX z!&!2thd}CaUuywySM>trmT2eebZh4PQoI_i_rnS2s$YLe{DlBEkJcYso zccD_rSlO1Gz6~phR*chQ#*=ZZ?XG*+ftl3Q(~Ojql*44m4=YiV^16_TsvV!%bvZ5P zU_6f!NJ*LCkYWx%x^4Mr&KR^z*=)W@JqyFpNw#c2t9kJpz!7}qBJfuENmuED8n3;8 z@^QU1#7NQ;2j2DKR3WDACFO45r*goyB*4pCd^O2}3z+l#P z3E+2t?X=MOPuaT`p031_^%pLkX;)?jz!?+OjcFuIN&wR~0t>_@Q<^c9>C`-uq1#8F&9a)ISvIT17XQ*}*QFPHN$c)TtVyK~N?T<$>ddIevwNqZ oGYkrHPk|#e|L?DRQ&&m~Ka|sn$zWB$p)Qc7nx1Nfiq+fy0WW&Yj{pDw literal 0 HcmV?d00001 From 52b64f34418af6a84f1aa64c1af52bf8a1d5b0f0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 17 Dec 2014 13:27:44 +0100 Subject: [PATCH 069/172] CSS --- htdocs/core/tpl/login.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index eabf4c2ad89..18069afc1d3 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -125,7 +125,7 @@ if (! empty($hookmanager->resArray['options'])) {
- + ",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j -)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); -var hljs=new function(){function l(o){return o.replace(/&/gm,"&").replace(/"}while(x.length||y.length){var u=t().splice(0,1)[0];v+=l(w.substr(q,u.offset-q));q=u.offset;if(u.event=="start"){v+=r(u.node);s.push(u.node)}else{if(u.event=="stop"){var p=s.length;do{p--;var o=s[p];v+=("")}while(o!=u.node);s.splice(p,1);while(p'+l(K[0])+""}else{M+=l(K[0])}O=N.lR.lastIndex;K=N.lR.exec(L)}M+=l(L.substr(O,L.length-O));return M}function J(r,L){if(L.sL&&d[L.sL]){var K=f(L.sL,r);s+=K.keyword_count;return K.value}else{return E(r,L)}}function H(L,r){var K=L.cN?'':"";if(L.rB){p+=K;L.buffer=""}else{if(L.eB){p+=l(r)+K;L.buffer=""}else{p+=K;L.buffer=r}}B.push(L);A+=L.r}function D(N,K,P){var Q=B[B.length-1];if(P){p+=J(Q.buffer+N,Q);return false}var L=y(K,Q);if(L){p+=J(Q.buffer+N,Q);H(L,K);return L.rB}var r=v(B.length-1,K);if(r){var M=Q.cN?"":"";if(Q.rE){p+=J(Q.buffer+N,Q)+M}else{if(Q.eE){p+=J(Q.buffer+N,Q)+M+l(K)}else{p+=J(Q.buffer+N+K,Q)+M}}while(r>1){M=B[B.length-2].cN?"":"";p+=M;r--;B.length--}var O=B[B.length-1];B.length--;B[B.length-1].buffer="";if(O.starts){H(O.starts,"")}return Q.rE}if(w(K,Q)){throw"Illegal"}}var G=d[I];var B=[G.dM];var A=0;var s=0;var p="";try{var u=0;G.dM.buffer="";do{var x=q(C,u);var t=D(x[0],x[1],x[2]);u+=x[0].length;if(!t){u+=x[1].length}}while(!x[2]);if(B.length>1){throw"Illegal"}return{language:I,r:A,keyword_count:s,value:p}}catch(F){if(F=="Illegal"){return{language:null,r:0,keyword_count:0,value:l(C)}}else{throw F}}}function h(){function o(t,s,u){if(t.compiled){return}if(!u){t.bR=c(s,t.b?t.b:"\\B|\\b");if(!t.e&&!t.eW){t.e="\\B|\\b"}if(t.e){t.eR=c(s,t.e)}}if(t.i){t.iR=c(s,t.i)}if(t.r==undefined){t.r=1}if(t.k){t.lR=c(s,t.l||hljs.IR,true)}for(var r in t.k){if(!t.k.hasOwnProperty(r)){continue}if(t.k[r] instanceof Object){t.kG=t.k}else{t.kG={keyword:t.k}}break}if(!t.c){t.c=[]}t.compiled=true;for(var q=0;qx.keyword_count+x.r){x=u}if(u.keyword_count+u.r>w.keyword_count+w.r){x=w;w=u}}}var s=t.className;if(!s.match(w.language)){s=s?(s+" "+w.language):w.language}var o=b(t);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=k(o,b(q),A)}if(y){w.value=w.value.replace(/^((<[^>]+>|\t)+)/gm,function(B,E,D,C){return E.replace(/\t/g,y)})}if(p){w.value=w.value.replace(/\n/g,"
")}if(/MSIE [678]/.test(navigator.userAgent)&&t.tagName=="CODE"&&t.parentNode.tagName=="PRE"){var q=t.parentNode;var v=document.createElement("div");v.innerHTML="
"+w.value+"
";t=v.firstChild.firstChild;v.firstChild.cN=q.cN;q.parentNode.replaceChild(v.firstChild,q)}else{t.innerHTML=w.value}t.className=s;t.dataset={};t.dataset.result={language:w.language,kw:w.keyword_count,re:w.r};if(x&&x.language){t.dataset.second_best={language:x.language,kw:x.keyword_count,re:x.r}}}function j(){if(j.called){return}j.called=true;e();var q=document.getElementsByTagName("pre");for(var o=0;o|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\.",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.inherit=function(o,r){var q={};for(var p in o){q[p]=o[p]}if(r){for(var p in r){q[p]=r[p]}}return q}}();hljs.LANGUAGES.ruby=function(){var g="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?";var a="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var n={keyword:{and:1,"false":1,then:1,defined:1,module:1,"in":1,"return":1,redo:1,"if":1,BEGIN:1,retry:1,end:1,"for":1,"true":1,self:1,when:1,next:1,until:1,"do":1,begin:1,unless:1,END:1,rescue:1,nil:1,"else":1,"break":1,undef:1,not:1,"super":1,"class":1,"case":1,require:1,yield:1,alias:1,"while":1,ensure:1,elsif:1,or:1,def:1},keymethods:{__id__:1,__send__:1,abort:1,abs:1,"all?":1,allocate:1,ancestors:1,"any?":1,arity:1,assoc:1,at:1,at_exit:1,autoload:1,"autoload?":1,"between?":1,binding:1,binmode:1,"block_given?":1,call:1,callcc:1,caller:1,capitalize:1,"capitalize!":1,casecmp:1,"catch":1,ceil:1,center:1,chomp:1,"chomp!":1,chop:1,"chop!":1,chr:1,"class":1,class_eval:1,"class_variable_defined?":1,class_variables:1,clear:1,clone:1,close:1,close_read:1,close_write:1,"closed?":1,coerce:1,collect:1,"collect!":1,compact:1,"compact!":1,concat:1,"const_defined?":1,const_get:1,const_missing:1,const_set:1,constants:1,count:1,crypt:1,"default":1,default_proc:1,"delete":1,"delete!":1,delete_at:1,delete_if:1,detect:1,display:1,div:1,divmod:1,downcase:1,"downcase!":1,downto:1,dump:1,dup:1,each:1,each_byte:1,each_index:1,each_key:1,each_line:1,each_pair:1,each_value:1,each_with_index:1,"empty?":1,entries:1,eof:1,"eof?":1,"eql?":1,"equal?":1,"eval":1,exec:1,exit:1,"exit!":1,extend:1,fail:1,fcntl:1,fetch:1,fileno:1,fill:1,find:1,find_all:1,first:1,flatten:1,"flatten!":1,floor:1,flush:1,for_fd:1,foreach:1,fork:1,format:1,freeze:1,"frozen?":1,fsync:1,getc:1,gets:1,global_variables:1,grep:1,gsub:1,"gsub!":1,"has_key?":1,"has_value?":1,hash:1,hex:1,id:1,include:1,"include?":1,included_modules:1,index:1,indexes:1,indices:1,induced_from:1,inject:1,insert:1,inspect:1,instance_eval:1,instance_method:1,instance_methods:1,"instance_of?":1,"instance_variable_defined?":1,instance_variable_get:1,instance_variable_set:1,instance_variables:1,"integer?":1,intern:1,invert:1,ioctl:1,"is_a?":1,isatty:1,"iterator?":1,join:1,"key?":1,keys:1,"kind_of?":1,lambda:1,last:1,length:1,lineno:1,ljust:1,load:1,local_variables:1,loop:1,lstrip:1,"lstrip!":1,map:1,"map!":1,match:1,max:1,"member?":1,merge:1,"merge!":1,method:1,"method_defined?":1,method_missing:1,methods:1,min:1,module_eval:1,modulo:1,name:1,nesting:1,"new":1,next:1,"next!":1,"nil?":1,nitems:1,"nonzero?":1,object_id:1,oct:1,open:1,pack:1,partition:1,pid:1,pipe:1,pop:1,popen:1,pos:1,prec:1,prec_f:1,prec_i:1,print:1,printf:1,private_class_method:1,private_instance_methods:1,"private_method_defined?":1,private_methods:1,proc:1,protected_instance_methods:1,"protected_method_defined?":1,protected_methods:1,public_class_method:1,public_instance_methods:1,"public_method_defined?":1,public_methods:1,push:1,putc:1,puts:1,quo:1,raise:1,rand:1,rassoc:1,read:1,read_nonblock:1,readchar:1,readline:1,readlines:1,readpartial:1,rehash:1,reject:1,"reject!":1,remainder:1,reopen:1,replace:1,require:1,"respond_to?":1,reverse:1,"reverse!":1,reverse_each:1,rewind:1,rindex:1,rjust:1,round:1,rstrip:1,"rstrip!":1,scan:1,seek:1,select:1,send:1,set_trace_func:1,shift:1,singleton_method_added:1,singleton_methods:1,size:1,sleep:1,slice:1,"slice!":1,sort:1,"sort!":1,sort_by:1,split:1,sprintf:1,squeeze:1,"squeeze!":1,srand:1,stat:1,step:1,store:1,strip:1,"strip!":1,sub:1,"sub!":1,succ:1,"succ!":1,sum:1,superclass:1,swapcase:1,"swapcase!":1,sync:1,syscall:1,sysopen:1,sysread:1,sysseek:1,system:1,syswrite:1,taint:1,"tainted?":1,tell:1,test:1,"throw":1,times:1,to_a:1,to_ary:1,to_f:1,to_hash:1,to_i:1,to_int:1,to_io:1,to_proc:1,to_s:1,to_str:1,to_sym:1,tr:1,"tr!":1,tr_s:1,"tr_s!":1,trace_var:1,transpose:1,trap:1,truncate:1,"tty?":1,type:1,ungetc:1,uniq:1,"uniq!":1,unpack:1,unshift:1,untaint:1,untrace_var:1,upcase:1,"upcase!":1,update:1,upto:1,"value?":1,values:1,values_at:1,warn:1,write:1,write_nonblock:1,"zero?":1,zip:1}};var h={cN:"yardoctag",b:"@[A-Za-z]+"};var d={cN:"comment",b:"#",e:"$",c:[h]};var c={cN:"comment",b:"^\\=begin",e:"^\\=end",c:[h],r:10};var b={cN:"comment",b:"^__END__",e:"\\n$"};var u={cN:"subst",b:"#\\{",e:"}",l:g,k:n};var p=[hljs.BE,u];var s={cN:"string",b:"'",e:"'",c:p,r:0};var r={cN:"string",b:'"',e:'"',c:p,r:0};var q={cN:"string",b:"%[qw]?\\(",e:"\\)",c:p,r:10};var o={cN:"string",b:"%[qw]?\\[",e:"\\]",c:p,r:10};var m={cN:"string",b:"%[qw]?{",e:"}",c:p,r:10};var l={cN:"string",b:"%[qw]?<",e:">",c:p,r:10};var k={cN:"string",b:"%[qw]?/",e:"/",c:p,r:10};var j={cN:"string",b:"%[qw]?%",e:"%",c:p,r:10};var i={cN:"string",b:"%[qw]?-",e:"-",c:p,r:10};var t={cN:"string",b:"%[qw]?\\|",e:"\\|",c:p,r:10};var e={cN:"function",b:"\\bdef\\s+",e:" |$|;",l:g,k:n,c:[{cN:"title",b:a,l:g,k:n},{cN:"params",b:"\\(",e:"\\)",l:g,k:n},d,c,b]};var f={cN:"identifier",b:g,l:g,k:n,r:0};var v=[d,c,b,s,r,q,o,m,l,k,j,i,t,{cN:"class",b:"\\b(class|module)\\b",e:"$|;",k:{"class":1,module:1},c:[{cN:"title",b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",r:0},{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+hljs.IR+"::)?"+hljs.IR}]},d,c,b]},e,{cN:"constant",b:"(::)?([A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:[s,r,q,o,m,l,k,j,i,t,f],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"number",b:"\\?\\w"},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},f,{b:"("+hljs.RSR+")\\s*",c:[d,c,b,{cN:"regexp",b:"/",e:"/[a-z]*",i:"\\n",c:[hljs.BE]}],r:0}];u.c=v;e.c[1].c=v;return{dM:{l:g,k:n,c:v}}}(); -// ColorBox v1.3.20.1 - jQuery lightbox plugin -// (c) 2011 Jack Moore - jacklmoore.com -// License: http://www.opensource.org/licenses/mit-license.php -(function ($, document, window) { - var - // Default settings object. - // See http://jacklmoore.com/colorbox for details. - defaults = { - transition: "elastic", - speed: 300, - width: false, - initialWidth: "600", - innerWidth: false, - maxWidth: false, - height: false, - initialHeight: "450", - innerHeight: false, - maxHeight: false, - scalePhotos: true, - scrolling: true, - inline: false, - html: false, - iframe: false, - fastIframe: true, - photo: false, - href: false, - title: false, - rel: false, - opacity: 0.9, - preloading: true, - - current: "image {current} of {total}", - previous: "previous", - next: "next", - close: "close", - xhrError: "This content failed to load.", - imgError: "This image failed to load.", - - open: false, - returnFocus: true, - reposition: true, - loop: true, - slideshow: false, - slideshowAuto: true, - slideshowSpeed: 2500, - slideshowStart: "start slideshow", - slideshowStop: "stop slideshow", - onOpen: false, - onLoad: false, - onComplete: false, - onCleanup: false, - onClosed: false, - overlayClose: true, - escKey: true, - arrowKey: true, - top: false, - bottom: false, - left: false, - right: false, - fixed: false, - data: undefined - }, - - // Abstracting the HTML and event identifiers for easy rebranding - colorbox = 'colorbox', - prefix = 'cbox', - boxElement = prefix + 'Element', - - // Events - event_open = prefix + '_open', - event_load = prefix + '_load', - event_complete = prefix + '_complete', - event_cleanup = prefix + '_cleanup', - event_closed = prefix + '_closed', - event_purge = prefix + '_purge', - - // Special Handling for IE - isIE = !$.support.opacity && !$.support.style, // IE7 & IE8 - isIE6 = isIE && !window.XMLHttpRequest, // IE6 - event_ie6 = prefix + '_IE6', - - // Cached jQuery Object Variables - $overlay, - $box, - $wrap, - $content, - $topBorder, - $leftBorder, - $rightBorder, - $bottomBorder, - $related, - $window, - $loaded, - $loadingBay, - $loadingOverlay, - $title, - $current, - $slideshow, - $next, - $prev, - $close, - $groupControls, - - // Variables for cached values or use across multiple functions - settings, - interfaceHeight, - interfaceWidth, - loadedHeight, - loadedWidth, - element, - index, - photo, - open, - active, - closing, - loadingTimer, - publicMethod, - div = "div", - init; - - // **************** - // HELPER FUNCTIONS - // **************** - - // Convience function for creating new jQuery objects - function $tag(tag, id, css) { - var element = document.createElement(tag); - - if (id) { - element.id = prefix + id; - } - - if (css) { - element.style.cssText = css; - } - - return $(element); - } - - // Determine the next and previous members in a group. - function getIndex(increment) { - var - max = $related.length, - newIndex = (index + increment) % max; - - return (newIndex < 0) ? max + newIndex : newIndex; - } - - // Convert '%' and 'px' values to integers - function setSize(size, dimension) { - return Math.round((/%/.test(size) ? ((dimension === 'x' ? winWidth() : winHeight()) / 100) : 1) * parseInt(size, 10)); - } - - // Checks an href to see if it is a photo. - // There is a force photo option (photo: true) for hrefs that cannot be matched by this regex. - function isImage(url) { - return settings.photo || /\.(gif|png|jp(e|g|eg)|bmp|ico)((#|\?).*)?$/i.test(url); - } - - function winWidth() { - // $(window).width() is incorrect for some mobile browsers, but - // window.innerWidth is unsupported in IE8 and lower. - return window.innerWidth || $window.width(); - } - - function winHeight() { - return window.innerHeight || $window.height(); - } - - // Assigns function results to their respective properties - function makeSettings() { - var i, - data = $.data(element, colorbox); - - if (data == null) { - settings = $.extend({}, defaults); - if (console && console.log) { - console.log('Error: cboxElement missing settings object'); - } - } else { - settings = $.extend({}, data); - } - - for (i in settings) { - if ($.isFunction(settings[i]) && i.slice(0, 2) !== 'on') { // checks to make sure the function isn't one of the callbacks, they will be handled at the appropriate time. - settings[i] = settings[i].call(element); - } - } - - settings.rel = settings.rel || element.rel || $(element).data('rel') || 'nofollow'; - settings.href = settings.href || $(element).attr('href'); - settings.title = settings.title || element.title; - - if (typeof settings.href === "string") { - settings.href = $.trim(settings.href); - } - } - - function trigger(event, callback) { - $.event.trigger(event); - if (callback) { - callback.call(element); - } - } - - // Slideshow functionality - function slideshow() { - var - timeOut, - className = prefix + "Slideshow_", - click = "click." + prefix, - start, - stop, - clear; - - if (settings.slideshow && $related[1]) { - start = function () { - $slideshow - .html(settings.slideshowStop) - .unbind(click) - .bind(event_complete, function () { - if (settings.loop || $related[index + 1]) { - timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed); - } - }) - .bind(event_load, function () { - clearTimeout(timeOut); - }) - .one(click + ' ' + event_cleanup, stop); - $box.removeClass(className + "off").addClass(className + "on"); - timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed); - }; - - stop = function () { - clearTimeout(timeOut); - $slideshow - .html(settings.slideshowStart) - .unbind([event_complete, event_load, event_cleanup, click].join(' ')) - .one(click, function () { - publicMethod.next(); - start(); - }); - $box.removeClass(className + "on").addClass(className + "off"); - }; - - if (settings.slideshowAuto) { - start(); - } else { - stop(); - } - } else { - $box.removeClass(className + "off " + className + "on"); - } - } - - function launch(target) { - if (!closing) { - - element = target; - - makeSettings(); - - $related = $(element); - - index = 0; - - if (settings.rel !== 'nofollow') { - $related = $('.' + boxElement).filter(function () { - var data = $.data(this, colorbox), - relRelated; - - if (data) { - relRelated = $(this).data('rel') || data.rel || this.rel; - } - - return (relRelated === settings.rel); - }); - index = $related.index(element); - - // Check direct calls to ColorBox. - if (index === -1) { - $related = $related.add(element); - index = $related.length - 1; - } - } - - if (!open) { - open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys. - - $box.show(); - - if (settings.returnFocus) { - $(element).blur().one(event_closed, function () { - $(this).focus(); - }); - } - - // +settings.opacity avoids a problem in IE when using non-zero-prefixed-string-values, like '.5' - $overlay.css({"opacity": +settings.opacity, "cursor": settings.overlayClose ? "pointer" : "auto"}).show(); - - // Opens inital empty ColorBox prior to content being loaded. - settings.w = setSize(settings.initialWidth, 'x'); - settings.h = setSize(settings.initialHeight, 'y'); - publicMethod.position(); - - if (isIE6) { - $window.bind('resize.' + event_ie6 + ' scroll.' + event_ie6, function () { - $overlay.css({width: winWidth(), height: winHeight(), top: $window.scrollTop(), left: $window.scrollLeft()}); - }).trigger('resize.' + event_ie6); - } - - trigger(event_open, settings.onOpen); - - $groupControls.add($title).hide(); - - $close.html(settings.close).show(); - } - - publicMethod.load(true); - } - } - - // ColorBox's markup needs to be added to the DOM prior to being called - // so that the browser will go ahead and load the CSS background images. - function appendHTML() { - if (!$box && document.body) { - init = false; - - $window = $(window); - $box = $tag(div).attr({id: colorbox, 'class': isIE ? prefix + (isIE6 ? 'IE6' : 'IE') : ''}).hide(); - $overlay = $tag(div, "Overlay", isIE6 ? 'position:absolute' : '').hide(); - $loadingOverlay = $tag(div, "LoadingOverlay").add($tag(div, "LoadingGraphic")); - $wrap = $tag(div, "Wrapper"); - $content = $tag(div, "Content").append( - $loaded = $tag(div, "LoadedContent", 'width:0; height:0; overflow:hidden'), - $title = $tag(div, "Title"), - $current = $tag(div, "Current"), - $next = $tag(div, "Next"), - $prev = $tag(div, "Previous"), - $slideshow = $tag(div, "Slideshow").bind(event_open, slideshow), - $close = $tag(div, "Close") - ); - - $wrap.append( // The 3x3 Grid that makes up ColorBox - $tag(div).append( - $tag(div, "TopLeft"), - $topBorder = $tag(div, "TopCenter"), - $tag(div, "TopRight") - ), - $tag(div, false, 'clear:left').append( - $leftBorder = $tag(div, "MiddleLeft"), - $content, - $rightBorder = $tag(div, "MiddleRight") - ), - $tag(div, false, 'clear:left').append( - $tag(div, "BottomLeft"), - $bottomBorder = $tag(div, "BottomCenter"), - $tag(div, "BottomRight") - ) - ).find('div div').css({'float': 'left'}); - - $loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none'); - - $groupControls = $next.add($prev).add($current).add($slideshow); - - $(document.body).append($overlay, $box.append($wrap, $loadingBay)); - } - } - - // Add ColorBox's event bindings - function addBindings() { - if ($box) { - if (!init) { - init = true; - - // Cache values needed for size calculations - interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height();//Subtraction needed for IE6 - interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width(); - loadedHeight = $loaded.outerHeight(true); - loadedWidth = $loaded.outerWidth(true); - - // Setting padding to remove the need to do size conversions during the animation step. - $box.css({"padding-bottom": interfaceHeight, "padding-right": interfaceWidth}); - - // Anonymous functions here keep the public method from being cached, thereby allowing them to be redefined on the fly. - $next.click(function () { - publicMethod.next(); - }); - $prev.click(function () { - publicMethod.prev(); - }); - $close.click(function () { - publicMethod.close(); - }); - $overlay.click(function () { - if (settings.overlayClose) { - publicMethod.close(); - } - }); - - // Key Bindings - $(document).bind('keydown.' + prefix, function (e) { - var key = e.keyCode; - if (open && settings.escKey && key === 27) { - e.preventDefault(); - publicMethod.close(); - } - if (open && settings.arrowKey && $related[1]) { - if (key === 37) { - e.preventDefault(); - $prev.click(); - } else if (key === 39) { - e.preventDefault(); - $next.click(); - } - } - }); - - $('.' + boxElement, document).live('click', function (e) { - // ignore non-left-mouse-clicks and clicks modified with ctrl / command, shift, or alt. - // See: http://jacklmoore.com/notes/click-events/ - if (!(e.which > 1 || e.shiftKey || e.altKey || e.metaKey)) { - e.preventDefault(); - launch(this); - } - }); - } - return true; - } - return false; - } - - // Don't do anything if ColorBox already exists. - if ($.colorbox) { - return; - } - - // Append the HTML when the DOM loads - $(appendHTML); - - - // **************** - // PUBLIC FUNCTIONS - // Usage format: $.fn.colorbox.close(); - // Usage from within an iframe: parent.$.fn.colorbox.close(); - // **************** - - publicMethod = $.fn[colorbox] = $[colorbox] = function (options, callback) { - var $this = this; - - options = options || {}; - - appendHTML(); - - if (addBindings()) { - if (!$this[0]) { - if ($this.selector) { // if a selector was given and it didn't match any elements, go ahead and exit. - return $this; - } - // if no selector was given (ie. $.colorbox()), create a temporary element to work with - $this = $(''); - options.open = true; // assume an immediate open - } - - if (callback) { - options.onComplete = callback; - } - - $this.each(function () { - $.data(this, colorbox, $.extend({}, $.data(this, colorbox) || defaults, options)); - }).addClass(boxElement); - - if (($.isFunction(options.open) && options.open.call($this)) || options.open) { - launch($this[0]); - } - } - - return $this; - }; - - publicMethod.position = function (speed, loadedCallback) { - var - css, - top = 0, - left = 0, - offset = $box.offset(), - scrollTop, - scrollLeft; - - $window.unbind('resize.' + prefix); - - // remove the modal so that it doesn't influence the document width/height - $box.css({top: -9e4, left: -9e4}); - - scrollTop = $window.scrollTop(); - scrollLeft = $window.scrollLeft(); - - if (settings.fixed && !isIE6) { - offset.top -= scrollTop; - offset.left -= scrollLeft; - $box.css({position: 'fixed'}); - } else { - top = scrollTop; - left = scrollLeft; - $box.css({position: 'absolute'}); - } - - // keeps the top and left positions within the browser's viewport. - if (settings.right !== false) { - left += Math.max(winWidth() - settings.w - loadedWidth - interfaceWidth - setSize(settings.right, 'x'), 0); - } else if (settings.left !== false) { - left += setSize(settings.left, 'x'); - } else { - left += Math.round(Math.max(winWidth() - settings.w - loadedWidth - interfaceWidth, 0) / 2); - } - - if (settings.bottom !== false) { - top += Math.max(winHeight() - settings.h - loadedHeight - interfaceHeight - setSize(settings.bottom, 'y'), 0); - } else if (settings.top !== false) { - top += setSize(settings.top, 'y'); - } else { - top += Math.round(Math.max(winHeight() - settings.h - loadedHeight - interfaceHeight, 0) / 2); - } - - $box.css({top: offset.top, left: offset.left}); - - // setting the speed to 0 to reduce the delay between same-sized content. - speed = ($box.width() === settings.w + loadedWidth && $box.height() === settings.h + loadedHeight) ? 0 : speed || 0; - - // this gives the wrapper plenty of breathing room so it's floated contents can move around smoothly, - // but it has to be shrank down around the size of div#colorbox when it's done. If not, - // it can invoke an obscure IE bug when using iframes. - $wrap[0].style.width = $wrap[0].style.height = "9999px"; - - function modalDimensions(that) { - $topBorder[0].style.width = $bottomBorder[0].style.width = $content[0].style.width = that.style.width; - $content[0].style.height = $leftBorder[0].style.height = $rightBorder[0].style.height = that.style.height; - } - - css = {width: settings.w + loadedWidth, height: settings.h + loadedHeight, top: top, left: left}; - if(speed===0){ // temporary workaround to side-step jQuery-UI 1.8 bug (http://bugs.jquery.com/ticket/12273) - $box.css(css); - } - $box.dequeue().animate(css, { - duration: speed, - complete: function () { - modalDimensions(this); - - active = false; - - // shrink the wrapper down to exactly the size of colorbox to avoid a bug in IE's iframe implementation. - $wrap[0].style.width = (settings.w + loadedWidth + interfaceWidth) + "px"; - $wrap[0].style.height = (settings.h + loadedHeight + interfaceHeight) + "px"; - - if (settings.reposition) { - setTimeout(function () { // small delay before binding onresize due to an IE8 bug. - $window.bind('resize.' + prefix, publicMethod.position); - }, 1); - } - - if (loadedCallback) { - loadedCallback(); - } - }, - step: function () { - modalDimensions(this); - } - }); - }; - - publicMethod.resize = function (options) { - if (open) { - options = options || {}; - - if (options.width) { - settings.w = setSize(options.width, 'x') - loadedWidth - interfaceWidth; - } - if (options.innerWidth) { - settings.w = setSize(options.innerWidth, 'x'); - } - $loaded.css({width: settings.w}); - - if (options.height) { - settings.h = setSize(options.height, 'y') - loadedHeight - interfaceHeight; - } - if (options.innerHeight) { - settings.h = setSize(options.innerHeight, 'y'); - } - if (!options.innerHeight && !options.height) { - $loaded.css({height: "auto"}); - settings.h = $loaded.height(); - } - $loaded.css({height: settings.h}); - - publicMethod.position(settings.transition === "none" ? 0 : settings.speed); - } - }; - - publicMethod.prep = function (object) { - if (!open) { - return; - } - - var callback, speed = settings.transition === "none" ? 0 : settings.speed; - - $loaded.remove(); - $loaded = $tag(div, 'LoadedContent').append(object); - - function getWidth() { - settings.w = settings.w || $loaded.width(); - settings.w = settings.mw && settings.mw < settings.w ? settings.mw : settings.w; - return settings.w; - } - function getHeight() { - settings.h = settings.h || $loaded.height(); - settings.h = settings.mh && settings.mh < settings.h ? settings.mh : settings.h; - return settings.h; - } - - $loaded.hide() - .appendTo($loadingBay.show())// content has to be appended to the DOM for accurate size calculations. - .css({width: getWidth(), overflow: settings.scrolling ? 'auto' : 'hidden'}) - .css({height: getHeight()})// sets the height independently from the width in case the new width influences the value of height. - .prependTo($content); - - $loadingBay.hide(); - - // floating the IMG removes the bottom line-height and fixed a problem where IE miscalculates the width of the parent element as 100% of the document width. - //$(photo).css({'float': 'none', marginLeft: 'auto', marginRight: 'auto'}); - - $(photo).css({'float': 'none'}); - - // Hides SELECT elements in IE6 because they would otherwise sit on top of the overlay. - if (isIE6) { - $('select').not($box.find('select')).filter(function () { - return this.style.visibility !== 'hidden'; - }).css({'visibility': 'hidden'}).one(event_cleanup, function () { - this.style.visibility = 'inherit'; - }); - } - - callback = function () { - var preload, - i, - total = $related.length, - iframe, - frameBorder = 'frameBorder', - allowTransparency = 'allowTransparency', - complete, - src, - img, - data; - - if (!open) { - return; - } - - function removeFilter() { - if (isIE) { - $box[0].style.removeAttribute('filter'); - } - } - - complete = function () { - clearTimeout(loadingTimer); - // Detaching forces Andriod stock browser to redraw the area underneat the loading overlay. Hiding alone isn't enough. - $loadingOverlay.detach().hide(); - trigger(event_complete, settings.onComplete); - }; - - if (isIE) { - //This fadeIn helps the bicubic resampling to kick-in. - if (photo) { - $loaded.fadeIn(100); - } - } - - $title.html(settings.title).add($loaded).show(); - - if (total > 1) { // handle grouping - if (typeof settings.current === "string") { - $current.html(settings.current.replace('{current}', index + 1).replace('{total}', total)).show(); - } - - $next[(settings.loop || index < total - 1) ? "show" : "hide"]().html(settings.next); - $prev[(settings.loop || index) ? "show" : "hide"]().html(settings.previous); - - if (settings.slideshow) { - $slideshow.show(); - } - - // Preloads images within a rel group - if (settings.preloading) { - preload = [ - getIndex(-1), - getIndex(1) - ]; - while (i = $related[preload.pop()]) { - data = $.data(i, colorbox); - - if (data && data.href) { - src = data.href; - if ($.isFunction(src)) { - src = src.call(i); - } - } else { - src = i.href; - } - - if (isImage(src)) { - img = new Image(); - img.src = src; - } - } - } - } else { - $groupControls.hide(); - } - - if (settings.iframe) { - iframe = $tag('iframe')[0]; - - if (frameBorder in iframe) { - iframe[frameBorder] = 0; - } - - if (allowTransparency in iframe) { - iframe[allowTransparency] = "true"; - } - - if (!settings.scrolling) { - iframe.scrolling = "no"; - } - - $(iframe) - .attr({ - src: settings.href, - name: (new Date()).getTime(), // give the iframe a unique name to prevent caching - 'class': prefix + 'Iframe', - allowFullScreen : true, // allow HTML5 video to go fullscreen - webkitAllowFullScreen : true, - mozallowfullscreen : true - }) - .one('load', complete) - .one(event_purge, function () { - iframe.src = "//about:blank"; - }) - .appendTo($loaded); - - if (settings.fastIframe) { - $(iframe).trigger('load'); - } - } else { - complete(); - } - - if (settings.transition === 'fade') { - $box.fadeTo(speed, 1, removeFilter); - } else { - removeFilter(); - } - }; - - if (settings.transition === 'fade') { - $box.fadeTo(speed, 0, function () { - publicMethod.position(0, callback); - }); - } else { - publicMethod.position(speed, callback); - } - }; - - publicMethod.load = function (launched) { - var href, setResize, prep = publicMethod.prep; - - active = true; - - photo = false; - - element = $related[index]; - - if (!launched) { - makeSettings(); - } - - trigger(event_purge); - - trigger(event_load, settings.onLoad); - - settings.h = settings.height ? - setSize(settings.height, 'y') - loadedHeight - interfaceHeight : - settings.innerHeight && setSize(settings.innerHeight, 'y'); - - settings.w = settings.width ? - setSize(settings.width, 'x') - loadedWidth - interfaceWidth : - settings.innerWidth && setSize(settings.innerWidth, 'x'); - - // Sets the minimum dimensions for use in image scaling - settings.mw = settings.w; - settings.mh = settings.h; - - // Re-evaluate the minimum width and height based on maxWidth and maxHeight values. - // If the width or height exceed the maxWidth or maxHeight, use the maximum values instead. - if (settings.maxWidth) { - settings.mw = setSize(settings.maxWidth, 'x') - loadedWidth - interfaceWidth; - settings.mw = settings.w && settings.w < settings.mw ? settings.w : settings.mw; - } - if (settings.maxHeight) { - settings.mh = setSize(settings.maxHeight, 'y') - loadedHeight - interfaceHeight; - settings.mh = settings.h && settings.h < settings.mh ? settings.h : settings.mh; - } - - href = settings.href; - - loadingTimer = setTimeout(function () { - $loadingOverlay.show().appendTo($content); - }, 100); - - if (settings.inline) { - // Inserts an empty placeholder where inline content is being pulled from. - // An event is bound to put inline content back when ColorBox closes or loads new content. - $tag(div).hide().insertBefore($(href)[0]).one(event_purge, function () { - $(this).replaceWith($loaded.children()); - }); - prep($(href)); - } else if (settings.iframe) { - // IFrame element won't be added to the DOM until it is ready to be displayed, - // to avoid problems with DOM-ready JS that might be trying to run in that iframe. - prep(" "); - } else if (settings.html) { - prep(settings.html); - } else if (isImage(href)) { - $(photo = new Image()) - .addClass(prefix + 'Photo') - .error(function () { - settings.title = false; - prep($tag(div, 'Error').html(settings.imgError)); - }) - .load(function () { - var percent; - photo.onload = null; //stops animated gifs from firing the onload repeatedly. - - if (settings.scalePhotos) { - setResize = function () { - photo.height -= photo.height * percent; - photo.width -= photo.width * percent; - }; - if (settings.mw && photo.width > settings.mw) { - percent = (photo.width - settings.mw) / photo.width; - setResize(); - } - if (settings.mh && photo.height > settings.mh) { - percent = (photo.height - settings.mh) / photo.height; - setResize(); - } - } - - if (settings.h) { - photo.style.marginTop = Math.max(settings.h - photo.height, 0) / 2 + 'px'; - } - - if ($related[1] && (settings.loop || $related[index + 1])) { - photo.style.cursor = 'pointer'; - photo.onclick = function () { - publicMethod.next(); - }; - } - - if (isIE) { - photo.style.msInterpolationMode = 'bicubic'; - } - - setTimeout(function () { // A pause because Chrome will sometimes report a 0 by 0 size otherwise. - prep(photo); - }, 1); - }); - - setTimeout(function () { // A pause because Opera 10.6+ will sometimes not run the onload function otherwise. - photo.src = href; - }, 1); - } else if (href) { - $loadingBay.load(href, settings.data, function (data, status, xhr) { - prep(status === 'error' ? $tag(div, 'Error').html(settings.xhrError) : $(this).contents()); - }); - } - }; - - // Navigates to the next page/image in a set. - publicMethod.next = function () { - if (!active && $related[1] && (settings.loop || $related[index + 1])) { - index = getIndex(1); - publicMethod.load(); - } - }; - - publicMethod.prev = function () { - if (!active && $related[1] && (settings.loop || index)) { - index = getIndex(-1); - publicMethod.load(); - } - }; - - // Note: to use this within an iframe use the following format: parent.$.fn.colorbox.close(); - publicMethod.close = function () { - if (open && !closing) { - - closing = true; - - open = false; - - trigger(event_cleanup, settings.onCleanup); - - $window.unbind('.' + prefix + ' .' + event_ie6); - - $overlay.fadeTo(200, 0); - - $box.stop().fadeTo(300, 0, function () { - - $box.add($overlay).css({'opacity': 1, cursor: 'auto'}).hide(); - - trigger(event_purge); - - $loaded.remove(); - - setTimeout(function () { - closing = false; - trigger(event_closed, settings.onClosed); - }, 1); - }); - } - }; - - // Removes changes ColorBox made to the document, but does not remove the plugin - // from jQuery. - publicMethod.remove = function () { - $([]).add($box).add($overlay).remove(); - $box = null; - $('.' + boxElement) - .removeData(colorbox) - .removeClass(boxElement) - .die(); - }; - - // A method for fetching the current element ColorBox is referencing. - // returns a jQuery object. - publicMethod.element = function () { - return $(element); - }; - - publicMethod.settings = defaults; - -}(jQuery, document, window)); -/* - * File: jquery.dataTables.min.js - * Version: 1.7.0 - * Author: Allan Jardine (www.sprymedia.co.uk) - * Info: www.datatables.net - * - * Copyright 2008-2010 Allan Jardine, all rights reserved. - * - * This source file is free software, under either the GPL v2 license or a - * BSD style license, as supplied with this software. - * - * This source file 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 license files for details. - */ - -(function(j,Y,p){j.fn.dataTableSettings=[];var E=j.fn.dataTableSettings;j.fn.dataTableExt={};var m=j.fn.dataTableExt;m.sVersion="1.7.0";m.sErrMode="alert";m.iApiIndex=0;m.oApi={};m.afnFiltering=[];m.aoFeatures=[];m.ofnSearch={};m.afnSortData=[];m.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active", -sPageButtonStaticDisabled:"paginate_button",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled", -sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};m.oJUIClasses={sPagePrevEnabled:"fg-button ui-state-default ui-corner-left",sPagePrevDisabled:"fg-button ui-state-default ui-corner-left ui-state-disabled", -sPageNextEnabled:"fg-button ui-state-default ui-corner-right",sPageNextDisabled:"fg-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-state-default",sPageButtonActive:"fg-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-state-default ui-state-disabled",sPageFirst:"first ui-corner-tl ui-corner-bl",sPagePrevious:"previous",sPageNext:"next", -sPageLast:"last ui-corner-tr ui-corner-br",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate fg-buttonset fg-buttonset-multi paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default", -sSortColumn:"sorting_",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead ui-state-default",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot ui-state-default", -sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"ui-state-default"};m.oPagination={two_button:{fnInit:function(g,l,q){var r,u,y;if(g.bJUI){r=p.createElement("a");u=p.createElement("a");y=p.createElement("span");y.className=g.oClasses.sPageJUINext;u.appendChild(y);y=p.createElement("span");y.className=g.oClasses.sPageJUIPrev;r.appendChild(y)}else{r=p.createElement("div");u=p.createElement("div")}r.className=g.oClasses.sPagePrevDisabled;u.className=g.oClasses.sPageNextDisabled;r.title=g.oLanguage.oPaginate.sPrevious; -u.title=g.oLanguage.oPaginate.sNext;l.appendChild(r);l.appendChild(u);j(r).click(function(){g.oApi._fnPageChange(g,"previous")&&q(g)});j(u).click(function(){g.oApi._fnPageChange(g,"next")&&q(g)});j(r).bind("selectstart",function(){return false});j(u).bind("selectstart",function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");r.setAttribute("id",g.sTableId+"_previous");u.setAttribute("id",g.sTableId+"_next")}},fnUpdate:function(g){if(g.aanFeatures.p)for(var l= -g.aanFeatures.p,q=0,r=l.length;q=u-r){r=u-q+1;w=u}else{r=y-Math.ceil(q/2)+1;w=r+q-1}for(q=r;q<=w;q++)C+=y!=q?''+q+"":''+q+"";w=g.aanFeatures.p;var z,D=function(){g._iDisplayStart= -(this.innerHTML*1-1)*g._iDisplayLength;l(g);return false},L=function(){return false};q=0;for(r=w.length;ql?1:0},"string-desc":function(g,l){g=g.toLowerCase();l=l.toLowerCase();return gl?-1:0},"html-asc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase(); -l=l.replace(/<.*?>/g,"").toLowerCase();return gl?1:0},"html-desc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return gl?-1:0},"date-asc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return g-l},"date-desc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l=== -"")l=Date.parse("01/01/1970 00:00:00");return l-g},"numeric-asc":function(g,l){return(g=="-"||g===""?0:g*1)-(l=="-"||l===""?0:l*1)},"numeric-desc":function(g,l){return(l=="-"||l===""?0:l*1)-(g=="-"||g===""?0:g*1)}};m.aTypes=[function(g){if(g.length===0)return"numeric";var l,q=false;l=g.charAt(0);if("0123456789-".indexOf(l)==-1)return null;for(var r=1;r")!=-1)return"html";return null}];m.fnVersionCheck=function(g){var l=function(w,x){for(;w.length=parseInt(u,10)};m._oExternConfig={iNextUnique:0};j.fn.dataTable=function(g){function l(){this.fnRecordsTotal=function(){return this.oFeatures.bServerSide? -this._iRecordsTotal:this.aiDisplayMaster.length};this.fnRecordsDisplay=function(){return this.oFeatures.bServerSide?this._iRecordsDisplay:this.aiDisplay.length};this.fnDisplayEnd=function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iDisplayStart+this.aiDisplay.length):this._iDisplayEnd};this.sInstance=this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true, -bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,iBarWidth:0};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ entries",sZeroRecords:"No matching records found",sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)", -sInfoPostFix:"",sSearch:"Search:",sUrl:"",oPaginate:{sFirst:"First",sPrevious:"Previous",sNext:"Next",sLast:"Last"}};this.aoData=[];this.aiDisplay=[];this.aiDisplayMaster=[];this.aoColumns=[];this.iNextId=0;this.asDataSearch=[];this.oPreviousSearch={sSearch:"",bRegex:false,bSmart:true};this.aoPreSearchCols=[];this.aaSorting=[[0,"asc",0]];this.aaSortingFixed=null;this.asStripClasses=[];this.asDestoryStrips=[];this.fnFooterCallback=this.fnHeaderCallback=this.fnRowCallback=null;this.aoDrawCallback=[]; -this.fnInitComplete=null;this.sTableId="";this.nTableWrapper=this.nTBody=this.nTFoot=this.nTHead=this.nTable=null;this.iDefaultSortIndex=0;this.bInitialised=false;this.aoOpenRows=[];this.sDom="lfrtip";this.sPaginationType="two_button";this.iCookieDuration=7200;this.sCookiePrefix="SpryMedia_DataTables_";this.sAjaxSource=null;this.bAjaxDataGet=true;this.fnServerData=function(a,b,c){j.ajax({url:a,data:b,success:c,dataType:"json",cache:false,error:function(){alert("DataTables warning: JSON data from server failed to load or be parsed. This is most likely to be caused by a JSON formatting error.")}})}; -this.fnFormatNumber=function(a){if(a<1E3)return a;else{var b=a+"";a=b.split("");var c="";b=b.length;for(var d=0;d=a.fnRecordsDisplay()?0:a.iInitDisplayStart;a.iInitDisplayStart=-1;F(a)}if(!(a.oFeatures.bServerSide&&!oa(a))){if(a.aiDisplay.length!==0){var i=a._iDisplayStart,h=a._iDisplayEnd;if(a.oFeatures.bServerSide){i=0;h=a.aoData.length}for(i=i;itr",a.nTHead)[0],V(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);typeof a.fnFooterCallback=="function"&&a.fnFooterCallback.call(a.oInstance,j(">tr",a.nTFoot)[0],V(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);f= -p.createDocumentFragment();b=p.createDocumentFragment();if(a.nTBody){e=a.nTBody.parentNode;b.appendChild(a.nTBody);c=a.nTBody.childNodes;for(b=c.length-1;b>=0;b--)c[b].parentNode.removeChild(c[b]);b=0;for(c=d.length;bj(a.nTable.parentNode).width()&&U(a)}b=0;for(c=a.aoDrawCallback.length;b< -c;b++)a.aoDrawCallback[b].fn.call(a.oInstance,a);a.bSorted=false;a.bFiltered=false}}function L(a){if(a.oFeatures.bSort)O(a,a.oPreviousSearch);else if(a.oFeatures.bFilter)P(a,a.oPreviousSearch);else{F(a);D(a)}}function oa(a){if(a.bAjaxDataGet){K(a,true);var b=a.aoColumns.length,c=[],d;a.iDraw++;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:aa(a)});c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",value:a.oFeatures.bPaginate!== -false?a._iDisplayLength:-1});if(a.oFeatures.bFilter!==false){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(d=0;d")c=c.parentNode;else if(i=="l"&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange){f=ra(a);e=1}else if(i=="f"&&a.oFeatures.bFilter){f=sa(a);e=1}else if(i=="r"&&a.oFeatures.bProcessing){f=ta(a);e=1}else if(i=="t"){f=ua(a);e=1}else if(i=="i"&&a.oFeatures.bInfo){f=va(a);e=1}else if(i=="p"&&a.oFeatures.bPaginate){f=wa(a);e=1}else if(m.aoFeatures.length!==0){h=m.aoFeatures;k=0;for(o=h.length;kcaption",a.nTable);i=0;for(k=d.length;i0&&a.nTable.removeChild(i[0]);if(a.nTFoot!==null){k=a.nTable.getElementsByTagName("tfoot");k.length>0&&a.nTable.removeChild(k[0])}i= -a.nTHead.cloneNode(true);a.nTable.insertBefore(i,a.nTable.childNodes[0]);if(a.nTFoot!==null){k=a.nTFoot.cloneNode(true);a.nTable.insertBefore(k,a.nTable.childNodes[1])}var I=ca(i);f=0;for(e=I.length;ff-a.oScroll.iBarWidth)a.nTable.style.width=v(f)}else a.nTable.style.width=v(f);f=j(a.nTable).outerWidth();e=a.nTHead.getElementsByTagName("tr");i=i.getElementsByTagName("tr");M(function(A,G){o=A.style;o.paddingTop="0";o.paddingBottom="0";o.borderTopWidth="0";o.borderBottomWidth= -"0";o.height=0;s=j(A).width();G.style.width=v(s);H.push(s)},i,e);if(a.nTFoot!==null){h=k.getElementsByTagName("tr");k=a.nTFoot.getElementsByTagName("tr");M(function(A,G){o=A.style;o.paddingTop="0";o.paddingBottom="0";o.borderTopWidth="0";o.borderBottomWidth="0";s=j(A).width();G.style.width=v(s);H.push(s)},h,k)}M(function(A){A.innerHTML="";A.style.width=v(H.shift())},i);a.nTFoot!==null&&M(function(A){A.innerHTML="";A.style.width=v(H.shift())},h);if(j(a.nTable).outerWidth()d.offsetWidth?a.oScroll.iBarWidth:0;if(a.nTable.offsetHeight'; -var c=j("input",b);c.val(a.oPreviousSearch.sSearch.replace('"',"""));c.keyup(function(){for(var d=a.aanFeatures.f,f=0,e=d.length;f=0;d--){f=ga(a.aoData[a.aiDisplay[d]]._aData[c],a.aoColumns[c].sType);if(!b.test(f)){a.aiDisplay.splice(d, -1);e++}}}}function ya(a,b,c,d,f){var e=fa(b,d,f);if(typeof c=="undefined"||c===null)c=0;if(m.afnFiltering.length!==0)c=1;if(b.length<=0){a.aiDisplay.splice(0,a.aiDisplay.length);a.aiDisplay=a.aiDisplayMaster.slice()}else if(a.aiDisplay.length==a.aiDisplayMaster.length||a.oPreviousSearch.sSearch.length>b.length||c==1||b.indexOf(a.oPreviousSearch.sSearch)!==0){a.aiDisplay.splice(0,a.aiDisplay.length);Q(a,1);for(c=0;c/g,"");else if(typeof a=="string")return a.replace(/\n/g, -" ");return a}function O(a,b){var c=[],d=m.oSort,f=a.aoData,e,i,h,k;if(!a.oFeatures.bServerSide&&(a.aaSorting.length!==0||a.aaSortingFixed!==null)){c=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(h=0;h0){e=a.aoColumns[c[c.length-1][0]].iDataSort;i=a.aoColumns[e].sType;k+="iTest = oSort['"+i+"-"+c[c.length-1][1]+"']( aoData[a]._aData["+e+"], aoData[b]._aData["+e+"] );if (iTest===0) return oSort['numeric-"+c[c.length-1][1]+"'](a, b); return iTest;}";eval(k);a.aiDisplayMaster.sort(this.ClosureDataTables.fn)}this.ClosureDataTables=undefined}}if(typeof b=="undefined"||b)W(a);a.bSorted=true;if(a.oFeatures.bFilter)P(a, -a.oPreviousSearch,1);else{a.aiDisplay=a.aiDisplayMaster.slice();a._iDisplayStart=0;F(a);D(a)}}function $(a,b,c,d){j(b).click(function(f){if(a.aoColumns[c].bSortable!==false){var e=function(){var i,h;if(f.shiftKey){for(var k=false,o=0;o=i)for(b=0;b=0?a._iDisplayStart-a._iDisplayLength:0;if(a._iDisplayStart<0)a._iDisplayStart=0}else if(b=="next")if(a._iDisplayLength>=0){if(a._iDisplayStart+a._iDisplayLength=0){b=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(b-1)*a._iDisplayLength}else a._iDisplayStart=0;else J(a,0,"Unknown paging action: "+b);return c!=a._iDisplayStart}function va(a){var b=p.createElement("div");b.className=a.oClasses.sInfo;if(typeof a.aanFeatures.i=="undefined"){a.aoDrawCallback.push({fn:Ca,sName:"information"});a.sTableId!==""&&b.setAttribute("id",a.sTableId+"_info")}return b} -function Ca(a){if(!(!a.oFeatures.bInfo||a.aanFeatures.i.length===0)){var b=j(a.aanFeatures.i[0]),c=a.fnFormatNumber(a.fnRecordsTotal()),d=a.fnFormatNumber(a._iDisplayStart+1),f=a.fnFormatNumber(a.fnDisplayEnd()),e=a.fnFormatNumber(a.fnRecordsDisplay());if(a.fnRecordsDisplay()===0&&a.fnRecordsDisplay()==a.fnRecordsTotal())b.html(a.oLanguage.sInfoEmpty+a.oLanguage.sInfoPostFix);else if(a.fnRecordsDisplay()===0)b.html(a.oLanguage.sInfoEmpty+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",c)+a.oLanguage.sInfoPostFix); -else a.fnRecordsDisplay()==a.fnRecordsTotal()?b.html(a.oLanguage.sInfo.replace("_START_",d).replace("_END_",f).replace("_TOTAL_",e)+a.oLanguage.sInfoPostFix):b.html(a.oLanguage.sInfo.replace("_START_",d).replace("_END_",f).replace("_TOTAL_",e)+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()))+a.oLanguage.sInfoPostFix);a=a.aanFeatures.i;if(a.length>1){b=b.html();c=1;for(d=a.length;c",c,d;if(a.aLengthMenu.length==2&&typeof a.aLengthMenu[0]=="object"&&typeof a.aLengthMenu[1]=="object"){c=0;for(d=a.aLengthMenu[0].length;c'+a.aLengthMenu[1][c]+""}else{c=0;for(d=a.aLengthMenu.length;c'+a.aLengthMenu[c]+""}b+="";var f=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.l=="undefined"&&f.setAttribute("id",a.sTableId+ -"_length");f.className=a.oClasses.sLength;f.innerHTML=a.oLanguage.sLengthMenu.replace("_MENU_",b);j('select option[value="'+a._iDisplayLength+'"]',f).attr("selected",true);j("select",f).change(function(){var e=j(this).val(),i=a.aanFeatures.l;c=0;for(d=i.length;ca.aiDisplay.length||a._iDisplayLength==-1?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Da(a,b){if(!a||a===null||a==="")return 0;if(typeof b=="undefined")b=p.getElementsByTagName("body")[0];var c=p.createElement("div");c.style.width=a;b.appendChild(c);a=c.offsetWidth;b.removeChild(c);return a}function ea(a){var b=0,c,d=0,f=a.aoColumns.length,e,i=j("th",a.nTHead);for(e= -0;etd",b);e.each(function(h){this.style.width="";h=da(a,h);if(h!==null&&a.aoColumns[h].sWidthOrig!=="")this.style.width=a.aoColumns[h].sWidthOrig});for(e=0;etd",b);if(f.length===0)f=j("thead tr:eq(0)>th",b);for(e=c=0;e0)a.aoColumns[e].sWidth=v(d);c++}a.nTable.style.width=v(j(b).outerWidth());b.parentNode.removeChild(b)}}function ia(a,b){if(a.oScroll.sX===""&&a.oScroll.sY!== -""){j(b).width();b.style.width=v(j(b).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sX!=="")b.style.width=v(j(b).outerWidth())}function Ea(a,b,c){if(typeof c=="undefined"||c){c=Fa(a,b);b=N(a,b);if(c<0)return null;return a.aoData[c].nTr.getElementsByTagName("td")[b]}var d=-1,f,e;c=-1;var i=p.createElement("div");i.style.visibility="hidden";i.style.position="absolute";p.body.appendChild(i);f=0;for(e=a.aoData.length;fd){d=i.offsetWidth; -c=f}}p.body.removeChild(i);if(c>=0){b=N(a,b);if(a=a.aoData[c].nTr.getElementsByTagName("td")[b])return a}return null}function Fa(a,b){for(var c=0,d=-1,f=0;fc){c=e.length;d=f}}return d}function v(a){if(a===null)return"0px";if(typeof a=="number")return a+"px";if(a.indexOf("em")!=-1||a.indexOf("%")!=-1||a.indexOf("ex")!=-1||a.indexOf("px")!=-1)return a;return a+"px"}function La(a,b){if(a.length!=b.length)return 1;for(var c=0;cb&&a[d]--;c!=-1&&a.splice(c,1)}function qa(a,b){b=b.split(",");for(var c=[],d=0,f=a.aoColumns.length;d< -f;d++)for(var e=0;e4096){e=p.cookie.split(";");for(var h=0,k=e.length;h=d.aiDisplay.length){d._iDisplayStart-=d._iDisplayLength;if(d._iDisplayStart<0)d._iDisplayStart=0}if(typeof c=="undefined"||c){F(d);D(d)}return f};this.fnClearTable=function(a){var b=B(this[m.iApiIndex]);ba(b);if(typeof a=="undefined"||a)D(b)};this.fnOpen=function(a,b,c){var d=B(this[m.iApiIndex]);this.fnClose(a);var f=p.createElement("tr"),e=p.createElement("td");f.appendChild(e);e.className=c;e.colSpan=T(d);e.innerHTML=b;b=j("tr",d.nTBody);j.inArray(a,b)!=-1&&j(f).insertAfter(a); -d.aoOpenRows.push({nTr:f,nParent:a});return f};this.fnClose=function(a){for(var b=B(this[m.iApiIndex]),c=0;ctr",c.nTHead)[0];var h=j(">tr",c.nTFoot)[0],k=[],o=[];for(d=0;d< -f;d++){k.push(c.aoColumns[d].nTh);o.push(c.aoColumns[d].nTf)}if(b){for(d=b=0;d=T(c)){e.appendChild(k[a]);h&&h.appendChild(o[a]);d=0;for(f=c.aoData.length;dtd:eq("+i+")",c.aoData[d].nTr)[0])}}c.aoColumns[a].bVisible=true}else{e.removeChild(k[a]);h&&h.removeChild(o[a]);i=X(c);d=0;for(f=c.aoData.length;dtr:even",c).addClass(a.asDestoryStrips[0]);j(">tr:odd",c).addClass(a.asDestoryStrips[1]);b=0;for(d=E.length;bt<"F"ip>'}if(e.oScroll.sX!== -""||e.oScroll.sY!=="")e.oScroll.iBarWidth=Ja();if(typeof g.iDisplayStart!="undefined"&&typeof e.iInitDisplayStart=="undefined"){e.iInitDisplayStart=g.iDisplayStart;e._iDisplayStart=g.iDisplayStart}if(typeof g.bStateSave!="undefined"){e.oFeatures.bStateSave=g.bStateSave;Ia(e,g);e.aoDrawCallback.push({fn:Ga,sName:"state_save"})}if(typeof g.aaData!="undefined")h=true;if(typeof g!="undefined"&&typeof g.aoData!="undefined")g.aoColumns=g.aoData;if(typeof g.oLanguage!="undefined")if(typeof g.oLanguage.sUrl!= -"undefined"&&g.oLanguage.sUrl!==""){e.oLanguage.sUrl=g.oLanguage.sUrl;j.getJSON(e.oLanguage.sUrl,null,function(o){u(e,o,true)});i=true}else u(e,g.oLanguage,false)}else g={};if(typeof g.asStripClasses=="undefined"){e.asStripClasses.push(e.oClasses.sStripOdd);e.asStripClasses.push(e.oClasses.sStripEven)}c=false;d=j("tbody>tr",this);a=0;for(b=e.asStripClasses.length;a=0;a--){k=g.aoColumnDefs[a].aTargets;c=0;for(d=k.length;c=0){for(;e.aoColumns.length<=k[c];)y(e);C(e,k[c],g.aoColumnDefs[a])}else if(typeof k[c]=="number"&&k[c]<0)C(e,e.aoColumns.length+k[c],g.aoColumnDefs[a]);else if(typeof k[c]=="string"){b= -0;for(f=e.aoColumns.length;b0)e.nTFoot=this.getElementsByTagName("tfoot")[0];if(h)for(a=0;a y) ? 1 : 0)); -}; - -jQuery.fn.dataTableExt.oSort['percent-desc'] = function(a,b) { - var x = (a == "-") ? 0 : a.replace( /%/, "" ); - var y = (b == "-") ? 0 : b.replace( /%/, "" ); - x = parseFloat( x ); - y = parseFloat( y ); - return ((x < y) ? 1 : ((x > y) ? -1 : 0)); -}; -/* - * timeago: a jQuery plugin, version: 0.9 (2010-06-21) - * @requires jQuery v1.2.3 or later - * - * Timeago is a jQuery plugin that makes it easy to support automatically - * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). - * - * For usage and examples, visit: - * http://timeago.yarp.com/ - * - * Licensed under the MIT: - * http://www.opensource.org/licenses/mit-license.php - * - * Copyright (c) 2008-2010, Ryan McGeary (ryanonjavascript -[at]- mcgeary [*dot*] org) - */ - -(function($) { - $.timeago = function(timestamp) { - if (timestamp instanceof Date) return inWords(timestamp); - else if (typeof timestamp == "string") return inWords($.timeago.parse(timestamp)); - else return inWords($.timeago.datetime(timestamp)); - }; - var $t = $.timeago; - - $.extend($.timeago, { - settings: { - refreshMillis: 60000, - allowFuture: false, - strings: { - prefixAgo: null, - prefixFromNow: null, - suffixAgo: "ago", - suffixFromNow: "from now", - seconds: "less than a minute", - minute: "about a minute", - minutes: "%d minutes", - hour: "about an hour", - hours: "about %d hours", - day: "a day", - days: "%d days", - month: "about a month", - months: "%d months", - year: "about a year", - years: "%d years", - numbers: [] - } - }, - inWords: function(distanceMillis) { - var $l = this.settings.strings; - var prefix = $l.prefixAgo; - var suffix = $l.suffixAgo; - if (this.settings.allowFuture) { - if (distanceMillis < 0) { - prefix = $l.prefixFromNow; - suffix = $l.suffixFromNow; - } - distanceMillis = Math.abs(distanceMillis); - } - - var seconds = distanceMillis / 1000; - var minutes = seconds / 60; - var hours = minutes / 60; - var days = hours / 24; - var years = days / 365; - - function substitute(stringOrFunction, number) { - var string = $.isFunction(stringOrFunction) ? stringOrFunction(number) : stringOrFunction; - var value = ($l.numbers && $l.numbers[number]) || number; - return string.replace(/%d/i, value); - } - - var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || - seconds < 90 && substitute($l.minute, 1) || - minutes < 45 && substitute($l.minutes, Math.round(minutes)) || - minutes < 90 && substitute($l.hour, 1) || - hours < 24 && substitute($l.hours, Math.round(hours)) || - hours < 48 && substitute($l.day, 1) || - days < 30 && substitute($l.days, Math.floor(days)) || - days < 60 && substitute($l.month, 1) || - days < 365 && substitute($l.months, Math.floor(days / 30)) || - years < 2 && substitute($l.year, 1) || - substitute($l.years, Math.floor(years)); - - return $.trim([prefix, words, suffix].join(" ")); - }, - parse: function(iso8601) { - var s = $.trim(iso8601); - s = s.replace(/\.\d\d\d/,""); // remove milliseconds - s = s.replace(/-/,"/").replace(/-/,"/"); - s = s.replace(/T/," ").replace(/Z/," UTC"); - s = s.replace(/([\+-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 - return new Date(s); - }, - datetime: function(elem) { - // jQuery's `is()` doesn't play well with HTML5 in IE - var isTime = $(elem).get(0).tagName.toLowerCase() == "time"; // $(elem).is("time"); - var iso8601 = isTime ? $(elem).attr("datetime") : $(elem).attr("title"); - return $t.parse(iso8601); - } - }); - - $.fn.timeago = function() { - var self = this; - self.each(refresh); - - var $s = $t.settings; - if ($s.refreshMillis > 0) { - setInterval(function() { self.each(refresh); }, $s.refreshMillis); - } - return self; - }; - - function refresh() { - var data = prepareData(this); - if (!isNaN(data.datetime)) { - $(this).text(inWords(data.datetime)); - } - return this; - } - - function prepareData(element) { - element = $(element); - if (!element.data("timeago")) { - element.data("timeago", { datetime: $t.datetime(element) }); - var text = $.trim(element.text()); - if (text.length > 0) element.attr("title", text); - } - return element.data("timeago"); - } - - function inWords(date) { - return $t.inWords(distance(date)); - } - - function distance(date) { - return (new Date().getTime() - date.getTime()); - } - - // fix for IE6 suckage - document.createElement("abbr"); - document.createElement("time"); -})(jQuery); -// JQuery URL Parser -// Written by Mark Perkins, mark@allmarkedup.com -// License: http://unlicense.org/ (i.e. do what you want with it!) - -jQuery.url = function() -{ - var segments = {}; - - var parsed = {}; - - /** - * Options object. Only the URI and strictMode values can be changed via the setters below. - */ - var options = { - - url : window.location, // default URI is the page in which the script is running - - strictMode: false, // 'loose' parsing by default - - key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], // keys available to query - - q: { - name: "queryKey", - parser: /(?:^|&)([^&=]*)=?([^&]*)/g - }, - - parser: { - strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/, //less intuitive, more accurate to the specs - loose: /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/ // more intuitive, fails on relative paths and deviates from specs - } - - }; - - /** - * Deals with the parsing of the URI according to the regex above. - * Written by Steven Levithan - see credits at top. - */ - var parseUri = function() - { - str = decodeURI( options.url ); - - var m = options.parser[ options.strictMode ? "strict" : "loose" ].exec( str ); - var uri = {}; - var i = 14; - - while ( i-- ) { - uri[ options.key[i] ] = m[i] || ""; - } - - uri[ options.q.name ] = {}; - uri[ options.key[12] ].replace( options.q.parser, function ( $0, $1, $2 ) { - if ($1) { - uri[options.q.name][$1] = $2; - } - }); - - return uri; - }; - - /** - * Returns the value of the passed in key from the parsed URI. - * - * @param string key The key whose value is required - */ - var key = function( key ) - { - if ( ! parsed.length ) - { - setUp(); // if the URI has not been parsed yet then do this first... - } - if ( key == "base" ) - { - if ( parsed.port !== null && parsed.port !== "" ) - { - return parsed.protocol+"://"+parsed.host+":"+parsed.port+"/"; - } - else - { - return parsed.protocol+"://"+parsed.host+"/"; - } - } - - return ( parsed[key] === "" ) ? null : parsed[key]; - }; - - /** - * Returns the value of the required query string parameter. - * - * @param string item The parameter whose value is required - */ - var param = function( item ) - { - if ( ! parsed.length ) - { - setUp(); // if the URI has not been parsed yet then do this first... - } - return ( parsed.queryKey[item] === null ) ? null : parsed.queryKey[item]; - }; - - /** - * 'Constructor' (not really!) function. - * Called whenever the URI changes to kick off re-parsing of the URI and splitting it up into segments. - */ - var setUp = function() - { - parsed = parseUri(); - - getSegments(); - }; - - /** - * Splits up the body of the URI into segments (i.e. sections delimited by '/') - */ - var getSegments = function() - { - var p = parsed.path; - segments = []; // clear out segments array - segments = parsed.path.length == 1 ? {} : ( p.charAt( p.length - 1 ) == "/" ? p.substring( 1, p.length - 1 ) : path = p.substring( 1 ) ).split("/"); - }; - - return { - - /** - * Sets the parsing mode - either strict or loose. Set to loose by default. - * - * @param string mode The mode to set the parser to. Anything apart from a value of 'strict' will set it to loose! - */ - setMode : function( mode ) - { - strictMode = mode == "strict" ? true : false; - return this; - }, - - /** - * Sets URI to parse if you don't want to to parse the current page's URI. - * Calling the function with no value for newUri resets it to the current page's URI. - * - * @param string newUri The URI to parse. - */ - setUrl : function( newUri ) - { - options.url = newUri === undefined ? window.location : newUri; - setUp(); - return this; - }, - - /** - * Returns the value of the specified URI segment. Segments are numbered from 1 to the number of segments. - * For example the URI http://test.com/about/company/ segment(1) would return 'about'. - * - * If no integer is passed into the function it returns the number of segments in the URI. - * - * @param int pos The position of the segment to return. Can be empty. - */ - segment : function( pos ) - { - if ( ! parsed.length ) - { - setUp(); // if the URI has not been parsed yet then do this first... - } - if ( pos === undefined ) - { - return segments.length; - } - return ( segments[pos] === "" || segments[pos] === undefined ) ? null : segments[pos]; - }, - - attr : key, // provides public access to private 'key' function - see above - - param : param // provides public access to private 'param' function - see above - - }; - -}(); - - - - -$(document).ready(function() { - // Configuration for fancy sortable tables for source file groups - $('.file_list').dataTable({ - "aaSorting": [[ 1, "asc" ]], - "bPaginate": false, - "bJQueryUI": true, - "aoColumns": [ - null, - { "sType": "percent" }, - null, - null, - null, - null, - null - ] - }); - - // Syntax highlight all files up front - deactivated - // $('.source_table pre code').each(function(i, e) {hljs.highlightBlock(e, ' ')}); - - // Syntax highlight source files on first toggle of the file view popup - $("a.src_link").click(function() { - // Get the source file element that corresponds to the clicked element - var source_table = $($(this).attr('href')); - - // If not highlighted yet, do it! - if (!source_table.hasClass('highlighted')) { - source_table.find('pre code').each(function(i, e) {hljs.highlightBlock(e, ' ')}); - source_table.addClass('highlighted'); - }; - }); - - var prev_anchor; - var curr_anchor; - - // Set-up of popup for source file views - $("a.src_link").colorbox({ - transition: "none", - inline: true, - opacity: 1, - width: "95%", - height: "95%", - onLoad: function() { - if (prev_anchor) { - prev_anchor = jQuery.url.attr('anchor'); - } - curr_anchor = this.href.split('#')[1]; - window.location.hash = curr_anchor; - }, - onCleanup: function() { - if (prev_anchor) { - $('a[href="#'+prev_anchor+'"]').click(); - curr_anchor = prev_anchor; - } else { - $('.group_tabs a:first').click(); - prev_anchor = curr_anchor; - curr_anchor = "#_AllFiles"; - } - window.location.hash = curr_anchor; - } - }); - - // Hide src files and file list container after load - $('.source_files').hide(); - $('.file_list_container').hide(); - - // Add tabs based upon existing file_list_containers - $('.file_list_container h2').each(function(){ - var container_id = $(this).parent().attr('id'); - var group_name = $(this).find('.group_name').first().html(); - var covered_percent = $(this).find('.covered_percent').first().html(); - - $('.group_tabs').append('
  • ' + group_name + ' ('+ covered_percent +')
    • '); - }); - - $('.group_tabs a').each( function() { - $(this).addClass($(this).attr('href').replace('#', '')); - }); - - // Make sure tabs don't get ugly focus borders when active - $('.group_tabs a').live('focus', function() { $(this).blur(); }); - - var favicon_path = $('link[rel="shortcut icon"]').attr('href'); - $('.group_tabs a').live('click', function(){ - if (!$(this).parent().hasClass('active')) { - $('.group_tabs a').parent().removeClass('active'); - $(this).parent().addClass('active'); - $('.file_list_container').hide(); - $(".file_list_container" + $(this).attr('href')).show(); - window.location.href = window.location.href.split('#')[0] + $(this).attr('href').replace('#', '#_'); - - // Force favicon reload - otherwise the location change containing anchor would drop the favicon... - // Works only on firefox, but still... - Anyone know a better solution to force favicon on local file? - $('link[rel="shortcut icon"]').remove(); - $('head').append(''); - }; - return false; - }); - - if (jQuery.url.attr('anchor')) { - var anchor = jQuery.url.attr('anchor') - if (anchor.length == 40) { - $('a.src_link[href=#' + anchor + ']').click(); - } else { - $('.group_tabs a.'+anchor.replace('_', '')).click(); - } - } else { - $('.group_tabs a:first').click(); - }; - - $("abbr.timeago").timeago(); - $('#loading').fadeOut(); - $('#wrapper').show(); -}); diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png deleted file mode 100644 index bc04508aae37b87025042bf57efcfe197288ca50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?&q;$mQ6;Pv!y2?ElLKmo7y`MFj>1e){yOv$OO6|NqaPJ}oaTuC~X=%G91_vFjZer9f;HRZykg1r(Q%$LHyxPJ#~WAJqK Kb6Mw<&;$Sw0X-f7 diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png deleted file mode 100644 index 57fe953b7e59ff70b15797d2ce74577a5c518891..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2032 zcmVJY#H00ECsOjJcrPfy<7 z-rL*T($dnqy1Kczxa#WanVFfAl9F0lTGZ6kTVXCUCxw*MpT3TLRU6+@a#Kgp#nwq+~xs8pDe0+TJ^71PyD=jT8EG#Td zO-(K?E-)}K&CSg@IXUd>>*eL;FE20Z>FFveDojjFLqkJ2I5;vgGB!3g+1c4TIy%_c z*v!n#OG`_@z`#O6Lg?q`M@L67F)>O?NgrxzUhVDeU|?XVsHpGn?=>|wii(Qo=H^61M1q2XU0q%2 z=;%&PPIYy4KtMn~K0c?Xr|#|TzP`R(TwGF8Qi+L)&d$#4?CeuhQ}*`u@bK_9(9qD1j*iO8%Cobx`1tsPgM+QDt@HEqKR-V-G&HNLtG~a$ z&(F_vbaZKHX@P-(`T6KKT=^tWhoS!jI3lu~@_o!g@83OR0kRm_}%@Eq+sPJqyHUNeFS#JB-O z25evli2n4S=sZA32_Y1OyuG%N>7=mWOhH)MG7l)l0YZ%F4|B^`T@wION_4GbcQl>A zsPD-3ryrPGrAtDhC<*}~Z?7rjz9U(VvB--N;~~p{1fnN|xh9B0Xn>GHe>>-^E+d=5 z(5YlJq-7Ksgj3mxklxC5hLH-HFIF8i%fZoX4yrMk5of~tXp<< zU~TQ-_OWU6&G^slgSE8>yk8;vUUfnBC5WX~Sg00BKt*~&H~lfH&kHSAXx)HNu9iQ9 zjrdY*xkM1M1Ha9H(+RU(_tjvNDmWC}E<_=$x;&z8Rgw@O)EUqdUZl6pN2O?ldU&r%@z&eDl+mR3{%z8B6? z9q7}r6kR+^d3uCrDLZJYt&>He=K@G((*L!_y^-Y^FpPFz(d9ykq9HH{OH!MI-Elj{LiPd1r!nH+j)@@;1 zB*+p5UrB`72#b39B}5jguB`efrXoj#NK|{e!lfr~mPu$X{18?mvx$m8q3R-{14u%I z^08GCVP8cWULjF>7LkAsA#_A?USUH5ULmEp5e@**J?anwvN7}jVQ;qUP%zh_|1Ry! z$X)vPeyHgRa`Z!1;pA_c{-kdjW+B77ltIWaTd)cJ^I@c#6VHeILiQP-L0INJ&1XAz z>=H2y#c{mD2|ASua(ALm2X?wZDU?!Lawmz!4nieJNr#@BZcgcZ{^RxuS*j$1!|~w# z{(}$c_`dz8@FYVaBq0e&NJ0{lkc1>8Aqh#SeZp2E725k!pKzH-2EqeMVKWJgFu6e*Kbmw`y zy38QXgC|5OoF|ssKl;kf29`L5*4Q{3SpXsyf)VEIoRJFc-h4y)Pla#N!nwj^JS4dQ O0000VN-G66{!m#Dz&KKu^y_lMYNSx+iL6S@to6V&NF~*-@fnlUXMN3lYjN{kB{H` zJHPuk6Sp8%7M6_w2=Fri{G0eK0q}qQ6Mu9M|N1`u%P;s)H-1oqA2;E5d+=93<3CK` z#|(Jq2l(X{{QIx*J;k^=2|tA4&mQAH|A_D3iubhP14r@F5d6Jx{6jh3yas$&IP=`6My*}-(7^Ct;HXY;7`Z#qk24xg=aGHLJ^+fh;NYKA2s3Mj^Ptu z;6FaYZyd)j?8Ljal__{%2i~$Cx1{2A8TgJoyfz)LUW&gh#MdBr zz6W0HgFm=||Fs`)%Exb=#T!=P>wWQS2k|@?ygmzG&BNPD@b*pkCnxbDFZ^&h{=q!_ zWF?+%5B%{b_%}Tk z)ktHy2%RxlI5%?6ZY$l%)y35jfZdMF$LOJQuo`5!xq7<<0wEFe!~iNDmRQ*CZa)6) z0GWrehsCg!=jkR4(xXzbtX4ETpjXdtu+U&WRP|3YXlu_B)iZZ=0#*{4B6KTmiGmnj zsbV4N=yD-QamiN_E; zVH?&r%TH4=`CvaO@re)|&d6egk9{2n%lVPd7of}(SV4M46aL@?LE0h(9W?Jl_KBI@ z-F~7hZ1jBTPv3t2$>t>FO^_-WY)duQCv|z9ndY=~Svu6Hr3d(F`3bw!v{nFdSgB1Q6VHd-c*2v7ZF{IUDRuWvJx*p|Z5ICc0 zU9HLoXRA#bkw5at2*g0eOp5TG8Vz>Xt$RXaKySuDSWD^f5vK87d0?b!)&Y(Lklp>S zy#DM5<`3iSo(CJ-I@{Z&N{aBfpEr;fm66DjO4mp=mt$?+3QEF$}ybSEVM3Iy1aWU;v3!lv8_ z(94N*wM%9t-?HD>a)R0~i6wDstS54=)@v(hfU8`dA#{$G9B$~1a-x=s!+qXe-}adL zfw5czHyZi?SlZ<6qtVKl=Ag{T4Z}~F(9YXfkNsPQ@_9(Jvt}nU(1P%gG6{=T*D_4H zn9}F@?Z8zHS44KwRKPu$dlVUtDAhh|DGz6p5;U_!Mg36vcSM{Bsf%UAQ2x(jrxz`8 zB%COz^WwIdX}PIID+nhjG)fESrRFcBwPUk0naeSL`XQ$_fWfywA(`&(g#Z$JC>EkQ z6gkN(T#wAR*ZKjDt}g2UWm;r$vPClAgPG$9Kz;?-+Q^l0!Q1GHuV(4vQWdwGVL<_8 zPX&a>l1QX#Fc5r!U4>x^n*#)DfSEC}dpgxAxf2ye!hD+mRtG%>U1&-X0oSYC+0K*m zHxSc!jMY7{(a^UjGfH(qw#?8^hvgyflU+}xDtI$L3>12&>>hT%nACJwk=+BZFp4ID zmQ{AZU?I0$4A`EMh^8=g7a~)#NW;@(_tv^M8aqAe9L={>Db>Ol0_knF>pMtuIYQI& zbKG3B_O$~HMdBK4mzz&+8$g$Aqf+b~r~txrbMXXdEboOp%i<7w2M;k2q*6x%OV%$7 zpKsxF6T>`a15nap%=3$I?l#GzFkgL0@!V{Th>gba_z#GoM|{jJ4)N-#ZU<&1XBmSCl1mtY_wwt8L-wWD7pAUqKed7V8ni;XY6EJobQXbvd z6@TvgPWc-pNHV*SW~rL#loGVfjCeUM@&ucW{0)0@5Dbwrwk<9cW3&<{)!S|K%p!GC zH9KRzvH$=boEDS-w9J*O*C$?@?HrRx1~z6n6$0}&-CDY_8cAN~7_uCIq$j}GRqKmm zVGF!w-OP)+xaYB=W+V#ZwLQOvS=Ci?m3YWNCV@mc@`o{bMGUOUS42fS8LN2yMUOj` z6lE-69TTs?ymO8-#T0~ zQDyd;Lwlc$^#C6Nl>A^?R<8q+FngF>ocpZh%p91MFjVS)v=tPcy+7Sa?-NhJHyJg^ z#>P@z=(#qq-i+9<&9#G?jI_@a%o{^8UvT87{IPi|D{P7@X##&WXU#HrM6hciM%{o1H zt*XLA8$$p^S#Ps})Rj@qOW@5G$E@?en5q8{5g`Gh-n?9Jj-fq<6ksF?Zky2=@x%o&X) za6X4=UkiZLLZW`qU<_2W+ts3*)viiQ)M9}QfE+n<;vgif)Wj{gOq1U~`Ed z5Y*+J>S&RRlLVm{y8$Y3_4dy^RE_Y)>3W6tJSN(BY0qOb&Ca7;y{cgwMoMS73+3Rlc2M$#Yn%LG zav37dp!h04w|xsl=-EmUC2nB1#Upj=i-QwYOHkBN7dK`*2O#@;ETML2ZbyaoI|jyY z7$TeP7!RC%t1))tHl&_JKQ$P;}FL2m^fs`BwgR0OTse zLO?(g=d@_1g)Ox~0cfLga~G1BqDo+%tb{_vVkrzr=ToFW^om6ZZb26LEinTVjYF*a zrJPQ}=e9(jkx=UK+zLsC_59@!UwpL1JTtoo5@MzwF`C7(6c8kCnU3Eo)afkBvuOT!DJsD{rvo!J<}{! zgNR;J$%_sO-DdLTI!0?j=^C09K`?07%oz|6tXP{n!y+PRumY}v3xG3Y(^ohgt>R6| z$TvFk0Nax*;xARpJ|uJ? z&vvr9xuuByQG45}A>DU#>(1RTw9F1ySJV>eSj=r%R{^!Rq}VO34CCAXbEk2`%@=M{g(h! zX{#8*+-1NxuSEL{IrC4pm*{EuDFRCQbZXEtFTJr70@hTbi+x4gOyq(JQ;vydoka3v`ibJezt624W}n(xkYxBFro!xj+t-ADrpv^ zU;03|-2I)9Cl*LDphtXXy&#b2a{12&luT~&9`~`(Z1X`iYcAhCGdB0q%5pgHAau^ZUy-{8F?>{UJ)>(^&{meh#`Qh=j9Iv+D>?~ z?vWE&^|mGtegG0FUgZcF(?WDEJ?#|~5z})HX~2NN8Ys}GzNF${!?FwsY_~|fX?79O z+?B7JyBU0=<|YCK)l|WuWLmw60N|A)bylbiAn%f5G^&EzSREWnDD6+O0ieLRFgvj& zsuKoK8?gjPBA)yXd#Yu-#B>ZfwsFuaV{aw0Q+h?W#;(MXUjs=V>X5~PCrxHhB$GWg zNXTTiS#Fn`*DdeaHjy&R%~b7g>{Ds&VrP@Avz7$KCwxNL$af!JH-tj%#)IxH>7rI$j*GvS_I4pw>Czy}#N+hil4dR;%&s zkq76B$&W&4n=*DAcLL0uM*Ksl(B zZJa?JBHHJHUKaImj{yo6i3W^QCUk|JhnG@rIw1~*-yb=?uPRD}Z-){dXAL&^JFXSi zZf@T#WW`a=>S9kRWKKay>^@%S=5o_p-;CU0` z(hlF{a+dVcagwIo&N4eSF#?Plv!$krBdp#nWATmqGlWJ~i49b91jsM#Y0K-GwSo&9 zG~>m8OD3`Cu^)_1t!&me9Wo+8Ae#|%EHFV@eFPmfpZpBS$x81`>42=Y4& zLuwOjC155CClo&4Oay332E>}0r)e(g(B@vEXzu9YQ@hO|0##1Zd?{T+^&K=G7JqIC z-5AZ~&NBb-q9Vx|ceZs_j}<@K+2&}w>Vol|kCzKb<4xy#RvPs7bM_(}3V2f|kmlY` z8NNrrYyfuyBw#$AEP3akxHN@+-z%Kv_B$;tt#`RAxLM!W;5AaLxz|ec4)o~8wm;FxkO-|aF@BeUCS`U2laXOa zL;2PwvGmj=41hL^8NbS~FCVOicxNx@rf$xr4uM2ypuJNtW=L*hBOfpkGDgN?zk-5$ z-(P-Vhzi65kHUn^m7PMSU*b+H*w-v5wjRHE|JwM1D~2eQlA1jMk{L6+!q=bpW`LI~ zP`S(<+Go3q!F4ZqS9_HX%$oPy1@IRoHal%#MSw3*dm9p5J5rY2m%7b={)cjw%HGa- z?!5a*`&hrS*`>j`v*+LvD^?ZYsaEA&zsaxAF(qTIwYEjAcA{s*DQJi4jW+w&b0wKV z5>3w)IE6GlR}336GKutCeCPyHFVKMzM#Ny9CBid#yEr*me8OmN)znx)@{c|xhHBJ! z%{&v`5Vv_oM#j^J|4#DyEB2yszCpgt699{LfCFq+9+(>7akW zfogy29EJ@K{N1LjS$x1kzeGI8I{@~j3k1%YPs)GA(M{r9|203|{pLdiPG9rcZ!djk zKrg*8P2<}Q%Q9_NuyG*N6qcj1@8`cXN$|VoB~$(!IRN;JHr5S#Cbu!zKS&? zO&-|l8Q;hO48g8fK#dzY#IUvWd8bYfCz4BC*ei`}0Qz=J1d?m5CFpiV>v|1r@SAV1 z>4E2%YH426l;ZP>MVM zdc@t)Zq{Rt@Ez|v^-lZa8zNjk z8fHHFG`1IwyWl2s{|+PVE3_r3YtL~brj=jJ5)QV-EP zXKrX;$L2P11HHTQHaiQ`Dx>Hg&E8ziMU~pawp^DvJt64mU=Z3k0+c_qLwM z+HSQuv&P}RV;iE?0mPl+*A8!fDEwa(Iv>g=dbxXt3C&tKhZSlPT_T%B-jR`WXH2}P z7|cWaasZ9}dymQ2 zl;Vv*VU21pCk}3ND;uj7M#FZH+&_Qpad`{%jz>g}HA-7&fJMOr>|`cnsuB;#T6@0T zWlPcfi^xL8h+i(%RW>GComR)Q>%6!ten-)tsN_GSXE#8LdVSClk>$|urE{)X{E>xz zktm%L0Q=%)B0Z=7ke(W}v+7#qY#0BxcNro1`3EM{W$q8_OrnbfkL$8!#X-+5wwa@w z3=P^NDiV*3!4VxjP?uWoG3XDBGj%$1@o6X0SD1ixCo7T#k{E2CC21=_Krzzpe{kmkwR&F8%4=f1IBGTu3r06fJb|oD{MlkLc0TrNzZu z!l=!Js#mRAx$f1^l{qB~#>@CK2_cu@4vj4#%UTge6_49x81p58@NS~^o zFy`s$2oVJ&S7k09oNgeQ`uJxp`N3)WraKOW@eO-bD{wsMg~T<8^F+cD&^(tH)*whkvv9hJGh7 z=QK`|*)AxnCwBaf)`KUQ)>%>q#o4{qGe;)3b)P?TX#Q=)w0vS$Z|3a=3Kq?uUbKiQ zYqe~M^tPQo_k7eWzHDL5jf`br;AwX6m1^07xhoe>zgU&cFFZ{=-Yrn@cChM8qp$m- zgaw(?S?V?*v8n&^_g9)k*u}nc0&SGm5vEdY6>76X-autGlc6T@PRe~jfx;k5Hl~Y8 zYm1n=)fT0!al?L{fHmSauT7=9RTe=dmkm*XxZ{?pkp`J&?79QsZ#R+FRnY4xv~xk; zp|)%rg#K0Nj3f(9z@&&Q%TI2l=2azCy>;QN9aWR6Egrt%taf&Ru#+oIE7X%FNyGe2XiOJ~^(EEihIMOWvOkrM&PH^?tlG>3DJ#_1HXGXkfHV969wl3h;rJ7JHeh-gNTvtor)e7uAp zvNv3so6GXzwJDWRF*Ys@{=+@J5eley06d`tAUA%3_qWgc#sst>54GW;?xsz&=w##8 zlJV$W-VXrH7zMa~Do(WYZrF>w^g)trpS`$U$iOT7D!w>xrT`cKdxqE`{ze+F!n`&Jt)3a9XdSEd0L4vg9{RkWc?l< zG5=(g#%*9S6MvXAqKK6u%6Y)1rLQbJY*?0v6!pqj5Ifv|HG!&uQ0sd{ESGC38K|uC|6Kk zGB-S~5wx57+M{%Cq*r5bx~sR(8jxNWp0&K!@XJ96U* z5HGP8-~dPV3cLg_zyZ5$28U@#L`pu}`Tc(1AAjG+?&<5z=bM_QJ?R|dp0wNQeY`He zFKSzTX`YE-DEe$HW`tAiFlHkPIw_gZ9wqVo@|Nyv+WI&d48<@!aU+%*L}83F%_UpY z_7BROMCVk15uGHNr~mx&RR>Az>F*jL4D&XfCdb#D_ODL|(e-)MiuHq6V83*wKuQGx zWqOenZt3X@U01Hvv8jUvM4Ws2GN@tL1#QMDXc({-K^p=a8K}PNIL=F8K?F@`naHXk z$E{l~gkbgP(i@M*ZVw-=e94`sPld=`)11v_#;k5IJ~2_N)lwRkRg;KXG0y}kYgw^V zDPUSeJjq4EGN2U6h+PR!mys@0Nb@kf6V8fNp=8O-lH?{bpqZvBuLZggJ^Ck%d(p*U zo>Q|&3wFgLc^~7QiY#mQup04aG!q@{>GF>eC$S4r6C&j7LdSx3 z6CodAKY-0$r|Dqagh8coAJ=c%b!_exR*4ysq&PF4t#MYQsp zNWUvCevs?7IVFPe0b>_c2Xv=Quwu$`(C#-tNTMWDdv!g_Y%%4@dm0~cmV!ln-Q*ts z(E3;2OK$u>H8W)}rfQDAnx#6D9jKOftuHrs!$UJUFlH02 diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png deleted file mode 100644 index 1460b78d1208ab13395cf1a0e15f4b9a2ffb933c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1008 zcmbVLO>Wab7?n$Ir*n*Za@{N5+uQQ{ zsIuFa%YD%riar~Q8R1kp3fYK)PE5{ekCJfy`WtO3%Jw)K48_ntu>%%sq`+u-oJzK$ zG!OHX1Q%3*5j~F*NB#NfvkIcnQD4@4=%*f?M8^wG`-{^-u(${sp?dffG;>=D#8eQF z$I~RUb4Ok3+Hzl9>nd16#D$}-oErLF;4w}?O@oyHnh=;sL)8PzvK|8iBB(<{M@9u% zcGa*U1nWnY)_6F!d$_%}B~Okz5hAs9eKwnEv#Q4UxsDo*MxkLC6^W>1^F)xml4Sd( z0;XBOqf|sJ0fizNu}k5o($iH4aq9b5!b!GHluVhPlT=3<)Z@5_Yl+T8kN$CEBRU(* zQ>yo9#x8jv>oMLh$uf7>8!CX(8~X*1WKqZzv*0qOiRfTQm4CD_3T=q$5FzUTS_U-h z2)PKmEm%LW>K4Xz*eW$PaoxIE#fE2Kv*sbxf=8xR^J=D1#cmr}s9JJ6NhU}V(9&)s z?XJ1#TCVMJN(AEr#-?QlbSF%(Y{F9D^=rT8jxNEc~4vt5&9l7xu z969g;9N-AAfW$NK3fOHkI7~w#Qu5i(@Av!u`1{`XPhM<2+0r!aLGK6;q}@^Py-oRj zTH78<^H>C9F=SJ*Ae?I5m`y0?rR0nbD2XrMe5V~v+ngq&u^5NPPQ+4!D2!32xnyfv z=b+3M>9l2J=rVf@6aqjA?pvGYz_>5D~Fkmf$O$eIEK=pmww)cPq5j3G?BCCdM zr*1hAg7u?IZ#&D5<3vJAVT&&v@O_d zA><+K1+cYmw``1CFsL+c;`%K+fI;BlX2VA)fZe9u@Ec95j=e)lR2pL}Av@WU7>X=e(^NvTr3^{3WNc&XjWyYK*|#XN?_?i) zCsg)*Co<2B&N+3S>-^92=6{}f>AK7{FFx0Of4=wcikhmljOlX#D_|1M**NA z{vRjdxR#2(p7Q1EDq=z+5KJ)d!d8;Lj#$^$!TnX2pSYE9en~lGBG6y#D~mC=grK1&6AU# z$6Zid1TO)GGe=Q9w5MmNWgsW7YpN%Qw6(W2baZrfeQ524^z;sP4R`kseH{4&3$HW) z#nmu?=fdX}7sFXr*H%~7*EY9UcDBB)A8a%4PLt8jYMZ<_pB!ARH&>xAbXpjF7i*H7 z(i9LbWc(qEk*g_$RoV&i8uzt1luL&Yg}6zU4DkIbn|$xYWrR0ekh>1o z4rjgWdhk)kajqAt;%7c5mVN6n!+_?npqxpy=Pu2svb@R*%kDM%#|TefDAkuyNz~Cx zePDZRHWNnbXLEKc^DP^v~hD2DGd zR#wow7Q&a2^*KOLfvh1=q?zwakcbbFsw29{{;Md_@~rkE1gwWwn7*AUh<`Z^dd`jZ zg8O*5V?6_W9sIpRfhgu5D1~z)=@SwY;*%1Qd_<6VUdMql^0ErDi*mhDB#eNN_YiV& zhPwK?nudm&sIOeOX>!T3KaY z-`M)PxwE#lzy5t?-`W0__wjHR#`pY2Mp=)}_+S<$1mmQ2U`+wcLT30@5w0tN?3axp zYK-Q`Jb}~%!)M$fDOhTed-ZPT#51TvSRXmyU*l#}5`~UUP{`tDl@fVXvLsq{O?Aj5 zA1Vd2*I8*L%N1?oi753X8z*|Dzm!NX_pXfNh-Z(q7%P0xVi8#x`RGRFeFJ(vbdvS; zY=e=(QgyavgUY)z{P}XC!sBEbjAe_nBER{xGhD>r<-;DUb)UNAwTulnw>r*yj_=}e zAx?!4;NI^gnZjo;jUA%M@tXVFRWxJ<*O0H&qNPllv7FioohQX@y7N?8q`to`oqk`a ztvr%vVtg+l0<_zfNkh-{dy$3rM?vjC9Eo|CE4U838fVJV<$zL{Etx5uATTyLWzr(^AD1M z|9z6=L_3+oFwcd1r*~Z3K~K1!`oJ+xjsf05ehz`YxIbBn%`_&s;aJ*L%PkPovpn80W zR65TLNF7u1HOv+NZAj8%-hph!7hMrQLMhNIm|yC1U*rVSw%031+grIe3k(O;hn5D5 z_12suuX&z}B|8R|r;}rO)b-A3Vg7r?%T;5nB{K!bg#KhlsMz_6enEz>SG&0{CqjM` zg^?Wr?YTSJ*~!rlKm);7}`79+dg#EwX`<3^!5!7;2Vd>MoBOQRR3U!#1MF8bp^Gy zwy?;uy|_2GzqB*Wd^maBsB5TPvO?k}71NHrM1jpq{^oPyYoU@P20)3^x1mwK#8g`~^A6Jn4uGKq9`)JcQfU7W#9Lar@3E>LmBsdWu4Lb7%{b|)7DJ)RJ*~_nTT^0rR^aZT*U{0 zQps=SzXE6$slc1^-KA7rJkG-9cAvgEm&b)iF)!Zzh~d7XFmbYUy6dc9B2S*t*4$u$ zwcc`YpU>?|=U^)puY+BR*ZRrYE4A`?a3^o!w!VXFI(fv>X&0QTJ_5k`84HiHN}&f4qlw7U?B_u3TIiP` zi9xGhqKV?)!s()R#Wi-cClk`c6YWhTD!|_*FeKRhXU&nKDUmms2T7linUS8AnM#VL zl%ll1#i^y0oT0O;v#z_ltsUPo*f`uUS~GlDC`Qb~Ip^oO{+zL^>4`8wM403pCM(>bJ+Xu^`Sy?iFkuEO|Y?tbwj zf9=DJ0}fTUR#AU62x3MJqofftxp)}|W`lY&=oTmW;Pf5*kvGikn=z-IW+(lO(i!%*c0ByakP`Z_Z+Jv+y|u(&+M4Bpt>Ky7W!FMnG&m_1x+U7IhXJi#LXb2cda z3sHe|Q2+8G4Y@Vp4lE2hS?>oEL1O)J87i^NDv05>$C+IT^7cv) z8a=c|3ax!g#2co`{Ajh{!3dXd8?7AWV*tABCl4sn#EV!j@=NhIrt{MkJH|xjj=eUo zdcIV_lKWe+>3Bj~Eo2A{q(&+{JYJ3(cx&u2*yMU+WuU~(nv4T=y-+C}DqtoUqcdF< z3|4T($Bl?v<1*F4R8PKxzLlr>QkMg`F7CW$1p=jlGh%bXy%Gqv{&nRAjS<2N#rK=t8SZpQttO((41I)TAI z41C^%SbL2`1D6;i)}Hiq)|U|ZpS4H%Z&Eeq0b-)_@nu4K`}+7fd%8KGUH+<2q?{t< z6No-LCmWfYn+`AHDuES6{zaikwMVMEw)Q%P-oDW_6cAWRd}CefA$hJ$DU53 zbg`M5KbHUj0zqB>SdU>;u_}e?-O~)ZATS-l2lMJqRB#1;eGxm0f4{#LJ%+?^CoSEJE`gJcmV;6B_dV$6yexU zZuU*p3{p4n%$J81x78VHg zGLa(>g3S8C$!S`za7X7pQDL<-Cn^*%r&QR_b5k^uYVWhZER=ZM9o3!)@wg+^-k0E? z#~szb%agMw6P+)H3F(9J#d^7*Lqq~Gm=5{Ik`E=yu37cF;{U! z^pTNQ5skdMzNW6Bsyu<5w&HqvLD@9r8ua)nF$0l}^Mku%FNFKc;%+^jYQw6OJLMru=NZBTVyi!nQJ|=TH*^AQ z^!Ic#`!Z#Z1rFqF(_7(g2+y3dzYs^Q9!CCJ+v9M5?m`0ETd@8rj8dwnRT3S3a3$$! zBs$vgm*cMS&*P5rpN>1~f14yX2P6|6)}IOEAAtV*zDr0?%1i;#=jP=i^Yc^TC4b*{ zEv+AjJy*lfkMHjrz<2fbkowN+fA<}Uq|F5sc<1uK>==){~ z`i%x7H*9k|>+u3>Rjhu2dJXw29=BJb7Hxs2B%SaFxDvH)i1K*{@e-Hg6e-GX-gT*JaoaxW!QqAq-SB*jQO#H-7BNQmV1_t*!`Qo%u| z`>x872g2V%y(#Eh$KjD|Pk&9O+%tebl8Nn~k_q(h^MrOG5)}~0gbfVB{25HY_|p+j zuhZ!B^7D`d1*u`b%uc`f(+{4yddV3E1_x?}hWbdm(|_P;o46h9AMAhoe(-uYII@p{>{KC^+8f?slsWt`%qdvng!PlF7#8csvQli}NJjKfwD0RNt;?pHF z4m32#UO!cTN88iJpu^yZCnvfG_y@W)*G6dh(6#3b%h8jRQF6P&1BHz9995MOE9eZ+ z9g85)`e)VPGol{&(_tl3AGp42Qfo4atG~Zb=hcxaLQJOJPe;jgacmFOk*`@{e#tXy z=H)rn16min5+9(O|6?9MpU6TW_xJQ!{=A;|?=7ggi7Al-HlL(=Tzf}_+! z0REVr{xO+o{y#{B49u zf1RCvIups2h|1JZ$1pNFGCWFO_BIOPMUc-OA&hp;E{tB1? zAk>k)Tsq|~Ss`?jaWcot*AK;^9>Hc0YXY$fTliq@?==OTJ&%c#UN@^nlYYM8-RnGK(CfL_9#7{jr_x+~3C!$>czXqCHMSK}kn^T?spST;WURP31}F&V;|_%7Ntp3yMIA^f*-H ziI=a4Pb<~Lrxi#;V?$k26H&tJJ0R^HJ*|ChoxOwo!vi%8Z^|j&#Te4YSA%DmnOPPV z7v`3Ti}>>V2Fv=!?&`O-t-Zs2z_uJ!U39tRBo_YSUWke8aWI#X8=oj~5oZ-L#Pi`& zn?P*5UbJ&M=B+`@)C5*HC{?nMz?8l!*gnkSYAl<*A^sfB5|Ie@M1s}z6)7TrV}A=N zFFa94Eq)CDYA53^7FtVQuxWfD{&-vC77?iUb9P;B6@kSR;Y@oK<<@9YVv2VsxOgbO4O^OJ-} r7_IjaZ#m9MA7V5mpRmrgS7cFiB#s48OjZL1$o993xE$$u?&$MB3D0WC diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png deleted file mode 100644 index 2a5079f4c4c7c7c56c2e9cf0ae0d6b2d20571810..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1300 zcmeAS@N?&q;$mQ6;Pv!y2?EkQK+Mm<1|%;$)bj*Vk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA){ffi_eM3D1{oGuTzrd=COM+4n&cLd=IHa;5RX-@T zIKQ+g85kdF$}r8qu)}W=NFmTQR{lkqz(`5Vami0E%}vcK@pQ3O0?O#6WTsddm|7SZ z8k(CJm>U_GSr{5x7`T|YIvQFUIlG#fni(6y%)qAC)ZE(8-|{wKeOaaKsm`y)D1=E-KAW6uYFBb#ak^GsmKd*Di@P-TESL zIsJ&*uZM>pf8F0+{C~AbfB?%TjjqKu=hY*pt-Uns^{(RMh4XT6&vOgh(vT79VYEE6 zO6d5PYt%Pe^Nq4?kyk!fB&UYZ=ei;^FU-C)l?z+|1U z`Sq8_f>KX?E-qYV$$vo7f^~O7&aAZ9X-`9PFHBZhxF)#7Q1`S{c<9z7iMEVcZd-D- zU+=nB=pX;#+%D!-(r>!co(lF?zMTC2d8}~#Yr#E*xlM-?*PJf7yIS+;$$IIygOh)0 p@4E7W$C)jP{dvOdxP7b=3`;cX-pyftkOC^GJYD@<);T3K0RXJA$o>ET diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png deleted file mode 100644 index 68aa3f48d064597e6c046229364a0022b72a9ed4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?&q;$mQ6;Pv!y2?Ej@K%BzC1|+|v6jcGKYEKu(kc`H+=L{JSCa5VGVT*4G^U+C4P7h^U=A3NZkc`H+=L{JSCxwN0Ug2M>FVdQ&MBb@0BuY+ AumAu6 diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png deleted file mode 100644 index 4b38ff2d7f6bedb954db4f2a9894694856a92378..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?&q;$mQ6;Pv!y2?ElLKs14a4amxm;JOW@>^)r^Lo9mVo;Tz=V8GyXasBuG zIoB^GOgD30P`qG=4NL43tA2?EQ$9sc`lxomNutS7f>U_jl2r5CIsXH_em-G4I!Ayl TF!F>J&?p8^S3j3^P6t^zP!KtM;qCqZ zXSBsQyIRidS+dCMkVlZ_)99S+23!C52cI;S+9WVO*}^OB@mOgKP%ne0tDnm{r-UW| D;%*_| diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png deleted file mode 100644 index 43d3253fc7e112981a0915b284dd1407f0e138f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?&q;$mQ6;Pv!y2?ElLKs14a4amxm;JOW@%sgEjLo9leD?U9rS+B;%#?}^? zG(|$SP50y5+vXbG6DJBbCnO~~r77;X(b4$*jE13CkI)SchU3YccNYA72sDm?!PC{x JWt~$(699GrBWC~r diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png deleted file mode 100644 index 8265061241d2e4faae5e88b4142d6f806e947733..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 109 zcmeAS@N?&q;$mQ6;Pv!y2?ElLKs14a4amxm;JOW@Og&v3Lo9mVo;KuSP!M1~xcATh z)s+WAZ$)r4ZS|OyIQ!@~0SAtU(YvZcL*JINJ51^`Z}}i2+{(oH@rKKEH=qFwp00i_ I>zopr0Eu-Yod5s; diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png deleted file mode 100644 index c6270881b87016e62aed1f999f883dadcb57c046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmeAS@N?&q;$mQ6;Pv!y2?ElLKs14a4amxm;JOW@>^xl@Lo9mVo;T!bFko=LIRDQ7 zZA}WSk5xLHuRERm^h5G+t(>8QW@`Mg*2xK;7B6%gRg-`C8qB}+ihJo4P5urgey)AI S9X>#l7(8A5T-G@yGywqfL?*-l diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png deleted file mode 100644 index 67e0eb9b4d19963b9e32310da2aa6c2184ee4868..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmeAS@N?&q;$mQ6;Pv!y2?ElLK%BzC1|;2eq7s0Vj;D)bh{V+7iZ3rN)~m6xv9&3> y{Q3W1-fKbO#g6*_{{;0YU7L&BQQ$g_V|b=OKTfJ_b)$KbLh*2~7Y1$sOSU diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png deleted file mode 100644 index 192e2b852572af305e320edf30cdadf068f7d179..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4367 zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm008`Z z1+21x|5}p8h26hy$;Qh5tgN)`|IS(Mc*Os=aCD#@`Vv4Geu9O~rtM*tnzX$y>NZA{ z?<*(LK+x3ug5cF&kN}_FPn>bsv7P=zh-&*&c;*E`(xe} z*{W|w0xib2C`Wz}9E+bZ5_z^(c5=tv(g-BGY$VyP4|w*xucwCu=C`3=i_LunAO%2v zI8@>89^=mhUJ7lF(cobLpZ%bLHE&c@T@{>}7YyXMk6ZFNnkuvO<$1=!?<8e6Fqn_T zt*D8?pPxi4o5zF@-H>r4QuAU-G1;ZsL$)tC*&c(RTjb| zLW&0tHf1hcFP6>6AyM`-qaID>qw2qA-NuVgF?G|A6+}5w&HXTDXN$U(>;?cYa1~ro za~_9d1iA4EJ}NNwmHyEB_tp00ky+_iYfLI|9X9SE^|;Hqjl=!_p>r>?9`+7thwi^e zr0MV=H`7En*%R#CppD`vg=Z(Tr}!t&xW_X(%ZA7WRVq^`dpydczBp~D?Z$rv*%Dp^)2Xib+V%EsP$W?ys$JApDDegg zPuY4gYyka#h<;ip!ZFg*+#iywLN$(BG39|EI(=vW{p7S8SSSt8&LIB#A7zD{Y^*V5%_9J_LG&uB4} z8t_4atU7-6@{P?OaL)5W(4Nyks0=0-lm8Tn3yOYgA87f8SDX?#Bi@Wgjh*P>+Sgm()}sAvlB##ZaYqt%;8cQj!$A8UNns>)7Ivguy(Zk8o`SBt43(CG zW*OY=(q0RcinkY4+X?P^8#LW#Lm{}Ts+cd;x}cF_eU=`2ta{ZLBb}ZM#~4}qv)DL& zW(Zchur!P>-Uv$8luMtq7GT;(U#zWIP^-Z5v(eUY^=e{h(mUucDi%=A zD_)@3nz3qx+h*PSb*TC?7>~(Fqh+{0+<|9w2(~E)gvwHJzkq##67f43ic{#fZc*p{ z(sf{Z>u1cpT_z7il*bz_l~~~5t(`o&qr%(RZh}zS%5q%$sWi|H)`19@LyL^YsWwUR zW#{K(X|5dg54G4ON4Mat;S3+sM_ftA4fr>oSzYHS`Ak9IR7=XL=%}CaFcj{<0H{D) zRDyeS)qB|2IE&IwHH-4aCQl-p2rmc@#yADeTsJ_nES!<@2rSS($wS=L?p1|={fR)% z)HG!xOaJY6B>IyYNVMr=+!<4(@W?mFMRPp62Y*ovL3lG1zzM`=#!VU#d%yaJ6s;wY z4?ZJ&Bf@s{O^MX*Gy(ltx0;};B!5uy0pTX7)DmA$U$->@)P zD;6N`0jWF41niCQV)RYSh>hcW`%_*gy-&B_yv;pf!iNgbYij3PWtAjkT1nBio6-Oj zr1-Ubh`O2@vAJ{=N4tCSyU!tCwZAb?h--qYQyAS%J(awsWxBvOEEehGLZSfWF+?`N zPawi4Dh9XgYpt63h3hn^0cw9~O7J6o&cz+g|oSJ(_eJJIOF*zdR=*oTaetZ?NgtgLeq^A7b@4QBrCnld9n0 zusdMg5i^;b8g|x<7dac>uG-{aD(TBh#j_8h2mb`%e)mTr6mrA%E_zaKwM7Iqu=Vrr z+qOx%#wua+ljScvJ!z4{n&GpfZpS0xqGwiTp)M60a{sK z6}v!6b_^VUE{iMf$iMOOZ>|TaaVbhm(~(5^vqYDfDyGgS2yIw1-EX}hfC^M1*s)Gx zDAof{8F{C8x4<$X+N0vypYUQerxs-Lmsnfg4jxX=WL+_zOpBurORhd=UOOQ3C^~EK zG+-os+YR#HPv^FaW~0l#_*@O2)*jZ&jn>WTZUko<5hpW_&vfnz#WMx!+fu%30_8}y z^72uv)3h<;m!156{rbteP~#@n@P2i`4O<~X+@vHl&*3KmX6 zZf8_{I#k2F5MJAYNZ^@iC3IiEtD1YaKrU{3qhD5nw)J)oZz-d{Zn>Oe2*uTt6=-I7 zd&I+i74Df1iWN5&Y-N?_zqjjUqm$GWQIpFXvXEE|)l9w_yO$V(G&6C_|94g-Fpr?G zFDgKVYG`^bbwlX0W-E~f51iQLR5tfO)7k34*la?F?@kBLs)XHdUP@FXMEwSFe5%*8 zHCD{qm&%pfuNT-WmX_0{AwDu;UhA~Qg`t|^-c*9PCoIDM7KqB)GEe17>?wz1OjYaRYsiNW1k^khcIQ*< zd?+EJv78JBS~wIPZ>MucKmyoQCX!~t(sCjosG&X9wKWYeBgz(VHB_tl zx8Xh4TRu@1i+Y5}^{omu(E?uqh^GmJJU#I66%4~?oja&V2d1;%s4~hMycqU}eTbo~ z&C(_EyVumwT`jfaV%XuA2VWm8fNrI!FK;Z{U zAzQSCQE|0q@JHQ=6y5WHZJbmE{oLHOy;eLmwo{QzM!dHE)7#5_EPvOt^HNH{!3gir z-FFL1;Q4?6;0$_o%lG62MxL#XM}whm0PZ@>E-DNtTzNB%U1L+@1<#|pOD6*!>J5A> zv7RJ2EJMtgOq{C@VbC>I1n@v?YSVe9Q6zJVx%%BpGiwK^Oa{{k!&-n}9S5Ncx~r4< zTWm>rMyTl^9StDgA}`TqBH(DM6NuM|E&^*Bb}jN5mOyuqhunNq7A+-GsSQn0U^+JXpOBG}xv9#zMq7ACuoBuB86T({H==-BR$>UwReKxU zIumMn!U2T3PgeuFHCHIm+ZrAE`||MqQUS$K82^FP6_SIu^L`jDS5Zjk7^&E?Ys`SBB$2D zh-Xts_(F=EcMh9$S`A5q-F`RDkaqT|9+MB^8~RoLJ~uG&emL=gzR4os>lv*dalv`G z;8MFNDHoaT8pmcHI44CRq-1+IN!?Gb9>KS;dqu2)qx7(oEvLI*Z0fG>(&zgw77ULRTS+fd{kEeZ<*?RLg5gmo{kLy2GSoQRGgd7g#7C?r0{<*<&CKBXbkg3|TLCm+ zY{2@rp9N^P9u#xd^b`7_!}c_5pZkLPW3Pnioa6PFtqwsuPdXbb2VAj1+A zQp@(LmiNPNRxi4-iI@WL!A{}j;mG9b0WVf7q5=ltqkhbL{RmoA?ZxAmh*SMr+8!V^ zcN=*9BL@!Y-W`lLBzjYE|E~XD%1(fLu*6)HzqjXp}}wHpS#S?zE9sB~Ej!7d zgfuj@d?H6`iO*iLvze4An9%K7+1d?_QYK^%{v%=?#rAh`&-#UIE0n4xC{6ybf5VJ# z{|)a9&3cMtsTVn2zVW^_Xij!#11Pl*d>P^8*0Jc|{bG1xJvf)s$)R;lDq=UD!Voa~ z@--3dfS#L&ABM&Y6ZHVObnaIZ<1>r*4fJ1@sed_(H9jk;^!NRpwMH^arz7`L7VaFr zR6o@Qsg%^s?3<^x-iF5l@o3QOz6U;KEuexBP_<6Du;;H~tTK`6^+l^Z zz2Q8JBk;(&ge>4E3n?Q5%UE(hhx>W7>D%@#LhhKE`#E^S2cxWmy=Lrr1}=OWIf=M%W0^+R7I4fr6m8C&2b zuooO=K+@Y1c)sE-WpirBzw65Vqop-`kYWCts_KYxy2}{YyY*m^!Wu?zdxu4VD2J0& numz7JYnS(S&XbzoJI1~90pd~yK{kJX`T&cwXtPRFO!WT&=0pO& diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png deleted file mode 100644 index 88442a01937a5ba6700857a86795401818e5d435..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4367 zcmd^?`8O2)_s3@pGmLE*`#M>&Z`mr_kcu#tBo!IbqU=l7VaSrbQrTh%5m}S08Obh0 zGL{*mi8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AW1wU4)820RRA}xtXaQ008`Z z1+1}x{#t_hrM=ZMrP5Yy4RVjO4DTKA7;X z%u#te7HB@PO*-}iW10Po5Qy`2GSj>67KThRD~1vsdVuFI`g?l`AU+$~^|-v(073xx zheI{?-U+@e;N{SkSaoh@(D{$*7_%k?l{EqKfsGzX@T$)V_=7rA9~oAi^@B&3E{aRaVwAQKi}0x{(ye1gQnmO-y2 z#NHtofUZlmZPTlu(ZO7v#8z@b z%(xv+;AAJKcqzcR*Loux-`6@;#^$76uQMpX4d|qY0#kn2-(w1;M$0v%sB>6Nit?^t!c`*ZP|EFq|Nw+nMp_Bce2Kl+v z9@Txy7U@3(8IH8KAdvSE<3;laycTen1J;{|pSMfO^^H_TI{Th1%riz5 zsS13UD5Dm=cID>Q4;aTqK}hdeAVeCShc0-Azy`&q?N*$(YHh*}Q(P>5?)g9&2K9Yi`pC>;PTw_fPF8En>YVKk6K4-b=e# zF1*Q8h?(i>680IIc;mzI>9Xb{HYvTL;T=eSHmsTUt-}p7!<#2HTf+w9&YV;TcawSA z_C^3$(k=OuaxoYdO#GDc4=t%1FK2t1ToYcA+@wfr3iQ=6d!%np+y$50{yMNr4@b(% znC9qQ9a3J4q{??zDjhg?-A$^_^N|p2b#?4OjSkaTi5_z=El#a^f}TN3fuRj8{F!Z> zzR(3~T$mdtmu?27Xvk(vTk|vQW31{b7gcL9P0TOX0Jf5v3#`<2Y=f#Oitrxti-G}E z@Q4*Ev}LXtVs}{fe;uj(430);rc*OrAML_2I|bU60zzdd*k8c@K=Fj#OobWLJGZC{ zf9XCnx&1Tt{vLxHEW+)Ll1wUe@YYHh-&N*m>M({YZf85L|5P060cnGUDj>y%lN6ie zgz}3Eaa33KhDVxg664!2mT17UdIT0~o#w{xY4xdqLH>9k zM_RfPo_X-jdjjogEjY&H3HF=`LTKz8*vc%L&4aHv7ALe73g7@@vf`%=@qJ(YLyFfE ziHBd{z7b)&dM0>EPddNeoLg;Bb+SKG$|3F+Q<+6{1CAl26<7e46x|BLKh+SAzZfZ2 zPRTBo#50sQZS6 zLEA6@F%NM4VHRM2j0de}Y>IE1+&`G{I_-V7N)8BoLcx(KPfP$P;oLxew9?F@Nbxo5+-civ=9~S}%D2K+g z0)7JFK2fpQ6<=$WtO3rmOpOrxivlZrY{Hh3dRslZBB?z@XEbd}63$d(@(lZ37CVq@ zShJ!S%xquZw&H6g2Ee_QQ0F!yf<-YW13BJod|Vm2sqy%SoVDMkKS&OL%BJFLVfh;Y zr7vM(%7Nxr<>Vr6i+O)P`gh6=dfwk%->@6>f@j@8Z8Tio3*4~?&t;4zdesr<2^kLg zf%`gzeRHFAc2Q`?_iy_-Lk%dxNz63egzd__uu!)AhQI!nUvIQSsQ(Cyzp5Q35=hm{ZWWLPZ{C3SI7hOeLSuUA-7&H7Q0Q-9|5-y(?wr}N0y4@ZT)W|x> zcVOEt;Tori$yc(+4RY3ju#AjmyQuEHWk>c~Qc8+A4%8FREgWi}kNMuM_6vbr3Hm4{ zJr&F%A;mFp@`Vhxq_g1WtG~G(rp2c!F3(2d<<8?>$khz(&tU4PMuy);VE_fFh_hpv zMw6_Ep3(Eq@N9#mL$t=lv_40R)}C3EE?8!1eK&kGOU}M(Hk}?%8H_qMpLZbuCrg1q)gS3LH}do#-+Y@ON?wR<(_N zdbaX$0W)InV5z65=lG!NMf%JfS7t`(7EQsAt^Sk%&SUd6x& zh@H&J&qu20mqP2?VDV^1dMVA<@0!N`Z6+7D{qcd-pdH=4quWZTuiGvc=z{SLM0u)d zv_1UMfif4llVr(-0a;q+`|t00*=Q#>N7Ux=ge)eNKr~Wr#qB4BAWV(j3jUoHar9%z z8!LH;U@cX*wSEM3-gGrm|Dh9`tn$`A(`=3!FfIqz>ATy>y(Vt=n}-w?30Av_pPcFQ zY>N~1_N8#<4eAE=iKgdvtBY{Cz`>1e6+G(WJt9S(a4itKL@JKayW|2srWY={m2s={ z_gP&XdUJnL(rbgdv^Y{b+LwkC^MpqD-)5q)v@TFMlX@#)XcLwCgj(X!Lw;3{#l3}8 zJ0DUACLT&v$e)~Jej+Q4h7^s&B-m-6;}-`umkXyGGq;`!2x{zzb8SlpkVRMnu7zs0 z{5H7ndfO+;d`TAU1L9_ua9+j!_liGy#Ts3V|Ie zhHO(8$Hi1zK%aD`Qgto@cCeC_v4##*# z?!8}J1}y{x0LiGeZQs*VXgSt;ZgskvKB)UBr?@DfX!Y$ZW}Q`)2eg3fDVq*>q&xJf z)Os4{umUz^FtD!LxM9~cVZcMtnJs5>lW^8HW9_?_M)odHi3pyTq1TGAK#mDlJH=Jj1cc|CF?}^eq*Rb?V}KoTcFA*yK?Cq#+5^x*CgfuHN6| z(wqd?CA)gu?G!UyO=jDWYu9)&EOm&gCrD+53T zW$`f#JYG@NJK(qar&db^Q;EGtBcnu*GhKAdcOOafxJfRyGU8s9AH_Z)$9V&ARaUi= zp1>-fI6#P7a1NVxS_?^s-g!SsmvZ*0nUD+O9r;!9AullLK{)=Qp79dk>p9II@xl4n z;4-@?Nf+szTE`Y{7zar{q;zLAS8Q>^obFLC^|x=*(v*1HbC#_h_{S`#0{<*>lF8V9?eupImH>4q zE3o0+7k;X(2g!^jlA<9nZ(#EM7DtV^MkF!`-4Qqmd~!LtZSFczHD3N9~07#xbP0#*5oA39ItAw0%HY z-VX4_Cw45ty(c)@0Pjt~{=5GBsk;I0!Q%5#{0CuaKfI~(^BWQv>#EQ+zR1dNn;aB| z7a0f@%w1bGa=b#)Qzl2{0OB0vl;Hd9U~H5F?&PZIrA9mI#C7Mn(n`V7vqdGt6Jh7T za-hR8mDzZBb3U;bIUgO$N!MzvoC?~^JmN?#MLSGqK!RaFdd0US>7Bzc8>DR(C(7`Y z+VNrd8z&!yH2QPE5>VvoZc1*XYqVyFB|ez*te}f6NiT(F;G6WLbh@k}loBpy_#YALD0;AmeLg5?Td7z*MQZkk{u^d~ z`)_!6WX@AKTdmmX%FPdLLGv=Zn?T6};HwBPx6UO8@0X)f8^L)TP7ZDJk`a3eBs#z8 zz}F;{18RN&b`+W*gx3Y+(YRhuO_G-$=R+I?-GSbUGsVbqBu(69mf5yl`FJs3m+q5>RbX&61Av9YS2!*;NUlA} zf@JxKW`mTikqln-*-!ko^2;0eUwqLpy?nRrrgy?w!P^<+VF>eC?FlvpDkazsKYxVM zCYW!~L**<6#Emd@P2jU<61`@-f3&4mDVEkQBkvHA_ph8u^-8E)iXW}$7yb`C_0gTF zec{~nW6;=!xD4PYGa)k*Ltl2kfc<&A<=g%(LiU8I`vq9zN5kyH{T9qcIyQV3GPBcy z{6~!bm7{NLXY$PuO;FzQalvK*+A(NZ6Z&E#h>dA??~@hX=QF6W?PGr=75Ff;1ykt7 zzaJc?Pte`wf3fN(@Rzx(QgyEqqfDzz&@ul9>pEqG diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png deleted file mode 100644 index 327cc6d46141e7d087f3886f8da43a062bb40530..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4367 zcmd^?`8O2)_s3^p#%>toqJ#RmwV2==ic*rz7lOw=Q+eU0002DrG>dY008`Z z1+21x|5~Euh26hy$=2H8tob?f|D7Z4eRTS7;iw>c)Fprj>;wy&ZTrJ)br}ag=X6m?%ffK0|0vORD=+10ST%qI@p)sak|5{hHP3I~z~E?vMLa z=BT|H4YC~HA|Lrfuq^&22*lYsxv3owD`Sw{vawW$0pQv5{@z|9SiqKkEiUgBfEWn* z;aH8mdrTk;cqyzUR+EXeFBHUiAG_pxG+l1x$NP*$z**XUaHs%* zT~QZ@JwKbQ&sNyZkpol8h z5^oVqK-Y!Zwy72HNaI8cpgp!BT9|lhIRf$Q$-mV0G_G0r_4vcCAV06moKS!OS6T2= zaA{r`*o?Vwy+p16i$FS1#yp!X#x#D-x=)mxV(MiaD~xucTKJ>Q&ldM6+YbU>U@N(y z7QBwf@bVLr{8V7vD}&+n@2eflqq8!v)|gb_I>&^k^y6-qc21A~ht9Lede}Ft6Sn^z zp03M_*i0AOWKXnrhc-zd6`!5VnHHEj z7mw4iO@RjJGiHrsLA75Z<5sgO`{Im|j=R7WL~BGbhi*;f*Y3A>gQEzF(H&xT!bvxf zIO>MBz@*Xgt3N_AaqdUIbfuim2#6yuNI%I-Ydn)sUd+Tg{Ha<2>9g?(?z%{MBPY8=38k@+?+;{=d%95yI5zOn57gFbea((RI`KOY|~ zLD#SQAn8PVU~6Hv)24u>H#nJ;tO!heKU;VX(T{v)QoCxTN#-wL^9#0ql4Wp5N^WEp zsW2?zYsa$T=k%VN{kwvrkavdGcNgF4tuaT@t zVKIYu9yWErR9xW~ixq{ydtSpI&*t;k#4>Rl2rfstJqIl_r>!mEQ=t1RwWLTBB;xz+ zjWM$srvM5=UI97MWD0U_wyd9Rx}b`Q$C{bloZWDSIC8A@2c&kC7O~w`9B~P6ZRUJs$!KA$?5whnCd!7c;#ew}h8ucNy}k5@Ti50qK_$ch2=zfFA6^gW<9= z&@6+eL&kf7T>18*S_j@ke}ks?Y&aBKT^;+SMh`SvV!+Z%kJG3gXJpV*U}$5j02W*4 z&kUg&SC+#-vD>VBzYf)YhTzbd>9kC@hdZ#$PN8;{z%V%~_7|`}NHSq3Q)wFY);;>% zU%C&>ZvBkCx69;(i1GTMq>~CAeRNXBc2xPAI!xipTiH%)Ka~f2z`78T3TUzM1l2Y< zq5S-O9LDo9fBgm7NXKo<<^_XaE&x zhfMT{seaG#HQutUOWm?!vDu5jCdvnbfzi%ElUgmj!1t}3yCp%j6Gw95E=ajxoCl7_Y^3O#fxl)0l0vetoSKoLf_Yb(Bid3 z(!poAUu5`>ff<3?lP+j5>s}jNog4s4Il$ipm095$@Jtb%paO`r_+~iaiI!yi`6!8k zy2BYhbXs~mF{g7EOtYf&!6VrRo*A<;+olTZs%_*5#G_UEMihvn!PHkNsR&e}=@%Z( z(S`v?ctYwAvH*Ldd}sqxb3)U^-u|@rNuSdlH*fPyn(`w9^_x5RS6QX-S=Q3D?dEg< z86k140HUF;PG~7x#nSGc{O)_mUlU*g6y~1f?h--uP*0_-X`3zZkBCS4x)RAi1vG&T z@Dm94jgG}G``M^vec?V0YJ@tR7g`oz7qyl)*zD04OYI@Kpy`v+a8QleQ|xzn?3Y~Q znq}n>7Ki$_WxtCO0Q?&%OzNGi0k$GhvmT=T91Ax*!XV*fE5TQY%9JNmcJHK z`5Z2x8f1AzK_T*%gwOZGf2Z82=iQyPb^8Htc-D2)dc&pNplz#&T;@okcO7YtnBkZo zw5M0tH#<^iAB|>y|F)Mi*nlD)$4oKI*e}nCiexLU2N-Vp_u?GG0)|-wOqG?}NyKUx zIQ$M+Z`52ix0anX^F{8)x2v|f=qmd1QpxOtn4v#`*xv(DaK*gvy^CJtTkVm-jcfw~ z`*!V8ZgI+(d=&@$0Cyc2%gkuDkM7=Ga^k!xqoR!GLOu4{#H02ESnl3zKNrN4V2DyN zP{S+`Q=Eb(p37lNIty;R{G01RT70VV(o7UV;Vi+GQq9!;1fh*+W%#cb22z2_czf0< zG}&hGDI@==Mzr6_SAxG!4hlh+o8i5O7<0tsq}dIh}7zH=CuP7uab)< zZzEdDufwq5{Y+kmSPrWEi|^Hl8J!XRycoUgo+faXF<~n6IHhY>IDskH(4P8T3n)*t zQ&5OzouQ4Jy!4vv9B+KCa=a)Y;^1B*>Is}u*HXn>Ft4+(#5MV)6J3S^{!UK8s<&}Y z%~U=rU_tEeFZLAm9PL*F-q$~Ne*Pjr=n{3yu9r(0rTVUOX#RqoKD;O9N zv7K4@=};a0LS$_VB8g+Bm(uxWTi%~zrfA2_qit8VUrW^y!uaXI)-znxCrRZ08beB|gTh{g@V#B`rm zTb#I$AC)_AKtHHYJUzEtQ;f$I4ry$w;L{xI5i9b7>wr0>Qt`~*MOVlXqj15!j8{{z z@8Xrg*Y_r*z1L}r3&XV|eQ9_JFOJB7TOcZH>pYb^skZ`#HdCuls3jdf5LEYE*qu+c z_a%p7;yGwa`4h7&kL6|2(4yg(1bf{xf|9`Ia?x~Cmev!2!HpepZf)rRiWpnq)iCXr z-$wV`Zuv%AF6!f>*0(Cv#R~ldAzr2s(#+t)R~%@5o4g?>F4II?X}^kaa~Fz68yEzpT0i!V+FfjU6)b=4@UWh z@4j1D0?!8q0x77~Ex(hKXa%-s6Y6z z)Mg6rxC}98GO=#D_#wA6QNRQ7=}i|(lW5i!bM?EoR`w21g#@PIN3;RIIuF7Y^j4<| zw%C&Mjgd3Kx|%@#MLvSR#kGDuwzTyh14BK3O?Jo{NrDOvj{- zQL!ZI4yom)97XswW;w>3Kr_7z|QWrC2`@T{wccm5>heu~IIo)X@nu$;rBY<`@&vznX8=gx zECHsG=S!Mq2mEILH^IYRM%u0Nr#d9$xU2)N$g6iU z64(?IzYyc*UBaiFS3}b|Zoivg$hi2{j4K555C5uopBI#LKZ5YUz;qGt^^Eq9_>g>T zNSS@Kw5#lPty2pxjEk%oTDm=wtl=-;0Ow!Wy&~SoS$5dPmfJHRK7H43>GOS8O9s#> zX}3qgy|j<1aob6Vd{}2C$?&X~`P(;HS!%r98S7S0!XwrbL4OvwDHLqKZu;8>Yk(#P z8?fQ+XF-~sC)t8E-fKY|w5c=I|XVb%VYwg*Vd z+Xi0$$caUG^n~Dy2tHKozw5u3x)bOTA~_c=xF4SO!-u9gw=RXTsR~OIh^qXy!9`_y zQ-B=8xvMKCPM66Bs+8y)K%Aq33Ve?ff{k{>A72r_&}dH^zvePqS}9z5x~ODmJp2qq z0emp3HWLqT&L{OE=Wt=%44u}>$>5F5L$1_PwBu9;Gz11@RD4U4-98AnMcQR?ql`~z z934cwcJ@_DV>|;a0>!TEq~u1q;j}}o2_f94gKoxjBI2-!Svr zf5SV&vtFXv8pY0+Z@g~{o|D_z07~xzUq*VncP={mycn5W56RBTrG(fM<_=N1 zM9XzXn1a<8NfS(66Xf)%MDLmIA8n~s%B8hS$lE03z00Rky%Xvd<3}p`MgId|J+3pg zFM^kG1Rh> z|A^7Qa`d&`biM_miG#m008`Z z1+21x|5}p8h26hy$;Qh5Y;t1q|IX>{!dw3>935zfz6214pI~9LX?vKZCT;JFx{VR# z`^t$l5HvNvAbIV$hMh{Rc09i0UhiP{Ni*@*#)$Iw#VKzp-YFaqWLIDiP+Fne^MWeR z>D+Th-jPr4-W@hS004MmEzC^pLtZX9r?^el^Fn&f%jRO9s)l>euUVeHv+>mP{+M?~ zw(6UaK#Q?0%8?%g$Kq#**nZ`EBUeVsl>sNCA)^ z4pq3j$M`dWmqMFkGJ@SP9+EZ$W5DDl%HItA=P|J>j)J?*|4}`s2M-$BQyrS1b!tc z{uapubY7@wom>GAH;gv}+G6UXgh;2B!;#OP{7X%D!hrqv33&)`m4z^g zkm7-ZO_>YVi)Hh1NR<7|s7I6esQRy2xAEdrOx^Tj1yPPvb3csP*`jVGy8*xpTm=`@ zoX6o9L2i74j|z-^r9ZU(eYJggWLEms8j}iKhmCtkJ??UD<8c3f=-i8}hrL7Eq5JO< zX*xW}%{0+X_5?dOXrnkv;n~UTDgMbb?(vMyvLSLomC6*#9*^>9IT+$~V@dG$({ROm zayuT| zQ#Z8uCk&Tg{SlOobvyc{Bk6dCUkr6Y>Pc>D!(CSmI$~5&YM?&uT$FfwRCwJ$F3aQGg=I# z27HhptBzm2d}H$mob$X8wC6MsDucWJI7 zv?a*>xKG~-AyyL7dVBtXbbpHO>;zGw+l~_@bGTH7{>>Oy(L%&fb zvcX$`o$Brs@fjFyovs;-3>d%mn%J8%?{_u7*`B;lYP?q zS`b*=CH0efJ{TTM{+Rp^%_-|Irh7oH@h>TE(v($2#>$92$~QaqoXahLUHF9uL#3sl zSq68zwATWq;_XG%c7nU!22J_FwpsUn9jg8e#$z(lXc?{#ciWH@(_2mdsQJ|eG-mm^4MQaJ< zgU<-xh_D@fQzErHO+bIvttO}{$sd$_K)4AiwZzvGn8MnD`4B0w%`oBdHa zhts^6)U-HKcE>K5W;xS~h+yx3X2i;Doh+!WvX&*1j#lX#ksw&TiH~ApA*fixH!KX+ ziUo*!K2A@6+u!Z*xzW@Sy_qn%enRStSXXR#LR>rZfNr zDSj;<(CW#7riqhMhIzMb5^zt2Q~9O8W9r@$7@>!9M}G-~EvYh1{^ci=LEQZ4p5YZ2kQE zwr!HGu}auHWqU$DS1lOFOmDJ_>e^j$a ziuJ%#M&2pjEwD_8_Nch_C%jnAsRfz*CDxX=gNM^ISy#*_)8gpElB>^|*AB=$iq0B5 z4H!w^c7y!))4A=U+32z_K3Bu1wTJa`qjj^o8^M`I#L0}~Go8Ca@l1jGwv_LhKsl1F zynGbvG;PfIrRPM)Si^JW3EkK4s^;D;kc->i=$DnCZN1&YTgvFKTQ27qLUHwE1)3S& z9`SHrg?pxhV#SRGTUq7#@9lco=p;2o)a3GpEF=~~HIr|~?j?pG%}m_#|D6>H%p>UQ ziwaPo8k$~9-4Ob$*-E6r11EMlmCZfSbhbJ$Hk;7lyVJq5Dq;7Vml72TQNKYPpX&8& zjTQ6urE=x=>jn0TrR8*Kh;q9iAPueMyc(n3qJ^FaZ7_#q3W3?P=mI%n6fC%v@@NS3 zUc55!`rf#d*E(%+VW?)fH-T4$d zA4&)|4n|YV8=qx)EGL7377j(n+v%JUkN`H7iKLmZw44YCYG{vjZA}Brh_VG-4b^J? zZFtZ1mQR$$q8=e~eXBxEw7^#Y;%NdQPY*nN1;g-J=ME~;f$8iws*LgmFNXbLA7UtL zvvi64?lpCES4-`<7fV&Q}iwXk@SKdrx*Vxo}!Skr@(#e2_dIKLz ztS1Q$%Mddr6X&W!7<5e)0Xz_!+H{_26v^CTu73B@%-R7elfg8?uomD~$3f_V?&@Uz z7F$xD5o$U}M+3;W$V;@D2soPR1mbm~i@=(OU5k8%B~agkS4buNCrby&bCKclspynZ zDvnIuAvfQYMN5fPYC}^Ln2wG9CuC$~ZmM#w(H7njtb{g3#s})gjVR!jl^B9^)!qiT z&V*W?Z~&q1)75}(%@qptwnm5kzC66YQ~>fCk$Ls-&Y#4bPvPmPQ$jm4>^noF7}qlj zsilT;ZZy2l%!&SfLy3wwiucR)BF!E4doSZ9O$kqZN?R|<3VMs~QfFjxa|OP7r31*| zOn#=J$4i<F#7c=!3c2TSXqfDAs*{2J?jvOpJI>8sO5UyXquR%3JFf$-$f)bRzuQYx8IF3q@8`L$K-?fhJKa5&kanxA5MIrZ?XvZdPeII5N3C$2sDMHEs2}rQKY|ujd+|6X;#B{Zwg*Vf z-3DI&$bmz;cL(DQiQZJ)zw5u3vJ>DQEHM`)upgHC!<(isw=Rjbt_)4(kF5B%!AWI$ z%>ZFSIjbwij+ZI=Dl<{pfLI54WyBr_1Q+E%IKCowp}~$ecFlRVq(Z3VbYbz}SlAhe zJosQlbvh2wlt=DC&EZ427}_lr6G0mphny)T7>CJpXfPbeDF2oyvwaX|gR;%!LK~e> zKRO71?c}4F%6JA?1d3kSNzRFM#cPFF5rer-3%S@*^poj^zKK6t7Tg2bN;)J#%TDqq zAq`C}pU9C~;P1eMZ@g~}nv>nx07~rxUq*Pjbu2n~zZjla56R--cjn7Id{e6FDt&z;q>Bzm5g*%5Y z)laoSDkXI@`{rq_w_!J9&9HKuiDP$IWVdXWKb+6gWB8=v6q(#j0ARu3WzGxrQmc+hMsXTLJBaE+XRH#Xiegt09f;}G!Vh8Q)e!R%=`2=og{m>Ul13n0C#uj)9 z>;;Dzko2|$p09XI*__((@49mTXlV@}WSIY^syd>a?lK1UZar9}u!hmw-eFN7%Hbpx mY{BEm+U32S^Q7kYj&bjNfVh-Fkj>wpKEUEE+N{zP6a9Zd&Z`mr_kcwz5Nh&gy7G+@45H9p05OJ)J3QW6aWBlnwy#00sz3{ zD`1rsbZm*{mv)cclC`DX`F<$J|IS(Dy5M$PI4aND2007{QH8(Z33wgEVl;S#B&jao?E1QdXrV{Q!yJ2zm?#46E2V>q9 z*(z^G0?o&^$VYx)EVG{x0&%`pW^%{f!jMU3*-)Zg5Agg&Ur!Ga#Ai*r5u5uOKnwu? zw6DV6JHeL;yb{_Rqt49?I{#4}W7epkvMMk$FA&K70K4RKG*xEd%l(|0&r#BLU@#wn zT~QT*NY(xM92*&=yl4B}hE89FBPY^j~Va8`jKxyZvC-kYCoNPRW6RtIYUG zxFk0WWWrduSuB%}MIh~FMm?I$M%8}Lx{ep0Vd$ivD2Q^PnE9bi&lhzo+719-Vk%5eS<8YX6oIQkQtsu z>I{60*%XAvSb!jCk-h_v;ZR#M0(lQHS~$1QYXOJZW4(F!c{`!pgzoTLepD zX!O9{M~&?;C1?2MB6$JOp6Ae~^LboWF$^3O!C^16XQyG}u(btz26TO`k{DrxMEtn3 zF={gH;6Fo`l|v3U8Z$XInb*xWUQ))yVNFcjW;Yzc_RzIH|CIKULe_io!%l(bJ+xb8 z!W%pVn5phgVV{AqH$EJnu4q1DlhP|3+=ldJ!J25_+g&kJytz`-)od{CjB$lo7VQ51Oe`agP zFLZ%wXXb|S#alti8nWq=R{RXR=*zVg3#v7kM&_5R02@ioc~?{eY19mtM?0{L4uLkMfKV9<_BXIEP&|GoLtzT_&Nb@7 zFS@|45TfVss0}5>EFqdCZw~QlD@0x#dmvk}qVGn`%;4MMwRVhk;NB8bATs zAQRl9t3E)##hI6Os+yNCHhB_Qg?X4@AhcuP%uRg+^TIhvkH7-0)7*qztzH!{$e#e@ zNKI2BF!$eiPozDq0Y{rW!Jacg2#tIPUpB+BdGHm*;Dt6r0USU~X56G9q4%4ANYPpX z>EH|8HzI6D&xAnfPUF{`b*%}iO7dq)KES&%m0IBH@eCoYz-R^Kr81o_nber0FS6L+RnU<2&?WQyU z86kEfAFQUTN@y-!#ZvE`{^4`TTkUTI6y%)X>=Z(EQ_du>X__qX4vR+mI1|Z0IW&P4 z@Cyj{iHgB4`&y}Fe&syN)Bv%&D6q`OCTuCGx7n>LlG06bLenNB;Y`&g&#*sav0rlx ztCtmnneFOYmwhjb0q}1n)Va+_U{TD;K#n)-AD0JiX*~WZXXUry50WFCvM&EtQ1(VZ z=}VZHa-jJ&Ik|}2V%|Rv|DAG!?)P`s)@}Q};F&j3>-AT51Gg>0a~Q)3UbUn-V!C}^ z;GRxF@9c1`Z4{dE3joe@*%oEkQkjF&kZ->+Nepet$1OU1JfqX+*6VE^<-!sToZQY=FEb0{t`>eyTQZhnXGGOlWB3ZVTsijj2j0eZUrZG z?gq4kZ@Yf}hw0pQk!)1iSD)+Q(^|v2xzRdV-Ho73L&9Xn$(hbw!FUFLeOt;84WKO1 zMoun@Wtuu>^vZLhW31tY(#b;q@PqpesHgCm+U82`{CTZ?1&)cY9q3XN@J~`QR<)IV za=PMiJ~Lu>f3dr;`)I%NMcULXS4MitCQZSQt?rZn-e|ja?ZCT5(+ul6B-+1&UctbK zi0zDu&xfk$mqKe>U~wEHt%T<5cU@!eHj}gK-ssnrpl#jV!`n)zZ(Gh6=z?+eBzdYS z&JO-)UzuyBgKWu#0a;q+`S0y|S!*XXMbzZ-ge)W$Lo|}zV)qh55T?ei`Tx#}IQlW< z&1HFrU=3BbrEUmy-gG5W|DhwBtn%g_({#2PFg6?C;k(npy((_|hld;$30AvB7@z9( zY>gH5_N8#<_Ui`ril*gssf%zq!@&)$@aF!wq}Muiabc)txHlCq<_V4Pzs*EpX_=>RCiaxW&?YK%@inBwhy1D@3%m0v zwm#$#OdOP|kT*Wd{6tn74JjOoj(ZJAm=R$OxE`w6 z{Kw$F%Wa=1^F>{J%(u47eSvsj0~>Ums^jyN1aZ9`@TEU*D_+d@J?~a4e1)bH& z{4Lg`JVWGkkhVIIcaeu+JrQs;)d|FDM;C!K47wJ14N4%s2d@!|xX%{$;1|Nfm+rQK9G)~E~b@s@%cBjW>gH?dM8m_q6~92zEhoav-ve)ve5$BuKcm6CQV{U~R$JLND=$-fDbSWpF>M^+>-l5;+A94c|AA}Pg>KQKrzMa$j85f*~ z4KB5fl602du5oDQhH;SPLrS)XlhpiV>*2f$yVpb;*h>#PS#!GkMW^ohE`536Y)%I{ zB<^<0xt8=Y)b2P4kPmAu#OWS&QpbIhmZrqnoU?54AUtL{75I07b7ltHr=9k$-V&e= zWd+v1`@&DP@gSSAq@U6Y9k!!d`8*KN8+$E8;~1|;Z*>URGG*7I?uLieg|;xA0AyG& zh19aXuI2gohsBF#WGpHVe7IA1bvQD)dccdtk|2+U`>37pUO$2qReNzeBw|&LOWOma z=57OTeqzTW+`EHu1_W;k_TTm2OW6r<4;G(`;@=NT{pn4WpIeu}SXG9m@w{9GY(T8NoDzJG9gK~#$Ddpgz0_b!9lPN)TT&rda<;H|a4hT` zSPpbBqB0!^Z^|R}Am?zQoOG?0iix0&j6;r;614qfIwTkdq?dnBl-@oFvqsuva-s}R zsU01Jzj5?YNTojqECNNY?Ih1Ov{dP zr@;+PEuTq|nqsq8Y^^873np~BRn+nCM338J^^xrV! z`+vi`L$jX3S!zX&S8si24VshL*#JuJ17AgWxppktd%ql>SP#zSaI|lolZ@DnC)4>& zzkW+Z*`wy>VTYmdLIhnvE{*H;#Q4nO1AV<$Wolo~V~oyAC?3DRvsMU3>2%~?%EH~l zS88Y4z?Bj@nSJxr);mzQSW}EFN8;FBW|=LU<&PKhbm=~+SOo@G698B+c$MQ)z2xeX zOh~4WXckD>3d!JApZ>&eBfqpx_|1od>E*d@HNF$h4Bkqg8H6yO)gEJGppt`a33G=i zZKC-)Jyg!(tGE%Swh?^xOoG>R*U#3JO2v|zCFC6v^8VE`DPHlli*du{eZv2Nrw-SV z(i_fAKLU-ci^~9hF%vT~F!Uw&3)o*ro4#$|BVu^fG4GnHqCXoT{XjS4mi(2hV$n$QCw)Yq$6ZvqG n0y5`zVCnMS&Usq%XUC{_K0r)TKgjy{rw=eck20+^K}Y`|QGX{I diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html deleted file mode 100644 index 3416ca7e30a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - Code coverage for Facter - - - - - - - - -
    - loading -
    - - - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb deleted file mode 100755 index 2fb72b29efb..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -#! /usr/bin/env ruby -S rspec -require 'spec_helper' -require 'facter/facter_dot_d' - -describe Facter::Util::DotD do - - context 'returns a simple fact' do - before :each do - Facter.stubs(:version).returns('1.6.1') - subject.stubs(:entries).returns(['/etc/facter/facts.d/fake_fact.txt']) - File.stubs(:readlines).with('/etc/facter/facts.d/fake_fact.txt').returns(['fake_fact=fake fact']) - subject.create - end - - it 'should return successfully' do - Facter.fact(:fake_fact).value.should == 'fake fact' - end - end - - context 'returns a fact with equals signs' do - before :each do - Facter.stubs(:version).returns('1.6.1') - subject.stubs(:entries).returns(['/etc/facter/facts.d/foo.txt']) - File.stubs(:readlines).with('/etc/facter/facts.d/foo.txt').returns(['foo=1+1=2']) - subject.create - end - - it 'should return successfully' do - Facter.fact(:foo).value.should == '1+1=2' - end - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb deleted file mode 100755 index 931c6d4b0a3..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env rspec - -require 'spec_helper' - -describe "PE Version specs" do - before :each do - # Explicitly load the pe_version.rb file which contains generated facts - # that cannot be automatically loaded. Puppet 2.x implements - # Facter.collection.load while Facter 1.x markes Facter.collection.load as - # a private method. - if Facter.collection.respond_to? :load - Facter.collection.load(:pe_version) - else - Facter.collection.loader.load(:pe_version) - end - end - - context "If PE is installed" do - %w{ 2.6.1 2.10.300 }.each do |version| - puppetversion = "2.7.19 (Puppet Enterprise #{version})" - context "puppetversion => #{puppetversion}" do - before :each do - Facter.fact(:puppetversion).stubs(:value).returns(puppetversion) - end - - (major,minor,patch) = version.split(".") - - it "Should return true" do - Facter.fact(:is_pe).value.should == true - end - - it "Should have a version of #{version}" do - Facter.fact(:pe_version).value.should == version - end - - it "Should have a major version of #{major}" do - Facter.fact(:pe_major_version).value.should == major - end - - it "Should have a minor version of #{minor}" do - Facter.fact(:pe_minor_version).value.should == minor - end - - it "Should have a patch version of #{patch}" do - Facter.fact(:pe_patch_version).value.should == patch - end - end - end - end - - context "When PE is not installed" do - before :each do - Facter.fact(:puppetversion).stubs(:value).returns("2.7.19") - end - - it "is_pe is false" do - Facter.fact(:is_pe).value.should == false - end - - it "pe_version is nil" do - Facter.fact(:pe_version).value.should be_nil - end - - it "pe_major_version is nil" do - Facter.fact(:pe_major_version).value.should be_nil - end - - it "pe_minor_version is nil" do - Facter.fact(:pe_minor_version).value.should be_nil - end - - it "Should have a patch version" do - Facter.fact(:pe_patch_version).value.should be_nil - end - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb deleted file mode 100755 index 73eb3eada8c..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb +++ /dev/null @@ -1,52 +0,0 @@ -#! /usr/bin/env ruby -S rspec -require 'spec_helper' -require 'facter/root_home' - -describe Facter::Util::RootHome do - context "solaris" do - let(:root_ent) { "root:x:0:0:Super-User:/:/sbin/sh" } - let(:expected_root_home) { "/" } - - it "should return /" do - Facter::Util::Resolution.expects(:exec).with("getent passwd root").returns(root_ent) - Facter::Util::RootHome.get_root_home.should == expected_root_home - end - end - context "linux" do - let(:root_ent) { "root:x:0:0:root:/root:/bin/bash" } - let(:expected_root_home) { "/root" } - - it "should return /root" do - Facter::Util::Resolution.expects(:exec).with("getent passwd root").returns(root_ent) - Facter::Util::RootHome.get_root_home.should == expected_root_home - end - end - context "windows" do - before :each do - Facter::Util::Resolution.expects(:exec).with("getent passwd root").returns(nil) - end - it "should be nil on windows" do - Facter::Util::RootHome.get_root_home.should be_nil - end - end -end - -describe 'root_home', :type => :fact do - before { Facter.clear } - after { Facter.clear } - - context "macosx" do - before do - Facter.fact(:kernel).stubs(:value).returns("Darwin") - Facter.fact(:osfamily).stubs(:value).returns("Darwin") - end - let(:expected_root_home) { "/var/root" } - sample_dscacheutil = File.read(fixtures('dscacheutil','root')) - - it "should return /var/root" do - Facter::Util::Resolution.stubs(:exec).with("dscacheutil -q user -a name root").returns(sample_dscacheutil) - Facter.fact(:root_home).value.should == expected_root_home - end - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb deleted file mode 100755 index e77779bae14..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb +++ /dev/null @@ -1,36 +0,0 @@ -#! /usr/bin/env ruby -S rspec -require 'spec_helper' -require 'facter/util/puppet_settings' - -describe Facter::Util::PuppetSettings do - - describe "#with_puppet" do - context "Without Puppet loaded" do - before(:each) do - Module.expects(:const_get).with("Puppet").raises(NameError) - end - - it 'should be nil' do - subject.with_puppet { Puppet[:vardir] }.should be_nil - end - it 'should not yield to the block' do - Puppet.expects(:[]).never - subject.with_puppet { Puppet[:vardir] }.should be_nil - end - end - context "With Puppet loaded" do - module Puppet; end - let(:vardir) { "/var/lib/puppet" } - - before :each do - Puppet.expects(:[]).with(:vardir).returns vardir - end - it 'should yield to the block' do - subject.with_puppet { Puppet[:vardir] } - end - it 'should return the nodes vardir' do - subject.with_puppet { Puppet[:vardir] }.should eq vardir - end - end - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb deleted file mode 100755 index a016b685c35..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb +++ /dev/null @@ -1,225 +0,0 @@ -#! /usr/bin/env ruby -S rspec -require 'spec_helper' -require 'tempfile' -provider_class = Puppet::Type.type(:file_line).provider(:ruby) -describe provider_class do - context "when adding" do - let :tmpfile do - tmp = Tempfile.new('tmp') - path = tmp.path - tmp.close! - path - end - let :resource do - Puppet::Type::File_line.new( - {:name => 'foo', :path => tmpfile, :line => 'foo'} - ) - end - let :provider do - provider_class.new(resource) - end - - it 'should detect if the line exists in the file' do - File.open(tmpfile, 'w') do |fh| - fh.write('foo') - end - provider.exists?.should be_true - end - it 'should detect if the line does not exist in the file' do - File.open(tmpfile, 'w') do |fh| - fh.write('foo1') - end - provider.exists?.should be_nil - end - it 'should append to an existing file when creating' do - provider.create - File.read(tmpfile).chomp.should == 'foo' - end - end - - context "when matching" do - before :each do - # TODO: these should be ported over to use the PuppetLabs spec_helper - # file fixtures once the following pull request has been merged: - # https://github.com/puppetlabs/puppetlabs-stdlib/pull/73/files - tmp = Tempfile.new('tmp') - @tmpfile = tmp.path - tmp.close! - @resource = Puppet::Type::File_line.new( - { - :name => 'foo', - :path => @tmpfile, - :line => 'foo = bar', - :match => '^foo\s*=.*$', - } - ) - @provider = provider_class.new(@resource) - end - - describe 'using match' do - it 'should raise an error if more than one line matches, and should not have modified the file' do - File.open(@tmpfile, 'w') do |fh| - fh.write("foo1\nfoo=blah\nfoo2\nfoo=baz") - end - @provider.exists?.should be_nil - expect { @provider.create }.to raise_error(Puppet::Error, /More than one line.*matches/) - File.read(@tmpfile).should eql("foo1\nfoo=blah\nfoo2\nfoo=baz") - end - - it 'should replace all lines that matches' do - @resource = Puppet::Type::File_line.new( - { - :name => 'foo', - :path => @tmpfile, - :line => 'foo = bar', - :match => '^foo\s*=.*$', - :multiple => true - } - ) - @provider = provider_class.new(@resource) - File.open(@tmpfile, 'w') do |fh| - fh.write("foo1\nfoo=blah\nfoo2\nfoo=baz") - end - @provider.exists?.should be_nil - @provider.create - File.read(@tmpfile).chomp.should eql("foo1\nfoo = bar\nfoo2\nfoo = bar") - end - - it 'should raise an error with invalid values' do - expect { - @resource = Puppet::Type::File_line.new( - { - :name => 'foo', - :path => @tmpfile, - :line => 'foo = bar', - :match => '^foo\s*=.*$', - :multiple => 'asgadga' - } - ) - }.to raise_error(Puppet::Error, /Invalid value "asgadga"\. Valid values are true, false\./) - end - - it 'should replace a line that matches' do - File.open(@tmpfile, 'w') do |fh| - fh.write("foo1\nfoo=blah\nfoo2") - end - @provider.exists?.should be_nil - @provider.create - File.read(@tmpfile).chomp.should eql("foo1\nfoo = bar\nfoo2") - end - it 'should add a new line if no lines match' do - File.open(@tmpfile, 'w') do |fh| - fh.write("foo1\nfoo2") - end - @provider.exists?.should be_nil - @provider.create - File.read(@tmpfile).should eql("foo1\nfoo2\nfoo = bar\n") - end - it 'should do nothing if the exact line already exists' do - File.open(@tmpfile, 'w') do |fh| - fh.write("foo1\nfoo = bar\nfoo2") - end - @provider.exists?.should be_true - @provider.create - File.read(@tmpfile).chomp.should eql("foo1\nfoo = bar\nfoo2") - end - end - - describe 'using after' do - let :resource do - Puppet::Type::File_line.new( - { - :name => 'foo', - :path => @tmpfile, - :line => 'inserted = line', - :after => '^foo1', - } - ) - end - - let :provider do - provider_class.new(resource) - end - - context 'with one line matching the after expression' do - before :each do - File.open(@tmpfile, 'w') do |fh| - fh.write("foo1\nfoo = blah\nfoo2\nfoo = baz") - end - end - - it 'inserts the specified line after the line matching the "after" expression' do - provider.create - File.read(@tmpfile).chomp.should eql("foo1\ninserted = line\nfoo = blah\nfoo2\nfoo = baz") - end - end - - context 'with two lines matching the after expression' do - before :each do - File.open(@tmpfile, 'w') do |fh| - fh.write("foo1\nfoo = blah\nfoo2\nfoo1\nfoo = baz") - end - end - - it 'errors out stating "One or no line must match the pattern"' do - expect { provider.create }.to raise_error(Puppet::Error, /One or no line must match the pattern/) - end - end - - context 'with no lines matching the after expression' do - let :content do - "foo3\nfoo = blah\nfoo2\nfoo = baz\n" - end - - before :each do - File.open(@tmpfile, 'w') do |fh| - fh.write(content) - end - end - - it 'appends the specified line to the file' do - provider.create - File.read(@tmpfile).should eq(content << resource[:line] << "\n") - end - end - end - end - - context "when removing" do - before :each do - # TODO: these should be ported over to use the PuppetLabs spec_helper - # file fixtures once the following pull request has been merged: - # https://github.com/puppetlabs/puppetlabs-stdlib/pull/73/files - tmp = Tempfile.new('tmp') - @tmpfile = tmp.path - tmp.close! - @resource = Puppet::Type::File_line.new( - {:name => 'foo', :path => @tmpfile, :line => 'foo', :ensure => 'absent' } - ) - @provider = provider_class.new(@resource) - end - it 'should remove the line if it exists' do - File.open(@tmpfile, 'w') do |fh| - fh.write("foo1\nfoo\nfoo2") - end - @provider.destroy - File.read(@tmpfile).should eql("foo1\nfoo2") - end - - it 'should remove the line without touching the last new line' do - File.open(@tmpfile, 'w') do |fh| - fh.write("foo1\nfoo\nfoo2\n") - end - @provider.destroy - File.read(@tmpfile).should eql("foo1\nfoo2\n") - end - - it 'should remove any occurence of the line' do - File.open(@tmpfile, 'w') do |fh| - fh.write("foo1\nfoo\nfoo2\nfoo\nfoo") - end - @provider.destroy - File.read(@tmpfile).should eql("foo1\nfoo2\n") - end - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb deleted file mode 100755 index f92065f79ba..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env ruby - -require 'spec_helper' - -anchor = Puppet::Type.type(:anchor).new(:name => "ntp::begin") - -describe anchor do - it "should stringify normally" do - anchor.to_s.should == "Anchor[ntp::begin]" - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb deleted file mode 100755 index ab5b81bb96b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb +++ /dev/null @@ -1,70 +0,0 @@ -#! /usr/bin/env ruby -S rspec -require 'spec_helper' -require 'tempfile' -describe Puppet::Type.type(:file_line) do - let :file_line do - Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path') - end - it 'should accept a line and path' do - file_line[:line] = 'my_line' - file_line[:line].should == 'my_line' - file_line[:path] = '/my/path' - file_line[:path].should == '/my/path' - end - it 'should accept a match regex' do - file_line[:match] = '^foo.*$' - file_line[:match].should == '^foo.*$' - end - it 'should not accept a match regex that does not match the specified line' do - expect { - Puppet::Type.type(:file_line).new( - :name => 'foo', - :path => '/my/path', - :line => 'foo=bar', - :match => '^bar=blah$' - )}.to raise_error(Puppet::Error, /the value must be a regex that matches/) - end - it 'should accept a match regex that does match the specified line' do - expect { - Puppet::Type.type(:file_line).new( - :name => 'foo', - :path => '/my/path', - :line => 'foo=bar', - :match => '^\s*foo=.*$' - )}.not_to raise_error - end - it 'should accept posix filenames' do - file_line[:path] = '/tmp/path' - file_line[:path].should == '/tmp/path' - end - it 'should not accept unqualified path' do - expect { file_line[:path] = 'file' }.to raise_error(Puppet::Error, /File paths must be fully qualified/) - end - it 'should require that a line is specified' do - expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => '/tmp/file') }.to raise_error(Puppet::Error, /Both line and path are required attributes/) - end - it 'should require that a file is specified' do - expect { Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'path') }.to raise_error(Puppet::Error, /Both line and path are required attributes/) - end - it 'should default to ensure => present' do - file_line[:ensure].should eq :present - end - - it "should autorequire the file it manages" do - catalog = Puppet::Resource::Catalog.new - file = Puppet::Type.type(:file).new(:name => "/tmp/path") - catalog.add_resource file - catalog.add_resource file_line - - relationship = file_line.autorequire.find do |rel| - (rel.source.to_s == "File[/tmp/path]") and (rel.target.to_s == file_line.to_s) - end - relationship.should be_a Puppet::Relationship - end - - it "should not autorequire the file it manages if it is not managed" do - catalog = Puppet::Resource::Catalog.new - catalog.add_resource file_line - file_line.autorequire.should be_empty - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/file_line.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/file_line.pp deleted file mode 100644 index eea693e15ec..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/file_line.pp +++ /dev/null @@ -1,9 +0,0 @@ -# This is a simple smoke test -# of the file_line resource type. -file { '/tmp/dansfile': - ensure => present -}-> -file_line { 'dans_line': - line => 'dan is awesome', - path => '/tmp/dansfile', -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp deleted file mode 100644 index e1f1353cdd9..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp +++ /dev/null @@ -1,10 +0,0 @@ -include stdlib -info('has_interface_with(\'lo\'):', has_interface_with('lo')) -info('has_interface_with(\'loX\'):', has_interface_with('loX')) -info('has_interface_with(\'ipaddress\', \'127.0.0.1\'):', has_interface_with('ipaddress', '127.0.0.1')) -info('has_interface_with(\'ipaddress\', \'127.0.0.100\'):', has_interface_with('ipaddress', '127.0.0.100')) -info('has_interface_with(\'network\', \'127.0.0.0\'):', has_interface_with('network', '127.0.0.0')) -info('has_interface_with(\'network\', \'128.0.0.0\'):', has_interface_with('network', '128.0.0.0')) -info('has_interface_with(\'netmask\', \'255.0.0.0\'):', has_interface_with('netmask', '255.0.0.0')) -info('has_interface_with(\'netmask\', \'256.0.0.0\'):', has_interface_with('netmask', '256.0.0.0')) - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp deleted file mode 100644 index 8429a885539..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp +++ /dev/null @@ -1,3 +0,0 @@ -include stdlib -info('has_ip_address(\'192.168.1.256\'):', has_ip_address('192.168.1.256')) -info('has_ip_address(\'127.0.0.1\'):', has_ip_address('127.0.0.1')) diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp deleted file mode 100644 index a15d8c011b6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp +++ /dev/null @@ -1,4 +0,0 @@ -include stdlib -info('has_ip_network(\'127.0.0.0\'):', has_ip_network('127.0.0.0')) -info('has_ip_network(\'128.0.0.0\'):', has_ip_network('128.0.0.0')) - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/init.pp deleted file mode 100644 index 9675d8374b5..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/init.pp +++ /dev/null @@ -1 +0,0 @@ -include stdlib diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml deleted file mode 100644 index 3f18ef2fca2..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml +++ /dev/null @@ -1,10 +0,0 @@ -fixtures: - repositories: - 'stdlib': - repo: 'git://github.com/puppetlabs/puppetlabs-stdlib' - ref: '4.1.0' - 'concat': - repo: 'git://github.com/puppetlabs/puppetlabs-concat' - ref: '1.0.1' - symlinks: - supervisord: "#{source_dir}" \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.nodeset.yml deleted file mode 100644 index c9a6e5a3e24..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.nodeset.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -default_set: 'centos-64-x64' -sets: - 'centos-59-x64': - nodes: - "main.foo.vm": - prefab: 'centos-59-x64' - 'centos-64-x64': - nodes: - "main.foo.vm": - prefab: 'centos-64-x64' - 'debian-607-x64': - nodes: - "main.foo.vm": - prefab: 'debian-607-x64' - 'debian-70rc1-x64': - nodes: - "main.foo.vm": - prefab: 'debian-70rc1-x64' - 'ubuntu-server-10044-x64': - nodes: - "main.foo.vm": - prefab: 'ubuntu-server-10044-x64' - 'ubuntu-server-12042-x64': - nodes: - "main.foo.vm": - prefab: 'ubuntu-server-12042-x64' diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml deleted file mode 100644 index bc96a165e59..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml +++ /dev/null @@ -1,31 +0,0 @@ -language: ruby -bundler_args: --without development -script: "bundle exec rake test" -rvm: -- 1.8.7 -- 1.9.3 -- 2.0.0 -env: - - PUPPET_VERSION="~> 2.7.0" - - PUPPET_VERSION="~> 3.1.0" - - PUPPET_VERSION="~> 3.2.0" - - PUPPET_VERSION="~> 3.3.0" - - PUPPET_VERSION="~> 3.4.0" - - PUPPET_VERSION="~> 3.5.0" - - PUPPET_VERSION="~> 3.6.0" -matrix: - exclude: - - rvm: 2.0.0 - env: PUPPET_VERSION="~> 2.7.0" - - rvm: 1.9.3 - env: PUPPET_VERSION="~> 2.7.0" - - rvm: 2.0.0 - env: PUPPET_VERSION="~> 3.1.0" - - rvm: 1.8.7 - env: PUPPET_VERSION="~> 3.2.0" -notifications: - email: false - -before_install: - - gem update --system 2.1.11 - - gem --version diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog deleted file mode 100644 index ea933f5dbcb..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog +++ /dev/null @@ -1,119 +0,0 @@ -2014-07-02 - v0.4.1 - -Fixes: - -- Fixed status code error on supervisord::supervisorctl commands, thanks to @jtreminio for the PR. - -2014-06-20 - v0.4.0 - -Fixes: - -- Removed root as group and replaced with uid 0 to enhance system -compatibility - -Enhancements: - -- Made package provider a user definable param see supervisord::package_provider and README for details of how to change this. -- All define types can now be automatically pulled in from hiera see example https://github.com/ajcrowe/puppet-supervisord#configure-a-program -- You can now override the default include path of $config_include/*.conf with your own array using $config_dirs. Bear in mind this would need to include whatever you set $config_include to be, with *.conf on the end. - -Many thanks for the PRs from @jasperla, @mvantellingen for the bug report on the service name and @hasc for the enhancement ideas. - -2014-06-06 - v0.3.3 - -Fixes: - -- Fixed typo in stopwaitsec param, should have been stopwaitsecs, thanks to @rchrd2 - -2014-05-03 - v0.3.2 - -Changes: - -- Added supervisord::executable_ctl variable for supervisorctl binary path, thanks to @bpgoldsb - -2014-04-22 - v0.3.1 - -Fixes: - -- Fixed typo in unix_socket_group param, thanks to @dig412 - -2014-03-11 - v0.3.0 - -Fixes: - -- Fixed typo in fcgi config -- Fixed typo in supervisord config with minfds and minprocs, thanks to @peefourtee -- Typo in README fixed thanks to @hopkinsth -- Removed refreshonly from pip_install exec resource -- Number of syntax fixes thanks to `puppet lint` - -Important Changes: - -- Lots of input validation has been added **PLEASE** check your config works before upgrading! -- Changed init_extras naming to defaults and cleaned things up. -- Starting and stopping apps is now done with supervisorctl commands to avoid service restarts - -Other Changes: - -- CSV functions now order things consistently -- Included description for classes and functions -- Expanded spec testing built with Travis CI -- Added beaker acceptance tests -- Added greater validation of various parameters -- Added coverage reporting for resources - -To-Do: - -- Add support for additional OS families such as Solaris. - - -2013-10-31 - v0.2.3 - -Fixes: - -- Fixed large bug on debian wheezy where /var/run is changed from a symlink to a - directory causing all pids to be inaccessible breaking lots of services - - -2013-10-30 - v0.2.2 - -Fixes: - -- Fixed syntax error in README examples and tests - -2013-10-16 - v0.2.1 - -Fixes: - -- Fixed user params in templates -- Added missing environment support in main supervisord.conf - - -2013-10-15 - v0.2.0 - -Feature complete release - -- Added Eventlistener template and function -- Added FGCI-Program template and function -- More consistent log naming and fixed missing new lines - - -2013-10-15 - v0.1.1 - -Fixes: - -- Missing '=' in template tags when using certain parameters -- Added log file default to program define to avoid /tmp being used when not specified -- Fixed logic when not using environment variables in program - - -2013-10-15 - v0.1.0 - -Summary: - -Completed basic module functionality for - -- Install with pip -- Configure programs -- Configure groups -- Install init scripts for RedHat and Debian families diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile deleted file mode 100644 index ba9a19d533a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile +++ /dev/null @@ -1,26 +0,0 @@ -source 'https://rubygems.org' - -group :test do - gem 'rake' - gem 'puppet-lint' - gem 'puppet-syntax' - gem 'puppetlabs_spec_helper' - gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git' , :ref => 'c44381a240ec420d4ffda7bffc55ee4d9c08d682' - gem 'rspec', '2.14.1' -end - -group :development do - gem 'travis' - gem 'travis-lint' - gem 'beaker' - gem 'beaker-rspec' - gem 'pry' - gem 'guard-rake' -end - - -if puppetversion = ENV['PUPPET_VERSION'] - gem 'puppet', puppetversion -else - gem 'puppet', '~> 3.4.0' -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile deleted file mode 100644 index 80d47f22679..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile +++ /dev/null @@ -1,11 +0,0 @@ -name 'ajcrowe-supervisord' -version '0.4.1' -source 'git@github.com/ajcrowe/puppet-supervisord.git' -author 'Alex Crowe' -license 'Apache License, Version 2.0' -summary 'supervisord class and functions' -description 'supervisord class and functions' -project_page 'https://github.com/ajcrowe/puppet-supervisord' - -dependency 'puppetlabs/concat', '>= 1.0.0 <2.0.0' -dependency 'puppetlabs/stdlib', '>= 4.1.0' diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md deleted file mode 100644 index b454cd9307a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md +++ /dev/null @@ -1,127 +0,0 @@ -# Puppet Supervisord - -[![Build Status](https://travis-ci.org/ajcrowe/puppet-supervisord.png?branch=master)](https://travis-ci.org/ajcrowe/puppet-supervisord) - -Puppet module to manage the [supervisord](http://supervisord.org/) process control system. - -Functions available to configure - -* [programs](http://supervisord.org/configuration.html#program-x-section-settings) -* [groups](http://supervisord.org/configuration.html#group-x-section-settings) -* [fcgi-programs](http://supervisord.org/configuration.html#fcgi-program-x-section-settings) -* [eventlisteners](http://supervisord.org/configuration.html#eventlistener-x-section-settings) - -## Examples - -### Configuring supervisord with defaults - -Install supervisord with pip and install an init script if available - -```ruby -include supervisord -``` - -### Install supervisord and pip - -Install supervisord and install pip if not available. - -```ruby -class supervisord { - $install_pip => true, -} -``` - -This will download [setuptool](https://bitbucket.org/pypa/setuptools) and install pip with easy_install. - -You can pass a specific url with `$setuptools_url = 'url'` - -### Install without pip - -If you want to use your system package manager you can specify that with `supervisord::package_provider`. - -You'll also likely need to adjust the `supervisord::service_name` to match that installed by the system package. If you're using Debian or Redhat OS families you'll also want to disable the init scripts with `supervisord::install_init = false`. - -Note: Only Debian and RedHat families have an init script currently. - -### Configure a program - -```ruby -supervisord::program { 'myprogram': - command => 'command --args', - priority => '100', - environment => { - 'HOME' => '/home/myuser', - 'PATH' => '/bin:/sbin:/usr/bin:/usr/sbin', - 'SECRET' => 'mysecret' - } -} -``` - -You may also specify a variable for a hiera lookup to retreive your environment hash. This allows you to reuse existing environment variable hashes. - -```ruby -supervisord::program { 'myprogram': - command => 'command --args', - priority => '100', - env_var => 'my_common_envs' -} -``` - -Or you can fully define your programs in hiera: - -```yaml -supervisord::programs: - 'myprogram': - command: 'command --args' - autostart: yes - autorestart: 'true' - environment: - HOME: '/home/myuser' - PATH: '/bin:/sbin:/usr/bin:/usr/sbin' - SECRET: 'mysecret' -``` - -### Configure a group - -```ruby -supervisord::group { 'mygroup': - priority => 100, - programs => ['program1', 'program2', 'program3'] -} -``` - -### Configure an eventlistener - -```ruby -supervisord::eventlistener { 'mylistener': - command => 'command --args', - events => ['PROCESS_STATE', 'PROCESS_STATE_START'] - priority => '100', - env_var => 'my_common_envs' -} -``` - -### Run supervisorctl Commands - -Should you need to run a sequence of command with `supervisorctl` you can use the define type `supervisord::supervisorctl` - -```ruby -supervisord::supervisorctl { 'restart_myapp': - command => 'restart', - process => 'myapp' -} -``` - -You can also issue a command without specifying a process. - -### Development - -If you have suggestions or improvements please file an issue or pull request, i'll try and sort them as quickly as possble. - -If you submit a pull please try and include tests for the new functionality/fix. The module is tested with [Travis-CI](https://travis-ci.org/ajcrowe/puppet-supervisord). - - -### Credits - -* Debian init script sourced from the system package. -* RedHat/Centos init script sourced from https://github.com/Supervisor/initscripts diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile deleted file mode 100644 index cd592af48f4..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile +++ /dev/null @@ -1,28 +0,0 @@ -require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint/tasks/puppet-lint' -require 'puppet-syntax/tasks/puppet-syntax' - -PuppetLint.configuration.send('disable_80chars') -PuppetLint.configuration.send('disable_class_inherits_from_params_class') -PuppetLint.configuration.send('disable_quoted_booleans') -PuppetLint.configuration.send('disable_autoloader_layout') - -exclude_paths = [ - "pkg/**/*", - "vendor/**/*", - "spec/**/*", -] -PuppetLint.configuration.ignore_paths = exclude_paths -PuppetSyntax.exclude_paths = exclude_paths - -desc "Acceptance Tests" -RSpec::Core::RakeTask.new(:acceptance) do |t| - t.pattern = 'spec/acceptance' -end - -desc "Test Suite" -task :test => [ - :lint, - :syntax, - :spec -] \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb deleted file mode 100644 index 6d34d5d5474..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb +++ /dev/null @@ -1,36 +0,0 @@ -# -# Converts the array to a csv string -# -# $array = [ 'string1', 'string2', 'string3' ] -# -# becomes: -# -# $string = "string1,string2,string3" -# -module Puppet::Parser::Functions - newfunction(:array2csv, :type => :rvalue, :doc => <<-'EOS' - Returns a sorted csv formatted string from an array in the form - VALUE1,VALUE2,VALUE3 - EOS - ) do |args| - - raise(Puppet::ParseError, "array2csv(): Wrong number of arguments " + - "given (#{args.size} of 1)") if args.size < 1 - - array = args[0] - - unless array.is_a?(Array) - raise(Puppet::ParseError, 'array2csv(): Requires an Array') - end - - sorted_array = array.sort - result = '' - - sorted_array.each {|value| - result += "#{value}," - } - - return result.chop! - - end -end \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb deleted file mode 100644 index 5371328f2ff..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb +++ /dev/null @@ -1,40 +0,0 @@ -# -# Converts the hash to a csv string -# -# $hash = { -# HOME => '/home/user', -# ENV1 => 'env1', -# SECRET => 'secret' -# } -# -# becomes: -# -# $string = "HOME='/home/user',ENV1='env1',SECRET='secret'" -# -module Puppet::Parser::Functions - newfunction(:hash2csv, :type => :rvalue, :doc => <<-'EOS' - Returns a csv formatted string from an hash in the form - KEY=VALUE,KEY2=VALUE2,KEY3=VALUE3 ordered by key - EOS - ) do |args| - - raise(Puppet::ParseError, "hash2csv(): Wrong number of arguments " + - "given (#{args.size} of 1)") if args.size < 1 - - hash = args[0] - - unless hash.is_a?(Hash) - raise(Puppet::ParseError, 'hash2csv(): Requires an Hash') - end - - sorted_hash = hash.sort - result = '' - - sorted_hash.each {|key, value| - result += "#{key}='#{value}'," - } - - return result.chop! - - end -end \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp deleted file mode 100644 index 93713729e8b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp +++ /dev/null @@ -1,72 +0,0 @@ -# Class: supervisord::config -# -# Configuration class for supervisor init and conf directories -# -class supervisord::config inherits supervisord { - - file { $supervisord::config_include: - ensure => directory, - owner => 'root', - mode => '0755' - } - - file { $supervisord::log_path: - ensure => directory, - owner => 'root', - mode => '0755' - } - - if $supervisord::run_path != '/var/run' { - file { $supervisord::run_path: - ensure => directory, - owner => 'root', - mode => '0755' - } - } - - if $supervisord::install_init { - file { '/etc/init.d/supervisord': - ensure => present, - owner => 'root', - mode => '0755', - content => template("supervisord/init/${::osfamily}/init.erb") - } - - if $supervisord::init_defaults { - file { $supervisord::init_defaults: - ensure => present, - owner => 'root', - mode => '0755', - content => template("supervisord/init/${::osfamily}/defaults.erb") - } - } - } - - concat { $supervisord::config_file: - owner => 'root', - group => '0', - mode => '0755' - } - - if $supervisord::unix_socket { - concat::fragment { 'supervisord_unix': - target => $supervisord::config_file, - content => template('supervisord/supervisord_unix.erb'), - order => 01 - } - } - - if $supervisord::inet_server { - concat::fragment { 'supervisord_inet': - target => $supervisord::config_file, - content => template('supervisord/supervisord_inet.erb'), - order => 01 - } - } - - concat::fragment { 'supervisord_main': - target => $supervisord::config_file, - content => template('supervisord/supervisord_main.erb'), - order => 02 - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp deleted file mode 100644 index fd52d6e4da4..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp +++ /dev/null @@ -1,118 +0,0 @@ -# Define: supervisord::eventlistener -# -# This define creates an eventlistener configuration file -# -# Documentation on parameters available at: -# http://supervisord.org/configuration.html#eventlistener-x-section-settings -# -define supervisord::eventlistener( - $command, - $ensure = present, - $ensure_process = 'running', - $buffer_size = 10, - $events = undef, - $result_handler = undef, - $env_var = undef, - $process_name = undef, - $numprocs = undef, - $numprocs_start = undef, - $priority = undef, - $autostart = undef, - $autorestart = undef, - $startsecs = undef, - $startretries = undef, - $exitcodes = undef, - $stopsignal = undef, - $stopwaitsecs = undef, - $stopasgroup = undef, - $killasgroup = undef, - $user = undef, - $redirect_stderr = undef, - $stdout_logfile = "eventlistener_${name}.log", - $stdout_logfile_maxbytes = undef, - $stdout_logfile_backups = undef, - $stdout_events_enabled = undef, - $stderr_logfile = "eventlistener_${name}.error", - $stderr_logfile_maxbytes = undef, - $stderr_logfile_backups = undef, - $stderr_events_enabled = undef, - $environment = undef, - $directory = undef, - $umask = undef, - $serverurl = undef -) { - - include supervisord - - # parameter validation - validate_string($command) - validate_re($ensure_process, ['running', 'stopped', 'removed']) - validate_re($buffer_size, '^\d+') - if $events { validate_array($events) } - if $result_handler { validate_string($result_handler) } - if $numprocs { validate_re($numprocs, '^\d+')} - if $numprocs_start { validate_re($numprocs_start, '^\d+')} - if $priority { validate_re($priority, '^\d+') } - if $autostart { validate_bool($autostart) } - if $autorestart { validate_re($autorestart, ['true', 'false', 'unexpected']) } - if $startsecs { validate_re($startsecs, '^\d+')} - if $startretries { validate_re($startretries, '^\d+')} - if $exitcodes { validate_string($exitcodes)} - if $stopsignal { validate_re($stopsignal, ['TERM', 'HUP', 'INT', 'QUIT', 'KILL', 'USR1', 'USR2']) } - if $stopwaitsecs { validate_re($stopwaitsecs, '^\d+')} - if $stopasgroup { validate_bool($stopasgroup) } - if $killasgroup { validate_bool($killasgroup) } - if $user { validate_string($user) } - if $redirect_stderr { validate_bool($redirect_stderr) } - validate_string($stdout_logfile) - if $stdout_logfile_maxbytes { validate_string($stdout_logfile_maxbytes) } - if $stdout_logfile_backups { validate_re($stdout_logfile_backups, '^\d+')} - if $stdout_events_enabled { validate_bool($stdout_events_enabled) } - validate_string($stderr_logfile) - if $stderr_logfile_maxbytes { validate_string($stderr_logfile_maxbytes) } - if $stderr_logfile_backups { validate_re($stderr_logfile_backups, '^\d+')} - if $stderr_events_enabled { validate_bool($stderr_events_enabled) } - if $directory { validate_absolute_path($directory) } - if $umask { validate_re($umask, '^[0-7][0-7][0-7]$') } - - # convert environment data into a csv - if $env_var { - $env_hash = hiera_hash($env_var) - validate_hash($env_hash) - $env_string = hash2csv($env_hash) - } - elsif $environment { - validate_hash($environment) - $env_string = hash2csv($environment) - } - - if $events { - $events_string = array2csv($events) - } - - $conf = "${supervisord::config_include}/eventlistener_${name}.conf" - - file { $conf: - ensure => $ensure, - owner => 'root', - mode => '0755', - content => template('supervisord/conf/eventlistener.erb'), - notify => Class['supervisord::reload'] - } - - case $ensure_process { - 'stopped': { - supervisord::supervisorctl { "stop_${name}": - command => 'stop', - process => $name - } - } - 'removed': { - supervisord::supervisorctl { "remove_${name}": - command => 'remove', - process => $name - } - } - default: { } - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp deleted file mode 100644 index 633b024917e..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp +++ /dev/null @@ -1,117 +0,0 @@ -# Define: supervisord::fcgi_program -# -# This define creates an eventlistener configuration file -# -# Documentation on parameters available at: -# http://supervisord.org/configuration.html#fcgi-program-x-section-settings -# -define supervisord::fcgi_program( - $command, - $socket, - $ensure = present, - $ensure_process = 'running', - $socket_owner = undef, - $socket_mode = undef, - $env_var = undef, - $process_name = undef, - $numprocs = undef, - $numprocs_start = undef, - $priority = undef, - $autostart = undef, - $autorestart = undef, - $startsecs = undef, - $startretries = undef, - $exitcodes = undef, - $stopsignal = undef, - $stopwaitsecs = undef, - $stopasgroup = undef, - $killasgroup = undef, - $user = undef, - $redirect_stderr = undef, - $stdout_logfile = "fcgi-program_${name}.log", - $stdout_logfile_maxbytes = undef, - $stdout_logfile_backups = undef, - $stdout_capture_maxbytes = undef, - $stdout_events_enabled = undef, - $stderr_logfile = "fcgi-program_${name}.error", - $stderr_logfile_maxbytes = undef, - $stderr_logfile_backups = undef, - $stderr_capture_maxbytes = undef, - $stderr_events_enabled = undef, - $environment = undef, - $directory = undef, - $umask = undef, - $serverurl = undef -) { - - include supervisord - - # parameter validation - validate_string($command) - validate_re($ensure_process, ['running', 'stopped', 'removed']) - validate_re($socket, ['^tcp:\/\/.*:\d+$', '^unix:\/\/\/']) - if $process_name { validate_string($process_name) } - if $numprocs { validate_re($numprocs, '^\d+')} - if $numprocs_start { validate_re($numprocs_start, '^\d+')} - if $priority { validate_re($priority, '^\d+') } - if $autostart { validate_bool($autostart) } - if $autorestart { validate_re($autorestart, ['true', 'false', 'unexpected']) } - if $startsecs { validate_re($startsecs, '^\d+')} - if $startretries { validate_re($startretries, '^\d+')} - if $exitcodes { validate_string($exitcodes)} - if $stopsignal { validate_re($stopsignal, ['TERM', 'HUP', 'INT', 'QUIT', 'KILL', 'USR1', 'USR2']) } - if $stopwaitsecs { validate_re($stopwaitsecs, '^\d+')} - if $stopasgroup { validate_bool($stopasgroup) } - if $killasgroup { validate_bool($killasgroup) } - if $user { validate_string($user) } - if $redirect_stderr { validate_bool($redirect_stderr) } - validate_string($stdout_logfile) - if $stdout_logfile_maxbytes { validate_string($stdout_logfile_maxbytes) } - if $stdout_logfile_backups { validate_re($stdout_logfile_backups, '^\d+')} - if $stdout_capture_maxbytes { validate_string($stdout_capture_maxbytes) } - if $stdout_events_enabled { validate_bool($stdout_events_enabled) } - validate_string($stderr_logfile) - if $stderr_logfile_maxbytes { validate_string($stderr_logfile_maxbytes) } - if $stderr_logfile_backups { validate_re($stderr_logfile_backups, '^\d+')} - if $stderr_capture_maxbytes { validate_string($stderr_capture_maxbytes) } - if $stderr_events_enabled { validate_bool($stderr_events_enabled) } - if $directory { validate_absolute_path($directory) } - if $umask { validate_re($umask, '^[0-7][0-7][0-7]$') } - - # convert environment data into a csv - if $env_var { - $env_hash = hiera_hash($env_var) - validate_hash($env_hash) - $env_string = hash2csv($env_hash) - } - elsif $environment { - validate_hash($environment) - $env_string = hash2csv($environment) - } - - $conf = "${supervisord::config_include}/fcgi-program_${name}.conf" - - file { $conf: - ensure => $ensure, - owner => 'root', - mode => '0755', - content => template('supervisord/conf/fcgi_program.erb'), - notify => Class['supervisord::reload'] - } - - case $ensure_process { - 'stopped': { - supervisord::supervisorctl { "stop_${name}": - command => 'stop', - process => $name - } - } - 'removed': { - supervisord::supervisorctl { "remove_${name}": - command => 'remove', - process => $name - } - } - default: { } - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp deleted file mode 100644 index 45cb29cf290..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp +++ /dev/null @@ -1,30 +0,0 @@ -# Define: supervisord::group -# -# This define creates an group configuration file -# -# Documentation on parameters available at: -# http://supervisord.org/configuration.html#group-x-section-settings -# -define supervisord::group ( - $programs, - $ensure = present, - $priority = undef -) { - - include supervisord - - # parameter validation - validate_array($programs) - if $priority { validate_re($priority, '^\d+', "invalid priority value of: ${priority}") } - - $progstring = array2csv($programs) - $conf = "${supervisord::config_include}/group_${name}.conf" - - file { $conf: - ensure => $ensure, - owner => 'root', - mode => '0755', - content => template('supervisord/conf/group.erb'), - notify => Class['supervisord::reload'] - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp deleted file mode 100644 index fa396da578d..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp +++ /dev/null @@ -1,130 +0,0 @@ -# Class: supervisord -# -# This class installs supervisord via pip -# -class supervisord( - $package_ensure = $supervisord::params::package_ensure, - $package_name = $supervisord::params::package_name, - $package_provider = $supervisord::params::package_provider, - $service_ensure = $supervisord::params::service_ensure, - $service_name = $supervisord::params::service_name, - $install_init = $supervisord::params::install_init, - $install_pip = false, - $init_defaults = $supervisord::params::init_defaults, - $setuptools_url = $supervisord::params::setuptools_url, - $executable_path = $supervisord::params::executable_path, - $executable = $supervisord::params::executable, - $executable_ctl = $supervisord::params::executable_ctl, - - $log_path = $supervisord::params::log_path, - $log_file = $supervisord::params::log_file, - $log_level = $supervisord::params::log_level, - $logfile_maxbytes = $supervisord::params::logfile_maxbytes, - $logfile_backups = $supervisord::params::logfile_backups, - - $run_path = $supervisord::params::run_path, - $pid_file = $supervisord::params::pid_file, - $nodaemon = $supervisord::params::nodaemon, - $minfds = $supervisord::params::minfds, - $minprocs = $supervisord::params::minprocs, - $config_include = $supervisord::params::config_include, - $config_file = $supervisord::params::config_file, - $config_dirs = undef, - $umask = $supervisord::params::umask, - - $unix_socket = $supervisord::params::unix_socket, - $unix_socket_file = $supervisord::params::unix_socket_file, - $unix_socket_mode = $supervisord::params::unix_socket_mode, - $unix_socket_owner = $supervisord::params::unix_socket_owner, - $unix_socket_group = $supervisord::params::unix_socket_group, - - $inet_server = $supervisord::params::inet_server, - $inet_server_hostname = $supervisord::params::inet_server_hostname, - $inet_server_port = $supervisord::params::inet_server_port, - - $unix_auth = false, - $unix_username = undef, - $unix_password = undef, - - $inet_auth = false, - $inet_username = undef, - $inet_password = undef, - - $user = undef, - $identifier = undef, - $childlogdir = undef, - $environment = undef, - $env_var = undef, - $directory = undef, - $strip_ansi = false, - $nocleanup = false, - - $eventlisteners = {}, - $fcgi_programs = {}, - $groups = {}, - $programs = {} - -) inherits supervisord::params { - - validate_bool($install_pip) - validate_bool($install_init) - validate_bool($nodaemon) - validate_bool($unix_auth) - validate_bool($inet_auth) - validate_bool($strip_ansi) - validate_bool($nocleanup) - - validate_hash($eventlisteners) - validate_hash($fcgi_programs) - validate_hash($groups) - validate_hash($programs) - - validate_absolute_path($config_include) - validate_absolute_path($log_path) - validate_absolute_path($run_path) - if $childlogdir { validate_absolute_path($childlogdir) } - if $directory { validate_absolute_path($directory) } - - $log_levels = ['^critical$', '^error$', '^warn$', '^info$', '^debug$', '^trace$', '^blather$'] - validate_re($log_level, $log_levels, "invalid log_level: ${log_level}") - validate_re($umask, '^0[0-7][0-7]$', "invalid umask: ${umask}.") - validate_re($unix_socket_mode, '^[0-7][0-7][0-7][0-7]$', "invalid unix_socket_mode: ${unix_socket_mode}") - - if ! is_integer($logfile_backups) { fail("invalid logfile_backups: ${logfile_backups}.")} - if ! is_integer($minfds) { fail("invalid minfds: ${minfds}.")} - if ! is_integer($minprocs) { fail("invalid minprocs: ${minprocs}.")} - if ! is_integer($inet_server_port) { fail("invalid inet_server_port: ${inet_server_port}.")} - - if $env_var { - validate_hash($env_var) - $env_hash = hiera($env_var) - $env_string = hash2csv($env_hash) - } - elsif $environment { - validate_hash($environment) - $env_string = hash2csv($environment) - } - - if $config_dirs { - validate_array($config_dirs) - $config_include_string = join($config_dirs, " ") - } - else { - $config_include_string = "${config_include}/*.conf" - } - - create_resources('supervisord::eventlistener', $eventlisteners) - create_resources('supervisord::fcgi_program', $fcgi_programs) - create_resources('supervisord::group', $groups) - create_resources('supervisord::program', $programs) - - if $install_pip { - include supervisord::pip - Class['supervisord::pip'] -> Class['supervisord::install'] - } - - include supervisord::install, supervisord::config, supervisord::service, supervisord::reload - - Class['supervisord::install'] -> Class['supervisord::config'] ~> Class['supervisord::service'] - Class['supervisord::reload'] -> Supervisord::Supervisorctl <| |> -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp deleted file mode 100644 index 387c77f5cba..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Class supervisord::install -# -# Installs supervisor package (defaults to using pip) -# -class supervisord::install inherits supervisord { - package { $supervisord::package_name: - ensure => $supervisord::package_ensure, - provider => $supervisord::package_provider - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp deleted file mode 100644 index 47a21852e01..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp +++ /dev/null @@ -1,60 +0,0 @@ -# Class: supervisord::params -# -# Default parameters for supervisord -# -class supervisord::params { - case $::osfamily { - 'RedHat': { - $init_defaults = '/etc/sysconfig/supervisord' - $unix_socket_group = 'nobody' - $install_init = true - $executable_path = '/usr/bin' - } - 'Debian': { - $init_defaults = '/etc/default/supervisor' - $unix_socket_group = 'nogroup' - $install_init = true - $executable_path = '/usr/local/bin' - } - default: { - $init_defaults = false - $unix_socket_group = 'nogroup' - $install_init = false - $executable_path = '/usr/local/bin' - } - } - - # default supervisord params - $package_ensure = 'installed' - $package_provider = 'pip' - $service_ensure = 'running' - $service_name = 'supervisord' - $package_name = 'supervisor' - $executable = "${$executable_path}/supervisord" - $executable_ctl = "${executable_path}/supervisorctl" - - $run_path = '/var/run' - $pid_file = 'supervisord.pid' - $log_path = '/var/log/supervisor' - $log_file = 'supervisord.log' - $logfile_maxbytes = '50MB' - $logfile_backups = '10' - $log_level = 'info' - $nodaemon = false - $minfds = '1024' - $minprocs = '200' - $umask = '022' - $config_include = '/etc/supervisor.d' - $config_file = '/etc/supervisord.conf' - $setuptools_url = 'https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py' - - $unix_socket = true - $unix_socket_file = 'supervisor.sock' - $unix_socket_mode = '0700' - $unix_socket_owner = 'nobody' - - $inet_server = false - $inet_server_hostname = '127.0.0.1' - $inet_server_port = '9001' - $inet_auth = false -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp deleted file mode 100644 index dcf57223498..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp +++ /dev/null @@ -1,30 +0,0 @@ -# Class: supervisord::pip -# -# Optional class to install setuptool and pip -# -class supervisord::pip inherits supervisord { - - Exec { - path => '/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin' - } - - exec { 'install_setuptools': - command => "curl ${supervisord::setuptools_url} | python", - cwd => '/tmp', - unless => 'which easy_install', - before => Exec['install_pip'] - } - - exec { 'install_pip': - command => 'easy_install pip', - unless => 'which pip' - } - - if $::osfamily == 'RedHat' { - exec { 'pip_provider_name_fix': - command => 'alternatives --install /usr/bin/pip-python pip-python /usr/bin/pip 1', - subscribe => Exec['install_pip'], - unless => 'which pip-python' - } - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp deleted file mode 100644 index 617a68ab208..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp +++ /dev/null @@ -1,113 +0,0 @@ -# Define: supervisord::program -# -# This define creates an program configuration file -# -# Documentation on parameters available at: -# http://supervisord.org/configuration.html#program-x-section-settings -# -define supervisord::program( - $command, - $ensure = present, - $ensure_process = 'running', - $env_var = undef, - $process_name = undef, - $numprocs = undef, - $numprocs_start = undef, - $priority = undef, - $autostart = undef, - $autorestart = undef, - $startsecs = undef, - $startretries = undef, - $exitcodes = undef, - $stopsignal = undef, - $stopwaitsecs = undef, - $stopasgroup = undef, - $killasgroup = undef, - $user = undef, - $redirect_stderr = undef, - $stdout_logfile = "program_${name}.log", - $stdout_logfile_maxbytes = undef, - $stdout_logfile_backups = undef, - $stdout_capture_maxbytes = undef, - $stdout_events_enabled = undef, - $stderr_logfile = "program_${name}.error", - $stderr_logfile_maxbytes = undef, - $stderr_logfile_backups = undef, - $stderr_capture_maxbytes = undef, - $stderr_events_enabled = undef, - $environment = undef, - $directory = undef, - $umask = undef, - $serverurl = undef -) { - - include supervisord - - # parameter validation - validate_string($command) - validate_re($ensure_process, ['running', 'stopped', 'removed']) - if $process_name { validate_string($process_name) } - if $numprocs { validate_re($numprocs, '^\d+')} - if $numprocs_start { validate_re($numprocs_start, '^\d+')} - if $priority { validate_re($priority, '^\d+') } - if $autostart { validate_bool($autostart) } - if $autorestart { validate_re($autorestart, ['true', 'false', 'unexpected']) } - if $startsecs { validate_re($startsecs, '^\d+')} - if $startretries { validate_re($startretries, '^\d+')} - if $exitcodes { validate_string($exitcodes)} - if $stopsignal { validate_re($stopsignal, ['TERM', 'HUP', 'INT', 'QUIT', 'KILL', 'USR1', 'USR2']) } - if $stopwaitsecs { validate_re($stopwaitsecs, '^\d+')} - if $stopasgroup { validate_bool($stopasgroup) } - if $killasgroup { validate_bool($killasgroup) } - if $user { validate_string($user) } - if $redirect_stderr { validate_bool($redirect_stderr) } - validate_string($stdout_logfile) - if $stdout_logfile_maxbytes { validate_string($stdout_logfile_maxbytes) } - if $stdout_logfile_backups { validate_re($stdout_logfile_backups, '^\d+')} - if $stdout_capture_maxbytes { validate_string($stdout_capture_maxbytes) } - if $stdout_events_enabled { validate_bool($stdout_events_enabled) } - validate_string($stderr_logfile) - if $stderr_logfile_maxbytes { validate_string($stderr_logfile_maxbytes) } - if $stderr_logfile_backups { validate_re($stderr_logfile_backups, '^\d+')} - if $stderr_capture_maxbytes { validate_string($stderr_capture_maxbytes) } - if $stderr_events_enabled { validate_bool($stderr_events_enabled) } - if $directory { validate_absolute_path($directory) } - if $umask { validate_re($umask, '^[0-7][0-7][0-7]$') } - - # convert environment data into a csv - if $env_var { - $env_hash = hiera_hash($env_var) - validate_hash($env_hash) - $env_string = hash2csv($env_hash) - } - elsif $environment { - validate_hash($environment) - $env_string = hash2csv($environment) - } - - $conf = "${supervisord::config_include}/program_${name}.conf" - - file { $conf: - ensure => $ensure, - owner => 'root', - mode => '0755', - content => template('supervisord/conf/program.erb'), - notify => Class['supervisord::reload'] - } - - case $ensure_process { - 'stopped': { - supervisord::supervisorctl { "stop_${name}": - command => 'stop', - process => $name - } - } - 'removed': { - supervisord::supervisorctl { "remove_${name}": - command => 'remove', - process => $name - } - } - default: { } - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/reload.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/reload.pp deleted file mode 100644 index 79eca3d7e0f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/reload.pp +++ /dev/null @@ -1,19 +0,0 @@ -# Class: supervisord::reload -# -# Class to reread and update supervisord with supervisorctl -# -class supervisord::reload inherits supervisord { - - $supervisorctl = $::supervisord::executable_ctl - - exec { 'supervisorctl_reread': - command => "${supervisorctl} reread", - refreshonly => true, - require => Service[$supervisord::service_name], - } - exec { 'supervisorctl_update': - command => "${supervisorctl} update", - refreshonly => true, - require => Service[$supervisord::service_name], - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp deleted file mode 100644 index f02a0d0a081..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp +++ /dev/null @@ -1,12 +0,0 @@ -# Class: supervisord::service -# -# Class for the supervisord service -# -class supervisord::service inherits supervisord { - service { $supervisord::service_name: - ensure => $supervisord::service_ensure, - enable => true, - hasrestart => true, - hasstatus => true - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp deleted file mode 100644 index 473d301185b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp +++ /dev/null @@ -1,27 +0,0 @@ -# Define: supervisord:supervisorctl -# -# This define executes command with the supervisorctl tool -# -define supervisord::supervisorctl( - $command, - $process = undef, - $refreshonly = false -) { - - validate_string($command) - validate_string($process) - - $supervisorctl = $::supervisord::executable_ctl - - if $process { - $cmd = join([$supervisorctl, $command, $process], ' ') - } - else { - $cmd = join([$supervisorctl, $command]) - } - - exec { "supervisorctl_command_${name}": - command => $cmd, - refreshonly => $refreshonly - } -} \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml deleted file mode 100644 index f8d4013a31b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-65-i386: - roles: - - master - platform: el-6-i386 - box : centos-65-i386-virtualbox-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-i386-virtualbox-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml deleted file mode 100644 index 7535c104afb..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-65-x64: - roles: - - master - platform: el-6-x86_64 - box : centos-65-x64-virtualbox-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml deleted file mode 100644 index d1233aa83d1..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - debian-73-i386: - roles: - - master - platform: debian-7-i386 - box : debian-73-i386-virtualbox-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-i386-virtualbox-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml deleted file mode 100644 index 5b87870a909..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - debian-73-x64: - roles: - - master - platform: debian-7-amd64 - box : debian-73-x64-virtualbox-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 5b87870a909..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - debian-73-x64: - roles: - - master - platform: debian-7-amd64 - box : debian-73-x64-virtualbox-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb deleted file mode 100644 index 47d052a4eec..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb +++ /dev/null @@ -1,114 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'supervisord install' do - - context 'default parameters with pip and init install' do - it 'should work with no errors' do - pp = <<-EOS - class { 'supervisord': install_pip => true, install_init => true} - EOS - - expect(apply_manifest(pp).exit_code).to_not eq(1) - expect(apply_manifest(pp).exit_code).to eq(0) - end - - describe service('supervisord') do - it { should be_enabled } - it { should be_running } - it 'should restart successfully' do - cmd="service supervisord restart" - expect(shell(cmd).exit_code).to_not eq(1) - end - end - end -end - -describe 'supervisord::program' do - context 'create a program config' do - it 'should install a program file' do - - pp = <<-EOS - include supervisord - supervisord::program { 'test': - command => 'echo', - priority => '100', - environment => { - 'HOME' => '/root', - 'PATH' => '/bin', - } - } - EOS - - expect(apply_manifest(pp).exit_code).to_not eq(1) - expect(apply_manifest(pp).exit_code).to eq(0) - end - - it 'should contain the correct values' do - cmd='grep command=echo /etc/supervisor.d/program_test.conf' - expect(shell(cmd).exit_code).to eq(0) - cmd='grep priority=100 /etc/supervisor.d/program_test.conf' - expect(shell(cmd).exit_code).to eq(0) - cmd='grep "environment=" /etc/supervisor.d/program_test.conf' - expect(shell(cmd).exit_code).to eq(0) - end - end -end - -describe 'supervisord::fcgi-program' do - context 'create fcgi-program config' do - it 'should install a fcgi-program file' do - - pp = <<-EOS - include supervisord - supervisord::fcgi_program { 'test': - socket => 'tcp://localhost:1000', - command => 'echo', - priority => '100', - environment => { - 'HOME' => '/root', - 'PATH' => '/bin', - } - } - EOS - - expect(apply_manifest(pp).exit_code).to_not eq(1) - expect(apply_manifest(pp).exit_code).to eq(0) - end - - it 'should contain the correct values' do - cmd='grep socket=tcp://localhost:1000 /etc/supervisor.d/fcgi-program_test.conf' - expect(shell(cmd).exit_code).to eq(0) - cmd="grep command=echo /etc/supervisor.d/fcgi-program_test.conf" - expect(shell(cmd).exit_code).to eq(0) - cmd="grep priority=100 /etc/supervisor.d/fcgi-program_test.conf" - expect(shell(cmd).exit_code).to eq(0) - cmd='grep "environment=" /etc/supervisor.d/fcgi-program_test.conf' - expect(shell(cmd).exit_code).to eq(0) - end - end -end - -describe 'supervisord::group' do - context 'create group config' do - it 'should install a group config' do - - pp = <<-EOS - include supervisord - supervisord::group { 'test': - programs => ['test'], - priority => '100', - } - EOS - - expect(apply_manifest(pp).exit_code).to_not eq(1) - expect(apply_manifest(pp).exit_code).to eq(0) - end - - it 'should contain the correct values' do - cmd='grep "programs=test" /etc/supervisor.d/group_test.conf' - expect(shell(cmd).exit_code).to eq(0) - cmd="grep priority=100 /etc/supervisor.d/group_test.conf" - expect(shell(cmd).exit_code).to eq(0) - end - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb deleted file mode 100644 index b845920f6fe..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb +++ /dev/null @@ -1,299 +0,0 @@ -require 'spec_helper' - -describe 'supervisord' do - - concatdir = '/var/lib/puppet/concat' - let(:facts) {{ :concat_basedir => concatdir }} - - it { should contain_class('supervisord') } - it { should contain_class('supervisord::install') } - it { should contain_class('supervisord::config') } - it { should contain_class('supervisord::service') } - it { should contain_class('supervisord::params') } - it { should contain_class('supervisord::reload') } - it { should contain_package('supervisor') } - - describe '#service_name' do - context 'default' do - it { should contain_service('supervisord') } - end - - context 'specified' do - let(:params) {{ :service_name => 'myservicename' }} - it { should contain_service('myservicename') } - end - end - - describe '#install_pip' do - context 'default' do - it { should_not contain_class('supervisord::pip') } - end - - context 'true' do - let(:params) {{ :install_pip => true }} - it { should contain_class('supervisord::pip') } - it { should contain_exec('install_setuptools') } - it { should contain_exec('install_pip') } - end - - context 'true and RedHat' do - let(:params) {{ :install_pip => true }} - let(:facts) {{ :osfamily => 'RedHat', :concat_basedir => concatdir }} - it { should contain_exec('pip_provider_name_fix') } - end - end - - describe '#env_var' do - context 'default' do - it { should contain_class('supervisord').without_env_hash } - it { should contain_class('supervisord').without_env_string } - end - end - - describe '#environment' do - context 'default' do - it { should contain_class('supervisord').without_env_string } - end - context 'is specified' do - let(:params) {{ :environment => { 'key1' => 'value1', 'key2' => 'value2' } }} - it { should contain_concat__fragment('supervisord_main')\ - .with_content(/environment=key1='value1',key2='value2'/) } - end - end - - describe '#install_init' do - context 'default' do - it { should_not contain_file('/etc/init.d/supervisord') } - end - - context 'false' do - it { should_not contain_file('/etc/init.d/supervisord') } - end - - describe 'on supported OS' do - context 'with Debian' do - let(:facts) {{ :osfamily => 'Debian', :concat_basedir => concatdir }} - it { should contain_file('/etc/init.d/supervisord') } - it { should contain_file('/etc/default/supervisor') } - end - - context 'with RedHat' do - let(:facts) {{ :osfamily => 'RedHat', :concat_basedir => concatdir }} - it { should contain_file('/etc/init.d/supervisord') } - it { should contain_file('/etc/sysconfig/supervisord') } - end - end - end - - describe '#unix_socket' do - context 'default' do - it { should contain_concat__fragment('supervisord_unix')} - end - context 'false' do - let(:params) {{ :unix_socket => false }} - it { should_not contain_concat__fragment('supervisord_unix')} - end - end - - describe '#inet_server' do - context 'default' do - it { should_not contain_concat__fragment('supervisord_inet')} - end - context 'true' do - let(:params) {{ :inet_server => true }} - it { should contain_concat__fragment('supervisord_inet')} - end - end - - describe '#run_path' do - context 'default' do - it { should_not contain_file('/var/run') } - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/pidfile=\/var\/run\/supervisord.pid$/) } - end - context 'is specified' do - let(:params) {{ :run_path => '/opt/supervisord/run' }} - it { should contain_file('/opt/supervisord/run') } - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/pidfile=\/opt\/supervisord\/run\/supervisord.pid$/) } - end - end - - describe '#log_path' do - context 'default' do - it { should contain_file('/var/log/supervisor') } - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/logfile=\/var\/log\/supervisor\/supervisord.log$/) } - end - context 'is specified' do - let(:params) {{ :log_path => '/opt/supervisord/logs' }} - it { should contain_file('/opt/supervisord/logs')} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/logfile=\/opt\/supervisord\/logs\/supervisord.log$/) } - end - end - - describe '#config_include' do - context 'default' do - it { should contain_file('/etc/supervisor.d') } - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/files=\/etc\/supervisor.d\/\*.conf$/) } - end - context 'is specified' do - let(:params) {{ :config_include => '/opt/supervisord/conf.d' }} - it { should contain_file('/opt/supervisord/conf.d') } - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/files=\/opt\/supervisord\/conf.d\/\*.conf$/) } - end - end - - describe '#config_dirs' do - context 'is specified' do - let(:params) {{ :config_dirs => ['/etc/supervisor.d/*.conf', '/opt/supervisor.d/*', '/usr/share/supervisor.d/*.config'] }} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/files=\/etc\/supervisor.d\/\*.conf \/opt\/supervisor.d\/\* \/usr\/share\/supervisor.d\/\*.config$/) } - end - end - - describe '#config_file' do - context 'default' do - it { should contain_file('/etc/supervisord.conf') } - end - context 'is specified' do - let(:params) {{ :config_file => '/opt/supervisord/supervisor.conf' }} - it { should contain_file('/opt/supervisord/supervisor.conf') } - end - end - - describe '#nodaemon' do - context 'default' do - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/nodaemon=false$/) } - end - context 'true' do - let(:params) {{ :nodaemon => true }} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/nodaemon=true$/) } - end - context 'invalid' do - let(:params) {{ :nodaemon => 'invalid' }} - it { expect { raise_error(Puppet::Error, /is not a boolean/) }} - end - end - - describe '#minfds' do - context 'default' do - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/minfds=1024$/) } - end - context 'specified' do - let(:params) {{ :minfds => 2048 }} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/minfds=2048$/) } - end - context 'invalid' do - let(:params) {{ :minfds => 'string' }} - it { expect { raise_error(Puppet::Error, /invalid minfds/) }} - end - end - - describe '#minprocs' do - context 'default' do - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/minprocs=200$/) } - end - context 'specified' do - let(:params) {{ :minprocs => 300 }} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/minprocs=300$/) } - end - context 'invalid' do - let(:params) {{ :minfds => 'string' }} - it { expect { raise_error(Puppet::Error, /invalid minprocs/) }} - end - end - - describe '#strip_ansi' do - context 'default' do - it { should_not contain_concat__fragment('supervisord_main') \ - .with_content(/strip_ansi$/) } - end - context 'true' do - let(:params) {{ :strip_ansi => true }} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/strip_ansi=true$/) } - end - context 'invalid' do - let(:params) {{ :strip_ansi => 'string' }} - it { expect { raise_error(Puppet::Error, /is not a boolean/) }} - end - end - - describe '#user' do - context 'default' do - it { should_not contain_concat__fragment('supervisord_main') \ - .with_content(/user$/) } - end - context 'specified' do - let(:params) {{ :user => 'myuser' }} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/user=myuser$/) } - end - end - - describe '#identifier' do - context 'default' do - it { should_not contain_concat__fragment('supervisord_main') \ - .with_content(/identifier$/) } - end - context 'specified' do - let(:params) {{ :identifier => 'myidentifier' }} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/identifier=myidentifier$/) } - end - end - - describe '#directory' do - context 'default' do - it { should_not contain_concat__fragment('supervisord_main') \ - .with_content(/directory$/) } - end - context 'specified' do - let(:params) {{ :directory => '/opt/supervisord' }} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/directory=\/opt\/supervisord$/) } - end - end - - describe '#nocleanup' do - context 'default' do - it { should_not contain_concat__fragment('supervisord_main') \ - .with_content(/nocleanup$/) } - end - context 'true' do - let(:params) {{ :nocleanup => true }} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/nocleanup=true$/) } - end - context 'invalid' do - let(:params) {{ :nocleanup => 'string' }} - it { expect { raise_error(Puppet::Error, /is not a boolean/) }} - end - end - - describe '#childlogdir' do - context 'default' do - it { should_not contain_concat__fragment('supervisord_main') \ - .with_content(/childlogdir$/) } - end - context 'specified' do - let(:params) {{ :childlogdir => '/opt/supervisord/logdir' }} - it { should contain_concat__fragment('supervisord_main') \ - .with_content(/childlogdir=\/opt\/supervisord\/logdir$/) } - end - context 'invalid' do - let(:params) {{ :childlogdir => 'not_a_path' }} - it { expect { raise_error(Puppet::Error, /is not an absolute path/) }} - end - end -end \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb deleted file mode 100644 index 1083b8a3230..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb +++ /dev/null @@ -1,86 +0,0 @@ -require 'spec_helper' - -describe 'supervisord::eventlistener', :type => :define do - let(:title) {'foo'} - let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }} - let(:default_params) do - { - :command => 'bar', - :process_name => '%(process_num)s', - :events => ['PROCESS_STATE', 'PROCESS_STATE_STARTING'], - :buffer_size => 10, - :numprocs => '1', - :numprocs_start => '0', - :priority => '999', - :autostart => true, - :autorestart => 'unexpected', - :startsecs => '1', - :startretries => '3', - :exitcodes => '0,2', - :stopsignal => 'TERM', - :stopwaitsecs => '10', - :stopasgroup => true, - :killasgroup => true, - :user => 'baz', - :redirect_stderr => true, - :stdout_logfile => 'eventlistener_foo.log', - :stdout_logfile_maxbytes => '50MB', - :stdout_logfile_backups => '10', - :stdout_events_enabled => true, - :stderr_logfile => 'eventlistener_foo.error', - :stderr_logfile_maxbytes => '50MB', - :stderr_logfile_backups => '10', - :stderr_events_enabled => true, - :environment => { 'env1' => 'value1', 'env2' => 'value2' }, - :directory => '/opt/supervisord/chroot', - :umask => '022', - :serverurl => 'AUTO' - } - end - - context 'default' do - let(:params) { default_params } - - it { should contain_supervisord__eventlistener('foo') } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/\[eventlistener:foo\]/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/command=bar/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/process_name=\%\(process_num\)s/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/events=PROCESS_STATE,PROCESS_STATE_STARTING/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/buffer_size=10/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/numprocs=1/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/numprocs_start=0/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/priority=999/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/autostart=true/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/startsecs=1/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/startretries=3/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/exitcodes=0,2/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stopsignal=TERM/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stopwaitsecs=10/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stopasgroup=true/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/killasgroup=true/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/user=baz/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/redirect_stderr=true/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stdout_logfile=\/var\/log\/supervisor\/eventlistener_foo.log/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stdout_logfile_maxbytes=50MB/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stdout_logfile_backups=10/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stdout_events_enabled=true/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stderr_logfile=\/var\/log\/supervisor\/eventlistener_foo.error/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stderr_logfile_maxbytes=50MB/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stderr_logfile_backups=10/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stderr_events_enabled=true/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/environment=env1='value1',env2='value2'/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/directory=\/opt\/supervisord\/chroot/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/umask=022/) } - it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/serverurl=AUTO/) } - end - - context 'ensure_process_stopped' do - let(:params) { default_params.merge({ :ensure_process => 'stopped' }) } - it { should contain_supervisord__supervisorctl('stop_foo') } - end - - context 'ensure_process_removed' do - let(:params) { default_params.merge({ :ensure_process => 'removed' }) } - it { should contain_supervisord__supervisorctl('remove_foo') } - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb deleted file mode 100644 index e01311be70d..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb +++ /dev/null @@ -1,88 +0,0 @@ -require 'spec_helper' - -describe 'supervisord::fcgi_program', :type => :define do - let(:title) {'foo'} - let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }} - let(:default_params) do - { - :command => 'bar', - :socket => 'tcp://localhost:1000', - :process_name => '%(process_num)s', - :numprocs => '1', - :numprocs_start => '0', - :priority => '999', - :autostart => true, - :autorestart => 'unexpected', - :startsecs => '1', - :startretries => '3', - :exitcodes => '0,2', - :stopsignal => 'TERM', - :stopwaitsecs => '10', - :stopasgroup => true, - :killasgroup => true, - :user => 'baz', - :redirect_stderr => true, - :stdout_logfile => 'fcgi-program_foo.log', - :stdout_logfile_maxbytes => '50MB', - :stdout_logfile_backups => '10', - :stdout_capture_maxbytes => '0', - :stdout_events_enabled => true, - :stderr_logfile => 'fcgi-program_foo.error', - :stderr_logfile_maxbytes => '50MB', - :stderr_logfile_backups => '10', - :stderr_capture_maxbytes => '0', - :stderr_events_enabled => true, - :environment => { 'env1' => 'value1', 'env2' => 'value2' }, - :directory => '/opt/supervisord/chroot', - :umask => '022', - :serverurl => 'AUTO' - } - end - - context 'default' do - let(:params) { default_params } - - it { should contain_supervisord__fcgi_program('foo') } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/\[fcgi-program:foo\]/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/socket=tcp:\/\/localhost:1000/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/command=bar/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/process_name=\%\(process_num\)s/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/numprocs=1/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/numprocs_start=0/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/priority=999/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/autostart=true/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/startsecs=1/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/startretries=3/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/exitcodes=0,2/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stopsignal=TERM/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stopwaitsecs=10/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stopasgroup=true/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/killasgroup=true/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/user=baz/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/redirect_stderr=true/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_logfile=\/var\/log\/supervisor\/fcgi-program_foo.log/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_logfile_maxbytes=50MB/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_logfile_backups=10/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_capture_maxbytes=0/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_events_enabled=true/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_logfile=\/var\/log\/supervisor\/fcgi-program_foo.error/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_logfile_maxbytes=50MB/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_logfile_backups=10/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_capture_maxbytes=0/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_events_enabled=true/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/environment=env1='value1',env2='value2'/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/directory=\/opt\/supervisord\/chroot/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/umask=022/) } - it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/serverurl=AUTO/) } - end - - context 'ensure_process_stopped' do - let(:params) { default_params.merge({ :ensure_process => 'stopped' }) } - it { should contain_supervisord__supervisorctl('stop_foo') } - end - - context 'ensure_process_removed' do - let(:params) { default_params.merge({ :ensure_process => 'removed' }) } - it { should contain_supervisord__supervisorctl('remove_foo') } - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb deleted file mode 100644 index ba8d70196ce..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'spec_helper' - -describe 'supervisord::group', :type => :define do - let(:title) {'foo'} - let(:params) {{ :programs => ['bar', 'baz'] }} - let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }} - - it { should contain_supervisord__group('foo').with_program } - it { should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/programs=bar,baz/) } - - describe '#priority' do - it 'should default to undef' do - should_not contain_file('/etc/supervisor.d/group_foo.conf').with_content(/priority/) - should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/programs=bar,baz/) - end - context '100' do - let(:params) {{ :priority => '100', :programs => ['bar', 'baz'] }} - it { should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/priority=100/) } - it { should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/programs=bar,baz/) } - end - end -end \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb deleted file mode 100644 index e32c24ab2d5..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb +++ /dev/null @@ -1,86 +0,0 @@ -require 'spec_helper' - -describe 'supervisord::program', :type => :define do - let(:title) {'foo'} - let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }} - let(:default_params) do - { - :command => 'bar', - :process_name => '%(process_num)s', - :numprocs => '1', - :numprocs_start => '0', - :priority => '999', - :autostart => true, - :autorestart => 'unexpected', - :startsecs => '1', - :startretries => '3', - :exitcodes => '0,2', - :stopsignal => 'TERM', - :stopwaitsecs => '10', - :stopasgroup => true, - :killasgroup => true, - :user => 'baz', - :redirect_stderr => true, - :stdout_logfile => 'program_foo.log', - :stdout_logfile_maxbytes => '50MB', - :stdout_logfile_backups => '10', - :stdout_capture_maxbytes => '0', - :stdout_events_enabled => true, - :stderr_logfile => 'program_foo.error', - :stderr_logfile_maxbytes => '50MB', - :stderr_logfile_backups => '10', - :stderr_capture_maxbytes => '0', - :stderr_events_enabled => true, - :environment => { 'env1' => 'value1', 'env2' => 'value2' }, - :directory => '/opt/supervisord/chroot', - :umask => '022', - :serverurl => 'AUTO' - } - end - - context 'default' do - let(:params) { default_params } - - it { should contain_supervisord__program('foo') } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/\[program:foo\]/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/command=bar/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/process_name=\%\(process_num\)s/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/numprocs=1/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/numprocs_start=0/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/priority=999/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/autostart=true/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/startsecs=1/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/startretries=3/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/exitcodes=0,2/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stopsignal=TERM/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stopwaitsecs=10/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stopasgroup=true/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/killasgroup=true/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/user=baz/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/redirect_stderr=true/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_logfile=\/var\/log\/supervisor\/program_foo.log/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_logfile_maxbytes=50MB/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_logfile_backups=10/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_capture_maxbytes=0/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_events_enabled=true/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_logfile=\/var\/log\/supervisor\/program_foo.error/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_logfile_maxbytes=50MB/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_logfile_backups=10/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_capture_maxbytes=0/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_events_enabled=true/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/environment=env1='value1',env2='value2'/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/directory=\/opt\/supervisord\/chroot/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/umask=022/) } - it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/serverurl=AUTO/) } - end - - context 'ensure_process_stopped' do - let(:params) { default_params.merge({ :ensure_process => 'stopped' }) } - it { should contain_supervisord__supervisorctl('stop_foo') } - end - - context 'ensure_process_removed' do - let(:params) { default_params.merge({ :ensure_process => 'removed' }) } - it { should contain_supervisord__supervisorctl('remove_foo') } - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb deleted file mode 100644 index 33cfd75efe9..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'spec_helper' - -describe 'supervisord::supervisorctl', :type => :define do - let(:title) {'command_foo'} - let(:default_params) {{ - :command => 'command', - :process => 'foo' - }} - let(:params) { default_params } - let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }} - - it { should contain_supervisord__supervisorctl('command_foo') } -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb deleted file mode 100644 index dd8dffa07ec..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'spec_helper' - -describe 'array2csv' do - it { should run.with_params(['value1']).and_return('value1') } - it { should run.with_params(['value1', 'value2', 'value3']).and_return('value1,value2,value3') } - it { should run.with_params('foo').and_raise_error(Puppet::ParseError) } - it { should run.with_params().and_raise_error(Puppet::ParseError) } -end \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb deleted file mode 100644 index 68f04a6445a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'spec_helper' - -describe 'hash2csv' do - it { should run.with_params({'key1' => 'value1'}).and_return("key1='value1'") } - it { should run.with_params({'key1' => 'value1', 'key2' => 'value2'}).and_return("key1='value1',key2='value2'") } - it { should run.with_params('foo').and_raise_error(Puppet::ParseError) } - it { should run.with_params().and_raise_error(Puppet::ParseError) } -end \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb deleted file mode 100644 index 745ad4a5493..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'puppetlabs_spec_helper/module_spec_helper' - -fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures')) - -RSpec.configure do |c| - c.module_path = File.join(fixture_path, 'modules') - c.manifest_dir = File.join(fixture_path, 'manifests') -end - -at_exit { RSpec::Puppet::Coverage.report! } diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb deleted file mode 100644 index dcae2850d27..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb +++ /dev/null @@ -1,24 +0,0 @@ -require 'beaker-rspec' - -hosts.each do |host| - # Install Puppet - install_puppet -end - -RSpec.configure do |c| - # Project root - proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) - - # Readable test descriptions - c.formatter = :documentation - - # Configure all nodes in nodeset - c.before :suite do - # Install module - puppet_module_install(:source => proj_root, :module_name => 'supervisord') - hosts.each do |host| - on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] } - on host, puppet('module','install','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] } - end - end -end \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb deleted file mode 100644 index 9875c8ef5b2..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb +++ /dev/null @@ -1,88 +0,0 @@ -[eventlistener:<%= @name %>] -command=<%= @command %> -<% if @process_name -%> -process_name=<%= @process_name %> -<% end -%> -<% if @numprocs -%> -numprocs=<%= @numprocs %> -<% end -%> -<% if @numprocs_start -%> -numprocs_start=<%= @numprocs_start %> -<% end -%> -<% if @events_string -%> -events=<%= @events_string %> -<% end -%> -<% if @buffer_size -%> -buffer_size=<%= @buffer_size %> -<% end -%> -<% if @result_handler -%> -result_handler=<%= @result_handler %> -<% end -%> -<% if @priority -%> -priority=<%= @priority %> -<% end -%> -<% if @autostart -%> -autostart=<%= @autostart %> -<% end -%> -<% if @autorestart -%> -autorestart=<%= @autorestart %> -<% end -%> -<% if @startsecs -%> -startsecs=<%= @startsecs %> -<% end -%> -<% if @startretries -%> -startretries=<%= @startretries %> -<% end -%> -<% if @exitcodes -%> -exitcodes=<%= @exitcodes %> -<% end -%> -<% if @stopsignal -%> -stopsignal=<%= @stopsignal %> -<% end -%> -<% if @stopwaitsecs -%> -stopwaitsecs=<%= @stopwaitsecs %> -<% end -%> -<% if @stopasgroup -%> -stopasgroup=<%= @stopasgroup %> -<% end -%> -<% if @killasgroup -%> -killasgroup=<%= @killasgroup %> -<% end -%> -<% if @user -%> -user=<%= @user %> -<% end -%> -<% if @redirect_stderr -%> -redirect_stderr=<%= @redirect_stderr %> -<% end -%> -stdout_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stdout_logfile %> -<% if @stdout_logfile_maxbytes -%> -stdout_logfile_maxbytes=<%= @stdout_logfile_maxbytes %> -<% end -%> -<% if @stdout_logfile_backups -%> -stdout_logfile_backups=<%= @stdout_logfile_backups %> -<% end -%> -<% if @stdout_events_enabled -%> -stdout_events_enabled=<%= @stdout_events_enabled %> -<% end -%> -stderr_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stderr_logfile %> -<% if @stderr_logfile_maxbytes -%> -stderr_logfile_maxbytes=<%= @stderr_logfile_maxbytes %> -<% end -%> -<% if @stderr_logfile_backups -%> -stderr_logfile_backups=<%= @stderr_logfile_backups %> -<% end -%> -<% if @stderr_events_enabled -%> -stderr_events_enabled=<%= @stderr_events_enabled %> -<% end -%> -<% if @env_string -%> -environment=<%= @env_string %> -<% end -%> -<% if @directory -%> -directory=<%= @directory %> -<% end -%> -<% if @umask -%> -umask=<%= @umask %> -<% end -%> -<% if @serverurl -%> -serverurl=<%= @serverurl %> -<% end -%> diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb deleted file mode 100644 index 98a7fb1cb32..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb +++ /dev/null @@ -1,96 +0,0 @@ -[fcgi-program:<%= @name %>] -command=<%= @command %> -socket=<%= @socket %> -<% if @socket_owner -%> -socket_owner=<%= @socket_owner %> -<% end -%> -<% if @socket_mode -%> -socket_mode=<%= @socket_mode %> -<% end -%> -<% if @process_name -%> -process_name=<%= @process_name %> -<% end -%> -<% if @numprocs -%> -numprocs=<%= @numprocs %> -<% end -%> -<% if @numprocs_start -%> -numprocs_start=<%= @numprocs_start %> -<% end -%> -<% if @priority -%> -priority=<%= @priority %> -<% end -%> -<% if @autostart -%> -autostart=<%= @autostart %> -<% end -%> -<% if @autorestart -%> -autorestart=<%= @autorestart %> -<% end -%> -<% if @startsecs -%> -startsecs=<%= @startsecs %> -<% end -%> -<% if @startretries -%> -startretries=<%= @startretries %> -<% end -%> -<% if @exitcodes -%> -exitcodes=<%= @exitcodes %> -<% end -%> -<% if @stopsignal -%> -stopsignal=<%= @stopsignal %> -<% end -%> -<% if @stopwaitsecs -%> -stopwaitsecs=<%= @stopwaitsecs %> -<% end -%> -<% if @stopasgroup -%> -stopasgroup=<%= @stopasgroup %> -<% end -%> -<% if @killasgroup -%> -killasgroup=<%= @killasgroup %> -<% end -%> -<% if @user -%> -user=<%= @user %> -<% end -%> -<% if @redirect_stderr -%> -redirect_stderr=<%= @redirect_stderr %> -<% end -%> -<% if @stdout_logfile -%> -stdout_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stdout_logfile %> -<% end -%> -<% if @stdout_logfile_maxbytes -%> -stdout_logfile_maxbytes=<%= @stdout_logfile_maxbytes %> -<% end -%> -<% if @stdout_logfile_backups -%> -stdout_logfile_backups=<%= @stdout_logfile_backups %> -<% end -%> -<% if @stdout_capture_maxbytes -%> -stdout_capture_maxbytes=<%= @stdout_capture_maxbytes %> -<% end -%> -<% if @stdout_events_enabled -%> -stdout_events_enabled=<%= @stdout_events_enabled %> -<% end -%> -<% if @stderr_logfile -%> -stderr_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stderr_logfile %> -<% end -%> -<% if @stderr_logfile_maxbytes -%> -stderr_logfile_maxbytes=<%= @stderr_logfile_maxbytes %> -<% end -%> -<% if @stderr_logfile_backups -%> -stderr_logfile_backups=<%= @stderr_logfile_backups %> -<% end -%> -<% if @stderr_capture_maxbytes -%> -stderr_capture_maxbytes=<%= @stderr_capture_maxbytes %> -<% end -%> -<% if @stderr_events_enabled -%> -stderr_events_enabled=<%= @stderr_events_enabled %> -<% end -%> -<% if @env_string -%> -environment=<%= @env_string %> -<% end -%> -<% if @directory -%> -directory=<%= @directory %> -<% end -%> -<% if @umask -%> -umask=<%= @umask %> -<% end -%> -<% if @serverurl -%> -serverurl=<%= @serverurl %> -<% end -%> diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/group.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/group.erb deleted file mode 100644 index 478a02e4504..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/group.erb +++ /dev/null @@ -1,5 +0,0 @@ -[group:<%= @name %>] -programs=<%= @progstring %> -<% if @priority -%> -priority=<%= @priority %> -<% end -%> diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb deleted file mode 100644 index 78002c87ca6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb +++ /dev/null @@ -1,89 +0,0 @@ -[program:<%= @name %>] -command=<%= @command %> -<% if @process_name -%> -process_name=<%= @process_name %> -<% end -%> -<% if @numprocs -%> -numprocs=<%= @numprocs %> -<% end -%> -<% if @numprocs_start -%> -numprocs_start=<%= @numprocs_start %> -<% end -%> -<% if @priority -%> -priority=<%= @priority %> -<% end -%> -<% if @autostart -%> -autostart=<%= @autostart %> -<% end -%> -<% if @autorestart -%> -autorestart=<%= @autorestart %> -<% end -%> -<% if @startsecs -%> -startsecs=<%= @startsecs %> -<% end -%> -<% if @startretries -%> -startretries=<%= @startretries %> -<% end -%> -<% if @exitcodes -%> -exitcodes=<%= @exitcodes %> -<% end -%> -<% if @stopsignal -%> -stopsignal=<%= @stopsignal %> -<% end -%> -<% if @stopwaitsecs -%> -stopwaitsecs=<%= @stopwaitsecs %> -<% end -%> -<% if @stopasgroup -%> -stopasgroup=<%= @stopasgroup %> -<% end -%> -<% if @killasgroup -%> -killasgroup=<%= @killasgroup %> -<% end -%> -<% if @user -%> -user=<%= @user %> -<% end -%> -<% if @redirect_stderr -%> -redirect_stderr=<%= @redirect_stderr %> -<% end -%> -<% if @stdout_logfile -%> -stdout_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stdout_logfile %> -<% end -%> -<% if @stdout_logfile_maxbytes -%> -stdout_logfile_maxbytes=<%= @stdout_logfile_maxbytes %> -<% end -%> -<% if @stdout_logfile_backups -%> -stdout_logfile_backups=<%= @stdout_logfile_backups %> -<% end -%> -<% if @stdout_capture_maxbytes -%> -stdout_capture_maxbytes=<%= @stdout_capture_maxbytes %> -<% end -%> -<% if @stdout_events_enabled -%> -stdout_events_enabled=<%= @stdout_events_enabled %> -<% end -%> -<% if @stderr_logfile -%> -stderr_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stderr_logfile %> -<% end -%> -<% if @stderr_logfile_maxbytes -%> -stderr_logfile_maxbytes=<%= @stderr_logfile_maxbytes %> -<% end -%> -<% if @stderr_logfile_backups -%> -stderr_logfile_backups=<%= @stderr_logfile_backups %> -<% end -%> -<% if @stderr_capture_maxbytes -%> -stderr_capture_maxbytes=<%= @stderr_capture_maxbytes %> -<% end -%> -<% if @stderr_events_enabled -%> -stderr_events_enabled=<%= @stderr_events_enabled %> -<% end -%> -<% if @env_string -%> -environment=<%= @env_string %> -<% end -%> -<% if @directory -%> -directory=<%= @directory %> -<% end -%> -<% if @umask -%> -umask=<%= @umask %> -<% end -%> -<% if @serverurl -%> -serverurl=<%= @serverurl %> -<% end -%> diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb deleted file mode 100644 index 232f5356da3..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb +++ /dev/null @@ -1,10 +0,0 @@ -# Defaults for supervisor initscript -# sourced by /etc/init.d/supervisor -# installed at /etc/default/supervisor by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="-c <%= @config_file %>" diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb deleted file mode 100644 index f8bdb5ff854..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb +++ /dev/null @@ -1,137 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: supervisor -# Required-Start: $remote_fs $network $named -# Required-Stop: $remote_fs $network $named -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/stop supervisor -# Description: Start/stop supervisor daemon and its configured -# subprocesses. -### END INIT INFO - - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=<%= @executable %> -NAME=supervisord -DESC=supervisor - -# Tests if executable exists -if [ ! -x $DAEMON ] ; then - echo "Executable not found ${DAEMON}" - exit 1 -fi - -LOGDIR=<%= @log_path %> -PIDFILE=<%= @run_path %>/<%= @pid_file %> -DODTIME=5 # Time to wait for the server to die, in seconds - # If this value is set too low you might not - # let some servers to die gracefully and - # 'restart' will not work - -# Include supervisor defaults if available -if [ -f <%= @init_defaults %> ] ; then - . <%= @init_defaults %> -fi - -set -e - -running_pid() -{ - # Check if a given process pid's cmdline matches a given name - pid=$1 - name=$2 - [ -z "$pid" ] && return 1 - [ ! -d /proc/$pid ] && return 1 - (cat /proc/$pid/cmdline | tr "\000" "\n"|grep -q $name) || return 1 - return 0 -} - -running() -{ -# Check if the process is running looking at /proc -# (works for all users) - - # No pidfile, probably no daemon present - [ ! -f "$PIDFILE" ] && return 1 - # Obtain the pid and check it against the binary name - pid=`cat $PIDFILE` - running_pid $pid $DAEMON || return 1 - return 0 -} - -force_stop() { -# Forcefully kill the process - [ ! -f "$PIDFILE" ] && return - if running ; then - kill -15 $pid - # Is it really dead? - [ -n "$DODTIME" ] && sleep "$DODTIME"s - if running ; then - kill -9 $pid - [ -n "$DODTIME" ] && sleep "$DODTIME"s - if running ; then - echo "Cannot kill $DESC (pid=$pid)!" - exit 1 - fi - fi - fi - rm -f $PIDFILE - return 0 -} - -case "$1" in - start) - if [ -e $PIDFILE ]; then - echo "$DESC already running with pid: `cat $PIDFILE`" - exit 0 - fi - echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --exec $DAEMON -- $DAEMON_OPTS - test -f $PIDFILE || sleep 1 - if running ; then - echo "$NAME." - else - echo " ERROR." - fi - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE - echo "$NAME." - ;; - force-stop) - echo -n "Forcefully stopping $DESC: " - force_stop - if ! running ; then - echo "$NAME." - else - echo " ERROR." - fi - ;; - restart) - echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE - [ -n "$DODTIME" ] && sleep $DODTIME - start-stop-daemon --start --quiet --pidfile \ - $PIDFILE --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." - ;; - status) - echo -n "$DESC is " - if running ; then - echo "running" - else - echo "not running." - exit 1 - fi - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|status|force-stop}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb deleted file mode 100644 index 0d7862d0233..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb +++ /dev/null @@ -1,8 +0,0 @@ -# this is sourced by the supervisord init script -# written by jkoppe - -set -a - -# should probably put both of these options as runtime arguments -OPTIONS="-c <%= @config_file %>" -PIDFILE=<%= @run_path %><%= @pid_file %> diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb deleted file mode 100644 index 617f3eed93b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash -# -# supervisord This scripts turns supervisord on -# -# Author: Mike McGrath (based off yumupdatesd) -# Jason Koppe adjusted to read sysconfig, -# use supervisord tools to start/stop, conditionally wait -# for child processes to shutdown, and startup later -# -# chkconfig: 345 83 04 -# -# description: supervisor is a process control utility. It has a web based -# xmlrpc interface as well as a few other nifty features. -# processname: supervisord -# config: <%= @config_file %> -# pidfile: <%= @run_path %>/<%= @pid_file %> -# - -# source function library -. /etc/rc.d/init.d/functions - -# source system settings -[ -e <%= @init_defaults %> ] && . <%= @init_defaults %> - -RETVAL=0 -DAEMON=<%= @executable %> -CTL=<%= @executable_ctl %> -DESC=supervisord -PIDFILE=<%= @run_path %>/<%= @pid_file %> - -# Tests if executable exists -if [ ! -x $DAEMON ] ; then - echo "Executable not found ${DAEMON}" - exit 1 -fi - -running_pid() -{ - # Check if a given process pid's cmdline matches a given name - pid=$1 - name=$2 - [ -z "$pid" ] && return 1 - [ ! -d /proc/$pid ] && return 1 - (cat /proc/$pid/cmdline | tr "\000" "\n"|grep -q $name) || return 1 - return 0 -} - -running() -{ -# Check if the process is running looking at /proc -# (works for all users) - - # No pidfile, probably no daemon present - [ ! -f "$PIDFILE" ] && return 1 - # Obtain the pid and check it against the binary name - pid=`cat $PIDFILE` - running_pid $pid $DAEMON || return 1 - return 0 -} - -start() { - echo -n "Starting $DESC: " - if [ -e $PIDFILE ]; then - echo "ALREADY STARTED" - return 1 - else - # start supervisord with options from sysconfig (stuff like -c) - daemon $DAEMON $OPTIONS - # only create the subsyslock if we created the PIDFILE - [ -e $PIDFILE ] && touch /var/lock/subsys/supervisord - return 0 - fi -} - -stop() { - echo -n "Stopping supervisord: " - killproc -p $PIDFILE $DESC - # always remove the subsys. we might have waited a while, but just remove it at this point. - rm -f /var/lock/subsys/supervisord - return 0 -} - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|force-reload) - restart - ;; - reload) - $CTL $OPTIONS reload - RETVAL=$? - ;; - condrestart) - [ -f /var/lock/subsys/supervisord ] && restart - RETVAL=$? - ;; - status) - echo -n "supervisord is " - if running ; then - echo "running" - else - echo "not running." - exit 1 - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb deleted file mode 100644 index 9f04cb24779..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb +++ /dev/null @@ -1,13 +0,0 @@ -[inet_http_server] -port=<%= @inet_server_hostname %>:<%= @inet_server_port %> -<% if @inet_auth -%> -username=<%= @inet_username %> -password=<%= @inet_password %> -<% end -%> - -[supervisorctl] -serverurl=http://<%= @inet_hostname%>:<%= @inet_server_port %> -<% if @inet_auth -%> -username=<%= @inet_username %> -password=<%= @inet_password %> -<% end -%> diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb deleted file mode 100644 index 8ab8fee51df..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb +++ /dev/null @@ -1,34 +0,0 @@ -[supervisord] -logfile=<%= @log_path %>/<%= @log_file %> -pidfile=<%= @run_path %>/<%= @pid_file %> -nodaemon=<%= @nodaemon %> -minfds=<%= @minfds %> -minprocs=<%= @minprocs %> -umask=<%= @umask %> -<% if @strip_ansi -%> -strip_ansi=<%= @strip_ansi %> -<% end -%> -<% if @user -%> -user=<%= @user %> -<% end -%> -<% if @identifier -%> -identifier=<%= @identifier %> -<% end -%> -<% if @directory -%> -directory=<%= @directory %> -<% end -%> -<% if @nocleanup -%> -nocleanup=true -<% end -%> -<% if @childlogdir -%> -childlogdir=<%= @childlogdir %> -<% end -%> -<% if @env_string -%> -environment=<%= @env_string %> -<% end -%> - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files=<%= @config_include_string %> diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb deleted file mode 100644 index 39e85199916..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb +++ /dev/null @@ -1,15 +0,0 @@ -[unix_http_server] -file=<%= @run_path %>/<%= @unix_socket_file %> -chmod=<%= @unix_socket_mode %> -chown=<%= @unix_socket_owner %>:<%= @unix_socket_group %> -<% if @unix_auth -%> -username=<%= @unix_socket_username %> -password=<%= @unix_socket_password %> -<% end -%> - -[supervisorctl] -serverurl=unix://<%= @run_path %>/<%= @unix_socket_file %> -<% if @unix_auth -%> -username=<%= @unix_username %> -password=<%= @unix_password %> -<% end -%> diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/group.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/group.pp deleted file mode 100644 index 3d340460dfb..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/group.pp +++ /dev/null @@ -1,4 +0,0 @@ -supervisord::group { 'mygroup': - priority => 100, - program => ['program1', 'program2', 'program3'] -} \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/init.pp deleted file mode 100644 index 48bc1f47987..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/init.pp +++ /dev/null @@ -1,5 +0,0 @@ -class { 'supervisord': - install_pip => true, - install_init => true, - nocleanup => true, -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp deleted file mode 100644 index 0d45ebe1b3d..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp +++ /dev/null @@ -1,35 +0,0 @@ -supervisord::program { 'myprogram': - command => 'command --args', - process_name => '%(process_num)s', - numprocs => '1', - numprocs_start => '0', - priority => '999', - autostart => true, - autorestart => 'unexpected', - startsecs => '1', - startretries => '3', - exitcodes => '0,2', - stopsignal => 'TERM', - stopwaitsecs => '10', - stopasgroup => false, - killasgroup => false, - redirect_stderr => false, - stdout_logfile => 'program_foo.log', - stdout_logfile_maxbytes => '50MB', - stdout_logfile_backups => '10', - stdout_capture_maxbytes => '0', - stdout_events_enabled => false, - stderr_logfile => 'program_foo.error', - stderr_logfile_maxbytes => '50MB', - stderr_logfile_backups => '10', - stderr_capture_maxbytes => '0', - stderr_events_enabled => false, - environment => { - 'HOME' => '/home/myuser', - 'PATH' => '/bin:/sbin:/usr/bin:/usr/sbin', - 'SECRET' => 'mysecret' - }, - directory => undef, - umask => '022', - serverurl => 'AUTO' -} \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/ChangeLog b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/ChangeLog deleted file mode 100644 index a91a0e2cf48..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/ChangeLog +++ /dev/null @@ -1,29 +0,0 @@ -2014-01-20 - 0.3.0 -* Add optional comment inside the sysctl.d file. -* Use sysctl -p with the created/modified file instead of sysctl -w (#3). -* Fix purge and set its default to false (#7, tehmaspc). - -2013-10-02 - 0.2.0 -* Add optional prefix to the sysctl.d file name, to force ordering. - -2013-06-25 - 0.1.1 -* Make purge optional, still enabled by default. -* Add rspec tests (Justin Lambert). -* Minor fix for values with spaces (needs more changes to be robust). - -2013-03-06 - 0.1.0 -* Update README to markdown. -* Change to recommended 2 space indent. - -2012-12-18 - 0.0.3 -* Add feature to update existing values in /etc/sysctl.conf. -* Apply setting on each run if needed (hakamadare). -* Make sure $ensure => absent still works with the above change. - -2012-09-19 - 0.0.2 -* Fix deprecation warnings. -* Fix README markup. - -2012-07-19 - 0.0.1 -* Initial module release. - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Gemfile deleted file mode 100644 index d4c141f5a3c..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Gemfile +++ /dev/null @@ -1,8 +0,0 @@ -source :rubygems - -puppetversion = ENV['PUPPET_VERSION'] -gem 'puppet', puppetversion, :require => false -gem 'puppet-lint' -gem 'rspec-puppet' -gem 'puppetlabs_spec_helper', '>= 0.4.0' - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/LICENSE deleted file mode 100644 index 49a6e5c4010..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/LICENSE +++ /dev/null @@ -1,14 +0,0 @@ -Copyright (C) 2011-2013 Matthias Saou - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Modulefile deleted file mode 100644 index 2d9f13ff73a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Modulefile +++ /dev/null @@ -1,8 +0,0 @@ -name 'thias-sysctl' -version '0.3.0' -source 'git://github.com/thias/puppet-sysctl' -author 'Matthias Saou' -license 'Apache 2.0' -summary 'Sysctl module' -description "Manage sysctl variable values." -project_page 'https://github.com/thias/puppet-sysctl' diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/README.md deleted file mode 100644 index 554bcfa0f14..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/README.md +++ /dev/null @@ -1,58 +0,0 @@ -# puppet-sysctl - -## Overview - -Manage sysctl variable values. All changes are immediately applied, as well as -configured to become persistent. Tested on Red Hat Enterprise Linux 6. - - * `sysctl` : Definition to manage sysctl variables by setting a value. - * `sysctl::base`: Base class (included from the definition). - -For persistence to work, your Operating System needs to support looking for -sysctl configuration inside `/etc/sysctl.d/`. - -You may optionally enable purging of the `/etc/sysctl.d/` directory, so that -all files which are not (or no longer) managed by this module will be removed. - -Beware that for the purge to work, you need to either have at least one -sysctl definition call left for the node, or include `sysctl::base` manually. - -You may also force a value to `ensure => absent`, which will always work. - -For the few original settings in the main `/etc/sysct.conf` file, the value is -also replaced so that running `sysctl -p` doesn't revert any change made by -puppet. - -## Examples - -Enable IP forwarding globally : -```puppet -sysctl { 'net.ipv4.ip_forward': value => '1' } -``` - -Set a value for maximum number of connections per UNIX socket : -```puppet -sysctl { 'net.core.somaxconn': value => '65536' } -``` - -Make sure we don't have any explicit value set for swappiness, typically -because it was set at some point but no longer needs to be. The original -value for existing nodes won't be reset until the next reboot : -```puppet -sysctl { 'vm.swappiness': ensure => absent } -``` - -If the order in which the files get applied is important, you can set it by -using a file name prefix, which could also be set globally from `site.pp` : -```puppet -Sysctl { prefix => '60' } -``` - -To enable purging of settings, you can use hiera to set the `sysctl::base` -`$purge` parameter : -```yaml ---- -# sysctl -sysctl::base::purge: true -``` - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Rakefile deleted file mode 100644 index 184b9b5915e..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Rakefile +++ /dev/null @@ -1,7 +0,0 @@ -require 'rubygems' -require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint' -PuppetLint.configuration.send("disable_80chars") -PuppetLint.configuration.send("disable_autoloader_layout") -PuppetLint.configuration.send("disable_quoted_booleans") - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/base.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/base.pp deleted file mode 100644 index f7a95131467..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/base.pp +++ /dev/null @@ -1,26 +0,0 @@ -# Class: sysctl::base -# -# Common part for the sysctl definition. Not meant to be used on its own. -# -class sysctl::base ( - $purge = false, -) { - - if $purge { - $recurse = true - } else { - $recurse = false - } - - file { '/etc/sysctl.d': - ensure => directory, - owner => 'root', - group => 'root', - mode => '0755', - # Magic hidden here - purge => $purge, - recurse => $recurse, - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/init.pp deleted file mode 100644 index 379e69136c2..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/init.pp +++ /dev/null @@ -1,66 +0,0 @@ -# Define: sysctl -# -# Manage sysctl variable values. -# -# Parameters: -# $value: -# The value for the sysctl parameter. Mandatory, unless $ensure is 'absent'. -# $prefix: -# Optional prefix for the sysctl.d file to be created. Default: none. -# $ensure: -# Whether the variable's value should be 'present' or 'absent'. -# Defaults to 'present'. -# -# Sample Usage : -# sysctl { 'net.ipv6.bindv6only': value => '1' } -# -define sysctl ( - $value = undef, - $prefix = undef, - $comment = undef, - $ensure = undef, -) { - - include sysctl::base - - # If we have a prefix, then add the dash to it - if $prefix { - $sysctl_d_file = "${prefix}-${title}.conf" - } else { - $sysctl_d_file = "${title}.conf" - } - - # The permanent change - file { "/etc/sysctl.d/${sysctl_d_file}": - ensure => $ensure, - owner => 'root', - group => 'root', - mode => '0644', - content => template("${module_name}/sysctl.d-file.erb"), - notify => [ - Exec["sysctl-${title}"], - Exec["update-sysctl.conf-${title}"], - ], - } - - if $ensure != 'absent' { - - # The immediate change + re-check on each run "just in case" - exec { "sysctl-${title}": - command => "/sbin/sysctl -p /etc/sysctl.d/${sysctl_d_file}", - refreshonly => true, - require => File["/etc/sysctl.d/${sysctl_d_file}"], - } - - # For the few original values from the main file - exec { "update-sysctl.conf-${title}": - command => "sed -i -e 's/^${title} *=.*/${title} = ${value}/' /etc/sysctl.conf", - path => [ '/usr/sbin', '/sbin', '/usr/bin', '/bin' ], - refreshonly => true, - onlyif => "grep -E '^${title} *=' /etc/sysctl.conf", - } - - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/metadata.json deleted file mode 100644 index 237befce806..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/metadata.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "project_page": "https://github.com/thias/puppet-sysctl", - "version": "0.3.0", - "license": "Apache 2.0", - "description": "Manage sysctl variable values.", - "dependencies": [ - - ], - "types": [ - - ], - "name": "thias-sysctl", - "author": "Matthias Saou", - "summary": "Sysctl module", - "source": "git://github.com/thias/puppet-sysctl", - "checksums": { - "tests/init.pp": "e70e5327b9840b44699bb7fae71d47cd", - "spec/spec_helper.rb": "3ea886dd135e120afa31e0aab12e85b0", - "ChangeLog": "ed8052eb5cb46b92eaa03b882c11779e", - "LICENSE": "99219472697a01561e7630d63aaecdc1", - "Modulefile": "3b8a6a0dfff841a31118a5f46fde59da", - "spec/defines/sysctl_init_spec.rb": "21d524df70961750cb22f6b83349093e", - "manifests/init.pp": "0f7dd893b08ebbbec8994d14eca6701b", - "README.md": "ed4837849a1c4790b7178cd99824a204", - "spec/classes/sysctl_base_spec.rb": "6241cf3e290871c00b1bb3bbd5490108", - "templates/sysctl.d-file.erb": "0212783df32c499b3e9e343993f608da", - "manifests/base.pp": "9508015ce74b5ce1420ad8c8ebc7d3af", - "tests/base.pp": "1ba89838432dbc94339097327c19ae3d", - "Gemfile": "3ad486d60d90bfe4395b368b95481e01", - "Rakefile": "ab253b919e7093c2a5eb7adf0e39ffbc" - } -} \ No newline at end of file diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb deleted file mode 100644 index a1d47a21e77..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe 'sysctl::base', :type => :class do - - it { should create_class('sysctl::base') } - it { should contain_file('/etc/sysctl.d') } - -end - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb deleted file mode 100644 index 1f8db67cce0..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -require 'spec_helper' - -describe 'sysctl', :type => :define do - let(:title) { 'net.ipv4.ip_forward'} - - context 'present' do - let(:params) { { :value => '1' } } - - it { should contain_file('/etc/sysctl.d/net.ipv4.ip_forward.conf').with( - :content => "net.ipv4.ip_forward = 1\n", - :ensure => nil - ) } - - it { should contain_exec('sysctl-net.ipv4.ip_forward') } - it { should contain_exec('update-sysctl.conf-net.ipv4.ip_forward')} - end - - context 'absent' do - let(:params) { { :ensure => 'absent' } } - - it { should contain_file('/etc/sysctl.d/net.ipv4.ip_forward.conf').with_ensure('absent') } - end - -end - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/spec_helper.rb deleted file mode 100644 index dc7e9f4a0ef..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/spec_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'rubygems' -require 'puppetlabs_spec_helper/module_spec_helper' diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb deleted file mode 100644 index 843721435a8..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb +++ /dev/null @@ -1,6 +0,0 @@ -<% if @comment -%> -<% @comment.each do |line| -%> -# <%= line %> -<% end -%> -<% end -%> -<%= @title %> = <%= @value %> diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/base.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/base.pp deleted file mode 100644 index a4868712ef7..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/base.pp +++ /dev/null @@ -1 +0,0 @@ -include sysctl::base diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/init.pp deleted file mode 100644 index 402615bb798..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/init.pp +++ /dev/null @@ -1,3 +0,0 @@ -sysctl { 'net.ipv4.ip_forward': value => '1' } -sysctl { 'net.core.somaxconn': value => '65536' } -sysctl { 'vm.swappiness': ensure => absent } diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/.travis.yml deleted file mode 100644 index 1c5e71b98df..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/.travis.yml +++ /dev/null @@ -1,31 +0,0 @@ -branches: - only: - - master -language: ruby -bundler_args: --without development -script: "bundle exec rake spec SPEC_OPTS='--format documentation'" -after_success: - - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release - - .forge-release/publish -rvm: - - 1.8.7 - - 1.9.3 - - 2.0.0 -env: - matrix: - - PUPPET_GEM_VERSION="~> 2.7.0" - - PUPPET_GEM_VERSION="~> 3.3.0" - global: - - PUBLISHER_LOGIN=puppetlabs - - secure: |- - ZiIkYd9+CdPzpwSjFPnVkCx1FIlipxpbdyD33q94h2Tj5zXjNb1GXizVy0NR - kVxGhU5Ld8y9z8DTqKRgCI1Yymg3H//OU++PKLOQj/X5juWVR4URBNPeBOzu - IJBDl1MADKA4i1+jAZPpz4mTvTtKS4pWKErgCSmhSfsY1hs7n6c= -matrix: - exclude: - - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 2.7.0" - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 2.7.0" -notifications: - email: false diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/CHANGELOG deleted file mode 100644 index 8142f5d6e45..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/CHANGELOG +++ /dev/null @@ -1,41 +0,0 @@ -2013-11-13 - Version 0.2.0 - -Summary: - -This release mainly focuses on a number of bugfixes, which should -significantly improve the reliability of Git and SVN. Thanks to -our many contributors for all of these fixes! - -Features: -- Git: - - Add autorequire for Package['git'] -- HG: - - Allow user and identity properties. -- Bzr: - - "ensure => latest" support. -- SVN: - - Added configuration parameter. - - Add support for master svn repositories. -- CVS: - - Allow for setting the CVS_RSH environment variable. - -Fixes: -- Handle Puppet::Util[::Execution].withenv for 2.x and 3.x properly. -- Change path_empty? to not do full directory listing. -- Overhaul spec tests to work with rspec2. -- Git: - - Improve Git SSH usage documentation. - - Add ssh session timeouts to prevent network issues from blocking runs. - - Fix git provider checkout of a remote ref on an existing repo. - - Allow unlimited submodules (thanks to --recursive). - - Use git checkout --force instead of short -f everywhere. - - Update git provider to handle checking out into an existing (empty) dir. -- SVN: - - Handle force property. for svn. - - Adds support for changing upstream repo url. - - Check that the URL of the WC matches the URL from the manifest. - - Changed from using "update" to "switch". - - Handle revision update without source switch. - - Fix svn provider to look for '^Revision:' instead of '^Last Changed Rev:'. -- CVS: - - Documented the "module" attribute. diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Gemfile deleted file mode 100644 index 5def8292208..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Gemfile +++ /dev/null @@ -1,22 +0,0 @@ -source 'https://rubygems.org' - -group :development, :test do - gem 'rake', :require => false - gem 'rspec-puppet', :require => false - gem 'puppetlabs_spec_helper', :require => false - gem 'rspec-system', :require => false - gem 'rspec-system-puppet', :require => false - gem 'rspec-system-serverspec', :require => false - gem 'serverspec', :require => false - gem 'puppet-lint', :require => false - gem 'pry', :require => false - gem 'simplecov', :require => false -end - -if puppetversion = ENV['PUPPET_GEM_VERSION'] - gem 'puppet', puppetversion, :require => false -else - gem 'puppet', :require => false -end - -# vim:ft=ruby diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/LICENSE deleted file mode 100644 index 2ee80c8ec84..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Copyright (C) 2010-2012 Puppet Labs Inc. - -Puppet Labs can be contacted at: info@puppetlabs.com - -This program and entire repository is free software; you can -redistribute it and/or modify it under the terms of the GNU -General Public License as published by the Free Software -Foundation; either version 2 of the License, or 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, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Modulefile deleted file mode 100644 index d2bbe929598..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Modulefile +++ /dev/null @@ -1,4 +0,0 @@ -name 'puppetlabs/vcsrepo' -version '0.2.0' -summary 'Manage repositories from various version control systems' -description 'Manage repositories from various version control systems' diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.BZR.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.BZR.markdown deleted file mode 100644 index cc257e9fdf6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.BZR.markdown +++ /dev/null @@ -1,47 +0,0 @@ -Using vcsrepo with Bazaar -========================= - -To create a blank repository ----------------------------- - -Define a `vcsrepo` without a `source` or `revision`: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => bzr - } - -To branch from an existing repository -------------------------------------- - -Provide the `source` location: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => bzr, - source => 'lp:myproj' - } - -For a specific revision, use `revision` with a valid revisionspec -(see `bzr help revisionspec` for more information on formatting a revision): - - vcsrepo { "/path/to/repo": - ensure => present, - provider => bzr, - source => 'lp:myproj', - revision => 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x' - } - -For sources that use SSH (eg, `bzr+ssh://...`, `sftp://...`) ------------------------------------------------------------- - -Manage your SSH keys with Puppet and use `require` in your `vcsrepo` -to ensure they are present. For more information, see the `require` -metaparameter documentation[1]. - -More Examples -------------- - -For examples you can run, see `examples/bzr/` - -[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.CVS.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.CVS.markdown deleted file mode 100644 index 3bdd59da4f6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.CVS.markdown +++ /dev/null @@ -1,66 +0,0 @@ -Using vcsrepo with CVS -====================== - -To create a blank repository ----------------------------- - -Define a `vcsrepo` without a `source` or `revision`: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => cvs - } - -To checkout/update from a repository ------------------------------------- - -To get the current mainline: - - vcsrepo { "/path/to/workspace": - ensure => present, - provider => cvs, - source => ":pserver:anonymous@example.com:/sources/myproj" - } - -To get a specific module on the current mainline: - - vcsrepo {"/vagrant/lockss-daemon-source": - ensure => present, - provider => cvs, - source => ":pserver:anonymous@lockss.cvs.sourceforge.net:/cvsroot/lockss", - module => "lockss-daemon", - } - - -You can use the `compression` parameter (it works like CVS `-z`): - - vcsrepo { "/path/to/workspace": - ensure => present, - provider => cvs, - compression => 3, - source => ":pserver:anonymous@example.com:/sources/myproj" - } - -For a specific tag, use `revision`: - - vcsrepo { "/path/to/workspace": - ensure => present, - provider => cvs, - compression => 3, - source => ":pserver:anonymous@example.com:/sources/myproj", - revision => "SOMETAG" - } - -For sources that use SSH ------------------------- - -Manage your SSH keys with Puppet and use `require` in your `vcsrepo` -to ensure they are present. For more information, see the `require` -metaparameter documentation[1]. - -More Examples -------------- - -For examples you can run, see `examples/cvs/` - -[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.GIT.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.GIT.markdown deleted file mode 100644 index 846bdcc2944..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.GIT.markdown +++ /dev/null @@ -1,95 +0,0 @@ -Using vcsrepo with Git -====================== - -To create a blank repository ----------------------------- - -Define a `vcsrepo` without a `source` or `revision`: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => git - } - -If you're defining this for a central/"official" repository, you'll -probably want to make it a "bare" repository. Do this by setting -`ensure` to `bare` instead of `present`: - - vcsrepo { "/path/to/repo": - ensure => bare, - provider => git - } - -To clone/pull a repository ----------------------------- - -To get the current [master] HEAD: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => git, - source => "git://example.com/repo.git" - } - -For a specific revision or branch (can be a commit SHA, tag or branch name): - - vcsrepo { "/path/to/repo": - ensure => present, - provider => git, - source => 'git://example.com/repo.git', - revision => '0c466b8a5a45f6cd7de82c08df2fb4ce1e920a31' - } - - vcsrepo { "/path/to/repo": - ensure => present, - provider => git, - source => 'git://example.com/repo.git', - revision => '1.1.2rc1' - } - - vcsrepo { "/path/to/repo": - ensure => present, - provider => git, - source => 'git://example.com/repo.git', - revision => 'development' - } - -Check out as a user: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => git, - source => 'git://example.com/repo.git', - revision => '0c466b8a5a45f6cd7de82c08df2fb4ce1e920a31', - user => 'someUser' - } - -Keep the repository at the latest revision (note: this will always overwrite local changes to the repository): - - vcsrepo { "/path/to/repo": - ensure => latest, - provider => git, - source => 'git://example.com/repo.git', - revision => 'master', - } - -For sources that use SSH (eg, `username@server:...`) ----------------------------------------------------- - -If your SSH key is associated with a user, simply fill the `user` parameter to use his keys. - -Example: - - user => 'toto' # will use toto's $HOME/.ssh setup - - -Otherwise, manage your SSH keys with Puppet and use `require` in your `vcsrepo` to ensure they are present. -For more information, see the `require` metaparameter documentation[1]. - -More Examples -------------- - -For examples you can run, see `examples/git/` - -[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.HG.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.HG.markdown deleted file mode 100644 index 55ceef4acce..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.HG.markdown +++ /dev/null @@ -1,73 +0,0 @@ -Using vcsrepo with Mercurial -============================ - -To create a blank repository ----------------------------- - -Define a `vcsrepo` without a `source` or `revision`: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => hg - } - -To clone/pull & update a repository ------------------------------------ - -To get the default branch tip: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => hg, - source => "http://hg.example.com/myrepo" - } - -For a specific changeset, use `revision`: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => hg, - source => "http://hg.example.com/myrepo", - revision => '21ea4598c962' - } - -You can also set `revision` to a tag: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => hg, - source => "http://hg.example.com/myrepo", - revision => '1.1.2' - } - -Check out as a user: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => hg, - source => "http://hg.example.com/myrepo", - user => 'user' - } - -Specify an SSH identity key: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => hg, - source => "ssh://hg@hg.example.com/myrepo", - identity => "/home/user/.ssh/id_dsa, - } - -For sources that use SSH (eg, `ssh://...`) ------------------------------------------- - -Manage your SSH keys with Puppet and use `require` in your `vcsrepo` -to ensure they are present. For more information, see the `require` -metaparameter documentation[1]. - -More Examples -------------- - -For examples you can run, see `examples/hg/` - -[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.SVN.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.SVN.markdown deleted file mode 100644 index f374094c1dc..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.SVN.markdown +++ /dev/null @@ -1,62 +0,0 @@ -Using vcsrepo with Subversion -============================= - -To create a blank repository ----------------------------- - -To create a blank repository suitable for use as a central repository, -define a `vcsrepo` without a `source` or `revision`: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => svn - } - -To checkout from a repository ------------------------------ - -Provide a `source` qualified to the branch/tag you want: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => svn, - source => "svn://svnrepo/hello/branches/foo" - } - -You can provide a specific `revision`: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => svn, - source => "svn://svnrepo/hello/branches/foo", - revision => '1234' - } - - -Using a specified Subversion configuration directory ------------------------------ - -Provide a `configuration` parameter which should be a directory path on the local system where your svn configuration -files are. Typically, it is /path/to/.subversion: - - vcsrepo { "/path/to/repo": - ensure => present, - provider => svn, - source => "svn://svnrepo/hello/branches/foo", - configuration => "/path/to/.subversion" - } - - -For sources that use SSH (eg, `svn+ssh://...`) ----------------------------------------------- - -Manage your SSH keys with Puppet and use `require` in your `vcsrepo` -to ensure they are present. For more information, see the `require` -metaparameter documentation[1]. - -More Examples -------------- - -For examples you can run, see `examples/svn/` - -[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.markdown deleted file mode 100644 index 848725630a2..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.markdown +++ /dev/null @@ -1,32 +0,0 @@ -vcsrepo -======= - -[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-vcsrepo.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-vcsrepo) - -Purpose -------- - -This provides a single type, `vcsrepo`. - -This type can be used to describe: - -* A working copy checked out from a (remote or local) source, at an - arbitrary revision -* A "blank" working copy not associated with a source (when it makes - sense for the VCS being used) -* A "blank" central repository (when the distinction makes sense for the VCS - being used) - -Supported Version Control Systems ---------------------------------- - -This module supports a wide range of VCS types, each represented by a -separate provider. - -For information on how to use this module with a specific VCS, see -`README..markdown`. - -License -------- - -See LICENSE. diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Rakefile deleted file mode 100644 index cd3d3799589..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Rakefile +++ /dev/null @@ -1 +0,0 @@ -require 'puppetlabs_spec_helper/rake_tasks' diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp deleted file mode 100644 index 0ed0705ee8d..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp +++ /dev/null @@ -1,6 +0,0 @@ -vcsrepo { '/tmp/vcstest-bzr-branch': - ensure => present, - provider => bzr, - source => 'lp:do', - revision => '1312', -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp deleted file mode 100644 index 1129dd7d059..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp +++ /dev/null @@ -1,4 +0,0 @@ -vcsrepo { '/tmp/vcstest-bzr-init': - ensure => present, - provider => bzr, -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp deleted file mode 100644 index 155742e34d5..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp +++ /dev/null @@ -1,11 +0,0 @@ -vcsrepo { '/tmp/vcstest-cvs-repo': - ensure => present, - provider => cvs, -} - -vcsrepo { '/tmp/vcstest-cvs-workspace-local': - ensure => present, - provider => cvs, - source => '/tmp/vcstest-cvs-repo', - require => Vcsrepo['/tmp/vcstest-cvs-repo'], -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp deleted file mode 100644 index eb9665a92e5..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp +++ /dev/null @@ -1,5 +0,0 @@ -vcsrepo { '/tmp/vcstest-cvs-workspace-remote': - ensure => present, - provider => cvs, - source => ':pserver:anonymous@cvs.sv.gnu.org:/sources/leetcvrt', -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp deleted file mode 100644 index 4166f6e6963..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp +++ /dev/null @@ -1,4 +0,0 @@ -vcsrepo { '/tmp/vcstest-git-bare': - ensure => bare, - provider => git, -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp deleted file mode 100644 index b29a4fdbef5..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp +++ /dev/null @@ -1,5 +0,0 @@ -vcsrepo { '/tmp/vcstest-git-clone': - ensure => present, - provider => git, - source => 'git://github.com/bruce/rtex.git', -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp deleted file mode 100644 index e3352eb7c77..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp +++ /dev/null @@ -1,4 +0,0 @@ -vcsrepo { '/tmp/vcstest-git-wc': - ensure => present, - provider => git, -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp deleted file mode 100644 index be2d955de53..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp +++ /dev/null @@ -1,6 +0,0 @@ -vcsrepo { '/tmp/vcstest-hg-clone': - ensure => present, - provider => hg, - source => 'http://hg.basho.com/riak', - revision => 'riak-0.5.3', -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp deleted file mode 100644 index a8908040490..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp +++ /dev/null @@ -1,4 +0,0 @@ -vcsrepo { '/tmp/vcstest-hg-init': - ensure => present, - provider => hg, -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp deleted file mode 100644 index f9fc2730f5a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp +++ /dev/null @@ -1,5 +0,0 @@ -vcsrepo { '/tmp/vcstest-svn-checkout': - ensure => present, - provider => svn, - source => 'http://svn.edgewall.org/repos/babel/trunk', -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp deleted file mode 100644 index de7c390f9f5..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp +++ /dev/null @@ -1,4 +0,0 @@ -vcsrepo { '/tmp/vcstest-svn-server': - ensure => present, - provider => svn, -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb deleted file mode 100644 index 8793e632cb7..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb +++ /dev/null @@ -1,42 +0,0 @@ -require 'tmpdir' -require 'digest/md5' -require 'fileutils' - -# Abstract -class Puppet::Provider::Vcsrepo < Puppet::Provider - - private - - def set_ownership - owner = @resource.value(:owner) || nil - group = @resource.value(:group) || nil - FileUtils.chown_R(owner, group, @resource.value(:path)) - end - - def path_exists? - File.directory?(@resource.value(:path)) - end - - def path_empty? - # Path is empty if the only entries are '.' and '..' - d = Dir.new(@resource.value(:path)) - d.read # should return '.' - d.read # should return '..' - d.read.nil? - end - - # Note: We don't rely on Dir.chdir's behavior of automatically returning the - # value of the last statement -- for easier stubbing. - def at_path(&block) #:nodoc: - value = nil - Dir.chdir(@resource.value(:path)) do - value = yield - end - value - end - - def tempdir - @tempdir ||= File.join(Dir.tmpdir, 'vcsrepo-' + Digest::MD5.hexdigest(@resource.value(:path))) - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb deleted file mode 100644 index 6688ce87b22..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb +++ /dev/null @@ -1,85 +0,0 @@ -require File.join(File.dirname(__FILE__), '..', 'vcsrepo') - -Puppet::Type.type(:vcsrepo).provide(:bzr, :parent => Puppet::Provider::Vcsrepo) do - desc "Supports Bazaar repositories" - - optional_commands :bzr => 'bzr' - has_features :reference_tracking - - def create - if !@resource.value(:source) - create_repository(@resource.value(:path)) - else - clone_repository(@resource.value(:revision)) - end - end - - def working_copy_exists? - File.directory?(File.join(@resource.value(:path), '.bzr')) - end - - def exists? - working_copy_exists? - end - - def destroy - FileUtils.rm_rf(@resource.value(:path)) - end - - def revision - at_path do - current_revid = bzr('version-info')[/^revision-id:\s+(\S+)/, 1] - desired = @resource.value(:revision) - begin - desired_revid = bzr('revision-info', desired).strip.split(/\s+/).last - rescue Puppet::ExecutionFailure - # Possible revid available during update (but definitely not current) - desired_revid = nil - end - if current_revid == desired_revid - desired - else - current_revid - end - end - end - - def revision=(desired) - at_path do - begin - bzr('update', '-r', desired) - rescue Puppet::ExecutionFailure - bzr('update', '-r', desired, ':parent') - end - end - end - - def latest - at_path do - bzr('version-info', ':parent')[/^revision-id:\s+(\S+)/, 1] - end - end - - def latest? - at_path do - return self.revision == self.latest - end - end - - private - - def create_repository(path) - bzr('init', path) - end - - def clone_repository(revision) - args = ['branch'] - if revision - args.push('-r', revision) - end - args.push(@resource.value(:source), - @resource.value(:path)) - bzr(*args) - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb deleted file mode 100644 index 206e73295e4..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb +++ /dev/null @@ -1,137 +0,0 @@ -require File.join(File.dirname(__FILE__), '..', 'vcsrepo') - -Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo) do - desc "Supports CVS repositories/workspaces" - - optional_commands :cvs => 'cvs' - has_features :gzip_compression, :reference_tracking, :modules, :cvs_rsh - - def create - if !@resource.value(:source) - create_repository(@resource.value(:path)) - else - checkout_repository - end - update_owner - end - - def exists? - if @resource.value(:source) - directory = File.join(@resource.value(:path), 'CVS') - else - directory = File.join(@resource.value(:path), 'CVSROOT') - end - File.directory?(directory) - end - - def working_copy_exists? - File.directory?(File.join(@resource.value(:path), 'CVS')) - end - - def destroy - FileUtils.rm_rf(@resource.value(:path)) - end - - def latest? - debug "Checking for updates because 'ensure => latest'" - at_path do - # We cannot use -P to prune empty dirs, otherwise - # CVS would report those as "missing", regardless - # if they have contents or updates. - is_current = (runcvs('-nq', 'update', '-d').strip == "") - if (!is_current) then debug "There are updates available on the checkout's current branch/tag." end - return is_current - end - end - - def latest - # CVS does not have a conecpt like commit-IDs or change - # sets, so we can only have the current branch name (or the - # requested one, if that differs) as the "latest" revision. - should = @resource.value(:revision) - current = self.revision - return should != current ? should : current - end - - def revision - if !@rev - if File.exist?(tag_file) - contents = File.read(tag_file).strip - # Note: Doesn't differentiate between N and T entries - @rev = contents[1..-1] - else - @rev = 'HEAD' - end - debug "Checkout is on branch/tag '#{@rev}'" - end - return @rev - end - - def revision=(desired) - at_path do - runcvs('update', '-dr', desired, '.') - update_owner - @rev = desired - end - end - - private - - def tag_file - File.join(@resource.value(:path), 'CVS', 'Tag') - end - - def checkout_repository - dirname, basename = File.split(@resource.value(:path)) - Dir.chdir(dirname) do - args = ['-d', @resource.value(:source)] - if @resource.value(:compression) - args.push('-z', @resource.value(:compression)) - end - args.push('checkout') - if @resource.value(:revision) - args.push('-r', @resource.value(:revision)) - end - args.push('-d', basename, module_name) - runcvs(*args) - end - end - - # When the source: - # * Starts with ':' (eg, :pserver:...) - def module_name - if (m = @resource.value(:module)) - m - elsif (source = @resource.value(:source)) - source[0, 1] == ':' ? File.basename(source) : '.' - end - end - - def create_repository(path) - runcvs('-d', path, 'init') - end - - def update_owner - if @resource.value(:owner) or @resource.value(:group) - set_ownership - end - end - - def runcvs(*args) - if @resource.value(:cvs_rsh) - debug "Using CVS_RSH = " + @resource.value(:cvs_rsh) - e = { :CVS_RSH => @resource.value(:cvs_rsh) } - else - e = {} - end - - # The location of withenv changed from Puppet 2.x to 3.x - withenv = Puppet::Util.method(:withenv) if Puppet::Util.respond_to?(:withenv) - withenv = Puppet::Util::Execution.method(:withenv) if Puppet::Util::Execution.respond_to?(:withenv) - fail("Cannot set custom environment #{e}") if e && !withenv - - withenv.call e do - Puppet.debug cvs *args - end - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb deleted file mode 100644 index f7b4e54b897..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb +++ /dev/null @@ -1,12 +0,0 @@ -require File.join(File.dirname(__FILE__), '..', 'vcsrepo') - -Puppet::Type.type(:vcsrepo).provide(:dummy, :parent => Puppet::Provider::Vcsrepo) do - desc "Dummy default provider" - - defaultfor :vcsrepo => :dummy - - def working_copy_exists? - providers = @resource.class.providers.map{|x| x.to_s}.sort.reject{|x| x == "dummy"}.join(", ") rescue "none" - raise("vcsrepo resource must have a provider, available: #{providers}") - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb deleted file mode 100644 index 47e84d29ec7..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb +++ /dev/null @@ -1,323 +0,0 @@ -require File.join(File.dirname(__FILE__), '..', 'vcsrepo') - -Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) do - desc "Supports Git repositories" - - ##TODO modify the commands below so that the su - is included - optional_commands :git => 'git', - :su => 'su' - has_features :bare_repositories, :reference_tracking, :ssh_identity, :multiple_remotes, :user - - def create - if !@resource.value(:source) - init_repository(@resource.value(:path)) - else - clone_repository(@resource.value(:source), @resource.value(:path)) - if @resource.value(:revision) - if @resource.value(:ensure) == :bare - notice "Ignoring revision for bare repository" - else - checkout - end - end - if @resource.value(:ensure) != :bare - update_submodules - end - end - update_owner_and_excludes - end - - def destroy - FileUtils.rm_rf(@resource.value(:path)) - end - - def latest? - at_path do - return self.revision == self.latest - end - end - - def latest - branch = on_branch? - if branch == 'master' - return get_revision("#{@resource.value(:remote)}/HEAD") - elsif branch == '(no branch)' - return get_revision('HEAD') - else - return get_revision("#{@resource.value(:remote)}/%s" % branch) - end - end - - def revision - update_references - current = at_path { git_with_identity('rev-parse', 'HEAD').chomp } - return current unless @resource.value(:revision) - - if tag_revision?(@resource.value(:revision)) - canonical = at_path { git_with_identity('show', @resource.value(:revision)).scan(/^commit (.*)/).to_s } - else - # if it's not a tag, look for it as a local ref - canonical = at_path { git_with_identity('rev-parse', '--revs-only', @resource.value(:revision)).chomp } - if canonical.empty? - # git rev-parse executed properly but didn't find the ref; - # look for it in the remote - remote_ref = at_path { git_with_identity('ls-remote', '--heads', '--tags', @resource.value(:remote), @resource.value(:revision)).chomp } - if remote_ref.empty? - fail("#{@resource.value(:revision)} is not a local or remote ref") - end - - # $ git ls-remote --heads --tags origin feature/cvs - # 7d4244b35e72904e30130cad6d2258f901c16f1a refs/heads/feature/cvs - canonical = remote_ref.split.first - end - end - - if current == canonical - @resource.value(:revision) - else - current - end - end - - def revision=(desired) - checkout(desired) - if local_branch_revision?(desired) - # reset instead of pull to avoid merge conflicts. assuming remote is - # authoritative. - # might be worthwhile to have an allow_local_changes param to decide - # whether to reset or pull when we're ensuring latest. - at_path { git_with_identity('reset', '--hard', "#{@resource.value(:remote)}/#{desired}") } - end - if @resource.value(:ensure) != :bare - update_submodules - end - update_owner_and_excludes - end - - def bare_exists? - bare_git_config_exists? && !working_copy_exists? - end - - def working_copy_exists? - File.directory?(File.join(@resource.value(:path), '.git')) - end - - def exists? - working_copy_exists? || bare_exists? - end - - def update_remote_origin_url - current = git_with_identity('config', 'remote.origin.url') - unless @resource.value(:source).nil? - if current.nil? or current.strip != @resource.value(:source) - git_with_identity('config', 'remote.origin.url', @resource.value(:source)) - end - end - end - - def update_references - at_path do - update_remote_origin_url - git_with_identity('fetch', @resource.value(:remote)) - git_with_identity('fetch', '--tags', @resource.value(:remote)) - update_owner_and_excludes - end - end - - private - - def bare_git_config_exists? - File.exist?(File.join(@resource.value(:path), 'config')) - end - - def clone_repository(source, path) - check_force - args = ['clone'] - if @resource.value(:ensure) == :bare - args << '--bare' - end - if !File.exist?(File.join(@resource.value(:path), '.git')) - args.push(source, path) - Dir.chdir("/") do - git_with_identity(*args) - end - else - notice "Repo has already been cloned" - end - end - - def check_force - if path_exists? and not path_empty? - if @resource.value(:force) - notice "Removing %s to replace with vcsrepo." % @resource.value(:path) - destroy - else - raise Puppet::Error, "Could not create repository (non-repository at path)" - end - end - end - - def init_repository(path) - check_force - if @resource.value(:ensure) == :bare && working_copy_exists? - convert_working_copy_to_bare - elsif @resource.value(:ensure) == :present && bare_exists? - convert_bare_to_working_copy - else - # normal init - FileUtils.mkdir(@resource.value(:path)) - FileUtils.chown(@resource.value(:user), nil, @resource.value(:path)) if @resource.value(:user) - args = ['init'] - if @resource.value(:ensure) == :bare - args << '--bare' - end - at_path do - git_with_identity(*args) - end - end - end - - # Convert working copy to bare - # - # Moves: - # /.git - # to: - # / - def convert_working_copy_to_bare - notice "Converting working copy repository to bare repository" - FileUtils.mv(File.join(@resource.value(:path), '.git'), tempdir) - FileUtils.rm_rf(@resource.value(:path)) - FileUtils.mv(tempdir, @resource.value(:path)) - end - - # Convert bare to working copy - # - # Moves: - # / - # to: - # /.git - def convert_bare_to_working_copy - notice "Converting bare repository to working copy repository" - FileUtils.mv(@resource.value(:path), tempdir) - FileUtils.mkdir(@resource.value(:path)) - FileUtils.mv(tempdir, File.join(@resource.value(:path), '.git')) - if commits_in?(File.join(@resource.value(:path), '.git')) - reset('HEAD') - git_with_identity('checkout', '--force') - update_owner_and_excludes - end - end - - def commits_in?(dot_git) - Dir.glob(File.join(dot_git, 'objects/info/*'), File::FNM_DOTMATCH) do |e| - return true unless %w(. ..).include?(File::basename(e)) - end - false - end - - def checkout(revision = @resource.value(:revision)) - if !local_branch_revision? && remote_branch_revision? - at_path { git_with_identity('checkout', '-b', revision, '--track', "#{@resource.value(:remote)}/#{revision}") } - else - at_path { git_with_identity('checkout', '--force', revision) } - end - end - - def reset(desired) - at_path do - git_with_identity('reset', '--hard', desired) - end - end - - def update_submodules - at_path do - git_with_identity('submodule', 'update', '--init', '--recursive') - end - end - - def remote_branch_revision?(revision = @resource.value(:revision)) - # git < 1.6 returns '#{@resource.value(:remote)}/#{revision}' - # git 1.6+ returns 'remotes/#{@resource.value(:remote)}/#{revision}' - branch = at_path { branches.grep /(remotes\/)?#{@resource.value(:remote)}\/#{revision}/ } - branch unless branch.empty? - end - - def local_branch_revision?(revision = @resource.value(:revision)) - at_path { branches.include?(revision) } - end - - def tag_revision?(revision = @resource.value(:revision)) - at_path { tags.include?(revision) } - end - - def branches - at_path { git_with_identity('branch', '-a') }.gsub('*', ' ').split(/\n/).map { |line| line.strip } - end - - def on_branch? - at_path { git_with_identity('branch', '-a') }.split(/\n/).grep(/\*/).first.to_s.gsub('*', '').strip - end - - def tags - at_path { git_with_identity('tag', '-l') }.split(/\n/).map { |line| line.strip } - end - - def set_excludes - at_path { open('.git/info/exclude', 'w') { |f| @resource.value(:excludes).each { |ex| f.write(ex + "\n") }}} - end - - def get_revision(rev) - if !working_copy_exists? - create - end - at_path do - update_remote_origin_url - git_with_identity('fetch', @resource.value(:remote)) - git_with_identity('fetch', '--tags', @resource.value(:remote)) - end - current = at_path { git_with_identity('rev-parse', rev).strip } - if @resource.value(:revision) - if local_branch_revision? - canonical = at_path { git_with_identity('rev-parse', @resource.value(:revision)).strip } - elsif remote_branch_revision? - canonical = at_path { git_with_identity('rev-parse', "#{@resource.value(:remote)}/" + @resource.value(:revision)).strip } - end - current = @resource.value(:revision) if current == canonical - end - update_owner_and_excludes - return current - end - - def update_owner_and_excludes - if @resource.value(:owner) or @resource.value(:group) - set_ownership - end - if @resource.value(:excludes) - set_excludes - end - end - - def git_with_identity(*args) - if @resource.value(:identity) - Tempfile.open('git-helper') do |f| - f.puts '#!/bin/sh' - f.puts "exec ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -oConnectTimeout=120 -i #{@resource.value(:identity)} $*" - f.close - - FileUtils.chmod(0755, f.path) - env_save = ENV['GIT_SSH'] - ENV['GIT_SSH'] = f.path - - ret = git(*args) - - ENV['GIT_SSH'] = env_save - - return ret - end - elsif @resource.value(:user) - su(@resource.value(:user), '-c', "git #{args.join(' ')}" ) - else - git(*args) - end - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb deleted file mode 100644 index 4886b7a1f8e..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb +++ /dev/null @@ -1,115 +0,0 @@ -require File.join(File.dirname(__FILE__), '..', 'vcsrepo') - -Puppet::Type.type(:vcsrepo).provide(:hg, :parent => Puppet::Provider::Vcsrepo) do - desc "Supports Mercurial repositories" - - optional_commands :hg => 'hg', - :su => 'su' - has_features :reference_tracking, :ssh_identity, :user - - def create - if !@resource.value(:source) - create_repository(@resource.value(:path)) - else - clone_repository(@resource.value(:revision)) - end - update_owner - end - - def working_copy_exists? - File.directory?(File.join(@resource.value(:path), '.hg')) - end - - def exists? - working_copy_exists? - end - - def destroy - FileUtils.rm_rf(@resource.value(:path)) - end - - def latest? - at_path do - return self.revision == self.latest - end - end - - def latest - at_path do - begin - hg_wrapper('incoming', '--branch', '.', '--newest-first', '--limit', '1')[/^changeset:\s+(?:-?\d+):(\S+)/m, 1] - rescue Puppet::ExecutionFailure - # If there are no new changesets, return the current nodeid - self.revision - end - end - end - - def revision - at_path do - current = hg_wrapper('parents')[/^changeset:\s+(?:-?\d+):(\S+)/m, 1] - desired = @resource.value(:revision) - if desired - # Return the tag name if it maps to the current nodeid - mapped = hg_wrapper('tags')[/^#{Regexp.quote(desired)}\s+\d+:(\S+)/m, 1] - if current == mapped - desired - else - current - end - else - current - end - end - end - - def revision=(desired) - at_path do - begin - hg_wrapper('pull') - rescue - end - begin - hg_wrapper('merge') - rescue Puppet::ExecutionFailure - # If there's nothing to merge, just skip - end - hg_wrapper('update', '--clean', '-r', desired) - end - update_owner - end - - private - - def create_repository(path) - hg_wrapper('init', path) - end - - def clone_repository(revision) - args = ['clone'] - if revision - args.push('-u', revision) - end - args.push(@resource.value(:source), - @resource.value(:path)) - hg_wrapper(*args) - end - - def update_owner - if @resource.value(:owner) or @resource.value(:group) - set_ownership - end - end - - def hg_wrapper(*args) - if @resource.value(:identity) - args += ["--ssh", "ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -i #{@resource.value(:identity)}"] - end - if @resource.value(:user) - args.map! { |a| if a =~ /\s/ then "'#{a}'" else a end } # Adds quotes to arguments with whitespaces. - su(@resource.value(:user), '-c', "hg #{args.join(' ')}") - else - hg(*args) - end - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb deleted file mode 100644 index e0d5b2164e6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb +++ /dev/null @@ -1,124 +0,0 @@ -require File.join(File.dirname(__FILE__), '..', 'vcsrepo') - -Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo) do - desc "Supports Subversion repositories" - - optional_commands :svn => 'svn', - :svnadmin => 'svnadmin', - :svnlook => 'svnlook' - - has_features :filesystem_types, :reference_tracking, :basic_auth, :configuration - - def create - if !@resource.value(:source) - create_repository(@resource.value(:path)) - else - checkout_repository(@resource.value(:source), - @resource.value(:path), - @resource.value(:revision)) - end - update_owner - end - - def working_copy_exists? - if File.directory?(@resource.value(:path)) - # :path is an svn checkout - return true if File.directory?(File.join(@resource.value(:path), '.svn')) - # :path is an svn server - return true if svnlook('uuid', @resource.value(:path)) - end - false - end - - def exists? - working_copy_exists? - end - - def destroy - FileUtils.rm_rf(@resource.value(:path)) - end - - def latest? - at_path do - (self.revision >= self.latest) and (@resource.value(:source) == self.sourceurl) - end - end - - def buildargs - args = ['--non-interactive'] - if @resource.value(:basic_auth_username) && @resource.value(:basic_auth_password) - args.push('--username', @resource.value(:basic_auth_username)) - args.push('--password', @resource.value(:basic_auth_password)) - args.push('--no-auth-cache') - end - - if @resource.value(:force) - args.push('--force') - end - - if @resource.value(:configuration) - args.push('--config-dir', @resource.value(:configuration)) - end - - args - end - - def latest - args = buildargs.push('info', '-r', 'HEAD') - at_path do - svn(*args)[/^Revision:\s+(\d+)/m, 1] - end - end - - def sourceurl - args = buildargs.push('info') - at_path do - svn(*args)[/^URL:\s+(\S+)/m, 1] - end - end - - def revision - args = buildargs.push('info') - at_path do - svn(*args)[/^Revision:\s+(\d+)/m, 1] - end - end - - def revision=(desired) - args = if @resource.value(:source) - buildargs.push('switch', '-r', desired, @resource.value(:source)) - else - buildargs.push('update', '-r', desired) - end - at_path do - svn(*args) - end - update_owner - end - - private - - def checkout_repository(source, path, revision) - args = buildargs.push('checkout') - if revision - args.push('-r', revision) - end - args.push(source, path) - svn(*args) - end - - def create_repository(path) - args = ['create'] - if @resource.value(:fstype) - args.push('--fs-type', @resource.value(:fstype)) - end - args << path - svnadmin(*args) - end - - def update_owner - if @resource.value(:owner) or @resource.value(:group) - set_ownership - end - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb deleted file mode 100644 index ad90cedd833..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb +++ /dev/null @@ -1,198 +0,0 @@ -require 'pathname' - -Puppet::Type.newtype(:vcsrepo) do - desc "A local version control repository" - - feature :gzip_compression, - "The provider supports explicit GZip compression levels" - feature :basic_auth, - "The provider supports HTTP Basic Authentication" - feature :bare_repositories, - "The provider differentiates between bare repositories - and those with working copies", - :methods => [:bare_exists?, :working_copy_exists?] - - feature :filesystem_types, - "The provider supports different filesystem types" - - feature :reference_tracking, - "The provider supports tracking revision references that can change - over time (eg, some VCS tags and branch names)" - - feature :ssh_identity, - "The provider supports a configurable SSH identity file" - - feature :user, - "The provider can run as a different user" - - feature :modules, - "The repository contains modules that can be chosen of" - - feature :multiple_remotes, - "The repository tracks multiple remote repositories" - - feature :configuration, - "The configuration directory to use" - - feature :cvs_rsh, - "The provider understands the CVS_RSH environment variable" - - ensurable do - attr_accessor :latest - - def insync?(is) - @should ||= [] - - case should - when :present - return true unless [:absent, :purged, :held].include?(is) - when :latest - if is == :latest - return true - else - return false - end - when :bare - return is == :bare - end - end - - newvalue :present do - notice "Creating repository from present" - provider.create - end - - newvalue :bare, :required_features => [:bare_repositories] do - if !provider.exists? - provider.create - end - end - - newvalue :absent do - provider.destroy - end - - newvalue :latest, :required_features => [:reference_tracking] do - if provider.exists? - if provider.respond_to?(:update_references) - provider.update_references - end - if provider.respond_to?(:latest?) - reference = provider.latest || provider.revision - else - reference = resource.value(:revision) || provider.revision - end - notice "Updating to latest '#{reference}' revision" - provider.revision = reference - else - notice "Creating repository from latest" - provider.create - end - end - - def retrieve - prov = @resource.provider - if prov - if prov.working_copy_exists? - (@should.include?(:latest) && prov.latest?) ? :latest : :present - elsif prov.class.feature?(:bare_repositories) and prov.bare_exists? - :bare - else - :absent - end - else - raise Puppet::Error, "Could not find provider" - end - end - - end - - newparam :path do - desc "Absolute path to repository" - isnamevar - validate do |value| - path = Pathname.new(value) - unless path.absolute? - raise ArgumentError, "Path must be absolute: #{path}" - end - end - end - - newparam :source do - desc "The source URI for the repository" - end - - newparam :fstype, :required_features => [:filesystem_types] do - desc "Filesystem type" - end - - newproperty :revision do - desc "The revision of the repository" - newvalue(/^\S+$/) - end - - newparam :owner do - desc "The user/uid that owns the repository files" - end - - newparam :group do - desc "The group/gid that owns the repository files" - end - - newparam :user do - desc "The user to run for repository operations" - end - - newparam :excludes do - desc "Files to be excluded from the repository" - end - - newparam :force do - desc "Force repository creation, destroying any files on the path in the process." - newvalues(:true, :false) - defaultto false - end - - newparam :compression, :required_features => [:gzip_compression] do - desc "Compression level" - validate do |amount| - unless Integer(amount).between?(0, 6) - raise ArgumentError, "Unsupported compression level: #{amount} (expected 0-6)" - end - end - end - - newparam :basic_auth_username, :required_features => [:basic_auth] do - desc "HTTP Basic Auth username" - end - - newparam :basic_auth_password, :required_features => [:basic_auth] do - desc "HTTP Basic Auth password" - end - - newparam :identity, :required_features => [:ssh_identity] do - desc "SSH identity file" - end - - newparam :module, :required_features => [:modules] do - desc "The repository module to manage" - end - - newparam :remote, :required_features => [:multiple_remotes] do - desc "The remote repository to track" - defaultto "origin" - end - - newparam :configuration, :required_features => [:configuration] do - desc "The configuration directory to use" - end - - newparam :cvs_rsh, :required_features => [:cvs_rsh] do - desc "The value to be used for the CVS_RSH environment variable." - end - - autorequire(:package) do - ['git', 'git-core'] - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt deleted file mode 100644 index 88a56a1c80f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt +++ /dev/null @@ -1,5 +0,0 @@ -revision-id: menesis@pov.lt-20100309191856-4wmfqzc803fj300x -date: 2010-03-09 21:18:56 +0200 -build-date: 2010-03-14 00:42:43 -0800 -revno: 2634 -branch-nick: mytest diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt deleted file mode 100644 index 2c99829d48f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt +++ /dev/null @@ -1,14 +0,0 @@ - feature/foo - feature/bar - feature/baz - feature/quux - only/local -* master - refactor/foo - origin/HEAD - origin/feature/foo - origin/feature/bar - origin/feature/baz - origin/feature/quux - origin/only/remote - origin/master diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt deleted file mode 100644 index 72d5e2009c5..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt +++ /dev/null @@ -1,14 +0,0 @@ - feature/foo -* feature/bar - feature/baz - feature/quux - only/local - master - refactor/foo - origin/HEAD - origin/feature/foo - origin/feature/bar - origin/feature/baz - origin/feature/quux - origin/only/remote - origin/master diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt deleted file mode 100644 index 7207c37929b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt +++ /dev/null @@ -1,15 +0,0 @@ - feature/foo - feature/bar - feature/baz - feature/quux - only/local - master -* (no branch) - refactor/foo - origin/HEAD - origin/feature/foo - origin/feature/bar - origin/feature/baz - origin/feature/quux - origin/only/remote - origin/master diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt deleted file mode 100644 index 46173df499d..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt +++ /dev/null @@ -1,6 +0,0 @@ -changeset: 3:34e6012c783a -parent: 2:21ea4598c962 -parent: 1:9d0ff0028458 -user: Test User -date: Fri Aug 07 13:13:02 2009 -0400 -summary: merge diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt deleted file mode 100644 index 53792e5ac8d..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt +++ /dev/null @@ -1,18 +0,0 @@ -tip 1019:bca3f20b249b -0.9.1 1017:76ce7cca95d8 -0.9 1001:dbaa6f4ec585 -0.8 839:65b66ac0fc83 -0.7.1 702:e1357f00129f -0.7 561:7b2af3b4c968 -0.6.3 486:e38077f4e4aa -0.6.2 405:07bb099b7b10 -0.6.1 389:93750f3fbbe2 -0.6 369:34e6012c783a -0.5.3 321:5ffa6ae7e699 -0.5.2 318:fdc2c2e4cebe -0.5.1 315:33a5ea0cbe7a -0.5 313:47490716f4c9 -0.4 240:47fa3a14cc63 -0.3.1 132:bc231db18e1c -0.3 130:661615e510dd -0.2 81:f98d13b442f6 diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt deleted file mode 100644 index d2a975b238f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt +++ /dev/null @@ -1,10 +0,0 @@ -Path: . -URL: http://example.com/svn/trunk -Repository Root: http://example.com/svn -Repository UUID: 75246ace-e253-0410-96dd-a7613ca8dc81 -Revision: 4 -Node Kind: directory -Schedule: normal -Last Changed Author: jon -Last Changed Rev: 3 -Last Changed Date: 2008-08-07 11:34:25 -0700 (Thu, 07 Aug 2008) diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec.opts deleted file mode 100644 index 91cd6427ed6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec.opts +++ /dev/null @@ -1,6 +0,0 @@ ---format -s ---colour ---loadby -mtime ---backtrace diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb deleted file mode 100644 index acfae0cb8cb..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'puppetlabs_spec_helper/module_spec_helper' -require 'simplecov' -require 'support/filesystem_helpers' -require 'support/fixture_helpers' - -SimpleCov.start do - add_filter "/spec/" -end - -RSpec.configure do |c| - c.include FilesystemHelpers - c.include FixtureHelpers -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb deleted file mode 100644 index 15e2ca750a4..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb +++ /dev/null @@ -1,18 +0,0 @@ -module FilesystemHelpers - - def expects_chdir(path = resource.value(:path)) - Dir.expects(:chdir).with(path).at_least_once.yields - end - - def expects_mkdir(path = resource.value(:path)) - Dir.expects(:mkdir).with(path).at_least_once - end - - def expects_rm_rf(path = resource.value(:path)) - FileUtils.expects(:rm_rf).with(path) - end - - def expects_directory?(returns = true, path = resource.value(:path)) - File.expects(:directory?).with(path).returns(returns) - end -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb deleted file mode 100644 index 8a0e0a0b4cc..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb +++ /dev/null @@ -1,7 +0,0 @@ -module FixtureHelpers - - def fixture(name, ext = '.txt') - File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', name.to_s + ext)) - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb deleted file mode 100644 index 488ddc0f90a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb +++ /dev/null @@ -1,109 +0,0 @@ -require 'spec_helper' - -describe Puppet::Type.type(:vcsrepo).provider(:bzr_provider) do - - let(:resource) { Puppet::Type.type(:vcsrepo).new({ - :name => 'test', - :ensure => :present, - :provider => :bzr, - :revision => '2634', - :source => 'lp:do', - :path => '/tmp/test', - })} - - let(:provider) { resource.provider } - - before :each do - Puppet::Util.stubs(:which).with('bzr').returns('/usr/bin/bzr') - end - - describe 'creating' do - context 'with defaults' do - it "should execute 'bzr clone -r' with the revision" do - provider.expects(:bzr).with('branch', '-r', resource.value(:revision), resource.value(:source), resource.value(:path)) - provider.create - end - end - - context 'without revision' do - it "should just execute 'bzr clone' without a revision" do - resource.delete(:revision) - provider.expects(:bzr).with('branch', resource.value(:source), resource.value(:path)) - provider.create - end - end - - context 'without source' do - it "should execute 'bzr init'" do - resource.delete(:source) - provider.expects(:bzr).with('init', resource.value(:path)) - provider.create - end - end - end - - describe 'destroying' do - it "it should remove the directory" do - provider.destroy - end - end - - describe "checking existence" do - it "should check for the directory" do - File.expects(:directory?).with(File.join(resource.value(:path), '.bzr')).returns(true) - provider.exists? - end - end - - describe "checking the revision property" do - before do - expects_chdir - provider.expects(:bzr).with('version-info').returns(File.read(fixtures('bzr_version_info.txt'))) - @current_revid = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x' - end - - context "when given a non-revid as the resource revision" do - context "when its revid is not different than the current revid" do - it "should return the ref" do - resource[:revision] = '2634' - provider.expects(:bzr).with('revision-info', '2634').returns("2634 menesis@pov.lt-20100309191856-4wmfqzc803fj300x\n") - provider.revision.should == resource.value(:revision) - end - end - context "when its revid is different than the current revid" do - it "should return the current revid" do - resource[:revision] = '2636' - provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2635 foo\n") - provider.revision.should == @current_revid - end - end - end - - context "when given a revid as the resource revision" do - context "when it is the same as the current revid" do - it "should return it" do - resource[:revision] = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x' - provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("1234 #{resource.value(:revision)}\n") - provider.revision.should == resource.value(:revision) - end - end - context "when it is not the same as the current revid" do - it "should return the current revid" do - resource[:revision] = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300y' - provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2636 foo\n") - provider.revision.should == @current_revid - end - end - - end - end - - describe "setting the revision property" do - it "should use 'bzr update -r' with the revision" do - Dir.expects(:chdir).with('/tmp/test').at_least_once.yields - provider.expects(:bzr).with('update', '-r', 'somerev') - provider.revision = 'somerev' - end - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb deleted file mode 100644 index efa4b33b36a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb +++ /dev/null @@ -1,115 +0,0 @@ -require 'spec_helper' - -describe Puppet::Type.type(:vcsrepo).provider(:cvs_provider) do - - let(:resource) { Puppet::Type.type(:vcsrepo).new({ - :name => 'test', - :ensure => :present, - :provider => :cvs, - :revision => '2634', - :source => 'lp:do', - :path => '/tmp/test', - })} - - let(:provider) { resource.provider } - - before :each do - Puppet::Util.stubs(:which).with('cvs').returns('/usr/bin/cvs') - end - - describe 'creating' do - context "with a source" do - it "should execute 'cvs checkout'" do - resource[:source] = ':ext:source@example.com:/foo/bar' - resource[:revision] = 'an-unimportant-value' - expects_chdir('/tmp') - provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-r', 'an-unimportant-value', '-d', 'test', 'bar') - provider.create - end - - it "should just execute 'cvs checkout' without a revision" do - resource[:source] = ':ext:source@example.com:/foo/bar' - resource.delete(:revision) - provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-d', File.basename(resource.value(:path)), File.basename(resource.value(:source))) - provider.create - end - - context "with a compression" do - it "should just execute 'cvs checkout' without a revision" do - resource[:source] = ':ext:source@example.com:/foo/bar' - resource[:compression] = '3' - resource.delete(:revision) - provider.expects(:cvs).with('-d', resource.value(:source), '-z', '3', 'checkout', '-d', File.basename(resource.value(:path)), File.basename(resource.value(:source))) - provider.create - end - end - end - - context "when a source is not given" do - it "should execute 'cvs init'" do - resource.delete(:source) - provider.expects(:cvs).with('-d', resource.value(:path), 'init') - provider.create - end - end - end - - describe 'destroying' do - it "it should remove the directory" do - provider.destroy - end - end - - describe "checking existence" do - it "should check for the CVS directory with source" do - resource[:source] = ':ext:source@example.com:/foo/bar' - File.expects(:directory?).with(File.join(resource.value(:path), 'CVS')) - provider.exists? - end - - it "should check for the CVSROOT directory without source" do - resource.delete(:source) - File.expects(:directory?).with(File.join(resource.value(:path), 'CVSROOT')) - provider.exists? - end - end - - describe "checking the revision property" do - before do - @tag_file = File.join(resource.value(:path), 'CVS', 'Tag') - end - - context "when CVS/Tag exists" do - before do - @tag = 'TAG' - File.expects(:exist?).with(@tag_file).returns(true) - end - it "should read CVS/Tag" do - File.expects(:read).with(@tag_file).returns("T#{@tag}") - provider.revision.should == @tag - end - end - - context "when CVS/Tag does not exist" do - before do - File.expects(:exist?).with(@tag_file).returns(false) - end - it "assumes HEAD" do - provider.revision.should == 'HEAD' - end - end - end - - describe "when setting the revision property" do - before do - @tag = 'SOMETAG' - end - - it "should use 'cvs update -dr'" do - expects_chdir - provider.expects(:cvs).with('update', '-dr', @tag, '.') - provider.revision = @tag - end - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb deleted file mode 100644 index 15fee535654..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb +++ /dev/null @@ -1,369 +0,0 @@ -require 'spec_helper' - -describe Puppet::Type.type(:vcsrepo).provider(:git_provider) do - - let(:resource) { Puppet::Type.type(:vcsrepo).new({ - :name => 'test', - :ensure => :present, - :provider => :git, - :revision => '2634', - :source => 'git@repo', - :path => '/tmp/test', - })} - - let(:provider) { resource.provider } - - before :each do - Puppet::Util.stubs(:which).with('git').returns('/usr/bin/git') - end - - context 'creating' do - context "with a revision that is a remote branch" do - it "should execute 'git clone' and 'git checkout -b'" do - resource[:revision] = 'only/remote' - Dir.expects(:chdir).with('/').at_least_once.yields - Dir.expects(:chdir).with('/tmp/test').at_least_once.yields - provider.expects(:git).with('clone', resource.value(:source), resource.value(:path)) - provider.expects(:update_submodules) - provider.expects(:git).with('branch', '-a').returns(resource.value(:revision)) - provider.expects(:git).with('checkout', '--force', resource.value(:revision)) - provider.create - end - end - - context "with a revision that is not a remote branch" do - it "should execute 'git clone' and 'git reset --hard'" do - resource[:revision] = 'a-commit-or-tag' - Dir.expects(:chdir).with('/').at_least_once.yields - Dir.expects(:chdir).with('/tmp/test').at_least_once.yields - provider.expects(:git).with('clone', resource.value(:source), resource.value(:path)) - provider.expects(:update_submodules) - provider.expects(:git).with('branch', '-a').returns(resource.value(:revision)) - provider.expects(:git).with('checkout', '--force', resource.value(:revision)) - provider.create - end - - it "should execute 'git clone' and submodule commands" do - resource.delete(:revision) - provider.expects(:git).with('clone', resource.value(:source), resource.value(:path)) - provider.expects(:update_submodules) - provider.create - end - end - - context "with an ensure of bare" do - context "with revision" do - it "should just execute 'git clone --bare'" do - resource[:ensure] = :bare - provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path)) - provider.create - end - end - context "without revision" do - it "should just execute 'git clone --bare'" do - resource[:ensure] = :bare - resource.delete(:revision) - provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path)) - provider.create - end - end - end - - context "when a source is not given" do - context "when the path does not exist" do - it "should execute 'git init'" do - resource[:ensure] = :present - resource.delete(:source) - expects_mkdir - expects_chdir - expects_directory?(false) - - provider.expects(:bare_exists?).returns(false) - provider.expects(:git).with('init') - provider.create - end - end - - context "when the path is a bare repository" do - it "should convert it to a working copy" do - resource[:ensure] = :present - resource.delete(:source) - provider.expects(:bare_exists?).returns(true) - provider.expects(:convert_bare_to_working_copy) - provider.create - end - end - - context "when the path is not empty and not a repository" do - it "should raise an exception" do - provider.expects(:path_exists?).returns(true) - provider.expects(:path_empty?).returns(false) - proc { provider.create }.should raise_error(Puppet::Error) - end - end - end - - context "when the path does not exist" do - it "should execute 'git init --bare'" do - resource[:ensure] = :bare - resource.delete(:source) - expects_chdir - expects_mkdir - expects_directory?(false) - provider.expects(:working_copy_exists?).returns(false) - provider.expects(:git).with('init', '--bare') - provider.create - end - end - - context "when the path is a working copy repository" do - it "should convert it to a bare repository" do - resource[:ensure] = :bare - resource.delete(:source) - provider.expects(:working_copy_exists?).returns(true) - provider.expects(:convert_working_copy_to_bare) - provider.create - end - end - - context "when the path is not empty and not a repository" do - it "should raise an exception" do - expects_directory?(true) - provider.expects(:path_empty?).returns(false) - proc { provider.create }.should raise_error(Puppet::Error) - end - end - end - - - context 'destroying' do - it "it should remove the directory" do - #expects_rm_rf - provider.destroy - end - end - - context "checking the revision property" do - before do - expects_chdir('/tmp/test') - resource[:revision] = 'currentsha' - resource.delete(:source) - provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha') - end - - context "when its SHA is not different than the current SHA" do - it "should return the ref" do - provider.expects(:git).with('config', 'remote.origin.url').returns('') - provider.expects(:git).with('fetch', 'origin') # FIXME - provider.expects(:git).with('fetch', '--tags', 'origin') - provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha') - provider.expects(:git).with('tag', '-l').returns("Hello") - provider.revision.should == resource.value(:revision) - end - end - - context "when its SHA is different than the current SHA" do - it "should return the current SHA" do - provider.expects(:git).with('config', 'remote.origin.url').returns('') - provider.expects(:git).with('fetch', 'origin') # FIXME - provider.expects(:git).with('fetch', '--tags', 'origin') - provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('othersha') - provider.expects(:git).with('tag', '-l').returns("Hello") - provider.revision.should == 'currentsha' - end - end - - context "when its a ref to a remote head" do - it "should return the revision" do - provider.expects(:git).with('config', 'remote.origin.url').returns('') - provider.expects(:git).with('fetch', 'origin') # FIXME - provider.expects(:git).with('fetch', '--tags', 'origin') - provider.expects(:git).with('tag', '-l').returns("Hello") - provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('') - provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns("newsha refs/heads/#{resource.value(:revision)}") - provider.revision.should == 'currentsha' - end - end - - context "when its a ref to non existant remote head" do - it "should fail" do - provider.expects(:git).with('config', 'remote.origin.url').returns('') - provider.expects(:git).with('fetch', 'origin') # FIXME - provider.expects(:git).with('fetch', '--tags', 'origin') - provider.expects(:git).with('tag', '-l').returns("Hello") - provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('') - provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns('') - expect { provider.revision }.to raise_error(Puppet::Error, /not a local or remote ref$/) - end - end - - context "when the source is modified" do - it "should update the origin url" do - resource[:source] = 'git://git@foo.com/bar.git' - provider.expects(:git).with('config', 'remote.origin.url').returns('old') - provider.expects(:git).with('config', 'remote.origin.url', 'git://git@foo.com/bar.git') - provider.expects(:git).with('fetch', 'origin') # FIXME - provider.expects(:git).with('fetch', '--tags', 'origin') - provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha') - provider.expects(:git).with('tag', '-l').returns("Hello") - provider.revision.should == resource.value(:revision) - end - end - end - - context "setting the revision property" do - before do - expects_chdir - end - context "when it's an existing local branch" do - it "should use 'git fetch' and 'git reset'" do - resource[:revision] = 'feature/foo' - provider.expects(:update_submodules) - provider.expects(:git).with('branch', '-a').returns(resource.value(:revision)) - provider.expects(:git).with('checkout', '--force', resource.value(:revision)) - provider.expects(:git).with('branch', '-a').returns(resource.value(:revision)) - provider.expects(:git).with('reset', '--hard', "origin/#{resource.value(:revision)}") - provider.revision = resource.value(:revision) - end - end - context "when it's a remote branch" do - it "should use 'git fetch' and 'git reset'" do - resource[:revision] = 'only/remote' - provider.expects(:update_submodules) - provider.expects(:git).with('branch', '-a').returns(resource.value(:revision)) - provider.expects(:git).with('checkout', '--force', resource.value(:revision)) - provider.expects(:git).with('branch', '-a').returns(resource.value(:revision)) - provider.expects(:git).with('reset', '--hard', "origin/#{resource.value(:revision)}") - provider.revision = resource.value(:revision) - end - end - context "when it's a commit or tag" do - it "should use 'git fetch' and 'git reset'" do - resource[:revision] = 'a-commit-or-tag' - provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a)) - provider.expects(:git).with('checkout', '--force', resource.value(:revision)) - provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a)) - provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a)) - provider.expects(:git).with('submodule', 'update', '--init', '--recursive') - provider.revision = resource.value(:revision) - end - end - end - - context "updating references" do - it "should use 'git fetch --tags'" do - resource.delete(:source) - expects_chdir - provider.expects(:git).with('config', 'remote.origin.url').returns('') - provider.expects(:git).with('fetch', 'origin') - provider.expects(:git).with('fetch', '--tags', 'origin') - provider.update_references - end - end - - context "checking if revision" do - before do - expects_chdir - provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a)) - end - context "is a local branch" do - context "when it's listed in 'git branch -a'" do - it "should return true" do - resource[:revision] = 'feature/foo' - provider.should be_local_branch_revision - end - end - context "when it's not listed in 'git branch -a'" do - it "should return false" do - resource[:revision] = 'feature/notexist' - provider.should_not be_local_branch_revision - end - end - end - context "is a remote branch" do - context "when it's listed in 'git branch -a' with an 'origin/' prefix" do - it "should return true" do - resource[:revision] = 'only/remote' - provider.should be_remote_branch_revision - end - end - context "when it's not listed in 'git branch -a' with an 'origin/' prefix" do - it "should return false" do - resource[:revision] = 'only/local' - provider.should_not be_remote_branch_revision - end - end - end - end - - describe 'latest?' do - before do - expects_chdir('/tmp/test') - end - context 'when true' do - it do - provider.expects(:revision).returns('testrev') - provider.expects(:latest).returns('testrev') - provider.latest?.should be_true - end - end - context 'when false' do - it do - provider.expects(:revision).returns('master') - provider.expects(:latest).returns('testrev') - provider.latest?.should be_false - end - end - end - - describe 'latest' do - before do - provider.expects(:get_revision).returns('master') - expects_chdir - end - context 'on master' do - it do - provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a)) - provider.latest.should == 'master' - end - end - context 'no branch' do - it do - provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_none)) - provider.latest.should == 'master' - end - end - context 'feature/bar' do - it do - provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_feature_bar)) - provider.latest.should == 'master' - end - end - end - - describe 'convert_working_copy_to_bare' do - it do - FileUtils.expects(:mv).returns(true) - FileUtils.expects(:rm_rf).returns(true) - FileUtils.expects(:mv).returns(true) - - provider.instance_eval { convert_working_copy_to_bare } - end - end - - describe 'convert_bare_to_working_copy' do - it do - FileUtils.expects(:mv).returns(true) - FileUtils.expects(:mkdir).returns(true) - FileUtils.expects(:mv).returns(true) - provider.expects(:commits_in?).returns(true) - # If you forget to stub these out you lose 3 hours of rspec work. - provider.expects(:reset).with('HEAD').returns(true) - provider.expects(:git_with_identity).returns(true) - provider.expects(:update_owner_and_excludes).returns(true) - - provider.instance_eval { convert_bare_to_working_copy } - end - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb deleted file mode 100644 index 7fd53486a74..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb +++ /dev/null @@ -1,122 +0,0 @@ -require 'spec_helper' - -describe Puppet::Type.type(:vcsrepo).provider(:hg) do - - let(:resource) { Puppet::Type.type(:vcsrepo).new({ - :name => 'test', - :ensure => :present, - :provider => :hg, - :path => '/tmp/vcsrepo', - })} - - let(:provider) { resource.provider } - - before :each do - Puppet::Util.stubs(:which).with('hg').returns('/usr/bin/hg') - end - - describe 'creating' do - context 'with source and revision' do - it "should execute 'hg clone -u' with the revision" do - resource[:source] = 'something' - resource[:revision] = '1' - provider.expects(:hg).with('clone', '-u', - resource.value(:revision), - resource.value(:source), - resource.value(:path)) - provider.create - end - end - - context 'without revision' do - it "should just execute 'hg clone' without a revision" do - resource[:source] = 'something' - provider.expects(:hg).with('clone', resource.value(:source), resource.value(:path)) - provider.create - end - end - - context "when a source is not given" do - it "should execute 'hg init'" do - provider.expects(:hg).with('init', resource.value(:path)) - provider.create - end - end - end - - describe 'destroying' do - it "it should remove the directory" do - expects_rm_rf - provider.destroy - end - end - - describe "checking existence" do - it "should check for the directory" do - expects_directory?(true, File.join(resource.value(:path), '.hg')) - provider.exists? - end - end - - describe "checking the revision property" do - before do - expects_chdir - end - - context "when given a non-SHA as the resource revision" do - before do - provider.expects(:hg).with('parents').returns(fixture(:hg_parents)) - provider.expects(:hg).with('tags').returns(fixture(:hg_tags)) - end - - context "when its SHA is not different than the current SHA" do - it "should return the ref" do - resource[:revision] = '0.6' - provider.revision.should == '0.6' - end - end - - context "when its SHA is different than the current SHA" do - it "should return the current SHA" do - resource[:revision] = '0.5.3' - provider.revision.should == '34e6012c783a' - end - end - end - context "when given a SHA as the resource revision" do - before do - provider.expects(:hg).with('parents').returns(fixture(:hg_parents)) - end - - context "when it is the same as the current SHA", :resource => {:revision => '34e6012c783a'} do - it "should return it" do - resource[:revision] = '34e6012c783a' - provider.expects(:hg).with('tags').returns(fixture(:hg_tags)) - provider.revision.should == resource.value(:revision) - end - end - - context "when it is not the same as the current SHA", :resource => {:revision => 'not-the-same'} do - it "should return the current SHA" do - resource[:revision] = 'not-the-same' - provider.expects(:hg).with('tags').returns(fixture(:hg_tags)) - provider.revision.should == '34e6012c783a' - end - end - end - end - - describe "setting the revision property" do - before do - @revision = '6aa99e9b3ab1' - end - it "should use 'hg update ---clean -r'" do - expects_chdir - provider.expects(:hg).with('pull') - provider.expects(:hg).with('merge') - provider.expects(:hg).with('update', '--clean', '-r', @revision) - provider.revision = @revision - end - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb deleted file mode 100644 index f44e314a56f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb +++ /dev/null @@ -1,105 +0,0 @@ -require 'spec_helper' - -describe Puppet::Type.type(:vcsrepo).provider(:svn) do - - let(:resource) { Puppet::Type.type(:vcsrepo).new({ - :name => 'test', - :ensure => :present, - :provider => :svn, - :path => '/tmp/vcsrepo', - })} - - let(:provider) { resource.provider } - - before :each do - Puppet::Util.stubs(:which).with('git').returns('/usr/bin/git') - end - - describe 'creating' do - context 'with source and revision' do - it "should execute 'svn checkout' with a revision" do - resource[:source] = 'exists' - resource[:revision] = '1' - provider.expects(:svn).with('--non-interactive', 'checkout', '-r', - resource.value(:revision), - resource.value(:source), - resource.value(:path)) - provider.create - end - end - context 'with source' do - it "should just execute 'svn checkout' without a revision" do - resource[:source] = 'exists' - provider.expects(:svn).with('--non-interactive', 'checkout', - resource.value(:source), - resource.value(:path)) - provider.create - end - end - - context 'with fstype' do - it "should execute 'svnadmin create' with an '--fs-type' option" do - resource[:fstype] = 'ext4' - provider.expects(:svnadmin).with('create', '--fs-type', - resource.value(:fstype), - resource.value(:path)) - provider.create - end - end - context 'without fstype' do - it "should execute 'svnadmin create' without an '--fs-type' option" do - provider.expects(:svnadmin).with('create', resource.value(:path)) - provider.create - end - end - end - - describe 'destroying' do - it "it should remove the directory" do - expects_rm_rf - provider.destroy - end - end - - describe "checking existence" do - it "should check for the directory" do - expects_directory?(true, resource.value(:path)) - expects_directory?(true, File.join(resource.value(:path), '.svn')) - provider.exists? - end - end - - describe "checking the revision property" do - before do - provider.expects(:svn).with('--non-interactive', 'info').returns(fixture(:svn_info)) - end - it "should use 'svn info'" do - expects_chdir - provider.revision.should == '4' # From 'Revision', not 'Last Changed Rev' - end - end - - describe "setting the revision property" do - before do - @revision = '30' - end - it "should use 'svn update'" do - expects_chdir - provider.expects(:svn).with('--non-interactive', 'update', '-r', @revision) - provider.revision = @revision - end - end - - describe "setting the revision property and repo source" do - before do - @revision = '30' - end - it "should use 'svn switch'" do - resource[:source] = 'an-unimportant-value' - expects_chdir - provider.expects(:svn).with('--non-interactive', 'switch', '-r', @revision, 'an-unimportant-value') - provider.revision = @revision - end - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown deleted file mode 100644 index 1ee19ac840f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown +++ /dev/null @@ -1,4 +0,0 @@ -Resource Type Specs -=================== - -Define specs for your resource types in this directory. diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.fixtures.yml deleted file mode 100644 index bb90cc14880..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.fixtures.yml +++ /dev/null @@ -1,10 +0,0 @@ -fixtures: - repositories: - "puppi": "git://github.com/example42/puppi.git" - "monitor": "git://github.com/example42/puppet-monitor.git" - "firewall": "git://github.com/example42/puppet-firewall.git" - "iptables": "git://github.com/example42/puppet-iptables.git" - "concat": "git://github.com/example42/puppet-concat.git" - symlinks: - "yum": "#{source_dir}" - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.gemfile deleted file mode 100644 index 49ea04a4918..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source :rubygems - -puppetversion = ENV['PUPPET_VERSION'] -gem 'puppet', puppetversion, :require => false -gem 'puppet-lint' -gem 'puppetlabs_spec_helper', '>= 0.1.0' -gem 'rspec-puppet', '0.1.6' diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.project deleted file mode 100644 index 13cd06f922b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - yum - - - - - - com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - - com.puppetlabs.geppetto.pp.dsl.ui.puppetNature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.travis.yml deleted file mode 100644 index dffeca98741..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -language: ruby -rvm: - - 1.8.7 - - 1.9.3 -script: - - "rake spec SPEC_OPTS='--format documentation'" -env: - - PUPPET_VERSION="~> 2.6.0" - - PUPPET_VERSION="~> 2.7.0" - - PUPPET_VERSION="~> 3.0.0" - - PUPPET_VERSION="~> 3.1.0" -matrix: - exclude: - - rvm: 1.9.3 - env: PUPPET_VERSION="~> 2.6.0" - gemfile: .gemfile - -gemfile: .gemfile -notifications: - email: - - al@lab42.it diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/LICENSE deleted file mode 100644 index f41da018579..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Copyright (C) 2013 Alessandro Franceschi / Lab42 - -for the relevant commits Copyright (C) by the respective authors. - -Contact Lab42 at: info@lab42.it - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Modulefile deleted file mode 100644 index 69820b86e02..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Modulefile +++ /dev/null @@ -1,9 +0,0 @@ -name 'example42-yum' -version '2.1.9' -author 'Alessandro Franceschi' -license 'Apache2' -project_page 'http://www.example42.com' -source 'https://github.com/example42/puppet-yum' -summary 'Puppet module for nagios' -description 'This module installs and manages yum and yum repositories' -dependency 'example42/puppi', '>= 2.0.0' diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/README.md deleted file mode 100644 index cb254401bf1..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/README.md +++ /dev/null @@ -1,132 +0,0 @@ -# Puppet module: yum - -This is a Puppet module that manages Yum repositories for Centos RedHat and Scientific Linux - -Made by Alessandro Franceschi / Lab42 - -Inspired by the Yum Immerda module: https://git.puppet.immerda.ch - -Official site: http://www.example42.com - -Official git repository: http://github.com/example42/puppet-yum - -Released under the terms of Apache 2 License. - -This module requires functions provided by the Example42 Puppi module. - -## USAGE - -* Just leave the default options: Automatic detection of Operating System (RedHat, Centos, Scientific supported) Epel repo installation, keeping of local yum files, automatic updates disabled. - - class { 'yum': - } - -* Enable automatic updates via cron (updatesd is supported only on 5) - - class { 'yum': - update => 'cron', - } - - -* Purge local /etc/yum.repos.d/ and enforce its contents only via a custom source - - class { 'yum': - source_repo_dir => 'puppet:///modules/example42/yum/conf/', - clean_repos => true, - } - -* Enable EPEL and PuppetLabs repos - - class { 'yum': - extrarepo => [ 'epel' , 'puppetlabs' ], - } - - -* Do not include any extra repo (By default EPEL is added) - - class { 'yum': - extrarepo => '' , - } - -* Automatically copy in /etc/pki/rpm-gpg all the rpm-gpg keys known by the yum module (this was the "old" and intrusive behaviour, now each rpm-gpg key may be individually provided by the yum::manages_repos' gpgkey_source parameter) - - class { 'yum': - install_all_keys => true , - } - -* Include a selected extra repo - - include yum::repo::puppetlabs - - -## USAGE - Overrides and Customizations -* Enable auditing without without making changes on existing yum configuration files - - class { 'yum': - audit_only => true - } - - -* Use custom sources for main config file - - class { 'yum': - source => [ "puppet:///modules/lab42/yum/yum.conf-${hostname}" , "puppet:///modules/lab42/yum/yum.conf" ], - } - - -* Use custom source directory for the whole configuration dir - - class { 'yum': - source_dir => 'puppet:///modules/lab42/yum/conf/', - source_dir_purge => false, # Set to true to purge any existing file not present in $source_dir - } - -* Use custom template for main config file. Note that template and source arguments are alternative. - - class { 'yum': - template => 'example42/yum/yum.conf.erb', - } - -* Automatically include a custom subclass - - class { 'yum': - my_class => 'yum::example42', - } - - -## USAGE - Example42 extensions management -* Activate puppi (recommended, but disabled by default) - - class { 'yum': - puppi => true, - } - -* Activate puppi and use a custom puppi_helper template (to be provided separately with a puppi::helper define ) to customize the output of puppi commands - - class { 'yum': - puppi => true, - puppi_helper => 'myhelper', - } - - -## OPERATING SYSTEMS SUPPORT - -REDHAT 6 - Full - -REDHAT 5 - Full - -REDHAT 4 - Partial - -CENTOS 6 - Full - -CENTOS 5 - Full - -CENTOS 4 - Partial - -SCIENTIFIC 6 - Full - -SCIENTIFIC 5 - Full - -AMAZON LINUX 3 (Sigh) - Partial - -[![Build Status](https://travis-ci.org/example42/puppet-yum.png?branch=master)](https://travis-ci.org/example42/puppet-yum) diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Rakefile deleted file mode 100644 index f0d1465cdc0..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Rakefile +++ /dev/null @@ -1,5 +0,0 @@ -require 'rubygems' -require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint/tasks/puppet-lint' -PuppetLint.configuration.send('disable_80chars') -PuppetLint.configuration.send('disable_class_parameter_defaults') diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6 deleted file mode 100644 index bd863d8e212..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6 +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQINBE4P06MBEACqn48FZgYkG2QrtUAVDV58H6LpDYEcTcv4CIFSkgs6dJ9TavCW -NyPBZRpM2R+Rg5eVqlborp7TmktBP/sSsxc8eJ+3P2aQWSWc5ol74Y0OznJUCrBr -bIdypJllsD9Fe+h7gLBXTh3vdBEWr2lR+xA+Oou8UlO2gFbVFQqMafUgU1s0vqaE -/hHH0TzwD0/tJ6eqIbHwVR/Bu6kHFK4PwePovhfvyYD9Y+C0vOYd5Ict2vbLHz1f -QBDZObv4M6KN3j7nzme47hKtdMd+LwFqxM5cXfM6b5doDulWPmuGV78VoX6OR7el -x1tlfpuiFeuXYnImm5nTawArcQ1UkXUSYcTUKShJebRDLR3BycxR39Q9jtbOQ29R -FumHginovEhdUcinRr22eRXgcmzpR00zFIWoFCwHh/OCtG14nFhefuZ8Z80qbVhW -2J9+/O4tksv9HtQBmQNOK5S8C4HNF2M8AfOWNTr8esFSDc0YA5/cxzdfOOtWam/w -lBpNcUUSSgddRsBwijPuWhVA3NmA/uQlJtAo4Ji5vo8cj5MTPG3+U+rfNqRxu1Yc -ioXRo4LzggPscaTZX6V24n0fzw0J2k7TT4sX007k+7YXwEMqmHpcMYbDNzdCzUer -Zilh5hihJwvGfdi234W3GofttoO+jaAZjic7a3p6cO1ICMgfVqrbZCUQVQARAQAB -tEZDZW50T1MtNiBLZXkgKENlbnRPUyA2IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8 -Y2VudG9zLTYta2V5QGNlbnRvcy5vcmc+iQI8BBMBAgAmBQJOD9OjAhsDBQkSzAMA -BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQCUb8osEFud6ajRAAnb6d+w6Y/v/d -MSy7UEy4rNquArix8xhqBwwjoGXpa37OqTvvcJrftZ1XgtzmTbkqXc+9EFch0C+w -ST10f+H0SPTUGuPwqLkg27snUkDAv1B8laub+l2L9erzCaRriH8MnFyxt5v1rqWA -mVlRymzgXK+EQDr+XOgMm1CvxVY3OwdjdoHNox4TdVQWlZl83xdLXBxkd5IRciNm -sg5fJAzAMeg8YsoDee3m4khg9gEm+/Rj5io8Gfk0nhQpgGGeS1HEXl5jzTb44zQW -qudkfcLEdUMOECbu7IC5Z1wrcj559qcp9C94IwQQO+LxLwg4kHffvZjCaOXDRiya -h8KGsEDuiqwjU9HgGq9fa0Ceo3OyUazUi+WnOxBLVIQ8cUZJJ2Ia5PDnEsz59kCp -JmBZaYPxUEteMtG3yDTa8c8jUnJtMPpkwpSkeMBeNr/rEH4YcBoxuFjppHzQpJ7G -hZRbOfY8w97TgJbfDElwTX0/xX9ypsmBezgGoOvOkzP9iCy9YUBc9q/SNnflRWPO -sMVrjec0vc6ffthu2xBdigBXhL7x2bphWzTXf2T067k+JOdoh5EGney6LhQzcp8m -YCTENStCR+L/5XwrvNgRBnoXe4e0ZHet1CcCuBCBvSmsPHp5ml21ahsephnHx+rl -JNGtzulnNP07RyfzQcpCNFH7W4lXzqM= -=jrWY ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL deleted file mode 100644 index 7a2030489d2..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1 -JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B -M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn -XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6 -pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV -QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp -Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq -3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu -vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar -1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g -YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB -tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS -KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9 -qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT -9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP -Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS -WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft -HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF -p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP -x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8 -wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J -l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG -iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR -XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ== -=V/6I ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL deleted file mode 100644 index 152fd799008..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL +++ /dev/null @@ -1,36 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.14 (GNU/Linux) - -mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o -h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu -gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+ -CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV -UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna -3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S -hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk -hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J -nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1 -YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr -BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ -AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf -3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE -ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO -w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr -6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo -BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn -ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ -3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE -tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8 -zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ -LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat -RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9 -EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu -W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe -nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg -5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ -Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf -8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA -mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q== -=iyOs ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta deleted file mode 100644 index b86da239064..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP -6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo -eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t -Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP -tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM -IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU -YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5 -ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U -vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg -QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i -ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD -AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8 -aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ -EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F -SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy -MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv -8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg -PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8 -+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO -eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F -AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma -D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5 -=mH0S ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh deleted file mode 100644 index f8c688e5f4c..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp -ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73 -uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o -V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/ -Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk -LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr -8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr -wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel -09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg -U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn -PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+ -E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr -a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD -zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A -YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD -/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8 -ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq -s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC -GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi -DX+bbalHM+xVnXZN -=rZT6 ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi deleted file mode 100644 index 32833860645..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.7 (GNU/Linux) - -mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3 -/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA -/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L -0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh -dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp -AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B -Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY -iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD -1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs -ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI -BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ -MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj -C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0 -HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa -o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw -CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv -JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK -8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i -gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw== -=6Rbg ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag deleted file mode 100644 index 8ee27f45b9b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag +++ /dev/null @@ -1,32 +0,0 @@ -The following public key can be used to verify RPM packages -downloaded from http://dag.wieers.com/apt/ using 'rpm -K' -if you have the GNU GPG package. -Questions about this key should be sent to: -Dag Wieers - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.1 (GNU/Linux) - -mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6 -TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF -5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3 -3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq -39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN -8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm -30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD -oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170 -JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy -cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT -EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST -hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF -Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon -g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt -llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l -IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg -6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh -Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L -n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I -RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE -BACeJU1hpElFnUZCL4yKj4EuLnlo8kc= -=mqUt ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy deleted file mode 100644 index 317b802b560..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m -DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l -qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw -XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu -0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9 -Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY -8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb -nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do -erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t -cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC -BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV -LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf -NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz -txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi -qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C -dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W -X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d -zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F -ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza -Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf -WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0 -cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8 -ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3 -Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet -etv5Qeg= -=nIAo ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms deleted file mode 100644 index 860ace4d247..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.6 (GNU/Linux) - -mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI -1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm -aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH -a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t -ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8 -mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE -OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx -k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8 -yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l -dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR -AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM -5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps -+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu -AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU -kg/3AeBlMBIlFe5hDQ== -=23Fz ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key deleted file mode 100644 index b91a5a88769..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0 -CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj -Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i -SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy -12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz -wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7 -exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd -tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B -N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv -cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb -AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975 -wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI -MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD -/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So -M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9 -hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN -dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs -UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv -qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH -5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n -nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO -Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5 -adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV -AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA -yOSLb33CweehCrlTnQ== -=scSy ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL deleted file mode 100644 index 5a13bb4f9f9..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF -l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/ -QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/ -lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk -/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm -l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl -1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic -vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP -QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ -RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM -AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa -ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/ -blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J -nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl -PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3 -5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS -w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd -yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA -DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1 -axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H -Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T -P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24 -0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC -GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY -bbsLFWOfmzAnNIGvFRWy+YHi -=MMNL ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5 deleted file mode 100644 index 2627d31d8f6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5 +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEWfB6MRBACrnYW6yKMT+MwJlCIhoyTxGf3mAxmnAiDEy6HcYN8rivssVTJk -CFtQBlBOpLV/OW2YtKrCO2xHn46eNfnMri8FGT8g+9JF3MUVi7kiV1He4iJynHXB -+F2ZqIvHf3IaUj1ys+p8TK64FDFxDQDrGQfIsD/+pkSGx53/877IrvdwjwCguQcr -Ioip5TH0Fj0OLUY4asYVZH8EAIqFHEqsY+9ziP+2R3/FyxSllKkjwcMLrBug+cYO -LYDD6eQXE9Mq8XKGFDj9ZB/0+JzK/XQeStheeFG75q3noq5oCPVFO4czuKErIRAB -qKbDBhaTj3JhOgM12XsUYn+rI6NeMV2ZogoQCC2tWmDETfRpYp2moo53NuFWHbAy -XjETA/sHEeQT9huHzdi/lebNBj0L8nBGfLN1nSRP1GtvagBvkR4RZ6DTQyl0UzOJ -RA3ywWlrL9IV9mrpb1Fmn60l2jTMMCc7J6LacmPK906N+FcN/Docj1M4s/4CNanQ -NhzcFhAFtQL56SNyLTCk1XzhssGZ/jwGnNbU/aaj4wOj0Uef5LRGQ2VudE9TLTUg -S2V5IChDZW50T1MgNSBPZmZpY2lhbCBTaWduaW5nIEtleSkgPGNlbnRvcy01LWtl -eUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwekAhsDBQkSzAMABgsJCAcDAgMVAgMD -FgIBAh4BAheAAAoJEKikR9zoViiXKlEAmwSoZDvZo+WChcg3s/SpNoWCKhMAAJwI -E2aXpZVrpsQnInUQWwkdrTiL5YhMBBMRAgAMBQJFnwiSBYMSzAIRAAoJEDjCFhY5 -bKCk0hAAn134bIx3wSbq58E6P6U5RT7Z2Zx4AJ9VxnVkoGHkVIgSdsxHUgRjo27N -F7kBDQRFnwezEAQA/HnJ5yiozwgtf6jt+kii8iua+WnjqBKomPHOQ8moxbWdv5Ks -4e1DPhzRqxhshjmub4SuJ93sgMSAF2ayC9t51mSJV33KfzPF2gIahcMqfABe/2hJ -aMzcQZHrGJCEX6ek8l8SFKou7vICzyajRSIK8gxWKBuQknP/9LKsoczV+xsAAwUD -/idXPkk4vRRHsCwc6I23fdI0ur52bzEqHiAIswNfO521YgLk2W1xyCLc2aYjc8Ni -nrMX1tCnEx0/gK7ICyJoWH1Vc7//79sWFtX2EaTO+Q07xjFX4E66WxJlCo9lOjos -Vk5qc7R+xzLDoLGFtbzaTRQFzf6yr7QTu+BebWLoPwNTiE8EGBECAA8FAkWfB7MC -GwwFCRLMAwAACgkQqKRH3OhWKJfvvACfbsF1WK193zM7vSc4uq51XsceLwgAoI0/ -9GxdNhGQEAweSlQfhPa3yYXH -=o/Mx ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL deleted file mode 100644 index 5a13bb4f9f9..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF -l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/ -QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/ -lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk -/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm -l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl -1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic -vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP -QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ -RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM -AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa -ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/ -blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J -nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl -PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3 -5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS -w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd -yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA -DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1 -axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H -Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T -P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24 -0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC -GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY -bbsLFWOfmzAnNIGvFRWy+YHi -=MMNL ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL deleted file mode 100644 index 152fd799008..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL +++ /dev/null @@ -1,36 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.14 (GNU/Linux) - -mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o -h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu -gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+ -CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV -UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna -3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S -hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk -hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J -nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1 -YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr -BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ -AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf -3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE -ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO -w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr -6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo -BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn -ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ -3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE -tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8 -zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ -LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat -RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9 -EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu -W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe -nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg -5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ -Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf -8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA -mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q== -=iyOs ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta deleted file mode 100644 index b86da239064..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP -6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo -eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t -Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP -tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM -IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU -YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5 -ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U -vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg -QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i -ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD -AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8 -aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ -EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F -SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy -MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv -8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg -PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8 -+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO -eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F -AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma -D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5 -=mH0S ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh deleted file mode 100644 index f8c688e5f4c..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp -ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73 -uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o -V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/ -Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk -LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr -8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr -wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel -09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg -U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn -PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+ -E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr -a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD -zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A -YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD -/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8 -ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq -s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC -GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi -DX+bbalHM+xVnXZN -=rZT6 ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi deleted file mode 100644 index 32833860645..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.7 (GNU/Linux) - -mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3 -/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA -/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L -0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh -dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp -AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B -Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY -iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD -1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs -ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI -BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ -MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj -C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0 -HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa -o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw -CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv -JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK -8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i -gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw== -=6Rbg ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag deleted file mode 100644 index 8ee27f45b9b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag +++ /dev/null @@ -1,32 +0,0 @@ -The following public key can be used to verify RPM packages -downloaded from http://dag.wieers.com/apt/ using 'rpm -K' -if you have the GNU GPG package. -Questions about this key should be sent to: -Dag Wieers - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.1 (GNU/Linux) - -mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6 -TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF -5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3 -3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq -39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN -8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm -30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD -oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170 -JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy -cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT -EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST -hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF -Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon -g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt -llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l -IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg -6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh -Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L -n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I -RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE -BACeJU1hpElFnUZCL4yKj4EuLnlo8kc= -=mqUt ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy deleted file mode 100644 index 317b802b560..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m -DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l -qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw -XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu -0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9 -Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY -8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb -nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do -erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t -cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC -BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV -LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf -NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz -txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi -qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C -dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W -X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d -zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F -ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza -Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf -WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0 -cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8 -ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3 -Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet -etv5Qeg= -=nIAo ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art deleted file mode 100644 index 825424e1f33..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.1 (GNU/Linux) - -mQGiBEGP+skRBACyZz7muj2OgWc9FxK+Hj7tWPnrfxEN+0PE+n8MtqH+dxwQpMTd -gDpOXxJa45GM5pEwB6CFSFK7Fb/faniF9fDbm1Ga7MpBupIBYLactkoOTZMuTlGB -T0O5ha4h26YLqFfQOtlEi7d0+BDDdfHRQw3o67ycgRnLgYSA79DISc3MywCgk2TR -yd5sRfZAG23b4EDl+D0+oaMEAK73J7zuxf6F6V5EaxLd/w4JVB2xW0Glcn0fACOe -8FV9lzcZuo2xPpdGuyj02f/xlqvEav3XqTfFU2no61mA2pamaRNhlo+CEfGc7qde -/1twfSgOYqzeCx7+aybyPo8Th41b80FT19mfkjBf6+5NbUHffRabFFh1FmcPVNBn -F3FoA/95nRIzqDMItdTRitaZn02dIGNjdwllBD75bSVEvaR9O5hjBo0VMc25DB7f -DM2qEO52wCQbAKw9zFC284ekZVDaK4aHYt7iobHaqJEpKHgsDut5WWuMiSLR+SsF -aBHIZ9HvrKWLSUQKHU6A1Hva0P0r3GnoCMc/VCVfrLl721SjPbQzQXRvbWljIFJv -Y2tldCBUdXJ0bGUgPGFkbWluQGF0b21pY3JvY2tldHR1cnRsZS5jb20+iFkEExEC -ABkFAkGP+skECwcDAgMVAgMDFgIBAh4BAheAAAoJEDKpURRevSdEzcQAn1hSHqTO -jwv/z/picpOnR+mgycwHAKCBex2ciyXo5xeaQ9w7OMf7Jsmon7kBDQRBj/rMEAQA -6JvRndqE4koK0e49fUkICm1X0ZEzsVg9VmUW+Zft5guCRxmGlYTmtlC7oJCToRP/ -m/xH5uIevGiJycRKB0Ix+Csl6f9QuTkQ7tSTHcaIKbI3tL1x6CCBoWeTGYaOJlvk -ubrmajiMFaBfopLH2firoSToDGoUvv4e7bImIHEgNr8AAwUEAND0YR9DOEZvc+Lq -Ta/PQyxkdZ75o+Ty/O64E3OmO1Tuw2ciSQXCcwrbrMSE6EHHetxtGCnOdkjjjtmH -AnxsxdONv/EJuQmLcoNcsigZZ4tfRdmtXgcbnOmXBgmy1ea1KvWcsmecNSAMJHwR -7vDDKzbj4mSmudzjapHeeOewFF10iEYEGBECAAYFAkGP+swACgkQMqlRFF69J0Sq -nQCfa/q9Y/oY4dOTGj6MsdmRIQkKZhYAoIscjinFwTru4FVi2MIEzUUMToDK -=NOIx ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms deleted file mode 100644 index 860ace4d247..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.6 (GNU/Linux) - -mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI -1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm -aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH -a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t -ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8 -mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE -OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx -k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8 -yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l -dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR -AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM -5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps -+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu -AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU -kg/3AeBlMBIlFe5hDQ== -=23Fz ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key deleted file mode 100644 index b91a5a88769..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0 -CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj -Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i -SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy -12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz -wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7 -exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd -tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B -N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv -cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb -AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975 -wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI -MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD -/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So -M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9 -hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN -dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs -UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv -qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH -5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n -nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO -Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5 -adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV -AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA -yOSLb33CweehCrlTnQ== -=scSy ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6 deleted file mode 100644 index bd863d8e212..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6 +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQINBE4P06MBEACqn48FZgYkG2QrtUAVDV58H6LpDYEcTcv4CIFSkgs6dJ9TavCW -NyPBZRpM2R+Rg5eVqlborp7TmktBP/sSsxc8eJ+3P2aQWSWc5ol74Y0OznJUCrBr -bIdypJllsD9Fe+h7gLBXTh3vdBEWr2lR+xA+Oou8UlO2gFbVFQqMafUgU1s0vqaE -/hHH0TzwD0/tJ6eqIbHwVR/Bu6kHFK4PwePovhfvyYD9Y+C0vOYd5Ict2vbLHz1f -QBDZObv4M6KN3j7nzme47hKtdMd+LwFqxM5cXfM6b5doDulWPmuGV78VoX6OR7el -x1tlfpuiFeuXYnImm5nTawArcQ1UkXUSYcTUKShJebRDLR3BycxR39Q9jtbOQ29R -FumHginovEhdUcinRr22eRXgcmzpR00zFIWoFCwHh/OCtG14nFhefuZ8Z80qbVhW -2J9+/O4tksv9HtQBmQNOK5S8C4HNF2M8AfOWNTr8esFSDc0YA5/cxzdfOOtWam/w -lBpNcUUSSgddRsBwijPuWhVA3NmA/uQlJtAo4Ji5vo8cj5MTPG3+U+rfNqRxu1Yc -ioXRo4LzggPscaTZX6V24n0fzw0J2k7TT4sX007k+7YXwEMqmHpcMYbDNzdCzUer -Zilh5hihJwvGfdi234W3GofttoO+jaAZjic7a3p6cO1ICMgfVqrbZCUQVQARAQAB -tEZDZW50T1MtNiBLZXkgKENlbnRPUyA2IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8 -Y2VudG9zLTYta2V5QGNlbnRvcy5vcmc+iQI8BBMBAgAmBQJOD9OjAhsDBQkSzAMA -BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQCUb8osEFud6ajRAAnb6d+w6Y/v/d -MSy7UEy4rNquArix8xhqBwwjoGXpa37OqTvvcJrftZ1XgtzmTbkqXc+9EFch0C+w -ST10f+H0SPTUGuPwqLkg27snUkDAv1B8laub+l2L9erzCaRriH8MnFyxt5v1rqWA -mVlRymzgXK+EQDr+XOgMm1CvxVY3OwdjdoHNox4TdVQWlZl83xdLXBxkd5IRciNm -sg5fJAzAMeg8YsoDee3m4khg9gEm+/Rj5io8Gfk0nhQpgGGeS1HEXl5jzTb44zQW -qudkfcLEdUMOECbu7IC5Z1wrcj559qcp9C94IwQQO+LxLwg4kHffvZjCaOXDRiya -h8KGsEDuiqwjU9HgGq9fa0Ceo3OyUazUi+WnOxBLVIQ8cUZJJ2Ia5PDnEsz59kCp -JmBZaYPxUEteMtG3yDTa8c8jUnJtMPpkwpSkeMBeNr/rEH4YcBoxuFjppHzQpJ7G -hZRbOfY8w97TgJbfDElwTX0/xX9ypsmBezgGoOvOkzP9iCy9YUBc9q/SNnflRWPO -sMVrjec0vc6ffthu2xBdigBXhL7x2bphWzTXf2T067k+JOdoh5EGney6LhQzcp8m -YCTENStCR+L/5XwrvNgRBnoXe4e0ZHet1CcCuBCBvSmsPHp5ml21ahsephnHx+rl -JNGtzulnNP07RyfzQcpCNFH7W4lXzqM= -=jrWY ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL deleted file mode 100644 index 7a2030489d2..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1 -JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B -M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn -XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6 -pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV -QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp -Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq -3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu -vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar -1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g -YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB -tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS -KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9 -qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT -9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP -Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS -WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft -HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF -p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP -x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8 -wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J -l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG -iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR -XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ== -=V/6I ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG deleted file mode 100644 index 8722c21cbd6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.7 (GNU/Linux) - -mQGiBEeD8koRBACC1VBRsUwGr9gxFFRho9kZpdRUjBJoPhkeOTvp9LzkdAQMFngr -BFi6N0ov1kCX7LLwBmDG+JPR7N+XcH9YR1coSHpLVg+JNy2kFDd4zAyWxJafjZ3a -9zFg9Yx+0va1BJ2t4zVcmKS4aOfbgQ5KwIOWUujalQW5Y+Fw39Gn86qjbwCg5dIo -tkM0l19h2sx50D027pV5aPsD/2c9pfcFTbMhB0CcKS836GH1qY+NCAdUwPs646ee -Ex/k9Uy4qMwhl3HuCGGGa+N6Plyon7V0TzZuRGp/1742dE8IO+I/KLy2L1d1Fxrn -XOTBZd8qe6nBwh12OMcKrsPBVBxn+iSkaG3ULsgOtx+HHLfa1/p22L5+GzGdxizr -peBuA/90cCp+lYcEwdYaRoFVR501yDOTmmzBc1DrsyWP79QMEGzMqa393G0VnqXt -L4pGmunq66Agw2EhPcIt3pDYiCmEt/obdVtSJH6BtmSDB/zYhbE8u3vLP3jfFDa9 -KXxgtYj0NvuUVoRmxSKm8jtfmj1L7zoKNz3jl+Ba3L0WxIv4+bRBUG9zdGdyZVNR -TCBSUE0gQnVpbGRpbmcgUHJvamVjdCA8cGdzcWxycG1zLWhhY2tlcnNAcGdmb3Vu -ZHJ5Lm9yZz6IYAQTEQIAIAUCR4PySgIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA -AAoJEB8W0uFELfD4jnkAoMqd6ZwwsgYHZ3hP9vt+DJt1uDW7AKDbRwP8ESKFhwdJ -8m91RPBeJW/tMLkCDQRHg/JKEAgA64+ZXgcERPYfZYo4p+yMTJAAa9aqnE3U4Ni6 -ZMB57GPuEy8NfbNya+HiftO8hoozmJdcI6XFyRBCDUVCdZ8SE+PJdOx2FFqZVIu6 -dKnr8ykhgLpNNEFDG3boK9UfLj/5lYQ3Y550Iym1QKOgyrJYeAp6sZ+Nx2PavsP3 -nMFCSD67BqAbcLCVQN7a2dAUXfEbfXJjPHXTbo1/kxtzE+KCRTLdXEbSEe3nHO04 -K/EgTBjeBUOxnciH5RylJ2oGy/v4xr9ed7R1jJtshsDKMdWApwoLlCBJ63jg/4T/ -z/OtXmu4AvmWaJxaTl7fPf2GqSqqb6jLCrQAH7AIhXr9V0zPZwADBQgAlpptNQHl -u7euIdIujFwwcxyQGfee6BG+3zaNSEHMVQMuc6bxuvYmgM9r7aki/b0YMfjJBk8v -OJ3Eh1vDH/woJi2iJ13vQ21ot+1JP3fMd6NPR8/qEeDnmVXu7QAtlkmSKI9Rdnjz -FFSUJrQPHnKsH4V4uvAM+njwYD+VFiwlBPTKNeL8cdBb4tPN2cdVJzoAp57wkZAN -VA2tKxNsTJKBi8wukaLWX8+yPHiWCNWItvyB4WCEp/rZKG4A868NM5sZQMAabpLd -l4fTiGu68OYgK9qUPZvhEAL2C1jPDVHPkLm+ZsD+90Pe66w9vB00cxXuHLzm8Pad -GaCXCY8h3xi6VIhJBBgRAgAJBQJHg/JKAhsMAAoJEB8W0uFELfD4K4cAoJ4yug8y -1U0cZEiF5W25HDzMTtaDAKCaM1m3Cbd+AZ0NGWNg/VvIX9MsPA== -=au6K ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL deleted file mode 100644 index 152fd799008..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL +++ /dev/null @@ -1,36 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.14 (GNU/Linux) - -mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o -h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu -gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+ -CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV -UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna -3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S -hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk -hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J -nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1 -YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr -BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ -AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf -3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE -ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO -w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr -6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo -BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn -ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ -3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE -tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8 -zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ -LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat -RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9 -EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu -W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe -nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg -5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ -Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf -8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA -mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q== -=iyOs ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta deleted file mode 100644 index b86da239064..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP -6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo -eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t -Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP -tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM -IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU -YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5 -ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U -vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg -QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i -ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD -AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8 -aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ -EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F -SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy -MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv -8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg -PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8 -+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO -eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F -AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma -D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5 -=mH0S ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh deleted file mode 100644 index f8c688e5f4c..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp -ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73 -uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o -V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/ -Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk -LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr -8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr -wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel -09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg -U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn -PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+ -E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr -a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD -zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A -YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD -/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8 -ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq -s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC -GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi -DX+bbalHM+xVnXZN -=rZT6 ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi deleted file mode 100644 index 32833860645..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.7 (GNU/Linux) - -mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3 -/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA -/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L -0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh -dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp -AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B -Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY -iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD -1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs -ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI -BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ -MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj -C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0 -HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa -o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw -CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv -JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK -8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i -gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw== -=6Rbg ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag deleted file mode 100644 index 8ee27f45b9b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag +++ /dev/null @@ -1,32 +0,0 @@ -The following public key can be used to verify RPM packages -downloaded from http://dag.wieers.com/apt/ using 'rpm -K' -if you have the GNU GPG package. -Questions about this key should be sent to: -Dag Wieers - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.1 (GNU/Linux) - -mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6 -TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF -5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3 -3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq -39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN -8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm -30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD -oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170 -JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy -cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT -EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST -hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF -Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon -g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt -llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l -IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg -6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh -Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L -n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I -RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE -BACeJU1hpElFnUZCL4yKj4EuLnlo8kc= -=mqUt ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy deleted file mode 100644 index 317b802b560..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m -DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l -qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw -XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu -0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9 -Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY -8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb -nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do -erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t -cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC -BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV -LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf -NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz -txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi -qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C -dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W -X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d -zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F -ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza -Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf -WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0 -cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8 -ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3 -Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet -etv5Qeg= -=nIAo ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art deleted file mode 100644 index 825424e1f33..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.1 (GNU/Linux) - -mQGiBEGP+skRBACyZz7muj2OgWc9FxK+Hj7tWPnrfxEN+0PE+n8MtqH+dxwQpMTd -gDpOXxJa45GM5pEwB6CFSFK7Fb/faniF9fDbm1Ga7MpBupIBYLactkoOTZMuTlGB -T0O5ha4h26YLqFfQOtlEi7d0+BDDdfHRQw3o67ycgRnLgYSA79DISc3MywCgk2TR -yd5sRfZAG23b4EDl+D0+oaMEAK73J7zuxf6F6V5EaxLd/w4JVB2xW0Glcn0fACOe -8FV9lzcZuo2xPpdGuyj02f/xlqvEav3XqTfFU2no61mA2pamaRNhlo+CEfGc7qde -/1twfSgOYqzeCx7+aybyPo8Th41b80FT19mfkjBf6+5NbUHffRabFFh1FmcPVNBn -F3FoA/95nRIzqDMItdTRitaZn02dIGNjdwllBD75bSVEvaR9O5hjBo0VMc25DB7f -DM2qEO52wCQbAKw9zFC284ekZVDaK4aHYt7iobHaqJEpKHgsDut5WWuMiSLR+SsF -aBHIZ9HvrKWLSUQKHU6A1Hva0P0r3GnoCMc/VCVfrLl721SjPbQzQXRvbWljIFJv -Y2tldCBUdXJ0bGUgPGFkbWluQGF0b21pY3JvY2tldHR1cnRsZS5jb20+iFkEExEC -ABkFAkGP+skECwcDAgMVAgMDFgIBAh4BAheAAAoJEDKpURRevSdEzcQAn1hSHqTO -jwv/z/picpOnR+mgycwHAKCBex2ciyXo5xeaQ9w7OMf7Jsmon7kBDQRBj/rMEAQA -6JvRndqE4koK0e49fUkICm1X0ZEzsVg9VmUW+Zft5guCRxmGlYTmtlC7oJCToRP/ -m/xH5uIevGiJycRKB0Ix+Csl6f9QuTkQ7tSTHcaIKbI3tL1x6CCBoWeTGYaOJlvk -ubrmajiMFaBfopLH2firoSToDGoUvv4e7bImIHEgNr8AAwUEAND0YR9DOEZvc+Lq -Ta/PQyxkdZ75o+Ty/O64E3OmO1Tuw2ciSQXCcwrbrMSE6EHHetxtGCnOdkjjjtmH -AnxsxdONv/EJuQmLcoNcsigZZ4tfRdmtXgcbnOmXBgmy1ea1KvWcsmecNSAMJHwR -7vDDKzbj4mSmudzjapHeeOewFF10iEYEGBECAAYFAkGP+swACgkQMqlRFF69J0Sq -nQCfa/q9Y/oY4dOTGj6MsdmRIQkKZhYAoIscjinFwTru4FVi2MIEzUUMToDK -=NOIx ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms deleted file mode 100644 index 860ace4d247..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.6 (GNU/Linux) - -mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI -1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm -aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH -a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t -ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8 -mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE -OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx -k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8 -yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l -dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR -AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM -5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps -+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu -AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU -kg/3AeBlMBIlFe5hDQ== -=23Fz ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key deleted file mode 100644 index b91a5a88769..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0 -CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj -Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i -SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy -12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz -wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7 -exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd -tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B -N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv -cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb -AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975 -wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI -MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD -/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So -M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9 -hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN -dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs -UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv -qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH -5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n -nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO -Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5 -adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV -AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA -yOSLb33CweehCrlTnQ== -=scSy ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5 deleted file mode 100644 index 2627d31d8f6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5 +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEWfB6MRBACrnYW6yKMT+MwJlCIhoyTxGf3mAxmnAiDEy6HcYN8rivssVTJk -CFtQBlBOpLV/OW2YtKrCO2xHn46eNfnMri8FGT8g+9JF3MUVi7kiV1He4iJynHXB -+F2ZqIvHf3IaUj1ys+p8TK64FDFxDQDrGQfIsD/+pkSGx53/877IrvdwjwCguQcr -Ioip5TH0Fj0OLUY4asYVZH8EAIqFHEqsY+9ziP+2R3/FyxSllKkjwcMLrBug+cYO -LYDD6eQXE9Mq8XKGFDj9ZB/0+JzK/XQeStheeFG75q3noq5oCPVFO4czuKErIRAB -qKbDBhaTj3JhOgM12XsUYn+rI6NeMV2ZogoQCC2tWmDETfRpYp2moo53NuFWHbAy -XjETA/sHEeQT9huHzdi/lebNBj0L8nBGfLN1nSRP1GtvagBvkR4RZ6DTQyl0UzOJ -RA3ywWlrL9IV9mrpb1Fmn60l2jTMMCc7J6LacmPK906N+FcN/Docj1M4s/4CNanQ -NhzcFhAFtQL56SNyLTCk1XzhssGZ/jwGnNbU/aaj4wOj0Uef5LRGQ2VudE9TLTUg -S2V5IChDZW50T1MgNSBPZmZpY2lhbCBTaWduaW5nIEtleSkgPGNlbnRvcy01LWtl -eUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwekAhsDBQkSzAMABgsJCAcDAgMVAgMD -FgIBAh4BAheAAAoJEKikR9zoViiXKlEAmwSoZDvZo+WChcg3s/SpNoWCKhMAAJwI -E2aXpZVrpsQnInUQWwkdrTiL5YhMBBMRAgAMBQJFnwiSBYMSzAIRAAoJEDjCFhY5 -bKCk0hAAn134bIx3wSbq58E6P6U5RT7Z2Zx4AJ9VxnVkoGHkVIgSdsxHUgRjo27N -F7kBDQRFnwezEAQA/HnJ5yiozwgtf6jt+kii8iua+WnjqBKomPHOQ8moxbWdv5Ks -4e1DPhzRqxhshjmub4SuJ93sgMSAF2ayC9t51mSJV33KfzPF2gIahcMqfABe/2hJ -aMzcQZHrGJCEX6ek8l8SFKou7vICzyajRSIK8gxWKBuQknP/9LKsoczV+xsAAwUD -/idXPkk4vRRHsCwc6I23fdI0ur52bzEqHiAIswNfO521YgLk2W1xyCLc2aYjc8Ni -nrMX1tCnEx0/gK7ICyJoWH1Vc7//79sWFtX2EaTO+Q07xjFX4E66WxJlCo9lOjos -Vk5qc7R+xzLDoLGFtbzaTRQFzf6yr7QTu+BebWLoPwNTiE8EGBECAA8FAkWfB7MC -GwwFCRLMAwAACgkQqKRH3OhWKJfvvACfbsF1WK193zM7vSc4uq51XsceLwgAoI0/ -9GxdNhGQEAweSlQfhPa3yYXH -=o/Mx ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL deleted file mode 100644 index 7a2030489d2..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1 -JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B -M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn -XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6 -pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV -QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp -Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq -3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu -vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar -1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g -YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB -tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS -KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9 -qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT -9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP -Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS -WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft -HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF -p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP -x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8 -wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J -l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG -iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR -XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ== -=V/6I ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL deleted file mode 100644 index 152fd799008..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL +++ /dev/null @@ -1,36 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.14 (GNU/Linux) - -mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o -h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu -gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+ -CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV -UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna -3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S -hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk -hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J -nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1 -YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr -BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ -AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf -3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE -ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO -w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr -6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo -BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn -ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ -3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE -tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8 -zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ -LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat -RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9 -EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu -W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe -nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg -5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ -Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf -8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA -mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q== -=iyOs ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta deleted file mode 100644 index b86da239064..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP -6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo -eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t -Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP -tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM -IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU -YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5 -ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U -vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg -QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i -ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD -AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8 -aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ -EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F -SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy -MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv -8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg -PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8 -+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO -eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F -AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma -D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5 -=mH0S ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson deleted file mode 100644 index c71c5047541..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.1 (GNU/Linux) - -mQGiBD/9sIMRBADp28M+gDNgYJ/UMW1Tem0W/D17FAZRVRI8Ht68QcZsq6uS1k3L -HPX7rLG3iKrKj4crvEE+CY/3L182NZ6bRJt61rQLrtSbMFIMvt7L6dG6BYYw0i8P -SqyVC6uPb2W8wi1RtNdQk0pSeDSQh8wCsDDo8WYHkdRztoKWHvd3hAN7NwCgzRVU -QS3Uw6McILxO9cUBgJEhBj8D/38TomjexWRUp+rzs6aouqHoZyslSCUe4aLeJvSQ -Whi1j4E0sgWMJ2L/Ta6FXNM2Of3Ze6delf8eVPZ2N78yELh+LV7DZr5Cy+zDtSWY -WnyWGSqHVEqf0UarpC8XVcJ1jJu3sHfaBf94tnKJI/uipxbD8oU4ixoLvANFR1fp -YfKdBACm+C8Rk2NpXeAtXIyN9UgJPpj9H5IXxnrdYJa0ce72qrrniM0dhGHz9+9H -5d8rVJYTNEW6kDhj79vnFLq86o0n8VIpv/0g38FO+FCi4yVJ49qA2+D7unysBVTm -ZXo3LRMiBJfeh39ONEIg+CWVD6sXo7FTwVKpawJpeO6Lp8nrlbQ6VHJveSBEYXdz -b24gKFNwaWt5IEhhaXIgSGF3YWlpYW4gU2hpcnRzKSA8ZGF3c29uQGZuYWwuZ292 -PohZBBMRAgAZBQI//bCDBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRDaatAIgv0XsoJ2 -AJ9KdOcfYSVAjoUwwrQjARa6xWP/NQCcCJKfBYUVZDiWsiZjVm1EOGcNCSS5AQ0E -P/2whBAEAJYHI18UVqIrZPX3C3FvzXf7MzNs31UPA1iCgp3f02w6nh/XZs8Y0CNB -ig9rCR/e2O8O4Fnl56Z+N+a9H7jPmF8sOhacvqNaS7yAJ+9pHj0op6Az/X69dWnS -AdaFXPB1Tc6ryfNtbs0CB0tWRbjlB4BTd/1PEerLNUNGoLOpFWeXAAMFA/0UD2ku -vIRoQwAjNf1/swcIQe44DNNQYY+GSzi0tXVhytiJquziPk/la2elinl4N1KERrO8 -fgdrHtZl4X7n3nv5GGdwVjQfcZJfzFcGIlzqJOcLHAlVSVEpAJAlkykbx8BDtfod -JbODs9NfU+VwmwrTwyVdpbOEHb9ktdeuabIXMIhGBBgRAgAGBQI//bCEAAoJENpq -0AiC/Rey1JoAnjJ1qsi4gbkb+srAgH2UCBRcM0uQAKCGiibCE9G5udph5YplnHhL -ZpAqxA== -=3u8+ ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta deleted file mode 100644 index 7b40671a4c1..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta +++ /dev/null @@ -1,61 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQINBEmkAzABEAC2/c7bP1lHQ3XScxbIk0LQWe1YOiibQBRLwf8Si5PktgtuPibT -kKpZjw8p4D+fM7jD1WUzUE0X7tXg2l/eUlMM4dw6XJAQ1AmEOtlwSg7rrMtTvM0A -BEtI7Km6fC6sU6RtBMdcqD1cH/6dbsfh8muznVA7UlX+PRBHVzdWzj6y8h84dBjo -gzcbYu9Hezqgj/lLzicqsSZPz9UdXiRTRAIhp8V30BD8uRaaa0KDDnD6IzJv3D9P -xQWbFM4Z12GN9LyeZqmD7bpKzZmXG/3drvfXVisXaXp3M07t3NlBa3Dt8NFIKZ0D -FRXBz5bvzxRVmdH6DtkDWXDPOt+Wdm1rZrCOrySFpBZQRpHw12eo1M1lirANIov7 -Z+V1Qh/aBxj5EUu32u9ZpjAPPNtQF6F/KjaoHHHmEQAuj4DLex4LY646Hv1rcv2i -QFuCdvLKQGSiFBrfZH0j/IX3/0JXQlZzb3MuMFPxLXGAoAV9UP/Sw/WTmAuTzFVm -G13UYFeMwrToOiqcX2VcK0aC1FCcTP2z4JW3PsWvU8rUDRUYfoXovc7eg4Vn5wHt -0NBYsNhYiAAf320AUIHzQZYi38JgVwuJfFu43tJZE4Vig++RQq6tsEx9Ftz3EwRR -fJ9z9mEvEiieZm+vbOvMvIuimFVPSCmLH+bI649K8eZlVRWsx3EXCVb0nQARAQAB -tDBSZWQgSGF0LCBJbmMuIChiZXRhIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0LmNv -bT6JAjYEEwECACAFAkpSM+cCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCT -ioDK8hVB6/9tEAC0+KmzeKceXQ/GTUoU6jy9vtkFCFrmv+c7ol4XpdTt0QhqBOwy -6m2mKWwmm8KfYfy0cADQ4y/EcoXl7FtFBwYmkCuEQGXhTDn9DvVjhooIq59LEMBQ -OW879RwwzRIZ8ebbjMUjDPF5MfPQqP2LBu9N4KvXlZp4voykwuuaJ+cbsKZR6pZ6 -0RQKPHKP+NgUFC0fff7XY9cuOZZWFAeKRhLN2K7bnRHKxp+kELWb6R9ZfrYwZjWc -MIPbTd1khE53L4NTfpWfAnJRtkPSDOKEGVlVLtLq4HEAxQt07kbslqISRWyXER3u -QOJj64D1ZiIMz6t6uZ424VE4ry9rBR0Jz55cMMx5O/ni9x3xzFUgH8Su2yM0r3jE -Rf24+tbOaPf7tebyx4OKe+JW95hNVstWUDyGbs6K9qGfI/pICuO1nMMFTo6GqzQ6 -DwLZvJ9QdXo7ujEtySZnfu42aycaQ9ZLC2DOCQCUBY350Hx6FLW3O546TAvpTfk0 -B6x+DV7mJQH7MGmRXQsE7TLBJKjq28Cn4tVp04PmybQyTxZdGA/8zY6pPl6xyVMH -V68hSBKEVT/rlouOHuxfdmZva1DhVvUC6Xj7+iTMTVJUAq/4Uyn31P1OJmA2a0PT -CAqWkbJSgKFccsjPoTbLyxhuMSNkEZFHvlZrSK9vnPzmfiRH0Orx3wYpMQ== -=21pb ------END PGP PUBLIC KEY BLOCK----- -The following public key can be used to verify RPM packages built and -signed by Red Hat, Inc. for this beta using `rpm -K' using the GNU GPG -package. Questions about this key should be sent to security@redhat.com. - - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.0.6 (GNU/Linux) -Comment: For info see http://www.gnupg.org - -mQGiBDySTqsRBACzc7xuCIp10oj5B2PAV4XzDeVxprv/WTMreSNSK+iC0bEz0IBp -Vnn++qtyiXfH+bGIE9jqZgIEnpttWhUOaU5LhcLFzy+m8NWfngIFP9QfGmGAe9Gd -LFeAdhj4RmSG/vgr7vDd83Hz22dv403Ar/sliWO4vDOrMmZBG57WGYTWtwCgkMsi -UUQuJ6slbzKn82w+bYxOlL0EAIylWJGaTkKOTL5DqVR3ik9aT0Dt3FNVYiuhcKBe -II4E3KOIVA9kO8in1IZjx2gs6K2UV+GsoAVANdfKL7l9O+k+J8OxhE74oycvYJxW -QzCgXMZkNcvW5wyXwEMcr6TVd/5BGztcMw8oT3/l2MtAEG/vn1XaWToRSO1XDMDz -+AjUA/4m0mTkN8S4wjzJG8lqN7+quW3UOaiCe8J3SFrrrhE0XbY9cTJI/9nuXHU1 -VjqOSmXQYH2Db7UOroFTBiWhlAedA4O4yuK52AJnvSsHbnJSEmn9rpo5z1Q8F+qI -mDlzriJdrIrVLeDiUeTlpH3kpG38D7007GhXBV72k1gpMoMcpbQ3UmVkIEhhdCwg -SW5jLiAoQmV0YSBUZXN0IFNvZnR3YXJlKSA8cmF3aGlkZUByZWRoYXQuY29tPohX -BBMRAgAXBQI8l5p/BQsHCgMEAxUDAgMWAgECF4AACgkQ/TcmiYl9oHqdeQCfZjw4 -F9sir3XfRAjVe9kYNcQ8hnIAn0WgyT7H5RriWYTOCfauOmd+cAW4iEYEEBECAAYF -AjyXmqQACgkQIZGAzdtCpg5nDQCfepuRUyuVJvhuQkPWySETYvRw+WoAnjAWhx6q -0npMx4OE1JGFi8ymKXktuQENBDySTq4QBADKL/mK7S8E3synxISlu7R6fUvu07Oc -RoX96n0Di6T+BS99hC44XzHjMDhUX2ZzVvYS88EZXoUDDkB/8g7SwZrOJ/QE1zrI -JmSVciNhSYWwqeT40Evs88ajZUfDiNbS/cSC6oui98iS4vxd7sE7IPY+FSx9vuAR -xOa9vBnJY/dx0wADBQQAosm+Iltt2uigC6LJzxNOoIdB5r0GqTC1o5sHCeNqXJhU -ExAG8m74uzMlYVLOpGZi4y4NwwAWvCWC0MWWnnu+LGFy1wKiJKRjhv5F+WkFutY5 -WHV5L44vp9jSIlBCRG+84jheTh8xqhndM9wOfPwWdYYu1vxrB8Tn6kA17PcYfHSI -RgQYEQIABgUCPJJergAKCRD9NyaJiX2geiCPAJ4nEM4NtI9Uj8lONDk6FU86PmoL -yACfb68fBd2pWEzLKsOk9imIobHHpzE= -=gpIn ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former deleted file mode 100644 index 3818b2c926f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former +++ /dev/null @@ -1,37 +0,0 @@ -The following public key can be used to verify RPM packages built and -signed by Red Hat, Inc. This key is used for packages in Red Hat -products shipped prior to November 2006, and for all updates to those -products. - -Questions about this key should be sent to security@redhat.com. - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.0.0 (GNU/Linux) -Comment: For info see http://www.gnupg.org - -mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8 -HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM -GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV -EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS -ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP -lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW -XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb -E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES -PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg -SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID -FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB -XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U -lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+ -5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3 -Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI -hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+ -JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9 -E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK -ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8 -BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5 -4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY -FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk -OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h -VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA== -=3AHZ ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release deleted file mode 100644 index 09aded8bec7..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release +++ /dev/null @@ -1,24 +0,0 @@ -The following public key can be used to verify RPM packages built and -signed by Red Hat, Inc. This key is used for packages in Red Hat -products shipped after November 2006, and for all updates to those -products. - -Questions about this key should be sent to security@redhat.com. - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEV2EyQRBAD4/SR69qoLzK4HIa6g9iS+baiX0o3NjkLftFHg/xy+IMOMg//i -4c5bUpLKDTMH3+yT0G8qpul/RALUFOESKFkZm3/SlkJKuroXcB8U6s2dh5XX9DDB -ISqRwL7M5qB8rfDPKHN+k/XwJ9CNpHMdNxnnc2WhnnmHNp6NrD/bUEH4vwCglMa0 -rFRXPaN7407DARGHvW/jugsEANFaeZsFwos/sajL1XQRfHZUTnvDjJgz31IFY+OL -DlOVAOtV/NaECMwIJsMIhoisW4Luwp4m75Qh3ogq3bwqSWNLsfJ9WFnNqXOgamyD -h/F4q492z6FpyIb1JZLABBSH7LEQjHlR/s/Ct5JEWc5MyfzdjBi6J9qCh3y/IYL0 -EbfRA/4yoJ/fH9uthDLZsZRWmnGJvb+VpRvcVs8IQ4aIAcOMbWu2Sp3U9pm6cxZF -N7tShmAwiiGj9UXVtlhpj3lnqulLMD9VqXGF0YgDOaQ7CP/99OEEhUjBj/8o8udF -gxc1i2WJjc7/sr8IMbDv/SNToi0bnZUxXa/BUjj92uaQ6/LupbQxUmVkIEhhdCwg -SW5jLiAocmVsZWFzZSBrZXkpIDxzZWN1cml0eUByZWRoYXQuY29tPohfBBMRAgAf -BQJFdhMkAhsDBgsJCAcDAgQVAggDAxYCAQIeAQIXgAAKCRBTJoEBNwFxhogXAKCD -TuYeyQrkYXjg9JmOdTZvsIVfZgCcCWKJXtfbC5dbv0piTHI/cdwVzJo= -=mhzo ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx deleted file mode 100644 index 0f875c0e207..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEYk7/IRBACdWFJInc51/+0sqvadIvf0E+Vhv4aIqB76jWtIGqXnTeG6hEl/ -9tJoLszBh4g/KBFVF3E4VxTHXKO/L7GZRa8JzoMtvV8XiP6BaYq6ykx6H7alKvoP -qzk7xBbvNbqsXJCO7keo+g7iIDdfAxvsSJYbhQBxDn5W4Hw7SnHcMmTDOQCg7vOj -UzaZG32yYMBZLjOAB/QzXgsD/1JRDnQ8cL6d17B1ie57ZuVOI3ziQJSmj0zbC0IX -OsxlcFjwydLk3TA88iCr0SO2mfXCsGTeDGFbrl2IRCoH91l3Ew49HI4OYtl+OPSt -pIYdFLSQ+RUPs9CFYwF9Ogjrwmi6jVptKq/+v0WgnCrbfz3DYxCWt/VB1PYDj5y6 -Mv//BACKa2mUuQoukDvzqiwZXV/Z52MeDOzPbOFo6qhx+54nav9Inz1yziEjYrP/ -ZrNJ4BT6fBgin/a6UmD5FqMtkrrhOCpHFQK2H+XYZ0vVJGZI7h74/fY8U2n+1Mle -xQ/ejWojF+H5nFUAwKHaNVNofKcw8c8msgGn2jsvrAISTSHshrQwUmVkIEhhdCwg -SW5jLiAoUkhYIGtleSkgPHJoeC1zdXBwb3J0QHJlZGhhdC5jb20+iF8EExECAB8F -AkYk7/ICGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEDmhOhJCGT5r6FoAoLsB -+DOPmTc3P+77DnNhU460nmjQAKCI3BJ/SxqPqfp8jL6lTfVo2zxegQ== -=t0np ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release deleted file mode 100644 index 47c6be6700b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release +++ /dev/null @@ -1,62 +0,0 @@ -The following public key can be used to verify RPM packages built and -signed by Red Hat, Inc. This key is used for packages in Red Hat -products shipped after November 2009, and for all updates to those -products. - -Questions about this key should be sent to security@redhat.com. - -pub 4096R/FD431D51 2009-10-22 Red Hat, Inc. (release key 2) - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF -0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF -0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c -u7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh -XGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H -5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW -9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj -/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1 -PcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY -HVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF -buhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB -tDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0 -LmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK -CRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC -2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf -C/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5 -un3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E -0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE -IGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh -8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL -Ght5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki -JUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25 -OFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq -dzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw== -=zbHE ------END PGP PUBLIC KEY BLOCK----- -The following public key can be used to verify RPM packages built and -signed by Red Hat, Inc. This key is a supporting (auxiliary) key for -Red Hat products shipped after November 2006 and for all updates to -those products. - -Questions about this key should be sent to security@redhat.com. - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEVwDGkRBACwPhZIpvkjI8wV9sFTDoqyPLx1ub8Sd/w+YuI5Ovm49mvvEQVT -VLg8FgE5JlST59AbsLDyVtRa9CxIvN5syBVrWWWtHtDnnylFBcqG/A6J3bI4E9/A -UtSL5Zxbav0+utP6f3wOpxQrxc+WIDVgpurdBKAQ3dsobGBqypeX6FXZ5wCgou6C -yZpGIBqosJaDWLzNeOfb/70D/1thLkQyhW3JJ6cHCYJHNfBShvbLWBf6S231mgmu -MyMlt8Kmipc9bw+saaAkSkVsQ/ZbfjrWB7e5kbMruKLVrH+nGhamlHYUGyAPtsPg -Uj/NUSj5BmrCsOkMpn43ngTLssE9MLhSPj2nIHGFv9B+iVLvomDdwnaBRgQ1aK8z -z6MAA/406yf5yVJ/MlTWs1/68VwDhosc9BtU1V5IE0NXgZUAfBJzzfVzzKQq6zJ2 -eZsMLhr96wbsW13zUZt1ing+ulwh2ee4meuJq6h/971JspFY/XBhcfq4qCNqVjsq -SZnWoGdCO6J8CxPIemD2IUHzjoyyeEj3RVydup6pcWZAmhzkKrQzUmVkIEhhdCwg -SW5jLiAoYXV4aWxpYXJ5IGtleSkgPHNlY3VyaXR5QHJlZGhhdC5jb20+iF4EExEC -AB4FAkVwDGkCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQRWiciC+mWOC1rQCg -ooNLCFOzNPcvhd9Za8C801HmnsYAniCw3yzrCqtjYnxDDxlufH0FVTwX -=d/bm ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi deleted file mode 100644 index 32833860645..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.7 (GNU/Linux) - -mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3 -/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA -/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L -0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh -dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp -AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B -Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY -iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD -1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs -ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI -BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ -MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj -C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0 -HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa -o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw -CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv -JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK -8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i -gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw== -=6Rbg ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag deleted file mode 100644 index 8ee27f45b9b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag +++ /dev/null @@ -1,32 +0,0 @@ -The following public key can be used to verify RPM packages -downloaded from http://dag.wieers.com/apt/ using 'rpm -K' -if you have the GNU GPG package. -Questions about this key should be sent to: -Dag Wieers - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.1 (GNU/Linux) - -mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6 -TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF -5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3 -3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq -39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN -8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm -30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD -oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170 -JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy -cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT -EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST -hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF -Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon -g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt -llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l -IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg -6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh -Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L -n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I -RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE -BACeJU1hpElFnUZCL4yKj4EuLnlo8kc= -=mqUt ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl deleted file mode 100644 index 70b6bd17ef3..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBEpXadARBACHhOfMUuT/4iDvBRmm6bEsvnMN++L79aYhEUMNlrZ2TjKPjPvG -Y0vGk+I0JhUJWutkQRZVbqgVDsNjmnELnACK+xvdryvtxh50wCI9WUl7CT5EV7BS -/jD7JxTFbXyC/Xv0ixMB9vj6U9cySyE8PxONp0HzO6LTIr1OMPgDUsP4lwCgh8De -fmY8TN2m9a0huLdNrnmKw0cD/2bkt6rJAi3+BGHWNgQ9Nb/4wQff8BKGDtL/8acp -3yH91axuD2iYCKw0ZP5akBpRGv+4e30Plmbi1f5NaEDo9Ga1c4TDPopwgiYhrVLj -56efoTfP2AiZl3iBKFPI83/YOhrVZF8UiYoAoUnOFpOg8vmtCzgvYip5UZLTgbfJ -lcWvA/9vMb8By+1pHjW98d7GkzvZqzyMtWlbO7PXCn8P7bGQYjwvyTGiRNz3q22c -2Z29qQw4r1L1L1JGsUwuOMahkczWVdD4TRHc8mhVJEUEA6AkNAZc+Ymsfr/ip0kX -nSZLE3pYVifOhBRO8EbT0WhCMScmZNpwvZU//HKL/p+n3LArUrRZU2NpZW50aWZp -YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4KSA8 -c2NpZW50aWZpYy1saW51eC1kZXZlbEBmbmFsLmdvdj6IYAQTEQIAIAUCSldp0AIb -AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJELC0GD8ZKn19cXIAnA5R+EbaYr4/ -IL6It/UxHXlBFIajAJ9bwmNDF14uvDnFigg1PLevLTBnTIhGBBARAgAGBQJKV6lf -AAoJENpq0AiC/ReyKLQAmwVC/Ii3sAKsptwZKHw/uk1kbupCAJ0eIzSaUo1hSa1V -fP7O/dqigu6JAbkCDQRKV2nZEAgAzAcaC7unRNdrIwAGGKqOIvI8WNwpftHY50Y5 -zPSl7vtWVkp3N+2fynJR+tW4G/2xDChBbPzPz/TavRyBc21LKzAlym8qIGEE02cZ -U/YJAYnbAkNNiGMOAnAIjBw1KUcQamAxdk0glE7MP1JiXY1MO4tTW38UEcvQbSvg -Mh/eECqFOwiQXJmkPpZhPUwnwmZRCV4vlCZQM3CMExZ9pDV/V+kuhefw2WeheXyh -g4DC88gcrv2mO0I3sVmpxn3JLMayiMlQbOSYLQuNVKN/EFDwuAbS9Ane7vm6wF9X -NswMX0I/vO1IVvSN1fi5ZM71QzeYUGKBQv97kLO20hbRWZ1V+wADBggAys+jhlYH -mtFZQxV4an1ucqnVauKnstj0zF88Hiy7yivT3W5h3Zd067uOfcBQCJUlt7y8sYD2 -q9htm5Rrxx+J29bl0zxwrEatnv0gLzprSa7Ei3wR6IrvBM3Ic0mGSzlsSxlzaFtt -Pwak5C47vX9+PwKEKXFdM1gVzHTuD6PXEYxA4YMlQGeGVA68FvTHxMHpf8POQWTV -QtjoI0flvFT7d4ozqUJdjJZxJDFQ7GO2YdIfF3sUdfn5kFxK0SUzqrmCYXeheniS -LKC4mpAR0PetWJ7r1gY5khHb2eHW1vdEBYUXlHjB+jLaOBns05MHMZYd4CHe8q/Q -gzMeVlh8YLSdZYhJBBgRAgAJBQJKV2nZAhsMAAoJELC0GD8ZKn19iU8AniUIFu32 -VeRJ+VKL2vBQMVbFVZOMAJ434Bi99fN2CSh7T62oxtQvhw70fw== -=eL9H ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3 deleted file mode 100644 index 5d16185468e..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3 +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBEpXatkRBADSVLhSFxxebo3H16HGjvOg+tSAuppoqrmg9WrC2ly6I41BHXng -n2H0t07nAemb35XSRfb6j4vNIiNoXGFzcjTMP5/cwn24hvilXyA0zX59hhD0ut4c -VGksNhUKnYkVI/+0+EjJ3RnCouVvVx8p2eCIDhjIueDjuLp3mVBLYh7OEwCgmQrO -ysS+xHHcYfUX4jsghfzge10EAIuMAXGWmMLRUJ6PCjrAKVVGT4FxH53UyPjXGXga -SYR4A4aFq9eoDPLRo/nRB/isT0/NfcBbp4wdzYUxz8pmMOWGLFjg7DBBvOj84q+0 -ZFibybxFJAtjaZcKw+feCb6R2tJPOfJr6+noOeAZ9MFYZ7z5NG5vezGB1rLu/c5k -vb5LA/9wI8pz7jCMOPBE4LGO9C1tbvKfrFHEfsgn5zsF/+YABCrbHrc2eN2NESpv -84jLHvrssKaPjJVHL1JlRRfO2myT37hLa/D3pUrAcs/CqWGeddKkhJE7c816EO6d -FZU5/7Utill9x3tLu8ZS+WXkH5sr/garxim5P3Sm3K1/ZXZaEbRbU2NpZW50aWZp -YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDMp -IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2rZ -AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQAYjOtesQYlrupwCfR65pEGRf -air4Nzf+ZP5Q2i8doscAnAhod/cVNjPA9Lo4UOEAJ5kWZ4CXiEYEEBECAAYFAkpX -pTwACgkQsLQYPxkqfX2m9QCfUzSI3MVchLk00M2c67Xj7ghvNaMAn3TybHcAHpGu -pJ8qBwisCX6mPMSqiEYEEBECAAYFAkpXqW4ACgkQ2mrQCIL9F7LGjwCfWBc67ftN -jTGxL+ilnrYyZhupKd8AoKoSkHG61pxk+Ja58aSvsGRWAdv9uQINBEpXat0QCADG -G22g1V5t8xoxjA5sgDw+ow3QonkA8p+EEr1+xjZyJTsMMiRioz88WH54xcbLBoCM -ltgK3gSYpywEoB76yzFS/woLSjBdCLEMwX6Dj/y1U67ykoDoop31LIW8a4geYJpW -0a83Np00noLidNi7xhuExvp3BxHPpM9mVvqfDOkFcuiexaAU9uF6cgVov8eE95l9 -jWcNn1oLnqo2mq2pqJFk0Qkq612Nj2TWOdcrJlksIqEG+H6Jn434u+leGgyR6RnW -Ty4OS4JnwRYXeAfLh2wCCFPWVL6eQTfRjkWmjWlvKIgz8YX+vTx7SfYsfhPRKkgs -ZS0VyRkUSV8EkkRlaRw3AAQLB/9YOgCeW673SBZJUITb1TM4bxT2bk03ORpfqPzu -NBfb4Szm1lsJvlOgEfwZZR2UcQeCqm+WtSSx/Ajce/LA/Q+MYW0X/Vcy1pEYYhs1 -9YRZ/1Q7+JR2Q/hCMBvtMf3XN+1sEjHwPJpskq0qBng6SofE+V7FOELswfSk6j+b -2d4G4WEyuiaj6FD5tvrWFmcWgBnhpGG+Rx2n1UT1lqk+r81H4iZB6MoIkicR1gyx -i6mfqJnKMFSWeeXddx7kr6xclDungGlTF/dnk5K73CRm5XBxxYsUYS1Kz8tF6MbB -d/FYJjYlQWx2eAh1xoimlnBgX8BNsmzjbvOtcLtZOUTT95F2iEkEGBECAAkFAkpX -at0CGwwACgkQAYjOtesQYlqHcACfQqTUZxtuSjHWeM2yODl4Cb6kMqkAnjgBLM1s -uix25Q+HkPygJyHv7nEI -=eJoE ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4 deleted file mode 100644 index 14f3096678e..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4 +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBEpXa1QRBACRt4l3x+38VrBV58HhPrz8iOKDhMVzBODGetPzqmIX0bLz7nz/ -ZYmEPsY0Nhnp77e3cU4YRSUKOM96BZwo8DsJz9sT14b3IozNEo2R7JZNp22RrvU4 -gRXjgQmg5N83tnU03KK/IxrbjdO29Go3vGBWM4tWxUoGLG9kQGhYtZL0MwCgn13c -xYt5JRtxLdfNM/Kxbg4FDTsD/31hBoeMetdNHjuMq+I3SMgnAATkgQ1TZHj8lCV3 -y0qM0zAfVRuPSTVodlJuMjOUKkERAAWqzXiNkgKtIgREBORmz6d9q/bangLr9ygL -fz/4vTxtfdmXxG8Ru/zVF9Ulu1GuLZKlP1PZosZsMQfbByWVOybg38qdyeC93EGd -qmrBBACQeehjanXRjgEROKXkpe2A6w31m0iu2sT42TUvq5neSXjrFTXN8YPd0SpK -8IiCZHkAh3YBCRogfT7T+uWQsrwICCAf00pEAuP9c6BUeepbjQZPK2fqD16lhRn8 -A1TjdngDto45/2T8eIUafh8ONheRuA1Lnb3gV92fUSkQDppw57RbU2NpZW50aWZp -YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDQp -IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2tU -AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ8VzxvJUFci5eswCffepTdZlb -60FSFxWfLGXdr6NLVY0Anj2ILigIHnOQ/Tb0fX4Wok2rObm1iEYEEBECAAYFAkpX -pPwACgkQsLQYPxkqfX27WgCfccR97sqL4klabdAmAkQ0TSXZ+AgAn0FUCu92L9xP -i9td6W7lPh0zdnudiEYEEBECAAYFAkpXqXsACgkQ2mrQCIL9F7LzywCdGT6FQ4ZT -swwxZA63MrLn7ZdN/r4AoLvfdudahfiuiZQtGTYvoR3gzw70uQINBEpXa10QCACr -GeMNUJTtApiwStqIKXGj5BahvI2muQPOF0yr5fqpOwA1SnucTQmwEVtBHRhR+J3V -iOQ8igyMUxOe0F6JCOAbZIx0G5iVs51+wT1LYD2bQkUoObIToGut9r6NlI2selcP -lqx2ckziGVOSU77/7MoGo5GNbWJaNHWCNh6zrA+5hKY46va7hkm0WFFvlZ+U8OCB -aI8BnwB7JZCNdrBgL37oX1qm53BboDaE4aY/73gIvCd3M5bjuqbe666zvQo8xdbL -wiSe8LrHHa7EHxWNFYxv91H56FIP7sbnbiSYKZiOMahnc2hBAa0CAsWhWKDSnqt4 -IN6VOMvqooFllvRXLVgnAAQLCACMm7NhtX0k5AAz3dsXREiQ5hpCS0+djxHTOyAf -aYjB9FTV2WfWQ9G/KTowpQm4nu6IHzFtHWn8mt7/wnxnSIPeykjgAeuzXd/mSBM6 -/FobeXZsb7a6vDZNP4gSGzMAv7xl4QdBWGxQMRED7Lvg1rU70Dh/X2WvRu3a0MBy -xHdTBmpIUIQJ0VV6ikGXvu7DS2skvL7lZxKTHPr0zho6rf9De7GJ6FGCAKfdmgjQ -Gm1i9/pH05UQ4+FD/JyNwEX/CPf8qb6PgtwoJeJ+SPnWZlayYBEB03sK1fD/RIfF -TbRoJz8YRBniC0AwLlUj3n6IdVGrcK8vy2MvVHF//cXLmCroiEgEGBECAAkFAkpX -a10CGwwACgkQ8VzxvJUFci4ylgCY4OS+SEAqiiqz1VBCKq5PxNpzXgCffwtqFgV9 -aFtaKnBEuQRBQ5uz+mA= -=G01V ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5 deleted file mode 100644 index 1e1c594ae7e..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5 +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBEpXa6URBADLDs4W73NK1DOZq0mWfmMwv27uaAS4RZuJJWj6eTmF2YcAdVPr -rsfvBB1GrN5YluqGCN0CBSULtmoxE8AVB/2kGgIZmD7x10+dMXn0cYJrQuTjtf1z -xos1cmdzK7Or0p5dQbuxvlpEseFATGimggBeunwSt5qMpXqN9/1dqksK0wCgi/Tu -JyR3Wsg0NqZrUbr5vEiqHoMEALmYht9n6lCt4j6oYZGZ1DlTwjaAjeJe9qdDlbx7 -fNsfFwV1fqMFc2Bop7UJXfTytVXzDwISsn5YLK2ty1kSuA/7PCt7OkrbchBwm/y0 -5KiGjnC0D+6qdApnwJClWFsu6VqquRiplAJ+6bMw/z+VXVnJztMx09tQ/M9idN// -mJYHA/9989JcHDi0hPlCCYHGs9Bw70H9TvzanKwq5GRlSbEDz9LrrJopJuz788Xu -xg0WXVlduwrEqU2wlq8lY2m6UlkfIya/fs6NkDCJE3bHSMjfovpL6cUFCKedKsas -ODOio6i3ZEcWXz3w4Dv43Mb/z1m8Fe5e6Z0jw5OwEQeWLIHHjbRbU2NpZW50aWZp -YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDUp -IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2ul -AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQKHfjrROgotzliQCfdmgSNeDY -fkako6w5P1RgYg+gnoAAnjdtRp8wrrlT7lD1fyZelaX+5GOxiEYEEBECAAYFAkpX -pFMACgkQsLQYPxkqfX1tUACdEsZdXFXMG2nhU4Eema+NQ7dPT3EAn2xH8ARaCHLo -xg/knc9G04Wd0Q6NiEYEEBECAAYFAkpXqYgACgkQ2mrQCIL9F7Ji0gCbBQ6cYMbI -Dd9B+cYFXDrSDqUmkXMAoJAv8rAPO4IfRsVd++gt28/G293TuQINBEpXa6gQCAC3 -VnB5gncnFQSjlu0YXhMQzOlXZ1/UVT262emIACbECDTUoy9U1J4VEecZimIe/BId -uEEBY76i5pmvEV5iWzP3UbCCCUQmpMlFk2LV1jci30/2uTSVXL3yicfrOs74W3rG -4DxN3cHbttEAZJgH0nKAg48APWsKOgrlgzPk63/vzcuymSnXWTiYksslXQ+NYOoV -2Oux9y65K1PjEZoftjorrtcx4E6P0LO5hoowFucfo3VEYpzCjeLogjMmS5Af5GyI -+/5QSQLQ+m0vzppwE8mIt1jsHtEy/0XIdOZTIA10e/I4AvxVoRHbdVY1LjtrkXKN -CGTyaydBe3a4MDoUQWTzAAMGCACW8tORZd0boInktcNWS/szBgAllwPVhFUF4hk7 -pp1rPsiW3h36ARvhvdtNlHHgFPExU4fSinnpMUL0ajx4jEXGg6178WHMFvLUw6ww -Ts1rXaHHagLwemG9iQ1++lLewSkqlKOjVvdV03WOHBwt5GTNe7KCuuM2ko27wSVY -YpbP4A5jEhMkQuWsXPpNu+Oj5uS8XzrIR9McHK0lD9vU2cUUM7OauRo4obygodOa -cwmd0NnRyYf5aPMn4AI795/eWuFK1WYz1Fe7uX7PNcrc2oGEUuqADFNfwtN2HN1V -4dDBHUiPiPydrSml2l4T2NOLI2wVaXIfKdM/6R4agf7lruJliEkEGBECAAkFAkpX -a6gCGwwACgkQKHfjrROgotzpAwCfbLfWIHyWyaWdBRRTixIRs/LFkzYAn3eVy9pL -omk16gZFWxiB8lelViC1 -=ta+t ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6 deleted file mode 100644 index 70e93822bc9..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6 +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBEpXa+QRBADFJtkQOdBsPIElO4SQnri0o6+d1uaaIkclI3uu88Pmy7LkBO4L -y8U7jKS1y4m6I49hpqALM43wq8tm7BYWObd+xlol2mZEgbrxHoFugqfEKAOKxLut -CkCC0wFOK3psQQMSNLokPHYLP6MJL84VsS+molGpUE7EtZZMRaHXyHiU+wCgg5dF -3TD3rYn2PXkiAFlHs6/OficEAK0zmzEdzNfdfWwipf4AQrAEaBO9If7eo5zj6RX9 -bajg0IRgTxpwq6dP+bnnoEtm/v0vZeAGe8zscCX8xIPtDqu7+QbMe89SSdKJXHog -/cC/vOS1+s5TKX2ervZ7pAauyve1xO53eVxsg6oDtTwIqvlQbmi6Vs2I3lplhJj9 -sZZ1A/4oNeWoZlBnxr/0eyHDktW89x0wt0R+jJVksnHJxyg7D+MLmaDZR0Fjg8Wt -EhW8Q5WS0rkk39VaFoA3oR9nfEzAJgymSqNjTEwLsPaqvq6Q5zE+nouYP46cMbcW -PKmST+QZCRMfznam667eKk0+opBIhDy57M2Kerx4EZyMy/0l4LRbU2NpZW50aWZp -YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDYp -IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2vk -AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQkV114Jsf01BepACeO7UR33C6 -g4HfHvLVq8zf1SU99y4An1ZOfgrW5iVCEwDc+bWiUu6sbujIiEYEEBECAAYFAkpX -pBIACgkQsLQYPxkqfX0yCACfap7Y7XpjuSr2DXL+ohDbAM+xdOIAnRjegnSEBqHa -Hpi8a7gS69H2hz51iEYEEBECAAYFAkpXqZUACgkQ2mrQCIL9F7IHlgCgr/SqepQ/ -8aXpbQqtwXQho6kDEHIAnRbtNiBRZl4B+fbh6ZsdOr6QHIiOuQINBEpXa+oQCACw -50+Jv6VEVrAL+rRoptmBmHbg8XhNfOPn349GYCtZ9TebCtmU82MEWYF4Eo5vk1JM -P29EBTKfYHBYsD231HavQa4EXVcjYm38i43c0P0sVvO1t5x2EDncthd+Sx3P/36k -mr9pjCA9PFR3zLUA3YxqeipgrfU2NhDh4yvxgHogYjn1Gdqf0TWo2lqYnLjAMbZ0 -y7Mk5G6SfZcSRrZvjZgvXUlmynJXMY766LjyrfasuS4fd2LWFovXOakBb5lR7Z/O -ec1U8CEypQ2iC9ww+Tg0tq+oIJ8g27pJrYsfoCf6HVhsxFOzxf8pjNTilWIB4lMk -ok5+QnQwDVOykeXFDoKXAAMFB/9w1l+PFODmKJFCPqkYj2+0a+rT+76hDVaPJC8E -xcsGf5uJQpOdgqgqMgT1kczMX4CbJ/OIqJVnuFGxoBh2tblwtHvGTwepSTn/yUyd -SbCKmgMr8WafSZUxcRFPql4U2yBvAvdkTCTl+OHv3CrAZxDTV15FoHyPRm/2XU2f -75Y3EutNLrh3TB5aXEveTe1LP+eYDtYTa/nW6A3WqOKWN7wpMBQ9H65mgN9au+g2 -Euh4DtV/myhnyILMYfCPvUAO68MZ4INC/koV0R78HBI4HHVE0Im338fQeS4g30eL -+IPoYGAkRQsZ8pi5JnVdqUK9DuNA+NuEhZmYycC6RCxUaKFmiEkEGBECAAkFAkpX -a+oCGwwACgkQkV114Jsf01C04QCdGkNIVHih/YkT79eykpQ8dUUfGkUAnjV0pyzz -5XK12rKD3j1Z+SNr+Lqs -=EcEL ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms deleted file mode 100644 index 860ace4d247..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.6 (GNU/Linux) - -mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI -1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm -aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH -a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t -ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8 -mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE -OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx -k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8 -yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l -dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR -AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM -5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps -+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu -AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU -kg/3AeBlMBIlFe5hDQ== -=23Fz ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key deleted file mode 100644 index b91a5a88769..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0 -CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj -Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i -SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy -12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz -wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7 -exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd -tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B -N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv -cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb -AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975 -wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI -MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD -/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So -M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9 -hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN -dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs -UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv -qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH -5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n -nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO -Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5 -adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV -AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA -yOSLb33CweehCrlTnQ== -=scSy ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/empty/.placeholder b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/empty/.placeholder deleted file mode 100644 index d7c13725067..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/empty/.placeholder +++ /dev/null @@ -1 +0,0 @@ -# Placeholder for git diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5 deleted file mode 100644 index 2627d31d8f6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5 +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEWfB6MRBACrnYW6yKMT+MwJlCIhoyTxGf3mAxmnAiDEy6HcYN8rivssVTJk -CFtQBlBOpLV/OW2YtKrCO2xHn46eNfnMri8FGT8g+9JF3MUVi7kiV1He4iJynHXB -+F2ZqIvHf3IaUj1ys+p8TK64FDFxDQDrGQfIsD/+pkSGx53/877IrvdwjwCguQcr -Ioip5TH0Fj0OLUY4asYVZH8EAIqFHEqsY+9ziP+2R3/FyxSllKkjwcMLrBug+cYO -LYDD6eQXE9Mq8XKGFDj9ZB/0+JzK/XQeStheeFG75q3noq5oCPVFO4czuKErIRAB -qKbDBhaTj3JhOgM12XsUYn+rI6NeMV2ZogoQCC2tWmDETfRpYp2moo53NuFWHbAy -XjETA/sHEeQT9huHzdi/lebNBj0L8nBGfLN1nSRP1GtvagBvkR4RZ6DTQyl0UzOJ -RA3ywWlrL9IV9mrpb1Fmn60l2jTMMCc7J6LacmPK906N+FcN/Docj1M4s/4CNanQ -NhzcFhAFtQL56SNyLTCk1XzhssGZ/jwGnNbU/aaj4wOj0Uef5LRGQ2VudE9TLTUg -S2V5IChDZW50T1MgNSBPZmZpY2lhbCBTaWduaW5nIEtleSkgPGNlbnRvcy01LWtl -eUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwekAhsDBQkSzAMABgsJCAcDAgMVAgMD -FgIBAh4BAheAAAoJEKikR9zoViiXKlEAmwSoZDvZo+WChcg3s/SpNoWCKhMAAJwI -E2aXpZVrpsQnInUQWwkdrTiL5YhMBBMRAgAMBQJFnwiSBYMSzAIRAAoJEDjCFhY5 -bKCk0hAAn134bIx3wSbq58E6P6U5RT7Z2Zx4AJ9VxnVkoGHkVIgSdsxHUgRjo27N -F7kBDQRFnwezEAQA/HnJ5yiozwgtf6jt+kii8iua+WnjqBKomPHOQ8moxbWdv5Ks -4e1DPhzRqxhshjmub4SuJ93sgMSAF2ayC9t51mSJV33KfzPF2gIahcMqfABe/2hJ -aMzcQZHrGJCEX6ek8l8SFKou7vICzyajRSIK8gxWKBuQknP/9LKsoczV+xsAAwUD -/idXPkk4vRRHsCwc6I23fdI0ur52bzEqHiAIswNfO521YgLk2W1xyCLc2aYjc8Ni -nrMX1tCnEx0/gK7ICyJoWH1Vc7//79sWFtX2EaTO+Q07xjFX4E66WxJlCo9lOjos -Vk5qc7R+xzLDoLGFtbzaTRQFzf6yr7QTu+BebWLoPwNTiE8EGBECAA8FAkWfB7MC -GwwFCRLMAwAACgkQqKRH3OhWKJfvvACfbsF1WK193zM7vSc4uq51XsceLwgAoI0/ -9GxdNhGQEAweSlQfhPa3yYXH -=o/Mx ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6 deleted file mode 100644 index bd863d8e212..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6 +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQINBE4P06MBEACqn48FZgYkG2QrtUAVDV58H6LpDYEcTcv4CIFSkgs6dJ9TavCW -NyPBZRpM2R+Rg5eVqlborp7TmktBP/sSsxc8eJ+3P2aQWSWc5ol74Y0OznJUCrBr -bIdypJllsD9Fe+h7gLBXTh3vdBEWr2lR+xA+Oou8UlO2gFbVFQqMafUgU1s0vqaE -/hHH0TzwD0/tJ6eqIbHwVR/Bu6kHFK4PwePovhfvyYD9Y+C0vOYd5Ict2vbLHz1f -QBDZObv4M6KN3j7nzme47hKtdMd+LwFqxM5cXfM6b5doDulWPmuGV78VoX6OR7el -x1tlfpuiFeuXYnImm5nTawArcQ1UkXUSYcTUKShJebRDLR3BycxR39Q9jtbOQ29R -FumHginovEhdUcinRr22eRXgcmzpR00zFIWoFCwHh/OCtG14nFhefuZ8Z80qbVhW -2J9+/O4tksv9HtQBmQNOK5S8C4HNF2M8AfOWNTr8esFSDc0YA5/cxzdfOOtWam/w -lBpNcUUSSgddRsBwijPuWhVA3NmA/uQlJtAo4Ji5vo8cj5MTPG3+U+rfNqRxu1Yc -ioXRo4LzggPscaTZX6V24n0fzw0J2k7TT4sX007k+7YXwEMqmHpcMYbDNzdCzUer -Zilh5hihJwvGfdi234W3GofttoO+jaAZjic7a3p6cO1ICMgfVqrbZCUQVQARAQAB -tEZDZW50T1MtNiBLZXkgKENlbnRPUyA2IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8 -Y2VudG9zLTYta2V5QGNlbnRvcy5vcmc+iQI8BBMBAgAmBQJOD9OjAhsDBQkSzAMA -BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQCUb8osEFud6ajRAAnb6d+w6Y/v/d -MSy7UEy4rNquArix8xhqBwwjoGXpa37OqTvvcJrftZ1XgtzmTbkqXc+9EFch0C+w -ST10f+H0SPTUGuPwqLkg27snUkDAv1B8laub+l2L9erzCaRriH8MnFyxt5v1rqWA -mVlRymzgXK+EQDr+XOgMm1CvxVY3OwdjdoHNox4TdVQWlZl83xdLXBxkd5IRciNm -sg5fJAzAMeg8YsoDee3m4khg9gEm+/Rj5io8Gfk0nhQpgGGeS1HEXl5jzTb44zQW -qudkfcLEdUMOECbu7IC5Z1wrcj559qcp9C94IwQQO+LxLwg4kHffvZjCaOXDRiya -h8KGsEDuiqwjU9HgGq9fa0Ceo3OyUazUi+WnOxBLVIQ8cUZJJ2Ia5PDnEsz59kCp -JmBZaYPxUEteMtG3yDTa8c8jUnJtMPpkwpSkeMBeNr/rEH4YcBoxuFjppHzQpJ7G -hZRbOfY8w97TgJbfDElwTX0/xX9ypsmBezgGoOvOkzP9iCy9YUBc9q/SNnflRWPO -sMVrjec0vc6ffthu2xBdigBXhL7x2bphWzTXf2T067k+JOdoh5EGney6LhQzcp8m -YCTENStCR+L/5XwrvNgRBnoXe4e0ZHet1CcCuBCBvSmsPHp5ml21ahsephnHx+rl -JNGtzulnNP07RyfzQcpCNFH7W4lXzqM= -=jrWY ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL deleted file mode 100644 index 5a13bb4f9f9..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF -l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/ -QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/ -lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk -/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm -l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl -1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic -vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP -QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ -RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM -AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa -ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/ -blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J -nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl -PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3 -5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS -w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd -yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA -DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1 -axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H -Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T -P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24 -0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC -GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY -bbsLFWOfmzAnNIGvFRWy+YHi -=MMNL ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4 deleted file mode 100644 index 5a13bb4f9f9..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4 +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF -l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/ -QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/ -lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk -/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm -l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl -1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic -vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP -QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ -RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM -AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa -ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/ -blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J -nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl -PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3 -5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS -w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd -yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA -DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1 -axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H -Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T -P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24 -0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC -GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY -bbsLFWOfmzAnNIGvFRWy+YHi -=MMNL ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5 deleted file mode 100644 index 5a13bb4f9f9..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5 +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF -l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/ -QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/ -lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk -/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm -l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl -1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic -vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP -QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ -RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM -AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa -ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/ -blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J -nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl -PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3 -5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS -w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd -yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA -DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1 -axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H -Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T -P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24 -0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC -GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY -bbsLFWOfmzAnNIGvFRWy+YHi -=MMNL ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6 deleted file mode 100644 index 7a2030489d2..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6 +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1 -JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B -M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn -XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6 -pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV -QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp -Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq -3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu -vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar -1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g -YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB -tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS -KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9 -qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT -9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP -Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS -WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft -HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF -p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP -x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8 -wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J -l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG -iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR -XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ== -=V/6I ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG deleted file mode 100644 index 8722c21cbd6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.7 (GNU/Linux) - -mQGiBEeD8koRBACC1VBRsUwGr9gxFFRho9kZpdRUjBJoPhkeOTvp9LzkdAQMFngr -BFi6N0ov1kCX7LLwBmDG+JPR7N+XcH9YR1coSHpLVg+JNy2kFDd4zAyWxJafjZ3a -9zFg9Yx+0va1BJ2t4zVcmKS4aOfbgQ5KwIOWUujalQW5Y+Fw39Gn86qjbwCg5dIo -tkM0l19h2sx50D027pV5aPsD/2c9pfcFTbMhB0CcKS836GH1qY+NCAdUwPs646ee -Ex/k9Uy4qMwhl3HuCGGGa+N6Plyon7V0TzZuRGp/1742dE8IO+I/KLy2L1d1Fxrn -XOTBZd8qe6nBwh12OMcKrsPBVBxn+iSkaG3ULsgOtx+HHLfa1/p22L5+GzGdxizr -peBuA/90cCp+lYcEwdYaRoFVR501yDOTmmzBc1DrsyWP79QMEGzMqa393G0VnqXt -L4pGmunq66Agw2EhPcIt3pDYiCmEt/obdVtSJH6BtmSDB/zYhbE8u3vLP3jfFDa9 -KXxgtYj0NvuUVoRmxSKm8jtfmj1L7zoKNz3jl+Ba3L0WxIv4+bRBUG9zdGdyZVNR -TCBSUE0gQnVpbGRpbmcgUHJvamVjdCA8cGdzcWxycG1zLWhhY2tlcnNAcGdmb3Vu -ZHJ5Lm9yZz6IYAQTEQIAIAUCR4PySgIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA -AAoJEB8W0uFELfD4jnkAoMqd6ZwwsgYHZ3hP9vt+DJt1uDW7AKDbRwP8ESKFhwdJ -8m91RPBeJW/tMLkCDQRHg/JKEAgA64+ZXgcERPYfZYo4p+yMTJAAa9aqnE3U4Ni6 -ZMB57GPuEy8NfbNya+HiftO8hoozmJdcI6XFyRBCDUVCdZ8SE+PJdOx2FFqZVIu6 -dKnr8ykhgLpNNEFDG3boK9UfLj/5lYQ3Y550Iym1QKOgyrJYeAp6sZ+Nx2PavsP3 -nMFCSD67BqAbcLCVQN7a2dAUXfEbfXJjPHXTbo1/kxtzE+KCRTLdXEbSEe3nHO04 -K/EgTBjeBUOxnciH5RylJ2oGy/v4xr9ed7R1jJtshsDKMdWApwoLlCBJ63jg/4T/ -z/OtXmu4AvmWaJxaTl7fPf2GqSqqb6jLCrQAH7AIhXr9V0zPZwADBQgAlpptNQHl -u7euIdIujFwwcxyQGfee6BG+3zaNSEHMVQMuc6bxuvYmgM9r7aki/b0YMfjJBk8v -OJ3Eh1vDH/woJi2iJ13vQ21ot+1JP3fMd6NPR8/qEeDnmVXu7QAtlkmSKI9Rdnjz -FFSUJrQPHnKsH4V4uvAM+njwYD+VFiwlBPTKNeL8cdBb4tPN2cdVJzoAp57wkZAN -VA2tKxNsTJKBi8wukaLWX8+yPHiWCNWItvyB4WCEp/rZKG4A868NM5sZQMAabpLd -l4fTiGu68OYgK9qUPZvhEAL2C1jPDVHPkLm+ZsD+90Pe66w9vB00cxXuHLzm8Pad -GaCXCY8h3xi6VIhJBBgRAgAJBQJHg/JKAhsMAAoJEB8W0uFELfD4K4cAoJ4yug8y -1U0cZEiF5W25HDzMTtaDAKCaM1m3Cbd+AZ0NGWNg/VvIX9MsPA== -=au6K ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL deleted file mode 100644 index 152fd799008..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL +++ /dev/null @@ -1,36 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.14 (GNU/Linux) - -mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o -h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu -gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+ -CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV -UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna -3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S -hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk -hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J -nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1 -YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr -BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ -AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf -3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE -ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO -w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr -6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo -BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn -ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ -3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE -tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8 -zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ -LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat -RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9 -EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu -W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe -nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg -5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ -Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf -8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA -mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q== -=iyOs ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta deleted file mode 100644 index b86da239064..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP -6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo -eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t -Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP -tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM -IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU -YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5 -ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U -vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg -QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i -ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD -AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8 -aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ -EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F -SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy -MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv -8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg -PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8 -+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO -eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F -AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma -D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5 -=mH0S ------END PGP PUBLIC KEY BLOCK----- - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org deleted file mode 100644 index fe0c0822752..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBEm+/6QRBAC5mbtqOFSQ0FkTLIMdIoqxtraIeUqwbPp3IBYQ/u/EREjyEf1D -qFyBEXII0dD8JDT85vRZ81jhB7nFWa0VbUfY0xfghkbnokiNBVNpiQcvszw3UYDF -aLAaOC8Z98vmlsQaBBTQG6704ZXLr7FJyG3GP5WE6egXIQQbrMcdmCoRBwCg/dwC -HLWjuemoDc5SX7hKHbB4zZ8D/jP+oMbqz+bDn8OZ2UuaGdxr+mHW8tzTdPjnEU8e -hUt1ws8eBqn/gMfKvUBa8xFSILe8Ty99u+VjFbcRsdf0H6dRre9AdDVUz5oxzoPw -gamA8mhPQvFh3wt9smtRUh5IoM2LiM1s5pGMLuYuvSnVUPArEnSfW6K5I6v7OarU -3WfrBACDEGGcaWKjfdkRtmKIQrzu6AnldVC1ISLVAoqxHnKNFTk1BgO0PSZDpfJI -x8fMCnGlusoL6F5+LYEk4K4B0zvlj1ur3JocjxpuBLccl94JTo/+I9ZbS8ptUqLw -LBUkgIQJzzIH4G5NZsQ3FpzSWGRFVa7etqTv9BfUMUmJxhEoobQ/ZWxyZXBvLm9y -ZyAoUlBNIFNpZ25pbmcgS2V5IGZvciBlbHJlcG8ub3JnKSA8c2VjdXJlQGVscmVw -by5vcmc+iGAEExECACAFAkm+/6QCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK -CRAwm8MFuq2uUlgWAKCGWOpyodbzxS7Xy/0X9m9qVnHq+ACfUHrQzYAtFRpT07Sg -giosE+mvAKu5Ag0ESb7/pxAIALgT0q0HhwugE717a7N+gAtCbFu8pCXOZcrAnJpG -cMA9VWmsODZStPTxXYM2ggCMSzUnNis8pPZOPIP5C+t2IYtVjLshM4C9UiY7u5ET -jErWCxWmF+2QLO50K56E4qxj0wufZt9P+Ih0USUM5L2oyrQG51uj/2v3Qq3igc8Z -NTtmEOfis3losusQbAfZtTBmNQ0570kkhMxiyavgAUxLenXHYrkDJFuL7XdBCmna -kykTn2dzU81rIDZ+QPxII4V/eZ5xGiRY/EDUIAysEV2m0NNZgWi/twUnZICm7zYp -VRviJrBnFTvNEPMhiGRnJgQp/Krv4WIHQ67N8lQg3q5RJX8AAwUH/0UBjBgbsuWR -dB+ZYWjKPBy+bJY/6HefPUuLrt3QDNINMW8kY7VzWRMWyGc4IlPJDW0nwOn/vT5H -Dgc3YmA3tm7cKj5wpFijzff61Db8eq+CUKGscKxDBGzHq6oirM5U7DQLmipCs5Eb -efwHIjE3aOUSnoQmniEnBWI2hm/rftmY9oJSi8xgns4wAokDPiMcucADtbV3fznx -ppuowtBi8bcGB1vJZjTySQcSKWv+IVp5ej06uZ9501BEm6HxUZkuAGPecP65kcQu -5bg7B7LQeI5AWyujqvfuWgAF34xhl9QU/sDWxM3wUog+bw7y8pyWCqnJhp70yx8o -SqzhFygT62eISQQYEQIACQUCSb7/pwIbDAAKCRAwm8MFuq2uUq8PAKC1+E2pSwiS -oHXkKYPYDwApsP1mVACfRe1YnggLYQtG9LMeweVQQC77rK8= -=qyRr ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh deleted file mode 100644 index f8c688e5f4c..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp -ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73 -uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o -V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/ -Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk -LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr -8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr -wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel -09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg -U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn -PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+ -E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr -a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD -zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A -YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD -/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8 -ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq -s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC -GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi -DX+bbalHM+xVnXZN -=rZT6 ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta deleted file mode 100644 index 7b40671a4c1..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta +++ /dev/null @@ -1,61 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQINBEmkAzABEAC2/c7bP1lHQ3XScxbIk0LQWe1YOiibQBRLwf8Si5PktgtuPibT -kKpZjw8p4D+fM7jD1WUzUE0X7tXg2l/eUlMM4dw6XJAQ1AmEOtlwSg7rrMtTvM0A -BEtI7Km6fC6sU6RtBMdcqD1cH/6dbsfh8muznVA7UlX+PRBHVzdWzj6y8h84dBjo -gzcbYu9Hezqgj/lLzicqsSZPz9UdXiRTRAIhp8V30BD8uRaaa0KDDnD6IzJv3D9P -xQWbFM4Z12GN9LyeZqmD7bpKzZmXG/3drvfXVisXaXp3M07t3NlBa3Dt8NFIKZ0D -FRXBz5bvzxRVmdH6DtkDWXDPOt+Wdm1rZrCOrySFpBZQRpHw12eo1M1lirANIov7 -Z+V1Qh/aBxj5EUu32u9ZpjAPPNtQF6F/KjaoHHHmEQAuj4DLex4LY646Hv1rcv2i -QFuCdvLKQGSiFBrfZH0j/IX3/0JXQlZzb3MuMFPxLXGAoAV9UP/Sw/WTmAuTzFVm -G13UYFeMwrToOiqcX2VcK0aC1FCcTP2z4JW3PsWvU8rUDRUYfoXovc7eg4Vn5wHt -0NBYsNhYiAAf320AUIHzQZYi38JgVwuJfFu43tJZE4Vig++RQq6tsEx9Ftz3EwRR -fJ9z9mEvEiieZm+vbOvMvIuimFVPSCmLH+bI649K8eZlVRWsx3EXCVb0nQARAQAB -tDBSZWQgSGF0LCBJbmMuIChiZXRhIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0LmNv -bT6JAjYEEwECACAFAkpSM+cCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCT -ioDK8hVB6/9tEAC0+KmzeKceXQ/GTUoU6jy9vtkFCFrmv+c7ol4XpdTt0QhqBOwy -6m2mKWwmm8KfYfy0cADQ4y/EcoXl7FtFBwYmkCuEQGXhTDn9DvVjhooIq59LEMBQ -OW879RwwzRIZ8ebbjMUjDPF5MfPQqP2LBu9N4KvXlZp4voykwuuaJ+cbsKZR6pZ6 -0RQKPHKP+NgUFC0fff7XY9cuOZZWFAeKRhLN2K7bnRHKxp+kELWb6R9ZfrYwZjWc -MIPbTd1khE53L4NTfpWfAnJRtkPSDOKEGVlVLtLq4HEAxQt07kbslqISRWyXER3u -QOJj64D1ZiIMz6t6uZ424VE4ry9rBR0Jz55cMMx5O/ni9x3xzFUgH8Su2yM0r3jE -Rf24+tbOaPf7tebyx4OKe+JW95hNVstWUDyGbs6K9qGfI/pICuO1nMMFTo6GqzQ6 -DwLZvJ9QdXo7ujEtySZnfu42aycaQ9ZLC2DOCQCUBY350Hx6FLW3O546TAvpTfk0 -B6x+DV7mJQH7MGmRXQsE7TLBJKjq28Cn4tVp04PmybQyTxZdGA/8zY6pPl6xyVMH -V68hSBKEVT/rlouOHuxfdmZva1DhVvUC6Xj7+iTMTVJUAq/4Uyn31P1OJmA2a0PT -CAqWkbJSgKFccsjPoTbLyxhuMSNkEZFHvlZrSK9vnPzmfiRH0Orx3wYpMQ== -=21pb ------END PGP PUBLIC KEY BLOCK----- -The following public key can be used to verify RPM packages built and -signed by Red Hat, Inc. for this beta using `rpm -K' using the GNU GPG -package. Questions about this key should be sent to security@redhat.com. - - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.0.6 (GNU/Linux) -Comment: For info see http://www.gnupg.org - -mQGiBDySTqsRBACzc7xuCIp10oj5B2PAV4XzDeVxprv/WTMreSNSK+iC0bEz0IBp -Vnn++qtyiXfH+bGIE9jqZgIEnpttWhUOaU5LhcLFzy+m8NWfngIFP9QfGmGAe9Gd -LFeAdhj4RmSG/vgr7vDd83Hz22dv403Ar/sliWO4vDOrMmZBG57WGYTWtwCgkMsi -UUQuJ6slbzKn82w+bYxOlL0EAIylWJGaTkKOTL5DqVR3ik9aT0Dt3FNVYiuhcKBe -II4E3KOIVA9kO8in1IZjx2gs6K2UV+GsoAVANdfKL7l9O+k+J8OxhE74oycvYJxW -QzCgXMZkNcvW5wyXwEMcr6TVd/5BGztcMw8oT3/l2MtAEG/vn1XaWToRSO1XDMDz -+AjUA/4m0mTkN8S4wjzJG8lqN7+quW3UOaiCe8J3SFrrrhE0XbY9cTJI/9nuXHU1 -VjqOSmXQYH2Db7UOroFTBiWhlAedA4O4yuK52AJnvSsHbnJSEmn9rpo5z1Q8F+qI -mDlzriJdrIrVLeDiUeTlpH3kpG38D7007GhXBV72k1gpMoMcpbQ3UmVkIEhhdCwg -SW5jLiAoQmV0YSBUZXN0IFNvZnR3YXJlKSA8cmF3aGlkZUByZWRoYXQuY29tPohX -BBMRAgAXBQI8l5p/BQsHCgMEAxUDAgMWAgECF4AACgkQ/TcmiYl9oHqdeQCfZjw4 -F9sir3XfRAjVe9kYNcQ8hnIAn0WgyT7H5RriWYTOCfauOmd+cAW4iEYEEBECAAYF -AjyXmqQACgkQIZGAzdtCpg5nDQCfepuRUyuVJvhuQkPWySETYvRw+WoAnjAWhx6q -0npMx4OE1JGFi8ymKXktuQENBDySTq4QBADKL/mK7S8E3synxISlu7R6fUvu07Oc -RoX96n0Di6T+BS99hC44XzHjMDhUX2ZzVvYS88EZXoUDDkB/8g7SwZrOJ/QE1zrI -JmSVciNhSYWwqeT40Evs88ajZUfDiNbS/cSC6oui98iS4vxd7sE7IPY+FSx9vuAR -xOa9vBnJY/dx0wADBQQAosm+Iltt2uigC6LJzxNOoIdB5r0GqTC1o5sHCeNqXJhU -ExAG8m74uzMlYVLOpGZi4y4NwwAWvCWC0MWWnnu+LGFy1wKiJKRjhv5F+WkFutY5 -WHV5L44vp9jSIlBCRG+84jheTh8xqhndM9wOfPwWdYYu1vxrB8Tn6kA17PcYfHSI -RgQYEQIABgUCPJJergAKCRD9NyaJiX2geiCPAJ4nEM4NtI9Uj8lONDk6FU86PmoL -yACfb68fBd2pWEzLKsOk9imIobHHpzE= -=gpIn ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former deleted file mode 100644 index 3818b2c926f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former +++ /dev/null @@ -1,37 +0,0 @@ -The following public key can be used to verify RPM packages built and -signed by Red Hat, Inc. This key is used for packages in Red Hat -products shipped prior to November 2006, and for all updates to those -products. - -Questions about this key should be sent to security@redhat.com. - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.0.0 (GNU/Linux) -Comment: For info see http://www.gnupg.org - -mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8 -HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM -GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV -EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS -ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP -lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW -XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb -E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES -PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg -SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID -FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB -XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U -lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+ -5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3 -Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI -hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+ -JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9 -E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK -ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8 -BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5 -4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY -FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk -OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h -VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA== -=3AHZ ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release deleted file mode 100644 index 09aded8bec7..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release +++ /dev/null @@ -1,24 +0,0 @@ -The following public key can be used to verify RPM packages built and -signed by Red Hat, Inc. This key is used for packages in Red Hat -products shipped after November 2006, and for all updates to those -products. - -Questions about this key should be sent to security@redhat.com. - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEV2EyQRBAD4/SR69qoLzK4HIa6g9iS+baiX0o3NjkLftFHg/xy+IMOMg//i -4c5bUpLKDTMH3+yT0G8qpul/RALUFOESKFkZm3/SlkJKuroXcB8U6s2dh5XX9DDB -ISqRwL7M5qB8rfDPKHN+k/XwJ9CNpHMdNxnnc2WhnnmHNp6NrD/bUEH4vwCglMa0 -rFRXPaN7407DARGHvW/jugsEANFaeZsFwos/sajL1XQRfHZUTnvDjJgz31IFY+OL -DlOVAOtV/NaECMwIJsMIhoisW4Luwp4m75Qh3ogq3bwqSWNLsfJ9WFnNqXOgamyD -h/F4q492z6FpyIb1JZLABBSH7LEQjHlR/s/Ct5JEWc5MyfzdjBi6J9qCh3y/IYL0 -EbfRA/4yoJ/fH9uthDLZsZRWmnGJvb+VpRvcVs8IQ4aIAcOMbWu2Sp3U9pm6cxZF -N7tShmAwiiGj9UXVtlhpj3lnqulLMD9VqXGF0YgDOaQ7CP/99OEEhUjBj/8o8udF -gxc1i2WJjc7/sr8IMbDv/SNToi0bnZUxXa/BUjj92uaQ6/LupbQxUmVkIEhhdCwg -SW5jLiAocmVsZWFzZSBrZXkpIDxzZWN1cml0eUByZWRoYXQuY29tPohfBBMRAgAf -BQJFdhMkAhsDBgsJCAcDAgQVAggDAxYCAQIeAQIXgAAKCRBTJoEBNwFxhogXAKCD -TuYeyQrkYXjg9JmOdTZvsIVfZgCcCWKJXtfbC5dbv0piTHI/cdwVzJo= -=mhzo ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx deleted file mode 100644 index 0f875c0e207..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEYk7/IRBACdWFJInc51/+0sqvadIvf0E+Vhv4aIqB76jWtIGqXnTeG6hEl/ -9tJoLszBh4g/KBFVF3E4VxTHXKO/L7GZRa8JzoMtvV8XiP6BaYq6ykx6H7alKvoP -qzk7xBbvNbqsXJCO7keo+g7iIDdfAxvsSJYbhQBxDn5W4Hw7SnHcMmTDOQCg7vOj -UzaZG32yYMBZLjOAB/QzXgsD/1JRDnQ8cL6d17B1ie57ZuVOI3ziQJSmj0zbC0IX -OsxlcFjwydLk3TA88iCr0SO2mfXCsGTeDGFbrl2IRCoH91l3Ew49HI4OYtl+OPSt -pIYdFLSQ+RUPs9CFYwF9Ogjrwmi6jVptKq/+v0WgnCrbfz3DYxCWt/VB1PYDj5y6 -Mv//BACKa2mUuQoukDvzqiwZXV/Z52MeDOzPbOFo6qhx+54nav9Inz1yziEjYrP/ -ZrNJ4BT6fBgin/a6UmD5FqMtkrrhOCpHFQK2H+XYZ0vVJGZI7h74/fY8U2n+1Mle -xQ/ejWojF+H5nFUAwKHaNVNofKcw8c8msgGn2jsvrAISTSHshrQwUmVkIEhhdCwg -SW5jLiAoUkhYIGtleSkgPHJoeC1zdXBwb3J0QHJlZGhhdC5jb20+iF8EExECAB8F -AkYk7/ICGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEDmhOhJCGT5r6FoAoLsB -+DOPmTc3P+77DnNhU460nmjQAKCI3BJ/SxqPqfp8jL6lTfVo2zxegQ== -=t0np ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release deleted file mode 100644 index 47c6be6700b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release +++ /dev/null @@ -1,62 +0,0 @@ -The following public key can be used to verify RPM packages built and -signed by Red Hat, Inc. This key is used for packages in Red Hat -products shipped after November 2009, and for all updates to those -products. - -Questions about this key should be sent to security@redhat.com. - -pub 4096R/FD431D51 2009-10-22 Red Hat, Inc. (release key 2) - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF -0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF -0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c -u7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh -XGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H -5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW -9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj -/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1 -PcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY -HVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF -buhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB -tDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0 -LmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK -CRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC -2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf -C/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5 -un3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E -0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE -IGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh -8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL -Ght5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki -JUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25 -OFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq -dzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw== -=zbHE ------END PGP PUBLIC KEY BLOCK----- -The following public key can be used to verify RPM packages built and -signed by Red Hat, Inc. This key is a supporting (auxiliary) key for -Red Hat products shipped after November 2006 and for all updates to -those products. - -Questions about this key should be sent to security@redhat.com. - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEVwDGkRBACwPhZIpvkjI8wV9sFTDoqyPLx1ub8Sd/w+YuI5Ovm49mvvEQVT -VLg8FgE5JlST59AbsLDyVtRa9CxIvN5syBVrWWWtHtDnnylFBcqG/A6J3bI4E9/A -UtSL5Zxbav0+utP6f3wOpxQrxc+WIDVgpurdBKAQ3dsobGBqypeX6FXZ5wCgou6C -yZpGIBqosJaDWLzNeOfb/70D/1thLkQyhW3JJ6cHCYJHNfBShvbLWBf6S231mgmu -MyMlt8Kmipc9bw+saaAkSkVsQ/ZbfjrWB7e5kbMruKLVrH+nGhamlHYUGyAPtsPg -Uj/NUSj5BmrCsOkMpn43ngTLssE9MLhSPj2nIHGFv9B+iVLvomDdwnaBRgQ1aK8z -z6MAA/406yf5yVJ/MlTWs1/68VwDhosc9BtU1V5IE0NXgZUAfBJzzfVzzKQq6zJ2 -eZsMLhr96wbsW13zUZt1ing+ulwh2ee4meuJq6h/971JspFY/XBhcfq4qCNqVjsq -SZnWoGdCO6J8CxPIemD2IUHzjoyyeEj3RVydup6pcWZAmhzkKrQzUmVkIEhhdCwg -SW5jLiAoYXV4aWxpYXJ5IGtleSkgPHNlY3VyaXR5QHJlZGhhdC5jb20+iF4EExEC -AB4FAkVwDGkCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQRWiciC+mWOC1rQCg -ooNLCFOzNPcvhd9Za8C801HmnsYAniCw3yzrCqtjYnxDDxlufH0FVTwX -=d/bm ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi deleted file mode 100644 index 32833860645..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.7 (GNU/Linux) - -mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3 -/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA -/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L -0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh -dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp -AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B -Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY -iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD -1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs -ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI -BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ -MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj -C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0 -HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa -o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw -CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv -JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK -8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i -gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw== -=6Rbg ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag deleted file mode 100644 index 8ee27f45b9b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag +++ /dev/null @@ -1,32 +0,0 @@ -The following public key can be used to verify RPM packages -downloaded from http://dag.wieers.com/apt/ using 'rpm -K' -if you have the GNU GPG package. -Questions about this key should be sent to: -Dag Wieers - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.1 (GNU/Linux) - -mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6 -TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF -5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3 -3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq -39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN -8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm -30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD -oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170 -JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy -cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT -EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST -hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF -Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon -g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt -llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l -IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg -6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh -Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L -n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I -RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE -BACeJU1hpElFnUZCL4yKj4EuLnlo8kc= -=mqUt ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl deleted file mode 100644 index 70b6bd17ef3..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBEpXadARBACHhOfMUuT/4iDvBRmm6bEsvnMN++L79aYhEUMNlrZ2TjKPjPvG -Y0vGk+I0JhUJWutkQRZVbqgVDsNjmnELnACK+xvdryvtxh50wCI9WUl7CT5EV7BS -/jD7JxTFbXyC/Xv0ixMB9vj6U9cySyE8PxONp0HzO6LTIr1OMPgDUsP4lwCgh8De -fmY8TN2m9a0huLdNrnmKw0cD/2bkt6rJAi3+BGHWNgQ9Nb/4wQff8BKGDtL/8acp -3yH91axuD2iYCKw0ZP5akBpRGv+4e30Plmbi1f5NaEDo9Ga1c4TDPopwgiYhrVLj -56efoTfP2AiZl3iBKFPI83/YOhrVZF8UiYoAoUnOFpOg8vmtCzgvYip5UZLTgbfJ -lcWvA/9vMb8By+1pHjW98d7GkzvZqzyMtWlbO7PXCn8P7bGQYjwvyTGiRNz3q22c -2Z29qQw4r1L1L1JGsUwuOMahkczWVdD4TRHc8mhVJEUEA6AkNAZc+Ymsfr/ip0kX -nSZLE3pYVifOhBRO8EbT0WhCMScmZNpwvZU//HKL/p+n3LArUrRZU2NpZW50aWZp -YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4KSA8 -c2NpZW50aWZpYy1saW51eC1kZXZlbEBmbmFsLmdvdj6IYAQTEQIAIAUCSldp0AIb -AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJELC0GD8ZKn19cXIAnA5R+EbaYr4/ -IL6It/UxHXlBFIajAJ9bwmNDF14uvDnFigg1PLevLTBnTIhGBBARAgAGBQJKV6lf -AAoJENpq0AiC/ReyKLQAmwVC/Ii3sAKsptwZKHw/uk1kbupCAJ0eIzSaUo1hSa1V -fP7O/dqigu6JAbkCDQRKV2nZEAgAzAcaC7unRNdrIwAGGKqOIvI8WNwpftHY50Y5 -zPSl7vtWVkp3N+2fynJR+tW4G/2xDChBbPzPz/TavRyBc21LKzAlym8qIGEE02cZ -U/YJAYnbAkNNiGMOAnAIjBw1KUcQamAxdk0glE7MP1JiXY1MO4tTW38UEcvQbSvg -Mh/eECqFOwiQXJmkPpZhPUwnwmZRCV4vlCZQM3CMExZ9pDV/V+kuhefw2WeheXyh -g4DC88gcrv2mO0I3sVmpxn3JLMayiMlQbOSYLQuNVKN/EFDwuAbS9Ane7vm6wF9X -NswMX0I/vO1IVvSN1fi5ZM71QzeYUGKBQv97kLO20hbRWZ1V+wADBggAys+jhlYH -mtFZQxV4an1ucqnVauKnstj0zF88Hiy7yivT3W5h3Zd067uOfcBQCJUlt7y8sYD2 -q9htm5Rrxx+J29bl0zxwrEatnv0gLzprSa7Ei3wR6IrvBM3Ic0mGSzlsSxlzaFtt -Pwak5C47vX9+PwKEKXFdM1gVzHTuD6PXEYxA4YMlQGeGVA68FvTHxMHpf8POQWTV -QtjoI0flvFT7d4ozqUJdjJZxJDFQ7GO2YdIfF3sUdfn5kFxK0SUzqrmCYXeheniS -LKC4mpAR0PetWJ7r1gY5khHb2eHW1vdEBYUXlHjB+jLaOBns05MHMZYd4CHe8q/Q -gzMeVlh8YLSdZYhJBBgRAgAJBQJKV2nZAhsMAAoJELC0GD8ZKn19iU8AniUIFu32 -VeRJ+VKL2vBQMVbFVZOMAJ434Bi99fN2CSh7T62oxtQvhw70fw== -=eL9H ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy deleted file mode 100644 index 317b802b560..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m -DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l -qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw -XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu -0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9 -Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY -8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb -nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do -erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t -cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC -BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV -LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf -NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz -txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi -qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C -dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W -X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d -zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F -ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza -Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf -WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0 -cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8 -ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3 -Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet -etv5Qeg= -=nIAo ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art deleted file mode 100644 index 825424e1f33..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.1 (GNU/Linux) - -mQGiBEGP+skRBACyZz7muj2OgWc9FxK+Hj7tWPnrfxEN+0PE+n8MtqH+dxwQpMTd -gDpOXxJa45GM5pEwB6CFSFK7Fb/faniF9fDbm1Ga7MpBupIBYLactkoOTZMuTlGB -T0O5ha4h26YLqFfQOtlEi7d0+BDDdfHRQw3o67ycgRnLgYSA79DISc3MywCgk2TR -yd5sRfZAG23b4EDl+D0+oaMEAK73J7zuxf6F6V5EaxLd/w4JVB2xW0Glcn0fACOe -8FV9lzcZuo2xPpdGuyj02f/xlqvEav3XqTfFU2no61mA2pamaRNhlo+CEfGc7qde -/1twfSgOYqzeCx7+aybyPo8Th41b80FT19mfkjBf6+5NbUHffRabFFh1FmcPVNBn -F3FoA/95nRIzqDMItdTRitaZn02dIGNjdwllBD75bSVEvaR9O5hjBo0VMc25DB7f -DM2qEO52wCQbAKw9zFC284ekZVDaK4aHYt7iobHaqJEpKHgsDut5WWuMiSLR+SsF -aBHIZ9HvrKWLSUQKHU6A1Hva0P0r3GnoCMc/VCVfrLl721SjPbQzQXRvbWljIFJv -Y2tldCBUdXJ0bGUgPGFkbWluQGF0b21pY3JvY2tldHR1cnRsZS5jb20+iFkEExEC -ABkFAkGP+skECwcDAgMVAgMDFgIBAh4BAheAAAoJEDKpURRevSdEzcQAn1hSHqTO -jwv/z/picpOnR+mgycwHAKCBex2ciyXo5xeaQ9w7OMf7Jsmon7kBDQRBj/rMEAQA -6JvRndqE4koK0e49fUkICm1X0ZEzsVg9VmUW+Zft5guCRxmGlYTmtlC7oJCToRP/ -m/xH5uIevGiJycRKB0Ix+Csl6f9QuTkQ7tSTHcaIKbI3tL1x6CCBoWeTGYaOJlvk -ubrmajiMFaBfopLH2firoSToDGoUvv4e7bImIHEgNr8AAwUEAND0YR9DOEZvc+Lq -Ta/PQyxkdZ75o+Ty/O64E3OmO1Tuw2ciSQXCcwrbrMSE6EHHetxtGCnOdkjjjtmH -AnxsxdONv/EJuQmLcoNcsigZZ4tfRdmtXgcbnOmXBgmy1ea1KvWcsmecNSAMJHwR -7vDDKzbj4mSmudzjapHeeOewFF10iEYEGBECAAYFAkGP+swACgkQMqlRFF69J0Sq -nQCfa/q9Y/oY4dOTGj6MsdmRIQkKZhYAoIscjinFwTru4FVi2MIEzUUMToDK -=NOIx ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms deleted file mode 100644 index 860ace4d247..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.6 (GNU/Linux) - -mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI -1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm -aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH -a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t -ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8 -mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE -OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx -k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8 -yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l -dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR -AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM -5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps -+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu -AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU -kg/3AeBlMBIlFe5hDQ== -=23Fz ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key deleted file mode 100644 index b91a5a88769..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0 -CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj -Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i -SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy -12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz -wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7 -exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd -tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B -N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv -cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb -AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975 -wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI -MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD -/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So -M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9 -hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN -dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs -UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv -qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH -5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n -nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO -Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5 -adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV -AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA -yOSLb33CweehCrlTnQ== -=scSy ------END PGP PUBLIC KEY BLOCK----- diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/yum-updatesd.conf b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/yum-updatesd.conf deleted file mode 100644 index 39181c9d6e3..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/yum-updatesd.conf +++ /dev/null @@ -1,20 +0,0 @@ -# File Managed by Puppet -[main] -# how often to check for new updates (in seconds) -run_interval = 3600 -# how often to allow checking on request (in seconds) -updaterefresh = 600 - -# how to send notifications (valid: dbus, email, syslog) -emit_via = dbus -# should we listen via dbus to give out update information/check for -# new updates -dbus_listener = yes - -# automatically install updates -do_update = yes -# automatically download updates -do_download = no -# automatically download deps of updates -do_download_deps = no - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/cron.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/cron.pp deleted file mode 100644 index 5b404a0b183..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/cron.pp +++ /dev/null @@ -1,47 +0,0 @@ -# = Class yum::cron -# -# -class yum::cron { - - $manage_update_package = $yum::bool_update_disable ? { - true => absent, - default => present, - } - - $manage_update_service_ensure = $yum::bool_update_disable ? { - true => stopped, - default => running, - } - - $manage_update_service_enable = $yum::bool_update_disable ? { - true => false, - default => true, - } - - $manage_update_file = $yum::bool_update_disable ? { - true => absent, - default => present, - } - - package { 'yum-cron': - ensure => $manage_update_package, - } - - service { 'yum-cron': - ensure => $manage_update_service_ensure, - name => $yum::service, - enable => $manage_update_service_enable, - hasstatus => true, - hasrestart => true, - require => Package['yum-cron'], - } - - file { 'yum-cron': - ensure => $manage_update_file, - path => '/etc/sysconfig/yum-cron', - content => template($yum::update_template), - require => Package['yum-cron'], - notify => Service['yum-cron'], - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/defaults.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/defaults.pp deleted file mode 100644 index 5d2a072d058..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/defaults.pp +++ /dev/null @@ -1,49 +0,0 @@ -# = Class: yum::defaults -# -# This class manages default yum repositories for RedHat based distros: -# RHEL, Centos, Scientific Linux -# -class yum::defaults ( ) inherits yum::params { - - $osver = split($::operatingsystemrelease, '[.]') - - if $yum::extrarepo =~ /epel/ { include yum::repo::epel } - if $yum::extrarepo =~ /rpmforge/ { include yum::repo::rpmforge } - if $yum::extrarepo =~ /jpackage5/ { include yum::repo::jpackage5 } - if $yum::extrarepo =~ /jpackage6/ { include yum::repo::jpackage6 } - if $yum::extrarepo =~ /remi/ { include yum::repo::remi } - if $yum::extrarepo =~ /remi_php55/ { include yum::repo::remi_php55 } - if $yum::extrarepo =~ /tmz/ and $osver[0] != '4' { include yum::repo::tmz } - if $yum::extrarepo =~ /webtatic/ { include yum::repo::webtatic } - if $yum::extrarepo =~ /puppetlabs/ and $osver[0] != '4' { include yum::repo::puppetlabs } - if $yum::extrarepo =~ /puppetdevel/ and $osver[0] != '4' { include yum::repo::puppetdevel } - if $yum::extrarepo =~ /nginx/ and $osver[0] != '4' { include yum::repo::nginx } - if $yum::extrarepo =~ /mongodb/ and $osver[0] != '4' { include yum::repo::mongodb } - if $yum::extrarepo =~ /repoforge/ { include yum::repo::repoforge } - if $yum::extrarepo =~ /repoforgeextras/ { include yum::repo::repoforgeextras } - if $yum::extrarepo =~ /integ_ganeti/ { include yum::repo::integ_ganeti } - if $yum::extrarepo =~ /elrepo/ { include yum::repo::elrepo } - if $yum::extrarepo =~ /centalt/ { include yum::repo::centalt } - - if $yum::bool_defaultrepo { - case $::operatingsystem { - centos: { - if $osver[0] == '6' { include yum::repo::centos6 } - if $osver[0] == '5' { include yum::repo::centos5 } - if $osver[0] == '4' { include yum::repo::centos4 } - if $yum::extrarepo =~ /centos-testing/ { include yum::repo::centos_testing } - if $yum::extrarepo =~ /karan/ { include yum::repo::karan } - if $yum::extrarepo =~ /atomic/ { include yum::repo::atomic } - } - redhat: { - } - scientific: { - if $osver[0] == '6' { include yum::repo::sl6 } - if $osver[0] == '5' { include yum::repo::sl5 } - if $yum::extrarepo =~ /centos-testing/ { include yum::repo::centos_testing } - if $yum::extrarepo =~ /karan/ { include yum::repo::karan } - } - default: { } - } - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/init.pp deleted file mode 100644 index c4617f420ba..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/init.pp +++ /dev/null @@ -1,329 +0,0 @@ -# = Class: yum -# -# This class manages yum repositories for RedHat based distros: -# RHEL, Centos, Scientific Linux -# -# Copyright 2008, admin(at)immerda.ch -# Copyright 2008, Puzzle ITC GmbH -# Marcel Harry haerry+puppet(at)puzzle.ch -# Simon Josi josi+puppet(at)puzzle.ch -# -# This program is free software; you can redistribute -# it and/or modify it under the terms of the GNU -# General Public License version 3 as published by -# the Free Software Foundation. -# -# Apapted for Example42 by Alessandro Franceschi -# -# == Parameters -# -# [*install_all_keys*] -# If to provide all the module's known rpm gpgp keys. -# Default true, set to false to keep backwards compatibility -# -# [*update*] -# If you want yum automatic updates. Possibile values: -# cron - Updates in a cronjob -# updatesd - Updates via updatesd (Only on Centos/RedHat/SL 5) -# false/no - Automatic updates disabled (Default) -# -# [*update_disable*] -# Set to true if you have enabled updates and now wish to disable -# Defaults to false. Logic pertaining to this parameter is only applied -# when the update method parameter (immediately above) is set. -# -# [*defaultrepo*] -# If you want to enable default repositories for supported OS -# Default: true -# Note: This variable is ignored if you provide a custom source_repo_dir -# -# [*extrarepo*] -# If you want to enable some (supported) extra repositories -# Can be an array. Default: 'epel' -# (Epel is used by many modules) -# Note: This variable is ignored if you provide a custom source_repo_dir -# -# [*plugins_source_dir*] -# The path of the plugins configuration directory -# -# [*repo_dir*] -# The path of the yum.repos.d directory -# -# [*source_repo_dir*] -# The source path to use to populate the yum.repos.d directory -# -# [*clean_repos*] -# Boolean. Defines if you want to cleanup the yum.repos.d dir -# and be sure that it contains only files managed by Puppet -# Default: false -# -# [*my_class*] -# Name of a custom class to autoload to manage module's customizations -# If defined, yum class will automatically "include $my_class" -# Can be defined also by the (top scope) variable $yum_myclass -# -# [*source*] -# Sets the content of source parameter for main configuration file -# If defined, yum main config file will have the param: source => $source -# Can be defined also by the (top scope) variable $yum_source -# -# [*source_dir*] -# If defined, the whole yum configuration directory content is retrieved -# recursively from the specified source -# (source => $source_dir , recurse => true) -# Can be defined also by the (top scope) variable $yum_source_dir -# -# [*source_dir_purge*] -# If set to true (default false) the existing configuration directory is -# mirrored with the content retrieved from source_dir -# (source => $source_dir , recurse => true , purge => true) -# Can be defined also by the (top scope) variable $yum_source_dir_purge -# -# [*template*] -# Sets the path to the template to use as content for main configuration file -# If defined, yum main config file has: content => content("$template") -# Note source and template parameters are mutually exclusive: don't use both -# Can be defined also by the (top scope) variable $yum_template -# -# [*options*] -# An hash of custom options to be used in templates for arbitrary settings. -# Can be defined also by the (top scope) variable $yum_options -# -# [*absent*] -# Set to 'true' to remove package(s) installed by module -# Can be defined also by the (top scope) variable $yum_absent -# -# [*disable*] -# Set to 'true' to disable service(s) managed by module -# Can be defined also by the (top scope) variable $yum_disable -# -# [*disableboot*] -# Set to 'true' to disable service(s) at boot, without checks if it's running -# Use this when the service is managed by a tool like a cluster software -# Can be defined also by the (top scope) variable $yum_disableboot -# -# [*puppi*] -# Set to 'true' to enable creation of module data files that are used by puppi -# Can be defined also by the (top scope) variables $yum_puppi and $puppi -# -# [*puppi_helper*] -# Specify the helper to use for puppi commands. The default for this module -# is specified in params.pp and is generally a good choice. -# You can customize the output of puppi commands for this module using another -# puppi helper. Use the define puppi::helper to create a new custom helper -# Can be defined also by the (top scope) variables $yum_puppi_helper -# and $puppi_helper -# -# [*debug*] -# Set to 'true' to enable modules debugging -# Can be defined also by the (top scope) variables $yum_debug and $debug -# -# [*audit_only*] -# Set to 'true' if you don't intend to override existing configuration files -# and want to audit the difference between existing files and the ones -# managed by Puppet. -# Can be defined also by the (top scope) variables $yum_audit_only -# and $audit_only -# -# [*config_dir*] -# Main configuration directory. Used by puppi -# -# [*config_file*] -# Main configuration file path -# -# [*config_file_mode*] -# Main configuration file path mode -# -# [*config_file_owner*] -# Main configuration file path owner -# -# [*config_file_group*] -# Main configuration file path group -# -# [*cron_params*] -# Optional extra arguments for $update = cron ONLY -# -# [*cron_mailto*] -# Optional mail addres to send update reports for $update = cron ONLY -# -# [*cron_dotw*] -# Days of the week to perform yum updates by cron -# 0123456 (default) -# -# [*log_file*] -# Log file(s). Used by puppi -# -class yum ( - $install_all_keys = params_lookup( 'install_all_keys' ), - $update = params_lookup( 'update' ), - $update_disable = params_lookup( 'update_disable' ), - $defaultrepo = params_lookup( 'defaultrepo' ), - $extrarepo = params_lookup( 'extrarepo' ), - $plugins_source_dir = params_lookup( 'plugins_source_dir' ), - $repo_dir = params_lookup( 'repo_dir' ), - $source_repo_dir = params_lookup( 'source_repo_dir' ), - $clean_repos = params_lookup( 'clean_repos' ), - $my_class = params_lookup( 'my_class' ), - $source = params_lookup( 'source' ), - $source_dir = params_lookup( 'source_dir' ), - $source_dir_purge = params_lookup( 'source_dir_purge' ), - $template = params_lookup( 'template' ), - $options = params_lookup( 'options' ), - $absent = params_lookup( 'absent' ), - $disable = params_lookup( 'disable' ), - $disableboot = params_lookup( 'disableboot' ), - $puppi = params_lookup( 'puppi' , 'global' ), - $puppi_helper = params_lookup( 'puppi_helper' , 'global' ), - $debug = params_lookup( 'debug' , 'global' ), - $audit_only = params_lookup( 'audit_only' , 'global' ), - $config_dir = params_lookup( 'config_dir' ), - $config_file = params_lookup( 'config_file' ), - $config_file_mode = params_lookup( 'config_file_mode' ), - $config_file_owner = params_lookup( 'config_file_owner' ), - $config_file_group = params_lookup( 'config_file_group' ), - $update_template = params_lookup( 'update_template' ), - $cron_param = params_lookup( 'cron_param' ), - $cron_mailto = params_lookup( 'cron_mailto' ), - $cron_dotw = params_lookup( 'cron_dotw' ), - $log_file = params_lookup( 'log_file' ) - ) inherits yum::params { - - $bool_install_all_keys=any2bool($install_all_keys) - $bool_defaultrepo=any2bool($defaultrepo) - $bool_clean_repos=any2bool($clean_repos) - $bool_source_dir_purge=any2bool($source_dir_purge) - $bool_absent=any2bool($absent) - $bool_disable=any2bool($disable) - $bool_disableboot=any2bool($disableboot) - $bool_puppi=any2bool($puppi) - $bool_debug=any2bool($debug) - $bool_audit_only=any2bool($audit_only) - $bool_update_disable=any2bool($update_disable) - - $osver = split($::operatingsystemrelease, '[.]') - - $manage_service_enable = $yum::bool_disableboot ? { - true => false, - default => $yum::bool_disable ? { - true => false, - default => $yum::bool_absent ? { - true => false, - false => true, - }, - }, - } - - $manage_service_ensure = $yum::bool_disable ? { - true => 'stopped', - default => $yum::bool_absent ? { - true => 'stopped', - default => 'running', - }, - } - - $manage_file = $yum::bool_absent ? { - true => 'absent', - default => 'present', - } - - $manage_audit = $yum::bool_audit_only ? { - true => 'all', - false => undef, - } - - $manage_file_replace = $yum::bool_audit_only ? { - true => false, - false => true, - } - - $manage_file_source = $yum::source ? { - '' => undef, - default => $yum::source, - } - - $manage_file_content = $yum::template ? { - '' => undef, - default => template($yum::template), - } - - $manage_updates = $yum::update ? { - 'cron' => true, - 'updatesd' => true, - default => false, - } - - file { 'yum.repo_dir': - ensure => directory, - path => $yum::repo_dir, - source => $yum::source_repo_dir, - recurse => true, - purge => $yum::bool_clean_repos, - replace => $yum::manage_file_replace, - audit => $yum::manage_audit, - } - - if $yum::source_repo_dir == undef { - include yum::defaults - } - - # Yum Configuration file - file { 'yum.conf': - ensure => $yum::manage_file, - path => $yum::config_file, - mode => $yum::config_file_mode, - owner => $yum::config_file_owner, - group => $yum::config_file_group, - source => $yum::manage_file_source, - content => $yum::manage_file_content, - replace => $yum::manage_file_replace, - audit => $yum::manage_audit, - } - - # The whole yum configuration directory can be recursively overriden - if $yum::source_dir { - file { 'yum.dir': - ensure => directory, - path => $yum::config_dir, - source => $yum::source_dir, - recurse => true, - purge => $yum::source_dir_purge, - replace => $yum::manage_file_replace, - audit => $yum::manage_audit, - } - } - - ### Manage Automatic Updates - if $yum::manage_updates { - include $yum::update - } - - ### Include custom class if $my_class is set - if $yum::my_class { - include $yum::my_class - } - - - ### Provide puppi data, if enabled ( puppi => true ) - if $yum::bool_puppi == true { - $classvars=get_class_args() - puppi::ze { 'yum': - ensure => $yum::manage_file, - variables => $classvars, - helper => $yum::puppi_helper, - } - } - - ### Debugging, if enabled ( debug => true ) - if $yum::bool_debug == true { - file { 'debug_yum': - ensure => $yum::manage_file, - path => "${settings::vardir}/debug-yum", - mode => '0640', - owner => 'root', - group => 'root', - content => inline_template('<%= scope.to_hash.reject { |k,v| k.to_s =~ /(uptime.*|path|timestamp|free|.*password.*|.*psk.*|.*key)/ }.to_yaml %>'), - } - } - - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp deleted file mode 100644 index bc74acda903..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp +++ /dev/null @@ -1,77 +0,0 @@ -# = Define yum::managed_yumrepo -# -define yum::managed_yumrepo ( - $descr = 'absent', - $baseurl = 'absent', - $mirrorlist = 'absent', - $enabled = 0, - $gpgcheck = 0, - $gpgkey = 'absent', - $gpgkey_source = '', - $gpgkey_name = '', - $failovermethod = 'absent', - $priority = 99, - $protect = 'absent', - $exclude = 'absent', - $autokeyimport = 'no', - $includepkgs = 'absent') { - - # ensure that everything is setup - include yum::prerequisites - - if $protect != 'absent' { - if ! defined(Yum::Plugin['protectbase']) { - yum::plugin { 'protectbase': } - } - } - - file { "/etc/yum.repos.d/${name}.repo": - ensure => file, - replace => false, - before => Yumrepo[ $name ], - mode => '0644', - owner => 'root', - group => 0, - } - - $gpgkey_real_name = $gpgkey_name ? { - '' => url_parse($gpgkey_source,'filename'), - default => $gpgkey_name, - } - - if $gpgkey_source != '' { - if ! defined(File["/etc/pki/rpm-gpg/${gpgkey_real_name}"]) { - file { "/etc/pki/rpm-gpg/${gpgkey_real_name}": - ensure => file, - replace => false, - before => Yumrepo[ $name ], - source => $gpgkey_source, - mode => '0644', - owner => 'root', - group => 0, - } - } - } - yumrepo { $name: - descr => $descr, - baseurl => $baseurl, - mirrorlist => $mirrorlist, - enabled => $enabled, - gpgcheck => $gpgcheck, - gpgkey => $gpgkey, - failovermethod => $failovermethod, - priority => $priority, - protect => $protect, - exclude => $exclude, - includepkgs => $includepkgs, - } - - if $autokeyimport == 'yes' and $gpgkey != '' { - exec { "rpmkey_add_${gpgkey}": - command => "rpm --import ${gpgkey}", - before => Yumrepo[ $name ], - refreshonly => true, - path => '/sbin:/bin:/usr/sbin:/usr/bin', - } - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/params.pp deleted file mode 100644 index 708793bad0f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/params.pp +++ /dev/null @@ -1,62 +0,0 @@ -# = Class yum::params -# -class yum::params { - - $install_all_keys = false - - $update = false - - $defaultrepo = true - - $extrarepo = 'epel' - - $clean_repos = false - - $plugins_config_dir = '/etc/yum/pluginconf.d' - - $source_repo_dir = undef - - $repo_dir = '/etc/yum.repos.d' - - $config_dir = '/etc/yum' - - $config_file = '/etc/yum.conf' - - $config_file_mode = '0644' - - $config_file_owner = 'root' - - $config_file_group = 'root' - - $log_file = '/var/log/yum.log' - - # parameters for the auto-update classes cron.pp/updatesd.pp - $update_disable = false - - $update_template = $::operatingsystemrelease ? { - /6.*/ => 'yum/yum-cron.erb', - default => undef, - } - - # The following two params are for cron.pp only - - $cron_param = '' - - $cron_mailto = '' - - $cron_dotw = '0123456' - - $source = '' - $source_dir = '' - $source_dir_purge = false - $template = '' - $options = '' - $absent = false - $disable = false - $disableboot = false - $puppi = false - $puppi_helper = 'standard' - $debug = false - $audit_only = false - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/plugin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/plugin.pp deleted file mode 100644 index 6e5d372ace7..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/plugin.pp +++ /dev/null @@ -1,54 +0,0 @@ -# Define: pagios::plugin -# -# Adds a yum plugin -# -# Usage: -# With standard source package: -# yum::plugin { 'priorities': } -# -# With custom config file source -# yum::plugin { 'priorities': -# source => 'puppet:///modules/example42/yum/plugin-priorities' -# } -# -# With custom package name (default is taken from $name) -# yum::plugin { 'priorities': -# package_name => 'yum-priorities' -# } -# -define yum::plugin ( - $package_name = '', - $source = '', - $enable = true - ) { - - include yum - - $ensure = bool2ensure( $enable ) - - $yum_plugins_prefix = $yum::osver[0] ? { - 5 => 'yum', - 6 => 'yum-plugin', - default => 'yum-plugin', - } - - $real_package_name = $package_name ? { - '' => "${yum_plugins_prefix}-${name}", - default => $package_name, - } - - package { $real_package_name : - ensure => $ensure - } - - if ( $source != '' ) { - file { "yum_plugin_conf_${name}": - ensure => $ensure, - path => "${yum::plugins_config_dir}/${name}.conf", - owner => root, - group => root, - mode => '0755', - source => $source, - } - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/prerequisites.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/prerequisites.pp deleted file mode 100644 index def976ff396..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/prerequisites.pp +++ /dev/null @@ -1,21 +0,0 @@ -# = Class yum::prerequisites -# -class yum::prerequisites { - - require yum - - yum::plugin { 'priorities': } -# yum::plugin { 'security': } - - if $yum::bool_install_all_keys == true { - file { 'rpm_gpg': - path => '/etc/pki/rpm-gpg/', - source => "puppet:///modules/yum/${::operatingsystem}.${yum::osver[0]}/rpm-gpg/", - recurse => true, - ignore => '.svn', - mode => '0644', - owner => root, - group => 0, - } - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/10gen.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/10gen.pp deleted file mode 100644 index 3f6bbf5d477..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/10gen.pp +++ /dev/null @@ -1,12 +0,0 @@ -# = Class: yum::repo::10gen -# -# This class installs the 10gen repo for MongoDB -# -class yum::repo::10gen { - yum::managed_yumrepo { '10gen': - descr => '10gen Repository', - baseurl => "http://downloads-distro.mongodb.org/repo/redhat/os/${::architecture}", - enabled => 1, - gpgcheck => 0, - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atomic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atomic.pp deleted file mode 100644 index 13a24149dd5..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atomic.pp +++ /dev/null @@ -1,16 +0,0 @@ -# = Class: yum::repo::atomic -# -# This class installs the atomic repo -# -class yum::repo::atomic { - yum::managed_yumrepo { 'atomic': - descr => 'CentOS / Red Hat Enterprise Linux $releasever - atomicrocketturtle.com', - mirrorlist => 'http://www.atomicorp.com/channels/mirrorlist/atomic/centos-$releasever-$basearch', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY.art', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY.art', - priority => 1, - exclude => 'nmap-ncat', - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp deleted file mode 100644 index dce3b67d47a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp +++ /dev/null @@ -1,17 +0,0 @@ -# = Class: yum::repo::atrpms -# -# This class installs the atrpms repo -# -class yum::repo::atrpms { - - yum::managed_yumrepo { 'centos5-atrpms': - descr => 'CentOS $releasever - $basearch - ATrpms', - baseurl => 'http://dl.atrpms.net/el$releasever-$basearch/atrpms/stable', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY.atrpms', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY.atrpms', - priority => 30, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centalt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centalt.pp deleted file mode 100644 index 238b1e19c5a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centalt.pp +++ /dev/null @@ -1,21 +0,0 @@ -# = Class: yum::repo::centalt -# -# This class installs the centalt repo -# -class yum::repo::centalt { - $osver = split($::operatingsystemrelease, '[.]') - $release = $::operatingsystem ? { - /(?i:Centos|RedHat|Scientific)/ => $osver[0], - default => '6', - } - - yum::managed_yumrepo { 'centalt': - descr => 'CentALT RPM Repository', - baseurl => "http://centos.alt.ru/repository/centos/${release}/\$basearch/", - enabled => 1, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => 'http://centos.alt.ru/repository/centos/RPM-GPG-KEY-CentALT', - priority => 1, - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos4.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos4.pp deleted file mode 100644 index 7d0330d9066..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos4.pp +++ /dev/null @@ -1,61 +0,0 @@ -# = Class: yum::repo::centos4 -# -# Base Centos4 repos -# -class yum::repo::centos4 { - - yum::managed_yumrepo { 'base': - descr => 'CentOS-$releasever - Base', - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os', - enabled => 1, - gpgcheck => 1, - gpgkey => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4', - priority => 1, - } - - yum::managed_yumrepo { 'updates': - descr => 'CentOS-$releasever - Updates', - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates', - enabled => 1, - gpgcheck => 1, - gpgkey => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4', - priority => 1, - } - - yum::managed_yumrepo { 'addons': - descr => 'CentOS-$releasever - Addons', - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=addons', - enabled => 1, - gpgcheck => 1, - gpgkey => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4', - priority => 1, - } - - yum::managed_yumrepo { 'extras': - descr => 'CentOS-$releasever - Extras', - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras', - enabled => 1, - gpgcheck => 1, - gpgkey => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4', - priority => 1, - } - - yum::managed_yumrepo { 'centosplus': - descr => 'CentOS-$releasever - Centosplus', - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus', - enabled => 0, - gpgcheck => 1, - gpgkey => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4', - priority => 2, - } - - yum::managed_yumrepo { 'contrib': - descr => 'CentOS-$releasever - Contrib', - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib', - enabled => 0, - gpgcheck => 1, - gpgkey => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4', - priority => 2, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos5.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos5.pp deleted file mode 100644 index c48cccdefc1..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos5.pp +++ /dev/null @@ -1,124 +0,0 @@ -# = Class: yum::repo::centos5 -# -# Base Centos5 repos -# -# == Parameters: -# -# [*mirror_url*] -# A clean URL to a mirror of `rsync://msync.centos.org::CentOS`. -# The paramater is interpolated with the known directory structure to -# create a the final baseurl parameter for each yumrepo so it must be -# "clean", i.e., without a query string like `?key1=valA&key2=valB`. -# Additionally, it may not contain a trailing slash. -# Example: `http://mirror.example.com/pub/rpm/centos` -# Default: `undef` -# -class yum::repo::centos5 ( - $mirror_url = undef, -) { - - if $mirror_url { - validate_re( - $mirror_url, - '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$', - '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.' - ) - } - - $baseurl_base = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/os/\$basearch/", - } - - $baseurl_updates = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/updates/\$basearch/", - } - - $baseurl_addons = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/addons/\$basearch/", - } - - $baseurl_extras = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/extras/\$basearch/", - } - - $baseurl_centosplus = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/centosplus/\$basearch/", - } - - $baseurl_contrib = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/contrib/\$basearch/", - } - - yum::managed_yumrepo { 'base': - descr => 'CentOS-$releasever - Base', - baseurl => $baseurl_base, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-CentOS-5', - priority => 1, - } - - yum::managed_yumrepo { 'updates': - descr => 'CentOS-$releasever - Updates', - baseurl => $baseurl_updates, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5', - priority => 1, - } - - yum::managed_yumrepo { 'addons': - descr => 'CentOS-$releasever - Addons', - baseurl => $baseurl_addons, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=addons', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5', - priority => 1, - } - - yum::managed_yumrepo { 'extras': - descr => 'CentOS-$releasever - Extras', - baseurl => $baseurl_extras, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5', - priority => 1, - } - - yum::managed_yumrepo { 'centosplus': - descr => 'CentOS-$releasever - Centosplus', - baseurl => $baseurl_centosplus, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5', - priority => 2, - } - - yum::managed_yumrepo { 'contrib': - descr => 'CentOS-$releasever - Contrib', - baseurl => $baseurl_contrib, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib', - failovermethod => 'priority', - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5', - priority => 10, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos6.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos6.pp deleted file mode 100644 index ddfdaf46fef..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos6.pp +++ /dev/null @@ -1,108 +0,0 @@ -# = Class: yum::repo::centos6 -# -# Base Centos6 repos -# -# == Parameters: -# -# [*mirror_url*] -# A clean URL to a mirror of `rsync://msync.centos.org::CentOS`. -# The paramater is interpolated with the known directory structure to -# create a the final baseurl parameter for each yumrepo so it must be -# "clean", i.e., without a query string like `?key1=valA&key2=valB`. -# Additionally, it may not contain a trailing slash. -# Example: `http://mirror.example.com/pub/rpm/centos` -# Default: `undef` -# -class yum::repo::centos6 ( - $mirror_url = undef, -) { - - if $mirror_url { - validate_re( - $mirror_url, - '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$', - '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.' - ) - } - - $baseurl_base = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/os/\$basearch/", - } - - $baseurl_updates = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/updates/\$basearch/", - } - - $baseurl_extras = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/extras/\$basearch/", - } - - $baseurl_centosplus = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/centosplus/\$basearch/", - } - - $baseurl_contrib = $mirror_url ? { - undef => undef, - default => "${mirror_url}/\$releasever/contrib/\$basearch/", - } - - yum::managed_yumrepo { 'base': - descr => 'CentOS-$releasever - Base', - baseurl => $baseurl_base, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-CentOS-6', - priority => 1, - } - - yum::managed_yumrepo { 'updates': - descr => 'CentOS-$releasever - Updates', - baseurl => $baseurl_updates, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6', - priority => 1, - } - - yum::managed_yumrepo { 'extras': - descr => 'CentOS-$releasever - Extras', - baseurl => $baseurl_extras, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6', - priority => 1, - } - - yum::managed_yumrepo { 'centosplus': - descr => 'CentOS-$releasever - Centosplus', - baseurl => $baseurl_centosplus, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6', - priority => 2, - } - - yum::managed_yumrepo { 'contrib': - descr => 'CentOS-$releasever - Contrib', - baseurl => $baseurl_contrib, - mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib', - failovermethod => 'priority', - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6', - priority => 10, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp deleted file mode 100644 index a71f311bcb7..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp +++ /dev/null @@ -1,23 +0,0 @@ -# = Class: yum::repo::centos_testing -# -# Centos Testing -# -class yum::repo::centos_testing ( - $include_pkgs = '', - $exclude_pkgs = undef - ) { - if $include_pkgs == '' { - fail('Please configure $include_pkgs as we run the testing repo with highest repository') - } - - yum::managed_yumrepo{'centos5-testing': - descr => 'CentOS-$releasever - Testing', - baseurl => 'http://dev.centos.org/centos/$releasever/testing/$basearch', - enabled => 1, - gpgcheck => 1, - gpgkey => 'http://dev.centos.org/centos/RPM-GPG-KEY-CentOS-testing', - priority => 1, - includepkgs => $include_pkgs, - exclude => $exclude_pkgs, - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/ceph.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/ceph.pp deleted file mode 100644 index 33449ecf501..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/ceph.pp +++ /dev/null @@ -1,20 +0,0 @@ -# = Class: yum::repo::ceph -# -# This class installs the official ceph repo -# -class yum::repo::ceph ( - $release = 'emperor' -) { - - yum::managed_yumrepo { 'ceph': - descr => "Ceph ${release} repository", - baseurl => "http://ceph.com/rpm-${release}/\$releasever/\$basearch", - enabled => 1, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc', - autokeyimport => 'yes', - priority => 5, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp deleted file mode 100644 index d55e8120733..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp +++ /dev/null @@ -1,15 +0,0 @@ -# = Class: yum::repo::elasticsearch10 -# -# This class installs the elasticsearch10 repo -# -class yum::repo::elasticsearch10 { - - yum::managed_yumrepo { 'elasticsearch-1.0': - descr => 'Elasticsearch repository for 1.0.x packages', - baseurl => 'http://packages.elasticsearch.org/elasticsearch/1.0/centos', - enabled => 1, - gpgcheck => 1, - gpgkey => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch', - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp deleted file mode 100644 index 50e312ebab5..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp +++ /dev/null @@ -1,15 +0,0 @@ -# = Class: yum::repo::elasticsearch90 -# -# This class installs the elasticsearch90 repo -# -class yum::repo::elasticsearch90 { - - yum::managed_yumrepo { 'elasticsearch-0.90': - descr => 'Elasticsearch repository for 0.90.x packages', - baseurl => 'http://packages.elasticsearch.org/elasticsearch/0.90/centos', - enabled => 1, - gpgcheck => 1, - gpgkey => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch', - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp deleted file mode 100644 index 60ae3e0a6cf..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp +++ /dev/null @@ -1,105 +0,0 @@ -# = Class: yum::repo::elrepo -# -# This class installs the ELRepo repository -# -# == Parameters: -# -# [*mirror_url*] -# A clean URL to a mirror of `http://elrepo.org/linux/`. -# The paramater is interpolated with the known directory structure to -# create a the final baseurl parameter for each yumrepo so it must be -# "clean", i.e., without a query string like `?key1=valA&key2=valB`. -# Additionally, it may not contain a trailing slash. -# Example: `http://elrepo.org/linux/` -# Default: `undef` -# -class yum::repo::elrepo ( - $mirror_url = undef, -) { - - if $mirror_url { - validate_re( - $mirror_url, - '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$', - '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.' - ) - } - - # Workaround for Facter < 1.7.0 - $osver = split($::operatingsystemrelease, '[.]') - - case $::operatingsystem { - 'RedHat','CentOS','Scientific': { - $release = "el${osver[0]}" - } - default: { - fail("${title}: Operating system '${::operatingsystem}' is not currently supported") - } - } - - $baseurl_elrepo = $mirror_url ? { - undef => undef, - default => "${mirror_url}/elrepo/${release}/\$basearch", - } - - $baseurl_elrepo_testing = $mirror_url ? { - undef => undef, - default => "${mirror_url}/testing/${release}/\$basearch", - } - - $baseurl_elrepo_kernel = $mirror_url ? { - undef => undef, - default => "${mirror_url}/kernel/${release}/\$basearch", - } - - $baseurl_elrepo_extras = $mirror_url ? { - undef => undef, - default => "${mirror_url}/extras/${release}/\$basearch", - } - - yum::managed_yumrepo { 'elrepo': - descr => "ELRepo.org Community Enterprise Linux Repository - ${release}", - baseurl => $baseurl_elrepo, - mirrorlist => "http://elrepo.org/mirrors-elrepo.${release}", - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-elrepo.org', - failovermethod => 'priority', - priority => 17, - } - - yum::managed_yumrepo { 'elrepo-testing': - descr => "ELRepo.org Community Enterprise Linux Testing Repository - ${release}", - baseurl => $baseurl_elrepo_testing, - mirrorlist => "http://elrepo.org/mirrors-elrepo-testing.${release}", - enabled => 0, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org', - failovermethod => 'priority', - priority => 17, - } - - yum::managed_yumrepo { 'elrepo-kernel': - descr => "ELRepo.org Community Enterprise Linux Kernel Repository - ${release}", - baseurl => $baseurl_elrepo_kernel, - mirrorlist => "http://elrepo.org/mirrors-elrepo-kernel.${release}", - enabled => 0, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org', - failovermethod => 'priority', - priority => 17, - } - - yum::managed_yumrepo { 'elrepo-extras': - descr => "ELRepo.org Community Enterprise Linux Extras Repository - ${release}", - baseurl => $baseurl_elrepo_extras, - mirrorlist => "http://elrepo.org/mirrors-elrepo-extras.${release}", - enabled => 0, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org', - failovermethod => 'priority', - priority => 17, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/epel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/epel.pp deleted file mode 100644 index 4039d81ebd8..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/epel.pp +++ /dev/null @@ -1,132 +0,0 @@ -# = Class: yum::repo::epel -# -# This class installs the epel repo -# -# == Parameters: -# -# [*mirror_url*] -# A clean URL to a mirror of `http://dl.fedoraproject.org/pub/epel/`. -# The paramater is interpolated with the known directory structure to -# create a the final baseurl parameter for each yumrepo so it must be -# "clean", i.e., without a query string like `?key1=valA&key2=valB`. -# Additionally, it may not contain a trailing slash. -# Example: `http://mirror.example.com/pub/rpm/epel` -# Default: `undef` -# -class yum::repo::epel ( - $mirror_url = undef, -) { - - if $mirror_url { - validate_re( - $mirror_url, - '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$', - '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.' - ) - } - - if $::operatingsystem == 'Amazon' { - $osver = [ '6' ] - } else { - $osver = split($::operatingsystemrelease, '[.]') - } - - $baseurl_epel = $mirror_url ? { - undef => undef, - default => "${mirror_url}/${osver[0]}/\$basearch/", - } - - $baseurl_epel_debuginfo = $mirror_url ? { - undef => undef, - default => "${mirror_url}/${osver[0]}/\$basearch/debug", - } - - $baseurl_epel_source = $mirror_url ? { - undef => undef, - default => "${mirror_url}/${osver[0]}/SRPMS/", - } - - $baseurl_epel_testing = $mirror_url ? { - undef => undef, - default => "${mirror_url}/testing/${osver[0]}/\$basearch/", - } - - $baseurl_epel_testing_debuginfo = $mirror_url ? { - undef => undef, - default => "${mirror_url}/testing/${osver[0]}/\$basearch/debug", - } - - $baseurl_epel_testing_source = $mirror_url ? { - undef => undef, - default => "${mirror_url}/testing/${osver[0]}/SRPMS/", - } - - yum::managed_yumrepo { 'epel': - descr => "Extra Packages for Enterprise Linux ${osver[0]} - \$basearch", - baseurl => $baseurl_epel, - mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-${osver[0]}&arch=\$basearch", - enabled => 1, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}", - gpgkey_source => "puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}", - priority => 16, - } - - yum::managed_yumrepo { 'epel-debuginfo': - descr => "Extra Packages for Enterprise Linux ${osver[0]} - \$basearch - Debug", - baseurl => $baseurl_epel_debuginfo, - mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-${osver[0]}&arch=\$basearch", - enabled => 0, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}", - priority => 16, - } - - yum::managed_yumrepo { 'epel-source': - descr => "Extra Packages for Enterprise Linux ${osver[0]} - \$basearch - Source", - baseurl => $baseurl_epel_source, - mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-${osver[0]}&arch=\$basearch", - enabled => 0, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}", - priority => 16, - } - - yum::managed_yumrepo { 'epel-testing': - descr => "Extra Packages for Enterprise Linux ${osver[0]} - Testing - \$basearch", - baseurl => $baseurl_epel_testing, - mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel${osver[0]}&arch=\$basearch", - enabled => 0, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}", - priority => 17, - } - - yum::managed_yumrepo { 'epel-testing-debuginfo': - descr => "Extra Packages for Enterprise Linux ${osver[0]} - Testing - \$basearch - Debug", - baseurl => $baseurl_epel_testing_debuginfo, - mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel${osver[0]}&arch=\$basearch", - enabled => 0, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}", - priority => 17, - } - - yum::managed_yumrepo { 'epel-testing-source': - descr => "Extra Packages for Enterprise Linux ${osver[0]} - Testing - \$basearch - Source", - baseurl => $baseurl_epel_testing_source, - mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel${osver[0]}&arch=\$basearch", - enabled => 0, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}", - priority => 17, - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/foreman.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/foreman.pp deleted file mode 100644 index b62b4c77474..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/foreman.pp +++ /dev/null @@ -1,18 +0,0 @@ -# = Class: yum::repo::foreman -# -# This class installs the foreman repo -# -class yum::repo::foreman { - - yum::managed_yumrepo { 'foreman': - descr => 'Foreman Repo', - baseurl => 'http://yum.theforeman.org/stable/', - enabled => 1, - gpgcheck => 0, - failovermethod => 'priority', - # gpgkey => 'http://yum.theforeman.org/RPM-GPG-KEY-foreman', - priority => 1, - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp deleted file mode 100644 index f43eb97062f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp +++ /dev/null @@ -1,69 +0,0 @@ -# = Class: yum::repo::integ_ganeti -# -# This class installs the Integ Ganeti Yum repo -# -# == Parameters: -# -# [*mirror_url*] -# A clean URL to a mirror of `http://jfut.integ.jp/linux/ganeti/`. -# The paramater is interpolated with the known directory structure to -# create a the final baseurl parameter for each yumrepo so it must be -# "clean", i.e., without a query string like `?key1=valA&key2=valB`. -# Additionally, it may not contain a trailing slash. -# Example: `http://mirror.example.com/pub/rpm/ganeti` -# Default: `undef` -# -class yum::repo::integ_ganeti ( - $mirror_url = undef, -) { - - if $mirror_url { - validate_re( - $mirror_url, - '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$', - '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.' - ) - } - - # Workaround for Facter < 1.7.0 - $osver = split($::operatingsystemrelease, '[.]') - - case $::operatingsystem { - 'Fedora': { - $release = 'fedora' - } - 'RedHat','CentOS','Scientific': { - $release = $osver[0] - } - default: { - fail("${title}: Operating system '${::operatingsystem}' is not currently supported") - } - } - - $baseurl_integ_ganeti = $mirror_url ? { - undef => "http://jfut.integ.jp/linux/ganeti/${release}/\$basearch", - default => "${mirror_url}/${release}/\$basearch", - } - - $baseurl_integ_ganeti_source = $mirror_url ? { - undef => "http://jfut.integ.jp/linux/ganeti/${release}/SRPMS", - default => "${mirror_url}/${release}/SRPMS", - } - - yum::managed_yumrepo { 'integ-ganeti': - descr => "Integ Ganeti Packages ${osver[0]} - \$basearch", - baseurl => $baseurl_integ_ganeti, - enabled => 1, - gpgcheck => 0, - priority => 15, - } - - yum::managed_yumrepo { 'integ-ganeti-source': - descr => "Integ Ganeti Packages ${osver[0]} - Source", - baseurl => $baseurl_integ_ganeti_source, - enabled => 0, - gpgcheck => 0, - priority => 15, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp deleted file mode 100644 index 3cf0a6c88fc..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp +++ /dev/null @@ -1,49 +0,0 @@ -# = Class: yum::repo::jpackage5 -# -# This class installs the jpackage5 repo -# -class yum::repo::jpackage5 { - - include yum - - yum::managed_yumrepo { 'jpackage-generic-5.0': - descr => 'JPackage (free), generic', - mirrorlist => 'http://www.jpackage.org/mirrorlist.php?dist=generic&type=free&release=5.0', - failovermethod => 'priority', - gpgcheck => 1, - gpgkey => 'http://www.jpackage.org/jpackage.asc', - enabled => 1, - priority => 10, - } - - yum::managed_yumrepo { 'jpackage-generic-5.0-updates': - descr => 'JPackage (free), generic updates', - mirrorlist => 'http://www.jpackage.org/mirrorlist.php?dist=generic&type=free&release=5.0-updates', - failovermethod => 'priority', - gpgcheck => 1, - gpgkey => 'http://www.jpackage.org/jpackage.asc', - enabled => 1, - priority => 10, - } - - yum::managed_yumrepo { 'jpackage-rhel': - descr => 'JPackage (free) for Red Hat Enterprise Linux $releasever', - mirrorlist => 'http://www.jpackage.org/mirrorlist.php?dist=redhat-el-$releasever&type=free&release=5.0', - failovermethod => 'priority', - gpgcheck => 1, - gpgkey => 'http://www.jpackage.org/jpackage.asc', - enabled => 1, - priority => 10, - } - - yum::managed_yumrepo { 'jpackage-generic-5.0-devel': - descr => 'JPackage (free), generic', - baseurl => 'http://mirrors.dotsrc.org/jpackage/5.0/generic/devel', - failovermethod => 'priority', - gpgcheck => 1, - gpgkey => 'http://www.jpackage.org/jpackage.asc', - enabled => 0, - priority => 10, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp deleted file mode 100644 index 373006d1a84..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp +++ /dev/null @@ -1,17 +0,0 @@ -# = Class: yum::repo::jpackage6 -# -# This class installs the jpackage6 repo -# -class yum::repo::jpackage6 { - - yum::managed_yumrepo { 'jpackage': - descr => 'JPackage 6 generic', - mirrorlist => 'http://www.jpackage.org/mirrorlist.php?dist=generic&type=free&release=6.0', - failovermethod => 'priority', - gpgcheck => 1, - gpgkey => 'http://www.jpackage.org/jpackage.asc', - enabled => 1, - priority => 1, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/karan.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/karan.pp deleted file mode 100644 index 96059ec3758..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/karan.pp +++ /dev/null @@ -1,44 +0,0 @@ -# = Class: yum::repo::karan -# -# This class installs the karan repo -# -class yum::repo::karan { - - yum::managed_yumrepo { 'kbs-CentOS-Extras': - descr => 'CentOS.Karan.Org-EL$releasever - Stable', - baseurl => 'http://centos.karan.org/el$releasever/extras/stable/$basearch/RPMS/', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-kbsingh', - priority => 20, - } - - yum::managed_yumrepo { 'kbs-CentOS-Extras-Testing': - descr => 'CentOS.Karan.Org-EL$releasever - Testing', - baseurl => 'http://centos.karan.org/el$releasever/extras/testing/$basearch/RPMS/', - enabled => 0, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh', - priority => 20, - } - - yum::managed_yumrepo { 'kbs-CentOS-Misc': - descr => 'CentOS.Karan.Org-EL$releasever - Stable', - baseurl => 'http://centos.karan.org/el$releasever/misc/stable/$basearch/RPMS/', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh', - priority => 20, - } - - yum::managed_yumrepo { 'kbs-CentOS-Misc-Testing': - descr => 'CentOS.Karan.Org-EL$releasever - Testing', - baseurl => 'http://centos.karan.org/el$releasever/misc/testing/$basearch/RPMS/', - enabled => 0, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh', - priority => 20, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp deleted file mode 100644 index 9e6ca82c708..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp +++ /dev/null @@ -1,15 +0,0 @@ -# = Class: yum::repo::logstash13 -# -# This class installs the logstash13 repo -# -class yum::repo::logstash13 { - - yum::managed_yumrepo { 'logstash-1.3': - descr => 'logstash repository for 1.3.x packages', - baseurl => 'http://packages.elasticsearch.org/logstash/1.3/centos', - enabled => 1, - gpgcheck => 1, - gpgkey => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch', - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp deleted file mode 100644 index 9b2f6968af4..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp +++ /dev/null @@ -1,15 +0,0 @@ -# = Class: yum::repo::mongodb -# -# This class installs the mongodb repo -# -class yum::repo::mongodb { - - yum::managed_yumrepo { 'mongodb': - descr => '10gen MongoDB Repo', - baseurl => 'http://downloads-distro.mongodb.org/repo/redhat/os/x86_64', - enabled => 1, - gpgcheck => 0, - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp deleted file mode 100644 index 8ebea58a5ff..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp +++ /dev/null @@ -1,16 +0,0 @@ -# = Class: yum::repo::monitoringsucks -# -# This class installs the monitoringsucks repo -# -class yum::repo::monitoringsucks { - - yum::managed_yumrepo { 'monitoringsucks': - descr => 'MonitoringSuck at Inuits', - baseurl => 'http://pulp.inuits.eu/pulp/repos/monitoring', - enabled => 1, - gpgcheck => 0, - failovermethod => 'priority', - priority => 99, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp deleted file mode 100644 index 3d81ae09a06..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp +++ /dev/null @@ -1,15 +0,0 @@ -# = Class: yum::repo::newrelic -# -# This class installs the newrelic repo -# -class yum::repo::newrelic { - - yum::managed_yumrepo { 'newrelic': - descr => 'Newrelic official release packages', - baseurl => 'http://yum.newrelic.com/pub/newrelic/el5/$basearch/', - enabled => 1, - gpgcheck => 0, - priority => 1, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/nginx.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/nginx.pp deleted file mode 100644 index c361aa33cde..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/nginx.pp +++ /dev/null @@ -1,16 +0,0 @@ -# = Class: yum::repo::nginx -# -# This class installs the nginx repo -# -class yum::repo::nginx { - $osver = split($::operatingsystemrelease, '[.]') - - yum::managed_yumrepo { 'nginx': - descr => 'Nginx official release packages', - baseurl => "http://nginx.org/packages/rhel/${osver[0]}/\$basearch/", - enabled => 1, - gpgcheck => 0, - priority => 1, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp deleted file mode 100644 index 175916194f6..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp +++ /dev/null @@ -1,15 +0,0 @@ -# = Class: yum::repo::openstack_grizzly -# -# This class installs the EPEL-6 repo for OpenStack Grizzly -# -class yum::repo::openstack_grizzly { - - yum::managed_yumrepo { 'epel-openstack-grizzly': - descr => 'OpenStack Grizzly Repository for EPEL 6', - baseurl => 'http://repos.fedorapeople.org/repos/openstack/openstack-grizzly/epel-6', - enabled => 1, - gpgcheck => 0, - failovermethod => 'priority', - priority => 1, - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/passenger.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/passenger.pp deleted file mode 100644 index c80d668bbea..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/passenger.pp +++ /dev/null @@ -1,20 +0,0 @@ -# = Class: yum::repo::passenger -# -# This class installs the passenger repo -# -class yum::repo::passenger { - - yum::managed_yumrepo { 'passenger': - descr => 'Red Hat Enterprise $releasever - Phusion Passenger', - baseurl => 'http://passenger.stealthymonkeys.com/rhel/$releasever/$basearch', - mirrorlist => 'http://passenger.stealthymonkeys.com/rhel/mirrors', - enabled => 1 , - gpgcheck => 0, # To fix key autoimport - failovermethod => 'priority', - gpgkey => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc', - autokeyimport => 'yes', - priority => 20, - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp deleted file mode 100644 index 89fe7c9cf4f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp +++ /dev/null @@ -1,18 +0,0 @@ -# = Class: yum::repo::pdgd91 -# -# This class installs the postgresql 9.1 repo -# -class yum::repo::pgdg91 { - - yum::managed_yumrepo { 'pgdg91': - descr => 'PostgreSQL 9.1 $releasever - $basearch', - baseurl => 'http://yum.postgresql.org/9.1/redhat/rhel-$releasever-$basearch', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-PGDG', - priority => 20, - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp deleted file mode 100644 index fe2dc057e69..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp +++ /dev/null @@ -1,18 +0,0 @@ -# = Class: yum::repo::pdgd92 -# -# This class installs the postgresql 9.2 repo -# -class yum::repo::pgdg92 { - - yum::managed_yumrepo { 'pgdg92': - descr => 'PostgreSQL 9.2 $releasever - $basearch', - baseurl => 'http://yum.postgresql.org/9.2/redhat/rhel-$releasever-$basearch', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-PGDG', - priority => 20, - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp deleted file mode 100644 index c3064ba12f5..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp +++ /dev/null @@ -1,18 +0,0 @@ -# = Class: yum::repo::pdgd93 -# -# This class installs the postgresql 9.3 repo -# -class yum::repo::pgdg93 { - - yum::managed_yumrepo { 'pgdg93': - descr => 'PostgreSQL 9.3 $releasever - $basearch', - baseurl => 'http://yum.postgresql.org/9.3/redhat/rhel-$releasever-$basearch', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-PGDG', - priority => 20, - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp deleted file mode 100644 index 1e553bedb4a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp +++ /dev/null @@ -1,27 +0,0 @@ -# = Class: yum::repo::puppetdevel -# -# This class installs the puppetdevel repo -# -class yum::repo::puppetdevel { - - yum::managed_yumrepo { 'puppetlabs_devel': - descr => 'Puppet Labs Packages - Devel', - baseurl => 'http://yum.puppetlabs.com/el/$releasever/devel/$basearch', - enabled => 1, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs', - priority => 15, - } - - yum::managed_yumrepo { 'puppetlabs_dependencies': - descr => 'Puppet Labs Packages - Dependencies', - baseurl => 'http://yum.puppetlabs.com/el/$releasever/dependencies/$basearch', - enabled => 1, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs', - priority => 15, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp deleted file mode 100644 index 0b3f5ea996a..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp +++ /dev/null @@ -1,36 +0,0 @@ -# = Class: yum::repo::puppetlabs -# -# This class installs the puppetlabs repo -# -class yum::repo::puppetlabs { - $osver = split($::operatingsystemrelease, '[.]') - $release = $::operatingsystem ? { - /(?i:Centos|RedHat|Scientific)/ => $osver[0], - default => '6', - } - - yum::managed_yumrepo { 'puppetlabs': - descr => 'Puppet Labs Packages', - baseurl => "http://yum.puppetlabs.com/el/${release}/products/\$basearch", - enabled => 1, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs', - priority => 1, - } - - # The dependencies repo has the same priority as base, - # because it needs to override base packages. - # E.g. puppet-3.0 requires Ruby => 1.8.7, but EL5 ships with 1.8.5. - # - yum::managed_yumrepo { 'puppetlabs_dependencies': - descr => 'Puppet Labs Packages', - baseurl => "http://yum.puppetlabs.com/el/${release}/dependencies/\$basearch", - enabled => 1, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs', - priority => 1, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rbel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rbel.pp deleted file mode 100644 index 85d22bff89f..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rbel.pp +++ /dev/null @@ -1,20 +0,0 @@ -# = Class: yum::repo::rbel -# -# This class installs the rbel repo -# -class yum::repo::rbel { - - $osver = split($::operatingsystemrelease, '[.]') - yum::managed_yumrepo { 'rbel': - descr => 'RBEL Repo', - baseurl => "http://rbel.frameos.org/stable/el${osver[0]}/\$basearch", - enabled => 1, - gpgcheck => 0, - failovermethod => 'priority', - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RBEL' , - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-RBEL', - priority => 16, - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi.pp deleted file mode 100644 index f27d6c9a290..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi.pp +++ /dev/null @@ -1,25 +0,0 @@ -# = Class: yum::repo::remi -# -# This class installs the remi repo -# -class yum::repo::remi { - yum::managed_yumrepo { 'remi': - descr => 'Les RPM de remi pour Enterpise Linux $releasever - $basearch', - mirrorlist => 'http://rpms.famillecollet.com/enterprise/$releasever/remi/mirror', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-remi', - priority => 1, - } - - yum::managed_yumrepo { 'remi-test': - descr => 'Les RPM de remi pour Enterpise Linux $releasever - $basearch - Test', - mirrorlist => 'http://rpms.famillecollet.com/enterprise/$releasever/test/mirror', - enabled => 0, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-remi', - priority => 1, - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp deleted file mode 100755 index 13a9412f5a4..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp +++ /dev/null @@ -1,15 +0,0 @@ -# = Class: yum::repo::remi_php55 -# -# This class installs the remi-php55 repo -# -class yum::repo::remi_php55 { - yum::managed_yumrepo { 'remi-php55': - descr => 'Les RPM de remi pour Enterpise Linux $releasever - $basearch - PHP 5.5', - mirrorlist => 'http://rpms.famillecollet.com/enterprise/$releasever/php55/mirror', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-remi', - priority => 1, - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp deleted file mode 100644 index b43e57dc565..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp +++ /dev/null @@ -1,18 +0,0 @@ -# = Class: yum::repo::repoforge -# -# This class installs the repoforge repo -# -class yum::repo::repoforge { - - yum::managed_yumrepo { 'repoforge': - descr => 'RepoForge packages', - baseurl => 'http://apt.sw.be/redhat/el$releasever/en/$basearch/rpmforge', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-rpmforge-dag', - priority => 1, - exclude => 'nagios-*', - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp deleted file mode 100644 index 5242b5849a9..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp +++ /dev/null @@ -1,17 +0,0 @@ -# = Class: yum::repo::repoforgeextras -# -# This class installs the repoforge extras repo -# -class yum::repo::repoforgeextras { - - yum::managed_yumrepo { 'repoforgeextras': - descr => 'RepoForge extra packages', - baseurl => 'http://apt.sw.be/redhat/el$releasever/en/$basearch/extras', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag', - priority => 1, - exclude => 'perl-IO-Compress-* perl-DBD-MySQL', - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp deleted file mode 100644 index d6c048d2f43..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp +++ /dev/null @@ -1,17 +0,0 @@ -# = Class: yum::repo::rpmforge -# -# This class installs the rpmforce repo -# -class yum::repo::rpmforge { - - yum::managed_yumrepo { 'rpmforge-rhel5': - descr => 'RPMForge RHEL5 packages', - baseurl => 'http://wftp.tu-chemnitz.de/pub/linux/dag/redhat/el$releasever/en/$basearch/dag', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-rpmforge-dag', - priority => 30, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl5.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl5.pp deleted file mode 100644 index 39f2633641c..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl5.pp +++ /dev/null @@ -1,77 +0,0 @@ -# = Class: yum::repo::sl5 -# -# Base Scientific Linux 5 repos -# -# == Parameters: -# -# [*mirror_url*] -# A clean URL to a mirror of `http://ftp.scientificlinux.org/linux/scientific/`. -# The paramater is interpolated with the known directory structure to -# create a the final baseurl parameter for each yumrepo so it must be -# "clean", i.e., without a query string like `?key1=valA&key2=valB`. -# Additionally, it may not contain a trailing slash. -# Example: `http://mirror.example.com/pub/rpm/scientific` -# Default: `undef` -# -class yum::repo::sl5 ( - $mirror_url = undef, -) { - - if $mirror_url { - validate_re( - $mirror_url, - '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$', - '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.' - ) - } - - $baseurl_sl5x = $mirror_url ? { - undef => undef, - default => "${mirror_url}/5x/\$basearch/os/", - } - - $baseurl_sl5x_security = $mirror_url ? { - undef => undef, - default => "${mirror_url}/5x/\$basearch/updates/security/", - } - - $baseurl_sl5x_fastbugs = $mirror_url ? { - undef => undef, - default => "${mirror_url}/5x/\$basearch/updates/fastbugs/", - } - - yum::managed_yumrepo { 'sl5x': - descr => 'Scientific Linux 5x - $basearch', - baseurl => $baseurl_sl5x, - mirrorlist => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-base-5x.txt', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-sl', - priority => 10, - } - - yum::managed_yumrepo { 'sl5x-security': - descr => 'Scientific Linux 5x - $basearch - security updates', - baseurl => $baseurl_sl5x_security, - mirrorlist => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-security-5x.txt', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson', - priority => 10, - } - - yum::managed_yumrepo { 'sl5x-fastbugs': - descr => 'Scientific Linux 5x - $basearch - fastbug updates', - baseurl => $baseurl_sl5x_fastbugs, - mirrorlist => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-5x.txt', - failovermethod => 'priority', - enabled => 0, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson', - priority => 10, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl6.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl6.pp deleted file mode 100644 index 4e2daa4e453..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl6.pp +++ /dev/null @@ -1,74 +0,0 @@ -# = Class: yum::repo::sl6 -# -# Base Scientific Linux 6 repos -# -# == Parameters: -# -# [*mirror_url*] -# A clean URL to a mirror of `http://ftp.scientificlinux.org/linux/scientific/`. -# The paramater is interpolated with the known directory structure to -# create a the final baseurl parameter for each yumrepo so it must be -# "clean", i.e., without a query string like `?key1=valA&key2=valB`. -# Additionally, it may not contain a trailing slash. -# Example: `http://mirror.example.com/pub/rpm/scientific` -# Default: `undef` -# -class yum::repo::sl6 ( - $mirror_url = undef, -) { - - if $mirror_url { - validate_re( - $mirror_url, - '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$', - '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.' - ) - } - - $baseurl_sl6x = $mirror_url ? { - undef => undef, - default => "${mirror_url}/6x/\$basearch/os/", - } - - $baseurl_sl6x_security = $mirror_url ? { - undef => undef, - default => "${mirror_url}/6x/\$basearch/updates/security/", - } - - $baseurl_sl6x_fastbugs = $mirror_url ? { - undef => undef, - default => "${mirror_url}/6x/\$basearch/updates/fastbugs/", - } - - yum::managed_yumrepo { 'sl6x': - descr => 'Scientific Linux 6x - $basearch', - baseurl => $baseurl_sl6x, - mirrorlist => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-base-6x.txt', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-sl', - } - - yum::managed_yumrepo { 'sl6x-security': - descr => 'Scientific Linux 6x - $basearch - security updates', - baseurl => $baseurl_sl6x_security, - mirrorlist => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-security-6x.txt', - failovermethod => 'priority', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson', - } - - yum::managed_yumrepo { 'sl6x-fastbugs': - descr => 'Scientific Linux 6x - $basearch - fastbug updates', - baseurl => $baseurl_sl6x_fastbugs, - mirrorlist => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6x.txt', - failovermethod => 'priority', - enabled => 0, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson', - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/tmz.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/tmz.pp deleted file mode 100644 index f53ba9a0f3b..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/tmz.pp +++ /dev/null @@ -1,27 +0,0 @@ -# = Class: yum::repo::tmz -# -# This class installs the tmz repo -# -class yum::repo::tmz { - - yum::managed_yumrepo { 'tmz-puppet': - descr => 'Puppet for EL $releasever - $basearch', - baseurl => 'http://tmz.fedorapeople.org/repo/puppet/epel/$releasever/$basearch', - enabled => 1, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => 'http://tmz.fedorapeople.org/repo/RPM-GPG-KEY-tmz', - priority => 16, - } - - yum::managed_yumrepo { 'tmz-puppet-source': - descr => 'Puppet for EL $releasever - Source', - baseurl => 'http://tmz.fedorapeople.org/repo/puppet/epel/$releasever/SRPMS', - enabled => 0, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => 'http://tmz.fedorapeople.org/repo/RPM-GPG-KEY-tmz', - priority => 16, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/varnish.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/varnish.pp deleted file mode 100644 index 75cc4584752..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/varnish.pp +++ /dev/null @@ -1,17 +0,0 @@ -# = Class: yum::repo::varnish -# -# This class installs the varnish 3.0 repo -# -class yum::repo::varnish { - - yum::managed_yumrepo { 'varnish': - descr => 'Varnish 3.0 for Enterprise Linux 5 - $basearch', - baseurl => 'http://repo.varnish-cache.org/redhat/varnish-3.0/el5/$basearch', - enabled => 1, - gpgcheck => 0, - failovermethod => 'priority', - # gpgkey => 'http://yum.theforeman.org/RPM-GPG-KEY-VARNISH', - priority => 26, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp deleted file mode 100644 index 7e7847de317..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp +++ /dev/null @@ -1,20 +0,0 @@ -# = Class: yum::repo::vfabric -# -# This class installs the vfabric repo -# -class yum::repo::vfabric { - - $osver = split($::operatingsystemrelease, '[.]') - - yum::managed_yumrepo { 'vfabric': - descr => 'vFabric 5.2 Repo - $basesearch', - baseurl => "http://repo.vmware.com/pub/rhel${osver[0]}/vfabric/5.2/\$basearch", - enabled => 1, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => "http://repo.vmware.com/pub/rhel${osver[0]}/vfabric/5.2/RPM-GPG-KEY-VFABRIC-5.2-EL${osver[0]}", - priority => 1, - } - -} - diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp deleted file mode 100644 index 171acf2df34..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp +++ /dev/null @@ -1,18 +0,0 @@ -# = Class: yum::repo::virtualbox -# -# This class installs the virtualbox repo -# -class yum::repo::virtualbox { - - yum::managed_yumrepo { 'virtualbox': - descr => 'RHEL/CentOS-$releasever / $basearch - VirtualBox', - baseurl => 'http://download.virtualbox.org/virtualbox/rpm/rhel/$releasever/$basearch', - enabled => 1, - gpgcheck => 1, - failovermethod => 'priority', - gpgkey => 'http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc', - autokeyimport => 'yes', - priority => 18, - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp deleted file mode 100644 index adf9c5d8f1d..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp +++ /dev/null @@ -1,19 +0,0 @@ -# = Class: yum::repo::webtatic -# -# This class installs the webtatic repo -# -class yum::repo::webtatic { - $osver = split($::operatingsystemrelease, '[.]') - yum::managed_yumrepo { 'webtatic': - descr => 'Webtatic Repository $releasever - $basearch', - mirrorlist => $osver[0] ? { - 5 => 'http://repo.webtatic.com/yum/centos/5/$basearch/mirrorlist', - 6 => 'http://repo.webtatic.com/yum/el6/$basearch/mirrorlist', - }, - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-webtatic-andy', - gpgkey_source => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-webtatic-andy', - priority => 1, - } -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/updatesd.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/updatesd.pp deleted file mode 100644 index 264541d2a5c..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/updatesd.pp +++ /dev/null @@ -1,50 +0,0 @@ -# Class yum::updatesd -# -# Installs and enables yum updatesd -# -# -class yum::updatesd { - - require yum - - $manage_update_package = $yum::bool_update_disable ? { - true => absent, - default => present, - } - - $manage_update_service_ensure = $yum::bool_update_disable ? { - true => stopped, - default => running, - } - - $manage_update_service_enable = $yum::bool_update_disable ? { - true => false, - default => true, - } - - $manage_update_file = $yum::bool_update_disable ? { - true => absent, - default => present, - } - - package { 'yum-updatesd': - ensure => $manage_update_package, - name => 'yum-updatesd', - } - - service { 'yum-updatesd': - ensure => $manage_update_service_ensure, - enable => $manage_update_service_enable, - hasstatus => true, - hasrestart => true, - require => Package['yum-updatesd'], - } - - file { 'yum-updatesd.conf': - ensure => $manage_update_file, - path => '/etc/yum/yum-updatesd.conf', - source => 'puppet:///modules/yum/yum-updatesd.conf', - require => Package['yum-updatesd'], - } - -} diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb deleted file mode 100644 index 62d9f9c65ac..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}" - -describe 'yum' do - - let(:title) { 'yum' } - let(:node) { 'rspec.example42.com' } - let(:facts) { { :ipaddress => '10.42.42.42' } } - - describe 'Test minimal installation' do - it { should contain_file('yum.conf').with_ensure('present') } - end - - describe 'Test decommissioning - absent' do - let(:params) { {:absent => true } } - it 'should remove yum configuration file' do should contain_file('yum.conf').with_ensure('absent') end - end - - describe 'Test customizations - source' do - let(:params) { {:source => "puppet:///modules/yum/spec"} } - it { should contain_file('yum.conf').with_source('puppet:///modules/yum/spec') } - end - -end diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/spec_helper.rb deleted file mode 100644 index 2c6f56649ae..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/spec_helper.rb +++ /dev/null @@ -1 +0,0 @@ -require 'puppetlabs_spec_helper/module_spec_helper' diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/templates/yum-cron.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/templates/yum-cron.erb deleted file mode 100644 index f4f5971a83c..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/templates/yum-cron.erb +++ /dev/null @@ -1,62 +0,0 @@ -# -# File Managed by Puppet -# -# Pass any given paramter to yum, as run in all the scripts invoked -# by this package. Be aware that this is global, and yum is invoked in -# several modes by these scripts for which your own parameter might not -# be appropriate -YUM_PARAMETER=<%= scope.lookupvar('yum::cron_param') %> - -# Don't install, just check (valid: yes|no) -CHECK_ONLY=no - -# Check to see if you can reach the repos before updating (valid: yes|no) -CHECK_FIRST=no - -# Don't install, just check and download (valid: yes|no) -# Implies CHECK_ONLY=yes (gotta check first to see what to download) -DOWNLOAD_ONLY=no - -# Error level, practical range 0-10, 0 means print only critical errors which -# you must be told, 1 means print all errors, even ones that are not important -# Level 0 is the default -# ERROR_LEVEL=0 - -# Debug level, practical range 0-10, higher number means more output -# Level 1 is a useful level if you want to see what's been done and -# don't want to read /var/log/yum.log -# Level 0 is the default -# DEBUG_LEVEL=1 - -# randomwait is used by yum to wait random time -# default is 60 so yum waits random time from 1 to 60 minutes -# the value must not be zero -RANDOMWAIT="60" - -# if MAILTO is set and the mail command is available, the mail command -# is used to deliver yum output - -# by default MAILTO is unset, so crond mails the output by itself -# example: MAILTO=root -MAILTO=<%= scope.lookupvar('yum::cron_mailto') %> - -# you may set SYSTEMNAME if you want your yum emails tagged differently -# default is output of hostname command -# this variable is used only if MAILTO is set too -#SYSTEMNAME="" - -# you may set DAYS_OF_WEEK to the days of the week you want to run -# default is every day -#DAYS_OF_WEEK="0123456" -DAYS_OF_WEEK=<%= scope.lookupvar('yum::cron_dotw') %> - -# which day should it do cleanup on? defaults to 0 (Sunday). If this day isn't in the -# DAYS_OF_WEEK above, it'll never happen -CLEANDAY="0" - -# set to yes to make the yum-cron service to wait for transactions to complete -SERVICE_WAITS=yes - -# set maximum time period (in seconds) for the yum-cron service to wait for -# transactions to complete. The default is 300 seconds (5 minutes) -SERVICE_WAIT_TIME=300 diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh b/dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh deleted file mode 100644 index 198d7e2dfb7..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -export DEBIAN_FRONTEND=noninteractive - -VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt') - -EXEC_ONCE_DIR="$1" -EXEC_ALWAYS_DIR="$2" - -shopt -s nullglob -files=("${VAGRANT_CORE_FOLDER}"/files/"${EXEC_ONCE_DIR}"/*) - -if [[ (${#files[@]} -gt 0) ]]; then - echo "Running files in files/${EXEC_ONCE_DIR}" - - if [ ! -d "/.puphpet-stuff/${EXEC_ONCE_DIR}-ran" ]; then - mkdir "/.puphpet-stuff/${EXEC_ONCE_DIR}-ran" - echo "Created directory /.puphpet-stuff/${EXEC_ONCE_DIR}-ran" - fi - - find "${VAGRANT_CORE_FOLDER}/files/${EXEC_ONCE_DIR}" -maxdepth 1 -not -path '/.*' -type f \( ! -iname "empty" \) -exec cp -n '{}' "/.puphpet-stuff/${EXEC_ONCE_DIR}-ran" \; - find "/.puphpet-stuff/${EXEC_ONCE_DIR}-ran" -maxdepth 1 -type f -exec chmod +x '{}' \; -exec ls {} \; | sort | xargs -r0 sh -c - echo "Finished running files in files/${EXEC_ONCE_DIR}" - echo "To run again, delete file(s) you want rerun in /.puphpet-stuff/${EXEC_ONCE_DIR}-ran or the whole folder to rerun all" -fi - -echo "Running files in files/${EXEC_ALWAYS_DIR}" -find "${VAGRANT_CORE_FOLDER}/files/${EXEC_ALWAYS_DIR}" -maxdepth 1 -not -path '/.*' -type f \( ! -iname "empty" \) -exec chmod +x '{}' \; -exec ls {} \; | sort | xargs -r0 sh -c -echo "Finished running files in files/${EXEC_ALWAYS_DIR}" - diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/hostsupdater-notice.txt b/dev/vagrant/dolibarrdev/puphpet/shell/hostsupdater-notice.txt deleted file mode 100644 index ce3331b3ced..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/shell/hostsupdater-notice.txt +++ /dev/null @@ -1,4 +0,0 @@ -=============================================================================== -You have the Vagrant::Hostsupdater plugin installed. You may be required to -enter your host's root/privileged password below to continue! -=============================================================================== diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh b/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh deleted file mode 100644 index 21486cd3b93..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt') - -if [[ -f '/.puphpet-stuff/displayed-important-notices' ]]; then - exit 0 -fi - -cat "${VAGRANT_CORE_FOLDER}/shell/important-notices.txt" - -touch '/.puphpet-stuff/displayed-important-notices' diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.txt b/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.txt deleted file mode 100644 index 0dc384f1e06..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.txt +++ /dev/null @@ -1,57 +0,0 @@ - _ - / ) - .--.; | _...,-"""-, - .-""-.-""""-. / _`'-._.' /` \ - /' \ \| (/'-._/ ) ; - .-""""-; ( '--' /-' _ | - .' | ; e / a , ; - / \ | __.'`-.__, ; / - / `._ ; .-' `--.,__.\ /` - //| \ \,-' /\_.' - // | `;.___> /,-'. - /`| / |`\ _..---\ | \ - |/ / _,.-----\ | \ /`| | |\ \ - / .; | | | \ / | | | \ ) - | / | \ / |\..' \ \ | \ \..' - jgs \../ \.../ \.../ \.../---' \.../ - -Read me for some important information! - -If Puppet did not blow up (you do not see a sea of red above), then your VM -was generated successfully! - -* A unique private key was generated for you! It is located at - "puphpet/files/dot/ssh/id_rsa". If you are on Windows, a PuTTY-friendly key - was also generated at same location with a ".ppk" extension. -* If you want to use your own private key for future provisions, overwrite the - generated key above with your own. Make sure to follow the naming pattern, - and include a ".pub" public key. -* If you wish to add packages, modules, Apache/Nginx vhosts, or anything else, - open up "puphpet/config.yaml" and make changes within! Some things will - have random strings like "DIdXRs2OI2LJ" - you must create a random string - as well! To do so, please apply face to keyboard and roll. -* If you change "puphpet/config.yaml", simple run "$ vagrant provision" and - your VM will be updated with the changes you requested! - -Did something go wrong? Don't worry! I can (maybe) help! Please go to our -Github issues page at https://github.com/puphpet/puphpet/issues and search for -your problem. If you do not find your problem answered, open a new ticket! - ----------------------------------------------------------------------------- -PLEASE REMEMBER TO INCLUDE THE CONTENTS OF YOUR "puphpet/config.yaml" FILE. ----------------------------------------------------------------------------- - -Make sure to xxx out any potential API keys or passwords that you do not want -others to see! - -Happy programming! - - Juan Treminio - -┈╭━━━━━━━━━━━━┳━━╮┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈ - ┃ ╭╯ ┃ ▋┃╭━┓ ____ _ _ _ _ -╭┫ ┃ ┃ ┃┃╭┛ | _ \ ___ __ _ __| | / \ | |__ _____ _____| | -┃┃ ╰━━╯ ┃╰╯┃ | |_) / _ \/ _` |/ _` | / _ \ | '_ \ / _ \ \ / / _ \ | -╯┃ ╰┳━╯ | _ < __/ (_| | (_| | / ___ \| |_) | (_) \ V / __/_| - ┃ ┃ |_| \_\___|\__,_|\__,_| /_/ \_\_.__/ \___/ \_/ \___(_) - ┃ ┏━┳━━━━━━━┓ ┏ ┃ -▔┗━┻━┛▔▔▔▔▔▔▔┗━┻━┛▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔ diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh b/dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh deleted file mode 100644 index e653f8991c1..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -export DEBIAN_FRONTEND=noninteractive - -VAGRANT_CORE_FOLDER=$(echo "$1") - -OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID) -CODENAME=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" CODENAME) - -cat "${VAGRANT_CORE_FOLDER}/shell/self-promotion.txt" -printf "\n" -echo "" - -if [[ ! -d '/.puphpet-stuff' ]]; then - mkdir '/.puphpet-stuff' - echo 'Created directory /.puphpet-stuff' -fi - -touch '/.puphpet-stuff/vagrant-core-folder.txt' -echo "${VAGRANT_CORE_FOLDER}" > '/.puphpet-stuff/vagrant-core-folder.txt' - -if [[ -f '/.puphpet-stuff/initial-setup-base-packages' ]]; then - exit 0 -fi - -if [ "${OS}" == 'debian' ] || [ "${OS}" == 'ubuntu' ]; then - echo 'Running initial-setup apt-get update' - apt-get update >/dev/null - echo 'Finished running initial-setup apt-get update' - - echo 'Installing git' - apt-get -y install git-core >/dev/null - echo 'Finished installing git' - - if [[ "${CODENAME}" == 'lucid' || "${CODENAME}" == 'precise' ]]; then - echo 'Installing basic curl packages' - apt-get -y install libcurl3 libcurl4-gnutls-dev curl >/dev/null - echo 'Finished installing basic curl packages' - fi - - echo 'Installing build-essential package' - apt-get -y install build-essential >/dev/null - echo 'Finished installing build-essential packages' -elif [[ "${OS}" == 'centos' ]]; then - echo 'Adding repos: elrep, epel, scl' - perl -p -i -e 's@enabled=1@enabled=0@gi' /etc/yum/pluginconf.d/fastestmirror.conf - perl -p -i -e 's@#baseurl=http://mirror.centos.org/centos/\$releasever/os/\$basearch/@baseurl=http://mirror.rackspace.com/CentOS//\$releasever/os/\$basearch/\nenabled=1@gi' /etc/yum.repos.d/CentOS-Base.repo - perl -p -i -e 's@#baseurl=http://mirror.centos.org/centos/\$releasever/updates/\$basearch/@baseurl=http://mirror.rackspace.com/CentOS//\$releasever/updates/\$basearch/\nenabled=1@gi' /etc/yum.repos.d/CentOS-Base.repo - perl -p -i -e 's@#baseurl=http://mirror.centos.org/centos/\$releasever/extras/\$basearch/@baseurl=http://mirror.rackspace.com/CentOS//\$releasever/extras/\$basearch/\nenabled=1@gi' /etc/yum.repos.d/CentOS-Base.repo - - yum -y --nogpgcheck install 'http://www.elrepo.org/elrepo-release-6-6.el6.elrepo.noarch.rpm' >/dev/null - yum -y --nogpgcheck install 'https://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm' >/dev/null - yum -y install centos-release-SCL >/dev/null - yum clean all >/dev/null - yum -y check-update >/dev/null - echo 'Finished adding repos: elrep, epel, scl' - - echo 'Installing git' - yum -y install git >/dev/null - echo 'Finished installing git' - - echo 'Installing Development Tools' - yum -y groupinstall 'Development Tools' >/dev/null - echo 'Finished installing Development Tools' -fi - -touch '/.puphpet-stuff/initial-setup-base-packages' diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/install-puppet.sh b/dev/vagrant/dolibarrdev/puphpet/shell/install-puppet.sh deleted file mode 100644 index 93f1c32c6c7..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/shell/install-puppet.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -export DEBIAN_FRONTEND=noninteractive - -VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt') - -OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID) -RELEASE=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" RELEASE) -CODENAME=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" CODENAME) - -if [[ -f '/.puphpet-stuff/install-puppet' ]]; then - exit 0 -fi - -if [ "${OS}" == 'debian' ] || [ "${OS}" == 'ubuntu' ]; then - apt-get -y install augeas-tools libaugeas-dev -elif [[ "${OS}" == 'centos' ]]; then - yum -y install augeas-devel -fi - -echo 'Installing Puppet requirements' -/usr/bin/gem install haml hiera facter json ruby-augeas -echo 'Finished installing Puppet requirements' - -echo 'Installing Puppet 3.4.3' -/usr/bin/gem install puppet --version 3.4.3 - -if [[ -f '/usr/bin/puppet' ]]; then - mv /usr/bin/puppet /usr/bin/puppet-old -fi - -ln -s /usr/local/rvm/wrappers/default/puppet /usr/bin/puppet -echo 'Finished installing Puppet 3.4.3' - -touch '/.puphpet-stuff/install-puppet' diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/install-ruby.sh b/dev/vagrant/dolibarrdev/puphpet/shell/install-ruby.sh deleted file mode 100644 index d1b94e37f7d..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/shell/install-ruby.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -export DEBIAN_FRONTEND=noninteractive - -VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt') - -OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID) -RELEASE=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" RELEASE) -CODENAME=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" CODENAME) - -if [[ -f '/.puphpet-stuff/install-ruby' ]]; then - exit 0 -fi - -if [[ -f '/usr/local/rvm/wrappers/default/ruby' ]]; then - RUBY_VERSION=$(/usr/local/rvm/wrappers/default/ruby --version); - if [ "grep '1.9.3' ${RUBY_VERSION}" ]; then - touch '/.puphpet-stuff/install-ruby' - exit 0 - fi -fi - -echo 'Installing Ruby 1.9.3 using RVM' - -curl -sSL https://get.rvm.io | bash -s stable --ruby=1.9.3 -source /usr/local/rvm/scripts/rvm - -if [[ -f '/usr/bin/ruby' ]]; then - mv /usr/bin/ruby /usr/bin/ruby-old -fi - -if [[ -f '/usr/bin/gem' ]]; then - mv /usr/bin/gem /usr/bin/gem-old -fi - -ln -s /usr/local/rvm/wrappers/default/ruby /usr/bin/ruby -ln -s /usr/local/rvm/wrappers/default/gem /usr/bin/gem - -gem update --system >/dev/null - -touch '/.puphpet-stuff/install-ruby' - -echo 'Finished install Ruby 1.9.3 using RVM' diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh b/dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh deleted file mode 100644 index 5a73825dd59..00000000000 --- a/dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -TYPE=$(echo "$1" | tr '[A-Z]' '[a-z]') -OS=$(uname) -ID='unknown' -CODENAME='unknown' -RELEASE='unknown' -ARCH='unknown' - -# detect centos -grep 'centos' /etc/issue -i -q -if [ $? = '0' ]; then - ID='centos' - RELEASE=$(cat /etc/redhat-release | grep -o 'release [0-9]' | cut -d " " -f2) -# could be debian or ubuntu -elif [ $(which lsb_release) ]; then - ID=$(lsb_release -i | cut -f2) - CODENAME=$(lsb_release -c | cut -f2) - RELEASE=$(lsb_release -r | cut -f2) -elif [ -f '/etc/lsb-release' ]; then - ID=$(cat /etc/lsb-release | grep DISTRIB_ID | cut -d "=" -f2) - CODENAME=$(cat /etc/lsb-release | grep DISTRIB_CODENAME | cut -d "=" -f2) - RELEASE=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d "=" -f2) -elif [ -f '/etc/issue' ]; then - ID=$(head -1 /etc/issue | cut -d " " -f1) - if [ -f '/etc/debian_version' ]; then - RELEASE=$(/dev/null - elif [ "${OS}" == 'centos' ]; then - yum -y install putty >/dev/null - fi - - puttygen "${VAGRANT_CORE_FOLDER}/files/dot/ssh/${BASE_KEY_NAME}" -O private -o "${VAGRANT_CORE_FOLDER}/files/dot/ssh/${BASE_KEY_NAME}.ppk" - fi - - echo "Your private key for SSH-based authentication has been saved to 'puphpet/files/dot/ssh/${BASE_KEY_NAME}'!" - else - echo "Pre-existing private key found at 'puphpet/files/dot/ssh/${BASE_KEY_NAME}'" - fi -} - -create_key 'root_id_rsa' -create_key 'id_rsa' - -PUBLIC_SSH_KEY=$(cat "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub") - -echo 'Adding generated key to /root/.ssh/id_rsa' -echo 'Adding generated key to /root/.ssh/id_rsa.pub' -echo 'Adding generated key to /root/.ssh/authorized_keys' - -mkdir -p /root/.ssh - -cp "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa" '/root/.ssh/' -cp "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" '/root/.ssh/' - -if [[ ! -f '/root/.ssh/authorized_keys' ]] || ! grep -q "${PUBLIC_SSH_KEY}" '/root/.ssh/authorized_keys'; then - cat "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" >> '/root/.ssh/authorized_keys' -fi - -chown -R root '/root/.ssh' -chgrp -R root '/root/.ssh' -chmod 700 '/root/.ssh' -chmod 644 '/root/.ssh/id_rsa.pub' -chmod 600 '/root/.ssh/id_rsa' -chmod 600 '/root/.ssh/authorized_keys' - -if [ "${VAGRANT_SSH_USERNAME}" != 'root' ]; then - VAGRANT_SSH_FOLDER="/home/${VAGRANT_SSH_USERNAME}/.ssh"; - - mkdir -p "${VAGRANT_SSH_FOLDER}" - - echo "Adding generated key to ${VAGRANT_SSH_FOLDER}/id_rsa" - echo "Adding generated key to ${VAGRANT_SSH_FOLDER}/id_rsa.pub" - echo "Adding generated key to ${VAGRANT_SSH_FOLDER}/authorized_keys" - - cp "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa" "${VAGRANT_SSH_FOLDER}/id_rsa" - cp "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" "${VAGRANT_SSH_FOLDER}/id_rsa.pub" - - if [[ ! -f "${VAGRANT_SSH_FOLDER}/authorized_keys" ]] || ! grep -q "${PUBLIC_SSH_KEY}" "${VAGRANT_SSH_FOLDER}/authorized_keys"; then - cat "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" >> "${VAGRANT_SSH_FOLDER}/authorized_keys" - fi - - chown -R "${VAGRANT_SSH_USERNAME}" "${VAGRANT_SSH_FOLDER}" - chgrp -R "${VAGRANT_SSH_USERNAME}" "${VAGRANT_SSH_FOLDER}" - chmod 700 "${VAGRANT_SSH_FOLDER}" - chmod 644 "${VAGRANT_SSH_FOLDER}/id_rsa.pub" - chmod 600 "${VAGRANT_SSH_FOLDER}/id_rsa" - chmod 600 "${VAGRANT_SSH_FOLDER}/authorized_keys" - - passwd -d "${VAGRANT_SSH_USERNAME}" >/dev/null -fi From c120e7b3df34165c538cff0af831872c9d781648 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Dec 2014 16:10:11 +0100 Subject: [PATCH 085/172] Clean deprecated files. Add utility tool --- .../emulate_oscommerce/llx_osc_categories.sql | 26 ---- .../llx_osc_customer.key.sql | 20 --- .../emulate_oscommerce/llx_osc_customer.sql | 25 ---- .../emulate_oscommerce/llx_osc_order.sql | 25 ---- .../emulate_oscommerce/llx_osc_product.sql | 27 ---- dev/initdata/sftpget_and_loaddump.php | 138 ++++++++++++++++++ 6 files changed, 138 insertions(+), 123 deletions(-) delete mode 100755 dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql delete mode 100755 dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql delete mode 100755 dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql delete mode 100755 dev/dbmodel/emulate_oscommerce/llx_osc_order.sql delete mode 100755 dev/dbmodel/emulate_oscommerce/llx_osc_product.sql create mode 100755 dev/initdata/sftpget_and_loaddump.php diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql deleted file mode 100755 index 2fd2820cfd3..00000000000 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql +++ /dev/null @@ -1,26 +0,0 @@ --- =================================================================== --- Copyright (C) 2005 Laurent Destailleur --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see . --- --- =================================================================== - -CREATE TABLE llx_osc_categories ( - rowid integer unsigned NOT NULL auto_increment, - dolicatid integer NOT NULL default '0', - osccatid integer NOT NULL default '0', - PRIMARY KEY (rowid), - UNIQUE KEY dolicatid (dolicatid), - UNIQUE KEY osccatid (osccatid) -) ENGINE=InnoDB; diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql deleted file mode 100755 index 002509b4787..00000000000 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql +++ /dev/null @@ -1,20 +0,0 @@ --- =================================================================== --- Copyright (C) 2005 Laurent Destailleur --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see . --- --- =================================================================== - - -ALTER TABLE llx_osc_customer ADD CONSTRAINT fk_osc_customer_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql deleted file mode 100755 index 895e95e4935..00000000000 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql +++ /dev/null @@ -1,25 +0,0 @@ --- =================================================================== --- Copyright (C) 2005 Laurent Destailleur --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see . --- --- =================================================================== - -CREATE TABLE llx_osc_customer ( - rowid integer NOT NULL default '0', - datem datetime default NULL, - fk_soc integer NOT NULL default '0', - PRIMARY KEY (rowid), - UNIQUE KEY fk_soc (fk_soc) -) ENGINE=InnoDB; diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql deleted file mode 100755 index ea1bfbe2c14..00000000000 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql +++ /dev/null @@ -1,25 +0,0 @@ --- =================================================================== --- Copyright (C) 2005 Laurent Destailleur --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see . --- --- =================================================================== - -CREATE TABLE llx_osc_order ( - rowid integer NOT NULL default '0', - datem datetime default NULL, - fk_commande integer NOT NULL default '0', - PRIMARY KEY (rowid), - UNIQUE KEY fk_commande (fk_commande) -) ENGINE=InnoDB; diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql deleted file mode 100755 index f08db68358d..00000000000 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql +++ /dev/null @@ -1,27 +0,0 @@ --- =================================================================== --- Copyright (C) 2005 Laurent Destailleur --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see . --- --- =================================================================== - -CREATE TABLE llx_osc_product ( - rowid integer NOT NULL default '0', - datem datetime default NULL, - fk_product integer NOT NULL default '0', - PRIMARY KEY (rowid), - UNIQUE KEY fk_product (fk_product) -) ENGINE=InnoDB; - - diff --git a/dev/initdata/sftpget_and_loaddump.php b/dev/initdata/sftpget_and_loaddump.php new file mode 100755 index 00000000000..c91ddcc3e17 --- /dev/null +++ b/dev/initdata/sftpget_and_loaddump.php @@ -0,0 +1,138 @@ +#!/usr/bin/php + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +$sapi_type = php_sapi_name(); +$script_file = basename(__FILE__); +$path=dirname(__FILE__).'/'; + +// Test if batch mode +if (substr($sapi_type, 0, 3) == 'cgi') { + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; + exit; +} + +// Global variables +$error=0; + +$sourceserver=isset($argv[1])?$argv[1]:''; // user@server:/src/file +$password=isset($argv[2])?$argv[2]:''; +$database=isset($argv[3])?$argv[3]:''; +$loginbase=isset($argv[4])?$argv[4]:''; +$passwordbase=isset($argv[5])?$argv[5]:''; + +// Include Dolibarr environment +$res=0; +if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php"); +if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include($path."../../htdocs/master.inc.php"); +if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php"); +if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php"); +if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php"); +if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include($path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only +if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include("../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only +if (! $res) die ("Failed to include master.inc.php file\n"); +include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + + +/* + * Main + */ + +$login=''; +$server=''; +if (preg_match('/^(.*)@(.*):(.*)$/',$sourceserver,$reg)) +{ + $login=$reg[1]; + $server=$reg[2]; + $sourcefile=$reg[3]; + $targetfile=basename($sourcefile); +} +if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile) || empty($password) || empty($database) || empty($loginbase) || empty($passwordbase)) +{ + print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh database loginbase passbase\n"; + print "Return code: 0 if success, <>0 if error\n"; + print "Warning, this script may take a long time.\n"; + exit(-1); +} + + +$targetdir='/tmp'; +print "Get dump file from server ".$server.", path ".$sourcefile.", connect with login ".$login." loaded into localhost\n"; + +$sftpconnectstring=$sourceserver; +print 'SFTP connect string : '.$sftpconnectstring."\n"; +//print 'SFTP password '.$password."\n"; + + +// SFTP connect +if (! function_exists("ssh2_connect")) { + dol_print_error('','ssh2_connect function does not exists'); exit(1); +} + +$connection = ssh2_connect($server, 22); +if ($connection) +{ + if (! @ssh2_auth_password($connection, $login, $password)) + { + dol_syslog("Could not authenticate with username ".$login." . and password ".$password,LOG_ERR); + exit(-5); + } + else + { + //$stream = ssh2_exec($connection, '/usr/bin/php -i'); + /* + print "Generate dump ".$filesys1.'.bz2'."\n"; + $stream = ssh2_exec($connection, "mysqldump -u debian-sys-maint -p4k9Blxl2snq4FHXY -h 127.0.0.1 --single-transaction -K --tables -c -e --hex-blob --default-character-set=utf8 saasplex | bzip2 -1 > ".$filesys1.'.bz2'); + stream_set_blocking($stream, true); + // The command may not finish properly if the stream is not read to end + $output = stream_get_contents($stream); + */ + + $sftp = ssh2_sftp($connection); + + print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n"; + ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile); + + $fullcommand="cat ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database; + if (preg_match('/\.bz2$/',$targetfile)) + { + $fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database; + } + if (preg_match('/\.gz$/',$targetfile)) + { + $fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database; + } + print "Load dump with ".$fullcommand."\n"; + $output=array(); + $return_var=0; + print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n"; + exec($fullcommand, $output, $return_var); + foreach($output as $line) print $line."\n"; + + //ssh2_sftp_unlink($sftp, $fileinstalllock); + //print $output; + } +} +else +{ + print 'Failed to connect to ssh2 to '.$server; + exit(-6); +} + + +exit(0); From 47cab9033625e859341a164012226e5b3e38cc39 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Dec 2014 19:01:29 +0100 Subject: [PATCH 086/172] Update codesniffer to remove travis errors. --- dev/codesniffer/ruleset.dtd | 3 +- dev/codesniffer/ruleset.xml | 116 +++++++++++++++++++++++++++++++++++- 2 files changed, 115 insertions(+), 4 deletions(-) diff --git a/dev/codesniffer/ruleset.dtd b/dev/codesniffer/ruleset.dtd index 0d498bb033c..e307d564e12 100755 --- a/dev/codesniffer/ruleset.dtd +++ b/dev/codesniffer/ruleset.dtd @@ -1,7 +1,8 @@ - + + diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml index 24cc4b46e7b..7e4ae92274c 100755 --- a/dev/codesniffer/ruleset.xml +++ b/dev/codesniffer/ruleset.xml @@ -3,6 +3,13 @@ Dolibarr coding standard. + */conf.php + */includes/* + */documents/* + */dev/vagrant/* + */custom/* + */nltechno* + @@ -10,7 +17,17 @@ - + + + 0 + + + 0 + + + 0 + + 0 @@ -46,6 +63,9 @@ --> + + + @@ -93,7 +113,7 @@ - + @@ -150,7 +170,75 @@ 0 - + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + 0 + + + 0 + + + 0 + + + 0 + + \r\nYou can adit it with the WYSIWYG editor.
    \r\nIt is\r\n
      \r\n
    • \r\n Fast
      • \r\n
    • \r\n Easy to use
      • \r\n
    • \r\n Pretty
      • \r\n
    ','','',NULL,NULL,'dolibarr@domain.com','','',NULL,'2011-07-18 20:44:33',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +/*!40000 ALTER TABLE `llx_mailing` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_mailing_cibles` +-- + +DROP TABLE IF EXISTS `llx_mailing_cibles`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_mailing_cibles` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_mailing` int(11) NOT NULL, + `fk_contact` int(11) NOT NULL, + `lastname` varchar(50) DEFAULT NULL, + `firstname` varchar(50) DEFAULT NULL, + `email` varchar(160) NOT NULL, + `other` varchar(255) DEFAULT NULL, + `tag` varchar(128) DEFAULT NULL, + `statut` smallint(6) NOT NULL DEFAULT '0', + `source_url` varchar(160) DEFAULT NULL, + `source_id` int(11) DEFAULT NULL, + `source_type` varchar(16) DEFAULT NULL, + `date_envoi` datetime DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_mailing_cibles` (`fk_mailing`,`email`), + KEY `idx_mailing_cibles_email` (`email`) +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_mailing_cibles` +-- + +LOCK TABLES `llx_mailing_cibles` WRITE; +/*!40000 ALTER TABLE `llx_mailing_cibles` DISABLE KEYS */; +INSERT INTO `llx_mailing_cibles` VALUES (1,1,0,'Dupont','Alain','toto@aa.com','Date fin=10/07/2011',NULL,0,'0',NULL,NULL,NULL),(2,2,0,'Swiss customer supplier','','abademail@aa.com','',NULL,0,'0',NULL,NULL,NULL),(3,2,0,'Smith Vick','','vsmith@email.com','',NULL,0,'0',NULL,NULL,NULL),(4,3,0,'Swiss customer supplier','','abademail@aa.com','',NULL,0,'0',NULL,NULL,NULL),(5,3,0,'Smith Vick','','vsmith@email.com','',NULL,0,'0',NULL,NULL,NULL); +/*!40000 ALTER TABLE `llx_mailing_cibles` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_menu` +-- + +DROP TABLE IF EXISTS `llx_menu`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_menu` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `menu_handler` varchar(16) NOT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `module` varchar(64) DEFAULT NULL, + `type` varchar(4) NOT NULL, + `mainmenu` varchar(100) NOT NULL, + `fk_menu` int(11) NOT NULL, + `fk_leftmenu` varchar(24) DEFAULT NULL, + `fk_mainmenu` varchar(24) DEFAULT NULL, + `position` int(11) NOT NULL, + `url` varchar(255) NOT NULL, + `target` varchar(100) DEFAULT NULL, + `titre` varchar(255) NOT NULL, + `langs` varchar(100) DEFAULT NULL, + `level` smallint(6) DEFAULT NULL, + `leftmenu` varchar(100) DEFAULT NULL, + `perms` varchar(255) DEFAULT NULL, + `enabled` varchar(255) DEFAULT '1', + `usertype` int(11) NOT NULL DEFAULT '0', + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`rowid`), + UNIQUE KEY `idx_menu_uk_menu` (`menu_handler`,`fk_menu`,`position`,`url`,`entity`), + KEY `idx_menu_menuhandler_type` (`menu_handler`,`type`) +) ENGINE=InnoDB AUTO_INCREMENT=108480 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_menu` +-- + +LOCK TABLES `llx_menu` WRITE; +/*!40000 ALTER TABLE `llx_menu` DISABLE KEYS */; +INSERT INTO `llx_menu` VALUES (19289,'all',1,'cashdesk','top','cashdesk',0,NULL,NULL,100,'/cashdesk/index.php?user=__LOGIN__','pointofsale','CashDeskMenu','cashdesk',NULL,NULL,'1','$conf->cashdesk->enabled',0,'2012-12-08 13:11:09'),(87422,'smartphone',1,NULL,'top','home',0,NULL,NULL,1,'/index.php?mainmenu=home&leftmenu=','','Home','',-1,'','','1',2,'2013-02-24 18:29:15'),(87423,'smartphone',1,NULL,'top','companies',0,NULL,NULL,2,'/societe/index.php?mainmenu=companies&leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->societe->enabled || $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(87424,'smartphone',1,NULL,'top','products',0,NULL,NULL,3,'/product/index.php?mainmenu=products&leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2013-02-24 18:29:15'),(87426,'smartphone',1,NULL,'top','commercial',0,NULL,NULL,5,'/comm/index.php?mainmenu=commercial&leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87427,'smartphone',1,NULL,'top','accountancy',0,NULL,NULL,6,'/compta/index.php?mainmenu=accountancy&leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled',2,'2013-02-24 18:29:15'),(87428,'smartphone',1,NULL,'top','project',0,NULL,NULL,7,'/projet/index.php?mainmenu=project&leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',0,'2013-02-24 18:29:15'),(87429,'smartphone',1,NULL,'top','tools',0,NULL,NULL,8,'/core/tools.php?mainmenu=tools&leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled',2,'2013-02-24 18:29:15'),(87432,'smartphone',1,NULL,'top','shop',0,NULL,NULL,11,'/boutique/index.php?mainmenu=shop&leftmenu=','','OSCommerce','shop',-1,'','','! empty($conf->boutique->enabled)',0,'2013-02-24 18:29:15'),(87434,'smartphone',1,NULL,'top','members',0,NULL,NULL,15,'/adherents/index.php?mainmenu=members&leftmenu=','','Members','members',-1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(87435,'smartphone',1,NULL,'top','bank',0,NULL,NULL,6,'/compta/bank/index.php?mainmenu=bank&leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',2,'2013-02-24 18:29:15'),(87521,'smartphone',1,NULL,'left','home',87422,NULL,NULL,0,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'','','$user->admin',2,'2013-02-24 18:29:15'),(87522,'smartphone',1,NULL,'left','home',87521,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87523,'smartphone',1,NULL,'left','home',87521,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87524,'smartphone',1,NULL,'left','home',87521,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87525,'smartphone',1,NULL,'left','home',87521,NULL,NULL,5,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87526,'smartphone',1,NULL,'left','home',87521,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87527,'smartphone',1,NULL,'left','home',87521,NULL,NULL,6,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87529,'smartphone',1,NULL,'left','home',87521,NULL,NULL,7,'/admin/perms.php?leftmenu=setup','','Security','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87530,'smartphone',1,NULL,'left','home',87521,NULL,NULL,9,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87531,'smartphone',1,NULL,'left','home',87521,NULL,NULL,8,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87532,'smartphone',1,NULL,'left','home',87521,NULL,NULL,10,'/admin/dict.php?leftmenu=setup','','DictionarySetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87533,'smartphone',1,NULL,'left','home',87521,NULL,NULL,11,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87621,'smartphone',1,NULL,'left','home',87422,NULL,NULL,1,'/admin/system/index.php?leftmenu=system','','SystemInfo','admin',0,'','','$user->admin',2,'2013-02-24 18:29:15'),(87622,'smartphone',1,NULL,'left','home',87621,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=system','','Dolibarr','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87623,'smartphone',1,NULL,'left','home',87622,NULL,NULL,1,'/admin/system/constall.php?leftmenu=system','','AllParameters','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87624,'smartphone',1,NULL,'left','home',87622,NULL,NULL,4,'/admin/system/about.php?leftmenu=system','','About','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87625,'smartphone',1,NULL,'left','home',87621,NULL,NULL,1,'/admin/system/os.php?leftmenu=system','','OS','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87626,'smartphone',1,NULL,'left','home',87621,NULL,NULL,2,'/admin/system/web.php?leftmenu=system','','WebServer','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87627,'smartphone',1,NULL,'left','home',87621,NULL,NULL,3,'/admin/system/phpinfo.php?leftmenu=system','','Php','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87628,'smartphone',1,NULL,'left','home',87622,NULL,NULL,3,'/admin/triggers.php?leftmenu=system','','Triggers','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87629,'smartphone',1,NULL,'left','home',87622,NULL,NULL,2,'/admin/system/modules.php?leftmenu=system','','Modules','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87631,'smartphone',1,NULL,'left','home',87621,NULL,NULL,4,'/admin/system/database.php?leftmenu=system','','Database','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87632,'smartphone',1,NULL,'left','home',87631,NULL,NULL,0,'/admin/system/database-tables.php?leftmenu=system','','Tables','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87721,'smartphone',1,NULL,'left','home',87422,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','SystemTools','admin',0,'','','$user->admin',2,'2013-02-24 18:29:15'),(87722,'smartphone',1,NULL,'left','home',87721,NULL,NULL,0,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87723,'smartphone',1,NULL,'left','home',87721,NULL,NULL,1,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87724,'smartphone',1,NULL,'left','home',87721,NULL,NULL,6,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87725,'smartphone',1,NULL,'left','home',87721,NULL,NULL,3,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','1 && function_exists(\'eaccelerator_info\')',2,'2013-02-24 18:29:15'),(87726,'smartphone',1,NULL,'left','home',87721,NULL,NULL,2,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87727,'smartphone',1,NULL,'left','home',87721,NULL,NULL,4,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87728,'smartphone',1,NULL,'left','home',87721,NULL,NULL,7,'/support/index.php?leftmenu=admintools','_blank','HelpCenter','help',1,'','','1',2,'2013-02-24 18:29:15'),(87729,'smartphone',1,NULL,'left','home',87721,NULL,NULL,5,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87821,'smartphone',1,NULL,'left','home',87422,NULL,NULL,3,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'','','1',2,'2013-02-24 18:29:15'),(87822,'smartphone',1,NULL,'left','home',87821,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','1',2,'2013-02-24 18:29:15'),(87823,'smartphone',1,NULL,'left','home',87822,NULL,NULL,0,'/user/fiche.php?leftmenu=users&action=create','','NewUser','users',2,'','$user->rights->user->user->creer || $user->admin','1',2,'2013-02-24 18:29:15'),(87824,'smartphone',1,NULL,'left','home',87821,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin','1',2,'2013-02-24 18:29:15'),(87825,'smartphone',1,NULL,'left','home',87824,NULL,NULL,0,'/user/group/fiche.php?leftmenu=users&action=create','','NewGroup','users',2,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin','1',2,'2013-02-24 18:29:15'),(87921,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,0,'/societe/societe.php','','ThirdParty','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87922,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,0,'/societe/soc.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87924,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,5,'/fourn/liste.php?leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(87925,'smartphone',1,NULL,'left','companies',87924,NULL,NULL,0,'/societe/soc.php?leftmenu=supplier&action=create&type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(87927,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,3,'/comm/prospect/list.php?leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87928,'smartphone',1,NULL,'left','companies',87927,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&action=create&type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87930,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,4,'/comm/list.php?leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87931,'smartphone',1,NULL,'left','companies',87930,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&action=create&type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88021,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses||Contacts@$conf->global->SOCIETE_ADDRESSES_MANAGEMENT','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88022,'smartphone',1,NULL,'left','companies',88021,NULL,NULL,0,'/contact/fiche.php?leftmenu=contacts&action=create','','NewContactAddress||NewContact@$conf->global->SOCIETE_ADDRESSES_MANAGEMENT','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88023,'smartphone',1,NULL,'left','companies',88021,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88025,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&type=p','','Prospects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88026,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&type=c','','Customers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88027,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&type=f','','Suppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(88028,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88071,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,3,'/categories/index.php?leftmenu=cat&type=1','','SuppliersCategoriesShort','categories',0,'','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88072,'smartphone',1,NULL,'left','companies',88071,NULL,NULL,0,'/categories/fiche.php?action=create&type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88081,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,4,'/categories/index.php?leftmenu=cat&type=2','','CustomersProspectsCategoriesShort','categories',0,'','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88082,'smartphone',1,NULL,'left','companies',88081,NULL,NULL,0,'/categories/fiche.php?action=create&type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88121,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,1,'/comm/prospect/index.php?leftmenu=prospects','','Prospects','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88122,'smartphone',1,NULL,'left','commercial',88121,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&action=create&type=p','','MenuNewProspect','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88123,'smartphone',1,NULL,'left','commercial',88121,NULL,NULL,1,'/comm/prospect/list.php?leftmenu=prospects','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88124,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,0,'/comm/prospect/list.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=-1','','LastProspectDoNotContact','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88125,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,1,'/comm/prospect/list.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=0','','LastProspectNeverContacted','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88126,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,2,'/comm/prospect/list.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=1','','LastProspectToContact','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88127,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,3,'/comm/prospect/list.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=2','','LastProspectContactInProcess','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88128,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,4,'/comm/prospect/list.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=3','','LastProspectContactDone','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88129,'smartphone',1,NULL,'left','commercial',88121,NULL,NULL,2,'/contact/list.php?leftmenu=prospects&type=p','','Contacts','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88221,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,2,'/comm/index.php?leftmenu=customers','','Customers','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88222,'smartphone',1,NULL,'left','commercial',88221,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&action=create&type=c','','MenuNewCustomer','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88223,'smartphone',1,NULL,'left','commercial',88221,NULL,NULL,1,'/comm/list.php?leftmenu=customers','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88224,'smartphone',1,NULL,'left','commercial',88221,NULL,NULL,2,'/contact/list.php?leftmenu=customers&type=c','','Contacts','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88321,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,3,'/contact/list.php?leftmenu=contacts','','Contacts','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88322,'smartphone',1,NULL,'left','commercial',88321,NULL,NULL,0,'/contact/fiche.php?leftmenu=contacts&action=create','','NewContactAddress||NewContact@$conf->global->SOCIETE_ADDRESSES_MANAGEMENT','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88323,'smartphone',1,NULL,'left','commercial',88321,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&action=create','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88331,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&type=p','','Prospects','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88332,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&type=c','','Customers','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88333,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&type=f','','Suppliers','companies',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88334,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&type=o','','Other','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88521,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,4,'/comm/propal.php?leftmenu=propals','','Prop','propal',0,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2013-02-24 18:29:15'),(88522,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,0,'/societe/societe.php?leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88523,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,1,'/comm/propal.php?viewstatut=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88524,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,2,'/comm/propal.php?viewstatut=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88525,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,3,'/comm/propal.php?viewstatut=2,3,4','','PropalStatusClosedShort','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88526,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88621,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2013-02-24 18:29:15'),(88622,'smartphone',1,NULL,'left','commercial',88621,NULL,NULL,0,'/societe/societe.php?leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88623,'smartphone',1,NULL,'left','commercial',88621,NULL,NULL,1,'/commande/liste.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88624,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,2,'/commande/liste.php?leftmenu=orders&viewstatut=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88625,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,3,'/commande/liste.php?leftmenu=orders&viewstatut=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88626,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,4,'/commande/liste.php?leftmenu=orders&viewstatut=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88627,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,5,'/commande/liste.php?leftmenu=orders&viewstatut=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88628,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,6,'/commande/liste.php?leftmenu=orders&viewstatut=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88629,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,7,'/commande/liste.php?leftmenu=orders&viewstatut=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88630,'smartphone',1,NULL,'left','commercial',88621,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88721,'smartphone',1,NULL,'left','commercial',87424,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','orders',0,'','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2013-02-24 18:29:15'),(88722,'smartphone',1,NULL,'left','commercial',88721,NULL,NULL,0,'/expedition/liste.php?leftmenu=sendings','','List','orders',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-02-24 18:29:15'),(88723,'smartphone',1,NULL,'left','commercial',88721,NULL,NULL,1,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','orders',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-02-24 18:29:15'),(88821,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88822,'smartphone',1,NULL,'left','commercial',88821,NULL,NULL,0,'/societe/societe.php?leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88823,'smartphone',1,NULL,'left','commercial',88821,NULL,NULL,1,'/contrat/liste.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88824,'smartphone',1,NULL,'left','commercial',88821,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88825,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88826,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88827,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&mode=4&filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88828,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88921,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2013-02-24 18:29:15'),(88922,'smartphone',1,NULL,'left','commercial',88921,NULL,NULL,0,'/fichinter/fiche.php?action=create&leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled && $leftmenu==\"ficheinter\"',2,'2013-02-24 18:29:15'),(88923,'smartphone',1,NULL,'left','commercial',88921,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled && $leftmenu==\"ficheinter\"',2,'2013-02-24 18:29:15'),(89021,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,3,'/fourn/facture/index.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89022,'smartphone',1,NULL,'left','accountancy',89021,NULL,NULL,0,'/fourn/facture/fiche.php?action=create&leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89023,'smartphone',1,NULL,'left','accountancy',89021,NULL,NULL,1,'/fourn/facture/impayees.php?leftmenu=suppliers_bills','','Unpaid','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89024,'smartphone',1,NULL,'left','accountancy',89021,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89121,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89122,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,3,'/compta/clients.php?action=facturer&leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89123,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,4,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','Repeatable','bills',1,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89124,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,5,'/compta/facture/impayees.php?action=facturer&leftmenu=customers_bills','','Unpaid','bills',1,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89125,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,6,'/compta/paiement/liste.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89131,'smartphone',1,NULL,'left','accountancy',89125,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89132,'smartphone',1,NULL,'left','accountancy',87435,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank','','MenuChequeDeposits','bills',0,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89133,'smartphone',1,NULL,'left','accountancy',89132,NULL,NULL,0,'/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new','','NewCheckDeposit','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89134,'smartphone',1,NULL,'left','accountancy',89132,NULL,NULL,1,'/compta/paiement/cheque/liste.php?leftmenu=checks','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89135,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89321,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,3,'/commande/liste.php?leftmenu=orders&viewstatut=3','','MenuOrdersToBill','orders',0,'','$user->rights->commande->lire','$conf->commande->enabled',0,'2013-02-24 18:29:15'),(89421,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,4,'/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy','','Donations','donations',0,'','$user->rights->don->lire','$conf->don->enabled',2,'2013-02-24 18:29:15'),(89422,'smartphone',1,NULL,'left','accountancy',89421,NULL,NULL,0,'/compta/dons/fiche.php?leftmenu=donations&mainmenu=accountancy&action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2013-02-24 18:29:15'),(89423,'smartphone',1,NULL,'left','accountancy',89421,NULL,NULL,1,'/compta/dons/liste.php?leftmenu=donations&mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2013-02-24 18:29:15'),(89521,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2013-02-24 18:29:15'),(89522,'smartphone',1,NULL,'left','accountancy',89521,NULL,NULL,1,'/compta/deplacement/fiche.php?action=create&leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-02-24 18:29:15'),(89523,'smartphone',1,NULL,'left','accountancy',89521,NULL,NULL,2,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-02-24 18:29:15'),(89524,'smartphone',1,NULL,'left','accountancy',89521,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-02-24 18:29:15'),(89621,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy','','MenuTaxAndDividends','compta',0,'','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2013-02-24 18:29:15'),(89622,'smartphone',1,NULL,'left','accountancy',89621,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2013-02-24 18:29:15'),(89623,'smartphone',1,NULL,'left','accountancy',89622,NULL,NULL,2,'/compta/sociales/charges.php?leftmenu=tax_social&action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2013-02-24 18:29:15'),(89624,'smartphone',1,NULL,'left','accountancy',89622,NULL,NULL,3,'/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2013-02-24 18:29:15'),(89721,'smartphone',1,NULL,'left','accountancy',89621,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&mainmenu=accountancy','','VAT','companies',1,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2013-02-24 18:29:15'),(89722,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,0,'/compta/tva/fiche.php?leftmenu=tax_vat&action=create','','NewPayment','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89723,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','Payments','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89724,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89725,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89821,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,8,'/compta/ventilation/index.php?leftmenu=ventil','','Ventilation','companies',0,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89822,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,0,'/compta/ventilation/liste.php','','ToDispatch','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89823,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,1,'/compta/ventilation/lignes.php','','Dispatched','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89824,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,2,'/compta/param/','','Setup','companies',1,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89825,'smartphone',1,NULL,'left','accountancy',89824,NULL,NULL,0,'/compta/param/comptes/liste.php','','List','companies',2,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89826,'smartphone',1,NULL,'left','accountancy',89824,NULL,NULL,1,'/compta/param/comptes/fiche.php?action=create','','New','companies',2,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89827,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,3,'/compta/export/','','Export','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89828,'smartphone',1,NULL,'left','accountancy',89827,NULL,NULL,0,'/compta/export/index.php','','New','companies',2,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89829,'smartphone',1,NULL,'left','accountancy',89827,NULL,NULL,1,'/compta/export/liste.php','','List','companies',2,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89921,'smartphone',1,NULL,'left','accountancy',87435,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank','','StandingOrders','withdrawals',0,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2013-02-24 18:29:15'),(89922,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,1,'/compta/prelevement/demandes.php?status=0&leftmenu=withdraw','','StandingOrderToProcess','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89923,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89924,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89925,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,3,'/compta/prelevement/liste.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89927,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89928,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(90021,'smartphone',1,NULL,'left','accountancy',87435,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&mainmenu=bank','','MenuBankCash','banks',0,'','$user->rights->banque->lire','$conf->banque->enabled',0,'2013-02-24 18:29:15'),(90022,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,0,'/compta/bank/fiche.php?action=create&leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90023,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,1,'/compta/bank/categ.php?leftmenu=bank','','Rubriques','categories',1,'','$user->rights->banque->configurer','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90024,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,2,'/compta/bank/search.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90025,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90027,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,5,'/compta/bank/virement.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90121,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy','','Reportings','main',0,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90122,'smartphone',1,NULL,'left','accountancy',90121,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90123,'smartphone',1,NULL,'left','accountancy',90122,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90124,'smartphone',1,NULL,'left','accountancy',90121,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90125,'smartphone',1,NULL,'left','accountancy',90124,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90126,'smartphone',1,NULL,'left','accountancy',90124,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90221,'smartphone',1,NULL,'left','products',87424,NULL,NULL,0,'/product/index.php?leftmenu=product&type=0','','Products','products',0,'','$user->rights->produit->lire','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90222,'smartphone',1,NULL,'left','products',90221,NULL,NULL,0,'/product/fiche.php?leftmenu=product&action=create&type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90223,'smartphone',1,NULL,'left','products',90221,NULL,NULL,1,'/product/liste.php?leftmenu=product&type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90224,'smartphone',1,NULL,'left','products',90221,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90321,'smartphone',1,NULL,'left','products',87424,NULL,NULL,1,'/product/index.php?leftmenu=service&type=1','','Services','products',0,'','$user->rights->service->lire','$conf->service->enabled',2,'2013-02-24 18:29:15'),(90322,'smartphone',1,NULL,'left','products',90321,NULL,NULL,0,'/product/fiche.php?leftmenu=service&action=create&type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2013-02-24 18:29:15'),(90323,'smartphone',1,NULL,'left','products',90321,NULL,NULL,1,'/product/liste.php?leftmenu=service&type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2013-02-24 18:29:15'),(90421,'smartphone',1,NULL,'left','products',87424,NULL,NULL,2,'/product/stats/index.php?leftmenu=stats','','Statistics','main',0,'','$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',2,'2013-02-24 18:29:15'),(90422,'smartphone',1,NULL,'left','products',90421,NULL,NULL,0,'/product/popuprop.php?leftmenu=stats','','Popularity','main',1,'','$user->rights->produit->lire && $user->rights->produit>lire','$conf->propal->enabled',2,'2013-02-24 18:29:15'),(90521,'smartphone',1,NULL,'left','products',87424,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90522,'smartphone',1,NULL,'left','products',90521,NULL,NULL,0,'/product/stock/fiche.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90523,'smartphone',1,NULL,'left','products',90521,NULL,NULL,1,'/product/stock/liste.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90524,'smartphone',1,NULL,'left','products',90521,NULL,NULL,2,'/product/stock/valo.php','','EnhancedValue','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90525,'smartphone',1,NULL,'left','products',90521,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90621,'smartphone',1,NULL,'left','products',87424,NULL,NULL,4,'/categories/index.php?leftmenu=cat&type=0','','Categories','categories',0,'','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2013-02-24 18:29:15'),(90622,'smartphone',1,NULL,'left','products',90621,NULL,NULL,0,'/categories/fiche.php?action=create&type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2013-02-24 18:29:15'),(91021,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91022,'smartphone',1,NULL,'left','project',91021,NULL,NULL,1,'/projet/fiche.php?leftmenu=projects&action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91023,'smartphone',1,NULL,'left','project',91021,NULL,NULL,2,'/projet/liste.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91031,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/index.php?leftmenu=projects&mode=mine','','MyProjects','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91032,'smartphone',1,NULL,'left','project',91031,NULL,NULL,1,'/projet/fiche.php?leftmenu=projects&action=create&mode=mine','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91033,'smartphone',1,NULL,'left','project',91031,NULL,NULL,2,'/projet/liste.php?leftmenu=projects&mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91121,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91122,'smartphone',1,NULL,'left','project',91121,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91123,'smartphone',1,NULL,'left','project',91121,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91124,'smartphone',1,NULL,'left','project',91121,NULL,NULL,3,'/projet/activity/list.php?leftmenu=projects','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91221,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects&mode=mine','','MyActivities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91222,'smartphone',1,NULL,'left','project',91221,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&action=create&mode=mine','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91223,'smartphone',1,NULL,'left','project',91221,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects&mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91224,'smartphone',1,NULL,'left','project',91221,NULL,NULL,3,'/projet/activity/list.php?leftmenu=projects&mode=mine','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91321,'smartphone',1,NULL,'left','tools',87429,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2013-02-24 18:29:15'),(91322,'smartphone',1,NULL,'left','tools',91321,NULL,NULL,0,'/comm/mailing/fiche.php?leftmenu=mailing&action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2013-02-24 18:29:15'),(91323,'smartphone',1,NULL,'left','tools',91321,NULL,NULL,1,'/comm/mailing/liste.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2013-02-24 18:29:15'),(91521,'smartphone',1,NULL,'left','tools',87429,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'','$user->rights->export->lire','$conf->export->enabled',2,'2013-02-24 18:29:15'),(91522,'smartphone',1,NULL,'left','tools',91521,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2013-02-24 18:29:15'),(91551,'smartphone',1,NULL,'left','tools',87429,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'','$user->rights->import->run','$conf->import->enabled',2,'2013-02-24 18:29:15'),(91552,'smartphone',1,NULL,'left','tools',91551,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2013-02-24 18:29:15'),(91621,'smartphone',1,NULL,'left','members',87434,NULL,NULL,0,'/adherents/index.php?leftmenu=members&mainmenu=members','','Members','members',0,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91622,'smartphone',1,NULL,'left','members',91621,NULL,NULL,0,'/adherents/fiche.php?action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91623,'smartphone',1,NULL,'left','members',91621,NULL,NULL,1,'/adherents/liste.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91624,'smartphone',1,NULL,'left','members',91623,NULL,NULL,2,'/adherents/liste.php?statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91625,'smartphone',1,NULL,'left','members',91623,NULL,NULL,3,'/adherents/liste.php?statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91626,'smartphone',1,NULL,'left','members',91623,NULL,NULL,4,'/adherents/liste.php?statut=1&filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91627,'smartphone',1,NULL,'left','members',91623,NULL,NULL,5,'/adherents/liste.php?statut=1&filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91628,'smartphone',1,NULL,'left','members',91623,NULL,NULL,6,'/adherents/liste.php?statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91721,'smartphone',1,NULL,'left','members',87434,NULL,NULL,1,'/adherents/index.php?leftmenu=accountancy&mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91722,'smartphone',1,NULL,'left','members',91721,NULL,NULL,0,'/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91723,'smartphone',1,NULL,'left','members',91721,NULL,NULL,1,'/adherents/cotisations.php?leftmenu=accountancy','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91921,'smartphone',1,NULL,'left','members',87434,NULL,NULL,3,'/adherents/index.php?leftmenu=export&mainmenu=members','','Exports','members',0,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91922,'smartphone',1,NULL,'left','members',91921,NULL,NULL,0,'/exports/index.php?leftmenu=export','','Datas','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled && $conf->export->enabled',2,'2013-02-24 18:29:15'),(91923,'smartphone',1,NULL,'left','members',91921,NULL,NULL,1,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91924,'smartphone',1,NULL,'left','members',91921,NULL,NULL,2,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92121,'smartphone',1,NULL,'left','members',87434,NULL,NULL,5,'/adherents/index.php?leftmenu=setup&mainmenu=members','','Setup','members',0,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92122,'smartphone',1,NULL,'left','members',92121,NULL,NULL,0,'/adherents/type.php?leftmenu=setup','','MembersTypes','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92123,'smartphone',1,NULL,'left','members',92121,NULL,NULL,1,'/adherents/options.php?leftmenu=setup','','MembersAttributes','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92421,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,0,'/compta/index.php?leftmenu=suppliers','','Suppliers','companies',0,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92422,'smartphone',1,NULL,'left','commercial',92421,NULL,NULL,0,'/societe/soc.php?leftmenu=suppliers&action=create&type=f','','NewSupplier','companies',1,'','$user->rights->societe->creer && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92423,'smartphone',1,NULL,'left','commercial',92421,NULL,NULL,1,'/fourn/liste.php?leftmenu=suppliers','','List','companies',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92424,'smartphone',1,NULL,'left','commercial',92421,NULL,NULL,2,'/contact/list.php?leftmenu=suppliers&type=f','','Contacts','companies',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92521,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'','$user->rights->fournisseur->commande->lire','$conf->commande->enabled',2,'2013-02-24 18:29:15'),(92522,'smartphone',1,NULL,'left','commercial',92521,NULL,NULL,0,'/societe/societe.php?leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->commande->enabled && $leftmenu==\"orders_suppliers\"',2,'2013-02-24 18:29:15'),(92523,'smartphone',1,NULL,'left','commercial',92521,NULL,NULL,1,'/fourn/commande/liste.php?leftmenu=orders_suppliers&viewstatut=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->commande->enabled && $leftmenu==\"orders_suppliers\"',2,'2013-02-24 18:29:15'),(92529,'smartphone',1,NULL,'left','commercial',92521,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->commande->enabled && $leftmenu==\"orders_suppliers\"',2,'2013-02-24 18:29:15'),(92621,'smartphone',1,NULL,'left','members',87434,NULL,NULL,3,'/categories/index.php?leftmenu=cat&type=3','','MembersCategoriesShort','categories',0,'','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(92622,'smartphone',1,NULL,'left','members',92621,NULL,NULL,0,'/categories/fiche.php?action=create&type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103108,'all',2,'pos','top','pos',0,NULL,NULL,100,'/pos/backend/listefac.php','','POS','pos@pos',NULL,'1','1','1',2,'2013-03-13 20:33:09'),(103109,'all',2,'pos','left','pos',103108,NULL,NULL,100,'/pos/backend/liste.php','','Tickets','pos@pos',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103110,'all',2,'pos','left','pos',103109,NULL,NULL,100,'/pos/backend/liste.php','','List','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103111,'all',2,'pos','left','pos',103110,NULL,NULL,100,'/pos/backend/liste.php?viewstatut=0','','StatusTicketDraft','pos@pos',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103112,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/liste.php?viewstatut=1','','StatusTicketClosed','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103113,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/liste.php?viewstatut=2','','StatusTicketProcessed','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103114,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/liste.php?viewtype=1','','StatusTicketReturned','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103115,'all',2,'pos','left','pos',103108,NULL,NULL,100,'/pos/backend/listefac.php','','Factures','pos@pos',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103116,'all',2,'pos','left','pos',103115,NULL,NULL,100,'/pos/backend/listefac.php','','List','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103117,'all',2,'pos','left','pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=0','','BillStatusDraft','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103118,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=1','','BillStatusValidated','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103119,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=2&viewtype=0','','BillStatusPaid','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103120,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewtype=2','','BillStatusReturned','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103121,'all',2,'pos','left','@pos',103108,NULL,NULL,100,'/pos/frontend/index.php','','POS','main',NULL,NULL,'$user->rights->pos->frontend','1',0,'2013-03-13 20:33:09'),(103122,'all',2,'pos','left','@pos',103121,NULL,NULL,100,'/pos/frontend/index.php','','NewTicket','main',NULL,NULL,'$user->rights->pos->frontend','1',0,'2013-03-13 20:33:09'),(103123,'all',2,'pos','left','@pos',103121,NULL,NULL,101,'/pos/backend/closes.php','','CloseandArching','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103124,'all',2,'pos','left','@pos',103108,NULL,NULL,100,'/pos/backend/terminal/cash.php','','Terminal','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103125,'all',2,'pos','left','@pos',103124,NULL,NULL,100,'/pos/backend/terminal/fiche.php?action=create','','NewCash','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103126,'all',2,'pos','left','@pos',103124,NULL,NULL,101,'/pos/backend/terminal/cash.php','','List','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103127,'all',2,'pos','left','@pos',103123,NULL,NULL,101,'/pos/backend/closes.php?viewstatut=0','','Arqueo','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103128,'all',2,'pos','left','@pos',103123,NULL,NULL,102,'/pos/backend/closes.php?viewstatut=1','','Closes','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103129,'all',2,'pos','left','@pos',103108,NULL,NULL,102,'/pos/backend/transfers.php','','Transfer','main',NULL,NULL,'$user->rights->pos->transfer','1',0,'2013-03-13 20:33:09'),(103130,'all',2,'pos','left','@pos',103108,NULL,NULL,102,'/pos/backend/resultat/index.php','','Rapport','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103131,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/casoc.php','','ReportsCustomer','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103132,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/causer.php','','ReportsUser','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103133,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/sellsjournal.php','','ReportsSells','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys','opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey','opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey','opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List','opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103160,'all',1,'cron','left','home',-1,'modulesadmintools','home',200,'/cron/list.php?status=1','','CronListActive','cron',NULL,NULL,'$user->rights->cron->read','$leftmenu==\'modulesadmintools\'',2,'2013-03-23 17:24:25'),(103161,'all',1,'cron','left','home',-1,'modulesadmintools','home',201,'/cron/list.php?status=0','','CronListInactive','cron',NULL,NULL,'$user->rights->cron->read','$leftmenu==\'modulesadmintools\'',2,'2013-03-23 17:24:25'),(103162,'auguria',1,'','top','home',0,NULL,NULL,1,'/index.php?mainmenu=home&leftmenu=','','Home','',-1,'','','1',2,'2013-03-24 02:31:47'),(103163,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,2,'/societe/index.php?mainmenu=companies&leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->societe->enabled || $conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(103164,'auguria',1,'product|service','top','products',0,NULL,NULL,3,'/product/index.php?mainmenu=products&leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2013-03-24 02:31:47'),(103166,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,5,'/comm/index.php?mainmenu=commercial&leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled',2,'2013-03-24 02:31:47'),(103167,'auguria',1,'comptabilite|accounting|facture|deplacement|don|tax','top','accountancy',0,NULL,NULL,6,'/compta/index.php?mainmenu=accountancy&leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled',2,'2013-03-24 02:31:47'),(103168,'auguria',1,'projet','top','project',0,NULL,NULL,7,'/projet/index.php?mainmenu=project&leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(103169,'auguria',1,'mailing|export|import','top','tools',0,NULL,NULL,8,'/core/tools.php?mainmenu=tools&leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled',2,'2013-03-24 02:31:47'),(103174,'auguria',1,'adherent','top','members',0,NULL,NULL,15,'/adherents/index.php?mainmenu=members&leftmenu=','','Members','members',-1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:47'),(103175,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,6,'/compta/bank/index.php?mainmenu=bank&leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2013-03-24 02:31:47'),(103261,'auguria',1,'','left','home',103162,NULL,NULL,0,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'setup','','$user->admin',2,'2013-03-24 02:31:47'),(103262,'auguria',1,'','left','home',103261,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103263,'auguria',1,'','left','home',103261,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103264,'auguria',1,'','left','home',103261,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103265,'auguria',1,'','left','home',103261,NULL,NULL,5,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103266,'auguria',1,'','left','home',103261,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103267,'auguria',1,'','left','home',103261,NULL,NULL,6,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103268,'auguria',1,'','left','home',103261,NULL,NULL,9,'/admin/pdf.php?leftmenu=setup','','PDF','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103269,'auguria',1,'','left','home',103261,NULL,NULL,7,'/admin/proxy.php?leftmenu=setup','','Security','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103270,'auguria',1,'','left','home',103261,NULL,NULL,10,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103271,'auguria',1,'','left','home',103261,NULL,NULL,8,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103272,'auguria',1,'','left','home',103261,NULL,NULL,12,'/admin/dict.php?leftmenu=setup','','DictionnarySetup','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103273,'auguria',1,'','left','home',103261,NULL,NULL,13,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103274,'auguria',1,'','left','home',103261,NULL,NULL,11,'/admin/sms.php?leftmenu=setup','','Sms','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103362,'auguria',1,'','left','home',103461,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103364,'auguria',1,'','left','home',103461,NULL,NULL,13,'/admin/system/about.php?leftmenu=admintools','','About','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103365,'auguria',1,'','left','home',103461,NULL,NULL,1,'/admin/system/os.php?leftmenu=admintools','','InfoOS','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103366,'auguria',1,'','left','home',103461,NULL,NULL,2,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103367,'auguria',1,'','left','home',103461,NULL,NULL,3,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103368,'auguria',1,'','left','home',103362,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers','admin',2,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103369,'auguria',1,'','left','home',103362,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules','admin',2,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103371,'auguria',1,'','left','home',103461,NULL,NULL,4,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103461,'auguria',1,'','left','home',103162,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','SystemTools','admin',0,'admintools','','$user->admin',2,'2013-03-24 02:31:47'),(103462,'auguria',1,'','left','home',103461,NULL,NULL,5,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103463,'auguria',1,'','left','home',103461,NULL,NULL,6,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103464,'auguria',1,'','left','home',103461,NULL,NULL,11,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103465,'auguria',1,'','left','home',103461,NULL,NULL,8,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','$leftmenu==\'admintools\' && function_exists(\'eaccelerator_info\')',2,'2013-03-24 02:31:47'),(103466,'auguria',1,'','left','home',103461,NULL,NULL,7,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103467,'auguria',1,'','left','home',103461,NULL,NULL,9,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103468,'auguria',1,'','left','home',103461,NULL,NULL,12,'/support/index.php?leftmenu=admintools','_blank','HelpCenter','help',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103469,'auguria',1,'','left','home',103461,NULL,NULL,10,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103561,'auguria',1,'','left','home',103162,NULL,NULL,3,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'users','','1',2,'2013-03-24 02:31:47'),(103562,'auguria',1,'','left','home',103561,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\'users\'',2,'2013-03-24 02:31:47'),(103563,'auguria',1,'','left','home',103562,NULL,NULL,0,'/user/fiche.php?leftmenu=users&action=create','','NewUser','users',2,'','$user->rights->user->user->creer || $user->admin','$leftmenu==\'users\'',2,'2013-03-24 02:31:47'),(103564,'auguria',1,'','left','home',103561,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin','$leftmenu==\'users\'',2,'2013-03-24 02:31:47'),(103565,'auguria',1,'','left','home',103564,NULL,NULL,0,'/user/group/fiche.php?leftmenu=users&action=create','','NewGroup','users',2,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin','$leftmenu==\'users\'',2,'2013-03-24 02:31:47'),(103661,'auguria',1,'','left','companies',103163,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty','companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103662,'auguria',1,'','left','companies',103661,NULL,NULL,0,'/societe/soc.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103664,'auguria',1,'','left','companies',103661,NULL,NULL,5,'/fourn/liste.php?leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(103665,'auguria',1,'','left','companies',103664,NULL,NULL,0,'/societe/soc.php?leftmenu=supplier&action=create&type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(103667,'auguria',1,'','left','companies',103661,NULL,NULL,3,'/comm/prospect/list.php?leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103668,'auguria',1,'','left','companies',103667,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&action=create&type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103670,'auguria',1,'','left','companies',103661,NULL,NULL,4,'/comm/list.php?leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103671,'auguria',1,'','left','companies',103670,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&action=create&type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103761,'auguria',1,'','left','companies',103163,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses','companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103762,'auguria',1,'','left','companies',103761,NULL,NULL,0,'/contact/fiche.php?leftmenu=contacts&action=create','','NewContactAddress','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103763,'auguria',1,'','left','companies',103761,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103765,'auguria',1,'','left','companies',103763,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&type=p','','Prospects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103766,'auguria',1,'','left','companies',103763,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&type=c','','Customers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103767,'auguria',1,'','left','companies',103763,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&type=f','','Suppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(103768,'auguria',1,'','left','companies',103763,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103811,'auguria',1,'','left','companies',103163,NULL,NULL,3,'/categories/index.php?leftmenu=cat&type=1','','SuppliersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2013-03-24 02:31:47'),(103812,'auguria',1,'','left','companies',103811,NULL,NULL,0,'/categories/fiche.php?action=create&type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2013-03-24 02:31:47'),(103821,'auguria',1,'','left','companies',103163,NULL,NULL,4,'/categories/index.php?leftmenu=cat&type=2','','CustomersProspectsCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2013-03-24 02:31:47'),(103822,'auguria',1,'','left','companies',103821,NULL,NULL,0,'/categories/fiche.php?action=create&type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2013-03-24 02:31:47'),(104261,'auguria',1,'','left','commercial',103166,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop','propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(104262,'auguria',1,'','left','commercial',104261,NULL,NULL,0,'/societe/societe.php?leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(104263,'auguria',1,'','left','commercial',104261,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(104264,'auguria',1,'','left','commercial',104263,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&viewstatut=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-03-24 02:31:47'),(104265,'auguria',1,'','left','commercial',104263,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&viewstatut=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-03-24 02:31:47'),(104266,'auguria',1,'','left','commercial',104263,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&viewstatut=2','','PropalStatusSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-03-24 02:31:47'),(104267,'auguria',1,'','left','commercial',104263,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&viewstatut=3','','PropalStatusNotSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-03-24 02:31:47'),(104268,'auguria',1,'','left','commercial',104263,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&viewstatut=4','','PropalStatusBilled','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-03-24 02:31:47'),(104271,'auguria',1,'','left','commercial',104261,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(104361,'auguria',1,'','left','commercial',103166,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2013-03-24 02:31:47'),(104362,'auguria',1,'','left','commercial',104361,NULL,NULL,0,'/societe/societe.php?leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2013-03-24 02:31:47'),(104363,'auguria',1,'','left','commercial',104361,NULL,NULL,1,'/commande/liste.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2013-03-24 02:31:47'),(104364,'auguria',1,'','left','commercial',104363,NULL,NULL,2,'/commande/liste.php?leftmenu=orders&viewstatut=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104365,'auguria',1,'','left','commercial',104363,NULL,NULL,3,'/commande/liste.php?leftmenu=orders&viewstatut=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104366,'auguria',1,'','left','commercial',104363,NULL,NULL,4,'/commande/liste.php?leftmenu=orders&viewstatut=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104367,'auguria',1,'','left','commercial',104363,NULL,NULL,5,'/commande/liste.php?leftmenu=orders&viewstatut=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104368,'auguria',1,'','left','commercial',104363,NULL,NULL,6,'/commande/liste.php?leftmenu=orders&viewstatut=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104369,'auguria',1,'','left','commercial',104363,NULL,NULL,7,'/commande/liste.php?leftmenu=orders&viewstatut=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104370,'auguria',1,'','left','commercial',104361,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2013-03-24 02:31:47'),(104461,'auguria',1,'','left','commercial',103164,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2013-03-24 02:31:47'),(104462,'auguria',1,'','left','commercial',104461,NULL,NULL,0,'/expedition/fiche.php?action=create2&leftmenu=sendings','','NewSending','sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-03-24 02:31:47'),(104463,'auguria',1,'','left','commercial',104461,NULL,NULL,1,'/expedition/liste.php?leftmenu=sendings','','List','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-03-24 02:31:47'),(104464,'auguria',1,'','left','commercial',104461,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-03-24 02:31:47'),(104561,'auguria',1,'','left','commercial',103166,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-03-24 02:31:47'),(104562,'auguria',1,'','left','commercial',104561,NULL,NULL,0,'/societe/societe.php?leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2013-03-24 02:31:47'),(104563,'auguria',1,'','left','commercial',104561,NULL,NULL,1,'/contrat/liste.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-03-24 02:31:47'),(104564,'auguria',1,'','left','commercial',104561,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-03-24 02:31:47'),(104565,'auguria',1,'','left','commercial',104564,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-03-24 02:31:47'),(104566,'auguria',1,'','left','commercial',104564,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-03-24 02:31:47'),(104567,'auguria',1,'','left','commercial',104564,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&mode=4&filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-03-24 02:31:47'),(104568,'auguria',1,'','left','commercial',104564,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-03-24 02:31:47'),(104661,'auguria',1,'','left','commercial',103166,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2013-03-24 02:31:47'),(104662,'auguria',1,'','left','commercial',104661,NULL,NULL,0,'/fichinter/fiche.php?action=create&leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2013-03-24 02:31:47'),(104663,'auguria',1,'','left','commercial',104661,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2013-03-24 02:31:47'),(104761,'auguria',1,'','left','accountancy',103167,NULL,NULL,3,'/fourn/facture/index.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(104762,'auguria',1,'','left','accountancy',104761,NULL,NULL,0,'/fourn/facture/fiche.php?action=create&leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(104763,'auguria',1,'','left','accountancy',104761,NULL,NULL,1,'/fourn/facture/impayees.php?leftmenu=suppliers_bills','','Unpaid','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(104764,'auguria',1,'','left','accountancy',104761,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(104765,'auguria',1,'','left','accountancy',104761,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(104861,'auguria',1,'','left','accountancy',103167,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104862,'auguria',1,'','left','accountancy',104861,NULL,NULL,3,'/compta/clients.php?action=facturer&leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104863,'auguria',1,'','left','accountancy',104861,NULL,NULL,4,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','Repeatable','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104864,'auguria',1,'','left','accountancy',104861,NULL,NULL,5,'/compta/facture/impayees.php?action=facturer&leftmenu=customers_bills','','Unpaid','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104865,'auguria',1,'','left','accountancy',104861,NULL,NULL,6,'/compta/paiement/liste.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104871,'auguria',1,'','left','accountancy',104865,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104872,'auguria',1,'','left','accountancy',103175,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank','','MenuChequeDeposits','bills',0,'checks','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-03-24 02:31:47'),(104873,'auguria',1,'','left','accountancy',104872,NULL,NULL,0,'/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new','','NewCheckDeposit','compta',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-03-24 02:31:47'),(104874,'auguria',1,'','left','accountancy',104872,NULL,NULL,1,'/compta/paiement/cheque/liste.php?leftmenu=checks','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-03-24 02:31:47'),(104875,'auguria',1,'','left','accountancy',104861,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(105061,'auguria',1,'','left','accountancy',103167,NULL,NULL,3,'/commande/liste.php?leftmenu=orders&viewstatut=3','','MenuOrdersToBill','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2013-03-24 02:31:47'),(105161,'auguria',1,'','left','accountancy',103167,NULL,NULL,4,'/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy','','Donations','donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2013-03-24 02:31:47'),(105162,'auguria',1,'','left','accountancy',105161,NULL,NULL,0,'/compta/dons/fiche.php?leftmenu=donations&mainmenu=accountancy&action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2013-03-24 02:31:47'),(105163,'auguria',1,'','left','accountancy',105161,NULL,NULL,1,'/compta/dons/liste.php?leftmenu=donations&mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2013-03-24 02:31:47'),(105261,'auguria',1,'','left','accountancy',103167,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2013-03-24 02:31:47'),(105262,'auguria',1,'','left','accountancy',105261,NULL,NULL,1,'/compta/deplacement/fiche.php?action=create&leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-03-24 02:31:47'),(105263,'auguria',1,'','left','accountancy',105261,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-03-24 02:31:47'),(105264,'auguria',1,'','left','accountancy',105261,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-03-24 02:31:47'),(105361,'auguria',1,'','left','accountancy',103167,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy','','MenuTaxAndDividends','compta',0,'tax','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2013-03-24 02:31:47'),(105362,'auguria',1,'','left','accountancy',105361,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2013-03-24 02:31:47'),(105363,'auguria',1,'','left','accountancy',105362,NULL,NULL,2,'/compta/sociales/charges.php?leftmenu=tax_social&action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2013-03-24 02:31:47'),(105364,'auguria',1,'','left','accountancy',105362,NULL,NULL,3,'/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2013-03-24 02:31:47'),(105461,'auguria',1,'','left','accountancy',105361,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&mainmenu=accountancy','','VAT','companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2013-03-24 02:31:47'),(105462,'auguria',1,'','left','accountancy',105461,NULL,NULL,0,'/compta/tva/fiche.php?leftmenu=tax_vat&action=create','','NewPayment','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-03-24 02:31:47'),(105463,'auguria',1,'','left','accountancy',105461,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','Payments','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-03-24 02:31:47'),(105464,'auguria',1,'','left','accountancy',105461,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-03-24 02:31:47'),(105465,'auguria',1,'','left','accountancy',105461,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-03-24 02:31:47'),(105561,'auguria',1,'','left','accountancy',103167,NULL,NULL,8,'/compta/ventilation/index.php?leftmenu=ventil','','Ventilation','companies',0,'ventil','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105562,'auguria',1,'','left','accountancy',105561,NULL,NULL,0,'/compta/ventilation/liste.php','','ToDispatch','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105563,'auguria',1,'','left','accountancy',105561,NULL,NULL,1,'/compta/ventilation/lignes.php','','Dispatched','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105564,'auguria',1,'','left','accountancy',105561,NULL,NULL,2,'/compta/param/','','Setup','companies',1,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105565,'auguria',1,'','left','accountancy',105564,NULL,NULL,0,'/compta/param/comptes/liste.php','','List','companies',2,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105566,'auguria',1,'','left','accountancy',105564,NULL,NULL,1,'/compta/param/comptes/fiche.php?action=create','','New','companies',2,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105567,'auguria',1,'','left','accountancy',105561,NULL,NULL,3,'/compta/export/','','Export','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105568,'auguria',1,'','left','accountancy',105567,NULL,NULL,0,'/compta/export/index.php','','New','companies',2,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105569,'auguria',1,'','left','accountancy',105567,NULL,NULL,1,'/compta/export/liste.php','','List','companies',2,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105661,'auguria',1,'','left','accountancy',103175,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank','','StandingOrders','withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2013-03-24 02:31:47'),(105663,'auguria',1,'','left','accountancy',105661,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-03-24 02:31:47'),(105664,'auguria',1,'','left','accountancy',105661,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-03-24 02:31:47'),(105665,'auguria',1,'','left','accountancy',105661,NULL,NULL,3,'/compta/prelevement/liste.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-03-24 02:31:47'),(105667,'auguria',1,'','left','accountancy',105661,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-03-24 02:31:47'),(105668,'auguria',1,'','left','accountancy',105661,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-03-24 02:31:47'),(105761,'auguria',1,'','left','accountancy',103175,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&mainmenu=bank','','MenuBankCash','banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2013-03-24 02:31:47'),(105762,'auguria',1,'','left','accountancy',105761,NULL,NULL,0,'/compta/bank/fiche.php?action=create&leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2013-03-24 02:31:47'),(105763,'auguria',1,'','left','accountancy',105761,NULL,NULL,1,'/compta/bank/categ.php?leftmenu=bank','','Rubriques','categories',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2013-03-24 02:31:47'),(105764,'auguria',1,'','left','accountancy',105761,NULL,NULL,2,'/compta/bank/search.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2013-03-24 02:31:47'),(105765,'auguria',1,'','left','accountancy',105761,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2013-03-24 02:31:47'),(105767,'auguria',1,'','left','accountancy',105761,NULL,NULL,5,'/compta/bank/virement.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2013-03-24 02:31:47'),(105861,'auguria',1,'','left','accountancy',103167,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy','','Reportings','main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-03-24 02:31:47'),(105862,'auguria',1,'','left','accountancy',105861,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-03-24 02:31:47'),(105863,'auguria',1,'','left','accountancy',105862,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-03-24 02:31:47'),(105864,'auguria',1,'','left','accountancy',105861,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-03-24 02:31:47'),(105865,'auguria',1,'','left','accountancy',105864,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-03-24 02:31:47'),(105866,'auguria',1,'','left','accountancy',105864,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-03-24 02:31:47'),(105867,'auguria',1,'','left','accountancy',105861,NULL,NULL,1,'/compta/journal/sellsjournal.php?leftmenu=ca','','SellsJournal','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-03-24 02:31:47'),(105868,'auguria',1,'','left','accountancy',105861,NULL,NULL,1,'/compta/journal/purchasesjournal.php?leftmenu=ca','','PurchasesJournal','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-03-24 02:31:47'),(105961,'auguria',1,'','left','products',103164,NULL,NULL,0,'/product/index.php?leftmenu=product&type=0','','Products','products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2013-03-24 02:31:47'),(105962,'auguria',1,'','left','products',105961,NULL,NULL,0,'/product/fiche.php?leftmenu=product&action=create&type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2013-03-24 02:31:47'),(105963,'auguria',1,'','left','products',105961,NULL,NULL,1,'/product/liste.php?leftmenu=product&type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2013-03-24 02:31:47'),(105964,'auguria',1,'','left','products',105961,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2013-03-24 02:31:47'),(105965,'auguria',1,'','left','products',105961,NULL,NULL,5,'/product/popuprop.php?leftmenu=stats&type=0','','Statistics','main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(106061,'auguria',1,'','left','products',103164,NULL,NULL,1,'/product/index.php?leftmenu=service&type=1','','Services','products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2013-03-24 02:31:47'),(106062,'auguria',1,'','left','products',106061,NULL,NULL,0,'/product/fiche.php?leftmenu=service&action=create&type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2013-03-24 02:31:47'),(106063,'auguria',1,'','left','products',106061,NULL,NULL,1,'/product/liste.php?leftmenu=service&type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2013-03-24 02:31:47'),(106064,'auguria',1,'','left','products',106061,NULL,NULL,5,'/product/popuprop.php?leftmenu=stats&type=1','','Statistics','main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(106261,'auguria',1,'','left','products',103164,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-03-24 02:31:47'),(106262,'auguria',1,'','left','products',106261,NULL,NULL,0,'/product/stock/fiche.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2013-03-24 02:31:47'),(106263,'auguria',1,'','left','products',106261,NULL,NULL,1,'/product/stock/liste.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-03-24 02:31:47'),(106264,'auguria',1,'','left','products',106261,NULL,NULL,2,'/product/stock/valo.php','','EnhancedValue','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-03-24 02:31:47'),(106265,'auguria',1,'','left','products',106261,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2013-03-24 02:31:47'),(106361,'auguria',1,'','left','products',103164,NULL,NULL,4,'/categories/index.php?leftmenu=cat&type=0','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2013-03-24 02:31:47'),(106362,'auguria',1,'','left','products',106361,NULL,NULL,0,'/categories/fiche.php?action=create&type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2013-03-24 02:31:47'),(106761,'auguria',1,'','left','project',103168,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106762,'auguria',1,'','left','project',106761,NULL,NULL,1,'/projet/fiche.php?leftmenu=projects&action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106763,'auguria',1,'','left','project',106761,NULL,NULL,2,'/projet/liste.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106771,'auguria',1,'','left','project',103168,NULL,NULL,0,'/projet/index.php?leftmenu=projects&mode=mine','','MyProjects','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106772,'auguria',1,'','left','project',106771,NULL,NULL,1,'/projet/fiche.php?leftmenu=projects&action=create&mode=mine','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106773,'auguria',1,'','left','project',106771,NULL,NULL,2,'/projet/liste.php?leftmenu=projects&mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106861,'auguria',1,'','left','project',103168,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106862,'auguria',1,'','left','project',106861,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106863,'auguria',1,'','left','project',106861,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106864,'auguria',1,'','left','project',106861,NULL,NULL,3,'/projet/activity/list.php?leftmenu=projects','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106961,'auguria',1,'','left','project',103168,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects&mode=mine','','MyActivities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106962,'auguria',1,'','left','project',106961,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&action=create&mode=mine','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106963,'auguria',1,'','left','project',106961,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects&mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106964,'auguria',1,'','left','project',106961,NULL,NULL,3,'/projet/activity/list.php?leftmenu=projects&mode=mine','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(107061,'auguria',1,'','left','tools',103169,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2013-03-24 02:31:47'),(107062,'auguria',1,'','left','tools',107061,NULL,NULL,0,'/comm/mailing/fiche.php?leftmenu=mailing&action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2013-03-24 02:31:47'),(107063,'auguria',1,'','left','tools',107061,NULL,NULL,1,'/comm/mailing/liste.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2013-03-24 02:31:47'),(107261,'auguria',1,'','left','tools',103169,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2013-03-24 02:31:47'),(107262,'auguria',1,'','left','tools',107261,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2013-03-24 02:31:47'),(107291,'auguria',1,'','left','tools',103169,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2013-03-24 02:31:47'),(107292,'auguria',1,'','left','tools',107291,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2013-03-24 02:31:47'),(107361,'auguria',1,'','left','members',103174,NULL,NULL,0,'/adherents/index.php?leftmenu=members&mainmenu=members','','Members','members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107362,'auguria',1,'','left','members',107361,NULL,NULL,0,'/adherents/fiche.php?leftmenu=members&action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107363,'auguria',1,'','left','members',107361,NULL,NULL,1,'/adherents/liste.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107364,'auguria',1,'','left','members',107363,NULL,NULL,2,'/adherents/liste.php?leftmenu=members&statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107365,'auguria',1,'','left','members',107363,NULL,NULL,3,'/adherents/liste.php?leftmenu=members&statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107366,'auguria',1,'','left','members',107363,NULL,NULL,4,'/adherents/liste.php?leftmenu=members&statut=1&filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107367,'auguria',1,'','left','members',107363,NULL,NULL,5,'/adherents/liste.php?leftmenu=members&statut=1&filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107368,'auguria',1,'','left','members',107363,NULL,NULL,6,'/adherents/liste.php?leftmenu=members&statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107369,'auguria',1,'','left','members',107361,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&mode=memberbycountry','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107461,'auguria',1,'','left','members',103174,NULL,NULL,1,'/adherents/index.php?leftmenu=members&mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107462,'auguria',1,'','left','members',107461,NULL,NULL,0,'/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107463,'auguria',1,'','left','members',107461,NULL,NULL,1,'/adherents/cotisations.php?leftmenu=members','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107464,'auguria',1,'','left','members',107461,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107661,'auguria',1,'','left','members',103174,NULL,NULL,3,'/adherents/index.php?leftmenu=export&mainmenu=members','','Exports','members',0,'export','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107662,'auguria',1,'','left','members',107661,NULL,NULL,0,'/exports/index.php?leftmenu=export','','Datas','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled && $conf->export->enabled',2,'2013-03-24 02:31:48'),(107663,'auguria',1,'','left','members',107661,NULL,NULL,1,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107664,'auguria',1,'','left','members',107661,NULL,NULL,2,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107861,'auguria',1,'','left','members',103174,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&mainmenu=members','','MembersTypes','members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107862,'auguria',1,'','left','members',107861,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&mainmenu=members&action=create','','New','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107863,'auguria',1,'','left','members',107861,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&mainmenu=members','','List','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(108261,'auguria',1,'','left','commercial',103166,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(108262,'auguria',1,'','left','commercial',108261,NULL,NULL,0,'/societe/societe.php?leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(108263,'auguria',1,'','left','commercial',108261,NULL,NULL,1,'/fourn/commande/liste.php?leftmenu=orders_suppliers&viewstatut=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(108269,'auguria',1,'','left','commercial',108261,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(108361,'auguria',1,'','left','members',103174,NULL,NULL,3,'/categories/index.php?leftmenu=cat&type=3','','MembersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2013-03-24 02:31:48'),(108362,'auguria',1,'','left','members',108361,NULL,NULL,0,'/categories/fiche.php?action=create&type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2013-03-24 02:31:48'),(108457,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=home&leftmenu=modulesadmintools','','BarCodePrintsheet','products',NULL,'barcodeprint','1','$conf->barcode->enabled',2,'2014-03-02 15:37:26'),(108458,'all',1,'barcode','left','home',-1,'modulesadmintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=modulesadmintools','','MassBarcodeInit','products',NULL,NULL,'1','$conf->barcode->enabled && $leftmenu==\"modulesadmintools\"',0,'2014-03-02 15:37:26'),(108459,'all',1,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2014-12-21 12:51:26'),(108460,'all',1,'agenda','left','agenda',108459,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2014-12-21 12:51:26'),(108461,'all',1,'agenda','left','agenda',108460,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&leftmenu=agenda&action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2014-12-21 12:51:26'),(108462,'all',1,'agenda','left','agenda',108460,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2014-12-21 12:51:26'),(108463,'all',1,'agenda','left','agenda',108462,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2014-12-21 12:51:26'),(108464,'all',1,'agenda','left','agenda',108462,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2014-12-21 12:51:26'),(108465,'all',1,'agenda','left','agenda',108462,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2014-12-21 12:51:26'),(108466,'all',1,'agenda','left','agenda',108462,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2014-12-21 12:51:26'),(108467,'all',1,'agenda','left','agenda',108460,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2014-12-21 12:51:26'),(108468,'all',1,'agenda','left','agenda',108467,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2014-12-21 12:51:26'),(108469,'all',1,'agenda','left','agenda',108467,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2014-12-21 12:51:26'),(108470,'all',1,'agenda','left','agenda',108467,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2014-12-21 12:51:26'),(108471,'all',1,'agenda','left','agenda',108467,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2014-12-21 12:51:26'),(108472,'all',1,'agenda','left','agenda',108460,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2014-12-21 12:51:26'),(108473,'all',1,'ecm','top','ecm',0,NULL,NULL,100,'/ecm/index.php','','MenuECM','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2014-12-21 12:51:28'),(108474,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2014-12-21 12:51:28'),(108475,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2014-12-21 12:51:28'),(108476,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2014-12-21 12:51:28'),(108477,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2014-12-21 19:52:31'),(108478,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2014-12-21 19:52:31'),(108479,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2014-12-21 19:52:31'); +/*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_milestone` +-- + +DROP TABLE IF EXISTS `llx_milestone`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_milestone` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_element` int(11) NOT NULL, + `elementtype` varchar(16) NOT NULL, + `label` varchar(255) NOT NULL, + `options` varchar(255) DEFAULT NULL, + `priority` int(11) DEFAULT '0', + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_user_modif` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_milestone_fk_element` (`fk_element`,`elementtype`), + KEY `idx_milestone_fk_user_modif` (`fk_user_modif`), + CONSTRAINT `fk_milestone_fk_user_modif` FOREIGN KEY (`fk_user_modif`) REFERENCES `llx_user` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_milestone` +-- + +LOCK TABLES `llx_milestone` WRITE; +/*!40000 ALTER TABLE `llx_milestone` DISABLE KEYS */; +INSERT INTO `llx_milestone` VALUES (2,779,'facture','azerty',NULL,0,'2013-03-09 12:19:30',NULL),(3,780,'facture','fsdf',NULL,0,'2013-03-09 13:01:08',NULL),(4,781,'facture','hhh',NULL,0,'2013-03-09 14:06:37',NULL); +/*!40000 ALTER TABLE `llx_milestone` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_monitoring_probes` +-- + +DROP TABLE IF EXISTS `llx_monitoring_probes`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_monitoring_probes` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `title` varchar(64) NOT NULL, + `groupname` varchar(64) DEFAULT NULL, + `url` varchar(250) NOT NULL, + `useproxy` int(11) DEFAULT '0', + `checkkey` varchar(250) DEFAULT NULL, + `maxval` int(11) DEFAULT NULL, + `frequency` int(11) DEFAULT '60', + `active` int(11) DEFAULT '1', + `status` int(11) DEFAULT '0', + `lastreset` datetime DEFAULT NULL, + `oldesterrortext` text, + `oldesterrordate` datetime DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_monitoring_probes` (`title`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_monitoring_probes` +-- + +LOCK TABLES `llx_monitoring_probes` WRITE; +/*!40000 ALTER TABLE `llx_monitoring_probes` DISABLE KEYS */; +INSERT INTO `llx_monitoring_probes` VALUES (1,'aaa',NULL,'http://www.chiensderace.com',0,'chiens',1000,10,1,1,'2011-04-20 23:46:41',NULL,NULL),(2,'ChatsDeRace',NULL,'http://www.chatsderace.com',0,'chats',1000,5,1,1,'2011-04-20 23:46:41',NULL,NULL); +/*!40000 ALTER TABLE `llx_monitoring_probes` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_notify` +-- + +DROP TABLE IF EXISTS `llx_notify`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_notify` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `daten` datetime DEFAULT NULL, + `fk_action` int(11) NOT NULL, + `fk_soc` int(11) DEFAULT NULL, + `fk_contact` int(11) DEFAULT NULL, + `fk_user` int(11) DEFAULT NULL, + `objet_type` varchar(24) NOT NULL, + `objet_id` int(11) NOT NULL, + `email` varchar(255) DEFAULT NULL, + `type` varchar(16) DEFAULT 'email', + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_notify` +-- + +LOCK TABLES `llx_notify` WRITE; +/*!40000 ALTER TABLE `llx_notify` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_notify` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_notify_def` +-- + +DROP TABLE IF EXISTS `llx_notify_def`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_notify_def` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `datec` date DEFAULT NULL, + `fk_action` int(11) NOT NULL, + `fk_soc` int(11) NOT NULL, + `fk_contact` int(11) DEFAULT NULL, + `fk_user` int(11) DEFAULT NULL, + `type` varchar(16) DEFAULT 'email', + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_notify_def` +-- + +LOCK TABLES `llx_notify_def` WRITE; +/*!40000 ALTER TABLE `llx_notify_def` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_notify_def` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_opensurvey_comments` +-- + +DROP TABLE IF EXISTS `llx_opensurvey_comments`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_opensurvey_comments` ( + `id_comment` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_sondage` char(16) NOT NULL, + `comment` text NOT NULL, + `usercomment` text, + PRIMARY KEY (`id_comment`), + KEY `idx_id_comment` (`id_comment`), + KEY `idx_id_sondage` (`id_sondage`) +) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_opensurvey_comments` +-- + +LOCK TABLES `llx_opensurvey_comments` WRITE; +/*!40000 ALTER TABLE `llx_opensurvey_comments` DISABLE KEYS */; +INSERT INTO `llx_opensurvey_comments` VALUES (2,'434dio8rxfljs3p1','aaa','aaa'),(5,'434dio8rxfljs3p1','aaa','aaa'),(6,'434dio8rxfljs3p1','gfh','jj'),(11,'434dio8rxfljs3p1','fsdf','fdsf'),(12,'3imby4hf7joiilsu','fsdf','aa'),(16,'3imby4hf7joiilsu','gdfg','gfdg'),(17,'3imby4hf7joiilsu','gfdgd','gdfgd'),(18,'om4e7azfiurnjtqe','fds','fdsf'),(26,'qgsfrgb922rqzocy','gfdg','gfdg'),(27,'qgsfrgb922rqzocy','gfdg','gfd'),(28,'m4467s2mtk6khmxc','hgf','hgfh'),(29,'m4467s2mtk6khmxc','fgh','hgf'),(30,'ckanvbe7kt3rdb3h','hfgh','fdfds'),(31,'m4467s2mtk6khmxc','hgfh','hgf'); +/*!40000 ALTER TABLE `llx_opensurvey_comments` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_opensurvey_sondage` +-- + +DROP TABLE IF EXISTS `llx_opensurvey_sondage`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_opensurvey_sondage` ( + `id_sondage` varchar(16) NOT NULL, + `id_sondage_admin` char(24) DEFAULT NULL, + `commentaires` text, + `mail_admin` varchar(128) DEFAULT NULL, + `nom_admin` varchar(64) DEFAULT NULL, + `fk_user_creat` int(11) NOT NULL, + `titre` text NOT NULL, + `date_fin` datetime NOT NULL, + `format` varchar(2) NOT NULL, + `mailsonde` tinyint(4) NOT NULL DEFAULT '0', + `survey_link_visible` int(11) DEFAULT '1', + `origin` varchar(64) DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `entity` int(11) NOT NULL DEFAULT '1', + `allow_comments` tinyint(4) NOT NULL DEFAULT '1', + `allow_spy` tinyint(4) NOT NULL DEFAULT '1', + `sujet` text, + PRIMARY KEY (`id_sondage`), + KEY `idx_id_sondage_admin` (`id_sondage_admin`), + KEY `idx_date_fin` (`date_fin`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_opensurvey_sondage` +-- + +LOCK TABLES `llx_opensurvey_sondage` WRITE; +/*!40000 ALTER TABLE `llx_opensurvey_sondage` DISABLE KEYS */; +INSERT INTO `llx_opensurvey_sondage` VALUES ('m4467s2mtk6khmxc','m4467s2mtk6khmxci2ysw682','fdffdshfghfj jhgjgh','aaa@aaa.com','fdfds',0,'fdffds','2013-03-07 00:00:00','D+',1,1,'dolibarr','0000-00-00 00:00:00',1,1,1,NULL); +/*!40000 ALTER TABLE `llx_opensurvey_sondage` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_opensurvey_sujet_studs` +-- + +DROP TABLE IF EXISTS `llx_opensurvey_sujet_studs`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_opensurvey_sujet_studs` ( + `id_sondage` char(16) NOT NULL, + `sujet` text +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_opensurvey_sujet_studs` +-- + +LOCK TABLES `llx_opensurvey_sujet_studs` WRITE; +/*!40000 ALTER TABLE `llx_opensurvey_sujet_studs` DISABLE KEYS */; +INSERT INTO `llx_opensurvey_sujet_studs` VALUES ('434dio8rxfljs3p1','1362697200,1363734000'),('3eyn2drokozf3j4s','1362438000@10h,1363129200@10h'),('z2qcqjh5pm1q4p99','résolution 1,résolution 2,aaa,fdsfsdfsd@checkbox'),('xfwtrseu3ok1c4m6','gdfgfd@yesno,gfdgd@pourcontre,llll@pourcontre'),('om4e7azfiurnjtqe','g dfgdfdfg dfg dg dfg g fdg dfgd fg fg d@pourcontre,mmlml@checkbox'),('fubmr7n293akha5j','check@checkbox,yesno@yesno,pc@pourcontre'),('icaanayi59qto4fl','check@checkbox,yesno@yesno,pc@pourcontre'),('ipbkufzz4lr2vbpx','pc@pourcontre,fdsffd@checkbox'),('3imby4hf7joiilsu','fsdf@yesno,fsdfsd@checkbox,fsdf@pourcontre'),('q41jpgfd4ii3g9vx','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('xm6hysvkspo7gbx6','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('99sbps3ba3s8pq7b','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('6wstlvu2z9kxqweh','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('783p7f377offci4v','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('u4umbl5yb6lpydci','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('dn2euwlf2d4wyy6m','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('t896ed7af3ujdprx','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('q5c4kucbbkuxjz8g','fdsfsd@pourcontre,fdsfs@pourcontre,fdsfsd@pourcontre'),('8mcdnf2hgcntfibe','fdsfsd@pourcontre,fdsfs@pourcontre,fdsfsd@pourcontre'),('7shynoad2x4zl8sw','fdsfsd@pourcontre,fdsfs@pourcontre,fdsfsd@pourcontre'),('x82rfs19p8fa21et','fdsfsd@pourcontre,fdsfs@pourcontre,fdsfsd@pourcontre'),('qgsfrgb922rqzocy','1364338800@20H-21H,1364338800@21H-22H,1364425200@20H-21H,1364425200@21H-22H,1364511600@20H-21H,1364511600@21H-22H'),('ah9xvaqu1ajjrqse','1391295600@2h-5h,1391295600@2h-5h,1364338800@20H-21H,1364338800@21H-22H,1364425200@20H-21H,1391295600@2h-5h'),('ckanvbe7kt3rdb3h','1363734000,1363820400'),('6v9xq6f9lemjiuba','1363734000,1363820400,1363906800,1363993200'),('m4467s2mtk6khmxc','1398981600,1357081200,1363734000,1363820400,1363993200,1398981600'); +/*!40000 ALTER TABLE `llx_opensurvey_sujet_studs` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_opensurvey_user_studs` +-- + +DROP TABLE IF EXISTS `llx_opensurvey_user_studs`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_opensurvey_user_studs` ( + `id_users` int(11) NOT NULL AUTO_INCREMENT, + `nom` varchar(64) NOT NULL, + `id_sondage` varchar(16) NOT NULL, + `reponses` varchar(100) NOT NULL, + PRIMARY KEY (`id_users`), + KEY `idx_id_users` (`id_users`), + KEY `idx_nom` (`nom`), + KEY `idx_id_sondage` (`id_sondage`), + KEY `idx_opensurvey_user_studs_id_users` (`id_users`), + KEY `idx_opensurvey_user_studs_nom` (`nom`), + KEY `idx_opensurvey_user_studs_id_sondage` (`id_sondage`) +) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_opensurvey_user_studs` +-- + +LOCK TABLES `llx_opensurvey_user_studs` WRITE; +/*!40000 ALTER TABLE `llx_opensurvey_user_studs` DISABLE KEYS */; +INSERT INTO `llx_opensurvey_user_studs` VALUES (1,'gfdgdf','om4e7azfiurnjtqe','01'),(2,'aa','3imby4hf7joiilsu','210'),(3,'fsdf','z2qcqjh5pm1q4p99','0110'),(5,'hfghf','z2qcqjh5pm1q4p99','1110'),(6,'qqqq','ah9xvaqu1ajjrqse','000111'),(7,'hjgh','ah9xvaqu1ajjrqse','000010'),(8,'bcvb','qgsfrgb922rqzocy','011000'),(9,'gdfg','ah9xvaqu1ajjrqse','001000'),(10,'ggg','ah9xvaqu1ajjrqse','000100'),(11,'gfdgd','ah9xvaqu1ajjrqse','001000'),(12,'hhhh','ah9xvaqu1ajjrqse','010000'),(13,'iii','ah9xvaqu1ajjrqse','000100'),(14,'kkk','ah9xvaqu1ajjrqse','001000'),(15,'lllll','ah9xvaqu1ajjrqse','000001'),(16,'kk','ah9xvaqu1ajjrqse','000001'),(17,'gggg','ah9xvaqu1ajjrqse','001000'),(18,'mmmm','ah9xvaqu1ajjrqse','000000'),(19,'jkjkj','ah9xvaqu1ajjrqse','000001'),(20,'azerty','8mcdnf2hgcntfibe','012'),(21,'hfghfg','8mcdnf2hgcntfibe','012'),(22,'fd','ckanvbe7kt3rdb3h','10'),(23,'gfdgdf','m4467s2mtk6khmxc','00011'),(24,'hgfh','m4467s2mtk6khmxc','000111'); +/*!40000 ALTER TABLE `llx_opensurvey_user_studs` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_paiement` +-- + +DROP TABLE IF EXISTS `llx_paiement`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_paiement` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `entity` int(11) NOT NULL DEFAULT '1', + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `datep` datetime DEFAULT NULL, + `amount` double(24,8) DEFAULT NULL, + `fk_paiement` int(11) NOT NULL, + `num_paiement` varchar(50) DEFAULT NULL, + `note` text, + `fk_bank` int(11) NOT NULL DEFAULT '0', + `fk_user_creat` int(11) DEFAULT NULL, + `fk_user_modif` int(11) DEFAULT NULL, + `statut` smallint(6) NOT NULL DEFAULT '0', + `fk_export_compta` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_paiement` +-- + +LOCK TABLES `llx_paiement` WRITE; +/*!40000 ALTER TABLE `llx_paiement` DISABLE KEYS */; +INSERT INTO `llx_paiement` VALUES (1,1,'2010-07-10 14:59:41','2010-07-10 12:59:41','2010-07-10 12:00:00',0.02000000,4,'','',4,1,NULL,0,0),(2,1,'2011-07-18 20:50:24','2011-07-18 18:50:24','2011-07-08 12:00:00',20.00000000,6,'','',5,1,NULL,0,0),(3,1,'2011-07-18 20:50:47','2011-07-18 18:50:47','2011-07-08 12:00:00',10.00000000,4,'','',6,1,NULL,0,0),(5,1,'2011-08-01 03:34:11','2011-08-01 01:34:11','2011-08-01 03:34:11',5.63000000,6,'','Payment Invoice FA1108-0003',8,1,NULL,0,0),(6,1,'2011-08-06 20:33:54','2011-08-06 18:33:54','2011-08-06 20:33:53',5.98000000,4,'','Payment Invoice FA1108-0004',13,1,NULL,0,0),(8,1,'2011-08-08 02:53:40','2011-08-08 00:53:40','2011-08-08 12:00:00',26.10000000,4,'','',14,1,NULL,0,0),(9,1,'2011-08-08 02:55:58','2011-08-08 00:55:58','2011-08-08 12:00:00',26.96000000,1,'','',15,1,NULL,0,0),(17,1,'2012-12-09 15:28:44','2012-12-09 14:28:44','2012-12-09 12:00:00',2.00000000,4,'','',16,1,NULL,0,0),(18,1,'2012-12-09 15:28:53','2012-12-09 14:28:53','2012-12-09 12:00:00',-2.00000000,4,'','',17,1,NULL,0,0),(19,1,'2012-12-09 17:35:55','2012-12-09 16:35:55','2012-12-09 12:00:00',-2.00000000,4,'','',18,1,NULL,0,0),(20,1,'2012-12-09 17:37:02','2012-12-09 16:37:02','2012-12-09 12:00:00',2.00000000,4,'','',19,1,NULL,0,0),(21,1,'2012-12-09 18:35:07','2012-12-09 17:35:07','2012-12-09 12:00:00',-2.00000000,4,'','',20,1,NULL,0,0),(23,1,'2012-12-12 18:54:33','2012-12-12 17:54:33','2012-12-12 12:00:00',1.00000000,1,'','',21,1,NULL,0,0),(24,1,'2013-03-06 16:48:16','2013-03-06 15:48:16','2013-03-06 00:00:00',20.00000000,4,'','Adhésion/cotisation 2016',22,1,NULL,0,0),(25,1,'2013-03-20 14:30:11','2013-03-20 13:30:11','2013-03-20 00:00:00',10.00000000,2,'','Adhésion/cotisation 2011',23,1,NULL,0,0),(26,1,'2014-03-02 19:57:58','2014-03-02 18:57:58','2013-07-09 12:00:00',605.00000000,2,'','',24,1,NULL,0,0),(27,1,'2014-03-02 19:59:48','2014-03-02 18:59:48','2013-03-22 12:00:00',30.00000000,4,'','',25,1,NULL,0,0),(29,1,'2014-03-02 20:01:39','2014-03-02 19:01:39','2013-03-19 12:00:00',500.00000000,4,'','',26,1,NULL,0,0),(30,1,'2014-03-02 20:02:06','2014-03-02 19:02:06','2013-03-21 12:00:00',400.00000000,2,'','',27,1,NULL,0,0),(32,1,'2014-03-03 19:22:32','2014-03-03 18:22:32','2013-10-03 12:00:00',-400.00000000,4,'','',28,1,NULL,0,0),(33,1,'2014-03-03 19:23:16','2014-03-03 18:23:16','2013-03-10 12:00:00',-300.00000000,4,'','',29,1,NULL,0,0); +/*!40000 ALTER TABLE `llx_paiement` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_paiement_facture` +-- + +DROP TABLE IF EXISTS `llx_paiement_facture`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_paiement_facture` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_paiement` int(11) DEFAULT NULL, + `fk_facture` int(11) DEFAULT NULL, + `amount` double(24,8) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_paiement_facture` (`fk_paiement`,`fk_facture`), + KEY `idx_paiement_facture_fk_facture` (`fk_facture`), + KEY `idx_paiement_facture_fk_paiement` (`fk_paiement`), + CONSTRAINT `fk_paiement_facture_fk_facture` FOREIGN KEY (`fk_facture`) REFERENCES `llx_facture` (`rowid`), + CONSTRAINT `fk_paiement_facture_fk_paiement` FOREIGN KEY (`fk_paiement`) REFERENCES `llx_paiement` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_paiement_facture` +-- + +LOCK TABLES `llx_paiement_facture` WRITE; +/*!40000 ALTER TABLE `llx_paiement_facture` DISABLE KEYS */; +INSERT INTO `llx_paiement_facture` VALUES (1,1,1,0.02000000),(2,2,2,20.00000000),(3,3,2,10.00000000),(5,5,5,5.63000000),(6,6,6,5.98000000),(9,8,2,16.10000000),(10,8,8,10.00000000),(11,9,3,15.00000000),(12,9,9,11.96000000),(20,17,11,2.00000000),(21,18,12,-2.00000000),(22,19,10,-1.00000000),(23,19,12,-1.00000000),(24,20,9,1.00000000),(25,20,11,1.00000000),(26,21,12,-2.00000000),(28,23,55,1.00000000),(29,24,161,20.00000000),(30,25,210,10.00000000),(31,26,32,600.00000000),(32,26,148,5.00000000),(33,27,152,10.00000000),(34,27,157,20.00000000),(36,29,32,500.00000000),(37,30,32,400.00000000),(39,32,213,-400.00000000),(40,33,213,-300.00000000); +/*!40000 ALTER TABLE `llx_paiement_facture` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_paiementcharge` +-- + +DROP TABLE IF EXISTS `llx_paiementcharge`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_paiementcharge` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_charge` int(11) DEFAULT NULL, + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `datep` datetime DEFAULT NULL, + `amount` double DEFAULT '0', + `fk_typepaiement` int(11) NOT NULL, + `num_paiement` varchar(50) DEFAULT NULL, + `note` text, + `fk_bank` int(11) NOT NULL, + `fk_user_creat` int(11) DEFAULT NULL, + `fk_user_modif` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_paiementcharge` +-- + +LOCK TABLES `llx_paiementcharge` WRITE; +/*!40000 ALTER TABLE `llx_paiementcharge` DISABLE KEYS */; +INSERT INTO `llx_paiementcharge` VALUES (4,4,'2011-08-05 23:11:37','2011-08-05 21:11:37','2011-08-05 12:00:00',10,2,'','',12,1,NULL); +/*!40000 ALTER TABLE `llx_paiementcharge` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_paiementfourn` +-- + +DROP TABLE IF EXISTS `llx_paiementfourn`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_paiementfourn` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `datec` datetime DEFAULT NULL, + `datep` datetime DEFAULT NULL, + `amount` double DEFAULT '0', + `fk_user_author` int(11) DEFAULT NULL, + `fk_paiement` int(11) NOT NULL, + `num_paiement` varchar(50) DEFAULT NULL, + `note` text, + `fk_bank` int(11) NOT NULL, + `statut` smallint(6) NOT NULL DEFAULT '0', + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_paiementfourn` +-- + +LOCK TABLES `llx_paiementfourn` WRITE; +/*!40000 ALTER TABLE `llx_paiementfourn` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_paiementfourn` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_paiementfourn_facturefourn` +-- + +DROP TABLE IF EXISTS `llx_paiementfourn_facturefourn`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_paiementfourn_facturefourn` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_paiementfourn` int(11) DEFAULT NULL, + `fk_facturefourn` int(11) DEFAULT NULL, + `amount` double DEFAULT '0', + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_paiementfourn_facturefourn` (`fk_paiementfourn`,`fk_facturefourn`), + KEY `idx_paiementfourn_facturefourn_fk_facture` (`fk_facturefourn`), + KEY `idx_paiementfourn_facturefourn_fk_paiement` (`fk_paiementfourn`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_paiementfourn_facturefourn` +-- + +LOCK TABLES `llx_paiementfourn_facturefourn` WRITE; +/*!40000 ALTER TABLE `llx_paiementfourn_facturefourn` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_paiementfourn_facturefourn` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_payment_salary` +-- + +DROP TABLE IF EXISTS `llx_payment_salary`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_payment_salary` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_user` int(11) NOT NULL, + `datep` date DEFAULT NULL, + `datev` date DEFAULT NULL, + `amount` double NOT NULL DEFAULT '0', + `fk_typepayment` int(11) NOT NULL, + `num_payment` varchar(50) DEFAULT NULL, + `label` varchar(255) DEFAULT NULL, + `datesp` date DEFAULT NULL, + `dateep` date DEFAULT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `note` text, + `fk_bank` int(11) DEFAULT NULL, + `fk_user_creat` int(11) DEFAULT NULL, + `fk_user_modif` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_payment_salary` +-- + +LOCK TABLES `llx_payment_salary` WRITE; +/*!40000 ALTER TABLE `llx_payment_salary` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_payment_salary` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_pos_cash` +-- + +DROP TABLE IF EXISTS `llx_pos_cash`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_pos_cash` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `entity` int(11) NOT NULL DEFAULT '1', + `code` varchar(3) DEFAULT NULL, + `name` varchar(30) DEFAULT NULL, + `tactil` tinyint(4) NOT NULL DEFAULT '0', + `fk_paycash` int(11) DEFAULT NULL, + `fk_modepaycash` int(11) DEFAULT NULL, + `fk_paybank` int(11) DEFAULT NULL, + `fk_modepaybank` int(11) DEFAULT NULL, + `fk_warehouse` int(11) DEFAULT NULL, + `fk_device` int(11) DEFAULT NULL, + `fk_soc` int(11) DEFAULT NULL, + `is_used` tinyint(4) DEFAULT '0', + `fk_user_u` int(11) DEFAULT NULL, + `fk_user_c` int(11) DEFAULT NULL, + `fk_user_m` int(11) DEFAULT NULL, + `datec` datetime DEFAULT NULL, + `datea` datetime DEFAULT NULL, + `is_closed` tinyint(4) DEFAULT '0', + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_pos_cash` +-- + +LOCK TABLES `llx_pos_cash` WRITE; +/*!40000 ALTER TABLE `llx_pos_cash` DISABLE KEYS */; +INSERT INTO `llx_pos_cash` VALUES (1,1,'aaa','aaa',0,3,1,1,1,1,NULL,1,0,0,1,NULL,'2013-01-19 18:18:39','2013-01-19 18:18:39',0); +/*!40000 ALTER TABLE `llx_pos_cash` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_pos_control_cash` +-- + +DROP TABLE IF EXISTS `llx_pos_control_cash`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_pos_control_cash` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `entity` int(11) NOT NULL DEFAULT '1', + `fk_cash` int(11) DEFAULT NULL, + `fk_user` int(11) DEFAULT NULL, + `date_c` datetime DEFAULT NULL, + `type_control` tinyint(4) DEFAULT '0', + `amount_teor` double(24,8) DEFAULT NULL, + `amount_real` double(24,8) DEFAULT NULL, + `amount_diff` double(24,8) DEFAULT NULL, + `amount_mov_out` double(24,8) DEFAULT NULL, + `amount_mov_int` double(24,8) DEFAULT NULL, + `amount_next_day` double(24,8) DEFAULT NULL, + `comment` text, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_pos_control_cash` +-- + +LOCK TABLES `llx_pos_control_cash` WRITE; +/*!40000 ALTER TABLE `llx_pos_control_cash` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_pos_control_cash` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_pos_facture` +-- + +DROP TABLE IF EXISTS `llx_pos_facture`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_pos_facture` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_cash` int(11) NOT NULL, + `fk_facture` int(11) NOT NULL, + `fk_control_cash` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_pos_facture` +-- + +LOCK TABLES `llx_pos_facture` WRITE; +/*!40000 ALTER TABLE `llx_pos_facture` DISABLE KEYS */; +INSERT INTO `llx_pos_facture` VALUES (1,1,148,NULL),(2,1,149,NULL),(3,1,150,NULL),(4,1,151,NULL); +/*!40000 ALTER TABLE `llx_pos_facture` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_pos_moviments` +-- + +DROP TABLE IF EXISTS `llx_pos_moviments`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_pos_moviments` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `entity` int(11) NOT NULL DEFAULT '1', + `fk_cash` int(11) DEFAULT NULL, + `fk_user` int(11) DEFAULT NULL, + `date_m` datetime DEFAULT NULL, + `amount` double(24,8) DEFAULT NULL, + `type` tinyint(4) DEFAULT NULL, + `comment` text, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_pos_moviments` +-- + +LOCK TABLES `llx_pos_moviments` WRITE; +/*!40000 ALTER TABLE `llx_pos_moviments` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_pos_moviments` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_pos_ticketdet` +-- + +DROP TABLE IF EXISTS `llx_pos_ticketdet`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_pos_ticketdet` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_ticket` int(11) NOT NULL, + `fk_parent_line` int(11) DEFAULT NULL, + `fk_product` int(11) DEFAULT NULL, + `description` text, + `tva_tx` double(6,3) DEFAULT NULL, + `localtax1_tx` double(6,3) DEFAULT '0.000', + `localtax2_tx` double(6,3) DEFAULT '0.000', + `qty` double DEFAULT NULL, + `remise_percent` double DEFAULT '0', + `remise` double DEFAULT '0', + `fk_remise_except` int(11) DEFAULT NULL, + `subprice` double(24,8) DEFAULT NULL, + `price` double(24,8) DEFAULT NULL, + `total_ht` double(24,8) DEFAULT NULL, + `total_tva` double(24,8) DEFAULT NULL, + `total_localtax1` double(24,8) DEFAULT '0.00000000', + `total_localtax2` double(24,8) DEFAULT '0.00000000', + `total_ttc` double(24,8) DEFAULT NULL, + `product_type` int(11) DEFAULT '0', + `date_start` datetime DEFAULT NULL, + `date_end` datetime DEFAULT NULL, + `info_bits` int(11) DEFAULT '0', + `fk_code_ventilation` int(11) NOT NULL DEFAULT '0', + `fk_export_compta` int(11) NOT NULL DEFAULT '0', + `rang` int(11) DEFAULT '0', + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_fk_remise_except` (`fk_remise_except`,`fk_ticket`), + KEY `idx_ticketdet_fk_ticket` (`fk_ticket`), + KEY `idx_ticketdet_fk_product` (`fk_product`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_pos_ticketdet` +-- + +LOCK TABLES `llx_pos_ticketdet` WRITE; +/*!40000 ALTER TABLE `llx_pos_ticketdet` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_pos_ticketdet` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_prelevement_bons` +-- + +DROP TABLE IF EXISTS `llx_prelevement_bons`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_prelevement_bons` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `ref` varchar(12) DEFAULT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `datec` datetime DEFAULT NULL, + `amount` double DEFAULT '0', + `statut` smallint(6) DEFAULT '0', + `credite` smallint(6) DEFAULT '0', + `note` text, + `date_trans` datetime DEFAULT NULL, + `method_trans` smallint(6) DEFAULT NULL, + `fk_user_trans` int(11) DEFAULT NULL, + `date_credit` datetime DEFAULT NULL, + `fk_user_credit` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_prelevement_bons_ref` (`ref`,`entity`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_prelevement_bons` +-- + +LOCK TABLES `llx_prelevement_bons` WRITE; +/*!40000 ALTER TABLE `llx_prelevement_bons` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_prelevement_bons` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_prelevement_facture` +-- + +DROP TABLE IF EXISTS `llx_prelevement_facture`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_prelevement_facture` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_facture` int(11) NOT NULL, + `fk_prelevement_lignes` int(11) NOT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_prelevement_facture_fk_prelevement_lignes` (`fk_prelevement_lignes`), + CONSTRAINT `fk_prelevement_facture_fk_prelevement_lignes` FOREIGN KEY (`fk_prelevement_lignes`) REFERENCES `llx_prelevement_lignes` (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_prelevement_facture` +-- + +LOCK TABLES `llx_prelevement_facture` WRITE; +/*!40000 ALTER TABLE `llx_prelevement_facture` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_prelevement_facture` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_prelevement_facture_demande` +-- + +DROP TABLE IF EXISTS `llx_prelevement_facture_demande`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_prelevement_facture_demande` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_facture` int(11) NOT NULL, + `amount` double NOT NULL, + `date_demande` datetime NOT NULL, + `traite` smallint(6) DEFAULT '0', + `date_traite` datetime DEFAULT NULL, + `fk_prelevement_bons` int(11) DEFAULT NULL, + `fk_user_demande` int(11) NOT NULL, + `code_banque` varchar(7) DEFAULT NULL, + `code_guichet` varchar(6) DEFAULT NULL, + `number` varchar(255) DEFAULT NULL, + `cle_rib` varchar(5) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_prelevement_facture_demande` +-- + +LOCK TABLES `llx_prelevement_facture_demande` WRITE; +/*!40000 ALTER TABLE `llx_prelevement_facture_demande` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_prelevement_facture_demande` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_prelevement_lignes` +-- + +DROP TABLE IF EXISTS `llx_prelevement_lignes`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_prelevement_lignes` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_prelevement_bons` int(11) DEFAULT NULL, + `fk_soc` int(11) NOT NULL, + `statut` smallint(6) DEFAULT '0', + `client_nom` varchar(255) DEFAULT NULL, + `amount` double DEFAULT '0', + `code_banque` varchar(7) DEFAULT NULL, + `code_guichet` varchar(6) DEFAULT NULL, + `number` varchar(255) DEFAULT NULL, + `cle_rib` varchar(5) DEFAULT NULL, + `note` text, + PRIMARY KEY (`rowid`), + KEY `idx_prelevement_lignes_fk_prelevement_bons` (`fk_prelevement_bons`), + CONSTRAINT `fk_prelevement_lignes_fk_prelevement_bons` FOREIGN KEY (`fk_prelevement_bons`) REFERENCES `llx_prelevement_bons` (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_prelevement_lignes` +-- + +LOCK TABLES `llx_prelevement_lignes` WRITE; +/*!40000 ALTER TABLE `llx_prelevement_lignes` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_prelevement_lignes` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_prelevement_rejet` +-- + +DROP TABLE IF EXISTS `llx_prelevement_rejet`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_prelevement_rejet` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_prelevement_lignes` int(11) DEFAULT NULL, + `date_rejet` datetime DEFAULT NULL, + `motif` int(11) DEFAULT NULL, + `date_creation` datetime DEFAULT NULL, + `fk_user_creation` int(11) DEFAULT NULL, + `note` text, + `afacturer` tinyint(4) DEFAULT '0', + `fk_facture` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_prelevement_rejet` +-- + +LOCK TABLES `llx_prelevement_rejet` WRITE; +/*!40000 ALTER TABLE `llx_prelevement_rejet` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_prelevement_rejet` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_printer_ipp` +-- + +DROP TABLE IF EXISTS `llx_printer_ipp`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_printer_ipp` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `datec` datetime DEFAULT NULL, + `printer_name` text NOT NULL, + `printer_location` text NOT NULL, + `printer_uri` varchar(256) NOT NULL, + `copy` int(11) NOT NULL DEFAULT '1', + `module` varchar(16) NOT NULL, + `login` varchar(32) NOT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_printer_ipp` +-- + +LOCK TABLES `llx_printer_ipp` WRITE; +/*!40000 ALTER TABLE `llx_printer_ipp` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_printer_ipp` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product` +-- + +DROP TABLE IF EXISTS `llx_product`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `virtual` tinyint(4) NOT NULL DEFAULT '0', + `fk_parent` int(11) DEFAULT '0', + `ref` varchar(128) NOT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `ref_ext` varchar(128) DEFAULT NULL, + `label` varchar(255) NOT NULL, + `description` text, + `note` text, + `customcode` varchar(32) DEFAULT NULL, + `fk_country` int(11) DEFAULT NULL, + `price` double(24,8) DEFAULT '0.00000000', + `price_ttc` double(24,8) DEFAULT '0.00000000', + `price_min` double(24,8) DEFAULT '0.00000000', + `price_min_ttc` double(24,8) DEFAULT '0.00000000', + `price_base_type` varchar(3) DEFAULT 'HT', + `tva_tx` double(6,3) DEFAULT NULL, + `recuperableonly` int(11) NOT NULL DEFAULT '0', + `localtax1_tx` double(6,3) DEFAULT '0.000', + `localtax2_tx` double(6,3) DEFAULT '0.000', + `fk_user_author` int(11) DEFAULT NULL, + `fk_user_modif` int(11) DEFAULT NULL, + `tosell` tinyint(4) DEFAULT '1', + `tobuy` tinyint(4) DEFAULT '1', + `tobatch` tinyint(4) NOT NULL DEFAULT '0', + `fk_product_type` int(11) DEFAULT '0', + `duration` varchar(6) DEFAULT NULL, + `seuil_stock_alerte` int(11) DEFAULT '0', + `url` varchar(255) DEFAULT NULL, + `barcode` varchar(255) DEFAULT NULL, + `fk_barcode_type` int(11) DEFAULT NULL, + `accountancy_code_sell` varchar(32) DEFAULT NULL, + `accountancy_code_buy` varchar(32) DEFAULT NULL, + `partnumber` varchar(32) DEFAULT NULL, + `weight` float DEFAULT NULL, + `weight_units` tinyint(4) DEFAULT NULL, + `length` float DEFAULT NULL, + `length_units` tinyint(4) DEFAULT NULL, + `surface` float DEFAULT NULL, + `surface_units` tinyint(4) DEFAULT NULL, + `volume` float DEFAULT NULL, + `volume_units` tinyint(4) DEFAULT NULL, + `stock` int(11) DEFAULT NULL, + `pmp` double(24,8) NOT NULL DEFAULT '0.00000000', + `canvas` varchar(32) DEFAULT 'default@product', + `finished` tinyint(4) DEFAULT NULL, + `hidden` tinyint(4) DEFAULT '0', + `import_key` varchar(14) DEFAULT NULL, + `desiredstock` int(11) DEFAULT '0', + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_product_ref` (`ref`,`entity`), + UNIQUE KEY `uk_product_barcode` (`barcode`,`fk_barcode_type`,`entity`), + KEY `idx_product_label` (`label`), + KEY `idx_product_barcode` (`barcode`), + KEY `idx_product_import_key` (`import_key`), + KEY `idx_product_fk_country` (`fk_country`), + KEY `idx_product_fk_user_author` (`fk_user_author`), + KEY `idx_product_fk_barcode_type` (`fk_barcode_type`), + CONSTRAINT `fk_product_fk_country` FOREIGN KEY (`fk_country`) REFERENCES `llx_c_country` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product` +-- + +LOCK TABLES `llx_product` WRITE; +/*!40000 ALTER TABLE `llx_product` DISABLE KEYS */; +INSERT INTO `llx_product` VALUES (1,'2010-07-08 14:33:17','2014-12-21 12:51:04',0,0,'PIDRESS',1,NULL,'Pink dress','A beatifull pink dress','',NULL,NULL,100.00000000,112.50000000,90.00000000,101.25000000,'HT',12.500,0,0.000,0.000,1,NULL,1,1,0,0,'',20,NULL,NULL,NULL,'','',NULL,100,0,NULL,0,NULL,0,NULL,0,2,0.00000000,NULL,1,0,NULL,0),(2,'2010-07-09 00:30:01','2014-12-21 12:51:04',0,0,'Product_P1',1,NULL,'Product P1','','','',32,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,NULL,1,1,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,0,0,NULL,0),(3,'2010-07-09 00:30:25','2014-12-21 12:51:04',0,0,'Service_S1',1,NULL,'Service S1','','',NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,NULL,1,1,0,1,'1m',NULL,NULL,NULL,NULL,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,0,0,NULL,0),(4,'2010-07-10 14:44:06','2014-12-21 12:51:04',0,0,'DECAP',1,NULL,'Decapsuleur','','',NULL,NULL,5.00000000,5.62500000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,NULL,1,1,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,2,-3,NULL,0,NULL,0,NULL,0,1001,10.00000000,NULL,1,0,NULL,0),(5,'2011-07-20 23:11:38','2014-12-21 12:51:04',0,0,'aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,NULL,1,1,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(6,'2011-07-29 22:16:44','2014-12-21 12:51:04',0,0,'Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,NULL,0,1,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(7,'2011-07-29 22:31:21','2014-12-21 12:51:04',0,0,'Copy_of_Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,NULL,0,0,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(8,'2011-07-29 22:46:54','2014-12-21 12:51:04',0,0,'Copy_of_Copy_of_Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,NULL,0,0,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(10,'2008-12-31 00:00:00','2014-12-21 12:51:04',0,0,'PR123456',1,NULL,'My product','This is a description example for record','Some note',NULL,NULL,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,0.000,NULL,NULL,0,0,0,0,'1y',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,0,'20110729232310',0),(11,'2013-01-13 20:24:42','2014-12-21 12:51:04',0,0,'gh',1,NULL,'hfghf','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,0.000,1,NULL,1,1,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,-1,0.00000000,'',1,0,NULL,0); +/*!40000 ALTER TABLE `llx_product` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_association` +-- + +DROP TABLE IF EXISTS `llx_product_association`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_association` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_product_pere` int(11) NOT NULL DEFAULT '0', + `fk_product_fils` int(11) NOT NULL DEFAULT '0', + `qty` double DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_product_association` (`fk_product_pere`,`fk_product_fils`), + KEY `idx_product_association` (`fk_product_fils`), + KEY `idx_product_association_fils` (`fk_product_fils`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_association` +-- + +LOCK TABLES `llx_product_association` WRITE; +/*!40000 ALTER TABLE `llx_product_association` DISABLE KEYS */; +INSERT INTO `llx_product_association` VALUES (1,4,1,2),(2,5,1,1); +/*!40000 ALTER TABLE `llx_product_association` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_batch` +-- + +DROP TABLE IF EXISTS `llx_product_batch`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_batch` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_product_stock` int(11) NOT NULL, + `eatby` datetime DEFAULT NULL, + `sellby` datetime DEFAULT NULL, + `batch` varchar(30) DEFAULT NULL, + `qty` double NOT NULL DEFAULT '0', + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_fk_product_stock` (`fk_product_stock`), + KEY `ix_fk_product_stock` (`fk_product_stock`), + CONSTRAINT `fk_product_batch_fk_product_stock` FOREIGN KEY (`fk_product_stock`) REFERENCES `llx_product_stock` (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_batch` +-- + +LOCK TABLES `llx_product_batch` WRITE; +/*!40000 ALTER TABLE `llx_product_batch` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_product_batch` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_customer_price` +-- + +DROP TABLE IF EXISTS `llx_product_customer_price`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_customer_price` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `entity` int(11) NOT NULL DEFAULT '1', + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_product` int(11) NOT NULL, + `fk_soc` int(11) NOT NULL, + `price` double(24,8) DEFAULT '0.00000000', + `price_ttc` double(24,8) DEFAULT '0.00000000', + `price_min` double(24,8) DEFAULT '0.00000000', + `price_min_ttc` double(24,8) DEFAULT '0.00000000', + `price_base_type` varchar(3) DEFAULT 'HT', + `tva_tx` double(6,3) DEFAULT NULL, + `recuperableonly` int(11) NOT NULL DEFAULT '0', + `localtax1_tx` double(6,3) DEFAULT '0.000', + `localtax2_tx` double(6,3) DEFAULT '0.000', + `fk_user` int(11) DEFAULT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_customer_price_fk_product_fk_soc` (`fk_product`,`fk_soc`), + KEY `idx_product_customer_price_fk_user` (`fk_user`), + KEY `fk_customer_price_fk_soc` (`fk_soc`), + KEY `idx_product_customer_price_fk_soc` (`fk_soc`), + CONSTRAINT `fk_customer_price_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`) ON DELETE CASCADE, + CONSTRAINT `fk_customer_price_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`) ON DELETE CASCADE, + CONSTRAINT `fk_product_customer_price_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_customer_price` +-- + +LOCK TABLES `llx_product_customer_price` WRITE; +/*!40000 ALTER TABLE `llx_product_customer_price` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_product_customer_price` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_customer_price_log` +-- + +DROP TABLE IF EXISTS `llx_product_customer_price_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_customer_price_log` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `entity` int(11) NOT NULL DEFAULT '1', + `datec` datetime DEFAULT NULL, + `fk_product` int(11) NOT NULL, + `fk_soc` int(11) NOT NULL, + `price` double(24,8) DEFAULT '0.00000000', + `price_ttc` double(24,8) DEFAULT '0.00000000', + `price_min` double(24,8) DEFAULT '0.00000000', + `price_min_ttc` double(24,8) DEFAULT '0.00000000', + `price_base_type` varchar(3) DEFAULT 'HT', + `tva_tx` double(6,3) DEFAULT NULL, + `recuperableonly` int(11) NOT NULL DEFAULT '0', + `localtax1_tx` double(6,3) DEFAULT '0.000', + `localtax2_tx` double(6,3) DEFAULT '0.000', + `fk_user` int(11) DEFAULT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_customer_price_log` +-- + +LOCK TABLES `llx_product_customer_price_log` WRITE; +/*!40000 ALTER TABLE `llx_product_customer_price_log` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_product_customer_price_log` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_extrafields` +-- + +DROP TABLE IF EXISTS `llx_product_extrafields`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_extrafields` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_object` int(11) NOT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_product_extrafields` (`fk_object`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_extrafields` +-- + +LOCK TABLES `llx_product_extrafields` WRITE; +/*!40000 ALTER TABLE `llx_product_extrafields` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_product_extrafields` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_fournisseur_price` +-- + +DROP TABLE IF EXISTS `llx_product_fournisseur_price`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_fournisseur_price` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_product` int(11) DEFAULT NULL, + `fk_soc` int(11) DEFAULT NULL, + `ref_fourn` varchar(30) DEFAULT NULL, + `fk_availability` int(11) DEFAULT NULL, + `price` double(24,8) DEFAULT '0.00000000', + `quantity` double DEFAULT NULL, + `remise_percent` double NOT NULL DEFAULT '0', + `remise` double NOT NULL DEFAULT '0', + `unitprice` double(24,8) DEFAULT '0.00000000', + `charges` double(24,8) DEFAULT '0.00000000', + `unitcharges` double(24,8) DEFAULT '0.00000000', + `tva_tx` double(6,3) NOT NULL DEFAULT '0.000', + `info_bits` int(11) NOT NULL DEFAULT '0', + `fk_user` int(11) DEFAULT NULL, + `import_key` varchar(14) DEFAULT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_product_fournisseur_price_ref` (`ref_fourn`,`fk_soc`,`quantity`,`entity`), + KEY `idx_product_fournisseur_price_fk_user` (`fk_user`), + KEY `idx_product_fourn_price_fk_product` (`fk_product`,`entity`), + KEY `idx_product_fourn_price_fk_soc` (`fk_soc`,`entity`), + CONSTRAINT `fk_product_fournisseur_price_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`), + CONSTRAINT `fk_product_fournisseur_price_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_fournisseur_price` +-- + +LOCK TABLES `llx_product_fournisseur_price` WRITE; +/*!40000 ALTER TABLE `llx_product_fournisseur_price` DISABLE KEYS */; +INSERT INTO `llx_product_fournisseur_price` VALUES (1,'2010-07-11 18:45:42','2012-12-08 13:11:08',4,1,'ABCD',NULL,10.00000000,1,0,0,10.00000000,0.00000000,0.00000000,0.000,0,1,NULL,1); +/*!40000 ALTER TABLE `llx_product_fournisseur_price` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_fournisseur_price_log` +-- + +DROP TABLE IF EXISTS `llx_product_fournisseur_price_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_fournisseur_price_log` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `datec` datetime DEFAULT NULL, + `fk_product_fournisseur` int(11) NOT NULL, + `price` double(24,8) DEFAULT '0.00000000', + `quantity` double DEFAULT NULL, + `fk_user` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_fournisseur_price_log` +-- + +LOCK TABLES `llx_product_fournisseur_price_log` WRITE; +/*!40000 ALTER TABLE `llx_product_fournisseur_price_log` DISABLE KEYS */; +INSERT INTO `llx_product_fournisseur_price_log` VALUES (1,'2010-07-11 18:45:42',1,10.00000000,1,1); +/*!40000 ALTER TABLE `llx_product_fournisseur_price_log` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_lang` +-- + +DROP TABLE IF EXISTS `llx_product_lang`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_lang` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_product` int(11) NOT NULL DEFAULT '0', + `lang` varchar(5) NOT NULL DEFAULT '0', + `label` varchar(255) NOT NULL, + `description` text, + `note` text, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_product_lang` (`fk_product`,`lang`), + CONSTRAINT `fk_product_lang_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_lang` +-- + +LOCK TABLES `llx_product_lang` WRITE; +/*!40000 ALTER TABLE `llx_product_lang` DISABLE KEYS */; +INSERT INTO `llx_product_lang` VALUES (1,1,'en_US','Pink dress','A beatifull pink dress',''),(2,2,'en_US','Product P1','',''),(3,3,'en_US','Service S1','',''),(4,4,'fr_FR','Decapsuleur','',''),(5,5,'en_US','aaaa','cccc','bbbb'),(6,6,'en_US','aaaa','cccc','bbbb'),(7,7,'en_US','aaaa','cccc','bbbb'),(8,8,'en_US','aaaa','cccc','bbbb'),(9,11,'fr_FR','hfghf','',''),(10,2,'fr_FR','Product P1','',''); +/*!40000 ALTER TABLE `llx_product_lang` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_price` +-- + +DROP TABLE IF EXISTS `llx_product_price`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_price` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `entity` int(11) NOT NULL DEFAULT '1', + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_product` int(11) NOT NULL, + `date_price` datetime NOT NULL, + `price_level` smallint(6) DEFAULT '1', + `price` double(24,8) DEFAULT NULL, + `price_ttc` double(24,8) DEFAULT NULL, + `price_min` double(24,8) DEFAULT NULL, + `price_min_ttc` double(24,8) DEFAULT NULL, + `price_base_type` varchar(3) DEFAULT 'HT', + `tva_tx` double(6,3) NOT NULL, + `recuperableonly` int(11) NOT NULL DEFAULT '0', + `localtax1_tx` double(6,3) DEFAULT '0.000', + `localtax2_tx` double(6,3) DEFAULT '0.000', + `fk_user_author` int(11) DEFAULT NULL, + `tosell` tinyint(4) DEFAULT '1', + `price_by_qty` int(11) NOT NULL DEFAULT '0', + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_product_price_fk_user_author` (`fk_user_author`), + KEY `idx_product_price_fk_product` (`fk_product`), + CONSTRAINT `fk_product_price_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`), + CONSTRAINT `fk_product_price_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_price` +-- + +LOCK TABLES `llx_product_price` WRITE; +/*!40000 ALTER TABLE `llx_product_price` DISABLE KEYS */; +INSERT INTO `llx_product_price` VALUES (1,1,'2010-07-08 12:33:17',1,'2010-07-08 14:33:17',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL),(2,1,'2010-07-08 22:30:01',2,'2010-07-09 00:30:01',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL),(3,1,'2010-07-08 22:30:25',3,'2010-07-09 00:30:25',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL),(4,1,'2010-07-10 12:44:06',4,'2010-07-10 14:44:06',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL),(5,1,'2011-07-20 21:11:38',5,'2011-07-20 23:11:38',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,1,0,NULL),(6,1,'2011-07-27 17:02:59',5,'2011-07-27 19:02:59',1,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,1,0,NULL),(7,1,'2011-07-29 20:16:44',6,'2011-07-29 22:16:44',1,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,NULL),(8,1,'2011-07-29 20:31:21',7,'2011-07-29 22:31:21',1,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,NULL),(9,1,'2011-07-29 20:46:54',8,'2011-07-29 22:46:54',1,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,NULL),(10,1,'2011-07-31 22:34:27',4,'2011-08-01 00:34:27',1,5.00000000,5.62500000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL),(12,1,'2013-01-13 19:24:59',11,'2013-01-13 20:24:59',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,0.000,1,1,0,NULL),(13,1,'2013-03-12 09:30:24',1,'2013-03-12 10:30:24',1,100.00000000,112.50000000,90.00000000,101.25000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL); +/*!40000 ALTER TABLE `llx_product_price` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_price_by_qty` +-- + +DROP TABLE IF EXISTS `llx_product_price_by_qty`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_price_by_qty` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_product_price` int(11) NOT NULL, + `date_price` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `price` double(24,8) DEFAULT '0.00000000', + `price_ttc` double(24,8) DEFAULT '0.00000000', + `remise_percent` double NOT NULL DEFAULT '0', + `remise` double NOT NULL DEFAULT '0', + `qty_min` double DEFAULT '0', + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_product_price_by_qty_level` (`fk_product_price`,`qty_min`), + KEY `idx_product_price_by_qty_fk_product_price` (`fk_product_price`), + CONSTRAINT `fk_product_price_by_qty_fk_product_price` FOREIGN KEY (`fk_product_price`) REFERENCES `llx_product_price` (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_price_by_qty` +-- + +LOCK TABLES `llx_product_price_by_qty` WRITE; +/*!40000 ALTER TABLE `llx_product_price_by_qty` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_product_price_by_qty` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_stock` +-- + +DROP TABLE IF EXISTS `llx_product_stock`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_stock` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_product` int(11) NOT NULL, + `fk_entrepot` int(11) NOT NULL, + `reel` double DEFAULT NULL, + `pmp` double(24,8) NOT NULL DEFAULT '0.00000000', + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_product_stock` (`fk_product`,`fk_entrepot`), + KEY `idx_product_stock_fk_product` (`fk_product`), + KEY `idx_product_stock_fk_entrepot` (`fk_entrepot`) +) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_stock` +-- + +LOCK TABLES `llx_product_stock` WRITE; +/*!40000 ALTER TABLE `llx_product_stock` DISABLE KEYS */; +INSERT INTO `llx_product_stock` VALUES (1,'2010-07-08 22:43:51',2,2,1000,0.00000000,NULL),(3,'2010-07-10 23:02:20',4,2,1000,0.00000000,NULL),(4,'2013-01-19 17:22:48',4,1,1,10.00000000,NULL),(5,'2013-01-19 17:22:48',1,1,2,0.00000000,NULL),(6,'2013-01-19 17:22:48',11,1,-1,0.00000000,NULL),(7,'2013-01-19 17:31:58',2,1,-2,0.00000000,NULL); +/*!40000 ALTER TABLE `llx_product_stock` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_product_subproduct` +-- + +DROP TABLE IF EXISTS `llx_product_subproduct`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_product_subproduct` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_product` int(11) NOT NULL, + `fk_product_subproduct` int(11) NOT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `fk_product` (`fk_product`,`fk_product_subproduct`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_product_subproduct` +-- + +LOCK TABLES `llx_product_subproduct` WRITE; +/*!40000 ALTER TABLE `llx_product_subproduct` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_product_subproduct` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_projet` +-- + +DROP TABLE IF EXISTS `llx_projet`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_projet` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_soc` int(11) DEFAULT NULL, + `datec` date DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `dateo` date DEFAULT NULL, + `datee` date DEFAULT NULL, + `ref` varchar(50) DEFAULT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `title` varchar(255) NOT NULL, + `description` text, + `fk_user_creat` int(11) NOT NULL, + `public` int(11) DEFAULT NULL, + `fk_statut` smallint(6) NOT NULL DEFAULT '0', + `note_private` text, + `note_public` text, + `model_pdf` varchar(255) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_projet_ref` (`ref`,`entity`), + KEY `idx_projet_fk_soc` (`fk_soc`), + CONSTRAINT `fk_projet_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_projet` +-- + +LOCK TABLES `llx_projet` WRITE; +/*!40000 ALTER TABLE `llx_projet` DISABLE KEYS */; +INSERT INTO `llx_projet` VALUES (1,NULL,'2010-07-09','2014-12-21 13:17:58','2010-07-09',NULL,'PROJ1',1,'Project One','',1,0,1,NULL,'gdfgdfg','baleine'),(2,NULL,'2010-07-09','2010-07-08 22:49:56','2010-07-09',NULL,'PROJ2',1,'Project Two','',1,0,0,NULL,NULL,NULL),(3,1,'2010-07-09','2010-07-08 22:50:19','2010-07-09',NULL,'PROJABC',1,'Project to create ABC company','',1,0,0,NULL,NULL,NULL),(4,NULL,'2010-07-09','2010-07-08 22:50:49','2010-07-09',NULL,'PROJSHARED',1,'The Global project','',1,1,1,NULL,NULL,NULL),(5,NULL,'2010-07-11','2010-07-11 14:22:49','2010-07-11','2011-07-14','RMLL',1,'Projet gestion RMLL 2011','',1,1,1,NULL,NULL,NULL); +/*!40000 ALTER TABLE `llx_projet` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_projet_extrafields` +-- + +DROP TABLE IF EXISTS `llx_projet_extrafields`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_projet_extrafields` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_object` int(11) NOT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_projet_extrafields` (`fk_object`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_projet_extrafields` +-- + +LOCK TABLES `llx_projet_extrafields` WRITE; +/*!40000 ALTER TABLE `llx_projet_extrafields` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_projet_extrafields` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_projet_task` +-- + +DROP TABLE IF EXISTS `llx_projet_task`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_projet_task` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `ref` varchar(50) DEFAULT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `fk_projet` int(11) NOT NULL, + `fk_task_parent` int(11) NOT NULL DEFAULT '0', + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `dateo` datetime DEFAULT NULL, + `datee` datetime DEFAULT NULL, + `datev` datetime DEFAULT NULL, + `label` varchar(255) NOT NULL, + `description` text, + `duration_effective` double NOT NULL DEFAULT '0', + `planned_workload` double NOT NULL DEFAULT '0', + `progress` int(11) DEFAULT '0', + `priority` int(11) DEFAULT '0', + `fk_user_creat` int(11) DEFAULT NULL, + `fk_user_valid` int(11) DEFAULT NULL, + `fk_statut` smallint(6) NOT NULL DEFAULT '0', + `note_private` text, + `note_public` text, + `rang` int(11) DEFAULT '0', + `model_pdf` varchar(255) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_projet_task_fk_projet` (`fk_projet`), + KEY `idx_projet_task_fk_user_creat` (`fk_user_creat`), + KEY `idx_projet_task_fk_user_valid` (`fk_user_valid`), + CONSTRAINT `fk_projet_task_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`), + CONSTRAINT `fk_projet_task_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`), + CONSTRAINT `fk_projet_task_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_projet_task` +-- + +LOCK TABLES `llx_projet_task` WRITE; +/*!40000 ALTER TABLE `llx_projet_task` DISABLE KEYS */; +INSERT INTO `llx_projet_task` VALUES (1,'1',1,1,0,'2010-07-11 15:15:55','2013-09-08 23:06:14','2010-07-11 12:00:00',NULL,NULL,'Work on module','',25920000,0,0,0,1,NULL,0,NULL,NULL,0,NULL),(2,'2',1,5,0,'2010-07-11 16:23:53','2013-09-08 23:06:14','2010-07-11 12:00:00','2011-07-14 12:00:00',NULL,'Heberger site RMLL','',0,0,0,0,1,NULL,0,NULL,NULL,0,NULL),(3,'TK1007-0001',1,1,0,'2014-12-21 13:52:41','2014-12-21 13:55:08','2014-12-21 13:52:00',NULL,NULL,'azerty','',9000,36000,0,0,1,NULL,0,NULL,'gdfgdfgdf',0,NULL),(4,'TK1007-0002',1,1,0,'2014-12-21 13:55:39','2014-12-21 13:22:35','2014-12-21 13:55:00',NULL,NULL,'gdfgdfgfd','',7200,18000,25,0,1,NULL,0,NULL,NULL,0,NULL),(5,'TK1007-0003',1,1,0,'2014-12-21 14:16:58','2014-12-21 13:16:58','2014-12-21 14:16:00',NULL,NULL,'mmmm','',0,0,0,0,1,NULL,0,NULL,NULL,0,NULL); +/*!40000 ALTER TABLE `llx_projet_task` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_projet_task_extrafields` +-- + +DROP TABLE IF EXISTS `llx_projet_task_extrafields`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_projet_task_extrafields` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_object` int(11) NOT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_projet_task_extrafields` (`fk_object`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_projet_task_extrafields` +-- + +LOCK TABLES `llx_projet_task_extrafields` WRITE; +/*!40000 ALTER TABLE `llx_projet_task_extrafields` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_projet_task_extrafields` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_projet_task_time` +-- + +DROP TABLE IF EXISTS `llx_projet_task_time`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_projet_task_time` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_task` int(11) NOT NULL, + `task_date` date DEFAULT NULL, + `task_datehour` datetime DEFAULT NULL, + `task_duration` double DEFAULT NULL, + `fk_user` int(11) DEFAULT NULL, + `thm` double(24,8) DEFAULT NULL, + `note` text, + PRIMARY KEY (`rowid`), + KEY `idx_projet_task_time_task` (`fk_task`), + KEY `idx_projet_task_time_date` (`task_date`), + KEY `idx_projet_task_time_datehour` (`task_datehour`) +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_projet_task_time` +-- + +LOCK TABLES `llx_projet_task_time` WRITE; +/*!40000 ALTER TABLE `llx_projet_task_time` DISABLE KEYS */; +INSERT INTO `llx_projet_task_time` VALUES (1,1,'2010-07-11',NULL,25920000,1,NULL,''),(2,4,'2014-12-21','2014-12-21 12:00:00',3600,1,NULL,''),(3,4,'2014-12-18','2014-12-18 12:00:00',3600,1,NULL,NULL),(4,3,'2014-12-21','2014-12-21 12:00:00',3600,1,NULL,NULL),(5,3,'2014-12-21','2014-12-21 12:00:00',1800,1,NULL,NULL),(6,3,'2014-12-21','2014-12-21 12:00:00',3600,1,NULL,NULL); +/*!40000 ALTER TABLE `llx_projet_task_time` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_propal` +-- + +DROP TABLE IF EXISTS `llx_propal`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_propal` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_soc` int(11) DEFAULT NULL, + `fk_projet` int(11) DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `ref` varchar(30) NOT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `ref_ext` varchar(255) DEFAULT NULL, + `ref_int` varchar(255) DEFAULT NULL, + `ref_client` varchar(255) DEFAULT NULL, + `datec` datetime DEFAULT NULL, + `datep` date DEFAULT NULL, + `fin_validite` datetime DEFAULT NULL, + `date_valid` datetime DEFAULT NULL, + `date_cloture` datetime DEFAULT NULL, + `fk_user_author` int(11) DEFAULT NULL, + `fk_user_modif` int(11) DEFAULT NULL, + `fk_user_valid` int(11) DEFAULT NULL, + `fk_user_cloture` int(11) DEFAULT NULL, + `fk_statut` smallint(6) NOT NULL DEFAULT '0', + `price` double DEFAULT '0', + `remise_percent` double DEFAULT '0', + `remise_absolue` double DEFAULT '0', + `remise` double DEFAULT '0', + `total_ht` double(24,8) DEFAULT '0.00000000', + `tva` double(24,8) DEFAULT '0.00000000', + `localtax1` double(24,8) DEFAULT '0.00000000', + `localtax2` double(24,8) DEFAULT '0.00000000', + `total` double(24,8) DEFAULT '0.00000000', + `fk_account` int(11) DEFAULT NULL, + `fk_currency` varchar(3) DEFAULT NULL, + `fk_cond_reglement` int(11) DEFAULT NULL, + `fk_mode_reglement` int(11) DEFAULT NULL, + `note_private` text, + `note_public` text, + `model_pdf` varchar(255) DEFAULT NULL, + `date_livraison` date DEFAULT NULL, + `fk_shipping_method` int(11) DEFAULT NULL, + `fk_availability` int(11) DEFAULT NULL, + `fk_delivery_address` int(11) DEFAULT NULL, + `fk_input_reason` int(11) DEFAULT NULL, + `import_key` varchar(14) DEFAULT NULL, + `extraparams` varchar(255) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_propal_ref` (`ref`,`entity`), + KEY `idx_propal_fk_soc` (`fk_soc`), + KEY `idx_propal_fk_user_author` (`fk_user_author`), + KEY `idx_propal_fk_user_valid` (`fk_user_valid`), + KEY `idx_propal_fk_user_cloture` (`fk_user_cloture`), + KEY `idx_propal_fk_projet` (`fk_projet`), + KEY `idx_propal_fk_account` (`fk_account`), + KEY `idx_propal_fk_currency` (`fk_currency`), + CONSTRAINT `fk_propal_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`), + CONSTRAINT `fk_propal_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`), + CONSTRAINT `fk_propal_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`), + CONSTRAINT `fk_propal_fk_user_cloture` FOREIGN KEY (`fk_user_cloture`) REFERENCES `llx_user` (`rowid`), + CONSTRAINT `fk_propal_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_propal` +-- + +LOCK TABLES `llx_propal` WRITE; +/*!40000 ALTER TABLE `llx_propal` DISABLE KEYS */; +INSERT INTO `llx_propal` VALUES (1,2,NULL,'2012-12-08 13:11:07','PR1007-0001',1,NULL,NULL,'','2010-07-09 01:33:49','2010-07-09','2010-07-24 12:00:00','2011-08-08 14:24:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,30.00000000,3.84000000,0.00000000,0.00000000,33.84000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL),(2,1,NULL,'2012-12-08 13:11:07','PR1007-0002',1,NULL,NULL,'','2010-07-10 02:11:44','2010-07-10','2010-07-25 12:00:00','2010-07-10 02:12:55','2011-07-20 15:23:12',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,1,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL),(3,4,NULL,'2012-12-08 13:11:07','PR1007-0003',1,NULL,NULL,'','2010-07-18 11:35:11','2010-07-18','2010-08-02 12:00:00','2010-07-18 11:36:18','2011-07-20 15:21:15',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL),(4,17,NULL,'2012-12-08 13:11:07','PR1108-0004',1,NULL,NULL,'','2011-08-04 23:36:23','2011-08-05','2011-08-20 12:00:00','2011-08-08 14:24:24',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,30.00000000,5.88000000,0.00000000,0.00000000,35.88000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(5,19,NULL,'2013-02-17 14:39:56','PR1302-0005',1,NULL,NULL,'','2013-02-17 15:39:56','2013-02-17','2013-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(6,19,NULL,'2013-02-17 14:40:12','PR1302-0006',1,NULL,NULL,'','2013-02-17 15:40:12','2013-02-17','2013-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(7,19,NULL,'2013-02-17 14:41:15','PR1302-0007',1,NULL,NULL,'','2013-02-17 15:41:15','2013-02-17','2013-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(8,19,NULL,'2013-02-17 14:43:39','PR1302-0008',1,NULL,NULL,'','2013-02-17 15:43:39','2013-02-17','2013-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(9,19,NULL,'2013-02-17 15:22:14','PR1302-0009',1,NULL,NULL,'','2013-02-17 15:53:01','2013-02-17','2013-03-04 12:00:00','2013-02-17 16:22:10','2013-02-17 16:22:14',1,NULL,1,1,2,0,NULL,NULL,0,60.00000000,11.76000000,0.00000000,0.00000000,71.76000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(11,18,NULL,'2013-02-17 15:28:22','PR1302-0010',1,NULL,NULL,'gfdf','2013-02-17 16:27:18','2013-02-17','2013-03-04 12:00:00','2013-02-17 16:27:29','2013-02-17 16:28:22',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(12,23,NULL,'2013-03-08 09:02:31','PR1303-0011',1,NULL,NULL,'fdfs','2013-03-08 10:00:23','2013-03-08','2013-03-23 12:00:00','2013-03-08 10:02:21','2013-03-08 10:02:31',1,NULL,1,1,2,0,NULL,NULL,0,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL); +/*!40000 ALTER TABLE `llx_propal` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_propal_extrafields` +-- + +DROP TABLE IF EXISTS `llx_propal_extrafields`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_propal_extrafields` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_object` int(11) NOT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_propal_extrafields` (`fk_object`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_propal_extrafields` +-- + +LOCK TABLES `llx_propal_extrafields` WRITE; +/*!40000 ALTER TABLE `llx_propal_extrafields` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_propal_extrafields` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_propaldet` +-- + +DROP TABLE IF EXISTS `llx_propaldet`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_propaldet` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_propal` int(11) DEFAULT NULL, + `fk_parent_line` int(11) DEFAULT NULL, + `fk_product` int(11) DEFAULT NULL, + `label` varchar(255) DEFAULT NULL, + `description` text, + `fk_remise_except` int(11) DEFAULT NULL, + `tva_tx` double(6,3) DEFAULT '0.000', + `localtax1_tx` double(6,3) DEFAULT '0.000', + `localtax1_type` varchar(10) NOT NULL DEFAULT '0', + `localtax2_tx` double(6,3) DEFAULT '0.000', + `localtax2_type` varchar(10) NOT NULL DEFAULT '0', + `qty` double DEFAULT NULL, + `remise_percent` double DEFAULT '0', + `remise` double DEFAULT '0', + `price` double DEFAULT NULL, + `subprice` double(24,8) DEFAULT '0.00000000', + `total_ht` double(24,8) DEFAULT '0.00000000', + `total_tva` double(24,8) DEFAULT '0.00000000', + `total_localtax1` double(24,8) DEFAULT '0.00000000', + `total_localtax2` double(24,8) DEFAULT '0.00000000', + `total_ttc` double(24,8) DEFAULT '0.00000000', + `product_type` int(11) DEFAULT '0', + `date_start` datetime DEFAULT NULL, + `date_end` datetime DEFAULT NULL, + `info_bits` int(11) DEFAULT '0', + `fk_product_fournisseur_price` int(11) DEFAULT NULL, + `buy_price_ht` double(24,8) DEFAULT '0.00000000', + `special_code` int(10) unsigned DEFAULT '0', + `rang` int(11) DEFAULT '0', + PRIMARY KEY (`rowid`), + KEY `idx_propaldet_fk_propal` (`fk_propal`), + KEY `idx_propaldet_fk_product` (`fk_product`), + CONSTRAINT `fk_propaldet_fk_propal` FOREIGN KEY (`fk_propal`) REFERENCES `llx_propal` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_propaldet` +-- + +LOCK TABLES `llx_propaldet` WRITE; +/*!40000 ALTER TABLE `llx_propaldet` DISABLE KEYS */; +INSERT INTO `llx_propaldet` VALUES (1,1,NULL,NULL,NULL,'Une machine à café',NULL,12.500,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,1.25000000,0.00000000,0.00000000,11.25000000,0,NULL,NULL,0,NULL,0.00000000,0,1),(2,2,NULL,NULL,NULL,'Product 1',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1),(3,2,NULL,2,NULL,'',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2),(4,3,NULL,NULL,NULL,'A new marvelous product',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1),(5,1,NULL,5,NULL,'cccc',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,2),(11,1,NULL,4,NULL,'',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3),(12,1,NULL,4,NULL,'',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4),(13,1,NULL,4,NULL,'',NULL,12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,5),(19,4,NULL,NULL,NULL,'bvbcvbcvbcbcbcb',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1),(20,4,NULL,NULL,NULL,'ghjhgjghjgh',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,2),(21,4,NULL,NULL,NULL,'ghjghjhgjg',NULL,19.600,0.000,'',0.000,'',2,0,0,10,10.00000000,20.00000000,3.92000000,0.00000000,0.00000000,23.92000000,1,NULL,NULL,0,NULL,0.00000000,0,3),(22,9,NULL,NULL,NULL,'gdfg',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,0,0.00000000,0,1),(23,9,NULL,NULL,NULL,'gfdgd',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,50.00000000,50.00000000,9.80000000,0.00000000,0.00000000,59.80000000,1,NULL,NULL,0,0,0.00000000,0,2),(24,11,NULL,NULL,NULL,'gfdg',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,0,0.00000000,0,1),(25,12,NULL,NULL,NULL,'fdsfs',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,0,0.00000000,0,1),(26,12,NULL,NULL,NULL,'fsdfsf',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,-5.00000000,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,0,0.00000000,0,2); +/*!40000 ALTER TABLE `llx_propaldet` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_propaldet_extrafields` +-- + +DROP TABLE IF EXISTS `llx_propaldet_extrafields`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_propaldet_extrafields` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_object` int(11) NOT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_propaldet_extrafields` (`fk_object`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_propaldet_extrafields` +-- + +LOCK TABLES `llx_propaldet_extrafields` WRITE; +/*!40000 ALTER TABLE `llx_propaldet_extrafields` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_propaldet_extrafields` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_residence` +-- + +DROP TABLE IF EXISTS `llx_residence`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_residence` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `entity` int(11) DEFAULT '1', + `ref` varchar(12) NOT NULL, + `label` varchar(30) NOT NULL, + `address` varchar(254) DEFAULT NULL, + `zip` varchar(12) DEFAULT NULL, + `town` varchar(36) DEFAULT NULL, + `fk_country_id` int(11) DEFAULT NULL, + `name_concierge` varchar(64) DEFAULT NULL, + `tel_concierge` varchar(32) DEFAULT NULL, + `hours_concierge` varchar(64) DEFAULT NULL, + `antenne` varchar(64) DEFAULT NULL, + `attestation` int(11) DEFAULT NULL, + `latitude` float DEFAULT NULL, + `longitude` float DEFAULT NULL, + `date_creation` datetime DEFAULT NULL, + `fk_user_creation` int(11) DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_user_modification` int(11) DEFAULT NULL, + `note_private` text, + `note_public` text, + `fk_thirdparty` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `idx_residence_ref` (`ref`), + KEY `idx_residence_label` (`label`), + KEY `idx_residence_zip` (`zip`), + KEY `idx_residence_town` (`town`), + KEY `fk_residence_thirdparty` (`fk_thirdparty`), + KEY `fk_country_id` (`fk_country_id`), + CONSTRAINT `fk_country_id` FOREIGN KEY (`fk_country_id`) REFERENCES `llx_c_country` (`rowid`), + CONSTRAINT `fk_residence_thirdparty` FOREIGN KEY (`fk_thirdparty`) REFERENCES `llx_societe` (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_residence` +-- + +LOCK TABLES `llx_residence` WRITE; +/*!40000 ALTER TABLE `llx_residence` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_residence` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_residence_building` +-- + +DROP TABLE IF EXISTS `llx_residence_building`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_residence_building` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `ref` varchar(20) NOT NULL, + `label` varchar(30) NOT NULL, + `access_code` varchar(16) DEFAULT NULL, + `date_creation` datetime DEFAULT NULL, + `fk_user_creation` int(11) DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_user_modification` int(11) DEFAULT NULL, + `note_private` text, + `note_public` text, + `fk_residence` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_residence_building_fk_residence` (`fk_residence`), + CONSTRAINT `fk_residence_building_residence` FOREIGN KEY (`fk_residence`) REFERENCES `llx_residence` (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_residence_building` +-- + +LOCK TABLES `llx_residence_building` WRITE; +/*!40000 ALTER TABLE `llx_residence_building` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_residence_building` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_residence_building_links` +-- + +DROP TABLE IF EXISTS `llx_residence_building_links`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_residence_building_links` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `residenceid` int(11) DEFAULT NULL, + `buildingid` int(11) DEFAULT NULL, + `parentid` int(11) DEFAULT NULL, + `parenttype` varchar(16) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_residence_building_1` (`parentid`,`parenttype`,`residenceid`), + UNIQUE KEY `uk_residence_building_2` (`parentid`,`parenttype`,`buildingid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_residence_building_links` +-- + +LOCK TABLES `llx_residence_building_links` WRITE; +/*!40000 ALTER TABLE `llx_residence_building_links` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_residence_building_links` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_resource` +-- + +DROP TABLE IF EXISTS `llx_resource`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_resource` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `entity` int(11) NOT NULL DEFAULT '1', + `ref` varchar(255) DEFAULT NULL, + `description` text, + `fk_code_type_resource` varchar(32) DEFAULT NULL, + `note_public` text, + `note_private` text, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`rowid`), + KEY `fk_code_type_resource_idx` (`fk_code_type_resource`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_resource` +-- + +LOCK TABLES `llx_resource` WRITE; +/*!40000 ALTER TABLE `llx_resource` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_resource` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_rights_def` +-- + +DROP TABLE IF EXISTS `llx_rights_def`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_rights_def` ( + `id` int(11) NOT NULL DEFAULT '0', + `libelle` varchar(255) DEFAULT NULL, + `module` varchar(64) DEFAULT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `perms` varchar(50) DEFAULT NULL, + `subperms` varchar(50) DEFAULT NULL, + `type` varchar(1) DEFAULT NULL, + `bydefault` tinyint(4) DEFAULT '0', + PRIMARY KEY (`id`,`entity`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_rights_def` +-- + +LOCK TABLES `llx_rights_def` WRITE; +/*!40000 ALTER TABLE `llx_rights_def` DISABLE KEYS */; +INSERT INTO `llx_rights_def` VALUES (11,'Lire les factures','facture',1,'lire',NULL,'a',1),(11,'Lire les factures','facture',2,'lire',NULL,'a',1),(12,'Creer/modifier les factures','facture',1,'creer',NULL,'a',0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0),(13,'Dévalider les factures','facture',1,'invoice_advance','unvalidate','a',0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0),(14,'Valider les factures','facture',1,'valider',NULL,'a',0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0),(15,'Envoyer les factures par mail','facture',1,'invoice_advance','send','a',0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0),(16,'Emettre des paiements sur les factures','facture',1,'paiement',NULL,'a',0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0),(19,'Supprimer les factures','facture',1,'supprimer',NULL,'a',0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0),(24,'Valider les propositions commerciales','propale',1,'valider',NULL,'d',0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0),(26,'Cloturer les propositions commerciales','propale',1,'cloturer',NULL,'d',0),(26,'Cloturer les propositions commerciales','propale',2,'cloturer',NULL,'d',0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1),(31,'Lire les produits','produit',2,'lire',NULL,'r',1),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0),(41,'Lire les projets et taches (partagés ou dont je suis contact)','projet',1,'lire',NULL,'r',1),(42,'Creer/modifier les projets et taches (partagés ou dont je suis contact)','projet',1,'creer',NULL,'w',0),(44,'Supprimer les projets et taches (partagés ou dont je suis contact)','projet',1,'supprimer',NULL,'d',0),(45,'Exporter les projets','projet',1,'export',NULL,'d',0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',1),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',1),(74,'Remove members','adherent',1,'supprimer',NULL,'d',1),(75,'Setup types and attributes of members','adherent',1,'configurer',NULL,'w',1),(76,'Export members','adherent',1,'export',NULL,'r',0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',1),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',1),(81,'Lire les commandes clients','commande',1,'lire',NULL,'r',1),(82,'Creer/modifier les commandes clients','commande',1,'creer',NULL,'w',0),(84,'Valider les commandes clients','commande',1,'valider',NULL,'d',0),(86,'Envoyer les commandes clients','commande',1,'order_advance','send','d',0),(87,'Cloturer les commandes clients','commande',1,'cloturer',NULL,'d',0),(88,'Annuler les commandes clients','commande',1,'annuler',NULL,'d',0),(89,'Supprimer les commandes clients','commande',1,'supprimer',NULL,'d',0),(91,'Lire les charges','tax',1,'charges','lire','r',1),(91,'Lire les charges','tax',2,'charges','lire','r',1),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0),(94,'Exporter les charges','tax',1,'charges','export','r',0),(94,'Exporter les charges','tax',2,'charges','export','r',0),(95,'Lire CA, bilans, resultats','compta',1,'resultat','lire','r',1),(96,'Parametrer la ventilation','compta',1,'ventilation','parametrer','r',0),(97,'Lire les ventilations de factures','compta',1,'ventilation','lire','r',1),(98,'Ventiler les lignes de factures','compta',1,'ventilation','creer','r',0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',1),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0),(104,'Valider les expeditions','expedition',1,'valider',NULL,'d',0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0),(111,'Lire les comptes bancaires','banque',1,'lire',NULL,'r',1),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0),(121,'Lire les societes','societe',1,'lire',NULL,'r',1),(121,'Lire les societes','societe',2,'lire',NULL,'r',1),(122,'Creer modifier les societes','societe',1,'creer',NULL,'w',0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0),(125,'Supprimer les societes','societe',1,'supprimer',NULL,'d',0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0),(126,'Exporter les societes','societe',1,'export',NULL,'r',0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0),(141,'Lire tous les projets et taches (y compris prives qui ne me sont pas affectes)','projet',1,'all','lire','r',0),(142,'Creer/modifier tous les projets et taches (y compris prives qui ne me sont pas affectes)','projet',1,'all','creer','w',0),(144,'Supprimer tous les projets et taches (y compris prives qui ne me sont pas affectes)','projet',1,'all','supprimer','d',0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0),(171,'Lire ses notes de frais et deplacements et celles de sa hierarchy','deplacement',1,'lire',NULL,'r',1),(172,'Creer/modifier une note de frais et deplacements','deplacement',1,'creer',NULL,'w',0),(174,'Lire toutes les notes de frais','deplacement',1,'readall',NULL,'d',0),(178,'Exporter les notes de frais et deplacements','deplacement',1,'export',NULL,'d',0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',1),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0),(229,'Supprimer les mailings)','mailing',1,'supprimer',NULL,'d',1),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',1),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',1),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',1,'client','voir','r',1),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1),(281,'Lire les contacts','societe',1,'contact','lire','r',1),(281,'Lire les contacts','societe',2,'contact','lire','r',1),(282,'Creer modifier les contacts','societe',1,'contact','creer','w',0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0),(283,'Supprimer les contacts','societe',1,'contact','supprimer','d',0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0),(286,'Exporter les contacts','societe',1,'contact','export','d',0),(286,'Exporter les contacts','societe',2,'contact','export','d',0),(300,'Lire les codes barres','barcode',1,'lire',NULL,'r',1),(301,'Creer/modifier les codes barres','barcode',1,'creer',NULL,'w',0),(302,'Supprimer les codes barres','barcode',1,'supprimer',NULL,'d',0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',1),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',1),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',1),(343,'Modifier son propre mot de passe','user',1,'self','password','w',1),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',1),(351,'Consulter les groupes','user',1,'group_advance','read','r',0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0),(531,'Lire les services','service',1,'lire',NULL,'r',1),(532,'Creer/modifier les services','service',1,'creer',NULL,'w',0),(534,'Supprimer les services','service',1,'supprimer',NULL,'d',0),(538,'Exporter les services','service',1,'export',NULL,'r',0),(700,'Lire les dons','don',1,'lire',NULL,'r',1),(701,'Creer/modifier les dons','don',1,'creer',NULL,'w',0),(701,'Lire les dons','don',2,'lire',NULL,'r',1),(702,'Supprimer les dons','don',1,'supprimer',NULL,'d',0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',1),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',1),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',1),(1101,'Lire les bons de livraison','expedition',1,'livraison','lire','r',1),(1102,'Creer modifier les bons de livraison','expedition',1,'livraison','creer','w',0),(1104,'Valider les bons de livraison','expedition',1,'livraison','valider','d',0),(1109,'Supprimer les bons de livraison','expedition',1,'livraison','supprimer','d',0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',1),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',1),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0),(1184,'Valider une commande fournisseur','fournisseur',1,'commande','valider','w',0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',1),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',1),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0),(1233,'Valider une facture fournisseur','fournisseur',1,'facture','valider','w',0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0),(1237,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0),(1321,'Exporter les factures clients, attributs et reglements','facture',1,'facture','export','r',0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0),(1421,'Exporter les commandes clients et attributs','commande',1,'commande','export','r',0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',1),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0),(2501,'Consulter/Télécharger les documents','ecm',1,'read',NULL,'r',1),(2503,'Soumettre ou supprimer des documents','ecm',1,'upload',NULL,'w',1),(2515,'Administrer les rubriques de documents','ecm',1,'setup',NULL,'w',1),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',1,'write',NULL,'w',1),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1),(20002,'Lire / Modifier toutes les demandes de congés payés','holiday',1,'lire_tous',NULL,'w',0),(20002,'Lire / Modifier toutes les demandes de congés payés','holiday',2,'lire_tous',NULL,'w',0),(20003,'Supprimer des demandes de congés payés','holiday',1,'delete',NULL,'w',0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0),(20004,'Définir les congés payés des utilisateurs','holiday',1,'define_holiday',NULL,'w',0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0),(20005,'Voir les logs de modification des congés payés','holiday',1,'view_log',NULL,'w',0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0),(20006,'Accéder au rapport mensuel des congés payés','holiday',1,'month_report',NULL,'w',0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',1),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0),(50101,'Use point of sale','cashdesk',1,'use',NULL,'a',1),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0),(400051,'Use POS','pos',2,'frontend',NULL,'a',1),(400052,'Use Backend','pos',2,'backend',NULL,'a',1),(400053,'Make Transfers','pos',2,'transfer',NULL,'a',1),(400055,'Stats','pos',2,'stats',NULL,'a',1); +/*!40000 ALTER TABLE `llx_rights_def` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_societe` +-- + +DROP TABLE IF EXISTS `llx_societe`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_societe` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `statut` tinyint(4) DEFAULT '0', + `parent` int(11) DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `datec` datetime DEFAULT NULL, + `nom` varchar(128) DEFAULT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `ref_ext` varchar(128) DEFAULT NULL, + `ref_int` varchar(60) DEFAULT NULL, + `code_client` varchar(24) DEFAULT NULL, + `code_fournisseur` varchar(24) DEFAULT NULL, + `code_compta` varchar(24) DEFAULT NULL, + `code_compta_fournisseur` varchar(24) DEFAULT NULL, + `address` varchar(255) DEFAULT NULL, + `zip` varchar(25) DEFAULT NULL, + `town` varchar(50) DEFAULT NULL, + `fk_departement` int(11) DEFAULT '0', + `fk_pays` int(11) DEFAULT '0', + `phone` varchar(20) DEFAULT NULL, + `fax` varchar(20) DEFAULT NULL, + `url` varchar(255) DEFAULT NULL, + `email` varchar(128) DEFAULT NULL, + `skype` varchar(255) DEFAULT NULL, + `fk_effectif` int(11) DEFAULT '0', + `fk_typent` int(11) DEFAULT '0', + `fk_forme_juridique` int(11) DEFAULT '0', + `fk_currency` varchar(3) DEFAULT NULL, + `siren` varchar(128) DEFAULT NULL, + `siret` varchar(128) DEFAULT NULL, + `ape` varchar(128) DEFAULT NULL, + `idprof4` varchar(128) DEFAULT NULL, + `tva_intra` varchar(20) DEFAULT NULL, + `capital` double DEFAULT NULL, + `fk_stcomm` int(11) NOT NULL, + `note_private` text, + `note_public` text, + `prefix_comm` varchar(5) DEFAULT NULL, + `client` tinyint(4) DEFAULT '0', + `fournisseur` tinyint(4) DEFAULT '0', + `supplier_account` varchar(32) DEFAULT NULL, + `fk_prospectlevel` varchar(12) DEFAULT NULL, + `customer_bad` tinyint(4) DEFAULT '0', + `customer_rate` double DEFAULT '0', + `supplier_rate` double DEFAULT '0', + `fk_user_creat` int(11) DEFAULT NULL, + `fk_user_modif` int(11) DEFAULT NULL, + `remise_client` double DEFAULT '0', + `mode_reglement` tinyint(4) DEFAULT NULL, + `cond_reglement` tinyint(4) DEFAULT NULL, + `mode_reglement_supplier` int(11) DEFAULT NULL, + `outstanding_limit` double(24,8) DEFAULT NULL, + `cond_reglement_supplier` int(11) DEFAULT NULL, + `tva_assuj` tinyint(4) DEFAULT '1', + `localtax1_assuj` tinyint(4) DEFAULT '0', + `localtax1_value` double(6,3) DEFAULT NULL, + `localtax2_assuj` tinyint(4) DEFAULT '0', + `localtax2_value` double(6,3) DEFAULT NULL, + `barcode` varchar(255) DEFAULT NULL, + `price_level` int(11) DEFAULT NULL, + `default_lang` varchar(6) DEFAULT NULL, + `canvas` varchar(32) DEFAULT NULL, + `import_key` varchar(14) DEFAULT NULL, + `status` tinyint(4) DEFAULT '1', + `logo` varchar(255) DEFAULT NULL, + `idprof5` varchar(128) DEFAULT NULL, + `idprof6` varchar(128) DEFAULT NULL, + `fk_barcode_type` int(11) DEFAULT '0', + `webservices_url` varchar(255) DEFAULT NULL, + `webservices_key` varchar(128) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_societe_prefix_comm` (`prefix_comm`,`entity`), + UNIQUE KEY `uk_societe_code_client` (`code_client`,`entity`), + UNIQUE KEY `uk_societe_barcode` (`barcode`,`fk_barcode_type`,`entity`), + KEY `idx_societe_user_creat` (`fk_user_creat`), + KEY `idx_societe_user_modif` (`fk_user_modif`), + KEY `idx_societe_barcode` (`barcode`) +) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_societe` +-- + +LOCK TABLES `llx_societe` WRITE; +/*!40000 ALTER TABLE `llx_societe` DISABLE KEYS */; +INSERT INTO `llx_societe` VALUES (1,0,NULL,'2012-12-19 14:47:50','2010-07-08 14:21:44','ABC and Co',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,4,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,1,NULL,0,NULL,NULL,NULL,'en_IN',NULL,NULL,1,NULL,'','',0,NULL,NULL),(2,0,NULL,'2011-07-31 22:35:08','2010-07-08 14:23:48','Belin SARL',1,NULL,NULL,'CU1108-0001','SU1108-0001',NULL,NULL,'11 rue de la paix.','75000','Paris',0,117,NULL,NULL,'dolibarr.fr',NULL,NULL,NULL,3,NULL,'0','123456789','','ACE14','','',10000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'fr_FR',NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(3,0,NULL,'2010-07-08 20:42:12','2010-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP',NULL,NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'es_AR',NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(4,0,NULL,'2013-03-03 23:09:48','2010-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL),(5,0,NULL,'2010-07-08 21:37:56','2010-07-08 23:22:57','NoCountry Co',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,193,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(6,0,NULL,'2010-07-08 22:25:06','2010-07-09 00:15:09','Swiss customer supplier',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'abademail@aa.com',NULL,2,2,601,'0','','','','','',56000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(7,0,NULL,'2013-02-12 16:06:20','2010-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,8,NULL,'0','','','','','',0,0,'Generic customer to use for Point Of Sale module.
    ',NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL),(8,0,NULL,'2010-07-10 12:54:27','2010-07-10 14:54:27','Client salon',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(9,0,NULL,'2010-07-10 12:55:11','2010-07-10 14:54:44','Client salon invidivdu',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,8,NULL,'0','','','','','',0,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(10,0,NULL,'2012-12-08 16:38:30','2010-07-10 15:13:08','Smith Vick',1,NULL,NULL,'CU1212-0005',NULL,NULL,NULL,'',NULL,NULL,0,102,NULL,NULL,NULL,'vsmith@email.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL),(11,0,NULL,'2010-07-11 12:35:22','2010-07-10 18:35:57','Mon client',1,NULL,NULL,NULL,NULL,'7051',NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(12,0,NULL,'2013-02-20 19:07:21','2010-07-11 16:18:08','Dupont Alain',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,'toto@aa.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL),(13,0,NULL,'2010-07-11 15:13:20','2010-07-11 17:13:20','Vendeur de chips',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(15,0,NULL,'2011-08-01 00:31:24','2011-08-01 02:31:24','mmm',1,NULL,NULL,'CU1108-0002','SU1108-0002',NULL,NULL,'','78180','mmm',0,31,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(16,0,NULL,'2011-08-01 00:42:21','2011-08-01 02:31:43','ppp',1,NULL,NULL,'CU1108-0003','SU1108-0003',NULL,NULL,'','78180','mmm',103,2,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(17,0,NULL,'2011-08-04 21:24:24','2011-08-01 02:41:26','FFF SARL',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,NULL,'The French Company',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,1,3,NULL,'0','','','','','',0,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(18,0,NULL,'2013-01-12 13:38:32','2012-12-09 20:14:42','doe john',1,NULL,NULL,'CU1212-0006',NULL,NULL,NULL,'',NULL,NULL,0,1,'111','2222',NULL,'johndoe@email.com',NULL,NULL,101,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL),(19,0,NULL,'2014-03-02 19:09:52','2013-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,0,NULL,'0','','','10/10/2010','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'en_US','patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL),(20,0,NULL,'2013-01-12 11:52:20','2013-01-12 12:52:20','pppoo',1,NULL,NULL,'CU1301-0009',NULL,NULL,NULL,'pppoo',NULL,NULL,0,4,NULL,NULL,NULL,NULL,NULL,NULL,101,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'en_US','patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL),(21,0,NULL,'2013-01-23 15:56:58','2013-01-23 16:56:58','pa',1,NULL,NULL,'CU1301-0010',NULL,NULL,NULL,'',NULL,NULL,0,81,NULL,NULL,NULL,NULL,NULL,NULL,101,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'en_US','patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL),(22,0,NULL,'2013-02-26 21:57:58','2013-02-26 22:57:50','pppp',1,NULL,NULL,'CU1302-0012',NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,101,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'fr_FR','patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL),(23,0,NULL,'2013-02-26 21:58:13','2013-02-26 22:58:13','ttttt',1,NULL,NULL,'CU1302-0013','SU1302-0006',NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,101,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'fr_FR',NULL,NULL,1,NULL,'','',0,NULL,NULL),(24,0,NULL,'2013-03-09 15:33:39','2013-03-06 17:13:59','smith smith',1,NULL,NULL,'CU1303-0015',NULL,'411E123',NULL,'',NULL,NULL,0,11,NULL,NULL,NULL,'smith@email.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL),(25,0,NULL,'2013-03-10 14:47:37','2013-03-10 15:47:37','jlmkjlkj',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'',NULL,NULL,0,117,NULL,NULL,NULL,NULL,NULL,NULL,101,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'en_US',NULL,NULL,1,NULL,'','',0,NULL,NULL),(26,0,NULL,'2013-03-10 14:57:32','2013-03-10 15:57:32','iiii',1,NULL,NULL,'CU1303-0017','SU1303-0008',NULL,NULL,'',NULL,NULL,290,117,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'en_US',NULL,NULL,1,NULL,'','',0,NULL,NULL); +/*!40000 ALTER TABLE `llx_societe` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_societe_address` +-- + +DROP TABLE IF EXISTS `llx_societe_address`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_societe_address` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `label` varchar(30) DEFAULT NULL, + `fk_soc` int(11) DEFAULT '0', + `name` varchar(60) DEFAULT NULL, + `address` varchar(255) DEFAULT NULL, + `zip` varchar(10) DEFAULT NULL, + `town` varchar(50) DEFAULT NULL, + `fk_pays` int(11) DEFAULT '0', + `phone` varchar(20) DEFAULT NULL, + `fax` varchar(20) DEFAULT NULL, + `note` text, + `fk_user_creat` int(11) DEFAULT NULL, + `fk_user_modif` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_societe_address` +-- + +LOCK TABLES `llx_societe_address` WRITE; +/*!40000 ALTER TABLE `llx_societe_address` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_societe_address` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_societe_commerciaux` +-- + +DROP TABLE IF EXISTS `llx_societe_commerciaux`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_societe_commerciaux` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_soc` int(11) DEFAULT NULL, + `fk_user` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_societe_commerciaux` (`fk_soc`,`fk_user`) +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_societe_commerciaux` +-- + +LOCK TABLES `llx_societe_commerciaux` WRITE; +/*!40000 ALTER TABLE `llx_societe_commerciaux` DISABLE KEYS */; +INSERT INTO `llx_societe_commerciaux` VALUES (1,2,2),(2,3,2),(3,15,1),(4,16,1),(5,17,1),(6,19,1),(8,19,3),(7,20,1),(9,21,1),(10,23,1),(11,25,1),(12,26,1); +/*!40000 ALTER TABLE `llx_societe_commerciaux` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_societe_extrafields` +-- + +DROP TABLE IF EXISTS `llx_societe_extrafields`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_societe_extrafields` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_object` int(11) NOT NULL, + `jjjj` varchar(255) DEFAULT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_societe_extrafields` (`fk_object`) +) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_societe_extrafields` +-- + +LOCK TABLES `llx_societe_extrafields` WRITE; +/*!40000 ALTER TABLE `llx_societe_extrafields` DISABLE KEYS */; +INSERT INTO `llx_societe_extrafields` VALUES (1,'2011-06-22 16:23:01',40,'kkkk',NULL),(2,'2011-06-22 16:23:16',41,'jjj',NULL),(4,'2011-06-23 07:40:40',39,'lll',NULL),(12,'2011-06-29 13:03:12',42,NULL,NULL),(14,'2011-07-02 01:24:03',57,NULL,NULL),(16,'2011-07-02 14:11:29',60,NULL,NULL),(17,'2011-07-18 10:26:55',35,NULL,NULL),(18,'2011-07-31 22:35:08',2,NULL,NULL),(19,'2011-08-01 00:31:24',15,NULL,NULL),(22,'2011-08-01 00:42:21',16,NULL,NULL),(27,'2011-08-04 21:24:24',17,NULL,NULL),(28,'2012-12-08 16:38:30',10,NULL,NULL),(30,'2012-12-19 14:47:50',1,NULL,NULL),(31,'2013-01-12 13:38:32',18,NULL,NULL),(33,'2013-02-12 16:06:20',7,NULL,NULL),(34,'2013-02-20 19:07:21',12,'jjj',NULL),(36,'2013-02-26 21:57:58',22,'jjj',NULL),(37,'2013-02-26 21:58:13',23,NULL,NULL),(44,'2013-03-03 23:08:04',4,'jjj',NULL),(45,'2013-03-09 15:33:39',24,'jjj',NULL),(46,'2013-03-10 14:47:37',25,NULL,NULL),(47,'2013-03-10 14:57:32',26,NULL,NULL),(49,'2014-03-02 19:09:52',19,'jjj',NULL); +/*!40000 ALTER TABLE `llx_societe_extrafields` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_societe_log` +-- + +DROP TABLE IF EXISTS `llx_societe_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_societe_log` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `datel` datetime DEFAULT NULL, + `fk_soc` int(11) DEFAULT NULL, + `fk_statut` int(11) DEFAULT NULL, + `fk_user` int(11) DEFAULT NULL, + `author` varchar(30) DEFAULT NULL, + `label` varchar(128) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_societe_log` +-- + +LOCK TABLES `llx_societe_log` WRITE; +/*!40000 ALTER TABLE `llx_societe_log` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_societe_log` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_societe_prices` +-- + +DROP TABLE IF EXISTS `llx_societe_prices`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_societe_prices` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_soc` int(11) DEFAULT '0', + `tms` timestamp NULL DEFAULT NULL, + `datec` datetime DEFAULT NULL, + `fk_user_author` int(11) DEFAULT NULL, + `price_level` tinyint(4) DEFAULT '1', + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_societe_prices` +-- + +LOCK TABLES `llx_societe_prices` WRITE; +/*!40000 ALTER TABLE `llx_societe_prices` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_societe_prices` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_societe_remise` +-- + +DROP TABLE IF EXISTS `llx_societe_remise`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_societe_remise` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_soc` int(11) NOT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `datec` datetime DEFAULT NULL, + `fk_user_author` int(11) DEFAULT NULL, + `remise_client` double(6,3) NOT NULL DEFAULT '0.000', + `note` text, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_societe_remise` +-- + +LOCK TABLES `llx_societe_remise` WRITE; +/*!40000 ALTER TABLE `llx_societe_remise` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_societe_remise` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_societe_remise_except` +-- + +DROP TABLE IF EXISTS `llx_societe_remise_except`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_societe_remise_except` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_soc` int(11) NOT NULL, + `datec` datetime DEFAULT NULL, + `amount_ht` double(24,8) NOT NULL, + `amount_tva` double(24,8) NOT NULL DEFAULT '0.00000000', + `amount_ttc` double(24,8) NOT NULL DEFAULT '0.00000000', + `tva_tx` double(6,3) NOT NULL DEFAULT '0.000', + `fk_user` int(11) NOT NULL, + `fk_facture_line` int(11) DEFAULT NULL, + `fk_facture` int(11) DEFAULT NULL, + `fk_facture_source` int(11) DEFAULT NULL, + `description` varchar(255) NOT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_societe_remise_except_fk_user` (`fk_user`), + KEY `idx_societe_remise_except_fk_soc` (`fk_soc`), + KEY `idx_societe_remise_except_fk_facture_line` (`fk_facture_line`), + KEY `idx_societe_remise_except_fk_facture` (`fk_facture`), + KEY `idx_societe_remise_except_fk_facture_source` (`fk_facture_source`), + CONSTRAINT `fk_societe_remise_fk_facture` FOREIGN KEY (`fk_facture`) REFERENCES `llx_facture` (`rowid`), + CONSTRAINT `fk_societe_remise_fk_facture_line` FOREIGN KEY (`fk_facture_line`) REFERENCES `llx_facturedet` (`rowid`), + CONSTRAINT `fk_societe_remise_fk_facture_source` FOREIGN KEY (`fk_facture_source`) REFERENCES `llx_facture` (`rowid`), + CONSTRAINT `fk_societe_remise_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`), + CONSTRAINT `fk_societe_remise_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_societe_remise_except` +-- + +LOCK TABLES `llx_societe_remise_except` WRITE; +/*!40000 ALTER TABLE `llx_societe_remise_except` DISABLE KEYS */; +INSERT INTO `llx_societe_remise_except` VALUES (1,23,'2013-03-08 10:02:54',5.00000000,0.00000000,5.00000000,0.000,1,775,NULL,NULL,'fsdfsf'),(2,19,'2013-03-19 09:36:15',10.00000000,1.25000000,11.25000000,12.500,1,1019,NULL,NULL,'hfghgf'); +/*!40000 ALTER TABLE `llx_societe_remise_except` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_societe_rib` +-- + +DROP TABLE IF EXISTS `llx_societe_rib`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_societe_rib` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_soc` int(11) NOT NULL, + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `label` varchar(30) DEFAULT NULL, + `bank` varchar(255) DEFAULT NULL, + `code_banque` varchar(7) DEFAULT NULL, + `code_guichet` varchar(6) DEFAULT NULL, + `number` varchar(255) DEFAULT NULL, + `cle_rib` varchar(5) DEFAULT NULL, + `bic` varchar(20) DEFAULT NULL, + `iban_prefix` varchar(34) DEFAULT NULL, + `domiciliation` varchar(255) DEFAULT NULL, + `proprio` varchar(60) DEFAULT NULL, + `owner_address` text, + `default_rib` tinyint(4) NOT NULL DEFAULT '0', + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_societe_rib` +-- + +LOCK TABLES `llx_societe_rib` WRITE; +/*!40000 ALTER TABLE `llx_societe_rib` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_societe_rib` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_socpeople` +-- + +DROP TABLE IF EXISTS `llx_socpeople`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_socpeople` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_soc` int(11) DEFAULT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `ref_ext` varchar(128) DEFAULT NULL, + `civility` varchar(6) DEFAULT NULL, + `lastname` varchar(50) DEFAULT NULL, + `firstname` varchar(50) DEFAULT NULL, + `address` varchar(255) DEFAULT NULL, + `zip` varchar(10) DEFAULT NULL, + `town` text, + `fk_departement` int(11) DEFAULT NULL, + `fk_pays` int(11) DEFAULT '0', + `birthday` date DEFAULT NULL, + `poste` varchar(80) DEFAULT NULL, + `phone` varchar(30) DEFAULT NULL, + `phone_perso` varchar(30) DEFAULT NULL, + `phone_mobile` varchar(30) DEFAULT NULL, + `fax` varchar(30) DEFAULT NULL, + `email` varchar(255) DEFAULT NULL, + `jabberid` varchar(255) DEFAULT NULL, + `skype` varchar(255) DEFAULT NULL, + `priv` smallint(6) NOT NULL DEFAULT '0', + `no_email` smallint(6) NOT NULL DEFAULT '0', + `fk_user_creat` int(11) DEFAULT '0', + `fk_user_modif` int(11) DEFAULT NULL, + `note_private` text, + `note_public` text, + `default_lang` varchar(6) DEFAULT NULL, + `canvas` varchar(32) DEFAULT NULL, + `import_key` varchar(14) DEFAULT NULL, + `statut` tinyint(4) NOT NULL DEFAULT '1', + PRIMARY KEY (`rowid`), + KEY `idx_socpeople_fk_soc` (`fk_soc`), + KEY `idx_socpeople_fk_user_creat` (`fk_user_creat`), + CONSTRAINT `fk_socpeople_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`), + CONSTRAINT `fk_socpeople_user_creat_user_rowid` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_socpeople` +-- + +LOCK TABLES `llx_socpeople` WRITE; +/*!40000 ALTER TABLE `llx_socpeople` DISABLE KEYS */; +INSERT INTO `llx_socpeople` VALUES (1,'2010-07-08 14:26:14','2010-07-08 20:45:28',1,1,NULL,'MR','Samira','Aljoun','','','',297,117,'2010-07-08','Project leader','','','','','','',NULL,0,0,1,1,'Met during a congress at Dubai',NULL,NULL,NULL,NULL,1),(2,'2010-07-08 22:44:50','2010-07-08 20:59:57',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','',NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2010-07-08 22:59:02','2010-07-08 20:59:35',NULL,1,NULL,'MR','Freeman','Private','','','',NULL,11,NULL,'','','','','','','',NULL,1,0,1,1,'This is a private contact',NULL,NULL,NULL,NULL,1),(4,'2010-07-09 00:16:58','2010-07-08 22:16:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','',NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(5,'2010-07-10 14:54:44','2010-07-10 12:54:44',9,1,NULL,'','Client salon invidivdu','','','','',NULL,NULL,NULL,'','','','','','','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1),(6,'2011-08-01 02:41:26','2011-08-01 00:41:26',17,1,NULL,'','aaa','','aaa','','',289,117,NULL,'','','','','','','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1),(7,'2013-02-12 17:05:57','2013-03-08 01:45:08',7,1,NULL,'','aaa','','','','',289,117,NULL,'','','','','','aaa@aaa.com','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1),(8,'2013-03-08 02:45:31','2013-03-08 01:45:31',7,1,NULL,'','kkkk','','','','',290,117,NULL,'','','','','','ttt@ttt.com','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1),(10,'2013-03-08 02:48:23','2013-03-08 01:48:23',7,1,NULL,'','fff','','','','',290,117,NULL,'','','','','','ttt@ttt.com','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1),(11,'2013-03-08 02:48:54','2013-03-08 01:48:54',7,1,NULL,'','iii','','','','',294,117,NULL,'','','','','','ttt@ttt.com','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1); +/*!40000 ALTER TABLE `llx_socpeople` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_socpeople_extrafields` +-- + +DROP TABLE IF EXISTS `llx_socpeople_extrafields`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_socpeople_extrafields` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_object` int(11) NOT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_socpeople_extrafields` (`fk_object`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_socpeople_extrafields` +-- + +LOCK TABLES `llx_socpeople_extrafields` WRITE; +/*!40000 ALTER TABLE `llx_socpeople_extrafields` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_socpeople_extrafields` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_stock_mouvement` +-- + +DROP TABLE IF EXISTS `llx_stock_mouvement`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_stock_mouvement` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `datem` datetime DEFAULT NULL, + `fk_product` int(11) NOT NULL, + `fk_entrepot` int(11) NOT NULL, + `value` double DEFAULT NULL, + `price` float(13,4) DEFAULT '0.0000', + `type_mouvement` smallint(6) DEFAULT NULL, + `fk_user_author` int(11) DEFAULT NULL, + `label` varchar(128) DEFAULT NULL, + `fk_origin` int(11) DEFAULT NULL, + `origintype` varchar(32) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_stock_mouvement_fk_product` (`fk_product`), + KEY `idx_stock_mouvement_fk_entrepot` (`fk_entrepot`) +) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_stock_mouvement` +-- + +LOCK TABLES `llx_stock_mouvement` WRITE; +/*!40000 ALTER TABLE `llx_stock_mouvement` DISABLE KEYS */; +INSERT INTO `llx_stock_mouvement` VALUES (1,'2010-07-08 22:43:51','2010-07-09 00:43:51',2,2,1000,0.0000,0,1,'Correct stock',NULL,NULL),(3,'2010-07-10 22:56:18','2010-07-11 00:56:18',4,2,500,0.0000,0,1,'Init',NULL,NULL),(4,'2010-07-10 23:02:20','2010-07-11 01:02:20',4,2,500,0.0000,0,1,'',NULL,NULL),(5,'2010-07-11 16:49:44','2010-07-11 18:49:44',4,1,2,10.0000,3,1,'',NULL,NULL),(6,'2010-07-11 16:49:44','2010-07-11 18:49:44',1,1,4,0.0000,3,1,'',NULL,NULL),(7,'2013-01-19 17:22:48','2013-01-19 18:22:48',11,1,-1,0.0000,2,1,'Facture créée dans DoliPOS',NULL,NULL),(8,'2013-01-19 17:22:48','2013-01-19 18:22:48',4,1,-1,5.0000,2,1,'Facture créée dans DoliPOS',NULL,NULL),(9,'2013-01-19 17:22:48','2013-01-19 18:22:48',1,1,-2,0.0000,2,1,'Facture créée dans DoliPOS',NULL,NULL),(10,'2013-01-19 17:31:10','2013-01-19 18:31:10',2,1,-1,0.0000,2,1,'Facture créée dans DoliPOS',NULL,NULL),(11,'2013-01-19 17:31:58','2013-01-19 18:31:58',2,1,-1,0.0000,2,1,'Facture créée dans DoliPOS',NULL,NULL); +/*!40000 ALTER TABLE `llx_stock_mouvement` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_tva` +-- + +DROP TABLE IF EXISTS `llx_tva`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_tva` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `datep` date DEFAULT NULL, + `datev` date DEFAULT NULL, + `amount` double NOT NULL DEFAULT '0', + `label` varchar(255) DEFAULT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `note` text, + `fk_bank` int(11) DEFAULT NULL, + `fk_user_creat` int(11) DEFAULT NULL, + `fk_user_modif` int(11) DEFAULT NULL, + `fk_typepayment` int(11) DEFAULT NULL, + `num_payment` varchar(50) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_tva` +-- + +LOCK TABLES `llx_tva` WRITE; +/*!40000 ALTER TABLE `llx_tva` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_tva` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_update_modules` +-- + +DROP TABLE IF EXISTS `llx_update_modules`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_update_modules` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `modulekey` varchar(24) DEFAULT NULL, + `datekey` date DEFAULT NULL, + `versionkey` double DEFAULT NULL, + `lastrequestdate` datetime DEFAULT NULL, + `email` varchar(128) DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_update_modules` +-- + +LOCK TABLES `llx_update_modules` WRITE; +/*!40000 ALTER TABLE `llx_update_modules` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_update_modules` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_user` +-- + +DROP TABLE IF EXISTS `llx_user`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_user` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_user_creat` int(11) DEFAULT NULL, + `fk_user_modif` int(11) DEFAULT NULL, + `login` varchar(24) NOT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `civility` varchar(6) DEFAULT NULL, + `ref_ext` varchar(50) DEFAULT NULL, + `ref_int` varchar(50) DEFAULT NULL, + `pass` varchar(32) DEFAULT NULL, + `pass_crypted` varchar(128) DEFAULT NULL, + `pass_temp` varchar(32) DEFAULT NULL, + `lastname` varchar(50) DEFAULT NULL, + `firstname` varchar(50) DEFAULT NULL, + `job` varchar(128) DEFAULT NULL, + `skype` varchar(255) DEFAULT NULL, + `office_phone` varchar(20) DEFAULT NULL, + `office_fax` varchar(20) DEFAULT NULL, + `user_mobile` varchar(20) DEFAULT NULL, + `email` varchar(255) DEFAULT NULL, + `signature` text, + `admin` smallint(6) DEFAULT '0', + `webcal_login` varchar(25) DEFAULT NULL, + `phenix_login` varchar(25) DEFAULT NULL, + `phenix_pass` varchar(128) DEFAULT NULL, + `module_comm` smallint(6) DEFAULT '1', + `module_compta` smallint(6) DEFAULT '1', + `fk_societe` int(11) DEFAULT NULL, + `fk_socpeople` int(11) DEFAULT NULL, + `fk_member` int(11) DEFAULT NULL, + `note` text, + `datelastlogin` datetime DEFAULT NULL, + `datepreviouslogin` datetime DEFAULT NULL, + `egroupware_id` int(11) DEFAULT NULL, + `ldap_sid` varchar(255) DEFAULT NULL, + `statut` tinyint(4) DEFAULT '1', + `photo` varchar(255) DEFAULT NULL, + `lang` varchar(6) DEFAULT NULL, + `openid` varchar(255) DEFAULT NULL, + `fk_user` int(11) DEFAULT NULL, + `thm` double(24,8) DEFAULT NULL, + `address` varchar(255) DEFAULT NULL, + `zip` varchar(25) DEFAULT NULL, + `town` varchar(50) DEFAULT NULL, + `fk_state` int(11) DEFAULT '0', + `fk_country` int(11) DEFAULT '0', + `color` varchar(6) DEFAULT NULL, + `accountancy_code` varchar(32) DEFAULT NULL, + `barcode` varchar(255) DEFAULT NULL, + `fk_barcode_type` int(11) DEFAULT '0', + `nb_holiday` int(11) DEFAULT '0', + `salary` double(24,8) DEFAULT NULL, + `tjm` double(24,8) DEFAULT NULL, + `salaryextra` double(24,8) DEFAULT NULL, + `weeklyhours` double(16,8) DEFAULT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_user_login` (`login`,`entity`), + UNIQUE KEY `uk_user_fk_socpeople` (`fk_socpeople`), + UNIQUE KEY `uk_user_fk_member` (`fk_member`), + KEY `uk_user_fk_societe` (`fk_societe`) +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_user` +-- + +LOCK TABLES `llx_user` WRITE; +/*!40000 ALTER TABLE `llx_user` DISABLE KEYS */; +INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2012-12-12 16:54:10',NULL,NULL,'admin',0,NULL,NULL,NULL,'admin','21232f297a57a5a743894a0e4a801fc3',NULL,'SuperAdminName','Firstname','',NULL,'','','','bidon@destailleur.fr','',1,'','','',1,1,NULL,NULL,NULL,'','2014-12-21 20:52:09','2014-12-21 13:51:38',NULL,'',1,'01.jpg',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(2,'2010-07-08 13:54:48','2010-07-08 09:54:48',NULL,NULL,'demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,'John','Doe',NULL,NULL,'09123123','','','johndoe@mycompany.com',NULL,0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(3,'2010-07-11 16:18:59','2013-02-20 18:07:21',NULL,NULL,'adupont',1,NULL,NULL,NULL,'adupont','00856ab2bbb748aa29aa335a6e3a2407',NULL,'Dupont','Alain','',NULL,'','','','toto@aa.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(4,'2013-01-23 17:52:27','2013-02-20 18:48:01',NULL,NULL,'aaa',1,NULL,NULL,NULL,'aaa','47bce5c74f589f4867dbd57e9ca9f808',NULL,'aaa','','',NULL,'','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,5,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(5,'2013-01-23 17:52:37','2013-01-23 15:52:37',NULL,NULL,'bbb',0,NULL,NULL,NULL,'bbb','08f8e0260c64418510cefb2b06eee5cd',NULL,'bbb','','',NULL,'','','','','',1,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(6,'2013-02-16 20:22:40','2013-02-16 18:22:40',NULL,NULL,'aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 18:48:15',NULL,NULL,'zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 15:10:14',NULL,NULL,'zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf
    \r\nfsdfsd
    \r\nfsdfs',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,NULL,'','','',NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL); +/*!40000 ALTER TABLE `llx_user` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_user_alert` +-- + +DROP TABLE IF EXISTS `llx_user_alert`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_user_alert` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `type` int(11) DEFAULT NULL, + `fk_contact` int(11) DEFAULT NULL, + `fk_user` int(11) DEFAULT NULL, + PRIMARY KEY (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_user_alert` +-- + +LOCK TABLES `llx_user_alert` WRITE; +/*!40000 ALTER TABLE `llx_user_alert` DISABLE KEYS */; +INSERT INTO `llx_user_alert` VALUES (1,1,1,1); +/*!40000 ALTER TABLE `llx_user_alert` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_user_clicktodial` +-- + +DROP TABLE IF EXISTS `llx_user_clicktodial`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_user_clicktodial` ( + `fk_user` int(11) NOT NULL, + `url` varchar(255) DEFAULT NULL, + `login` varchar(32) DEFAULT NULL, + `pass` varchar(64) DEFAULT NULL, + `poste` varchar(20) DEFAULT NULL, + PRIMARY KEY (`fk_user`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_user_clicktodial` +-- + +LOCK TABLES `llx_user_clicktodial` WRITE; +/*!40000 ALTER TABLE `llx_user_clicktodial` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_user_clicktodial` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_user_extrafields` +-- + +DROP TABLE IF EXISTS `llx_user_extrafields`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_user_extrafields` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_object` int(11) NOT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_user_extrafields` (`fk_object`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_user_extrafields` +-- + +LOCK TABLES `llx_user_extrafields` WRITE; +/*!40000 ALTER TABLE `llx_user_extrafields` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_user_extrafields` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_user_param` +-- + +DROP TABLE IF EXISTS `llx_user_param`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_user_param` ( + `fk_user` int(11) NOT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `param` varchar(64) NOT NULL, + `value` varchar(255) NOT NULL, + UNIQUE KEY `uk_user_param` (`fk_user`,`param`,`entity`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_user_param` +-- + +LOCK TABLES `llx_user_param` WRITE; +/*!40000 ALTER TABLE `llx_user_param` DISABLE KEYS */; +INSERT INTO `llx_user_param` VALUES (1,1,'MAIN_BOXES_0','1'),(1,1,'MAIN_THEME','eldy'),(1,3,'THEME_ELDY_ENABLE_PERSONALIZED','1'),(1,1,'THEME_ELDY_RGB','ded0ed'),(1,3,'THEME_ELDY_RGB','d0ddc3'); +/*!40000 ALTER TABLE `llx_user_param` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_user_rights` +-- + +DROP TABLE IF EXISTS `llx_user_rights`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_user_rights` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_user` int(11) NOT NULL, + `fk_id` int(11) NOT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_user_rights` (`fk_user`,`fk_id`), + CONSTRAINT `fk_user_rights_fk_user_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=11900 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_user_rights` +-- + +LOCK TABLES `llx_user_rights` WRITE; +/*!40000 ALTER TABLE `llx_user_rights` DISABLE KEYS */; +INSERT INTO `llx_user_rights` VALUES (11746,1,11),(11722,1,12),(11727,1,13),(11732,1,14),(11737,1,15),(11742,1,16),(11748,1,19),(9726,1,21),(9700,1,22),(9706,1,24),(9711,1,25),(9716,1,26),(9722,1,27),(9728,1,28),(9978,1,31),(9968,1,32),(9974,1,34),(1910,1,36),(9980,1,38),(11573,1,41),(11574,1,42),(11575,1,44),(11576,1,45),(7184,1,61),(7181,1,62),(7183,1,64),(7185,1,67),(7186,1,68),(1678,1,71),(1673,1,72),(1675,1,74),(1679,1,75),(1677,1,76),(1681,1,78),(1682,1,79),(11710,1,81),(11693,1,82),(11697,1,84),(11700,1,86),(11703,1,87),(11707,1,88),(11711,1,89),(11580,1,91),(11581,1,92),(11582,1,93),(11583,1,94),(10097,1,95),(10099,1,96),(10103,1,97),(10104,1,98),(7139,1,101),(7134,1,102),(7136,1,104),(7137,1,105),(7138,1,106),(7140,1,109),(10229,1,111),(10201,1,112),(10207,1,113),(10213,1,114),(10219,1,115),(10225,1,116),(10231,1,117),(11644,1,121),(11634,1,122),(11640,1,125),(11646,1,126),(11577,1,141),(11578,1,142),(11579,1,144),(2307,1,151),(2304,1,152),(2306,1,153),(2308,1,154),(10092,1,161),(10093,1,162),(10094,1,163),(10095,1,164),(10096,1,165),(1585,1,170),(11862,1,171),(11855,1,172),(11538,1,173),(11859,1,174),(11863,1,178),(10000,1,221),(9990,1,222),(9996,1,223),(10002,1,229),(10007,1,237),(10011,1,238),(10015,1,239),(1686,1,241),(1685,1,242),(1687,1,243),(11848,1,251),(11810,1,252),(11813,1,253),(11816,1,254),(11819,1,255),(11823,1,256),(1617,1,258),(11651,1,262),(11670,1,281),(11660,1,282),(11666,1,283),(11672,1,286),(11590,1,300),(11587,1,301),(11591,1,302),(1763,1,331),(1762,1,332),(1764,1,333),(11826,1,341),(11828,1,342),(11830,1,343),(11832,1,344),(11844,1,351),(11837,1,352),(11841,1,353),(11845,1,354),(11849,1,358),(11686,1,531),(11679,1,532),(11683,1,534),(1625,1,536),(11687,1,538),(11878,1,700),(11868,1,701),(11874,1,702),(11880,1,703),(1755,1,1001),(1754,1,1002),(1756,1,1003),(1758,1,1004),(1759,1,1005),(7146,1,1101),(7143,1,1102),(7145,1,1104),(7147,1,1109),(11756,1,1181),(11804,1,1182),(11761,1,1183),(11765,1,1184),(11769,1,1185),(11773,1,1186),(11777,1,1187),(11781,1,1188),(1578,1,1201),(1579,1,1202),(11800,1,1231),(11787,1,1232),(11791,1,1233),(11795,1,1234),(11798,1,1235),(11801,1,1236),(11805,1,1237),(1736,1,1251),(11753,1,1321),(11714,1,1421),(8190,1,1791),(8187,1,1792),(8191,1,1793),(11604,1,2401),(11600,1,2402),(11606,1,2403),(11620,1,2411),(11616,1,2412),(11622,1,2413),(11626,1,2414),(1618,1,2500),(11890,1,2501),(11887,1,2503),(11891,1,2515),(9610,1,5001),(9611,1,5002),(8155,1,20001),(8159,1,20002),(8163,1,20003),(8167,1,20004),(8171,1,20005),(8175,1,20006),(10345,1,23001),(10338,1,23002),(10342,1,23003),(10346,1,23004),(7701,1,50101),(4984,1,50401),(4983,1,50402),(4985,1,50403),(4987,1,50411),(4988,1,50412),(4989,1,50415),(11896,1,55001),(11897,1,55002),(3564,1,100700),(3565,1,100701),(9596,1,101051),(9598,1,101052),(9600,1,101053),(9604,1,101060),(9605,1,101061),(7177,1,101201),(7178,1,101202),(10353,1,101250),(10355,1,101251),(8980,1,101261),(8981,1,101262),(7616,1,101331),(10030,1,101701),(10031,1,101702),(3582,1,102000),(3583,1,102001),(9819,1,400051),(9823,1,400052),(9827,1,400053),(9831,1,400055),(132,2,11),(133,2,12),(134,2,13),(135,2,14),(136,2,16),(137,2,19),(138,2,21),(139,2,22),(140,2,24),(141,2,25),(142,2,26),(143,2,27),(10359,2,31),(145,2,32),(10361,2,34),(146,2,36),(147,2,41),(148,2,42),(149,2,44),(150,2,61),(151,2,62),(152,2,64),(153,2,71),(154,2,72),(155,2,74),(156,2,75),(157,2,78),(158,2,79),(159,2,81),(160,2,82),(161,2,84),(162,2,86),(163,2,87),(164,2,88),(165,2,89),(166,2,91),(167,2,92),(168,2,93),(2475,2,95),(2476,2,96),(2477,2,97),(2478,2,98),(169,2,101),(170,2,102),(171,2,104),(172,2,109),(173,2,111),(174,2,112),(175,2,113),(176,2,114),(177,2,116),(178,2,117),(179,2,121),(180,2,122),(181,2,125),(182,2,141),(183,2,142),(184,2,144),(2479,2,151),(2480,2,152),(2481,2,153),(2482,2,154),(185,2,161),(186,2,162),(187,2,163),(188,2,164),(189,2,165),(190,2,170),(2471,2,171),(192,2,172),(2472,2,173),(193,2,221),(194,2,222),(195,2,229),(196,2,241),(197,2,242),(198,2,243),(199,2,251),(201,2,262),(202,2,281),(203,2,282),(204,2,283),(205,2,331),(2483,2,531),(207,2,532),(2484,2,534),(208,2,536),(2473,2,700),(210,2,701),(211,2,702),(2474,2,703),(212,2,1001),(213,2,1002),(214,2,1003),(215,2,1004),(216,2,1005),(217,2,1101),(218,2,1102),(219,2,1104),(220,2,1109),(221,2,1181),(222,2,1182),(223,2,1183),(224,2,1184),(225,2,1185),(226,2,1186),(227,2,1187),(228,2,1188),(229,2,1201),(230,2,1202),(231,2,1231),(232,2,1232),(233,2,1233),(234,2,1234),(235,2,1421),(236,2,2401),(237,2,2402),(238,2,2403),(239,2,2411),(240,2,2412),(241,2,2413),(242,2,2500),(2470,2,2501),(243,2,2515),(10363,2,20001),(10364,2,20002),(10365,2,20003),(10366,2,20004),(10367,2,20005),(10368,2,20006),(10362,2,50101),(10372,2,101250),(1807,3,11),(1808,3,31),(1809,3,36),(1810,3,41),(1811,3,61),(1812,3,71),(1813,3,72),(1814,3,74),(1815,3,75),(1816,3,78),(1817,3,79),(1818,3,91),(1819,3,95),(1820,3,97),(1821,3,111),(1822,3,121),(1823,3,122),(1824,3,125),(1825,3,161),(1826,3,170),(1827,3,171),(1828,3,172),(1829,3,221),(1830,3,222),(1831,3,229),(1832,3,241),(1833,3,242),(1834,3,243),(1835,3,251),(1836,3,255),(1837,3,256),(1838,3,262),(1839,3,281),(1840,3,282),(1841,3,283),(1842,3,331),(1843,3,531),(1844,3,536),(1845,3,700),(1846,3,1001),(1847,3,1002),(1848,3,1003),(1849,3,1004),(1850,3,1005),(1851,3,1181),(1852,3,1182),(1853,3,1201),(1854,3,1202),(1855,3,1231),(1856,3,2401),(1857,3,2402),(1858,3,2403),(1859,3,2411),(1860,3,2412),(1861,3,2413),(1862,3,2500),(1863,3,2515),(8026,4,11),(8027,4,21),(8028,4,31),(8029,4,41),(8030,4,61),(8031,4,71),(8032,4,72),(8033,4,74),(8034,4,75),(8035,4,78),(8036,4,79),(8037,4,81),(8038,4,91),(8039,4,95),(8040,4,97),(8041,4,101),(8042,4,111),(8043,4,121),(8044,4,151),(8045,4,161),(8046,4,171),(8047,4,221),(8048,4,222),(8049,4,229),(8050,4,241),(8051,4,242),(8052,4,243),(8146,4,251),(8147,4,253),(8053,4,262),(8054,4,281),(8055,4,331),(8056,4,341),(8057,4,342),(8058,4,343),(8059,4,344),(8060,4,531),(8061,4,700),(8062,4,1001),(8063,4,1002),(8064,4,1003),(8065,4,1004),(8066,4,1005),(8067,4,1101),(8068,4,1181),(8069,4,1182),(8070,4,1201),(8071,4,1202),(8072,4,1231),(8073,4,2401),(8074,4,2501),(8075,4,2503),(8076,4,2515),(8077,4,20001),(8078,4,50101),(8079,4,101201),(8080,4,101261),(8081,4,102000),(8082,4,400051),(8083,4,400052),(8084,4,400053),(8085,4,400055),(11749,5,11),(11725,5,12),(11729,5,13),(11735,5,14),(11739,5,15),(11745,5,16),(11751,5,19),(9729,5,21),(9703,5,22),(9709,5,24),(9713,5,25),(9719,5,26),(9725,5,27),(9731,5,28),(9981,5,31),(9971,5,32),(9977,5,34),(9983,5,38),(8089,5,41),(8090,5,61),(8091,5,71),(8092,5,72),(8093,5,74),(8094,5,75),(8095,5,78),(8096,5,79),(11712,5,81),(11695,5,82),(11699,5,84),(11701,5,86),(11705,5,87),(11709,5,88),(11713,5,89),(9799,5,91),(9789,5,92),(9795,5,93),(9801,5,94),(10098,5,95),(10100,5,96),(10105,5,97),(10106,5,98),(8101,5,101),(10232,5,111),(10204,5,112),(10210,5,113),(10216,5,114),(10222,5,115),(10228,5,116),(10234,5,117),(11647,5,121),(11637,5,122),(11643,5,125),(11649,5,126),(8104,5,151),(8105,5,161),(11864,5,171),(11857,5,172),(11540,5,173),(11861,5,174),(11865,5,178),(10003,5,221),(9993,5,222),(9999,5,223),(10005,5,229),(10009,5,237),(10013,5,238),(10017,5,239),(8110,5,241),(8111,5,242),(8112,5,243),(11850,5,251),(11811,5,252),(11815,5,253),(11817,5,254),(11821,5,255),(11825,5,256),(11653,5,262),(11673,5,281),(11663,5,282),(11669,5,283),(11675,5,286),(11592,5,300),(11589,5,301),(11593,5,302),(8115,5,331),(11827,5,341),(11829,5,342),(11831,5,343),(11833,5,344),(11846,5,351),(11839,5,352),(11843,5,353),(11847,5,354),(11851,5,358),(11688,5,531),(11681,5,532),(11685,5,534),(11689,5,538),(11881,5,700),(11871,5,701),(11877,5,702),(11883,5,703),(8122,5,1001),(8123,5,1002),(8124,5,1003),(8125,5,1004),(8126,5,1005),(8127,5,1101),(11757,5,1181),(11806,5,1182),(11763,5,1183),(11767,5,1184),(11771,5,1185),(11775,5,1186),(11779,5,1187),(11783,5,1188),(8130,5,1201),(8131,5,1202),(11802,5,1231),(11789,5,1232),(11793,5,1233),(11797,5,1234),(11799,5,1235),(11803,5,1236),(11807,5,1237),(11755,5,1321),(11715,5,1421),(8192,5,1791),(8189,5,1792),(8193,5,1793),(11607,5,2401),(11603,5,2402),(11609,5,2403),(11623,5,2411),(11619,5,2412),(11625,5,2413),(11627,5,2414),(11892,5,2501),(11889,5,2503),(11893,5,2515),(9612,5,5001),(9613,5,5002),(8157,5,20001),(8161,5,20002),(8165,5,20003),(8169,5,20004),(8173,5,20005),(8177,5,20006),(10347,5,23001),(10340,5,23002),(10344,5,23003),(10348,5,23004),(8138,5,50101),(11898,5,55001),(11899,5,55002),(9597,5,101051),(9599,5,101052),(9601,5,101053),(9606,5,101060),(9607,5,101061),(8139,5,101201),(10356,5,101250),(10358,5,101251),(8982,5,101261),(8983,5,101262),(10032,5,101701),(10033,5,101702),(8141,5,102000),(9821,5,400051),(9825,5,400052),(9829,5,400053),(9833,5,400055),(8194,6,11),(8195,6,21),(8196,6,31),(8197,6,41),(8198,6,61),(8199,6,71),(8200,6,72),(8201,6,74),(8202,6,75),(8203,6,78),(8204,6,79),(8205,6,81),(8206,6,91),(8207,6,95),(8208,6,97),(8209,6,101),(8210,6,111),(8211,6,121),(8212,6,151),(8213,6,161),(8214,6,171),(8215,6,221),(8216,6,222),(8217,6,229),(8218,6,241),(8219,6,242),(8220,6,243),(8221,6,262),(8222,6,281),(8223,6,331),(8224,6,341),(8225,6,342),(8226,6,343),(8227,6,344),(8228,6,531),(8229,6,700),(8230,6,1001),(8231,6,1002),(8232,6,1003),(8233,6,1004),(8234,6,1005),(8235,6,1101),(8236,6,1181),(8237,6,1182),(8238,6,1201),(8239,6,1202),(8240,6,1231),(8241,6,1791),(8242,6,2401),(8243,6,2501),(8244,6,2503),(8245,6,2515),(8246,6,5001),(8247,6,20001),(8248,6,50101),(8249,6,101201),(8250,6,101261),(8251,6,102000),(8252,6,400051),(8253,6,400052),(8254,6,400053),(8255,6,400055),(8256,7,11),(8257,7,21),(8258,7,31),(8259,7,41),(8260,7,61),(8261,7,71),(8262,7,72),(8263,7,74),(8264,7,75),(8265,7,78),(8266,7,79),(8267,7,81),(8268,7,91),(8269,7,95),(8270,7,97),(8271,7,101),(8272,7,111),(8273,7,121),(8274,7,151),(8275,7,161),(8276,7,171),(8277,7,221),(8278,7,222),(8279,7,229),(8280,7,241),(8281,7,242),(8282,7,243),(8283,7,262),(8284,7,281),(8285,7,331),(8286,7,341),(8287,7,342),(8288,7,343),(8289,7,344),(8290,7,531),(8291,7,700),(8292,7,1001),(8293,7,1002),(8294,7,1003),(8295,7,1004),(8296,7,1005),(8297,7,1101),(8298,7,1181),(8299,7,1182),(8300,7,1201),(8301,7,1202),(8302,7,1231),(8303,7,1791),(8304,7,2401),(8305,7,2501),(8306,7,2503),(8307,7,2515),(8308,7,5001),(8309,7,20001),(8310,7,50101),(8311,7,101201),(8312,7,101261),(8313,7,102000),(8314,7,400051),(8315,7,400052),(8316,7,400053),(8317,7,400055),(8318,9,11),(8319,9,21),(8320,9,31),(8321,9,41),(8322,9,61),(8323,9,71),(8324,9,72),(8325,9,74),(8326,9,75),(8327,9,78),(8328,9,79),(8329,9,81),(8330,9,91),(8331,9,95),(8332,9,97),(8333,9,101),(8334,9,111),(8335,9,121),(8336,9,151),(8337,9,161),(8338,9,171),(8339,9,221),(8340,9,222),(8341,9,229),(8342,9,241),(8343,9,242),(8344,9,243),(8345,9,262),(8346,9,281),(8347,9,331),(8348,9,341),(8349,9,342),(8350,9,343),(8351,9,344),(8352,9,531),(8353,9,700),(8354,9,1001),(8355,9,1002),(8356,9,1003),(8357,9,1004),(8358,9,1005),(8359,9,1101),(8360,9,1181),(8361,9,1182),(8362,9,1201),(8363,9,1202),(8364,9,1231),(8365,9,1791),(8366,9,2401),(8367,9,2501),(8368,9,2503),(8369,9,2515),(8370,9,5001),(8371,9,20001),(8372,9,50101),(8373,9,101201),(8374,9,101261),(8375,9,102000),(8376,9,400051),(8377,9,400052),(8378,9,400053),(8379,9,400055); +/*!40000 ALTER TABLE `llx_user_rights` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_usergroup` +-- + +DROP TABLE IF EXISTS `llx_usergroup`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_usergroup` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `nom` varchar(255) NOT NULL, + `entity` int(11) NOT NULL DEFAULT '1', + `datec` datetime DEFAULT NULL, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `note` text, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_usergroup_name` (`nom`,`entity`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_usergroup` +-- + +LOCK TABLES `llx_usergroup` WRITE; +/*!40000 ALTER TABLE `llx_usergroup` DISABLE KEYS */; +INSERT INTO `llx_usergroup` VALUES (1,'ggg',1,'2013-01-16 20:48:08','2013-01-16 19:48:08','ggg'); +/*!40000 ALTER TABLE `llx_usergroup` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_usergroup_extrafields` +-- + +DROP TABLE IF EXISTS `llx_usergroup_extrafields`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_usergroup_extrafields` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `fk_object` int(11) NOT NULL, + `import_key` varchar(14) DEFAULT NULL, + PRIMARY KEY (`rowid`), + KEY `idx_usergroup_extrafields` (`fk_object`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_usergroup_extrafields` +-- + +LOCK TABLES `llx_usergroup_extrafields` WRITE; +/*!40000 ALTER TABLE `llx_usergroup_extrafields` DISABLE KEYS */; +/*!40000 ALTER TABLE `llx_usergroup_extrafields` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_usergroup_rights` +-- + +DROP TABLE IF EXISTS `llx_usergroup_rights`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_usergroup_rights` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `fk_usergroup` int(11) NOT NULL, + `fk_id` int(11) NOT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `fk_usergroup` (`fk_usergroup`,`fk_id`), + CONSTRAINT `fk_usergroup_rights_fk_usergroup` FOREIGN KEY (`fk_usergroup`) REFERENCES `llx_usergroup` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_usergroup_rights` +-- + +LOCK TABLES `llx_usergroup_rights` WRITE; +/*!40000 ALTER TABLE `llx_usergroup_rights` DISABLE KEYS */; +INSERT INTO `llx_usergroup_rights` VALUES (1,1,2401),(2,1,2402),(3,1,2403),(4,1,2411),(5,1,2412),(6,1,2413); +/*!40000 ALTER TABLE `llx_usergroup_rights` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `llx_usergroup_user` +-- + +DROP TABLE IF EXISTS `llx_usergroup_user`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `llx_usergroup_user` ( + `rowid` int(11) NOT NULL AUTO_INCREMENT, + `entity` int(11) NOT NULL DEFAULT '1', + `fk_user` int(11) NOT NULL, + `fk_usergroup` int(11) NOT NULL, + PRIMARY KEY (`rowid`), + UNIQUE KEY `uk_usergroup_user` (`entity`,`fk_user`,`fk_usergroup`), + KEY `fk_usergroup_user_fk_user` (`fk_user`), + KEY `fk_usergroup_user_fk_usergroup` (`fk_usergroup`), + CONSTRAINT `fk_usergroup_user_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`), + CONSTRAINT `fk_usergroup_user_fk_usergroup` FOREIGN KEY (`fk_usergroup`) REFERENCES `llx_usergroup` (`rowid`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `llx_usergroup_user` +-- + +LOCK TABLES `llx_usergroup_user` WRITE; +/*!40000 ALTER TABLE `llx_usergroup_user` DISABLE KEYS */; +INSERT INTO `llx_usergroup_user` VALUES (1,1,1,1); +/*!40000 ALTER TABLE `llx_usergroup_user` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2014-12-21 21:06:14 diff --git a/dev/initdata/savedemo.sh b/dev/initdata/savedemo.sh index 5426a6e6391..c4de22c5e2f 100755 --- a/dev/initdata/savedemo.sh +++ b/dev/initdata/savedemo.sh @@ -193,13 +193,15 @@ export list=" --ignore-table=$base.llx_cabinetmed_societe --ignore-table=$base.llx_fournisseur_ca --ignore-table=$base.llx_google_maps + --ignore-table=$base.llx_notes --ignore-table=$base.llx_pos_paiement_ticket --ignore-table=$base.llx_pos_places --ignore-table=$base.llx_pos_ticket --ignore-table=$base.llx_publi_c_contact_list --ignore-table=$base.llx_publi_c_dnd_list --ignore-table=$base.llx_publi_c_method_list - --ignore-table=$base.llx_ultimatepdf + --ignore-table=$base.llx_ultimatepdf + --ignore-table=$base.llx_ventilation_achat " echo "mysqldump -P$port -u$admin -p***** $list $base > $mydir/$dumpfile" mysqldump -P$port -u$admin $passwd $list $base > $mydir/$dumpfile From a519df5d00da565e65054f795d51ec93f9f0575a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Dec 2014 01:43:20 +0100 Subject: [PATCH 112/172] Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop --- htdocs/theme/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/theme/.gitignore b/htdocs/theme/.gitignore index bad6db7e4d2..59c154b7d5f 100644 --- a/htdocs/theme/.gitignore +++ b/htdocs/theme/.gitignore @@ -1,2 +1,3 @@ /bootstrap /oblyon +/autre From c9db04985e475cc9b80aba244ec9f9b77add538c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Dec 2014 02:53:33 +0100 Subject: [PATCH 113/172] Update image for menu --- htdocs/theme/eldy/img/menus/agenda.png | Bin 1586 -> 700 bytes htdocs/theme/eldy/img/menus/agenda_over.png | Bin 0 -> 541 bytes htdocs/theme/eldy/img/menus/bank.png | Bin 719 -> 827 bytes htdocs/theme/eldy/img/menus/bank_over.png | Bin 0 -> 620 bytes htdocs/theme/eldy/img/menus/commercial.png | Bin 1472 -> 845 bytes .../theme/eldy/img/menus/commercial_over.png | Bin 0 -> 638 bytes htdocs/theme/eldy/img/menus/company.png | Bin 2141 -> 572 bytes htdocs/theme/eldy/img/menus/company_over.png | Bin 0 -> 406 bytes htdocs/theme/eldy/img/menus/cron.png | Bin 2165 -> 0 bytes htdocs/theme/eldy/img/menus/ecm.png | Bin 2372 -> 912 bytes htdocs/theme/eldy/img/menus/ecm_over.png | Bin 0 -> 647 bytes htdocs/theme/eldy/img/menus/externalsite.png | Bin 624 -> 531 bytes .../eldy/img/menus/externalsite_over.png | Bin 0 -> 404 bytes htdocs/theme/eldy/img/menus/ftp.png | Bin 0 -> 788 bytes htdocs/theme/eldy/img/menus/ftp_over.png | Bin 0 -> 563 bytes htdocs/theme/eldy/img/menus/generic1.png | Bin 976 -> 570 bytes htdocs/theme/eldy/img/menus/generic1_over.png | Bin 0 -> 486 bytes htdocs/theme/eldy/img/menus/generic2.png | Bin 943 -> 570 bytes htdocs/theme/eldy/img/menus/generic2_over.png | Bin 0 -> 548 bytes htdocs/theme/eldy/img/menus/generic3.png | Bin 742 -> 570 bytes htdocs/theme/eldy/img/menus/generic3_over.png | Bin 0 -> 486 bytes htdocs/theme/eldy/img/menus/generic4.png | Bin 992 -> 570 bytes htdocs/theme/eldy/img/menus/generic4_over.png | Bin 0 -> 486 bytes htdocs/theme/eldy/img/menus/globe.png | Bin 2175 -> 1175 bytes htdocs/theme/eldy/img/menus/globe_over.png | Bin 0 -> 844 bytes htdocs/theme/eldy/img/menus/holiday.png | Bin 1723 -> 1086 bytes htdocs/theme/eldy/img/menus/home.png | Bin 1008 -> 679 bytes htdocs/theme/eldy/img/menus/home_over.png | Bin 0 -> 484 bytes htdocs/theme/eldy/img/menus/mail.png | Bin 1041 -> 718 bytes htdocs/theme/eldy/img/menus/mail_over.png | Bin 0 -> 534 bytes htdocs/theme/eldy/img/menus/members.png | Bin 1366 -> 1044 bytes htdocs/theme/eldy/img/menus/members_over.png | Bin 0 -> 720 bytes htdocs/theme/eldy/img/menus/money.png | Bin 1751 -> 1259 bytes htdocs/theme/eldy/img/menus/money_over.png | Bin 0 -> 940 bytes htdocs/theme/eldy/img/menus/pointofsale.png | Bin 1460 -> 542 bytes .../theme/eldy/img/menus/pointofsale_over.png | Bin 0 -> 424 bytes htdocs/theme/eldy/img/menus/products.png | Bin 1519 -> 510 bytes htdocs/theme/eldy/img/menus/products_over.png | Bin 0 -> 358 bytes htdocs/theme/eldy/img/menus/project.png | Bin 1075 -> 449 bytes htdocs/theme/eldy/img/menus/project_over.png | Bin 0 -> 360 bytes htdocs/theme/eldy/img/menus/shop.png | Bin 0 -> 679 bytes htdocs/theme/eldy/img/menus/shop_over.png | Bin 0 -> 502 bytes htdocs/theme/eldy/img/menus/tools.png | Bin 1404 -> 1052 bytes htdocs/theme/eldy/img/menus/tools_over.png | Bin 0 -> 706 bytes htdocs/theme/eldy/style.css.php | 2 +- 45 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 htdocs/theme/eldy/img/menus/agenda_over.png create mode 100644 htdocs/theme/eldy/img/menus/bank_over.png create mode 100644 htdocs/theme/eldy/img/menus/commercial_over.png create mode 100644 htdocs/theme/eldy/img/menus/company_over.png delete mode 100644 htdocs/theme/eldy/img/menus/cron.png create mode 100644 htdocs/theme/eldy/img/menus/ecm_over.png create mode 100644 htdocs/theme/eldy/img/menus/externalsite_over.png create mode 100644 htdocs/theme/eldy/img/menus/ftp.png create mode 100644 htdocs/theme/eldy/img/menus/ftp_over.png create mode 100644 htdocs/theme/eldy/img/menus/generic1_over.png create mode 100644 htdocs/theme/eldy/img/menus/generic2_over.png create mode 100644 htdocs/theme/eldy/img/menus/generic3_over.png create mode 100644 htdocs/theme/eldy/img/menus/generic4_over.png create mode 100644 htdocs/theme/eldy/img/menus/globe_over.png create mode 100644 htdocs/theme/eldy/img/menus/home_over.png create mode 100644 htdocs/theme/eldy/img/menus/mail_over.png create mode 100644 htdocs/theme/eldy/img/menus/members_over.png create mode 100644 htdocs/theme/eldy/img/menus/money_over.png create mode 100644 htdocs/theme/eldy/img/menus/pointofsale_over.png create mode 100644 htdocs/theme/eldy/img/menus/products_over.png create mode 100644 htdocs/theme/eldy/img/menus/project_over.png create mode 100644 htdocs/theme/eldy/img/menus/shop.png create mode 100644 htdocs/theme/eldy/img/menus/shop_over.png create mode 100644 htdocs/theme/eldy/img/menus/tools_over.png diff --git a/htdocs/theme/eldy/img/menus/agenda.png b/htdocs/theme/eldy/img/menus/agenda.png index 866037c9b543df97f7e01e4f7873850ba597d030..0798d15f938689a6b894e2da42fd7cbe5d73aea4 100644 GIT binary patch literal 700 zcmV;t0z>_YP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#q{Lk(I000KNoL_t(o!|mC@)k^_kQ=x z%rkR6tE;QZYFm`py6|22O#nZZ^6XSu;2&cq0FPk~H}itunnTQ!c-_tU4l4f$2T`qi zJ{o+@>|TA1>oqxbMe2zT#zQ z@9+S3acMK8O+Rj6JjFK>+F4XEiBEVEphjcDw_DHm;eJqjInmzYPPnc;8^l9g2=7kf zMcsR8EjRdk0jgTpY6;cqeG{S1ho|_N(kCreRQPcWWT;hZ;J+38|1i~Q<+tNp3u@IG z_;=t;=rbKl`Bn$)Q23(NjOlHqNuMKlg@v%|+SaM5av);`txuaYJCL}q;83Tg%H0|8 zYiiHnLyG@=O8@1J?uA>0ueGTB`v(5gDPyfsyuY#GKPRTUG~0#i8NW<&EbMGDHu_@2 ze`%p$+LHlaN%U(L>w9eY3jUyX1GUgxxE{_(!TCIDo7r`ixWcMBmsqG~8;qL;EVUZ6 z-4nBm*t?F+#Z)*Ai)!uGHq&iF{>G0gi*aA0000}2P)41MT?JuDYQ~ktt?pEL~DJZ z(4x|`Nz+6${b4aJB{WKZC~7yYJogFvp4r*iot>R!@9DX-%d$MQy~&rkb06P#&$;KG zdl@FCEMLAnTF=kVXBIDBoUmfWicNWWc}>N|#ZRiLs)XamkB4e&YyIWr<-!Nszak5Gg{L?Lf$Yf~D= z2%%r4PnLtw(Qy|J9z3MW&dT12H1XqnQOjc8wRY|6ZyY{yr1#$a9)%RSi5wh*anOQp zLlJ=3_8?V7LA~Ap_4OJFt*b`5#2H;jEje`f@S_L4j}$8;d5i*LLD}l+>Hxc7YG0(E zj9P8b*mydKuHTQeag;kdJ9}bJN_XwL+1d36$Y_PvFN04Cf+&q4@Ef4Om6NcLgq3jH z1bhfOFM!q!4(p-%=uu~SdU{UOlC4{}FzeT^-+i^Y1w5h*oZu(C7y!W^oCGgI3IQBL zAu$kA{-cn>V>~#I^N6&cbar*a)@|E57A;zoqzEloupr^xy?ciSbS7}PeZhDN{`*scg=W@Z*%ymSRcL}GFB z^b4#vfRLv_kO4kMA>KcRi;<@T=iy=@%;O_>f9-;t9QEzg)YLd8N3Fin*?k{Ob~iCQ zc(8FII6V?Lg}^lM5>bR$Ur_mXDUc(eVq||rWXY2En3~#;LPMh*^cih1Y~jG@@WKe|hfz+N1{<#Y{KY2t>cZto zID7sA{CM+c6mTmG9U65hd^#&fnp#?6>C&Y&%#o^U|KJDLn+FC*Twy+on_OsW1`LL3rlhoV_^H7j6*9&MjZjzoFN7Cma{3gZ0kc!# z)7f}vIDH0^l9G#=f`WqfuAW}nNvMzsT}ORQ_h}rX&jUMw5fn4pV=O|x{RiHMgoK3G znANLS@Bik;_b_aAlVJ-BW~YFg?*|(Oz*JbD3o49OIRr%rMab{>A3(vTP5l_&^O&UM zSwc8sFjJd@4}*rb%}s?oN-!AEG8!lu8JTC2l9FaI1^I8P z)N1v)AAV{_(|yE*1MDW|Y1VSvNXx)W%mq$_#yUET|t4Pm7ExcV^;=(iZ zYBaIp&6u{Y;(+eY-oNRd5DOk!m&XroB@czlFZpE#unKK^HjW&whJC(jZS#IR+wpYD%CkO}TFw6wNC z(dNzf5))s{o^-QLd95VUoAHC{qt0J`>sBJk>8%&rBX~t$zlnT=?>l?!;^Fz?R zE!W`8muI1}@(>gj7WQXkW`04V3n`)-Kgp7rO7tNSDfH5!_X!f^Vs!3Xwrp7q&0Wd! k<`vTuPYPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Uj0XJcGUf00EszL_t(o!|j;SZG$inhJUKQHye}TLe;1Qe& z>THk^$OPAyi)0~)ZLr-~^+~({#vk@?-+wNM2&u*$5{?X?;co!Gp14<~0^b2p3|s>^ z0cb+O-v{{S7Qj!|e8iFO0F*Q9pfj{p00sckrNhEwhV}8GGykkgQ8o_%+LSe4r3^o0 z_&M@(MuDY5oPk@fP7rHe8Z@`^8xGnunL1F~5V*6Orq+ zA)-$*ha#d%YuA%qNL!XA;Oa_;a^hL5wHH3&U1cM=QgVqe&1|)7d!uWn8Z zGhzZN$4P zS{E)O?|Nb;E#xt!_1f3=xW*DUj{ZCt_!9Vmr~lnz4IKF0AmB@6Gv2Ek9@%mvEfEsh f2Yfy~__y%C#jBVt_@Tw}00000NkvXXu0mjfo}S{j literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/bank.png b/htdocs/theme/eldy/img/menus/bank.png index 9c6300eae328e5ceb9ef00e02da20ceea075711e..fbaee7cc6bd21fb4f562365a376918f52633026f 100644 GIT binary patch literal 827 zcmV-B1H}A^P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UjF*gs!;&00O&7L_t(o!|juHgdX)@yEDi7t@D1>FBoln*mjVY;#P?LKYVapg1n-0aZv&+i z!HQiyFylX)-s1DpZw8Do2-uc^%gjst6xj(I=n1)lq)x&qJ%TnDCx%{G~U z%zL$8z(rsYa2m)O_kU3E76M0f?cF8a2}X#*zE^ysHErzdW;gIquQ7c%lt!^{YNd*>0{XDL`IKc z|0Yi6{TA#eSAV^LSGp$$yfylRz*k^#8maQAtAEGGey;Qd*LW$7KdINikAOe`{z~66 z#@d0IX)ymzrEysn0NXt5yQS|MW1FjGJ`*tJE49@w`=6>j$Fdy&o&b{#`}sh#hkrXP z^Onc_N~Ojj=|jpU_f^ZZ$?mhthP)B;LkbxyuFZ&FwrN%dxve9TtU{v*JT?|+(bxm; zlI;UvjgNmj&X@;S1{@Ugmw-NFZmaZF>G$%v1K1b9cOr$^6y^NB0I$8M3bZAOlGqAZ zRjvSbi`{P;GatMa*Z{0j--;XjcuHbafNfVed^Z+sURy`T=`Zn}l(}UrOG}l0B0F?S zLn1qLN<&8eTjra5K4nfM{=-y!3c0~*!Pm4jzDcDe{{W+U8l>_!?qmP}002ovPDHLk FV1m@oVeJ3_ literal 719 zcmV;=0xhT(th&XmxyG=&#b)!yaS;py1q?Ahh*+2-)n=K0y_`Pu0C>+9?5>+9?5>+9?5 z>+9?5>+6|^M^^v<00DGTPE!Ct=GbNc00D1FL_t(26$QbuZX8t<0MK*qOm@9?BBiiN zo3vDPNcjSOngR(?@C#{BB)Tmui+DZn&D_g5000000001lU)jJ5FMul$znlYf?Q_mq zgmAk;nhjlZj4_H3;{Fj*y)}J|F~)2{2p%4hhvT(-A7hN!gb*UUe`I-DYTsj@bM6Qs zgb1hgbuDZ&=R6RCYAqrjp4RP*;V69s0IBnJ1$OxYVC@4wRsy^LP@SMw0DQU!DI((b zU9SazS|c(tBO;1g3xK+0W@ctY#7?gT!1=Od=67Ef;Y4KtaK67>E`R>?`H#2ryLF+m z063jbr*B{TpWpskGMZj@0NyQ2*iWXtYEpT91`w)#{`=pj-@k5S+o;8J-B*>t)1{8% z^MfzunEyTB-BzwX0(0x`?!Hx3ZRCop_h8(*ySl2Y?O5UJ4z}0s)^zRrk23*0-i;01 zy#ah!o&#|C001&0^A-RhBQqm2=&q_`0ssJj{{cW-!=ga7AUOa4002ovPDHLkV1nI} Be5wEd diff --git a/htdocs/theme/eldy/img/menus/bank_over.png b/htdocs/theme/eldy/img/menus/bank_over.png new file mode 100644 index 0000000000000000000000000000000000000000..d395710a8777d9c9612301f716557ccffc9188f6 GIT binary patch literal 620 zcmV-y0+aoTP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UjR=>1v<=00HbtL_t(o!|ho?PJ>VoeKqdO4XP)Q6WAUB6J46(0n~Z|>&|7HxN&3Z z0Zi}&(i4d8P4EV7To_l+&5-;|3bch5(EpNIOc~%o9`ok^wn(C>*g=C~$y@T4e1ou? zb9@hgUm?FxVr}x*6~Ex{U&=;f3Lr4#)NTs-DS)1lPXN3&rQ3{D9?1jQR=H{NLjaDE z_W*R8qWJ@nN+1u>Z(6tM0J!|iYVtCl6W+@^b(;@ir_*i^^uA@(%zPDYb_HPL+&;DmAZX?Yo?M zPvtXdrCTv6jh6*Iewmk5%1&2N@{iK~5-hu9yiwTGH%sD?$29$=VPJ>y3zUbM@*uYA59NKm0^BP@=xx8W57==3}->Y=; z3EFCLzLCu-yTxtEuYp$1Uzv{a(N%$14Sp+;x3aP17vLAzGvAk&!lohs0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UjeGh88CP00PZPL_t(o!|j>RYg0iG$3H3lwoO%1!D^@?{x;PLS}Z930Hb)3BJ`#n z1dpPiAove>62z0B7r~PU4n9_&F+VyX3JY+8-P1Z#izBhmHH2`rC&`x5)|HUS5Q zyxp07`+f7~&CX0>N-3I^T4-WwYVh;wbl)?;0bnig6?iTDAkAdvcpb#d3=Q^4~o9&QkLq0M~* zlE5RE(WVXf=C&W@S{Lc9zv)4z(wE!aMmCPC;>-++pfTm z0egX7V5`hMmHCIj77eJ0T3sJfr+_uUi1_j$pdaY8fUeL+*Wlj*=YZn|w+NzP*Wlk- zKH4D4x(5Fdcm?#-xNfS7FdIo$c}v`+7QP2ex;|kmbQHK;rS22pS|g>zkAcPV@!Du; zuE6V+&vzN3%rvl68z*Hv-AI+xN?^aoudf4FfC+7G0Wi>LW#CB<@EgE0;5~5FBTEAv zjRL*{=<@*Fq{-8UXw%;)KHq0JsCp$`_#)RP`CVYfrRA3Z2Yq7s6p**X`opf>rd!^k zANZ^V{BGB7v(J)*Wr2c4-X_)9kPFLq0txYF6OVh6Hxuu2W%(Y9Reu2AwW1~IqqhNA zB>ItBJ_VG0cudnPSoF%k=BO>-B?j=z<;S(_PXRf9Qd)wMfnOg`Efuxv4*|OCqPG01 z06?ETUCp_bvq|CM+P$b}2R8hB18s5Zei~jPc+(rdhJ!hE9 z2dw$sDBw+D_-DYHKT*Z`B9O7W zc;PPqiI=KU-y$A)MWR)tLWI)D4sqfHVu&3_i7&Btz2m*ioH-XBb{#FqTRF61q><*~ zocWyZ?{>cMBR}Fc)|L+*9DMi49q4Cx>=5PseN6rAZia^LIKFWCtLK1^fR&C?*A4EaFkdJXADMb^`pK!O z2Od9q?AU?vdyf?R?mQ$u`s@<3XXohK`T}qq7(GHWH_RK)Kf%fKOWrQcW^;4rwl2EoC?E0g zu~CAk#L3wOMjBr-J^c{IdfxiW>lbFuoPG?b?&LM-0W6P>9q!K;_t8u zVTSh?c=lK0)S6>>XBjN#SlQ0_c;+g_)&^;2Fy(QZ&Lf=R#g|^@H@|&^rGaJvY9w zoQlPb_ZknuD>j)tc0)!Ccq{Z6X04ABCR!>-~)^DZL1J$i<2BgC~hcO1{92=Dl zw(1E=DWrfvDMZ*VoIL}r^=RuzwEgZuQbUUto3_DrT*G9VR14C~5;%}j;5>xF?Rs7G z1Ulz1nI+ZcR&#nlXBjQiB(79xY;S{9WLXZKS)B7oDe>Nu3D0hI)4OP#LmNw~vs<0% zJ+xAdY{t~9>*!2VD)o_SO`2s`r;t+My&}ZpoWC7~9%CJ8X1n^ylcp)ExlOgYiM5U} zjA+Cftt~DPv?r9p+8+S4&XE~MyNBBnD>qlcHQ1_F@d)tIM|DXx;#>0@pe!eHT>!H{1CAi&%EO3djM6qA363FQ%s!e*VDy zl_<)82s{l;0Hw~l?tS8i8sVMw1>jC8Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Uju{RL`#f00I6JOUe(4N5oY2F(Z=AtTTY=md2) zpc~K$)IZ9d&llT#2pe?gABk=Bc#-5MrywF6)gEwQJ2d#mjh@>Ar~#A!MgWFKC+dZW zB!?!Vf&4ZQQ6uF~5_n6~?YbxMn&#VOt=~eZR2l%)f_=prrxM^bfbYnfF91D{n~j{% zUCwHw0&_oHc?JLt4{hzM06g=2mTFTH(HKa|vuFNh?@N74FhB6mUt6qp{QZ<%P`OXo zcMgfs3X!QvtaG2R2EYe^*M)ntGH+IfT~_b|m&3XCx29A|s><_%Jr~ZCT?n(J`bHW& zxNgU+m+-YkGon4Q?XFR49Z7>P@080oKEUi3I4#VPO=JG*ghv~Z&E;Og<{s;{a|%mT zs7;tZ2bzvh606+ID-W}<^iD_@Wlh+Ilh6m=L~a_gtICk>2{He~FP{axj!0i)wSuDT zOMq`9!fTwMJYSX^T3drRGo){m8hjl{R2RIN@T{cZV{F-M_j_c1PKWgySbLh=&#nQl zCN$W?%yzL%1%3)kbHVGBVH3OJlWf$Jf>$1?unX`8z-M5-0&sO+<|2B9A|Qop?ny(9 zwjv_qnICygnd^T3mTWDT&+3j$I60qtzO(6;hEuW8|FFtxvb7_Phc&lkDZnSOL;nx^ Y4;OV literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/company.png b/htdocs/theme/eldy/img/menus/company.png index 95e5db620468bcff16d311bd3f0ecb36de03c004..828bf8f2e709d32ecb911377c85b8538f558671d 100644 GIT binary patch delta 536 zcmV+z0_XkR5WEB-iBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Ck2><{9 z008+zyMK{D9)I2p76BeET{mi)0005JNklFE8JI zn&zc#O-e~sZGsA$7w^S;@m_o}HdVkJE2^cnwrWPJ6@O5q+Q4##alh)Kf65duMi_ep z+?Ba(1n>f!TVgJNt(g9(>@_cdE^u#&=^E~kEL(gC^oGRrRGf3<1A{RA0s~jcH-T$Q zOw(2J0+(GJfyr*aB+)Kdcv@ a-u?jKF}KY$N0!k50000d0TvY)4nOtG0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0} zP*;Ht7XSbUxJg7oR7l6wmTQb$Wf{kR?>T4AnRDhoJA0kI_OiQdk>0cl5d;xKql6SA znn;Y%7!v)W5ie1U2})3-RlzEX5Jlr9k{A&04N#i4w0~twt?jnE+itr%%XVjWX6Jr8 zx7QDaDs9sczxjN5-w)6G{__9lN&b)Ef2f_0Jo52WGI7uPwQEWnCMHfej-vr267l-q zcR&B$`Gtj?=Xv*i>fU?LUHVqMS;!B5xJ&rH|DBPcp^1@^p;B*8_mZybP1kibAp}AQ zeBZ|~41cdytA(d$W{0O|Plxh_!h^MXecwY5JYc^m;9Vd7h*>BUMp~`rz~euCmd~idz4g}*-=BGdrTM~g#4wE8KJ>vIKM#e%{jTFE zfDl3m5c0x_EEWs3_q_X-_SDI#6NgW|s(;Paov~{>o7)z0RrbzzvC;_A9rn3-olV-v zk}Fj3Jny1=7lEc}YNi<+EtFQaSL&r!P!Ikn8A~loY zbCn21F@URB__SCX&C+dZ95|~Y{UH0M`%o2)&FMNL;Q~V1Q=y_APK^Ud0)3=++j|6@Qn-N{~~l z9lTmL=rOBA1ODYeML^Smzf37~Mqt~J%bnK>TDG8&_u1NAAZad9u`MP`{gj%p$?$30 zF4uN8sarYb3L2-1Df0CI196wTHnwqAGf2kPnfhlmp&_prNA@C6(U-I=g*~CDtZibS==_>q)UAj-*cHSv~avDC@i)vSh}fG zGSMT+)+EQ41eF?W?SB-UEOil$2N*E(bcR=OTnEEQvtd~0;G9ZFGRDSqo?c^tcDv0? zA;fIaqF8R>T?wcnY1;7AQHAy0g3W1{_rGRoy(Ae;Rv3&d(ULkR$~_e7DjN+LjyDv}pWw1<8btzZcc>Wa>HXMPe!OiP@ zHn$WON|KXVLAeT>Qwm25-GrhB1Hn9wiPkQrHr98R-xd>jK%3tc}+giDl7LiS76}z9bcdt!sVOci60NWw6^# z6jenxOxrLFyHcrGzUOPc=UpT#uU{kr`C1+epzT6PhrXyFphyP8Wfb9aC_lg}8HIAW zj8GIL5H&o6fJU>$hKaW!>3k0lF* wmF@LL?Y4Hye)e5A-T2oXcivg!|Ec~B>^Ya2SP#C~Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?hRKk6QcL#T#LS5yxbDj z0E;X!#V4_weWx!>|NKnv|EtGu&89A{;LNF4DP%sUyZntkb7zOHi%VZ$jbfQduietc z{A%~FJy*Vxd(2Aijf~#I#{$hg?2+xMNk)$wv*J!3-_vs=?yfV>6YmEWY@b$Ds;+;c v?zE5V%};~X54cO)?NVPzt=JU!Nz8^(ebcG0kG<|@f zhGCk@X*r@*SrN^}8T{p|e17pGwrwpVn@vQrU5H$luS8AMV{XGORpb zia<)yT3w~STfYRIWd=0;{%-Yf%`SuQ$ zS5r7mg$i7fnnaT>kuUK`5$h?D$YhnS>0;vIg|w8x8^*@&?y;SB-$T9GBv`#pShV(T80uqfkUhX6HYl)S(k32M934HSMubtMHk68_QmH{B zoylb4ND;>h5yxmM!V)1e@`+-fFp7z9y$pn*Q63!P$);=L@T)AUPDTtLI3`62L4vm%Nn~Px>ZZZu6Y3B*;cC=7p$2E-DVtwTX z5`&Z$(!6>KBU>bW*F7W(MKnz#jza_rDFuzd#zQ9*HktrU6QaIerPXp4jn$QvPj4>H zZ|dqUt2kW}q~l~i#fx?y7$HX`F8+*Aiq zEYOPm7`j0mMa<3q3*Yyy7z+yvM<=g-{$y|eCS<0F%J<>ioI_U)GG>b~xK7ip5*tZ! zS%XMAc-2V)p(9Wv@+GWd52OpIAV5Q)SvJXZT3w%=5!2IC*G$u#(fuG;*x1$i<6ZZU znwn)RbW;S48X{<5MNLwcz}6+U5z>}TlTMr1R!mS|C-8hCrIX0!NaymTGFi-I3f(j@ zO-ua!gQFZj`nOjc$9Y$Oc+W%4h57kXce!VDaN7=IC4|xpR1A^tAf$s%fUU*YT8O0_ z%&-Ao6X~`Hf&e|8Cz)h=1fJ~cg!@B7y*)7-yh za9g3+wNb@ZMxfcq5Mrs*hz@?2NE{pMjl zIDYKq#f6186+}8fv)NqNG_e>(;S-y;Y&F`8C54?9qOFrC-Hq>sg!L6{TKKL{wXSGr zC8FGB?5>@pN@X-ViO>usr4%0?f0uWTymf5i;>DkbQM3kND5VfWsIzC!9?532Wy3Ij zHTLu~Mo(YA@)Jq)bU`?^WtuCqXmJve%@J?x!N~QX=Qd(wiil(e!?IPY)e;{beV4ah zKRkZ=^!Q7Gl(V-7+qgY=Kyc#3iQfl7;H+0GzxdAMPi?sOYrDv_<&~Sr2v4Mlu(8{B zknFpgL~aA7WrLz5Rv16xBjlbkL?pc8L_I4_j$}I}|FIq7N2e&-1 zedo}j`|sbqZ)Ep_?AUoX=}a0FO5H{$A%v8YndwQ+ojJwHe|%KAaN+##rluzU7zDSH z?B2bb@$vC5s~QUb4Js&TCG-#`9JzMs-p~SO~oP900000NkvXXu0mjf<>nx% diff --git a/htdocs/theme/eldy/img/menus/ecm.png b/htdocs/theme/eldy/img/menus/ecm.png index a9a975219cdad1addf39baa2d93fd859e7e08d18..542ff5766e1d7df538e04a1c2dffde2c7de8f635 100644 GIT binary patch delta 905 zcmV;419tqx5|9TWiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29yQleqjmrQ0}x3> zK~z}7?U~7I6j2bye~}y%H4#Nbqe)y5!GlCxLLd=QuZoBZ5?nwH9t1(~=zrh>dQ$Wf zJ*kKwxa-9|E&DY&ue_gNY^-O`8 zk*hX_9JW09Jo!BN%v(8d4rudzq?wJD*O=Ko``60-oFmi9PXcyG<-0(&=lhy$Oq+7x zh)ACW$`at#XH(i#o7ovNi#mSW%xXQcn0Na*e?gkI2ixUUPOKg{2{dZnf1lvkN(YlM z<%`X%&deIktViB%W{1tJG!DMUykH^*%sYU z3|A>!rRH9&E5aVdW0*tnu3Z=)HC6(_u_@TN`Hl3yV| z2D|_&azXi3z-C~o=I6EN7|aFbrvSwcu~MbYU@jr-a5@HQ#t=V)oODU*y`+ES{$L(*wvgAK1UCNxt zSrMZ05#YKiS<>cbdvFEVC-vJzIH>XwmEWhSlv_XKe*rJGXg_HY1yTMH@H|M5@Vha4 z04#HMnMEm(f2ShQ7j%L6CEo{h>GNlG-DJsk>IJMHeG;bLKlW%p%N7WCS$dDC=be?9l@+cX! fg8ZMzqhx;pthyQFzv{&m00000NkvXXu0mjf(j=L~ literal 2372 zcmV-K3A^@*P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01EH`01EH{Laa2H00007bV*G`2igPy z6)`B=NSdDj00_iML_t(Y$8DC|kDX-|#-I25-hDnF=dkD0PNzpGEiD#W1QJNlAO?lr zXyT2==ncUbO*~u}Z@iG0aL*q=Xksf86OC5nPy%$?0&STNowl>*uxDn^?7hFe_jh=Y z%Zq}7@wr>;Vm)gm&q{tS06hP#hw$FQDgdB7xew1h^>u8uR-8bHBoP<@d*bAySX)`f zzPf|NU%c?bBR_fWk;f0r?f%^$l)Kh8wmt+9;WIJD@J0Qn`uRyjK6=ld>6!cX?>>>E{xmG@NyVJ9Z)5f! zmln^x^WpWs_J_fr7H%%5iD-+6{QqnABiW1W@o0Sd~c_CVWH^{Y<6)x zqx+-f!pL-Ebe5Ya6-#DP$!wP8D#bPmC9NkyWjWlw%Z!bY;jgt?a zLNcBQFV;z_0o&gsGiTrW=;HO|wO77<=daBOQg#e*~9b?B2A9vfW_4I=FrfC18R@me}v{$x7}o;6xcaSMPkpSkY& zLdyAjyp%ryo_w+s=*p(Av1@!k^5c`(*lc64z5>~8AqxBCn5gUmUoDg>cy#iRPR9~I zeD}uEV|=9_fD=QU9Ll9#C5PRg34dpt4Ab#s{CYZHxE+gU7s&O#C$~O5rZ#TChLT*B zW{YqC1zWKQsdyZ2DvMMsja;F?9JhjGzJfq9TD$TlPelDA#YE~RZ%Y>`tB`RG8_yLT zFBBnj2xQqttyq59%~fZ$3Fnk><{S$UaTN1;HjytNk*gq<%pewvL0b!@7~1U?27>|m zoA069?XaGZ=qh$+O_-NBHwsY@A)Sjy6SaKrorNaLkptygQ6)wFjg=q3MDbWU#fs%o zN~g1|R4yZ3EW;lTG2C27r`N%t??DKS&>uhwiAVtw7Lg$^ZSKr}aJ9+1y#cJ$uvV|$ zT=OsNg!a1;6sm<3_xfJN3X@2r)2NQ_LTz*s92&mgL-Y0x47)oJK?J1@A|e>gK-NN$ zgNRuOG666DD4u!E&ec0UU5GRIOu8LHlitXkN z=54P+TMcUfQU=-r27tAIB?T!NBC?QHAygJZDXeVmuuv&*mWV-x5}b2ZNhY}%1~3kS zPG7&V9@%(`3{u)aTZ1U_2##gUGQb#UZ6GW`TY}OASRfz+sTG7Z(3;?D!b+!$Ku9>5 zObVI^W92M@FhsA{XTAQ=fA{+G`^FIWLj~7mwvdTifS6VUEew>@kk&#Q3#|;aGVl#S zT7}3MNNGWa5Q+%HAcD072TmNJ)|hLQFo*;RBN2uXtQJNDAshM;L>R8Pa@f?7fDsx> zX$WJXEJ14vtqH;y_)QF47AaZ3NV(SKrq%I(uBs;G=`ys!;OIB zI;hSanSAz%ubdK^>rC3k{rl?_gdy`oiFT(iI@@g_l!P<{r3gkDC}knFL8LT7r4gCC z3m9!+G(k#@VWd#1l#xg#;2fAJV`8j^e7#XlTfWy4S#lgS#_LWj5hunNVw|yVf51X* zAgzTk8llmMpb?Nks5OMPkk&$ygf#kYNVGxV2Vlg&z`*OZEXIV3WIFA#Z24$9#S58I zEm_P=JmPD!lW`el>O}};VHAOkfz<@50Yw^-wouA~w1p)NX$aO3q)^!GdkDe6V=-83 z;S5=pC9?&ja|JhBZ5*8*8!L=V&7@<+?8%`QMPNXwoUj5gzSW3GLxK>JMQAL9AxID; zyZd|EGPDOnEUdPuZ#hP$rcf%EVvg%D9?!?sSgMMv@1AD}`iXii1uB%$9?0s!12g+t zYb}h_XY2k}lLBcFSwL6`qYR`XkT$T)Knepdh_Kf7AY)0Y?cT?#wYtd{^6SQ!w~RIc zpTBzNT7=BvDz|(6Afm=dl}%Uc;Er24cJ%1e7o_>>i4G}I`y%`Y`wFw_Ra0Bt0&BfK`4+6!m}Qk}4cTlK=}hKwuiJffVPWBqtyXJgettgs9C!{LIs_j2zLrwH zQ7V<*zH;Sqc4ud2ZDV8omxWxG8D&vUCaKr$uzn=b9R}F&LfQ#5%M{CO@6;4VM@J)T z?bUX>eYVr-oaLO~dj0j+#TOB7&z?QFcI_IzOp$bK4t+WkSvr?uGLT~mDcn5{Nnoh`uT;0g)^MPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UkNtxZG$in#b2s?4;$2(pmc)J4YEP$28=*9$Oa`7G#i9& zKsO*8xD#BzoF#fP34e@-hU_n1%SHuKZ$6r zD4C>E$G6uv`%*Ze?{@MS0q_6Xq0pI^9)n*+Wcy4&PJ z_demj0lYSLyWa3cL+3_1KOUgpc)V)tLn`;A`zwGC9_RiTJuI>D+{S~O;sZ23w50@e zTEi;g$6dgiYAPC1&Gj{AC%&cHf$k5D^BnENnB_bmMm%j#0JdYGhr-tl=yJdgvTb;# z@iFqqql@NkCkjrk^@w@bcQSYdkO4S9>iK+iW3N_If&;+H(W^{i2YM8CV$xVU>gT}V h8XjY{yhNTU{s4BK^m~$Nny>%>002ovPDHLkV1nqy7Iy#u literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/externalsite.png b/htdocs/theme/eldy/img/menus/externalsite.png index 0bf9138d463f9d2254ebd19794bf3e6e944f88dc..01e30553fc569e01123faefa7ef3c019cbb36b5d 100644 GIT binary patch literal 531 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?kymxs9pc?p3FMN--{Y$aT(A&9uv>Kw{59X(ZGyAAIoZy6yR=qdsl%PB8wk zFeP(F5j-(yt?6IQgi%v`O*!-B5m_b(trNyYCrLB*7N-NHB3B3e#hF+ zf8rJ4pZJ&k|GOu<9V{=TDW}&3&iwhZVrZR561CN*1OzzA5xdfz;$Z(DcuC;w6&}z4dDsW5y4+fo*fMq{L5xBeb%ZM zx(}Fke0$|}VBVegm3vRe?dM;a`C|cV^~J0YZ21V3e4M`{qNQ%tnJccK==5~;b6Mw< G&;$T2cj_tt literal 624 zcmV-$0+0QPP);J~w_+FIG!IR8?1WT1RtROkiMOXJ=)e%#&DdU$=2-4*X+&M>de{g z&)V+K+wRib@6z4x)ZOpi-sRZf@7v+*+T!om;PBYt@!R9_-sSV`*vakO%;(+K=;Gnw z==9_1^yBLE-FaB_37>Q>F)OG?)U2N_v`TZ?eX~T^7-`bM* zeJ33rBoRSCNZo>y7qU>AlqMmYoJh8La>$s-t4Xc-i5zr##8kOtC+d?oq)p|Kg^M=X zpVqwHc7kr^Y%|G0VO0P9Rtww!0000< KMNUMnLSTX-L}RJ| diff --git a/htdocs/theme/eldy/img/menus/externalsite_over.png b/htdocs/theme/eldy/img/menus/externalsite_over.png new file mode 100644 index 0000000000000000000000000000000000000000..8e227ddc83f7c92994716cbe7c75cfdb4814feea GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?{il#0xY<#M8wwB;xSf z8G*Tn4FuZOUuIx&QebgX6gi|I0ws?fNDkmg`|$Ru(%m)Qua@es{_=m)(;qeE|B~F( zHQ5iuh30=dB(&!NtA52n?zj(4;(H#@_h zQ}Yc&jE$L-x@R?dCtIu8J^MTDzUs$~=l;y>XZ-aHWX6BtA0H1^_y)VLo3|s;IB)T} z?-?sUZzU=*VPjdU6YcJ2GTL*@hZDU$|yw~oWpW0>3HIb8k zZkqI7sxrEQ`JCbpHlK%D=ihkGz7r?=>&>^|iq4&k<_QdTjk}-k-=+IZd*46(Yt40A hxFF63``};ZUxs3rV>T01q(edB>FMg{vd$@?2>`CysPX^+ literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/ftp.png b/htdocs/theme/eldy/img/menus/ftp.png new file mode 100644 index 0000000000000000000000000000000000000000..d9d96f0255b04e220db0fb0549d01c42bb2df960 GIT binary patch literal 788 zcmV+v1MB>WP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Urkjp2N2Q00NXrL_t(o!|j;AYZO5g$3GD@D2h!KF`&^Xhz4U}W8(#ag(&DBAXWjp zC@4`uLWqSDEyP05*x4xlC~PbQwG(XAXkwuxK{!Q21mUi@+}=%^R}7E2-MP)~c?&!6 zSY~eCo6miB_RZVvFvgJ8wu%h596pE7;WN}$tNuaYwuj$G;CvJ7^Z*0EDPT<2>9Kwv zi$!mYv8`Z?2|Vnz@(VK^vmpNV7;#K1Z-6C_|6KLd<^b?m#Wdo-l=QZ#1C<2fF9Dq@ zW?lS!*4Zuw@Ix#VK1t>Gs(9ys&kp5(1Gj*i((eQA0Q*(EN#JTDc$2X5o2_^=z$43F zuM^1iFz^7_=$LZ`*a{4};NMxdDT!t;-V1yKPB(zB$@Mz0Hble%a1?lzcAl>|%--|1 z1wc2@WsNNYQ@Pr$Vm)IQT5bLYj7 zyKKk*1w8YuZ8Ur}<=Tgc__byVvncol;JF9HVodll@Wtx?37gyz^4;bbuty4{OuR`& zDZdRk=@GXGy!fB+f#c!ql=>r1S-S literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/ftp_over.png b/htdocs/theme/eldy/img/menus/ftp_over.png new file mode 100644 index 0000000000000000000000000000000000000000..e3ea742e7c7edd0d0e970ae45c28e464d90fce7e GIT binary patch literal 563 zcmV-30?hr1P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Uru@FTV-^00FZ}L_t(o!|j;iae_b)g+DX?j~z%VkPf_55KAx>Bv{*QfxRp|WRJ4x3mqg9R!j-VeMK!n`UL+Y!MHE(||E*eNr=C9oS&im5HFBB& z%Zi3r_>{^?MFpusQBhTLi{J*Bt9&>ms+Q4D&0<@Vk5%~UkU0`_EgqeDMDSF#oU&Pp zH&$1cP$7%kc@Q^EJM2_te_On2ovLvxW@?((!IDz0w;JOM!|y`caEF>(4N8+w{>6UY zg#+;2@HyXH$eO-qbmrV9kuaJ^@%*j+v^pU_QO%{-Kj3rO3HI_#@S%@BGHVYXJb%xG zP5TsuaNKtSx{)Cke*gdg z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29}VV9DyaYf0lG;< zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)TqP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~# zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy62NdNN z_%sWe`TuOxSD&fS*UGUQeA4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{ z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJk!15ims zK~y-)?UTK4TtyVce|P5XZr1VIP8{191tTFL5K%B7IS3)X1T|lO0-~V-iJAsFI+_$v zKt(}G6(~TV!bDL7RzOfh`IHkoe~A;v-hFT1o4JQ#O>huhNXL<`bmxrb=$x55#@`69 zy!L+Q>c-%}_RT9VP3(K{>G9seW1Y_210hUId)m`YIZzL(vg~hO8*Hv$><=#dR+VRe z>U8e^KE~e0g>xSd0S7RE=U;x~Ad`n)pPahyt%KH}ah^;^@Ahy7Q5u%|8em$kqaCBHvSFT-Dnr5-JAdD??m7p;eX*>!gfz|El>>; z_Ft+SQc9s7^ta4xXNd0_G7MKe3@gXJ`NVHrhgjI%dySU!Hn%pHkH+=WznoZ@ogHsa zO&=+G`z_^w*IAw+H!>yg-IaH*C9gq>rW|R?Rc)*olf9Z#@@1*4)jvt?&pZ{+4 z)N*H<>X1z@1SrgN#B;#2jVcA)1M-M+Kpsqu+u-KueEHnBUk&?b-~D~%qc3u*$~)pO zJ$|VD@Y1v6E5H8n%7;Bdnk6MXOfMNHC0wBx3+I=Y_4ytubsKJc7Em7 s^()7x=N3<_AYJ^ifAz}A`Y)|N0qp@5e-SikmH+?%07*qoM6N<$f^G1=qW}N^ diff --git a/htdocs/theme/eldy/img/menus/generic1_over.png b/htdocs/theme/eldy/img/menus/generic1_over.png new file mode 100644 index 0000000000000000000000000000000000000000..adfa8c1599b9c2b74e15d0b86e5cba6dfbe8587a GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?if!v#l>^8Umr0u{387!;VsMgq7~=$b(UP6Ti&X<-Ic9C+F;Y{zHhH(ZWm89 z3enS95<2PAi4Rh%W-jU7DjcHrP2JRVZR673pv%RM+l|9#&F@dre(}3~uc2+(y|q>o zSN=@hJ%Ks=`L^vZfBl~OUQ71gLp0RRbAQf+%&Ag!oIW1&b8c-9S29YA>}TFO(=_0c za_q<6wLg6p+6d2FexA>UH^(@QHU6@+edKJh%=KRtd(-Qty!`N==O6Q5>Ds50%W@q- OG34p$=d#Wzp$PyNUC@aD literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/generic2.png b/htdocs/theme/eldy/img/menus/generic2.png index 86847858c4af5ccd8bdb4fe19e3c46c8be9a9763..f4dfc5f360a87341fd9e6a59f10bc733c68028ee 100644 GIT binary patch delta 561 zcmV-10?z%f2f73yiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29~Jc{vi|@80lG;< zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)TqP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~# zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy62NdNN z_%sWe`TuOxSD&fS*UGUQeA4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{ z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJk!(oY#})Bu&#M1htE*2ufQOqPWqDf;$y|g1B+xfAAl;>Bfbw zUAihRDiuVuXcxhcE);_4SJL*Re`$Ko`!O@m?IMXyQ7U5HdBZdF%nV%f-1A}FRe0^q zQ`PlRclge&?N?^z=3bZ{&OKFC!$(6H%zNq$Qig7l>U!MVm~3sYjVGg@ntJqYRn2}; z6xHar)w3<&00!{Vt0x{|cJZy*gR}38`22vEUe}U9MYDJDM z+uN7FYul}l+h+9H`ql5R*pnxZEib?E@<+qNi_fU&As2EfXUwBW5j=|2K&(Y-A=M&w zA~qsUq*!Af4OgbFZ(O)~>8p2(x8HmH%#q`dpX|>V4;?_gfmweF>s3bChoWZ`rBU?2 z0)zro7^b}wG(+I-k_W4*f8kPD4xTHI%$LWjr9g1Wg?SPljnqM^ouY=+6E?A34oHG* zxOVc~LD@6&BuQ8(ddJJzDJKj%%IThwA+{n;plbveE`f}kAZJk&kP4$HLFc}8is zQtj9dh@ynDFC;Jnqr_4m*FsTf*J{ar?O7`dtREnW;37Dfi;%z(mPN>rlaO{c*=_c| z27$kl{*>I4{>|ilf4~nw|AY5|?LXmKpo!^0!=;=;H;LP3cK^5Y515AG%57LV^Ye$k zIflaib=^j=oLg>ht)4D6ez<)8=)!QifAGNb<#5VU4tOVdh8$%|;QJ%*A4}eWWTqU5 z^_E5(tEaDA`uc-n?4)nL{N>!z(#+W_7gnoz($h9S7a*ADet>7Y8_94F$U)hVn<>gB zx31-@s~10Q$2Z@m@`^zU5`%f%CHofxW`ilz-!&8e(hfdBO8XhaE14oio zQ?Zd!-Q3w6H5;Ri+rQpe-(0zUbL-sv;=||H*H*{ZudQ`^tlt3;()=DAWrRNf0000< KMNUMnLSTXf_{0Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UbDk&Ws2E00E>)L_t(o!|j>dO~Wu0hQ9z(ctC0e0}#XjWCOYZY*5&s8_*398)SsC zLD?YPpnV2J5lH2JcsZ3Kgo>RwH|irDwY3`iv;F(G>jol1TVsP3hlj5#wo0nE3&i?< zs@W*`o@S&O1093sCcqpRYp2G!J0~JG*%OgOMCRf)QV|)5NY{oZu&~Mm=$9?%k4V-H`#&hw(Pdav@NjFJB>LX}>qKPkgMI`gT3 mU;4Tz(s%A_P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UsIsk^a;G00Fv5L_t(o!|jQgSZP0byDzW z=znlk2M2#a9qg*8pt#sU1S<#%R*Q?Z9tY2GDPnWm+qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzb zumHp?l0F8~z>#k*Yvi|pGvL(MmQ=)mX>FUT;OEhY+#f#sfCD|vDw~LyU{geHL}Xh; zVuoXaVnsyKI*-v9Q_X+thFwx*ffL{yxCIJTNM%GZ3CsgM+FrE1VM}FBhZHGa+ohHT z4bE@9z_8W_6y+B9Gz*&f|7_G(pQ+H-%CQ?H^PjEyS6Qm#N2(#RY3j^7**Mv>Q|4P* z^G-HSHcmD!^G@?lHcmESkbkaY=ATSE2DxY*1SWv)5Q*Ob7pAN1Rq>#f;P;}bABb2W zoY$4j0v|yJdNsZVMu9FZBUHY#F9L7A@}-u^J@=I9$hR5!AHhKvxC=E9UH||907*qo IM6N<$f;5xuNdN!< literal 742 zcmVcR1y$2<3PzvsN`Ih6dmlz2S8&}y~Z z-EQ}a-EO~Nv)RsAES3|hs=5?KF>}s|rfH+`c--vw``;k$ORv{^XSG^iL(KPFE;j)V zLm0)MXf%2pUS4-N9JicKX9OSwA&jwoZ9bpxd7e(Eq}gnK7z_q4V53*1QmI0N!QlB= zEVc~_mrW*<2T90*o2qhldk0q)###<^;v8UMJd4hj0eO}b(P zJC>Fx>2wK&g=7NC42S^9cT^`7BMd=kLiPS&0CEjK(sZ}RLZJZT>5xky*II1!Td+7@ z|H1zrctjs>ZE43M5taW%F!b~ueYm;VI=Q;)V0u8X-r*XJMw4D$Tf28{ef@z| zRS6#q52Vc%S{NCLQUtDO64WA;_YlU`xcassWeQ&lam&=!6{$2KXJm+9!`ORjt2ga5Kpd2>o!(6LFGye*;{0y7D@p`@QA^kzMTGa&W Y2db0ZOUWr-FaQ7m07*qoM6N<$f|{aGnE(I) diff --git a/htdocs/theme/eldy/img/menus/generic3_over.png b/htdocs/theme/eldy/img/menus/generic3_over.png new file mode 100644 index 0000000000000000000000000000000000000000..0672d20bce4bb1776f71dc8038e32a8382f5ae87 GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?5iL3@)IZ1~;#a?Jzp;5@B{K!=^C8I!mt3EpOG_?#fmmZLn!}-?!H?w~Hql zh3M%l37z!m#0RNWGne#k6%JARrfzDwwsC21(B)#s?Z)A==JzLQzxdt0*U+}?-dd}P zD}Sc$p1>UbeB1VyzkbhsuO)l$AsTAuxj$z@=2WRVP9Kl?Ik&clD;cFl_A_stX&P`z zIrd}k+MhlPZG>koKhI~wn`4~D8h=^ZK618L=K8OSz3FvRUViw`^N;zjbnVm0Wx0-^ O81i)Wb6Mw<&;$S`U(e_O literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/generic4.png b/htdocs/theme/eldy/img/menus/generic4.png index 29a3d7fed672e0dc6b78eaf38a82e0ac65982262..5f9240240da3f037ca1918367f6b6489b972c260 100644 GIT binary patch delta 561 zcmV-10?z&52f73yiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E2A0VTYcH95}0lG;< zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)TqP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~# zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy62NdNN z_%sWe`TuOxSD&fS*UGUQeA4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{ z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJkr1mFiDiBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPw4fByjg z0RN!9r;`8x010qNS#tmY3h)2`3h)6!tTdPa000McNliru+5`a=I4BB=A=Ur@17Jx+ zK~y-)?UYMwRaF#*zqR%`y|?9FO1W)q8y<$lpdi6V0F95}z{H_p%FHk}>ez`69XY{7 z2Rbsu5phIJ)YMreXapaG1VuEtf4!8_6x!Q!&pCUq<>0m|14hEkf3hDd`Pcuiz4HtI zKu^B;a$~i)Il0_he`#uO``E;u)`9kPb9dOT9Urw(mB_xbELLt8%d1QMKYM>{{IYm$ z@a^PW4`&9;ht!EWPL4h^@sHf%iY1pi`VMUzdWw#v-XpJW_fT@nsk0p1i8tR%-61CRUme?RtS)%WW$`b=KDjyP> zE3ppb5iXiC(XM&C5n1jrBsOzKa+qi-mcdHxl(kdYrc!g%6@2)34a+bbcOf(df)KnU z7`P2RWm}HjH!mHse_Uv0iW`V4?uwdWDB_BkkPzIUcEikZ<1Q%ofaAkvf1mGOx5V5F z$^*jx#1EEOK(wkoZl>pbLrNC4Kd9C=lgjS{r;9+WtkiS!KfZtKjuC?VXW6Pq(Kmix zxN|yOyu5UNdS*{+aw0#vb1E0jBZav~jOZo_BVm{u^}qI;e|3)}M3ESrem8n=VdeDM z54-OKQa{drvoJq5H~ZDX`EH}AItOR>sFES3hG`QvsY$BG!e zzZTb5Z?7)(Fm5dWy7>FbrKR5O`Mrlb=dUc>=wH8Zv)bbN3uVFjIbl|2=>Px#07*qo IM6N<$f-4)$)Bpeg diff --git a/htdocs/theme/eldy/img/menus/generic4_over.png b/htdocs/theme/eldy/img/menus/generic4_over.png new file mode 100644 index 0000000000000000000000000000000000000000..6a4d7b1acce5db322cde66f1e2fad71876449e3f GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?5iL3@)IZ1~;#a?Jzp;5@B{K!=^C8I!mt3EpOG_?#fmmZLn!}-?!H?w~Hql zh3M%l37z!m#0RNWGne#k6%JARrfzDwwsC21(B)#s?Z)A==JzLQzxdt0*U+}?-dd}P zD}Sc$p1>UbeB1VyzkbhsuO)l$AsTAuxj$z@=2WRVP9Kl?Ik&clD;cFl_A_stX&P`z zIrd}k+MhlPZG>koKhI~wn`4~D8h=^ZK618L=K8OSz3FvRUViw`^N;zjbnVm0Wx0-^ O81i)Wb6Mw<&;$Tu*w1GG literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/globe.png b/htdocs/theme/eldy/img/menus/globe.png index 073348a5246d824568ec6d9a2f939b5797c05815..8c2380eda131f90b77a1f3792b2afbbcabb5b7b4 100644 GIT binary patch delta 1144 zcmV-;1c&?o5SIxdiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Ck2><{9 z008+zyMK{D9)I2p76Bh9txx{$000CRNklEJzZxz9cKo^!s>_dWOC^MAZmX2x8V>zKn*0bc=M0iP`O zz!qS`|9~U%y>>=cW|pOOnc0Y4mT@!NlF@cLzl-EAk^|CBYkxzA_v-@o2fE$BufVw4 zZlE6+0S+YiS)|q>pIty5&<#8Wddovu&8?p)_#I+7YM;ccS#Dl;=A3U#ctxo&}x; znw;;In%m{pey^8H1iuY<#*HWR#&-c9rGWSa=oLdhIDM}`H92ycfKK4UjI1IPiyoWo~>Yuus3pIB?S}f*%FWC}xwhzbHIYz#j$1^mP;6 za&@Zy27r5K@tlv!lvbe1*$*UbSoFEK%8gg3%Ir?qbSG7&j;Sas=-JC&;6|VpSbwP2 zoC5r$vH;+r;8*KT13#$xp+Vy%dj3b%V!JlXarIdk9Si(NatE+jeT~z9qrOx62z;Li zBJG^d1%E-D20oLc8sL1ez7e=p>_&Ygdw~1(T#&C*{-SaFt5r42PbnBkV;(u*uat=l zYZR~u%-0p2R|-rgxtMilfWP&toPW@%7L_COfu|hflltf(3wV?kmjw1t=kx+lt&5{N zW7-sB*4?a>S*&WdPq~g_^eRQ8JiideuG$1m-z*&bdC4V>*5tWD_TY zBCA&UKLq?Ma;o)Aso-mY`&{r*y#V@1IF%M4##e)gr~`hMeOqvv^(juO%t53uYg6#i z@GHJddC+|+P3o7(d0TnqK+eSeb000O7NklgyqZAQQYhi#9 zQ9)o}n2~wi$2n)O{&6qy5l!65PR<|ueBb`Qwf0&|_ zipr{%!0C8(uHLDT%jM5Hr>!05I=A=r_HA6e_}1M3cYgP79$B;cQ*q_92*(USmi_8a z*H4`~Wqn0OMW`xvzBePCJsB!X(`WORDnTTdpE-&erWbDDSm*($UooqD4HxfLsg@e&;%KsuHO1 z{;AWwvllLDerWZY&Si_|d<@@xlCa}^ZhrOHS^KV?KDKnqs74#sP$Pd>zgPAhK2CRU zhB!%xJ;ZTBeL1}_ z=1;ovOV7F>t*^h`E~&ste=g6uU9G4pu{WY5As59=88w)1-7uXoLmN1Gu8$LEKH$Ky z)12w*l|#on_`>87(ll)NtuMWCa^K8_cefqe_u|J1efNplhRIj&YpAc+C{Dzir#lld zxPPvKJ8zuEle-Q9(A-c>(|{^2A2*mV3>ZGJnpqQ@InmKWV_hZtkG3t5mDyB%CMW)Nq)`&s{T8-Et(dFN~&VGxkX_Dgrx>$P9J@_WZNKlkfJ zx8Gh!8XY%xj?|BRVR&P$g+VBoM^y-&;|B{SbLr^8WFk*4AJN&9rL(7>ljnNLr6h@G^|Slw&O}s}rg(Ah5gKYM_@FO`ihzK5!^|_Lsg{K^ zM>BjtX?(*Cb3^AQeRZZ*HZDb+sT33^CdA%|5T8U$7IwqnIeBDcX*AP+C?pLB)mj zsH3nIF%TCb8ern6N;~2>CVwAA00e=fwk%}ouu9r{JyBvT`^!%Dww*x*#07{31q?u> zfc=xd@20Z6{GtF+#5v3i#9>OYR)Pk~>7Iy&x=Ioc`FsQzQ7nw8OEID@q%WJ{aC?Rz zOoJsK)>#9JSmI;)BUt_1n45lLNHVvDh?IJImeTG-lIS7QGbCj3<$%JR2brd z0CfS6?R*DO1y#_XKqwa+D?Bk=nlM$uGke-P6s#3>#e-UCAR>i;W9)A0;^^sa%qRc@ z*?hw8BWF2$s+-6Ea~yRJ6D<&6MJy>u)Z(`~Fl!A+;_ZgCh^U|iTfrkq0%l}lmKFnbHh&syCj;YO645=$+*4T^i-VhCuAcbgvs-iel z)I%j!s~w)NxD2J*r~<-Q4D;saT~Doi%rZLJCN>d%zvq_EDvuwN`EFx5Crt} z=8-@N6uf~qBUB;r31WsseMz+CH-Q6?nxU^q&Ctac+PJ6`{1J+Z6%pmtV_iJ8?=%PA z@8PkEn5$sp`oUXm0z30yeWNWq z(UC3qquV4k_kS1Nq^l}WhgkwX0SyYV_eG691`V*H`f-EGNur1~OD-i9I07w<9Qjl~;ds8-T@cKHW@`i$%m#1JtEZq^P+#4_!$0V%oQ! z&d?VF-V;T6viXQ?F2V(l(sW2!%Gskkj>gvdd^6zv+kZQ`5HM2L+}D}3AN-2tGh${1 z1`$MEv2p}phL}gO!WMYswh5G$gp{O92m(jowD9y4+ja1ytb5|6g~6N$IzMx2bJM;t z-wm1ev}h2RHxuVRJX5sv!ZI^j##FI#;W!Y*%<$eDX0r9*nfU$(A6>|?b?ZNhub(6g zCokF%zkjiIpym2{L`?88__&y=_OUI%wnLrV_1HmPJJx0Sd>-$;YP15 e*ShIbasLlSj;-G-t?G{e0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Us+gMz2%=00PWOL_t(o!|hnnaoaEqea`jY+92u#(FBdUfj6kSfksd#s5hwE3DgOq zPEh*4cU3o#CqRE5TNp=DvSY_dPPoIJMVjCv2tasRi3nb*+~5Vv0)7F%fR9TCpaxJ~ z0Ef4|Ick-N%+XRr2Kg_eh}1LJPT9?A&r8p-$@On$oUa7%V8%KCzW|KX4uAtN0O%uj za%w@FC4e=69{}C~_y*t(z&-61kMVp)1wGNyLlt$7fS#NZCnC2ZvK5iW>>I_H0`3?p zm6^*;2%Q7G-6x~7B(VP^_|_Qj0{the zo^JtsP|tf+As!NWzvIn}rrPx8HvI3BHrEk*p8zymf3L>hAJ{iZVx{3+C#T8Wgbn2b zro6Ag*8w9LLrI<(yfCB?sBHhr=Z#4?E#Dai<&|2Ojd~#>gfj)cS5@O0QWzX|`~bX7 z9(QH%nJTZ7;Ge6Ev5D1dA>d-PR52$f>SNY7Di`&57XrVF9I(G~xD=6GJOJ+^CCOb0 zd^b@A55RYkI@_~NcuLu^3Cj%leG2>^^?b)ZWDFea(y~iX7qE-5k#ct|6>?t5%9`Tz|0VqdSndG>0$M^e#)x?8 zS}S8bSL|mzV@o`!P|0000P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U7}1jiONi00X{BL_t(o!|j+$ZyZGwg}*xw;#Y72!E$(t@DPs(P%Hyd#0nPd$Oa@N z7D$LCEB*sN0g3+rDG>Vy6cTmrrW&I8{@#Kus3 zP13lek0o8w!R04OpGtZ|($p}(zbNT^4v@r}Ez8y?lDe6?i;~`zbYxH*m3`u0^K$=| z;pst-JpKwt)^Xm1C@|0Xzsy zmkK^2I>4$GNj0;~72s*$xQ&?xUI%^z{si8#u|2J4NaHflDtqShjJX9Y01Gzes15oM z_yJf1E&{VQt_E!R{e<;*pn1>if|AZjn(I@4zc;tu_p!1Ac2MABK-*d*iDLpulY5!@ zN{PV3Zqw?4E0E@Y&2=2uiHMz{`ur|Ccw#Mzmjt-EpU!Io%;0#cU6P_U0bQUI5k$(kZRM!ez@^QPx=G_864}1hXYu`;AfOTL6_zL)}pzr6L ze65!Oevp9u9{AOq-0`ee{G0*i`uO_{(C*__rO*5Y;41KPPFfp4RZ`U}GVK`HO1YQH zVuM}5M?@m&GO+9|Kh4kKKHhQJtXFE$dCW3!=dOXb{OlE&&j80qybs*hB+!&}0eA}d zrL17x3-}v8x@{J@j^7*3D9@Uu7J)HIofNeuUeN=)(?G{SN%O!t;K`h=Ju-QD%WPEh znYHV(HQ+Dc4^Kn`xDgTEQou`k#>;;icmg<*nf1K)qBCn^&cE&FE$fDjS&oR+1A#Yl zoHVbW@>RxEpA(WYbw%Ig7~A#UvF=-iHM?j7xE>MBfxtVFn)3CGzO_9Z_W2NC0`XBf+ zz@xT&t3-hP%2w@06W-0Y9TN?^R=bEQubLftXUptuSJlrljcNO=yOLtFPD)h-e#J~M zkvjEPQaMoXyW;v<%E;b#HDzQa^mN>&)+5V$nkd~Esj$|Yw8Og!rUk|JSbi{;{RR91007*qoM6N<$ Ef)z6M7XSbN literal 1723 zcmV;s21NOZP)hewVK^U631$%cI+f$HItB}O`C_&Dn6n-41y03Q3GOXHIR<+ z0pjr3<+-~&4a5f~7DWMhDuO&B`(SzOg1C{pu&=v&cftGb+0~E`Gff-CZ{|1WySv}{ z&i|bA-MxDSf}b#4F4zCO*7@P{f^i!h$9;D`!Rd4^Ap0iq0nN7)5q7&h+8#Y;2fx>6 zp5Rdo06(L^u|zLnA?(C3amVQzzT>>9;_vL5F)|YKg2ff()5h(7{=IK}*>LZNCxi(S zPhj4AV$)Dv31_ykFq_S=SS%iFHk$|5IRdUi24}=9ICuN-+)f`jB7Izs-1y#|9t4=%_UBzoBxG8asb8Vu{;89N6f!|((cHvG%hu8M? zqSs(RpH{^)0YVsq#Ds`v0!3gvb1{GKGxxmhfvaO!F*Y0hE6<7h7EOJ%Mx&~(Rx7)R zuL=8wh6a>ftyAB6b0%+CDZ;?}#CkCpep9 zU5DED`u=|Rc`JS-KL_O%l}}}6Wv_~j`^0N( zRfTsesZnjdth%v9*MD=`BN3EeaN=3HBKI%vE?a(oHPvIQsk?P^e8n`kvp9BrTe{D(Ux6EI+>BY5&ik{UM*y^B4Y@l$^S7 zd{TaHr(j8B#<4YV1tSEvHtvLNb!?$&{l5y$Gd?&`;9l~iU%?ocQ>V{_ZP^b0?$;^`CycfS&FOw?{xoue3_J=Q~vZ~5sQ}a(H{(5aZX0DFM z^c6?(i?@&9PoYx0|LG-V@>yl~#*cFh?sZoiTYh)&aJ=WKZmW+Szbds}Zw!7nT8agM z37EGo9&=YGV6NXWZ2R4$fQK%?N z08<(XI5Hw)Vh}i(%`&&4?+B+1^ zi2BSxRHp^tvNQmdDeF;lMuN(;5Y$Q5;aXN8zLdp6ogc(^6>UcE>8-eZE&@XrcEMO0 z$(hQddr4rEwQ}!KOL_Ft@5Xd=$UKZ0mX_puU&<%4^>NE>HT$hY<$KYRzZs47mHegS zeke^`i;^RLIC*ddia-7v%Fkred=BSj(4H5JuA)#3l zKLOith-a@IhPB}k>}^Tllv1$D^a8s&^L2ZNe6m9$o5ZTK?iNLL*9uHci8Jk*?6bD! z4G;CVMZd z%KX*0?NVjP?dmMB?P(qyw3zEuz@f>8RU_wz+Ozn9mUI}JBrsf;(BFu3+-^*Qu{8~Y z*Hd6_lfX`XoH`T3Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Us_zEL+C^P<)SlA#NHW(?Tq}f1A!op@03ws+IrLZDduriUbQWEKT^Sd^`sn=`X{Qk`E{@(9tPThL<_s+TZ z`%dScbMEgAg%Av?tT4c`3|~;TVXTUURu5Q>cP z5JIxRSj=WJgfQE~E=j*vW)$^&g1qAl>sq`g| z#mMvXVH0!g!?jp3->#vMox%$|sVZ#t;|g}vREdA$G~O=-el4bOvJb7qR~%1&NMZO1 zT)>(>_Fu2kY?d2-Gp=H9LmJ4(xSj|82+m@(VIA-}yw1utQ&_cxViQY}JgM?Cwl@g+ z1D@kenQXHw?OE!Shj>s$kqUhXp}DFmY|;n#q$>Ds&ws+N9ClkVl74=dp*z}fX{prn z-S9JumFy0=+|f$h$k5%1OLcfYZ!^>`5N_RjM2q<(0(_}G{(H}tg`Zmje5IammxON@ zfNw8{O~zq5j6XT-Ha79VZYWSG8*yM;;!5`(1J&Ckb!D4ap06d_#DcG-NYw#fndiR` zvgcd)f=x9Z*l&4^^1kjHPA?0?CE>FA|B;T%$nW&RQyF|CWuX6u{Ri8ndcK2x=Z;DWgBDUf_`{2J&sURrA zKJ6c{EXyJdYlR3(Q(CLBSU(>6v9W0;oteyd?wz^uW;&_e1BY|&oipcmf9IZ@36W(P zxC8=$yTijjPnf1r)^)wCX&SXE_g$)Te|vkoTr3u8Y!1^r0uS*EJ~`B#_~rDe9|K+8 z9YINw!ako5s7j9Av6cudE#zS~lZF4*3XofTxt*PR_7~>*xEs*PWV|QY+}voCN@YJ! zh=A4Pgbc%KfdPt$+VH!`O%t3D8$*qt#8TIBC$s}79FB}8;z__JV4IOh82o;prK)PRY@1(-FhBPimh)+Q|Rvtq$uzW=@D;7IBWkZOYjol!0 zJJQ+)vChP;-^vawNs^|cN7QrLt_#j2iuH#ST#^?)*% zLhoX=bS*96(e?Gu(AgCg4rl>w2t`SJqsX7txf>45^SFpO0e6Tjv(7Y49hEU~OY~qnB;>=O;tw|958{NE=#)p_&ulR0M-A5aY>ocX+a;L%ZSt{R z(Q|yLYRHNO^R5#+@WQ2^SSk4QCQfO*)}k#MML>}InC2-TK{^F;*g-v^pzcG|Q!158 zg&FZP!5BFY?9ae=l8bBJvE1h|A`s80uB@y8XSG)rB9MDe05U|NCu3t{_hx2h%-u@% zJ$1)=F{y^85V!yyxlnT22v&h<~@-5(Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?bhi@pN$vi8%ar z=KH`F1A(LWEo-Lp?crO{?9F+-u|z?2j;IHFP?Kzj=nB~*d@mCIKDc+bck*Q37Vk%I zW+(nIW~pmA`%E{dgJb6_Hc9V?wp&>P+IIvztgPc*P%LBKw2ikx%;D(o_?ny>u&iC-!-Gk(L|Q0q~l{C1+lD|Pk_ z2}T;7D;8U9s;O6(X4(AMqtNunq5PeJTCbLV(EPH^`;q+uMP(xP`NGM6SU$Yi za*jLa!z?QgosH8PH-?<)IT-ljbwBfe--P8rmD>;PDz^CiHMq6y;Uic3T8%x2wEx(j z{5;ovoPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UtEEPNJaz00K@)L_t(o!|mA5i_K9O$MM%N*`SmSjSwXpjr>@kZ2Z`bmE=dHNt03% z3pO?=Wurv-ogYc5`2%E#g;GkBvN4T8CX&%aGjs2Zac!Pk-@eVApWl0H^nL1d`#$HK z=e+Ovp7VL0d+SQ2lIdzQOk>O8bNC!ShtJ{1wEA(5TNi;H$7i`U;yJcW0{kfMVSXZBGJdA; zMZCpc^u%)!vtsv7VeU9$HJ}wOi5Nw^L{s89Q}_Y~@j7<;arnw@C$3?|C~=zb083JH zFX14%6TYgz!*86x1^h@XxEQywD>Z)(&f{dHJ`Y{=T@l>0B_g zf^T?~wF+5FCBQ9#{K^*zCx03JyA`{OPgi<~hWnL4@i zs;xG=u^Jyn054ll3cPGzBC+*`_BYg0DmP*kx^QKZbxk)eN8DyCtOa}{w%`+PPO;kj z8nRi8BeQYKec=?6%1jZ#+d zy-`Hf(#AZJb@^Z1IeZSE!{_ihd=8((|3~ou0IMM4$}o!v+5i9m07*qoM6N<$g1l~1 AHvj+t literal 1041 zcmV+s1n&EZP)JpP>vdt|_MW<5-%Q75q1MST~ zlbHZ|A#EdcZBNfj&*^z-Pw5+lmKMJLeh-usYGM%Z!uTYgPI zb0_B5cEWB)VVrG}630<@&|1)2FkIJVQv2~dFZJ`#kSZQ@bf5vC-e_Q>UOyICn>`+M zc0&AccNmJ51+Qwgb}aBx%q-YTym9GEB+@JJeP2dWSzAM;a&$Brb!0MGD0UvNU-|-~ zBXAWlD~D>W2GcZAt8JiEUOf^vHtM9AmfCUh=m_*foO$O4WwkCdTU)O})pTraZDA!} zI24(%PEHhH|zcLUcQ2(idlEf1;>2VA(Fr zwDXswEL*nV$&+8&G6zvrn2&iClYdkxj&k2LN_dlrdu*I?o~Jv zq22*$+iufgbjQcUz%7WrD_Gz3d*%2pM*gm*_fo9j2XuME0|9O7ehnL`Ow#h0D8& zIGx#%3l|~Y?f(jM5k)qcZ;a!B-}=8TX<#q${M*-L+PtBstR2$OqcP~qF&L_jBt^HZ zq_C7Qpz&TpmHWn06b3yXOQsOr+1Kg)r$3Ev@Ba~%zZ(RvGku>xe02RY%*@PU^3fDA zjmdlW5q#-I1iQNMPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UtLYNAnv100EXsL_t(o!|j;eQNlnJg+CnM!3v}Uw*x~3+JUhG=|HGJtw5|mtiVu# zp@Y~#sNnkG%}i#^l9(*vXZFnO19x}WFXW!H2?G(~Sarq`E5HZ%03YB3e67wKt{dy< zQz?-9fRBO4p5Z4z5_Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UtVE_K&6j00WdsL_t(o!|j<%Yza`1nI6+8X-c2qR}AK>o!$Q>k(QUoBt$}=FXfmGi{`CzvRo@oAW>C z{LeSvYi3f$7zV2hVGv7}e3pEc{J)Xu!0Le}zZy6L+>~AccEuz-1~>?G0zy&-xM zc&Ds0(}L|4X0z5l4ScrXO_EgEB!3Um%ffB9;QYEtbGm`Y7VNVm0ec514Hw$2i!CxW*64qcjI zyc5_1wDd=N&19l!T+Y*pDKpJ?havoG+AF6}& z`kSSey;p^icX6AQ4nABj;^hk9AlxF~!A?7@TLp}ZOMa|+i=P&~DEwLntXH7gb!Z#D zIxhJY4%WE^d;&_;=GyQxd>!Q#2Yh8*pI_=we6H%cAwr?50iFXLz8s>K(- z08fRjj8I)YE$h>{hGB>5NiCAw^jKPDfQi7!7?vNYxoLHeODy>D>Y=RUCpeI4*0mx* zM_D2AY2C@Z5Nv^~<#Qbfz45&;ic8+_3a^w#gXFg>`9JctAo-*MGFq9YH^GZ1PtuAr zLO3~*?*=}o@MMw>U5j;yBr;ihy$yMyYRU9Cm=p3w;Ib?+D}zPabuCI@^}ZJEd$&I; zjlNMA8o9!@N^=#&Mba*xANC|9Z+v9y^t;VvVk+S`sbRn}rPVmn4%`F2#hIMyrw?j{ z$`liIAe*FtmkRvYk{W=ofhB6CN2m~a?<#+ZY)5}>l*)d}%##1l$o~Z`gD literal 1366 zcmXAoc~lYx9LH(aI;_@8n{BjO$KKwyH@8@o zaU=o&u(ADTla~Piet@GfP!JFZ3<~}cxO>m8m}5U3joWkPT*#S}ki?YG6xfLq=i(DC zAhT$hS#(rZ5gJ_-3d;yTe=+PLJQK|)kw{c3m6Ffpa5(#68BuAled#DrIuewgc^IB~ zJOlYN90@^Yfif`%utdmZ++iH)B$j}}U=I-rVitiA3t~yM6T|`(J`ah*r{XCkS&*X3 zrzp7zOf-a<1LaaKvf1od3JqLP0;VzJ3W{S3S;y%A!%iq-#TBu$>5P*cE}G55;&503 z(I-5aa=EC4T3ASAULml#B}^uZ&F1lV^hF7ULbY0r!SQo&Voa_$_Pia77v&Pfxp;YQ zo}5UMk@H1Vnv7N~rx&XkES(SL6$P8C^sz89^>VqKC(vHu8u&uJNK!77m$7+9HqXrF zRB`!6uApiGk&Q303q;itS*27~CzRS3kkpB!*JR2XiQ=lV)Gm=olq#J@qfx7M3Z+4- z)#?|eP?>aPMy<}I)mioBRpk|x}M$E&tp zud&zH*4El<8+_R8Ee+S29S(;WcThn-Eu^Lk@)05$LRO46a8O2Wj)IBPa7kr+vO$-qTLwWX)&9b6x6TaVAf`)*P1NM0aFZlYd=*S2t)}3;8>&HQx z{3xHUZAe|dcJry`0JHaY|3r@}{Q3;}MfCT)_Y*xy4$^Dyvz_nbcd(p^gtw1dXmisW zllEplY6tE9&Y6gx{b#JdZ74V#_im~K4ow&*(49%4B<%F`edNPt(#uEhb_Rrf;vM~y zG*b diff --git a/htdocs/theme/eldy/img/menus/members_over.png b/htdocs/theme/eldy/img/menus/members_over.png new file mode 100644 index 0000000000000000000000000000000000000000..8c77498c304af9150165b348fc08498d7aa3f11c GIT binary patch literal 720 zcmV;>0x$iEP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!alBTT*k00K}+L_t(o!|hqoP3$lb91#DP4lotq4#=y3&_POo4z7eN!E|6MczGS< zRe#KznZREdU2# zkjDe)3jsF(jsPYAuK@l6h?19kkr*TMG%-dWmt&MMY(5)f3~@dBTpo5YAM>GkfiZH? zuH|85(*w9Cb!(G3enDQ1{EdlIt!!A%C=e=qlu6-ziFWe*c>j_9(VxH3;&zhc~P+Kleve5A~9`c z4=hp6EXn#@T61;YZDkJz0#HW)n&n`&um=qAmR!gZFY1+@+tq@1ibYxlo95j1K)Zlf zHYkReQz`hPf_0-Pl^XV^Qt&~+x+}B?%x-mB@J#9RNwd+0QJfQ}ZBiZ4Y+Q2r(8gop zZQe3tJ8hF16j}@g%!g$DNl}U^=I_WBZvk8vFn^s~8yzv;vaZr9{7GNoDCfB&;am+1 zzESx6ZX-K9XeXC`G5asB&lE}~y%Hi}e-rRQ0IuDhSb4GRuQC7p)wx&$Zvi|k`1El@ z@N2vK1mH%_M)*A7ia3;B&Oj?*?N^C5h!MaamHrjq7fZfjGB&}Ku3rm2wGvM8`NQWf z8q9NXhF=3)c}!B9N2yLjNl9FabAaD}*4e@TSx{)Cke*gdg z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E2AOy!rxG?|#1Zzn| zK~z}7?U`Fl9aR*Dzp522wFs2b0)UUZ$9{7 zqEQnyK6r^fc!^2%$(SaMAO-K%e_k}T7ZKZv(n2XHSZJXp`0`CM8Rr~^!^x=_R`@-yUT$j^}ff0Mr;gE95MrS{wY%jA~;cjL^c=m6FLn`{@Q!8s1>20pgkq&MZ7{2RcPzz4uqi3PSg2BX8bg%9`;aJ%DQO2A=t z3apHF*bjm8fxGoDfxSRye+uw=pcc3aSm(9xfYuo7g}`mzTbG8{56-zA=$TC9UjrTo zt~Yl}C-EkGfp?w!Vc;pRm%8h&%22glje8?;oF?it5qYQw-I1}81~ExxXkM(Ll5w)#T&o^V18))_rTjO+Fe$nV_6_ypJc(V0{#YGkkoo$ zIZzoY)@mbTI)Q`0=SKZeTYx`-IawgTCrQq40X71sRhkx~9@IWzA|sX*_@FndI2QwN zSto4(?wca<)4(gLe_dMgceuT8mIS~6@Oy}8w3w>^ib4~;0~9Nl8=Z7>CjpbrSMjs?BmW zw%zMBz(tXoGGaMS8UX494sR4owvKTa~&}C$91p zuSuAn?Gn1tN!MB)F9U8e+BFIDz0X3iSG)~?xX*BYwq_V|H=3&wj6{c7(iTM!eS8FlL?|P)(WtUD60#N@+PAb~mhh<-N1bIJMQg%58B#XC8bgVt$b)B2wa{{TcvYAUe- R_K^Sp002ovPDHLkV1j>TN4@|6 literal 1751 zcmV;|1}OQ7P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01EH`01EH{Laa2H00007bV*G`2igW1 z6B`hB!M=+C00vh{L_t(o!|j$!Y+P3v$N%5C=iGZ|?mRuVs6-dA;87$bvOq$B1nL8+kcdic)ixmsp-IzJG!Lbre#G^AJTo49 z?#z9^J{F-BERdXlV3VJ8bT()4(S`0cwN)fh{9xVpi-;SNT$M=k5WO$et=ciy5N<;*#EzhB`vWlMFL6)Te5t15V@;vuD=>Kj|#acU@j)(V*u>vAO;0NffcX)1Yj&9D*V9IVb{3tz{>2$&CIDdWR#H$~`3;wMj9e?Q; zzd3N=^WP#8ndf*E_yNUHgp3)QkjR@Rq|{+q1=JT8aq8_eY~DLciU_{bMHc$V(il~% z2t#N{lN3=L!}eUbLC8j_2w~`yqzP=N7YBYY<;Br_5Je45YBOmN*LzNHrPp*Xo_YO^ z768bZ$;lJQ_#1;mL!!TL6LL9|P1A&wilmTi8YaRh!qVIvy>tFASPD8QcMK>J(3J*d zrMLeJEwU*^-1Ms$43Knx>I=Y}<8gXJx(Lda7719k#4I=ZhBAYBl6c69Nn+ zC8Q8AlmQ}wk^%rA=vLZf%*e6~X$EARA&Mgeag62W3Z$;1QYa@~ueUxqG4)*YTI&Tp zGFtzVQ`?81q++3GWLc^+XF}5?+g&ey{-tMzCZ<0+d1Y#P>uTt722i7^11=3 zX;4x^X$qPEgb<%dF@Q8pk!Aoh!wo#lE-oOKFQQZ`BF$1P%r8vNU0!%LXhfGuU`hV7 z)a3Fj3?TT&`Gm#gy7`&0U8Vi|K8Mq1PhoOph1=~la(gZ|4b)IB6rrR9n2~10Kt}jj zj2S`*FsJBrZOk?rC>2X=Sq1U~4`C9cuU6gO*AaAj^`iVd#(T zynjrN*80fEfNrmg#=4CtP5{oJ>pDwKkR}9^5Cq(sT9U+QuC`I{tfSIbg>D+;dM>9K zLsyEDI7Mg8zUZ~Q^N6XvA*pxYzaCi{T?kyaw^CoxrBvzYrp=;AAlLVjR>w{q-;+@s z6TmElATUEo$zd4L-0~87VZc_YL;!Q>g%DCe5K$T>Vb68Ww;JseUfaL=-t}`n-R=h8 zIxx_G=)wKt_mAz^QmqYClddD)ym6IPCI1B@XFicD`)0KKgLT7;(-lz0UMsY8t%n(T9fa*)sCDnah2@Sg`KN zTY0|q3kB(h&S4Tk15pyEh&freTlVS3Z0qIe_ogomX`7oD>u0<>sxBMhiKoAQs8A{V zuv{rWR47;wn&2pmAT&XtAF|`RC!6)g@$QWCc6Y*At`1k+b2r|K@3>EGlrJCo%Fcn2 zf$tRx#Unx^NL`|5JJ-4$`)9p*@9fmXMAH&Q|Juz<>3>}EZik)wca^^Q*dxzLrM|h^ tZa?d}?ytP2@0@(?we)VczRUlbzXPO(I8?dK^`8I$002ovPDHLkV1kDtMiT%4 diff --git a/htdocs/theme/eldy/img/menus/money_over.png b/htdocs/theme/eldy/img/menus/money_over.png new file mode 100644 index 0000000000000000000000000000000000000000..9a501e762d0d460c396ba28c1631f9ae38b12165 GIT binary patch literal 940 zcmV;d15^BoP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!n`N7)?!00S&ZL_t(o!|hqUj?+L8{(`7zE)8`o(Zlip=#~~ygo@${jD#p5qC{7O z8X<)zz`TKZ0`^KOj6{EXZ{RDS9hz^Y(Q52CIVW%^Bdy}wpSj7*H}j1*6A{66l^eLm zaxng2{K5Ex@dxAoZ{u%namE3d@;Us=#uotQ91g%y$G$TFHAmc=^&(=8LPToWPAUCii>+;CxK|`}BNd$j6W``>yi^fVU&) zy#(-K-^ND(zX3c1@MBAzX8=5aJAb28wj$#A>{ng+B~+Vbz3>pD+bWxP{oww2b3f@S<^ z7QS*__*A5V`e%>07G)f%hx9fzfF+alSj}IkUZr90l9F_mmC9ED-Z0r^XN+xlF@4J^ zL%zxq*pi0(9HZ2zQrYgx^Oo`NRp?h4WE?S_hRc$2rHnn{{L2vxZ>{QOb(OyWJm>Rk zHfoV@nzJsaF;_1j=iCnfPXOHJ^DO}P38!%xy8|{QVY3(j84VqMPQ%9Ug0U@z{RZF@ zy}DF=x#zp9%X*=xn9(y5#{k|b#{LT6Gxe=w?2t8z-HhGAu)#>ixxuoY^LbKNoZpnO zryY!4i^$`lB;~TYJye292qVAC>m3x>7GKCQ;A;h9KiEC`>jBQ5pS{Pa8@hQQ{9DtA#qX4=E9J}Z-rDs87~ekfxX24g=R0-HooRSz^m*5~MY zycCfc&nJD(fMA>H>e3lRIK^LlZWS zLcKxbRBq5V4=KB4-__w{gWqA(?Qp>nv(mPySd87MQoZqw+2O~9eaRn}6|ZO5h}_r! O0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!yv_{59=00Ev!L_t(o!|j;8O2j}Eg};>uim)oI7NV3+Y6hmtbKuO7nLEIvP3IFJGz4F_9h(^F z0&U>ljg$9JKV$&6NoKPq8Cc8}o zIM%Gu(1}f8(D`}bP*BH-^LMJh&j{@9_8x?Lryie zls~|4WdKcSATcx`O<`#uGB7YRATl#LG&wpjH6SZ6F)%PdC>K`%000McNliru z+5`g*6c<0I<6i&(010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00RI} zOjJbx001W^CptPh4kS|zCtDRLO%pC&1SW0;C~FKVW(g~804aSEGinh(e=9OVFFH># zKwBovjomG09wQZWyuO{&;@YR4RX~P zYQh|H$P#qZ6?fPadDR~TukdBD?Q65`WwP*WwDNDc^>w!Cb-3<(vEqEU=yA31 zbhz?xx%qm#^L@VggMD~}fqaRAeuIO9jD~`Wh=hxaijI(wjF+E~jft0(j+v8>larH{ znVy=JlAfEDoSU10nX!VQzl))?mZ7ParLvi+xuBk%qoJRpqob*(q^qc!ItH()_L5{kqfYw%`A{ z-1)rY|G~Sq!oIx2z`Vo5!^y?N%*n#b%gfKw+0)L+)6>)3*wNeD+sfML$K3PR-sRTf z>)7Y=*nO^=;rI|>g4S7=<@vW?dtaO?)&@t0000Ny^=@(0004W zQchC2pL>98-};-ZVOi*ej#>Jbo5ocvjA z)$@#paf1OH2X|$&V+-}`$3m>}iP5oQj?O;|9742X)9yV3N3vJ9w2#4u_stc~KAy^X zoFjxDu3p!@IpCf)`ab)5E^}l2=r`^ns|1zGy)|n$c4yk}L77LW@4w#9f}$pZQde{b zVB!4U4(*dq2=NH2K}pl3)Djvm>eqTQEAIG|5ZAISP*#)(t54=}( z$xEou%@(H$YW~&xmphxbZ3i63f~w|6a<|%O+m0MfYtP)jt&ZnMhpt@M+H`_gQSZmH zmC!C7?`t{@T#o&MFw=KWU%oha0AnL9{2`ihX4?mhW#KQ8Q@?idfB6pK1szzSWk^{7 O0000Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?vyi!_&nvB;xSf znFn(Z8Hlv)S71A_wY{rn0x!p86XhwKk8%#M88}_#oaOxfB}44OpmQ>3j(RW(Y92f0 zcj~vQ_s$qYlySK3jEyXD4_IMn{gy8R%B*D$&m^87J|d~VcI)eaTl0%% zZ(W`?+hp2vX@#A|CPlY6_8jn@D7BU+fUkJ*q4f<}dE0(6S@9Rv`K)>HVWpyLdCe;&SZ<~pMT_vDM+%6B%1>dgyhd=SdN&*Z>O8S^*M?|;AGTF-Rz*_yQ< zO%Kf1t`W8Pyw*2;r^E}PU4BhU{zDOC{T9D#SI@HE%L`is3`Pb| LS3j3^P6Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!=1oKY_T00DkUL_t(o!|j-{PQx$|hQFdp3~amtREUL{r4l>511!7%5(5jcF);8X zs7o1`c>-WSVyKwdkSGgn+{7#%Jfy^&V`^7E$&z)E&tHFCE_dx{tx45ZNZ2xbhR^UB zKEpR!w}lvcz@_l)5%4CyS!?aP23qS@=J$7o9dUKmm`y zgXRA){^;Qgpqk^48eSPlJ;$F!+MEMp%fIE2HdQQXvr+RbnY58uG%swj@G2{xnDPs+ zHlHage+#S%&))l7+{ypjL^_OY182h61G517z_BpS74RZ~?|Hn8o7R5UBTi2WUzsv^ z2MjI$0kHpvN>Z9QH^8gqKQVBka@utOC~8Vt>7b;l>3^y=+vbq)vzo84ZgXH+dgYa= z7X4q~T$ES9VZ)CMqP(={3EI4cgjb;l7S~egdubV>^IU4>eH5F8p0-@zr!6Tz{cre* zhhpE>ehjP&<4mORBagQE-P%6`U&1(}JdDI(3iFHaX#mOUYT>FNHPzY>gWgV& z>N8U5zT4A5N^ZO8yhkKkjJd8W&>2X~+Za^wk&*Y$2D2r^{ zSb$`8H06x~B>mYYk4IN?5%P13aOmJAI68U!ZDafMkmI-KvD+;LK4-Xyh^j_>q73xp zYH&E6@byWPJ8bd_HJ`ia<8ec7+v<8lUN3wm;Dc@v0TZPKQ_8L(Dt#yEgt$Yj?ejU@m* z;WvmY)jpl~?gIM>3>)fFOGqty#VKkiTC>L&2R6uviL6YSn%sp#;PfW@gqQi_OFBoZBcVOu=2kpAEHiBA^*W z4l=>xveBjxX#sn?B;c1u5w2;{VwK+YF9EL71Pn#L|45Q^HU(HDpf)9%hE=LyT7kT@pD6(n=ky% z+Ipksn-wlgEL?C&5VNnq&+uH2Fv>ssU|jWT5Cy8WBt9MgTU}1PxnS z($-JPUL715Q1Y~bBq+JfkxFXbBO^-lT)_K%)b6uq*Y=x}cA$v(HB|aEq^3yKl=bvc zRuJ%_|2t&JgOHbXy4TRa_>D<}G&G!PdGzqHOj5nEKvk+r8QONMAj>1QkhQ`G#;w)O_XCU%ZIGU%Pg_R|YG(Un-%GsVcuDgbZ%j+kF}FQtvpg&U|gL&k5hM zs`8`}Q{LG`1bcA+A}$^5(ACwS{qnD~6pG%uPwkFpr^gP}SF2SORVJeNjz1Q>_rCMA zx_g_>wpbqEe?};&N+$ex9qz6>^QP(F1XP0!Hea8KyLP_M#AME5o$0&?A5M5^{{!y8 VO~+Xfi$4GW002ovPDHLkV1l;z?#ciF diff --git a/htdocs/theme/eldy/img/menus/products_over.png b/htdocs/theme/eldy/img/menus/products_over.png new file mode 100644 index 0000000000000000000000000000000000000000..0a5d9a7951fffbc4b473c79c447a2a8ecd00fb37 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?> za)F6bQ&g$LQ6-y)ocxaQrmO#8P*E}ucIw4UL@ zw0maqz6|qTRXyZBeKjrG`I6T2Sr4MO@dCB~h=yuqZV&t}=Smy9M_Rmvw+Pkv51FTC%9@2h=n;r!=7PWbV^`MU(K vZP~rUZ*tatzL;p@Rw^gMFOccxby@n*`5Pxp#TQHj`k2Af)z4*}Q$iB}abJjV literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/project.png b/htdocs/theme/eldy/img/menus/project.png index 882235d2cd3497a1488ddea08af1dfc2b4eeef73..ae4d177c6cdb769943524b09e643971c1382a7e9 100644 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?Ub7z-u>W_#-k-A;#-`jJ6&FK{%K3Q z#!ha}x2wOmPpB^Vf4u+kq;gN~7Kc?)iiwtc4qNXzeBS-7)c0L%eIk|V-5mFs{esv2 z5t*@sXMW{V*?Y@$Qh(g3{KwBT*LK@ z+Jzr@8rgOKY}})(^WpY^ou5?t9-7W;WZicv(=xcKD?ht8Ju7pz*5;o+FE#5dW@fi< z53|#-{b{2$Kj(G|@1gLOHEE6Ojb^vARoi{v7P(~G&s>`uELL5<_KS8X?=$Ls`s-5P orcaBP&dU9xzY*j~>zb8zjLrfDE33{4+y(`{r>mdKI;Vst06z-BXaE2J literal 1075 zcmXxjTTEMZ9Ki8IK!LGkic3t)j59#y!$cAvlo;cx5ZgqM;9iU-!?>^q6SHh2GfJds zfn^dc^lD)jXt|Zr_Oz#`J=fl$m-SA|>FK?t>$adoUwm;<|2?>GKL7JS|KG#ONlwn~ zk>QU|op|L01VN_+{DD!hpKYwRW^f(cduttRtrLQw!Paa`b4PpEBP;$Y7`0#He|`gk zIyxJxDOvdODHyg~Y{n2PZnF_~jKp!8ARGpB z#DqjFXw+hhBld(9OJZbFF+ot2gQ8qGwMRHov@`AWFm4~~-DP(Ix!qviA1VaHg;2N{ zj+UeGax76vrmD$QEwx{R^{eLXH2^VeSd5#rLE$hc0jE*rG^zoYY0(WYxy*MwmOEa{ zT`zLK!MXzYP|dL&n|2plwV1Y0Sck%T)MBt9MjHZSRv1Gqq#YqKl)`NQP1ybT+AhBC z$2S7_`v1ty0JQ~#j?vo>9EPxCJM1uqoefbp9Ccfw9!uP3jrq{zjxFiO_Wbr#080gk zRESE4XeLZE5hojSvoSA_i+gj4oqWRQl`$R#vm;}C@=QR+HYnJjjEyMRh^is3%*KDs zCKb7)DwpOk>Re_q59F2#xw{R8d&T0t0*a#G(}lPmaD}-dkqFqMT(M`xC2w@UT*YVD}@@MwA=Ee8Ka)5PfTXVArZW*i)Jf&t#8H)3CpE%&#H zptI8RlGpmNmsPbtyITJ`^7OQ)?BBfCE11uZe-*5N4{``e@>0y&VR15RKLmpq7 z?;iPf{L>fto!wX4q%BW6PD29GL-|GNx&AljyZM)e@9;Y>oNtx31a+cr_w_Nsq;c&7 Z22?mD;j317P{sXa)mS+F} diff --git a/htdocs/theme/eldy/img/menus/project_over.png b/htdocs/theme/eldy/img/menus/project_over.png new file mode 100644 index 0000000000000000000000000000000000000000..d6c28b6d7ee28267dd5792dd34045956a5d8e92b GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?hRC6YJJoDZ6 zhVSOhGu7u~wk91D+Vg-_|HpX^|A^I$Ue0k}yFaLI2*1q{_n}FA&x2si*`Iy2>XY9J z-DtT{D_!@>=MsZ!2fy%Mz0%t@!qyM+PTXgFEfCN9({)R5dCCwzW2Lx|7WwK^G>~3S#8&SM_{>M#6fPLP4Q-bZg5t2 xwW+MmJN9zp+uCTGyN}YOzk*y=ad7_?=9+hBE5&799f5vk@O1TaS?83{1OO9*jYR+e literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/shop.png b/htdocs/theme/eldy/img/menus/shop.png new file mode 100644 index 0000000000000000000000000000000000000000..fab7db59040300ef6fbcbd91ced1831ac17c4df1 GIT binary patch literal 679 zcmV;Y0$BZtP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#NqPt@oD00JjTL_t(o!|j+qXcR#dhrg(YMUL~(O3WES4E{k8L$I_6DHMxXTE)sz zw9&#sYnv2yVqq^>*_~ixAdOKYDx!koAy|lsB;cLrJ)7Uc5xmXpFcUX84<2(f^V`RF zZ|A*TcF4@wthR+sYzaQWC-?-P;1hg;FBAMt;3Hu2C9Tyr5`L)Qi&-6L0>=jIF9K8g zGo^!{1CI91e`u`rt-S=!0Lx`MHdlc$pbablr-2dq5#X`*#-xpJX6E8GGkarZEi;?V z(alQJGP8zbY;SkX{1i|DJ^(jzbXS09z)#>@j;;orlpl(n`P*jp%FL!6v=h=k7_dKW zX7kcy-ZZm=MKkYOuup*%;FM!d9s;|8@ipt?z#aWw0luh4viU{eZODSHst}t6Zs;Rj zb7IZl^1}SKz-o_a9J_m15f^*x-DmKuL>`O zRW#lQRtIRV1NVT*5b)b|>qFQcjjK7DuX=toT!ZGpw*zKAvteK~XTPOdIIQ_=U-(}E zGoM)lxVDa_-KUxHh2IxA^Sg9xg2i0#*o3s5z`KHR59peI4&U>L+bc`vHw=C>LZ`{z z`Ips(qrvwgWWK8LbAety0(|m;51sk0#!i9QU7yTXB4obn@%-?DuSbC2q4B%gri*R$ zf$v6u&upnc?5Zz(=riB(h~4plH{f@qK3^nuFXVTdQd#=Yn&AI8_&;Knr+6#HVN?JB N002ovPDHLkV1jidGt>Y8 literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/shop_over.png b/htdocs/theme/eldy/img/menus/shop_over.png new file mode 100644 index 0000000000000000000000000000000000000000..bda5823f8c36729b82f6d310cb6c7e1991821c95 GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?KUgF*5nBSUrfJ647TSD_CPA~Hl93@QO7rOaQWMF5NQi<;J zWB;!@zql;t9hcIf$hAj0eIJU(K~Zs2K0^h=k>m&2&pdu8Z89`wuwwXn=C40P-`taY z`{p;)e|-JaUPeRNc_|-*{Lk424C@%~{fs+%>u+y|%3*W=NXpY`l(g1;NlE@{uS%m58sx(w#iYncjbx5mfo8T o`CsRpzsU91Jm8_|Kbvp7A39FBd9tU?21W{lr>mdKI;Vst04SH#jQ{`u literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/tools.png b/htdocs/theme/eldy/img/menus/tools.png index ed5d0326c4324bcbafb60fb6e1fec2653fcab28c..de7f2b7b22164a355844cc2f6c6b738d1e88e4ba 100644 GIT binary patch literal 1052 zcmV+%1mpXOP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#SnLAAsH00W#!L_t(o!|mBwXq{CM2k>8tu}R#bm1?B1iYq9R7eNXZL0bhE>YE!_ zX%$gis4t4z7eNK9_#i5%wD_hz6hssaic76l5EB$ptV`WWX;Pz6X>N?imkAuc-tCL` zW`PV0_xt9|%=bUb%$aj;M@q>;r6m?HErMSJzX*O2{QLxe3f5y_K7c>0gzl5LD|;Wt zMHp*fH-O%F9>Y+}(5IA|<#p*$8cHek7W8^kN_VG}-c8kMETy!qid|{$C|Mq?$JTT z$5~DKeg`jx|E9qog%@yU$x+>mSL?Jtgezx|6bH(z`EhKBEHF`pM{CIM#}#!twzi{m}w&F_XE@ zR=hcrY||{A8bR2T$$p5AEw9oBPem4~M$>uzCG2YS@s1YU+pLUW?7`o-H=Z|F0sbuB zYgI+u(S}Q>9y}f!T~0gj{9GMI>QR5>?`|xMSju9z#yWdXd>K<`WZ81?&j95xP# zxhNgPj=K~4+ZC`EpwFyn$UM>iv;cgYU!TP3Rqn(^YY1mW6%ZfxTJb zbwRZ4saFQiblEJgadgY+H@sD2NsUIQ)}k|HgPHCWR+S0jGT{Gd0Ddy6z{v))@_Ag9 z>@Re3yote?G5CErqYm&L4S?q$D>x?j_pCy#L~+-0@FP*~_E!PEGY%ik(B9Z(JFz;J zQ%~#}Q?cgTRvz?c9hk(|C4lGGAFHyppP#0N+6lf@)EU9qlg;etT-WonMhp6Ho&Nxd WZ(6pU8BH(%0000P000>X1^@s6#OZ}&00004XF*Lt006O% z3;baP000FuNklZjA`^lj*!i;Ow1f2PrB_~BP`_RLRw ze$YAezGg-^WYHUotE{YT+C6#RPd4#`L9{z-QWz1@hhpnJJUr*jdELj?`$|vmRru!G z5S%>u@hFu_O+Ul*{J8+g%BNXaSm*!-4SdlL z0|R{!6%{E%{?%&vi`H6LwmG`GLrQuEh)YU;LB4>O0sL33T3JRWlXX>~@GXK~1!%CJ zkjk2VM?RK%5krr$le5khu%%>(pio@=7`J;i07up=d(__121d(`4yr(GJKM^0^|jF3 z*F%(+mfXUvRIAgp=Wy!0eEnc8%NjT?ZVFIte*QR$IjTbz<>chZ@7=o#ZJ)KkvSmw4 z4Gj%5v$M1AHe9|0b)VKks34>s!O3cMZ^k9WN|V#l0Dl{EB`9szZV2KBcc3^`9mMYF zX#e^4?OTNWN*7%HTn_Rp-O$`3g~lcc`1tTHp&Y}R06}=DWbEN643FF+(lRr_eFG27 zt=`8VA~S36B+7|IW<{gXHJ?>2Sg>H{{o(t7LEm1#Mtu3zAau*SFo=*fHv!L^*ND=V zVwegr`e1~(eq#u@>zu1Syu3PX*lZcc#dXpVw=P{YC5(!Gq@1m1i!Kxj8!lWt|773( z?7Mt^V6#9FBJY-WLQAWRXl-kTjT<+}1A{iVVZe_{fECN~2uYKK2aJL`N_}g|l4EQq zE;zfdC*qQ}6UgtS-Zo?9v@cZ7gK=1x;Ogl!ryxBwnaJ9+3&zF~U~Gi=?xqqzBF*eQ z&6;i3zxrJZg6r-vMc32Yt3#n^&t-o6?R^ve@XwaQC#?g3cY$|cYP!0XOeU#Ij|P=S zOSH9jxW&}h-=j;VYRv^;W#gARlzgNMVv8EVJmd(RsBebwEny&x*z!G!+q?jwDmKQ{ z($XT$1z^h#+E73MgE?*AbL z0k#%4fR{?;BsRFh>HtHQNG7~0WMDA1;eT3-HH}DZk+~L z1&d)7%T0>n!h?qnJi>F-(kcZB8rVaJ%N`=X?_2?%+{ls#X-B64PO()O02V<-U~0$f zL~$c!Uf_on<-Z{ifk6$Di%?N<6zf)S)rqQ?0(@Lz4vlA2bVHoD37q4m0q+GCz*?ux zJt)3Xl{f)dFEt{ntB*ZZfi6id!0{7RPmn*##Kc5%Hb9_TT=`>BrCb5v#vfMz%mebl z(k<+3tjg*ID^@Jm)YjHctf@IY@eI^(fjD`p`l*hNP7>0;=S~;Z+B>Ol$Kei$FP6f( zglWJU|2$xMMdM>?@lRVfFfbr77cs-=g0$-=KlG>-jqBtpYyM)tE*#Vw5+TH-APf=k>~RZ^6tdMM0LF&_f*D0GKox% zFk!i#ML%6%VYX<-#&4Gv7Uqv_OH3G??c(}R7LpW_^4?+0^#27+0cn6~76-`y0000< KMNUMnLSTZA)tP|+ diff --git a/htdocs/theme/eldy/img/menus/tools_over.png b/htdocs/theme/eldy/img/menus/tools_over.png new file mode 100644 index 0000000000000000000000000000000000000000..80f9a7f553a765bde7599d380459f301d726ef77 GIT binary patch literal 706 zcmV;z0zLhSP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#baD?v*D00KfuL_t(o!|j>jQS2ZP$N%2=T{`eOcy!>Ea3!PzQ$k9xgNGfY1YQTR zgV;f=VEwY0VURso5m80H)pOiKw)l>8njdWTJ6~hI1@M@e*L3CAmRiws!Msyq?m|Q_wYzZ0Bxk9WB(Ud|ehvB_IFIHk z5fHrUcx5`Fzh>pbHVe66HP4Yg7=wrQ+}B@7K<$=~!n3A5;3cI<(H6SHrIkICf%vGg^*E z%?=C&>LQt~h1bemN7xa3@yQKG3-xwgW` z4lJAxHQ>#w$`UhNt2{*guUwU0e$O5h9_DK`s9n)bM_fL;PU_xKAAIqlAgkCb6rIf*SBsA^0TR2BaMD{MPM)&&C$;!v=840V5pln@eSE9|f04 z6JHwwz`tnh+){1)M(`N&DN>rAf4;X;8@I!Ki-|(VM+cFiWqHu?7y24`%czgLc1f&x oOP_;lMV|@HFLq7%|NGxMpPMEXG=2^^yZ`_I07*qoM6N<$g6e)Wq5uE@ literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 847f2766d6b..bb5941c8130 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -679,7 +679,7 @@ div.mainmenu { position : relative; background-repeat:no-repeat; background-position:center top; - height: px; + height: px; margin-left: 0px; min-width: 40px; } From 90d275bd2068a568691481a3d2ae2debd9555f81 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Dec 2014 02:53:55 +0100 Subject: [PATCH 114/172] Fix comment --- htdocs/core/modules/modDynamicPrices.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php index c1450bc3b27..3a47e6a70e9 100755 --- a/htdocs/core/modules/modDynamicPrices.class.php +++ b/htdocs/core/modules/modDynamicPrices.class.php @@ -58,7 +58,7 @@ class modDynamicPrices extends DolibarrModules // Config pages //------------- - //$this->config_page_url = array("dynamicprices.php@dynamicprices"); + //$this->config_page_url = array(); // Dependancies //------------- From 46fdd19389fdea8ce6c5840b4c36da18c720747b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Dec 2014 02:53:33 +0100 Subject: [PATCH 115/172] Update image for menu --- htdocs/theme/eldy/img/menus/agenda.png | Bin 1586 -> 700 bytes htdocs/theme/eldy/img/menus/agenda_over.png | Bin 0 -> 541 bytes htdocs/theme/eldy/img/menus/bank.png | Bin 719 -> 827 bytes htdocs/theme/eldy/img/menus/bank_over.png | Bin 0 -> 620 bytes htdocs/theme/eldy/img/menus/commercial.png | Bin 1472 -> 845 bytes .../theme/eldy/img/menus/commercial_over.png | Bin 0 -> 638 bytes htdocs/theme/eldy/img/menus/company.png | Bin 2141 -> 572 bytes htdocs/theme/eldy/img/menus/company_over.png | Bin 0 -> 406 bytes htdocs/theme/eldy/img/menus/cron.png | Bin 2165 -> 0 bytes htdocs/theme/eldy/img/menus/ecm.png | Bin 2372 -> 912 bytes htdocs/theme/eldy/img/menus/ecm_over.png | Bin 0 -> 647 bytes htdocs/theme/eldy/img/menus/externalsite.png | Bin 624 -> 531 bytes .../eldy/img/menus/externalsite_over.png | Bin 0 -> 404 bytes htdocs/theme/eldy/img/menus/ftp.png | Bin 0 -> 788 bytes htdocs/theme/eldy/img/menus/ftp_over.png | Bin 0 -> 563 bytes htdocs/theme/eldy/img/menus/generic1.png | Bin 976 -> 570 bytes htdocs/theme/eldy/img/menus/generic1_over.png | Bin 0 -> 486 bytes htdocs/theme/eldy/img/menus/generic2.png | Bin 943 -> 570 bytes htdocs/theme/eldy/img/menus/generic2_over.png | Bin 0 -> 548 bytes htdocs/theme/eldy/img/menus/generic3.png | Bin 742 -> 570 bytes htdocs/theme/eldy/img/menus/generic3_over.png | Bin 0 -> 486 bytes htdocs/theme/eldy/img/menus/generic4.png | Bin 992 -> 570 bytes htdocs/theme/eldy/img/menus/generic4_over.png | Bin 0 -> 486 bytes htdocs/theme/eldy/img/menus/globe.png | Bin 2175 -> 1175 bytes htdocs/theme/eldy/img/menus/globe_over.png | Bin 0 -> 844 bytes htdocs/theme/eldy/img/menus/holiday.png | Bin 1723 -> 1086 bytes htdocs/theme/eldy/img/menus/home.png | Bin 1008 -> 679 bytes htdocs/theme/eldy/img/menus/home_over.png | Bin 0 -> 484 bytes htdocs/theme/eldy/img/menus/mail.png | Bin 1041 -> 718 bytes htdocs/theme/eldy/img/menus/mail_over.png | Bin 0 -> 534 bytes htdocs/theme/eldy/img/menus/members.png | Bin 1366 -> 1044 bytes htdocs/theme/eldy/img/menus/members_over.png | Bin 0 -> 720 bytes htdocs/theme/eldy/img/menus/money.png | Bin 1751 -> 1259 bytes htdocs/theme/eldy/img/menus/money_over.png | Bin 0 -> 940 bytes htdocs/theme/eldy/img/menus/pointofsale.png | Bin 1460 -> 542 bytes .../theme/eldy/img/menus/pointofsale_over.png | Bin 0 -> 424 bytes htdocs/theme/eldy/img/menus/products.png | Bin 1519 -> 510 bytes htdocs/theme/eldy/img/menus/products_over.png | Bin 0 -> 358 bytes htdocs/theme/eldy/img/menus/project.png | Bin 1075 -> 449 bytes htdocs/theme/eldy/img/menus/project_over.png | Bin 0 -> 360 bytes htdocs/theme/eldy/img/menus/shop.png | Bin 0 -> 679 bytes htdocs/theme/eldy/img/menus/shop_over.png | Bin 0 -> 502 bytes htdocs/theme/eldy/img/menus/tools.png | Bin 1404 -> 1052 bytes htdocs/theme/eldy/img/menus/tools_over.png | Bin 0 -> 706 bytes htdocs/theme/eldy/style.css.php | 2 +- 45 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 htdocs/theme/eldy/img/menus/agenda_over.png create mode 100644 htdocs/theme/eldy/img/menus/bank_over.png create mode 100644 htdocs/theme/eldy/img/menus/commercial_over.png create mode 100644 htdocs/theme/eldy/img/menus/company_over.png delete mode 100644 htdocs/theme/eldy/img/menus/cron.png create mode 100644 htdocs/theme/eldy/img/menus/ecm_over.png create mode 100644 htdocs/theme/eldy/img/menus/externalsite_over.png create mode 100644 htdocs/theme/eldy/img/menus/ftp.png create mode 100644 htdocs/theme/eldy/img/menus/ftp_over.png create mode 100644 htdocs/theme/eldy/img/menus/generic1_over.png create mode 100644 htdocs/theme/eldy/img/menus/generic2_over.png create mode 100644 htdocs/theme/eldy/img/menus/generic3_over.png create mode 100644 htdocs/theme/eldy/img/menus/generic4_over.png create mode 100644 htdocs/theme/eldy/img/menus/globe_over.png create mode 100644 htdocs/theme/eldy/img/menus/home_over.png create mode 100644 htdocs/theme/eldy/img/menus/mail_over.png create mode 100644 htdocs/theme/eldy/img/menus/members_over.png create mode 100644 htdocs/theme/eldy/img/menus/money_over.png create mode 100644 htdocs/theme/eldy/img/menus/pointofsale_over.png create mode 100644 htdocs/theme/eldy/img/menus/products_over.png create mode 100644 htdocs/theme/eldy/img/menus/project_over.png create mode 100644 htdocs/theme/eldy/img/menus/shop.png create mode 100644 htdocs/theme/eldy/img/menus/shop_over.png create mode 100644 htdocs/theme/eldy/img/menus/tools_over.png diff --git a/htdocs/theme/eldy/img/menus/agenda.png b/htdocs/theme/eldy/img/menus/agenda.png index 866037c9b543df97f7e01e4f7873850ba597d030..0798d15f938689a6b894e2da42fd7cbe5d73aea4 100644 GIT binary patch literal 700 zcmV;t0z>_YP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#q{Lk(I000KNoL_t(o!|mC@)k^_kQ=x z%rkR6tE;QZYFm`py6|22O#nZZ^6XSu;2&cq0FPk~H}itunnTQ!c-_tU4l4f$2T`qi zJ{o+@>|TA1>oqxbMe2zT#zQ z@9+S3acMK8O+Rj6JjFK>+F4XEiBEVEphjcDw_DHm;eJqjInmzYPPnc;8^l9g2=7kf zMcsR8EjRdk0jgTpY6;cqeG{S1ho|_N(kCreRQPcWWT;hZ;J+38|1i~Q<+tNp3u@IG z_;=t;=rbKl`Bn$)Q23(NjOlHqNuMKlg@v%|+SaM5av);`txuaYJCL}q;83Tg%H0|8 zYiiHnLyG@=O8@1J?uA>0ueGTB`v(5gDPyfsyuY#GKPRTUG~0#i8NW<&EbMGDHu_@2 ze`%p$+LHlaN%U(L>w9eY3jUyX1GUgxxE{_(!TCIDo7r`ixWcMBmsqG~8;qL;EVUZ6 z-4nBm*t?F+#Z)*Ai)!uGHq&iF{>G0gi*aA0000}2P)41MT?JuDYQ~ktt?pEL~DJZ z(4x|`Nz+6${b4aJB{WKZC~7yYJogFvp4r*iot>R!@9DX-%d$MQy~&rkb06P#&$;KG zdl@FCEMLAnTF=kVXBIDBoUmfWicNWWc}>N|#ZRiLs)XamkB4e&YyIWr<-!Nszak5Gg{L?Lf$Yf~D= z2%%r4PnLtw(Qy|J9z3MW&dT12H1XqnQOjc8wRY|6ZyY{yr1#$a9)%RSi5wh*anOQp zLlJ=3_8?V7LA~Ap_4OJFt*b`5#2H;jEje`f@S_L4j}$8;d5i*LLD}l+>Hxc7YG0(E zj9P8b*mydKuHTQeag;kdJ9}bJN_XwL+1d36$Y_PvFN04Cf+&q4@Ef4Om6NcLgq3jH z1bhfOFM!q!4(p-%=uu~SdU{UOlC4{}FzeT^-+i^Y1w5h*oZu(C7y!W^oCGgI3IQBL zAu$kA{-cn>V>~#I^N6&cbar*a)@|E57A;zoqzEloupr^xy?ciSbS7}PeZhDN{`*scg=W@Z*%ymSRcL}GFB z^b4#vfRLv_kO4kMA>KcRi;<@T=iy=@%;O_>f9-;t9QEzg)YLd8N3Fin*?k{Ob~iCQ zc(8FII6V?Lg}^lM5>bR$Ur_mXDUc(eVq||rWXY2En3~#;LPMh*^cih1Y~jG@@WKe|hfz+N1{<#Y{KY2t>cZto zID7sA{CM+c6mTmG9U65hd^#&fnp#?6>C&Y&%#o^U|KJDLn+FC*Twy+on_OsW1`LL3rlhoV_^H7j6*9&MjZjzoFN7Cma{3gZ0kc!# z)7f}vIDH0^l9G#=f`WqfuAW}nNvMzsT}ORQ_h}rX&jUMw5fn4pV=O|x{RiHMgoK3G znANLS@Bik;_b_aAlVJ-BW~YFg?*|(Oz*JbD3o49OIRr%rMab{>A3(vTP5l_&^O&UM zSwc8sFjJd@4}*rb%}s?oN-!AEG8!lu8JTC2l9FaI1^I8P z)N1v)AAV{_(|yE*1MDW|Y1VSvNXx)W%mq$_#yUET|t4Pm7ExcV^;=(iZ zYBaIp&6u{Y;(+eY-oNRd5DOk!m&XroB@czlFZpE#unKK^HjW&whJC(jZS#IR+wpYD%CkO}TFw6wNC z(dNzf5))s{o^-QLd95VUoAHC{qt0J`>sBJk>8%&rBX~t$zlnT=?>l?!;^Fz?R zE!W`8muI1}@(>gj7WQXkW`04V3n`)-Kgp7rO7tNSDfH5!_X!f^Vs!3Xwrp7q&0Wd! k<`vTuPYPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Uj0XJcGUf00EszL_t(o!|j;SZG$inhJUKQHye}TLe;1Qe& z>THk^$OPAyi)0~)ZLr-~^+~({#vk@?-+wNM2&u*$5{?X?;co!Gp14<~0^b2p3|s>^ z0cb+O-v{{S7Qj!|e8iFO0F*Q9pfj{p00sckrNhEwhV}8GGykkgQ8o_%+LSe4r3^o0 z_&M@(MuDY5oPk@fP7rHe8Z@`^8xGnunL1F~5V*6Orq+ zA)-$*ha#d%YuA%qNL!XA;Oa_;a^hL5wHH3&U1cM=QgVqe&1|)7d!uWn8Z zGhzZN$4P zS{E)O?|Nb;E#xt!_1f3=xW*DUj{ZCt_!9Vmr~lnz4IKF0AmB@6Gv2Ek9@%mvEfEsh f2Yfy~__y%C#jBVt_@Tw}00000NkvXXu0mjfo}S{j literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/bank.png b/htdocs/theme/eldy/img/menus/bank.png index 9c6300eae328e5ceb9ef00e02da20ceea075711e..fbaee7cc6bd21fb4f562365a376918f52633026f 100644 GIT binary patch literal 827 zcmV-B1H}A^P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UjF*gs!;&00O&7L_t(o!|juHgdX)@yEDi7t@D1>FBoln*mjVY;#P?LKYVapg1n-0aZv&+i z!HQiyFylX)-s1DpZw8Do2-uc^%gjst6xj(I=n1)lq)x&qJ%TnDCx%{G~U z%zL$8z(rsYa2m)O_kU3E76M0f?cF8a2}X#*zE^ysHErzdW;gIquQ7c%lt!^{YNd*>0{XDL`IKc z|0Yi6{TA#eSAV^LSGp$$yfylRz*k^#8maQAtAEGGey;Qd*LW$7KdINikAOe`{z~66 z#@d0IX)ymzrEysn0NXt5yQS|MW1FjGJ`*tJE49@w`=6>j$Fdy&o&b{#`}sh#hkrXP z^Onc_N~Ojj=|jpU_f^ZZ$?mhthP)B;LkbxyuFZ&FwrN%dxve9TtU{v*JT?|+(bxm; zlI;UvjgNmj&X@;S1{@Ugmw-NFZmaZF>G$%v1K1b9cOr$^6y^NB0I$8M3bZAOlGqAZ zRjvSbi`{P;GatMa*Z{0j--;XjcuHbafNfVed^Z+sURy`T=`Zn}l(}UrOG}l0B0F?S zLn1qLN<&8eTjra5K4nfM{=-y!3c0~*!Pm4jzDcDe{{W+U8l>_!?qmP}002ovPDHLk FV1m@oVeJ3_ literal 719 zcmV;=0xhT(th&XmxyG=&#b)!yaS;py1q?Ahh*+2-)n=K0y_`Pu0C>+9?5>+9?5>+9?5 z>+9?5>+6|^M^^v<00DGTPE!Ct=GbNc00D1FL_t(26$QbuZX8t<0MK*qOm@9?BBiiN zo3vDPNcjSOngR(?@C#{BB)Tmui+DZn&D_g5000000001lU)jJ5FMul$znlYf?Q_mq zgmAk;nhjlZj4_H3;{Fj*y)}J|F~)2{2p%4hhvT(-A7hN!gb*UUe`I-DYTsj@bM6Qs zgb1hgbuDZ&=R6RCYAqrjp4RP*;V69s0IBnJ1$OxYVC@4wRsy^LP@SMw0DQU!DI((b zU9SazS|c(tBO;1g3xK+0W@ctY#7?gT!1=Od=67Ef;Y4KtaK67>E`R>?`H#2ryLF+m z063jbr*B{TpWpskGMZj@0NyQ2*iWXtYEpT91`w)#{`=pj-@k5S+o;8J-B*>t)1{8% z^MfzunEyTB-BzwX0(0x`?!Hx3ZRCop_h8(*ySl2Y?O5UJ4z}0s)^zRrk23*0-i;01 zy#ah!o&#|C001&0^A-RhBQqm2=&q_`0ssJj{{cW-!=ga7AUOa4002ovPDHLkV1nI} Be5wEd diff --git a/htdocs/theme/eldy/img/menus/bank_over.png b/htdocs/theme/eldy/img/menus/bank_over.png new file mode 100644 index 0000000000000000000000000000000000000000..d395710a8777d9c9612301f716557ccffc9188f6 GIT binary patch literal 620 zcmV-y0+aoTP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UjR=>1v<=00HbtL_t(o!|ho?PJ>VoeKqdO4XP)Q6WAUB6J46(0n~Z|>&|7HxN&3Z z0Zi}&(i4d8P4EV7To_l+&5-;|3bch5(EpNIOc~%o9`ok^wn(C>*g=C~$y@T4e1ou? zb9@hgUm?FxVr}x*6~Ex{U&=;f3Lr4#)NTs-DS)1lPXN3&rQ3{D9?1jQR=H{NLjaDE z_W*R8qWJ@nN+1u>Z(6tM0J!|iYVtCl6W+@^b(;@ir_*i^^uA@(%zPDYb_HPL+&;DmAZX?Yo?M zPvtXdrCTv6jh6*Iewmk5%1&2N@{iK~5-hu9yiwTGH%sD?$29$=VPJ>y3zUbM@*uYA59NKm0^BP@=xx8W57==3}->Y=; z3EFCLzLCu-yTxtEuYp$1Uzv{a(N%$14Sp+;x3aP17vLAzGvAk&!lohs0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UjeGh88CP00PZPL_t(o!|j>RYg0iG$3H3lwoO%1!D^@?{x;PLS}Z930Hb)3BJ`#n z1dpPiAove>62z0B7r~PU4n9_&F+VyX3JY+8-P1Z#izBhmHH2`rC&`x5)|HUS5Q zyxp07`+f7~&CX0>N-3I^T4-WwYVh;wbl)?;0bnig6?iTDAkAdvcpb#d3=Q^4~o9&QkLq0M~* zlE5RE(WVXf=C&W@S{Lc9zv)4z(wE!aMmCPC;>-++pfTm z0egX7V5`hMmHCIj77eJ0T3sJfr+_uUi1_j$pdaY8fUeL+*Wlj*=YZn|w+NzP*Wlk- zKH4D4x(5Fdcm?#-xNfS7FdIo$c}v`+7QP2ex;|kmbQHK;rS22pS|g>zkAcPV@!Du; zuE6V+&vzN3%rvl68z*Hv-AI+xN?^aoudf4FfC+7G0Wi>LW#CB<@EgE0;5~5FBTEAv zjRL*{=<@*Fq{-8UXw%;)KHq0JsCp$`_#)RP`CVYfrRA3Z2Yq7s6p**X`opf>rd!^k zANZ^V{BGB7v(J)*Wr2c4-X_)9kPFLq0txYF6OVh6Hxuu2W%(Y9Reu2AwW1~IqqhNA zB>ItBJ_VG0cudnPSoF%k=BO>-B?j=z<;S(_PXRf9Qd)wMfnOg`Efuxv4*|OCqPG01 z06?ETUCp_bvq|CM+P$b}2R8hB18s5Zei~jPc+(rdhJ!hE9 z2dw$sDBw+D_-DYHKT*Z`B9O7W zc;PPqiI=KU-y$A)MWR)tLWI)D4sqfHVu&3_i7&Btz2m*ioH-XBb{#FqTRF61q><*~ zocWyZ?{>cMBR}Fc)|L+*9DMi49q4Cx>=5PseN6rAZia^LIKFWCtLK1^fR&C?*A4EaFkdJXADMb^`pK!O z2Od9q?AU?vdyf?R?mQ$u`s@<3XXohK`T}qq7(GHWH_RK)Kf%fKOWrQcW^;4rwl2EoC?E0g zu~CAk#L3wOMjBr-J^c{IdfxiW>lbFuoPG?b?&LM-0W6P>9q!K;_t8u zVTSh?c=lK0)S6>>XBjN#SlQ0_c;+g_)&^;2Fy(QZ&Lf=R#g|^@H@|&^rGaJvY9w zoQlPb_ZknuD>j)tc0)!Ccq{Z6X04ABCR!>-~)^DZL1J$i<2BgC~hcO1{92=Dl zw(1E=DWrfvDMZ*VoIL}r^=RuzwEgZuQbUUto3_DrT*G9VR14C~5;%}j;5>xF?Rs7G z1Ulz1nI+ZcR&#nlXBjQiB(79xY;S{9WLXZKS)B7oDe>Nu3D0hI)4OP#LmNw~vs<0% zJ+xAdY{t~9>*!2VD)o_SO`2s`r;t+My&}ZpoWC7~9%CJ8X1n^ylcp)ExlOgYiM5U} zjA+Cftt~DPv?r9p+8+S4&XE~MyNBBnD>qlcHQ1_F@d)tIM|DXx;#>0@pe!eHT>!H{1CAi&%EO3djM6qA363FQ%s!e*VDy zl_<)82s{l;0Hw~l?tS8i8sVMw1>jC8Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Uju{RL`#f00I6JOUe(4N5oY2F(Z=AtTTY=md2) zpc~K$)IZ9d&llT#2pe?gABk=Bc#-5MrywF6)gEwQJ2d#mjh@>Ar~#A!MgWFKC+dZW zB!?!Vf&4ZQQ6uF~5_n6~?YbxMn&#VOt=~eZR2l%)f_=prrxM^bfbYnfF91D{n~j{% zUCwHw0&_oHc?JLt4{hzM06g=2mTFTH(HKa|vuFNh?@N74FhB6mUt6qp{QZ<%P`OXo zcMgfs3X!QvtaG2R2EYe^*M)ntGH+IfT~_b|m&3XCx29A|s><_%Jr~ZCT?n(J`bHW& zxNgU+m+-YkGon4Q?XFR49Z7>P@080oKEUi3I4#VPO=JG*ghv~Z&E;Og<{s;{a|%mT zs7;tZ2bzvh606+ID-W}<^iD_@Wlh+Ilh6m=L~a_gtICk>2{He~FP{axj!0i)wSuDT zOMq`9!fTwMJYSX^T3drRGo){m8hjl{R2RIN@T{cZV{F-M_j_c1PKWgySbLh=&#nQl zCN$W?%yzL%1%3)kbHVGBVH3OJlWf$Jf>$1?unX`8z-M5-0&sO+<|2B9A|Qop?ny(9 zwjv_qnICygnd^T3mTWDT&+3j$I60qtzO(6;hEuW8|FFtxvb7_Phc&lkDZnSOL;nx^ Y4;OV literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/company.png b/htdocs/theme/eldy/img/menus/company.png index 95e5db620468bcff16d311bd3f0ecb36de03c004..828bf8f2e709d32ecb911377c85b8538f558671d 100644 GIT binary patch delta 536 zcmV+z0_XkR5WEB-iBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Ck2><{9 z008+zyMK{D9)I2p76BeET{mi)0005JNklFE8JI zn&zc#O-e~sZGsA$7w^S;@m_o}HdVkJE2^cnwrWPJ6@O5q+Q4##alh)Kf65duMi_ep z+?Ba(1n>f!TVgJNt(g9(>@_cdE^u#&=^E~kEL(gC^oGRrRGf3<1A{RA0s~jcH-T$Q zOw(2J0+(GJfyr*aB+)Kdcv@ a-u?jKF}KY$N0!k50000d0TvY)4nOtG0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0} zP*;Ht7XSbUxJg7oR7l6wmTQb$Wf{kR?>T4AnRDhoJA0kI_OiQdk>0cl5d;xKql6SA znn;Y%7!v)W5ie1U2})3-RlzEX5Jlr9k{A&04N#i4w0~twt?jnE+itr%%XVjWX6Jr8 zx7QDaDs9sczxjN5-w)6G{__9lN&b)Ef2f_0Jo52WGI7uPwQEWnCMHfej-vr267l-q zcR&B$`Gtj?=Xv*i>fU?LUHVqMS;!B5xJ&rH|DBPcp^1@^p;B*8_mZybP1kibAp}AQ zeBZ|~41cdytA(d$W{0O|Plxh_!h^MXecwY5JYc^m;9Vd7h*>BUMp~`rz~euCmd~idz4g}*-=BGdrTM~g#4wE8KJ>vIKM#e%{jTFE zfDl3m5c0x_EEWs3_q_X-_SDI#6NgW|s(;Paov~{>o7)z0RrbzzvC;_A9rn3-olV-v zk}Fj3Jny1=7lEc}YNi<+EtFQaSL&r!P!Ikn8A~loY zbCn21F@URB__SCX&C+dZ95|~Y{UH0M`%o2)&FMNL;Q~V1Q=y_APK^Ud0)3=++j|6@Qn-N{~~l z9lTmL=rOBA1ODYeML^Smzf37~Mqt~J%bnK>TDG8&_u1NAAZad9u`MP`{gj%p$?$30 zF4uN8sarYb3L2-1Df0CI196wTHnwqAGf2kPnfhlmp&_prNA@C6(U-I=g*~CDtZibS==_>q)UAj-*cHSv~avDC@i)vSh}fG zGSMT+)+EQ41eF?W?SB-UEOil$2N*E(bcR=OTnEEQvtd~0;G9ZFGRDSqo?c^tcDv0? zA;fIaqF8R>T?wcnY1;7AQHAy0g3W1{_rGRoy(Ae;Rv3&d(ULkR$~_e7DjN+LjyDv}pWw1<8btzZcc>Wa>HXMPe!OiP@ zHn$WON|KXVLAeT>Qwm25-GrhB1Hn9wiPkQrHr98R-xd>jK%3tc}+giDl7LiS76}z9bcdt!sVOci60NWw6^# z6jenxOxrLFyHcrGzUOPc=UpT#uU{kr`C1+epzT6PhrXyFphyP8Wfb9aC_lg}8HIAW zj8GIL5H&o6fJU>$hKaW!>3k0lF* wmF@LL?Y4Hye)e5A-T2oXcivg!|Ec~B>^Ya2SP#C~Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?hRKk6QcL#T#LS5yxbDj z0E;X!#V4_weWx!>|NKnv|EtGu&89A{;LNF4DP%sUyZntkb7zOHi%VZ$jbfQduietc z{A%~FJy*Vxd(2Aijf~#I#{$hg?2+xMNk)$wv*J!3-_vs=?yfV>6YmEWY@b$Ds;+;c v?zE5V%};~X54cO)?NVPzt=JU!Nz8^(ebcG0kG<|@f zhGCk@X*r@*SrN^}8T{p|e17pGwrwpVn@vQrU5H$luS8AMV{XGORpb zia<)yT3w~STfYRIWd=0;{%-Yf%`SuQ$ zS5r7mg$i7fnnaT>kuUK`5$h?D$YhnS>0;vIg|w8x8^*@&?y;SB-$T9GBv`#pShV(T80uqfkUhX6HYl)S(k32M934HSMubtMHk68_QmH{B zoylb4ND;>h5yxmM!V)1e@`+-fFp7z9y$pn*Q63!P$);=L@T)AUPDTtLI3`62L4vm%Nn~Px>ZZZu6Y3B*;cC=7p$2E-DVtwTX z5`&Z$(!6>KBU>bW*F7W(MKnz#jza_rDFuzd#zQ9*HktrU6QaIerPXp4jn$QvPj4>H zZ|dqUt2kW}q~l~i#fx?y7$HX`F8+*Aiq zEYOPm7`j0mMa<3q3*Yyy7z+yvM<=g-{$y|eCS<0F%J<>ioI_U)GG>b~xK7ip5*tZ! zS%XMAc-2V)p(9Wv@+GWd52OpIAV5Q)SvJXZT3w%=5!2IC*G$u#(fuG;*x1$i<6ZZU znwn)RbW;S48X{<5MNLwcz}6+U5z>}TlTMr1R!mS|C-8hCrIX0!NaymTGFi-I3f(j@ zO-ua!gQFZj`nOjc$9Y$Oc+W%4h57kXce!VDaN7=IC4|xpR1A^tAf$s%fUU*YT8O0_ z%&-Ao6X~`Hf&e|8Cz)h=1fJ~cg!@B7y*)7-yh za9g3+wNb@ZMxfcq5Mrs*hz@?2NE{pMjl zIDYKq#f6186+}8fv)NqNG_e>(;S-y;Y&F`8C54?9qOFrC-Hq>sg!L6{TKKL{wXSGr zC8FGB?5>@pN@X-ViO>usr4%0?f0uWTymf5i;>DkbQM3kND5VfWsIzC!9?532Wy3Ij zHTLu~Mo(YA@)Jq)bU`?^WtuCqXmJve%@J?x!N~QX=Qd(wiil(e!?IPY)e;{beV4ah zKRkZ=^!Q7Gl(V-7+qgY=Kyc#3iQfl7;H+0GzxdAMPi?sOYrDv_<&~Sr2v4Mlu(8{B zknFpgL~aA7WrLz5Rv16xBjlbkL?pc8L_I4_j$}I}|FIq7N2e&-1 zedo}j`|sbqZ)Ep_?AUoX=}a0FO5H{$A%v8YndwQ+ojJwHe|%KAaN+##rluzU7zDSH z?B2bb@$vC5s~QUb4Js&TCG-#`9JzMs-p~SO~oP900000NkvXXu0mjf<>nx% diff --git a/htdocs/theme/eldy/img/menus/ecm.png b/htdocs/theme/eldy/img/menus/ecm.png index a9a975219cdad1addf39baa2d93fd859e7e08d18..542ff5766e1d7df538e04a1c2dffde2c7de8f635 100644 GIT binary patch delta 905 zcmV;419tqx5|9TWiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29yQleqjmrQ0}x3> zK~z}7?U~7I6j2bye~}y%H4#Nbqe)y5!GlCxLLd=QuZoBZ5?nwH9t1(~=zrh>dQ$Wf zJ*kKwxa-9|E&DY&ue_gNY^-O`8 zk*hX_9JW09Jo!BN%v(8d4rudzq?wJD*O=Ko``60-oFmi9PXcyG<-0(&=lhy$Oq+7x zh)ACW$`at#XH(i#o7ovNi#mSW%xXQcn0Na*e?gkI2ixUUPOKg{2{dZnf1lvkN(YlM z<%`X%&deIktViB%W{1tJG!DMUykH^*%sYU z3|A>!rRH9&E5aVdW0*tnu3Z=)HC6(_u_@TN`Hl3yV| z2D|_&azXi3z-C~o=I6EN7|aFbrvSwcu~MbYU@jr-a5@HQ#t=V)oODU*y`+ES{$L(*wvgAK1UCNxt zSrMZ05#YKiS<>cbdvFEVC-vJzIH>XwmEWhSlv_XKe*rJGXg_HY1yTMH@H|M5@Vha4 z04#HMnMEm(f2ShQ7j%L6CEo{h>GNlG-DJsk>IJMHeG;bLKlW%p%N7WCS$dDC=be?9l@+cX! fg8ZMzqhx;pthyQFzv{&m00000NkvXXu0mjf(j=L~ literal 2372 zcmV-K3A^@*P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01EH`01EH{Laa2H00007bV*G`2igPy z6)`B=NSdDj00_iML_t(Y$8DC|kDX-|#-I25-hDnF=dkD0PNzpGEiD#W1QJNlAO?lr zXyT2==ncUbO*~u}Z@iG0aL*q=Xksf86OC5nPy%$?0&STNowl>*uxDn^?7hFe_jh=Y z%Zq}7@wr>;Vm)gm&q{tS06hP#hw$FQDgdB7xew1h^>u8uR-8bHBoP<@d*bAySX)`f zzPf|NU%c?bBR_fWk;f0r?f%^$l)Kh8wmt+9;WIJD@J0Qn`uRyjK6=ld>6!cX?>>>E{xmG@NyVJ9Z)5f! zmln^x^WpWs_J_fr7H%%5iD-+6{QqnABiW1W@o0Sd~c_CVWH^{Y<6)x zqx+-f!pL-Ebe5Ya6-#DP$!wP8D#bPmC9NkyWjWlw%Z!bY;jgt?a zLNcBQFV;z_0o&gsGiTrW=;HO|wO77<=daBOQg#e*~9b?B2A9vfW_4I=FrfC18R@me}v{$x7}o;6xcaSMPkpSkY& zLdyAjyp%ryo_w+s=*p(Av1@!k^5c`(*lc64z5>~8AqxBCn5gUmUoDg>cy#iRPR9~I zeD}uEV|=9_fD=QU9Ll9#C5PRg34dpt4Ab#s{CYZHxE+gU7s&O#C$~O5rZ#TChLT*B zW{YqC1zWKQsdyZ2DvMMsja;F?9JhjGzJfq9TD$TlPelDA#YE~RZ%Y>`tB`RG8_yLT zFBBnj2xQqttyq59%~fZ$3Fnk><{S$UaTN1;HjytNk*gq<%pewvL0b!@7~1U?27>|m zoA069?XaGZ=qh$+O_-NBHwsY@A)Sjy6SaKrorNaLkptygQ6)wFjg=q3MDbWU#fs%o zN~g1|R4yZ3EW;lTG2C27r`N%t??DKS&>uhwiAVtw7Lg$^ZSKr}aJ9+1y#cJ$uvV|$ zT=OsNg!a1;6sm<3_xfJN3X@2r)2NQ_LTz*s92&mgL-Y0x47)oJK?J1@A|e>gK-NN$ zgNRuOG666DD4u!E&ec0UU5GRIOu8LHlitXkN z=54P+TMcUfQU=-r27tAIB?T!NBC?QHAygJZDXeVmuuv&*mWV-x5}b2ZNhY}%1~3kS zPG7&V9@%(`3{u)aTZ1U_2##gUGQb#UZ6GW`TY}OASRfz+sTG7Z(3;?D!b+!$Ku9>5 zObVI^W92M@FhsA{XTAQ=fA{+G`^FIWLj~7mwvdTifS6VUEew>@kk&#Q3#|;aGVl#S zT7}3MNNGWa5Q+%HAcD072TmNJ)|hLQFo*;RBN2uXtQJNDAshM;L>R8Pa@f?7fDsx> zX$WJXEJ14vtqH;y_)QF47AaZ3NV(SKrq%I(uBs;G=`ys!;OIB zI;hSanSAz%ubdK^>rC3k{rl?_gdy`oiFT(iI@@g_l!P<{r3gkDC}knFL8LT7r4gCC z3m9!+G(k#@VWd#1l#xg#;2fAJV`8j^e7#XlTfWy4S#lgS#_LWj5hunNVw|yVf51X* zAgzTk8llmMpb?Nks5OMPkk&$ygf#kYNVGxV2Vlg&z`*OZEXIV3WIFA#Z24$9#S58I zEm_P=JmPD!lW`el>O}};VHAOkfz<@50Yw^-wouA~w1p)NX$aO3q)^!GdkDe6V=-83 z;S5=pC9?&ja|JhBZ5*8*8!L=V&7@<+?8%`QMPNXwoUj5gzSW3GLxK>JMQAL9AxID; zyZd|EGPDOnEUdPuZ#hP$rcf%EVvg%D9?!?sSgMMv@1AD}`iXii1uB%$9?0s!12g+t zYb}h_XY2k}lLBcFSwL6`qYR`XkT$T)Knepdh_Kf7AY)0Y?cT?#wYtd{^6SQ!w~RIc zpTBzNT7=BvDz|(6Afm=dl}%Uc;Er24cJ%1e7o_>>i4G}I`y%`Y`wFw_Ra0Bt0&BfK`4+6!m}Qk}4cTlK=}hKwuiJffVPWBqtyXJgettgs9C!{LIs_j2zLrwH zQ7V<*zH;Sqc4ud2ZDV8omxWxG8D&vUCaKr$uzn=b9R}F&LfQ#5%M{CO@6;4VM@J)T z?bUX>eYVr-oaLO~dj0j+#TOB7&z?QFcI_IzOp$bK4t+WkSvr?uGLT~mDcn5{Nnoh`uT;0g)^MPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UkNtxZG$in#b2s?4;$2(pmc)J4YEP$28=*9$Oa`7G#i9& zKsO*8xD#BzoF#fP34e@-hU_n1%SHuKZ$6r zD4C>E$G6uv`%*Ze?{@MS0q_6Xq0pI^9)n*+Wcy4&PJ z_demj0lYSLyWa3cL+3_1KOUgpc)V)tLn`;A`zwGC9_RiTJuI>D+{S~O;sZ23w50@e zTEi;g$6dgiYAPC1&Gj{AC%&cHf$k5D^BnENnB_bmMm%j#0JdYGhr-tl=yJdgvTb;# z@iFqqql@NkCkjrk^@w@bcQSYdkO4S9>iK+iW3N_If&;+H(W^{i2YM8CV$xVU>gT}V h8XjY{yhNTU{s4BK^m~$Nny>%>002ovPDHLkV1nqy7Iy#u literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/externalsite.png b/htdocs/theme/eldy/img/menus/externalsite.png index 0bf9138d463f9d2254ebd19794bf3e6e944f88dc..01e30553fc569e01123faefa7ef3c019cbb36b5d 100644 GIT binary patch literal 531 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?kymxs9pc?p3FMN--{Y$aT(A&9uv>Kw{59X(ZGyAAIoZy6yR=qdsl%PB8wk zFeP(F5j-(yt?6IQgi%v`O*!-B5m_b(trNyYCrLB*7N-NHB3B3e#hF+ zf8rJ4pZJ&k|GOu<9V{=TDW}&3&iwhZVrZR561CN*1OzzA5xdfz;$Z(DcuC;w6&}z4dDsW5y4+fo*fMq{L5xBeb%ZM zx(}Fke0$|}VBVegm3vRe?dM;a`C|cV^~J0YZ21V3e4M`{qNQ%tnJccK==5~;b6Mw< G&;$T2cj_tt literal 624 zcmV-$0+0QPP);J~w_+FIG!IR8?1WT1RtROkiMOXJ=)e%#&DdU$=2-4*X+&M>de{g z&)V+K+wRib@6z4x)ZOpi-sRZf@7v+*+T!om;PBYt@!R9_-sSV`*vakO%;(+K=;Gnw z==9_1^yBLE-FaB_37>Q>F)OG?)U2N_v`TZ?eX~T^7-`bM* zeJ33rBoRSCNZo>y7qU>AlqMmYoJh8La>$s-t4Xc-i5zr##8kOtC+d?oq)p|Kg^M=X zpVqwHc7kr^Y%|G0VO0P9Rtww!0000< KMNUMnLSTX-L}RJ| diff --git a/htdocs/theme/eldy/img/menus/externalsite_over.png b/htdocs/theme/eldy/img/menus/externalsite_over.png new file mode 100644 index 0000000000000000000000000000000000000000..8e227ddc83f7c92994716cbe7c75cfdb4814feea GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?{il#0xY<#M8wwB;xSf z8G*Tn4FuZOUuIx&QebgX6gi|I0ws?fNDkmg`|$Ru(%m)Qua@es{_=m)(;qeE|B~F( zHQ5iuh30=dB(&!NtA52n?zj(4;(H#@_h zQ}Yc&jE$L-x@R?dCtIu8J^MTDzUs$~=l;y>XZ-aHWX6BtA0H1^_y)VLo3|s;IB)T} z?-?sUZzU=*VPjdU6YcJ2GTL*@hZDU$|yw~oWpW0>3HIb8k zZkqI7sxrEQ`JCbpHlK%D=ihkGz7r?=>&>^|iq4&k<_QdTjk}-k-=+IZd*46(Yt40A hxFF63``};ZUxs3rV>T01q(edB>FMg{vd$@?2>`CysPX^+ literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/ftp.png b/htdocs/theme/eldy/img/menus/ftp.png new file mode 100644 index 0000000000000000000000000000000000000000..d9d96f0255b04e220db0fb0549d01c42bb2df960 GIT binary patch literal 788 zcmV+v1MB>WP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Urkjp2N2Q00NXrL_t(o!|j;AYZO5g$3GD@D2h!KF`&^Xhz4U}W8(#ag(&DBAXWjp zC@4`uLWqSDEyP05*x4xlC~PbQwG(XAXkwuxK{!Q21mUi@+}=%^R}7E2-MP)~c?&!6 zSY~eCo6miB_RZVvFvgJ8wu%h596pE7;WN}$tNuaYwuj$G;CvJ7^Z*0EDPT<2>9Kwv zi$!mYv8`Z?2|Vnz@(VK^vmpNV7;#K1Z-6C_|6KLd<^b?m#Wdo-l=QZ#1C<2fF9Dq@ zW?lS!*4Zuw@Ix#VK1t>Gs(9ys&kp5(1Gj*i((eQA0Q*(EN#JTDc$2X5o2_^=z$43F zuM^1iFz^7_=$LZ`*a{4};NMxdDT!t;-V1yKPB(zB$@Mz0Hble%a1?lzcAl>|%--|1 z1wc2@WsNNYQ@Pr$Vm)IQT5bLYj7 zyKKk*1w8YuZ8Ur}<=Tgc__byVvncol;JF9HVodll@Wtx?37gyz^4;bbuty4{OuR`& zDZdRk=@GXGy!fB+f#c!ql=>r1S-S literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/ftp_over.png b/htdocs/theme/eldy/img/menus/ftp_over.png new file mode 100644 index 0000000000000000000000000000000000000000..e3ea742e7c7edd0d0e970ae45c28e464d90fce7e GIT binary patch literal 563 zcmV-30?hr1P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Uru@FTV-^00FZ}L_t(o!|j;iae_b)g+DX?j~z%VkPf_55KAx>Bv{*QfxRp|WRJ4x3mqg9R!j-VeMK!n`UL+Y!MHE(||E*eNr=C9oS&im5HFBB& z%Zi3r_>{^?MFpusQBhTLi{J*Bt9&>ms+Q4D&0<@Vk5%~UkU0`_EgqeDMDSF#oU&Pp zH&$1cP$7%kc@Q^EJM2_te_On2ovLvxW@?((!IDz0w;JOM!|y`caEF>(4N8+w{>6UY zg#+;2@HyXH$eO-qbmrV9kuaJ^@%*j+v^pU_QO%{-Kj3rO3HI_#@S%@BGHVYXJb%xG zP5TsuaNKtSx{)Cke*gdg z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29}VV9DyaYf0lG;< zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)TqP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~# zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy62NdNN z_%sWe`TuOxSD&fS*UGUQeA4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{ z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJk!15ims zK~y-)?UTK4TtyVce|P5XZr1VIP8{191tTFL5K%B7IS3)X1T|lO0-~V-iJAsFI+_$v zKt(}G6(~TV!bDL7RzOfh`IHkoe~A;v-hFT1o4JQ#O>huhNXL<`bmxrb=$x55#@`69 zy!L+Q>c-%}_RT9VP3(K{>G9seW1Y_210hUId)m`YIZzL(vg~hO8*Hv$><=#dR+VRe z>U8e^KE~e0g>xSd0S7RE=U;x~Ad`n)pPahyt%KH}ah^;^@Ahy7Q5u%|8em$kqaCBHvSFT-Dnr5-JAdD??m7p;eX*>!gfz|El>>; z_Ft+SQc9s7^ta4xXNd0_G7MKe3@gXJ`NVHrhgjI%dySU!Hn%pHkH+=WznoZ@ogHsa zO&=+G`z_^w*IAw+H!>yg-IaH*C9gq>rW|R?Rc)*olf9Z#@@1*4)jvt?&pZ{+4 z)N*H<>X1z@1SrgN#B;#2jVcA)1M-M+Kpsqu+u-KueEHnBUk&?b-~D~%qc3u*$~)pO zJ$|VD@Y1v6E5H8n%7;Bdnk6MXOfMNHC0wBx3+I=Y_4ytubsKJc7Em7 s^()7x=N3<_AYJ^ifAz}A`Y)|N0qp@5e-SikmH+?%07*qoM6N<$f^G1=qW}N^ diff --git a/htdocs/theme/eldy/img/menus/generic1_over.png b/htdocs/theme/eldy/img/menus/generic1_over.png new file mode 100644 index 0000000000000000000000000000000000000000..adfa8c1599b9c2b74e15d0b86e5cba6dfbe8587a GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?if!v#l>^8Umr0u{387!;VsMgq7~=$b(UP6Ti&X<-Ic9C+F;Y{zHhH(ZWm89 z3enS95<2PAi4Rh%W-jU7DjcHrP2JRVZR673pv%RM+l|9#&F@dre(}3~uc2+(y|q>o zSN=@hJ%Ks=`L^vZfBl~OUQ71gLp0RRbAQf+%&Ag!oIW1&b8c-9S29YA>}TFO(=_0c za_q<6wLg6p+6d2FexA>UH^(@QHU6@+edKJh%=KRtd(-Qty!`N==O6Q5>Ds50%W@q- OG34p$=d#Wzp$PyNUC@aD literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/generic2.png b/htdocs/theme/eldy/img/menus/generic2.png index 86847858c4af5ccd8bdb4fe19e3c46c8be9a9763..f4dfc5f360a87341fd9e6a59f10bc733c68028ee 100644 GIT binary patch delta 561 zcmV-10?z%f2f73yiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29~Jc{vi|@80lG;< zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)TqP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~# zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy62NdNN z_%sWe`TuOxSD&fS*UGUQeA4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{ z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJk!(oY#})Bu&#M1htE*2ufQOqPWqDf;$y|g1B+xfAAl;>Bfbw zUAihRDiuVuXcxhcE);_4SJL*Re`$Ko`!O@m?IMXyQ7U5HdBZdF%nV%f-1A}FRe0^q zQ`PlRclge&?N?^z=3bZ{&OKFC!$(6H%zNq$Qig7l>U!MVm~3sYjVGg@ntJqYRn2}; z6xHar)w3<&00!{Vt0x{|cJZy*gR}38`22vEUe}U9MYDJDM z+uN7FYul}l+h+9H`ql5R*pnxZEib?E@<+qNi_fU&As2EfXUwBW5j=|2K&(Y-A=M&w zA~qsUq*!Af4OgbFZ(O)~>8p2(x8HmH%#q`dpX|>V4;?_gfmweF>s3bChoWZ`rBU?2 z0)zro7^b}wG(+I-k_W4*f8kPD4xTHI%$LWjr9g1Wg?SPljnqM^ouY=+6E?A34oHG* zxOVc~LD@6&BuQ8(ddJJzDJKj%%IThwA+{n;plbveE`f}kAZJk&kP4$HLFc}8is zQtj9dh@ynDFC;Jnqr_4m*FsTf*J{ar?O7`dtREnW;37Dfi;%z(mPN>rlaO{c*=_c| z27$kl{*>I4{>|ilf4~nw|AY5|?LXmKpo!^0!=;=;H;LP3cK^5Y515AG%57LV^Ye$k zIflaib=^j=oLg>ht)4D6ez<)8=)!QifAGNb<#5VU4tOVdh8$%|;QJ%*A4}eWWTqU5 z^_E5(tEaDA`uc-n?4)nL{N>!z(#+W_7gnoz($h9S7a*ADet>7Y8_94F$U)hVn<>gB zx31-@s~10Q$2Z@m@`^zU5`%f%CHofxW`ilz-!&8e(hfdBO8XhaE14oio zQ?Zd!-Q3w6H5;Ri+rQpe-(0zUbL-sv;=||H*H*{ZudQ`^tlt3;()=DAWrRNf0000< KMNUMnLSTXf_{0Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UbDk&Ws2E00E>)L_t(o!|j>dO~Wu0hQ9z(ctC0e0}#XjWCOYZY*5&s8_*398)SsC zLD?YPpnV2J5lH2JcsZ3Kgo>RwH|irDwY3`iv;F(G>jol1TVsP3hlj5#wo0nE3&i?< zs@W*`o@S&O1093sCcqpRYp2G!J0~JG*%OgOMCRf)QV|)5NY{oZu&~Mm=$9?%k4V-H`#&hw(Pdav@NjFJB>LX}>qKPkgMI`gT3 mU;4Tz(s%A_P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UsIsk^a;G00Fv5L_t(o!|jQgSZP0byDzW z=znlk2M2#a9qg*8pt#sU1S<#%R*Q?Z9tY2GDPnWm+qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzb zumHp?l0F8~z>#k*Yvi|pGvL(MmQ=)mX>FUT;OEhY+#f#sfCD|vDw~LyU{geHL}Xh; zVuoXaVnsyKI*-v9Q_X+thFwx*ffL{yxCIJTNM%GZ3CsgM+FrE1VM}FBhZHGa+ohHT z4bE@9z_8W_6y+B9Gz*&f|7_G(pQ+H-%CQ?H^PjEyS6Qm#N2(#RY3j^7**Mv>Q|4P* z^G-HSHcmD!^G@?lHcmESkbkaY=ATSE2DxY*1SWv)5Q*Ob7pAN1Rq>#f;P;}bABb2W zoY$4j0v|yJdNsZVMu9FZBUHY#F9L7A@}-u^J@=I9$hR5!AHhKvxC=E9UH||907*qo IM6N<$f;5xuNdN!< literal 742 zcmVcR1y$2<3PzvsN`Ih6dmlz2S8&}y~Z z-EQ}a-EO~Nv)RsAES3|hs=5?KF>}s|rfH+`c--vw``;k$ORv{^XSG^iL(KPFE;j)V zLm0)MXf%2pUS4-N9JicKX9OSwA&jwoZ9bpxd7e(Eq}gnK7z_q4V53*1QmI0N!QlB= zEVc~_mrW*<2T90*o2qhldk0q)###<^;v8UMJd4hj0eO}b(P zJC>Fx>2wK&g=7NC42S^9cT^`7BMd=kLiPS&0CEjK(sZ}RLZJZT>5xky*II1!Td+7@ z|H1zrctjs>ZE43M5taW%F!b~ueYm;VI=Q;)V0u8X-r*XJMw4D$Tf28{ef@z| zRS6#q52Vc%S{NCLQUtDO64WA;_YlU`xcassWeQ&lam&=!6{$2KXJm+9!`ORjt2ga5Kpd2>o!(6LFGye*;{0y7D@p`@QA^kzMTGa&W Y2db0ZOUWr-FaQ7m07*qoM6N<$f|{aGnE(I) diff --git a/htdocs/theme/eldy/img/menus/generic3_over.png b/htdocs/theme/eldy/img/menus/generic3_over.png new file mode 100644 index 0000000000000000000000000000000000000000..0672d20bce4bb1776f71dc8038e32a8382f5ae87 GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?5iL3@)IZ1~;#a?Jzp;5@B{K!=^C8I!mt3EpOG_?#fmmZLn!}-?!H?w~Hql zh3M%l37z!m#0RNWGne#k6%JARrfzDwwsC21(B)#s?Z)A==JzLQzxdt0*U+}?-dd}P zD}Sc$p1>UbeB1VyzkbhsuO)l$AsTAuxj$z@=2WRVP9Kl?Ik&clD;cFl_A_stX&P`z zIrd}k+MhlPZG>koKhI~wn`4~D8h=^ZK618L=K8OSz3FvRUViw`^N;zjbnVm0Wx0-^ O81i)Wb6Mw<&;$S`U(e_O literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/generic4.png b/htdocs/theme/eldy/img/menus/generic4.png index 29a3d7fed672e0dc6b78eaf38a82e0ac65982262..5f9240240da3f037ca1918367f6b6489b972c260 100644 GIT binary patch delta 561 zcmV-10?z&52f73yiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E2A0VTYcH95}0lG;< zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)TqP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~# zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy62NdNN z_%sWe`TuOxSD&fS*UGUQeA4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{ z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJkr1mFiDiBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPw4fByjg z0RN!9r;`8x010qNS#tmY3h)2`3h)6!tTdPa000McNliru+5`a=I4BB=A=Ur@17Jx+ zK~y-)?UYMwRaF#*zqR%`y|?9FO1W)q8y<$lpdi6V0F95}z{H_p%FHk}>ez`69XY{7 z2Rbsu5phIJ)YMreXapaG1VuEtf4!8_6x!Q!&pCUq<>0m|14hEkf3hDd`Pcuiz4HtI zKu^B;a$~i)Il0_he`#uO``E;u)`9kPb9dOT9Urw(mB_xbELLt8%d1QMKYM>{{IYm$ z@a^PW4`&9;ht!EWPL4h^@sHf%iY1pi`VMUzdWw#v-XpJW_fT@nsk0p1i8tR%-61CRUme?RtS)%WW$`b=KDjyP> zE3ppb5iXiC(XM&C5n1jrBsOzKa+qi-mcdHxl(kdYrc!g%6@2)34a+bbcOf(df)KnU z7`P2RWm}HjH!mHse_Uv0iW`V4?uwdWDB_BkkPzIUcEikZ<1Q%ofaAkvf1mGOx5V5F z$^*jx#1EEOK(wkoZl>pbLrNC4Kd9C=lgjS{r;9+WtkiS!KfZtKjuC?VXW6Pq(Kmix zxN|yOyu5UNdS*{+aw0#vb1E0jBZav~jOZo_BVm{u^}qI;e|3)}M3ESrem8n=VdeDM z54-OKQa{drvoJq5H~ZDX`EH}AItOR>sFES3hG`QvsY$BG!e zzZTb5Z?7)(Fm5dWy7>FbrKR5O`Mrlb=dUc>=wH8Zv)bbN3uVFjIbl|2=>Px#07*qo IM6N<$f-4)$)Bpeg diff --git a/htdocs/theme/eldy/img/menus/generic4_over.png b/htdocs/theme/eldy/img/menus/generic4_over.png new file mode 100644 index 0000000000000000000000000000000000000000..6a4d7b1acce5db322cde66f1e2fad71876449e3f GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?5iL3@)IZ1~;#a?Jzp;5@B{K!=^C8I!mt3EpOG_?#fmmZLn!}-?!H?w~Hql zh3M%l37z!m#0RNWGne#k6%JARrfzDwwsC21(B)#s?Z)A==JzLQzxdt0*U+}?-dd}P zD}Sc$p1>UbeB1VyzkbhsuO)l$AsTAuxj$z@=2WRVP9Kl?Ik&clD;cFl_A_stX&P`z zIrd}k+MhlPZG>koKhI~wn`4~D8h=^ZK618L=K8OSz3FvRUViw`^N;zjbnVm0Wx0-^ O81i)Wb6Mw<&;$Tu*w1GG literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/globe.png b/htdocs/theme/eldy/img/menus/globe.png index 073348a5246d824568ec6d9a2f939b5797c05815..8c2380eda131f90b77a1f3792b2afbbcabb5b7b4 100644 GIT binary patch delta 1144 zcmV-;1c&?o5SIxdiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Ck2><{9 z008+zyMK{D9)I2p76Bh9txx{$000CRNklEJzZxz9cKo^!s>_dWOC^MAZmX2x8V>zKn*0bc=M0iP`O zz!qS`|9~U%y>>=cW|pOOnc0Y4mT@!NlF@cLzl-EAk^|CBYkxzA_v-@o2fE$BufVw4 zZlE6+0S+YiS)|q>pIty5&<#8Wddovu&8?p)_#I+7YM;ccS#Dl;=A3U#ctxo&}x; znw;;In%m{pey^8H1iuY<#*HWR#&-c9rGWSa=oLdhIDM}`H92ycfKK4UjI1IPiyoWo~>Yuus3pIB?S}f*%FWC}xwhzbHIYz#j$1^mP;6 za&@Zy27r5K@tlv!lvbe1*$*UbSoFEK%8gg3%Ir?qbSG7&j;Sas=-JC&;6|VpSbwP2 zoC5r$vH;+r;8*KT13#$xp+Vy%dj3b%V!JlXarIdk9Si(NatE+jeT~z9qrOx62z;Li zBJG^d1%E-D20oLc8sL1ez7e=p>_&Ygdw~1(T#&C*{-SaFt5r42PbnBkV;(u*uat=l zYZR~u%-0p2R|-rgxtMilfWP&toPW@%7L_COfu|hflltf(3wV?kmjw1t=kx+lt&5{N zW7-sB*4?a>S*&WdPq~g_^eRQ8JiideuG$1m-z*&bdC4V>*5tWD_TY zBCA&UKLq?Ma;o)Aso-mY`&{r*y#V@1IF%M4##e)gr~`hMeOqvv^(juO%t53uYg6#i z@GHJddC+|+P3o7(d0TnqK+eSeb000O7NklgyqZAQQYhi#9 zQ9)o}n2~wi$2n)O{&6qy5l!65PR<|ueBb`Qwf0&|_ zipr{%!0C8(uHLDT%jM5Hr>!05I=A=r_HA6e_}1M3cYgP79$B;cQ*q_92*(USmi_8a z*H4`~Wqn0OMW`xvzBePCJsB!X(`WORDnTTdpE-&erWbDDSm*($UooqD4HxfLsg@e&;%KsuHO1 z{;AWwvllLDerWZY&Si_|d<@@xlCa}^ZhrOHS^KV?KDKnqs74#sP$Pd>zgPAhK2CRU zhB!%xJ;ZTBeL1}_ z=1;ovOV7F>t*^h`E~&ste=g6uU9G4pu{WY5As59=88w)1-7uXoLmN1Gu8$LEKH$Ky z)12w*l|#on_`>87(ll)NtuMWCa^K8_cefqe_u|J1efNplhRIj&YpAc+C{Dzir#lld zxPPvKJ8zuEle-Q9(A-c>(|{^2A2*mV3>ZGJnpqQ@InmKWV_hZtkG3t5mDyB%CMW)Nq)`&s{T8-Et(dFN~&VGxkX_Dgrx>$P9J@_WZNKlkfJ zx8Gh!8XY%xj?|BRVR&P$g+VBoM^y-&;|B{SbLr^8WFk*4AJN&9rL(7>ljnNLr6h@G^|Slw&O}s}rg(Ah5gKYM_@FO`ihzK5!^|_Lsg{K^ zM>BjtX?(*Cb3^AQeRZZ*HZDb+sT33^CdA%|5T8U$7IwqnIeBDcX*AP+C?pLB)mj zsH3nIF%TCb8ern6N;~2>CVwAA00e=fwk%}ouu9r{JyBvT`^!%Dww*x*#07{31q?u> zfc=xd@20Z6{GtF+#5v3i#9>OYR)Pk~>7Iy&x=Ioc`FsQzQ7nw8OEID@q%WJ{aC?Rz zOoJsK)>#9JSmI;)BUt_1n45lLNHVvDh?IJImeTG-lIS7QGbCj3<$%JR2brd z0CfS6?R*DO1y#_XKqwa+D?Bk=nlM$uGke-P6s#3>#e-UCAR>i;W9)A0;^^sa%qRc@ z*?hw8BWF2$s+-6Ea~yRJ6D<&6MJy>u)Z(`~Fl!A+;_ZgCh^U|iTfrkq0%l}lmKFnbHh&syCj;YO645=$+*4T^i-VhCuAcbgvs-iel z)I%j!s~w)NxD2J*r~<-Q4D;saT~Doi%rZLJCN>d%zvq_EDvuwN`EFx5Crt} z=8-@N6uf~qBUB;r31WsseMz+CH-Q6?nxU^q&Ctac+PJ6`{1J+Z6%pmtV_iJ8?=%PA z@8PkEn5$sp`oUXm0z30yeWNWq z(UC3qquV4k_kS1Nq^l}WhgkwX0SyYV_eG691`V*H`f-EGNur1~OD-i9I07w<9Qjl~;ds8-T@cKHW@`i$%m#1JtEZq^P+#4_!$0V%oQ! z&d?VF-V;T6viXQ?F2V(l(sW2!%Gskkj>gvdd^6zv+kZQ`5HM2L+}D}3AN-2tGh${1 z1`$MEv2p}phL}gO!WMYswh5G$gp{O92m(jowD9y4+ja1ytb5|6g~6N$IzMx2bJM;t z-wm1ev}h2RHxuVRJX5sv!ZI^j##FI#;W!Y*%<$eDX0r9*nfU$(A6>|?b?ZNhub(6g zCokF%zkjiIpym2{L`?88__&y=_OUI%wnLrV_1HmPJJx0Sd>-$;YP15 e*ShIbasLlSj;-G-t?G{e0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Us+gMz2%=00PWOL_t(o!|hnnaoaEqea`jY+92u#(FBdUfj6kSfksd#s5hwE3DgOq zPEh*4cU3o#CqRE5TNp=DvSY_dPPoIJMVjCv2tasRi3nb*+~5Vv0)7F%fR9TCpaxJ~ z0Ef4|Ick-N%+XRr2Kg_eh}1LJPT9?A&r8p-$@On$oUa7%V8%KCzW|KX4uAtN0O%uj za%w@FC4e=69{}C~_y*t(z&-61kMVp)1wGNyLlt$7fS#NZCnC2ZvK5iW>>I_H0`3?p zm6^*;2%Q7G-6x~7B(VP^_|_Qj0{the zo^JtsP|tf+As!NWzvIn}rrPx8HvI3BHrEk*p8zymf3L>hAJ{iZVx{3+C#T8Wgbn2b zro6Ag*8w9LLrI<(yfCB?sBHhr=Z#4?E#Dai<&|2Ojd~#>gfj)cS5@O0QWzX|`~bX7 z9(QH%nJTZ7;Ge6Ev5D1dA>d-PR52$f>SNY7Di`&57XrVF9I(G~xD=6GJOJ+^CCOb0 zd^b@A55RYkI@_~NcuLu^3Cj%leG2>^^?b)ZWDFea(y~iX7qE-5k#ct|6>?t5%9`Tz|0VqdSndG>0$M^e#)x?8 zS}S8bSL|mzV@o`!P|0000P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U7}1jiONi00X{BL_t(o!|j+$ZyZGwg}*xw;#Y72!E$(t@DPs(P%Hyd#0nPd$Oa@N z7D$LCEB*sN0g3+rDG>Vy6cTmrrW&I8{@#Kus3 zP13lek0o8w!R04OpGtZ|($p}(zbNT^4v@r}Ez8y?lDe6?i;~`zbYxH*m3`u0^K$=| z;pst-JpKwt)^Xm1C@|0Xzsy zmkK^2I>4$GNj0;~72s*$xQ&?xUI%^z{si8#u|2J4NaHflDtqShjJX9Y01Gzes15oM z_yJf1E&{VQt_E!R{e<;*pn1>if|AZjn(I@4zc;tu_p!1Ac2MABK-*d*iDLpulY5!@ zN{PV3Zqw?4E0E@Y&2=2uiHMz{`ur|Ccw#Mzmjt-EpU!Io%;0#cU6P_U0bQUI5k$(kZRM!ez@^QPx=G_864}1hXYu`;AfOTL6_zL)}pzr6L ze65!Oevp9u9{AOq-0`ee{G0*i`uO_{(C*__rO*5Y;41KPPFfp4RZ`U}GVK`HO1YQH zVuM}5M?@m&GO+9|Kh4kKKHhQJtXFE$dCW3!=dOXb{OlE&&j80qybs*hB+!&}0eA}d zrL17x3-}v8x@{J@j^7*3D9@Uu7J)HIofNeuUeN=)(?G{SN%O!t;K`h=Ju-QD%WPEh znYHV(HQ+Dc4^Kn`xDgTEQou`k#>;;icmg<*nf1K)qBCn^&cE&FE$fDjS&oR+1A#Yl zoHVbW@>RxEpA(WYbw%Ig7~A#UvF=-iHM?j7xE>MBfxtVFn)3CGzO_9Z_W2NC0`XBf+ zz@xT&t3-hP%2w@06W-0Y9TN?^R=bEQubLftXUptuSJlrljcNO=yOLtFPD)h-e#J~M zkvjEPQaMoXyW;v<%E;b#HDzQa^mN>&)+5V$nkd~Esj$|Yw8Og!rUk|JSbi{;{RR91007*qoM6N<$ Ef)z6M7XSbN literal 1723 zcmV;s21NOZP)hewVK^U631$%cI+f$HItB}O`C_&Dn6n-41y03Q3GOXHIR<+ z0pjr3<+-~&4a5f~7DWMhDuO&B`(SzOg1C{pu&=v&cftGb+0~E`Gff-CZ{|1WySv}{ z&i|bA-MxDSf}b#4F4zCO*7@P{f^i!h$9;D`!Rd4^Ap0iq0nN7)5q7&h+8#Y;2fx>6 zp5Rdo06(L^u|zLnA?(C3amVQzzT>>9;_vL5F)|YKg2ff()5h(7{=IK}*>LZNCxi(S zPhj4AV$)Dv31_ykFq_S=SS%iFHk$|5IRdUi24}=9ICuN-+)f`jB7Izs-1y#|9t4=%_UBzoBxG8asb8Vu{;89N6f!|((cHvG%hu8M? zqSs(RpH{^)0YVsq#Ds`v0!3gvb1{GKGxxmhfvaO!F*Y0hE6<7h7EOJ%Mx&~(Rx7)R zuL=8wh6a>ftyAB6b0%+CDZ;?}#CkCpep9 zU5DED`u=|Rc`JS-KL_O%l}}}6Wv_~j`^0N( zRfTsesZnjdth%v9*MD=`BN3EeaN=3HBKI%vE?a(oHPvIQsk?P^e8n`kvp9BrTe{D(Ux6EI+>BY5&ik{UM*y^B4Y@l$^S7 zd{TaHr(j8B#<4YV1tSEvHtvLNb!?$&{l5y$Gd?&`;9l~iU%?ocQ>V{_ZP^b0?$;^`CycfS&FOw?{xoue3_J=Q~vZ~5sQ}a(H{(5aZX0DFM z^c6?(i?@&9PoYx0|LG-V@>yl~#*cFh?sZoiTYh)&aJ=WKZmW+Szbds}Zw!7nT8agM z37EGo9&=YGV6NXWZ2R4$fQK%?N z08<(XI5Hw)Vh}i(%`&&4?+B+1^ zi2BSxRHp^tvNQmdDeF;lMuN(;5Y$Q5;aXN8zLdp6ogc(^6>UcE>8-eZE&@XrcEMO0 z$(hQddr4rEwQ}!KOL_Ft@5Xd=$UKZ0mX_puU&<%4^>NE>HT$hY<$KYRzZs47mHegS zeke^`i;^RLIC*ddia-7v%Fkred=BSj(4H5JuA)#3l zKLOith-a@IhPB}k>}^Tllv1$D^a8s&^L2ZNe6m9$o5ZTK?iNLL*9uHci8Jk*?6bD! z4G;CVMZd z%KX*0?NVjP?dmMB?P(qyw3zEuz@f>8RU_wz+Ozn9mUI}JBrsf;(BFu3+-^*Qu{8~Y z*Hd6_lfX`XoH`T3Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Us_zEL+C^P<)SlA#NHW(?Tq}f1A!op@03ws+IrLZDduriUbQWEKT^Sd^`sn=`X{Qk`E{@(9tPThL<_s+TZ z`%dScbMEgAg%Av?tT4c`3|~;TVXTUURu5Q>cP z5JIxRSj=WJgfQE~E=j*vW)$^&g1qAl>sq`g| z#mMvXVH0!g!?jp3->#vMox%$|sVZ#t;|g}vREdA$G~O=-el4bOvJb7qR~%1&NMZO1 zT)>(>_Fu2kY?d2-Gp=H9LmJ4(xSj|82+m@(VIA-}yw1utQ&_cxViQY}JgM?Cwl@g+ z1D@kenQXHw?OE!Shj>s$kqUhXp}DFmY|;n#q$>Ds&ws+N9ClkVl74=dp*z}fX{prn z-S9JumFy0=+|f$h$k5%1OLcfYZ!^>`5N_RjM2q<(0(_}G{(H}tg`Zmje5IammxON@ zfNw8{O~zq5j6XT-Ha79VZYWSG8*yM;;!5`(1J&Ckb!D4ap06d_#DcG-NYw#fndiR` zvgcd)f=x9Z*l&4^^1kjHPA?0?CE>FA|B;T%$nW&RQyF|CWuX6u{Ri8ndcK2x=Z;DWgBDUf_`{2J&sURrA zKJ6c{EXyJdYlR3(Q(CLBSU(>6v9W0;oteyd?wz^uW;&_e1BY|&oipcmf9IZ@36W(P zxC8=$yTijjPnf1r)^)wCX&SXE_g$)Te|vkoTr3u8Y!1^r0uS*EJ~`B#_~rDe9|K+8 z9YINw!ako5s7j9Av6cudE#zS~lZF4*3XofTxt*PR_7~>*xEs*PWV|QY+}voCN@YJ! zh=A4Pgbc%KfdPt$+VH!`O%t3D8$*qt#8TIBC$s}79FB}8;z__JV4IOh82o;prK)PRY@1(-FhBPimh)+Q|Rvtq$uzW=@D;7IBWkZOYjol!0 zJJQ+)vChP;-^vawNs^|cN7QrLt_#j2iuH#ST#^?)*% zLhoX=bS*96(e?Gu(AgCg4rl>w2t`SJqsX7txf>45^SFpO0e6Tjv(7Y49hEU~OY~qnB;>=O;tw|958{NE=#)p_&ulR0M-A5aY>ocX+a;L%ZSt{R z(Q|yLYRHNO^R5#+@WQ2^SSk4QCQfO*)}k#MML>}InC2-TK{^F;*g-v^pzcG|Q!158 zg&FZP!5BFY?9ae=l8bBJvE1h|A`s80uB@y8XSG)rB9MDe05U|NCu3t{_hx2h%-u@% zJ$1)=F{y^85V!yyxlnT22v&h<~@-5(Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?bhi@pN$vi8%ar z=KH`F1A(LWEo-Lp?crO{?9F+-u|z?2j;IHFP?Kzj=nB~*d@mCIKDc+bck*Q37Vk%I zW+(nIW~pmA`%E{dgJb6_Hc9V?wp&>P+IIvztgPc*P%LBKw2ikx%;D(o_?ny>u&iC-!-Gk(L|Q0q~l{C1+lD|Pk_ z2}T;7D;8U9s;O6(X4(AMqtNunq5PeJTCbLV(EPH^`;q+uMP(xP`NGM6SU$Yi za*jLa!z?QgosH8PH-?<)IT-ljbwBfe--P8rmD>;PDz^CiHMq6y;Uic3T8%x2wEx(j z{5;ovoPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UtEEPNJaz00K@)L_t(o!|mA5i_K9O$MM%N*`SmSjSwXpjr>@kZ2Z`bmE=dHNt03% z3pO?=Wurv-ogYc5`2%E#g;GkBvN4T8CX&%aGjs2Zac!Pk-@eVApWl0H^nL1d`#$HK z=e+Ovp7VL0d+SQ2lIdzQOk>O8bNC!ShtJ{1wEA(5TNi;H$7i`U;yJcW0{kfMVSXZBGJdA; zMZCpc^u%)!vtsv7VeU9$HJ}wOi5Nw^L{s89Q}_Y~@j7<;arnw@C$3?|C~=zb083JH zFX14%6TYgz!*86x1^h@XxEQywD>Z)(&f{dHJ`Y{=T@l>0B_g zf^T?~wF+5FCBQ9#{K^*zCx03JyA`{OPgi<~hWnL4@i zs;xG=u^Jyn054ll3cPGzBC+*`_BYg0DmP*kx^QKZbxk)eN8DyCtOa}{w%`+PPO;kj z8nRi8BeQYKec=?6%1jZ#+d zy-`Hf(#AZJb@^Z1IeZSE!{_ihd=8((|3~ou0IMM4$}o!v+5i9m07*qoM6N<$g1l~1 AHvj+t literal 1041 zcmV+s1n&EZP)JpP>vdt|_MW<5-%Q75q1MST~ zlbHZ|A#EdcZBNfj&*^z-Pw5+lmKMJLeh-usYGM%Z!uTYgPI zb0_B5cEWB)VVrG}630<@&|1)2FkIJVQv2~dFZJ`#kSZQ@bf5vC-e_Q>UOyICn>`+M zc0&AccNmJ51+Qwgb}aBx%q-YTym9GEB+@JJeP2dWSzAM;a&$Brb!0MGD0UvNU-|-~ zBXAWlD~D>W2GcZAt8JiEUOf^vHtM9AmfCUh=m_*foO$O4WwkCdTU)O})pTraZDA!} zI24(%PEHhH|zcLUcQ2(idlEf1;>2VA(Fr zwDXswEL*nV$&+8&G6zvrn2&iClYdkxj&k2LN_dlrdu*I?o~Jv zq22*$+iufgbjQcUz%7WrD_Gz3d*%2pM*gm*_fo9j2XuME0|9O7ehnL`Ow#h0D8& zIGx#%3l|~Y?f(jM5k)qcZ;a!B-}=8TX<#q${M*-L+PtBstR2$OqcP~qF&L_jBt^HZ zq_C7Qpz&TpmHWn06b3yXOQsOr+1Kg)r$3Ev@Ba~%zZ(RvGku>xe02RY%*@PU^3fDA zjmdlW5q#-I1iQNMPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UtLYNAnv100EXsL_t(o!|j;eQNlnJg+CnM!3v}Uw*x~3+JUhG=|HGJtw5|mtiVu# zp@Y~#sNnkG%}i#^l9(*vXZFnO19x}WFXW!H2?G(~Sarq`E5HZ%03YB3e67wKt{dy< zQz?-9fRBO4p5Z4z5_Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UtVE_K&6j00WdsL_t(o!|j<%Yza`1nI6+8X-c2qR}AK>o!$Q>k(QUoBt$}=FXfmGi{`CzvRo@oAW>C z{LeSvYi3f$7zV2hVGv7}e3pEc{J)Xu!0Le}zZy6L+>~AccEuz-1~>?G0zy&-xM zc&Ds0(}L|4X0z5l4ScrXO_EgEB!3Um%ffB9;QYEtbGm`Y7VNVm0ec514Hw$2i!CxW*64qcjI zyc5_1wDd=N&19l!T+Y*pDKpJ?havoG+AF6}& z`kSSey;p^icX6AQ4nABj;^hk9AlxF~!A?7@TLp}ZOMa|+i=P&~DEwLntXH7gb!Z#D zIxhJY4%WE^d;&_;=GyQxd>!Q#2Yh8*pI_=we6H%cAwr?50iFXLz8s>K(- z08fRjj8I)YE$h>{hGB>5NiCAw^jKPDfQi7!7?vNYxoLHeODy>D>Y=RUCpeI4*0mx* zM_D2AY2C@Z5Nv^~<#Qbfz45&;ic8+_3a^w#gXFg>`9JctAo-*MGFq9YH^GZ1PtuAr zLO3~*?*=}o@MMw>U5j;yBr;ihy$yMyYRU9Cm=p3w;Ib?+D}zPabuCI@^}ZJEd$&I; zjlNMA8o9!@N^=#&Mba*xANC|9Z+v9y^t;VvVk+S`sbRn}rPVmn4%`F2#hIMyrw?j{ z$`liIAe*FtmkRvYk{W=ofhB6CN2m~a?<#+ZY)5}>l*)d}%##1l$o~Z`gD literal 1366 zcmXAoc~lYx9LH(aI;_@8n{BjO$KKwyH@8@o zaU=o&u(ADTla~Piet@GfP!JFZ3<~}cxO>m8m}5U3joWkPT*#S}ki?YG6xfLq=i(DC zAhT$hS#(rZ5gJ_-3d;yTe=+PLJQK|)kw{c3m6Ffpa5(#68BuAled#DrIuewgc^IB~ zJOlYN90@^Yfif`%utdmZ++iH)B$j}}U=I-rVitiA3t~yM6T|`(J`ah*r{XCkS&*X3 zrzp7zOf-a<1LaaKvf1od3JqLP0;VzJ3W{S3S;y%A!%iq-#TBu$>5P*cE}G55;&503 z(I-5aa=EC4T3ASAULml#B}^uZ&F1lV^hF7ULbY0r!SQo&Voa_$_Pia77v&Pfxp;YQ zo}5UMk@H1Vnv7N~rx&XkES(SL6$P8C^sz89^>VqKC(vHu8u&uJNK!77m$7+9HqXrF zRB`!6uApiGk&Q303q;itS*27~CzRS3kkpB!*JR2XiQ=lV)Gm=olq#J@qfx7M3Z+4- z)#?|eP?>aPMy<}I)mioBRpk|x}M$E&tp zud&zH*4El<8+_R8Ee+S29S(;WcThn-Eu^Lk@)05$LRO46a8O2Wj)IBPa7kr+vO$-qTLwWX)&9b6x6TaVAf`)*P1NM0aFZlYd=*S2t)}3;8>&HQx z{3xHUZAe|dcJry`0JHaY|3r@}{Q3;}MfCT)_Y*xy4$^Dyvz_nbcd(p^gtw1dXmisW zllEplY6tE9&Y6gx{b#JdZ74V#_im~K4ow&*(49%4B<%F`edNPt(#uEhb_Rrf;vM~y zG*b diff --git a/htdocs/theme/eldy/img/menus/members_over.png b/htdocs/theme/eldy/img/menus/members_over.png new file mode 100644 index 0000000000000000000000000000000000000000..8c77498c304af9150165b348fc08498d7aa3f11c GIT binary patch literal 720 zcmV;>0x$iEP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!alBTT*k00K}+L_t(o!|hqoP3$lb91#DP4lotq4#=y3&_POo4z7eN!E|6MczGS< zRe#KznZREdU2# zkjDe)3jsF(jsPYAuK@l6h?19kkr*TMG%-dWmt&MMY(5)f3~@dBTpo5YAM>GkfiZH? zuH|85(*w9Cb!(G3enDQ1{EdlIt!!A%C=e=qlu6-ziFWe*c>j_9(VxH3;&zhc~P+Kleve5A~9`c z4=hp6EXn#@T61;YZDkJz0#HW)n&n`&um=qAmR!gZFY1+@+tq@1ibYxlo95j1K)Zlf zHYkReQz`hPf_0-Pl^XV^Qt&~+x+}B?%x-mB@J#9RNwd+0QJfQ}ZBiZ4Y+Q2r(8gop zZQe3tJ8hF16j}@g%!g$DNl}U^=I_WBZvk8vFn^s~8yzv;vaZr9{7GNoDCfB&;am+1 zzESx6ZX-K9XeXC`G5asB&lE}~y%Hi}e-rRQ0IuDhSb4GRuQC7p)wx&$Zvi|k`1El@ z@N2vK1mH%_M)*A7ia3;B&Oj?*?N^C5h!MaamHrjq7fZfjGB&}Ku3rm2wGvM8`NQWf z8q9NXhF=3)c}!B9N2yLjNl9FabAaD}*4e@TSx{)Cke*gdg z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E2AOy!rxG?|#1Zzn| zK~z}7?U`Fl9aR*Dzp522wFs2b0)UUZ$9{7 zqEQnyK6r^fc!^2%$(SaMAO-K%e_k}T7ZKZv(n2XHSZJXp`0`CM8Rr~^!^x=_R`@-yUT$j^}ff0Mr;gE95MrS{wY%jA~;cjL^c=m6FLn`{@Q!8s1>20pgkq&MZ7{2RcPzz4uqi3PSg2BX8bg%9`;aJ%DQO2A=t z3apHF*bjm8fxGoDfxSRye+uw=pcc3aSm(9xfYuo7g}`mzTbG8{56-zA=$TC9UjrTo zt~Yl}C-EkGfp?w!Vc;pRm%8h&%22glje8?;oF?it5qYQw-I1}81~ExxXkM(Ll5w)#T&o^V18))_rTjO+Fe$nV_6_ypJc(V0{#YGkkoo$ zIZzoY)@mbTI)Q`0=SKZeTYx`-IawgTCrQq40X71sRhkx~9@IWzA|sX*_@FndI2QwN zSto4(?wca<)4(gLe_dMgceuT8mIS~6@Oy}8w3w>^ib4~;0~9Nl8=Z7>CjpbrSMjs?BmW zw%zMBz(tXoGGaMS8UX494sR4owvKTa~&}C$91p zuSuAn?Gn1tN!MB)F9U8e+BFIDz0X3iSG)~?xX*BYwq_V|H=3&wj6{c7(iTM!eS8FlL?|P)(WtUD60#N@+PAb~mhh<-N1bIJMQg%58B#XC8bgVt$b)B2wa{{TcvYAUe- R_K^Sp002ovPDHLkV1j>TN4@|6 literal 1751 zcmV;|1}OQ7P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01EH`01EH{Laa2H00007bV*G`2igW1 z6B`hB!M=+C00vh{L_t(o!|j$!Y+P3v$N%5C=iGZ|?mRuVs6-dA;87$bvOq$B1nL8+kcdic)ixmsp-IzJG!Lbre#G^AJTo49 z?#z9^J{F-BERdXlV3VJ8bT()4(S`0cwN)fh{9xVpi-;SNT$M=k5WO$et=ciy5N<;*#EzhB`vWlMFL6)Te5t15V@;vuD=>Kj|#acU@j)(V*u>vAO;0NffcX)1Yj&9D*V9IVb{3tz{>2$&CIDdWR#H$~`3;wMj9e?Q; zzd3N=^WP#8ndf*E_yNUHgp3)QkjR@Rq|{+q1=JT8aq8_eY~DLciU_{bMHc$V(il~% z2t#N{lN3=L!}eUbLC8j_2w~`yqzP=N7YBYY<;Br_5Je45YBOmN*LzNHrPp*Xo_YO^ z768bZ$;lJQ_#1;mL!!TL6LL9|P1A&wilmTi8YaRh!qVIvy>tFASPD8QcMK>J(3J*d zrMLeJEwU*^-1Ms$43Knx>I=Y}<8gXJx(Lda7719k#4I=ZhBAYBl6c69Nn+ zC8Q8AlmQ}wk^%rA=vLZf%*e6~X$EARA&Mgeag62W3Z$;1QYa@~ueUxqG4)*YTI&Tp zGFtzVQ`?81q++3GWLc^+XF}5?+g&ey{-tMzCZ<0+d1Y#P>uTt722i7^11=3 zX;4x^X$qPEgb<%dF@Q8pk!Aoh!wo#lE-oOKFQQZ`BF$1P%r8vNU0!%LXhfGuU`hV7 z)a3Fj3?TT&`Gm#gy7`&0U8Vi|K8Mq1PhoOph1=~la(gZ|4b)IB6rrR9n2~10Kt}jj zj2S`*FsJBrZOk?rC>2X=Sq1U~4`C9cuU6gO*AaAj^`iVd#(T zynjrN*80fEfNrmg#=4CtP5{oJ>pDwKkR}9^5Cq(sT9U+QuC`I{tfSIbg>D+;dM>9K zLsyEDI7Mg8zUZ~Q^N6XvA*pxYzaCi{T?kyaw^CoxrBvzYrp=;AAlLVjR>w{q-;+@s z6TmElATUEo$zd4L-0~87VZc_YL;!Q>g%DCe5K$T>Vb68Ww;JseUfaL=-t}`n-R=h8 zIxx_G=)wKt_mAz^QmqYClddD)ym6IPCI1B@XFicD`)0KKgLT7;(-lz0UMsY8t%n(T9fa*)sCDnah2@Sg`KN zTY0|q3kB(h&S4Tk15pyEh&freTlVS3Z0qIe_ogomX`7oD>u0<>sxBMhiKoAQs8A{V zuv{rWR47;wn&2pmAT&XtAF|`RC!6)g@$QWCc6Y*At`1k+b2r|K@3>EGlrJCo%Fcn2 zf$tRx#Unx^NL`|5JJ-4$`)9p*@9fmXMAH&Q|Juz<>3>}EZik)wca^^Q*dxzLrM|h^ tZa?d}?ytP2@0@(?we)VczRUlbzXPO(I8?dK^`8I$002ovPDHLkV1kDtMiT%4 diff --git a/htdocs/theme/eldy/img/menus/money_over.png b/htdocs/theme/eldy/img/menus/money_over.png new file mode 100644 index 0000000000000000000000000000000000000000..9a501e762d0d460c396ba28c1631f9ae38b12165 GIT binary patch literal 940 zcmV;d15^BoP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!n`N7)?!00S&ZL_t(o!|hqUj?+L8{(`7zE)8`o(Zlip=#~~ygo@${jD#p5qC{7O z8X<)zz`TKZ0`^KOj6{EXZ{RDS9hz^Y(Q52CIVW%^Bdy}wpSj7*H}j1*6A{66l^eLm zaxng2{K5Ex@dxAoZ{u%namE3d@;Us=#uotQ91g%y$G$TFHAmc=^&(=8LPToWPAUCii>+;CxK|`}BNd$j6W``>yi^fVU&) zy#(-K-^ND(zX3c1@MBAzX8=5aJAb28wj$#A>{ng+B~+Vbz3>pD+bWxP{oww2b3f@S<^ z7QS*__*A5V`e%>07G)f%hx9fzfF+alSj}IkUZr90l9F_mmC9ED-Z0r^XN+xlF@4J^ zL%zxq*pi0(9HZ2zQrYgx^Oo`NRp?h4WE?S_hRc$2rHnn{{L2vxZ>{QOb(OyWJm>Rk zHfoV@nzJsaF;_1j=iCnfPXOHJ^DO}P38!%xy8|{QVY3(j84VqMPQ%9Ug0U@z{RZF@ zy}DF=x#zp9%X*=xn9(y5#{k|b#{LT6Gxe=w?2t8z-HhGAu)#>ixxuoY^LbKNoZpnO zryY!4i^$`lB;~TYJye292qVAC>m3x>7GKCQ;A;h9KiEC`>jBQ5pS{Pa8@hQQ{9DtA#qX4=E9J}Z-rDs87~ekfxX24g=R0-HooRSz^m*5~MY zycCfc&nJD(fMA>H>e3lRIK^LlZWS zLcKxbRBq5V4=KB4-__w{gWqA(?Qp>nv(mPySd87MQoZqw+2O~9eaRn}6|ZO5h}_r! O0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!yv_{59=00Ev!L_t(o!|j;8O2j}Eg};>uim)oI7NV3+Y6hmtbKuO7nLEIvP3IFJGz4F_9h(^F z0&U>ljg$9JKV$&6NoKPq8Cc8}o zIM%Gu(1}f8(D`}bP*BH-^LMJh&j{@9_8x?Lryie zls~|4WdKcSATcx`O<`#uGB7YRATl#LG&wpjH6SZ6F)%PdC>K`%000McNliru z+5`g*6c<0I<6i&(010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00RI} zOjJbx001W^CptPh4kS|zCtDRLO%pC&1SW0;C~FKVW(g~804aSEGinh(e=9OVFFH># zKwBovjomG09wQZWyuO{&;@YR4RX~P zYQh|H$P#qZ6?fPadDR~TukdBD?Q65`WwP*WwDNDc^>w!Cb-3<(vEqEU=yA31 zbhz?xx%qm#^L@VggMD~}fqaRAeuIO9jD~`Wh=hxaijI(wjF+E~jft0(j+v8>larH{ znVy=JlAfEDoSU10nX!VQzl))?mZ7ParLvi+xuBk%qoJRpqob*(q^qc!ItH()_L5{kqfYw%`A{ z-1)rY|G~Sq!oIx2z`Vo5!^y?N%*n#b%gfKw+0)L+)6>)3*wNeD+sfML$K3PR-sRTf z>)7Y=*nO^=;rI|>g4S7=<@vW?dtaO?)&@t0000Ny^=@(0004W zQchC2pL>98-};-ZVOi*ej#>Jbo5ocvjA z)$@#paf1OH2X|$&V+-}`$3m>}iP5oQj?O;|9742X)9yV3N3vJ9w2#4u_stc~KAy^X zoFjxDu3p!@IpCf)`ab)5E^}l2=r`^ns|1zGy)|n$c4yk}L77LW@4w#9f}$pZQde{b zVB!4U4(*dq2=NH2K}pl3)Djvm>eqTQEAIG|5ZAISP*#)(t54=}( z$xEou%@(H$YW~&xmphxbZ3i63f~w|6a<|%O+m0MfYtP)jt&ZnMhpt@M+H`_gQSZmH zmC!C7?`t{@T#o&MFw=KWU%oha0AnL9{2`ihX4?mhW#KQ8Q@?idfB6pK1szzSWk^{7 O0000Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?vyi!_&nvB;xSf znFn(Z8Hlv)S71A_wY{rn0x!p86XhwKk8%#M88}_#oaOxfB}44OpmQ>3j(RW(Y92f0 zcj~vQ_s$qYlySK3jEyXD4_IMn{gy8R%B*D$&m^87J|d~VcI)eaTl0%% zZ(W`?+hp2vX@#A|CPlY6_8jn@D7BU+fUkJ*q4f<}dE0(6S@9Rv`K)>HVWpyLdCe;&SZ<~pMT_vDM+%6B%1>dgyhd=SdN&*Z>O8S^*M?|;AGTF-Rz*_yQ< zO%Kf1t`W8Pyw*2;r^E}PU4BhU{zDOC{T9D#SI@HE%L`is3`Pb| LS3j3^P6Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!=1oKY_T00DkUL_t(o!|j-{PQx$|hQFdp3~amtREUL{r4l>511!7%5(5jcF);8X zs7o1`c>-WSVyKwdkSGgn+{7#%Jfy^&V`^7E$&z)E&tHFCE_dx{tx45ZNZ2xbhR^UB zKEpR!w}lvcz@_l)5%4CyS!?aP23qS@=J$7o9dUKmm`y zgXRA){^;Qgpqk^48eSPlJ;$F!+MEMp%fIE2HdQQXvr+RbnY58uG%swj@G2{xnDPs+ zHlHage+#S%&))l7+{ypjL^_OY182h61G517z_BpS74RZ~?|Hn8o7R5UBTi2WUzsv^ z2MjI$0kHpvN>Z9QH^8gqKQVBka@utOC~8Vt>7b;l>3^y=+vbq)vzo84ZgXH+dgYa= z7X4q~T$ES9VZ)CMqP(={3EI4cgjb;l7S~egdubV>^IU4>eH5F8p0-@zr!6Tz{cre* zhhpE>ehjP&<4mORBagQE-P%6`U&1(}JdDI(3iFHaX#mOUYT>FNHPzY>gWgV& z>N8U5zT4A5N^ZO8yhkKkjJd8W&>2X~+Za^wk&*Y$2D2r^{ zSb$`8H06x~B>mYYk4IN?5%P13aOmJAI68U!ZDafMkmI-KvD+;LK4-Xyh^j_>q73xp zYH&E6@byWPJ8bd_HJ`ia<8ec7+v<8lUN3wm;Dc@v0TZPKQ_8L(Dt#yEgt$Yj?ejU@m* z;WvmY)jpl~?gIM>3>)fFOGqty#VKkiTC>L&2R6uviL6YSn%sp#;PfW@gqQi_OFBoZBcVOu=2kpAEHiBA^*W z4l=>xveBjxX#sn?B;c1u5w2;{VwK+YF9EL71Pn#L|45Q^HU(HDpf)9%hE=LyT7kT@pD6(n=ky% z+Ipksn-wlgEL?C&5VNnq&+uH2Fv>ssU|jWT5Cy8WBt9MgTU}1PxnS z($-JPUL715Q1Y~bBq+JfkxFXbBO^-lT)_K%)b6uq*Y=x}cA$v(HB|aEq^3yKl=bvc zRuJ%_|2t&JgOHbXy4TRa_>D<}G&G!PdGzqHOj5nEKvk+r8QONMAj>1QkhQ`G#;w)O_XCU%ZIGU%Pg_R|YG(Un-%GsVcuDgbZ%j+kF}FQtvpg&U|gL&k5hM zs`8`}Q{LG`1bcA+A}$^5(ACwS{qnD~6pG%uPwkFpr^gP}SF2SORVJeNjz1Q>_rCMA zx_g_>wpbqEe?};&N+$ex9qz6>^QP(F1XP0!Hea8KyLP_M#AME5o$0&?A5M5^{{!y8 VO~+Xfi$4GW002ovPDHLkV1l;z?#ciF diff --git a/htdocs/theme/eldy/img/menus/products_over.png b/htdocs/theme/eldy/img/menus/products_over.png new file mode 100644 index 0000000000000000000000000000000000000000..0a5d9a7951fffbc4b473c79c447a2a8ecd00fb37 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?> za)F6bQ&g$LQ6-y)ocxaQrmO#8P*E}ucIw4UL@ zw0maqz6|qTRXyZBeKjrG`I6T2Sr4MO@dCB~h=yuqZV&t}=Smy9M_Rmvw+Pkv51FTC%9@2h=n;r!=7PWbV^`MU(K vZP~rUZ*tatzL;p@Rw^gMFOccxby@n*`5Pxp#TQHj`k2Af)z4*}Q$iB}abJjV literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/project.png b/htdocs/theme/eldy/img/menus/project.png index 882235d2cd3497a1488ddea08af1dfc2b4eeef73..ae4d177c6cdb769943524b09e643971c1382a7e9 100644 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?Ub7z-u>W_#-k-A;#-`jJ6&FK{%K3Q z#!ha}x2wOmPpB^Vf4u+kq;gN~7Kc?)iiwtc4qNXzeBS-7)c0L%eIk|V-5mFs{esv2 z5t*@sXMW{V*?Y@$Qh(g3{KwBT*LK@ z+Jzr@8rgOKY}})(^WpY^ou5?t9-7W;WZicv(=xcKD?ht8Ju7pz*5;o+FE#5dW@fi< z53|#-{b{2$Kj(G|@1gLOHEE6Ojb^vARoi{v7P(~G&s>`uELL5<_KS8X?=$Ls`s-5P orcaBP&dU9xzY*j~>zb8zjLrfDE33{4+y(`{r>mdKI;Vst06z-BXaE2J literal 1075 zcmXxjTTEMZ9Ki8IK!LGkic3t)j59#y!$cAvlo;cx5ZgqM;9iU-!?>^q6SHh2GfJds zfn^dc^lD)jXt|Zr_Oz#`J=fl$m-SA|>FK?t>$adoUwm;<|2?>GKL7JS|KG#ONlwn~ zk>QU|op|L01VN_+{DD!hpKYwRW^f(cduttRtrLQw!Paa`b4PpEBP;$Y7`0#He|`gk zIyxJxDOvdODHyg~Y{n2PZnF_~jKp!8ARGpB z#DqjFXw+hhBld(9OJZbFF+ot2gQ8qGwMRHov@`AWFm4~~-DP(Ix!qviA1VaHg;2N{ zj+UeGax76vrmD$QEwx{R^{eLXH2^VeSd5#rLE$hc0jE*rG^zoYY0(WYxy*MwmOEa{ zT`zLK!MXzYP|dL&n|2plwV1Y0Sck%T)MBt9MjHZSRv1Gqq#YqKl)`NQP1ybT+AhBC z$2S7_`v1ty0JQ~#j?vo>9EPxCJM1uqoefbp9Ccfw9!uP3jrq{zjxFiO_Wbr#080gk zRESE4XeLZE5hojSvoSA_i+gj4oqWRQl`$R#vm;}C@=QR+HYnJjjEyMRh^is3%*KDs zCKb7)DwpOk>Re_q59F2#xw{R8d&T0t0*a#G(}lPmaD}-dkqFqMT(M`xC2w@UT*YVD}@@MwA=Ee8Ka)5PfTXVArZW*i)Jf&t#8H)3CpE%&#H zptI8RlGpmNmsPbtyITJ`^7OQ)?BBfCE11uZe-*5N4{``e@>0y&VR15RKLmpq7 z?;iPf{L>fto!wX4q%BW6PD29GL-|GNx&AljyZM)e@9;Y>oNtx31a+cr_w_Nsq;c&7 Z22?mD;j317P{sXa)mS+F} diff --git a/htdocs/theme/eldy/img/menus/project_over.png b/htdocs/theme/eldy/img/menus/project_over.png new file mode 100644 index 0000000000000000000000000000000000000000..d6c28b6d7ee28267dd5792dd34045956a5d8e92b GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?hRC6YJJoDZ6 zhVSOhGu7u~wk91D+Vg-_|HpX^|A^I$Ue0k}yFaLI2*1q{_n}FA&x2si*`Iy2>XY9J z-DtT{D_!@>=MsZ!2fy%Mz0%t@!qyM+PTXgFEfCN9({)R5dCCwzW2Lx|7WwK^G>~3S#8&SM_{>M#6fPLP4Q-bZg5t2 xwW+MmJN9zp+uCTGyN}YOzk*y=ad7_?=9+hBE5&799f5vk@O1TaS?83{1OO9*jYR+e literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/shop.png b/htdocs/theme/eldy/img/menus/shop.png new file mode 100644 index 0000000000000000000000000000000000000000..fab7db59040300ef6fbcbd91ced1831ac17c4df1 GIT binary patch literal 679 zcmV;Y0$BZtP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#NqPt@oD00JjTL_t(o!|j+qXcR#dhrg(YMUL~(O3WES4E{k8L$I_6DHMxXTE)sz zw9&#sYnv2yVqq^>*_~ixAdOKYDx!koAy|lsB;cLrJ)7Uc5xmXpFcUX84<2(f^V`RF zZ|A*TcF4@wthR+sYzaQWC-?-P;1hg;FBAMt;3Hu2C9Tyr5`L)Qi&-6L0>=jIF9K8g zGo^!{1CI91e`u`rt-S=!0Lx`MHdlc$pbablr-2dq5#X`*#-xpJX6E8GGkarZEi;?V z(alQJGP8zbY;SkX{1i|DJ^(jzbXS09z)#>@j;;orlpl(n`P*jp%FL!6v=h=k7_dKW zX7kcy-ZZm=MKkYOuup*%;FM!d9s;|8@ipt?z#aWw0luh4viU{eZODSHst}t6Zs;Rj zb7IZl^1}SKz-o_a9J_m15f^*x-DmKuL>`O zRW#lQRtIRV1NVT*5b)b|>qFQcjjK7DuX=toT!ZGpw*zKAvteK~XTPOdIIQ_=U-(}E zGoM)lxVDa_-KUxHh2IxA^Sg9xg2i0#*o3s5z`KHR59peI4&U>L+bc`vHw=C>LZ`{z z`Ips(qrvwgWWK8LbAety0(|m;51sk0#!i9QU7yTXB4obn@%-?DuSbC2q4B%gri*R$ zf$v6u&upnc?5Zz(=riB(h~4plH{f@qK3^nuFXVTdQd#=Yn&AI8_&;Knr+6#HVN?JB N002ovPDHLkV1jidGt>Y8 literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/shop_over.png b/htdocs/theme/eldy/img/menus/shop_over.png new file mode 100644 index 0000000000000000000000000000000000000000..bda5823f8c36729b82f6d310cb6c7e1991821c95 GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?KUgF*5nBSUrfJ647TSD_CPA~Hl93@QO7rOaQWMF5NQi<;J zWB;!@zql;t9hcIf$hAj0eIJU(K~Zs2K0^h=k>m&2&pdu8Z89`wuwwXn=C40P-`taY z`{p;)e|-JaUPeRNc_|-*{Lk424C@%~{fs+%>u+y|%3*W=NXpY`l(g1;NlE@{uS%m58sx(w#iYncjbx5mfo8T o`CsRpzsU91Jm8_|Kbvp7A39FBd9tU?21W{lr>mdKI;Vst04SH#jQ{`u literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus/tools.png b/htdocs/theme/eldy/img/menus/tools.png index ed5d0326c4324bcbafb60fb6e1fec2653fcab28c..de7f2b7b22164a355844cc2f6c6b738d1e88e4ba 100644 GIT binary patch literal 1052 zcmV+%1mpXOP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#SnLAAsH00W#!L_t(o!|mBwXq{CM2k>8tu}R#bm1?B1iYq9R7eNXZL0bhE>YE!_ zX%$gis4t4z7eNK9_#i5%wD_hz6hssaic76l5EB$ptV`WWX;Pz6X>N?imkAuc-tCL` zW`PV0_xt9|%=bUb%$aj;M@q>;r6m?HErMSJzX*O2{QLxe3f5y_K7c>0gzl5LD|;Wt zMHp*fH-O%F9>Y+}(5IA|<#p*$8cHek7W8^kN_VG}-c8kMETy!qid|{$C|Mq?$JTT z$5~DKeg`jx|E9qog%@yU$x+>mSL?Jtgezx|6bH(z`EhKBEHF`pM{CIM#}#!twzi{m}w&F_XE@ zR=hcrY||{A8bR2T$$p5AEw9oBPem4~M$>uzCG2YS@s1YU+pLUW?7`o-H=Z|F0sbuB zYgI+u(S}Q>9y}f!T~0gj{9GMI>QR5>?`|xMSju9z#yWdXd>K<`WZ81?&j95xP# zxhNgPj=K~4+ZC`EpwFyn$UM>iv;cgYU!TP3Rqn(^YY1mW6%ZfxTJb zbwRZ4saFQiblEJgadgY+H@sD2NsUIQ)}k|HgPHCWR+S0jGT{Gd0Ddy6z{v))@_Ag9 z>@Re3yote?G5CErqYm&L4S?q$D>x?j_pCy#L~+-0@FP*~_E!PEGY%ik(B9Z(JFz;J zQ%~#}Q?cgTRvz?c9hk(|C4lGGAFHyppP#0N+6lf@)EU9qlg;etT-WonMhp6Ho&Nxd WZ(6pU8BH(%0000P000>X1^@s6#OZ}&00004XF*Lt006O% z3;baP000FuNklZjA`^lj*!i;Ow1f2PrB_~BP`_RLRw ze$YAezGg-^WYHUotE{YT+C6#RPd4#`L9{z-QWz1@hhpnJJUr*jdELj?`$|vmRru!G z5S%>u@hFu_O+Ul*{J8+g%BNXaSm*!-4SdlL z0|R{!6%{E%{?%&vi`H6LwmG`GLrQuEh)YU;LB4>O0sL33T3JRWlXX>~@GXK~1!%CJ zkjk2VM?RK%5krr$le5khu%%>(pio@=7`J;i07up=d(__121d(`4yr(GJKM^0^|jF3 z*F%(+mfXUvRIAgp=Wy!0eEnc8%NjT?ZVFIte*QR$IjTbz<>chZ@7=o#ZJ)KkvSmw4 z4Gj%5v$M1AHe9|0b)VKks34>s!O3cMZ^k9WN|V#l0Dl{EB`9szZV2KBcc3^`9mMYF zX#e^4?OTNWN*7%HTn_Rp-O$`3g~lcc`1tTHp&Y}R06}=DWbEN643FF+(lRr_eFG27 zt=`8VA~S36B+7|IW<{gXHJ?>2Sg>H{{o(t7LEm1#Mtu3zAau*SFo=*fHv!L^*ND=V zVwegr`e1~(eq#u@>zu1Syu3PX*lZcc#dXpVw=P{YC5(!Gq@1m1i!Kxj8!lWt|773( z?7Mt^V6#9FBJY-WLQAWRXl-kTjT<+}1A{iVVZe_{fECN~2uYKK2aJL`N_}g|l4EQq zE;zfdC*qQ}6UgtS-Zo?9v@cZ7gK=1x;Ogl!ryxBwnaJ9+3&zF~U~Gi=?xqqzBF*eQ z&6;i3zxrJZg6r-vMc32Yt3#n^&t-o6?R^ve@XwaQC#?g3cY$|cYP!0XOeU#Ij|P=S zOSH9jxW&}h-=j;VYRv^;W#gARlzgNMVv8EVJmd(RsBebwEny&x*z!G!+q?jwDmKQ{ z($XT$1z^h#+E73MgE?*AbL z0k#%4fR{?;BsRFh>HtHQNG7~0WMDA1;eT3-HH}DZk+~L z1&d)7%T0>n!h?qnJi>F-(kcZB8rVaJ%N`=X?_2?%+{ls#X-B64PO()O02V<-U~0$f zL~$c!Uf_on<-Z{ifk6$Di%?N<6zf)S)rqQ?0(@Lz4vlA2bVHoD37q4m0q+GCz*?ux zJt)3Xl{f)dFEt{ntB*ZZfi6id!0{7RPmn*##Kc5%Hb9_TT=`>BrCb5v#vfMz%mebl z(k<+3tjg*ID^@Jm)YjHctf@IY@eI^(fjD`p`l*hNP7>0;=S~;Z+B>Ol$Kei$FP6f( zglWJU|2$xMMdM>?@lRVfFfbr77cs-=g0$-=KlG>-jqBtpYyM)tE*#Vw5+TH-APf=k>~RZ^6tdMM0LF&_f*D0GKox% zFk!i#ML%6%VYX<-#&4Gv7Uqv_OH3G??c(}R7LpW_^4?+0^#27+0cn6~76-`y0000< KMNUMnLSTZA)tP|+ diff --git a/htdocs/theme/eldy/img/menus/tools_over.png b/htdocs/theme/eldy/img/menus/tools_over.png new file mode 100644 index 0000000000000000000000000000000000000000..80f9a7f553a765bde7599d380459f301d726ef77 GIT binary patch literal 706 zcmV;z0zLhSP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#baD?v*D00KfuL_t(o!|j>jQS2ZP$N%2=T{`eOcy!>Ea3!PzQ$k9xgNGfY1YQTR zgV;f=VEwY0VURso5m80H)pOiKw)l>8njdWTJ6~hI1@M@e*L3CAmRiws!Msyq?m|Q_wYzZ0Bxk9WB(Ud|ehvB_IFIHk z5fHrUcx5`Fzh>pbHVe66HP4Yg7=wrQ+}B@7K<$=~!n3A5;3cI<(H6SHrIkICf%vGg^*E z%?=C&>LQt~h1bemN7xa3@yQKG3-xwgW` z4lJAxHQ>#w$`UhNt2{*guUwU0e$O5h9_DK`s9n)bM_fL;PU_xKAAIqlAgkCb6rIf*SBsA^0TR2BaMD{MPM)&&C$;!v=840V5pln@eSE9|f04 z6JHwwz`tnh+){1)M(`N&DN>rAf4;X;8@I!Ki-|(VM+cFiWqHu?7y24`%czgLc1f&x oOP_;lMV|@HFLq7%|NGxMpPMEXG=2^^yZ`_I07*qoM6N<$g6e)Wq5uE@ literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 143b76b00ed..50b80258ea6 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -673,7 +673,7 @@ div.mainmenu { position : relative; background-repeat:no-repeat; background-position:center top; - height: px; + height: px; margin-left: 0px; min-width: 40px; } From 1dc2bbb0f14451558f386a1079db07f1d9d528fc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Dec 2014 03:01:31 +0100 Subject: [PATCH 116/172] Fixed: Var no declared --- htdocs/core/lib/ecm.lib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php index 2f12976e49f..1debd4e3892 100644 --- a/htdocs/core/lib/ecm.lib.php +++ b/htdocs/core/lib/ecm.lib.php @@ -32,6 +32,8 @@ function ecm_prepare_dasboard_head($object) { global $langs, $conf, $user; + global $helptext1, $helptext2; + $h = 0; $head = array(); From e6d2bc0bff55007f7b642222a7088d39dd70dcf6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Dec 2014 03:12:01 +0100 Subject: [PATCH 117/172] Maj icon --- htdocs/theme/eldy/img/object_action.png | Bin 710 -> 528 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/htdocs/theme/eldy/img/object_action.png b/htdocs/theme/eldy/img/object_action.png index 001b0cf9b7698a7da6ced443f8402134cf7d12c6..0b02fada4147e31e71f53a800b91839be9b66f07 100644 GIT binary patch delta 513 zcmV+c0{;ER1&{=g8Gi-<0019IEztk~00DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RZ3>E?l0mBs!jsO4wkV!;AR4C7N zk}+!=K@f%C+jV0p1l&YOq;R7yAZb;maAADP6?Sh7ap`}cUw@J!U2uLvY`BPv3pFRy zXk|#{AV?8}I~T$@&FZDui_eZS&9b}So3}Hwbk1Qmn;}UObi3UhlJ7~rBY6M-l5$C3 zC4KhZ-{pCZe!mX_K&R6|nx=;UK9X!j!A}4nxf}OO0B7Uz_;NCtfJu_TId=%)3rR>4 zNrn(!1Aw*mSATgH6C6#a(+duV!yRMHcap6VkOY$35qu~$04Qm>Ua#M5kvy%6@E9gO zwcIl@Et01OKpKIn=r0^y@r+3g$$e}NjYgw;053?^LI|%Ujbnm+vq?b`A%wSs!C*Vq z_D^g{x+0l8v65u1&0~`w3D(-`{gnZbm2kz8)y9--g?h=1q;pBjI0oT=1wW2zDe2tS z>-FEwX7dMt<5K**!`1l$IPu literal 710 zcmWlWT}ahn7{}jp{F+~}yOt0*D)eM08IpN0!ZVKK87eZBa9yMg>S7SutebgJx;S`R z6g47bkO-q2XDO^A8WkJ{6}*}s)66r7tVK5?3U(vBy~6+bKfmX9_wr8n^`5J(s;dG3 z)MmRfJl+TPhbY0__^9|DuZr<(PiMtOJa+IT)iZSZ1y+@#T|+VeSGE0#-ThWr#j^BD zx+e|5;=Ss_QmF)I zBzQ9+*a>_}F2h@l?51QVrMfK7vx3CRE~`RTgB)*ilEPuoJYKYT)#VLe&^^KML|G9P zO*DPc3M5&U6h+dYWLT2nN!Zv>f{|=`vgONGAj3$}p|%MC0qu>8mhknKlyfSe$5aEHhZ zA~!@Z2w{LAh6s6KcR(wBk_{q}tc0T{$@zD!o<>jaD?9|ma zjxk#G#_q_tp4b{H?5r)jdM^Fxb3<~O<}!uGbvT(ze_`lk zLwjpedor~;lS{j8XP?f#nxAiLPO?+CZ>2x9Kbv2gn_Fu8I#{z?Q@lSX%(mqBe$bGA po`+r2tq;Aa*Fs0PFq11Q#KGdb=8a3mri=I;AluoSSzw1J{{xOVMJNCO From b45bd06475788d6f4e68f8d6cdcfe946b6523290 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Mon, 22 Dec 2014 12:26:04 +0100 Subject: [PATCH 118/172] Update functions.lib.php Add feature to limit the number of tabs in a card (based on google menu practice) function actived with MAXTABS_IN_CARD dictionnary watch result here : http://www.dolibarr.fr/forum/12-howto--aide/52135-tuto-ajouter-a-un-doc-pdf-un-extrafields#56008 or here. All the code is in one function, need to explode/refactoring it on diferent css --- htdocs/core/lib/functions.lib.php | 86 +++++++++++++++++++++++-------- 1 file changed, 65 insertions(+), 21 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 194fee33bfc..20b7d4369ac 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -683,42 +683,86 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p if (count($keys)) $maxkey=max($keys); } - // Show tabs + // Show tabs + $bactive=false; + // if =0 we don't use the feature + $limittoshow=($conf->global->MAXTABS_IN_CARD?$conf->global->MAXTABS_IN_CARD:99); + $displaytab=0; + for ($i = 0 ; $i <= $maxkey ; $i++) { - $isactive=(is_numeric($active) && $i == $active) || (! is_numeric($active) && $active == $links[$i][2]); - $out.='
    '; - if (isset($links[$i][2]) && $links[$i][2] == 'image') + if ((is_numeric($active) && $i == $active) || (! is_numeric($active) && $active == $links[$i][2])) { - if (!empty($links[$i][0])) - { - $out.=''.$links[$i][1].''."\n"; - } - else - { - $out.=''.$links[$i][1].''."\n"; - } + $isactive=true; + $bactive=true; + if ($i <=$limittoshow) + $limittoshow++; } - else if (! empty($links[$i][1])) + else + $isactive=false; + + if ($i <=$limittoshow || $isactive ) { - //print "x $i $active ".$links[$i][2]." z"; - if ($isactive) + $out.='
    '; + if (isset($links[$i][2]) && $links[$i][2] == 'image') { - $out.=''.$links[$i][1].''."\n"; + if (!empty($links[$i][0])) + { + $out.=''.$links[$i][1].''."\n"; + } + else + { + $out.=''.$links[$i][1].''."\n"; + } } - else + else if (! empty($links[$i][1])) { - $out.=''.$links[$i][1].''."\n"; + //print "x $i $active ".$links[$i][2]." z"; + if ($isactive) + { + $out.=''.$links[$i][1].''."\n"; + } + else + { + $out.=''.$links[$i][1].''."\n"; + } } + $out.='
    '; } - $out.='
    '; + else + { + $outmore.='
    '; + if (isset($links[$i][2]) && $links[$i][2] == 'image') + { + if (!empty($links[$i][0])) + $outmore.=''.$links[$i][1].''."\n"; + else + $outmore.=''.$links[$i][1].''."\n"; + + } + else if (! empty($links[$i][1])) + $outmore.=''.$links[$i][1].''."\n"; + + $outmore.='
    '; + } + $displaytab=$i; } - $out.="\n"; + if ($displaytab > $limittoshow) + { + $out.='
    Plus'; + $out.='
    '.$outmore.'
    '; + $out.="\n"; + + $out.=""; + } if (! $notab) $out.="\n".'
    '."\n"; - + return $out; } From 748bef6134a5f663c71fe409f4490a2caf04f8d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 22 Dec 2014 20:02:53 +0100 Subject: [PATCH 119/172] Translation error --- htdocs/langs/en_US/products.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 1e3027acd25..e290bd49c31 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Products and Services statistics ProductsStatistics=Products statistics ProductsOnSell=Available products ProductsNotOnSell=Obsolete products -ProductsOnSellAndOnBuy=Products not for sale nor purchase +ProductsOnSellAndOnBuy=Products for sale and for purchase ServicesOnSell=Available services ServicesNotOnSell=Obsolete services -ServicesOnSellAndOnBuy=Services not for sale nor purchase +ServicesOnSellAndOnBuy=Services for sale and for purchase InternalRef=Internal reference LastRecorded=Last products/services on sell recorded LastRecordedProductsAndServices=Last %s recorded products/services From 46fe2c67e0a5ce2dbf82ba4b420154e1ae4d5940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 22 Dec 2014 22:32:05 +0100 Subject: [PATCH 120/172] Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks --- ChangeLog | 1 + htdocs/core/lib/functions2.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a169a80654b..92b3911a14c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ Fix: Paypal link were broken dur to SSL v3 closed. - Fix: Show sender Country on PDF docs when sender Country <> receiver Country - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS - Fix: [ bug #1749 ] Undefined $mailchimp +- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 4127686b459..4c2dd6e5189 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -738,7 +738,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m $sql = "SELECT MAX(".$sqlstring.") as val"; $sql.= " FROM ".MAIN_DB_PREFIX.$table; $sql.= " WHERE ".$field." LIKE '".$maskLike."'"; - $sql.= " AND ".$field." NOT LIKE '%PROV%'"; + $sql.= " AND ".$field." NOT LIKE '(PROV%)'"; $sql.= " AND entity IN (".getEntity($table, 1).")"; if ($where) $sql.=$where; if ($sqlwhere) $sql.=' AND '.$sqlwhere; From db301863867d9f1c48020a0897d9079e3e361358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 22 Dec 2014 22:52:43 +0100 Subject: [PATCH 121/172] Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs --- ChangeLog | 1 + htdocs/projet/tasks/contact.php | 10 +++++----- htdocs/projet/tasks/document.php | 2 +- htdocs/projet/tasks/note.php | 2 +- htdocs/projet/tasks/time.php | 8 ++++---- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index a169a80654b..00a07efb2d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ Fix: Paypal link were broken dur to SSL v3 closed. - Fix: Show sender Country on PDF docs when sender Country <> receiver Country - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS - Fix: [ bug #1749 ] Undefined $mailchimp +- Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index f0bdce25fca..8a6ebb0a3d4 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -57,7 +57,7 @@ $projectstatic = new Project($db); // Add new contact if ($action == 'addcontact' && $user->rights->projet->creer) { - $result = $object->fetch($id); + $result = $object->fetch($id, $ref); if ($result > 0 && $id > 0) { @@ -87,7 +87,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)) + if ($object->fetch($id, $ref)) { $result=$object->swapContactStatus(GETPOST('ligne')); } @@ -100,7 +100,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer) // Efface un contact if ($action == 'deleteline' && $user->rights->projet->creer) { - $object->fetch($id); + $object->fetch($id, $ref); $result = $object->delete_contact($_GET["lineid"]); if ($result >= 0) @@ -152,7 +152,7 @@ $userstatic = new User($db); if ($id > 0 || ! empty($ref)) { - if ($object->fetch($id) > 0) + if ($object->fetch($id, $ref) > 0) { $result=$projectstatic->fetch($object->fk_project); if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); @@ -245,7 +245,7 @@ if ($id > 0 || ! empty($ref)) $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; - print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param); print '
    '; print 'attribute_required [$key])) print ' class="fieldrequired"'; + //var_dump($action);exit; + if ((! empty($action) && $action != 'view') && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"'; print '>' . $label . ''; //TODO Improve element and rights detection @@ -67,8 +68,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) print ''; @@ -928,7 +928,7 @@ if ($id > 0) $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); } } - print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); + print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0'); if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy"); print ''; From 08fd74e79ee6b2680278d07e2dd156ac0b2c9edc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 13:21:40 +0100 Subject: [PATCH 147/172] Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier invoices list --- htdocs/fourn/facture/list.php | 2 +- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 357df92a4eb..2a01602eadc 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -150,7 +150,7 @@ if ($filter && $filter != -1) // GETPOST('filtre') may be a string if ($search_ref) { - if (is_numeric($search_ref)) $sql .= natural_search(array('fac.rowid', 'fac.ref'), $search_ref);// For backward compatibility + if (is_numeric($search_ref)) $sql .= natural_search(array('fac.ref'), $search_ref); else $sql .= natural_search('fac.ref', $search_ref); } if (search_ref_supplier) diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index e2c586de47f..2281793929f 100755 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1136,6 +1136,8 @@ ALTER TABLE llx_facture_fourn MODIFY COLUMN ref VARCHAR(255); ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_ext VARCHAR(255); ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_supplier VARCHAR(255); +UPDATE llx_facture_fourn SET ref = rowid WHERE ref IS NULL or ref = ''; + ALTER TABLE llx_facture_rec ADD COLUMN revenuestamp double(24,8) DEFAULT 0; ALTER TABLE llx_facturedet_rec MODIFY COLUMN tva_tx double(6,3); ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL; From dc4a874e70143d61181d3a10b0952679950ea515 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 13:07:16 +0100 Subject: [PATCH 148/172] Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors --- htdocs/compta/charges/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index dd6455a3932..ca03e11bcba 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -102,7 +102,7 @@ if ($conf->salaries->enabled) // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire $sql.= " AND s.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; } - if (preg_match('/^s/',$sortfield)) $sql.= $db->order($sortfield,$sortorder); + if (preg_match('/^s\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder); $result = $db->query($sql); if ($result) @@ -204,7 +204,7 @@ if ($conf->tax->enabled) $sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')"; $sql .= ")"; } - if (! preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder); + if (preg_match('/^cs\./',$sortfield) || preg_match('/^c\./',$sortfield) || preg_match('/^pc\./',$sortfield) || preg_match('/^pct\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder); //$sql.= $db->plimit($limit+1,$offset); //print $sql; @@ -295,7 +295,7 @@ if ($conf->tax->enabled) // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire $sql.= " AND pv.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; } - if (preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder); + if (preg_match('/^pv\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder); $result = $db->query($sql); if ($result) From bd7f6339ce4b1d56485d5fb7eb98ef00e6ec5f60 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 12:59:34 +0100 Subject: [PATCH 149/172] Because this is a legal issue (OPCA), i added the hidden constant for 3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button "Classified Billed" is visible on proposal even if there is no invoice linked to proposal. Fixed: Also fix get list of invoice that report too many data. --- htdocs/comm/propal.php | 8 +++++--- htdocs/comm/propal/class/propal.class.php | 9 ++++++--- htdocs/core/class/commonobject.class.php | 2 +- htdocs/langs/en_US/workflow.lang | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 5feb7769a43..6110186fcb4 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -2110,12 +2110,14 @@ if ($action == 'create') // Create an invoice and classify billed if ($object->statut == 2) { - if (! empty($conf->facture->enabled) && $user->rights->facture->creer) { + if (! empty($conf->facture->enabled) && $user->rights->facture->creer) + { print '
    ' . $langs->trans("AddBill") . '
    '; } - $arraypropal = $object->getInvoiceArrayList(); - if (is_array($arraypropal) && count($arraypropal) > 0) { + $arrayofinvoiceforpropal = $object->getInvoiceArrayList(); + if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || ! empty($conf->global->WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES)) + { print '
    socid . '">' . $langs->trans("ClassifyBilled") . '
    '; } } diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index fb9d5257d49..be22043e4b5 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1987,16 +1987,19 @@ class Propal extends CommonObject { $linkedInvoices[] = $objectid[$i]; } - // Cas des factures liees via la commande + // Cas des factures liees par un autre objet (ex: commande) else - { + { $this->fetchObjectLinked($objectid[$i],$objecttype); foreach($this->linkedObjectsIds as $subobjecttype => $subobjectid) { $numj=count($subobjectid); for ($j=0;$j<$numj;$j++) { - $linkedInvoices[] = $subobjectid[$j]; + if ($subobjecttype == 'facture') + { + $linkedInvoices[] = $subobjectid[$j]; + } } } } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 4cc8cd23672..6ab8c6c75f2 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1851,7 +1851,7 @@ abstract class CommonObject } } else - { + { $sql.= "(fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."')"; $sql.= " ".$clause." (fk_target = '".$targetid."' AND targettype = '".$targettype."')"; } diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang index d4ecf42b997..e08c88a9170 100644 --- a/htdocs/langs/en_US/workflow.lang +++ b/htdocs/langs/en_US/workflow.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - admin WorkflowSetup=Workflow module setup -WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can enabled automatic actions that you are interesting in. +WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed From 40404530ba801398fd199b30560e9f1447f0f695 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 12:25:21 +0100 Subject: [PATCH 150/172] Fixed: [ bug #1756 ] PHP error while removing an import profile --- htdocs/core/tpl/extrafields_view.tpl.php | 15 ++++++++------- htdocs/imports/class/import.class.php | 7 ++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index ad2fa068757..7f0115b83bc 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -33,13 +33,13 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) { if ($action == 'edit_extras') { - $value = (isset($_POST ["options_" . $key]) ? $_POST ["options_" . $key] : $object->array_options ["options_" . $key]); + $value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]); } else { - $value = $object->array_options ["options_" . $key]; + $value = $object->array_options["options_" . $key]; } - if ($extrafields->attribute_type [$key] == 'separate') + if ($extrafields->attribute_type[$key] == 'separate') { print $extrafields->showSeparator($key); } @@ -47,7 +47,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) { print '
    '; // Convert date into timestamp format - if (in_array($extrafields->attribute_type [$key], array('date','datetime'))) { - $value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]); + if (in_array($extrafields->attribute_type[$key], array('date','datetime'))) { + $value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $db->jdate($object->array_options['options_' . $key]); } //TODO Improve element and rights detection @@ -77,7 +78,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) print ''; print ''; print ''; - print ''; + print ''; print ''; print $extrafields->showInputField($key, $value); diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index 58a1bf3e931..b846d158227 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.class.php @@ -22,8 +22,7 @@ */ /** - * \class Import - * \brief Class to manage imports + * Class to manage imports */ class Import { @@ -313,10 +312,12 @@ class Import { if (! $notrigger) { + /* Not used. This is not a business object. To convert it we must herit from CommonObject // Call trigger $result=$this->call_trigger('IMPORT_DELETE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers + */ } } From acf7b9f130bb1e45ce34d819615afc4224572c97 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 12:59:34 +0100 Subject: [PATCH 126/172] Because this is a legal issue (OPCA), i added the hidden constant for 3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button "Classified Billed" is visible on proposal even if there is no invoice linked to proposal. Fixed: Also fix get list of invoice that report too many data. --- htdocs/comm/propal.php | 8 +++++--- htdocs/comm/propal/class/propal.class.php | 9 ++++++--- htdocs/core/class/commonobject.class.php | 2 +- htdocs/langs/en_US/workflow.lang | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 0ac5d78aead..0143e20ba77 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -2109,12 +2109,14 @@ if ($action == 'create') // Create an invoice and classify billed if ($object->statut == 2) { - if (! empty($conf->facture->enabled) && $user->rights->facture->creer) { + if (! empty($conf->facture->enabled) && $user->rights->facture->creer) + { print '
    ' . $langs->trans("AddBill") . '
    '; } - $arraypropal = $object->getInvoiceArrayList(); - if (is_array($arraypropal) && count($arraypropal) > 0) { + $arrayofinvoiceforpropal = $object->getInvoiceArrayList(); + if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || ! empty($conf->global->WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES)) + { print '
    socid . '">' . $langs->trans("ClassifyBilled") . '
    '; } } diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index fb9d5257d49..be22043e4b5 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1987,16 +1987,19 @@ class Propal extends CommonObject { $linkedInvoices[] = $objectid[$i]; } - // Cas des factures liees via la commande + // Cas des factures liees par un autre objet (ex: commande) else - { + { $this->fetchObjectLinked($objectid[$i],$objecttype); foreach($this->linkedObjectsIds as $subobjecttype => $subobjectid) { $numj=count($subobjectid); for ($j=0;$j<$numj;$j++) { - $linkedInvoices[] = $subobjectid[$j]; + if ($subobjecttype == 'facture') + { + $linkedInvoices[] = $subobjectid[$j]; + } } } } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1a9195e069d..54c7b9d860d 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1851,7 +1851,7 @@ abstract class CommonObject } } else - { + { $sql.= "(fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."')"; $sql.= " ".$clause." (fk_target = '".$targetid."' AND targettype = '".$targettype."')"; } diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang index d4ecf42b997..e08c88a9170 100644 --- a/htdocs/langs/en_US/workflow.lang +++ b/htdocs/langs/en_US/workflow.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - admin WorkflowSetup=Workflow module setup -WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can enabled automatic actions that you are interesting in. +WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed From aa618d481b00b683ede0184fc8f54b31e87921bc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 13:07:16 +0100 Subject: [PATCH 127/172] Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors --- htdocs/compta/charges/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index dd6455a3932..ca03e11bcba 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -102,7 +102,7 @@ if ($conf->salaries->enabled) // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire $sql.= " AND s.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; } - if (preg_match('/^s/',$sortfield)) $sql.= $db->order($sortfield,$sortorder); + if (preg_match('/^s\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder); $result = $db->query($sql); if ($result) @@ -204,7 +204,7 @@ if ($conf->tax->enabled) $sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')"; $sql .= ")"; } - if (! preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder); + if (preg_match('/^cs\./',$sortfield) || preg_match('/^c\./',$sortfield) || preg_match('/^pc\./',$sortfield) || preg_match('/^pct\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder); //$sql.= $db->plimit($limit+1,$offset); //print $sql; @@ -295,7 +295,7 @@ if ($conf->tax->enabled) // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire $sql.= " AND pv.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; } - if (preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder); + if (preg_match('/^pv\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder); $result = $db->query($sql); if ($result) From 2b4edd999670eadc3104d0496ed2973d553b73e9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 13:21:40 +0100 Subject: [PATCH 128/172] Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier invoices list --- htdocs/fourn/facture/list.php | 2 +- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 357df92a4eb..2a01602eadc 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -150,7 +150,7 @@ if ($filter && $filter != -1) // GETPOST('filtre') may be a string if ($search_ref) { - if (is_numeric($search_ref)) $sql .= natural_search(array('fac.rowid', 'fac.ref'), $search_ref);// For backward compatibility + if (is_numeric($search_ref)) $sql .= natural_search(array('fac.ref'), $search_ref); else $sql .= natural_search('fac.ref', $search_ref); } if (search_ref_supplier) diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index e2c586de47f..2281793929f 100755 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1136,6 +1136,8 @@ ALTER TABLE llx_facture_fourn MODIFY COLUMN ref VARCHAR(255); ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_ext VARCHAR(255); ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_supplier VARCHAR(255); +UPDATE llx_facture_fourn SET ref = rowid WHERE ref IS NULL or ref = ''; + ALTER TABLE llx_facture_rec ADD COLUMN revenuestamp double(24,8) DEFAULT 0; ALTER TABLE llx_facturedet_rec MODIFY COLUMN tva_tx double(6,3); ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL; From a90a03412ab292966f8c02baa9ee2743ac3a9824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 23 Dec 2014 15:43:45 +0100 Subject: [PATCH 129/172] Fixed string not translated in linked objects of a project --- htdocs/projet/element.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 4a0c70e04af..28f41370d5f 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -373,8 +373,10 @@ foreach ($listofreferent as $key => $value) } } +$langs->load('margins'); + // Margin display of the project -print_titre("Margin"); +print_titre($langs->trans("Margins")); print ''; print ''; print ''; From 78307a748dc3c66e1855ccf3aa50258201ad6654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 23 Dec 2014 15:56:29 +0100 Subject: [PATCH 130/172] Corrected confusing table header in task list --- htdocs/langs/en_US/projects.lang | 1 + htdocs/projet/tasks/index.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index a37e9651bcc..e9d04c8c8db 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -3,6 +3,7 @@ RefProject=Ref. project ProjectId=Project Id Project=Project Projects=Projects +ProjectStatus=Project status SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index ec23afb1902..94711b4d92e 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -97,7 +97,7 @@ print '
    '.$langs->trans("Element").'
    '; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; From 743867b91b8305eed0125acb9328355ffc169a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 23 Dec 2014 15:57:30 +0100 Subject: [PATCH 131/172] Spanish translation --- htdocs/langs/es_ES/projects.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index 988b3e545c8..f393616f898 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -3,6 +3,7 @@ RefProject=Ref. proyecto ProjectId=Id proyecto Project=Proyecto Projects=Proyectos +ProjectStatus=Estado del proyecto SharedProject=Proyecto compartido PrivateProject=Contactos del proyecto MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto afectado (cualquier tipo). From 416f13c708cbfbff3e0ff0e1997867e3b37b9a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 23 Dec 2014 16:00:04 +0100 Subject: [PATCH 132/172] Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H --- ChangeLog | 1 + htdocs/margin/agentMargins.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 949492346b2..d24728054e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.5.7 compared to 3.5.6 ***** Fix: Paypal link were broken dur to SSL v3 closed. +Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index e618931ee77..da7bf758f1d 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -57,9 +57,9 @@ $pagenext = $page + 1; $startdate=$enddate=''; if (!empty($_POST['startdatemonth'])) - $startdate = dol_mktime(12, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']); + $startdate = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']); if (!empty($_POST['enddatemonth'])) - $enddate = dol_mktime(12, 0, 0, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']); + $enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']); /* * View From 034455fc2d0e55724ae6d1ad2e80f35d04e9ac5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 23 Dec 2014 16:37:53 +0100 Subject: [PATCH 133/172] Fix: [ bug #1722 ] Missing link in homepage project's box --- htdocs/core/boxes/box_project.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php index 62ed89dd65b..57863100999 100644 --- a/htdocs/core/boxes/box_project.php +++ b/htdocs/core/boxes/box_project.php @@ -1,5 +1,6 @@ + * Copyright (C) 2014 Marcos García * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or @@ -45,7 +46,7 @@ class box_project extends ModeleBoxes $langs->load("boxes"); $langs->load("projects"); - $this->boxlabel="Projet"; + $this->boxlabel="Projects"; } /** @@ -63,13 +64,8 @@ class box_project extends ModeleBoxes $totalMnt = 0; $totalnb = 0; $totalnbTask=0; - include_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); - require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); - $projectstatic=new Project($db); - - - $textHead = $langs->trans("Projet"); + $textHead = $langs->trans("Projects"); $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead)); // list the summary of the orders @@ -91,14 +87,15 @@ class box_project extends ModeleBoxes $i = 0; while ($i < $num) { - $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"','logo' => 'object_projectpub'); - $objp = $db->fetch_object($result); - $projectstatic->fetch($objp->rowid); + + $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', + 'logo' => 'object_project', + 'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' =>$projectstatic->getNomUrl(1) - ); + 'text' => $objp->ref, + 'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="left"', 'text' => $objp->title From d03cc03cd7ed5fcaef5d26e1912ecc8d82852287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 23 Dec 2014 16:42:05 +0100 Subject: [PATCH 134/172] Enhance select_salesrepresentatives with select2 --- htdocs/core/class/html.formother.class.php | 38 ++++++++++++++-------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index d6cf08594bb..4f0439d7b3c 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -356,9 +356,18 @@ class FormOther global $conf,$langs; $langs->load('users'); + $out = ''; + $nodatarole = ''; + // Enhance with select2 + if ($conf->use_javascript_ajax) + { + include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; + $out.= ajax_combobox($htmlname); + $nodatarole=' data-role="none"'; + } // Select each sales and print them in a select input - $moreforfilter =''; + $out.=''; // Get list of users allowed to be viewed $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login"; @@ -383,34 +392,35 @@ class FormOther { while ($obj_usr = $this->db->fetch_object($resql_usr)) { - $moreforfilter.=''; + $out.=($moreinfo?')':''); + $out.=''; } $this->db->free($resql_usr); } @@ -418,9 +428,9 @@ class FormOther { dol_print_error($this->db); } - $moreforfilter.=''; + $out.=''; - return $moreforfilter; + return $out; } /** From b7dbb1e9cd1e7f8926d7c8ad5ff525d59f5d148b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 17:46:30 +0100 Subject: [PATCH 135/172] Fixed: Do not show disabled user when creating a new event. --- htdocs/comm/action/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 8a2c602a3f0..180dbcddb30 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -678,7 +678,7 @@ if ($action == 'create') $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); } } - print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); + print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0'); if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.$langs->trans("Busy"); print ''; @@ -925,7 +925,7 @@ if ($id > 0) $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); } } - print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); + print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0'); if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy"); print ''; From a111c4765c250c9008e16de5d1c5ab2f46e3800d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 18:00:14 +0100 Subject: [PATCH 136/172] Fixed: Filter lost with navigation --- htdocs/fichinter/list.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 9030cd9c4ac..851077b510f 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -121,7 +121,13 @@ if ($result) { $num = $db->num_rows($result); - $urlparam="&socid=$socid"; + $urlparam=''; + if ($socid) $urlparam.="&socid=".$socid; + if ($search_ref) $urlparam.="&search_ref=".urlencode($search_ref); + if ($search_company) $urlparam.="&search_company=".urlencode($search_company); + if ($search_desc) $urlparam.="&search_desc=".urlencode($search_desc); + if ($search_status != '' && $search_status > -1) $urlparam.="&search_status=".urlencode($search_status); + print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num); print ''."\n"; @@ -193,7 +199,7 @@ if ($result) print ''; } print ''; - + print ''; print "\n"; @@ -207,7 +213,7 @@ if ($result) print ''; print ''; } - + print '
    '.$langs->trans("Project").''.$langs->trans("Status").''.$langs->trans("ProjectStatus").''.$langs->trans("RefTask").''.$langs->trans("LabelTask").''.$langs->trans("DateStart").'
    '.convertSecondToTime($objp->duree).''.$interventionstatic->LibStatut($objp->fk_statut,5).' 
    '.convertSecondToTime($total).'  
    '; print "\n"; $db->free($result); From 6b29c8e5c6ebb9a007f2e256d46191cd8b9c52c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 23 Dec 2014 19:06:51 +0100 Subject: [PATCH 137/172] Update index.php --- htdocs/comm/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index fd25287c029..4b4db757dc2 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -483,7 +483,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) $var=true; print ''; - print ''; + print ''; $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); while ($i < $nbofloop) From 7001cd0283b3bfd0d7ca74de3c5f596297f502d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 23 Dec 2014 20:11:13 +0100 Subject: [PATCH 138/172] Update index.php --- htdocs/compta/index.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 2359d70d07b..72b860977f6 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -167,7 +167,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print '
    '.$langs->trans("ProposalsOpened").' ('.$num.')
    '.$langs->trans("ProposalsOpened").' '.$num.'
    '; print ''; - print ''; + print ''; if ($num) { $companystatic=new Societe($db); @@ -236,7 +236,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print '
    '.$langs->trans("CustomersDraftInvoices").($num?' ('.$num.')':'').'
    '.$langs->trans("CustomersDraftInvoices").($num?' '.$num.'':'').'
    '; print ''; - print ''; + print ''; if ($num) { $companystatic=new Societe($db); @@ -555,7 +555,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print '
    '.$langs->trans("SuppliersDraftInvoices").($num?' ('.$num.')':'').'
    '.$langs->trans("SuppliersDraftInvoices").($num?' '.$num.'':'').'
    '; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -639,7 +639,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us $i = 0; print '
    '.$langs->trans("ContributionsToPay").($num?' ('.$num.')':'').''.$langs->trans("ContributionsToPay").($num?' '.$num.'':'').''.$langs->trans("DateDue").''.$langs->trans("AmountTTC").''.$langs->trans("Paid").'
    '; print ""; - print ''; + print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; print ''; print ''; @@ -737,7 +737,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $i = 0; print '
    '.$langs->trans("OrdersToBill").' ('.$num.')'.$langs->trans("OrdersToBill").' '.$num.''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").''.$langs->trans("ToBill").'
    '; - print ''; + print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; print ''; print ''; @@ -842,7 +842,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $num = $db->num_rows($resql); print '
    '.$langs->trans("BillsCustomersUnpaid",$num).' ('.$num.')
    '.$langs->trans("BillsCustomersUnpaid",$num).' '.$num.''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").''.$langs->trans("Received").'
    '; - print ''; + print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; print ''; print ''; @@ -916,7 +916,7 @@ if ($resql) $var=!$var; print ""; - print ""; + print ''; $i++; } $db->free($resql); From 8e06329f8d58fb6314b80ed7aa82fd48715776e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 23 Dec 2014 21:26:34 +0100 Subject: [PATCH 139/172] Add css badge --- htdocs/contrat/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 02a580174c3..3d0fee451be 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -245,7 +245,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) print '
    '.$langs->trans("BillsSuppliersUnpaid",$num).' ('.$num.')
    '.$langs->trans("BillsSuppliersUnpaid",$num).' '.$num.''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").''.$langs->trans("Paid").'
    ".dol_print_date($obj->da,"day")."$obj->libelle $obj->label
    '.$obj->libelle.' '.$obj->label.'
    '; print ''; - print ''; + print ''; if ($num) { $companystatic=new Societe($db); @@ -471,7 +471,7 @@ if ($resql) print '
    '.$langs->trans("DraftContracts").($num?' ('.$num.')':'').'
    '.$langs->trans("DraftContracts").($num?' '.$num.'':'').'
    '; - print ''; + print ''; print "\n"; $var=True; @@ -551,7 +551,7 @@ if ($resql) print '
    '.$langs->trans("NotActivatedServices").' ('.$num.')
    '.$langs->trans("NotActivatedServices").' '.$num.'
    '; - print ''; + print ''; print "\n"; $var=True; From 17eebf750ecd50f937065e02ff3cb0bb106fcee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 24 Dec 2014 00:28:05 +0100 Subject: [PATCH 140/172] Update list.php ship2bill.php doesn't exist --- htdocs/expedition/list.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 0722dedddf4..2468c9084d2 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -117,14 +117,14 @@ if ($resql) print '
    '.$langs->trans("ListOfExpiredServices").' ('.$num.')
    '.$langs->trans("ListOfExpiredServices").' '.$num.'
    '; print ''; - print_liste_field_titre($langs->trans("Ref"),"ship2bill.php","e.ref","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Company"),"ship2bill.php","s.nom", "", $param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateDeliveryPlanned"),"ship2bill.php","e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateDeliveryPlanned"), $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder); if($conf->livraison_bon->enabled) { - print_liste_field_titre($langs->trans("DeliveryOrder"),"ship2bill.php","e.date_expedition","",$param, '',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateReceived"),"ship2bill.php","e.date_expedition","",$param, 'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DeliveryOrder"), $_SERVER["PHP_SELF"],"e.date_expedition","",$param, '',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateReceived"), $_SERVER["PHP_SELF"],"e.date_expedition","",$param, 'align="center"',$sortfield,$sortorder); } - print_liste_field_titre($langs->trans("Status"),"ship2bill.php","e.fk_statut","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder); print ''; print "\n"; From b68276637bd2adfe7192546ffebfcb1688b86c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 24 Dec 2014 14:31:17 +0100 Subject: [PATCH 141/172] Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks Conflicts: htdocs/core/lib/functions2.lib.php --- ChangeLog | 1 + htdocs/core/lib/functions2.lib.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5ec86761300..7b5447aed23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -181,6 +181,7 @@ Dolibarr better: - Fix: Show sender Country on PDF docs when sender Country <> receiver Country - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS - Fix: [ bug #1749 ] Undefined $mailchimp +- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 246af863d12..219d0074813 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -784,9 +784,10 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m $sql = "SELECT MAX(".$sqlstring.") as val"; $sql.= " FROM ".MAIN_DB_PREFIX.$table; $sql.= " WHERE ".$field." LIKE '".$maskLike."'"; - $sql.= " AND ".$field." NOT LIKE '%PROV%'"; + $sql.= " AND ".$field." NOT LIKE '(PROV%)'"; if ($bentityon) // only if entity enable $sql.= " AND entity IN (".getEntity($table, 1).")"; + if ($where) $sql.=$where; if ($sqlwhere) $sql.=' AND '.$sqlwhere; From 294753dc475d0d74235a1cd1a21ae3ff147188b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 24 Dec 2014 14:31:17 +0100 Subject: [PATCH 142/172] Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks Conflicts: htdocs/core/lib/functions2.lib.php --- ChangeLog | 1 + htdocs/core/lib/functions2.lib.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 94f568bebfa..e0d1deb8760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -195,6 +195,7 @@ Dolibarr better: - Fix: Show sender Country on PDF docs when sender Country <> receiver Country - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS - Fix: [ bug #1749 ] Undefined $mailchimp +- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 246af863d12..219d0074813 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -784,9 +784,10 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m $sql = "SELECT MAX(".$sqlstring.") as val"; $sql.= " FROM ".MAIN_DB_PREFIX.$table; $sql.= " WHERE ".$field." LIKE '".$maskLike."'"; - $sql.= " AND ".$field." NOT LIKE '%PROV%'"; + $sql.= " AND ".$field." NOT LIKE '(PROV%)'"; if ($bentityon) // only if entity enable $sql.= " AND entity IN (".getEntity($table, 1).")"; + if ($where) $sql.=$where; if ($sqlwhere) $sql.=' AND '.$sqlwhere; From ee1bc22e79313e8937020bdb641aa637d7231dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 23 Dec 2014 16:37:53 +0100 Subject: [PATCH 143/172] Fix: [ bug #1722 ] Missing link in homepage project's box --- htdocs/core/boxes/box_project.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php index 62ed89dd65b..57863100999 100644 --- a/htdocs/core/boxes/box_project.php +++ b/htdocs/core/boxes/box_project.php @@ -1,5 +1,6 @@ + * Copyright (C) 2014 Marcos García * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or @@ -45,7 +46,7 @@ class box_project extends ModeleBoxes $langs->load("boxes"); $langs->load("projects"); - $this->boxlabel="Projet"; + $this->boxlabel="Projects"; } /** @@ -63,13 +64,8 @@ class box_project extends ModeleBoxes $totalMnt = 0; $totalnb = 0; $totalnbTask=0; - include_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); - require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); - $projectstatic=new Project($db); - - - $textHead = $langs->trans("Projet"); + $textHead = $langs->trans("Projects"); $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead)); // list the summary of the orders @@ -91,14 +87,15 @@ class box_project extends ModeleBoxes $i = 0; while ($i < $num) { - $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"','logo' => 'object_projectpub'); - $objp = $db->fetch_object($result); - $projectstatic->fetch($objp->rowid); + + $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', + 'logo' => 'object_project', + 'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' =>$projectstatic->getNomUrl(1) - ); + 'text' => $objp->ref, + 'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="left"', 'text' => $objp->title From 73b47427d8d3c71a45b72a785f73a9288f796b9b Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 24 Dec 2014 15:41:11 +0100 Subject: [PATCH 144/172] Update ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index e0d1deb8760..7a8978a0c12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.8 compared to 3.7.* ***** For users: - New: Use new combobox. +- New: Add hidden option MAXTABS_IN_CARD. For translators: - Update language files. From 34ef373b3a127e2e7ab0b0ec5bff957cc2a391a9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 18:00:14 +0100 Subject: [PATCH 145/172] Fixed: Filter lost with navigation --- htdocs/fichinter/list.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 9030cd9c4ac..851077b510f 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -121,7 +121,13 @@ if ($result) { $num = $db->num_rows($result); - $urlparam="&socid=$socid"; + $urlparam=''; + if ($socid) $urlparam.="&socid=".$socid; + if ($search_ref) $urlparam.="&search_ref=".urlencode($search_ref); + if ($search_company) $urlparam.="&search_company=".urlencode($search_company); + if ($search_desc) $urlparam.="&search_desc=".urlencode($search_desc); + if ($search_status != '' && $search_status > -1) $urlparam.="&search_status=".urlencode($search_status); + print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num); print '
    '."\n"; @@ -193,7 +199,7 @@ if ($result) print '    '; } print ''; - + print ''; print "\n"; @@ -207,7 +213,7 @@ if ($result) print ''; print ''; } - + print '
     
    '.convertSecondToTime($objp->duree).''.$interventionstatic->LibStatut($objp->fk_statut,5).' 
    '.convertSecondToTime($total).'  
    '; print "\n"; $db->free($result); From 2c170dbe0e239b0bd28df1fbf9ba8c5f313de42e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 23 Dec 2014 17:46:30 +0100 Subject: [PATCH 146/172] Fixed: Do not show disabled user when creating a new event. --- htdocs/comm/action/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index e6523d3d4ed..faa4109f736 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -681,7 +681,7 @@ if ($action == 'create') $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true); } } - print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1); + print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0'); if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.$langs->trans("Busy"); print '
    '; print 'attribute_required [$key])) print ' class="fieldrequired"'; + //var_dump($action);exit; + if ((! empty($action) && $action != 'view') && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"'; print '>' . $label . ''; //TODO Improve element and rights detection @@ -67,8 +68,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) print ''; - if (! empty($conf->browser->phone)) print '
    '; + if (! empty($conf->browser->phone)) print '
    '; else print '
    '; // Convert date into timestamp format - if (in_array($extrafields->attribute_type [$key], array('date','datetime'))) { - $value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]); + if (in_array($extrafields->attribute_type[$key], array('date','datetime'))) { + $value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $db->jdate($object->array_options['options_' . $key]); } //TODO Improve element and rights detection @@ -77,7 +78,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) print '
    '; print ''; print ''; - print ''; + print ''; print ''; print $extrafields->showInputField($key, $value); diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index 58a1bf3e931..b846d158227 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.class.php @@ -22,8 +22,7 @@ */ /** - * \class Import - * \brief Class to manage imports + * Class to manage imports */ class Import { @@ -313,10 +312,12 @@ class Import { if (! $notrigger) { + /* Not used. This is not a business object. To convert it we must herit from CommonObject // Call trigger $result=$this->call_trigger('IMPORT_DELETE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers + */ } } From 09a094104cc8199b825a3e6a7acb1fd70d78c267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 25 Dec 2014 18:31:24 +0100 Subject: [PATCH 151/172] Removed duplicated and unused translation key --- htdocs/langs/en_US/projects.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 8d5d7c26a53..74204a176e4 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -11,7 +11,6 @@ ProjectsDesc=This view presents all projects (your user permissions grant you pe MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). -Myprojects=My projects ProjectsArea=Projects area NewProject=New project AddProject=Create project From 146bba90e73f2ebbf92417d8b341a0f7d6bb252a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 25 Dec 2014 18:42:26 +0100 Subject: [PATCH 152/172] Fix: [ bug #1724 ] Can't add a submenu to projects --- ChangeLog | 1 + htdocs/core/menus/init_menu_auguria.sql | 2 +- htdocs/core/menus/standard/eldy.lib.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b5447aed23..e6509e65d99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,6 +149,7 @@ For developers: - Qual: Renamed all files & links "fiche.php" into "card.php". - Qual: Replace all constants COMPTA_* by ACCOUNTING_*. - Qual: Replace all constants ACCOUNTINGEX_* by ACCOUNTING_* to simplify migration of the module +- Fix: [ bug #1724 ] Can't add a submenu to projects WARNING: Following changes may create regression for some external modules, but was necessary to make Dolibarr better: diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 06a187fd7de..7acce783e39 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -232,7 +232,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3602__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3610__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects&mode=mine', 'MyProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3610__+MAX_llx_menu__, 'project', 'myprojects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects&mode=mine', 'MyProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3611__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&action=create&mode=mine', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3612__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects&mode=mine', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 781de5f2913..74d6b95df73 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1132,12 +1132,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("projects"); // Project affected to user - $newmenu->add("/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects'); + $newmenu->add("/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire, '', $mainmenu, 'myprojects'); $newmenu->add("/projet/card.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); $newmenu->add("/projet/list.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); // All project i have permission on - $newmenu->add("/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire && $user->rights->projet->lire); + $newmenu->add("/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire && $user->rights->projet->lire, '', $mainmenu, 'projects'); $newmenu->add("/projet/card.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer && $user->rights->projet->creer); $newmenu->add("/projet/list.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire); From f735aa676e30b5f07e01c63f6387827ad4a579fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 25 Dec 2014 19:16:25 +0100 Subject: [PATCH 153/172] Fix: [ bug #1674 ] PayPal logo copyright issues --- htdocs/paypal/admin/paypal.php | 2 +- htdocs/paypal/img/object_paypal.png | Bin 1055 -> 4438 bytes htdocs/paypal/img/paypal.png | Bin 1684 -> 0 bytes htdocs/paypal/img/paypal_logo.png | Bin 1159 -> 0 bytes 4 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 htdocs/paypal/img/paypal.png delete mode 100644 htdocs/paypal/img/paypal_logo.png diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index 69b0664eb9d..e3dff71b721 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -93,7 +93,7 @@ llxHeader('',$langs->trans("PaypalSetup")); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre(' - '.$langs->trans("ModuleSetup"),$linkback,'paypal_logo@paypal'); +print_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback); print '
    '; $head=paypaladmin_prepare_head(); diff --git a/htdocs/paypal/img/object_paypal.png b/htdocs/paypal/img/object_paypal.png index 4ff3c80565df25279d900d6cee4d29676f0676d5..6b1f28eb73ea2cee17cdabbfd316134f42dec56b 100644 GIT binary patch literal 4438 zcmbtY3s@6Z77n7KxKbZjwBqL&T~TW?c@fN*46gvjHJAccR;@ZrhGZm@8E1w!wN%~u zet^Y_FSOPc7ORUEtHt8uQ}L~+D;24t+jUvns`buuK6f6cV5z;d1Rf zmLsuq!<|Oj?C1#&XGw-9X*(p?#nR|ZUMCg{j@&=4I4Q78s+SaIaX7Yr1G zJ3^nSaUU2s4=vC(8WBCgl39c~o~0?rsWBMK5kdxa;7oM5xpeG2u#;Tpp*?#KtM()%sYuew-#;789<8J3wD44wq#!jb{oOby+sI zTORj1%O22n%UZa@Rvp#vEJ{}%44rOA)45ZpT@R>-QK}tFF0q#AAQ>Uxcsx(}cj?0uXOew=P@-#W7iZH8*aAkxBm#byC*_9Fj z;$@~Sifq!%TmMZ)US0Px0`kCOI8T^Sg-ouJ$W#)ACPl776cOMhRmwFISp*_;<+xqh z%Svop9+N?8voV%HplG3QKn9@zk_gP4J92nV^!N@<1%XD|`0azY+UBVa%a>nG*mXs1)CYM8M zwN$POSF7b?A&>=y(0OEP3CKdY8f2lZlZf3u|IZ%wik;4SSX+O6Ey1=c{wEF2rTxD( zH2`LiSeC$enoXf;&|sVyHCbt%=BzXW#U`tvQAP|W?Sf!57zP}a-_BP$F_3stcc)y} zhHWP$C)R_UJ0-OCqjGVgN6YbU2puBow3&z@C$^pPJ4DoJyAZ?fQ-_7}@i_KZ7r<=P zE^rsOTjahfgdN-u)_D;ecgsl>?wja!LrpAgVF``{ofoy!E~@g7d8x;cJjW0$L*@`R zROw>JSA<@GHs*9NK8L!<&`aut@ggu^Eb8JeZxY23S2OZ#Fm9oz8yvA=c1tE;ArJZ# zMhf8&VlWHrAqH9TsjdZLiZ+w!q%WFOX`~8`(oK^dsvdDT2QtJtASTjg!i4cw6vk;g z55^A12GYPl4Tj~K2rbWaN<5Zz7IcmpS=2LwVVYhV9 zcL}`#lUWjE4HM>mq0$`oJ!KyHUW|plhOiuinVB=Q zJHutwWYnmK@49jR%m(^)zOrT^$~K=E4A=kAx?x)Qm*}0NZ&Idx`{$pnzIUXt1eTUX z=7(=pCEvNex?1;sYnS~kHWGO7UhpKU41Y!=J8+ef3yE^-=KZ{{q}04VNq}I z*fTdFPXT?g4<4c$-!RPdvcI+UQFFq>mrb{$?jA<+9uQe{!DA6LecghI_u-S}>IKZR z1ucEwJMoVPn?K(ccD-um9}6b4E!|Jd$>u-OEwxV{cvv*zvG~1)?`}u^`cu6%BC6N< zZ|BY3{%%W`f!7RnyXCFIO~1Q^9_dkfy#B!P)_F0NC$o!6|MKlmeBhyziDwU;%K2zz z%a-Mz-&|N3u-MditL2TzFRQjq=p)-X>e#{H!UuogCh?8S9xgCluBMhB{pHHqrd7xH zBm@UZQmyR6w5B;%wAIz?$0VN$&U<^p#)cn~Pqui6;qc?0{kJV-2aS55o0wH>7%^z*lbe;R zh(Z1-V@l2>;RS1p2VDN4WoTK?Us|!ckGF{8OTvowmS$9hmL?SU-ZFL9%kp!Z4gP%w zoN5hf{QW2WmxYcsvRA9tNN#2ornbgE;x7D{5pg*nY-ZPY*EQ(7Z=JO=8}E$`-%TPdP;GxfwKpv zTs|YO)jVGE?EaJKMVVdD#-(-7-*5i8oUipO?iP7V6?r5`H?e-?tX(&DwFc)8RLDh5 zVV_Y4&4K#Rb(5jW<7`a-kU3)iyS=`7daZicJiL1A;>A4iq9Vllv|)5@$;ya|TK}+B zhtC~2MP1cEtql=(ex82%bk(9^Yn}wnt9|$=b8ku5n>91?&VCj5aUm7kaQFLTjTfic zROWvE535gy4E^v{dT~bIxic=Dx|qAUHyMaiFJAbs?=z)!c5;*OMTy7|m#E(vGkgBO E0AB_H&j0`b literal 1055 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD!lvNA9*GX(gAxB|r)7?~NFSs0kvS%83* zm4%g!fsKcSlaGO0oQ+4AonM@RN0LEImq${STi!%M#gIYSLsZ8}#xhjiK90dCl@W-H z)0lwBB#qf5jm0#b)hvSzh|DuMEV4MQvbe0Wd8~8z?DEvDe6`ISg&Ycm91DaU3&dQC zBwULn-AbfAN@YFE*u!UA_P6+I<(c9KN*e z#I5ZoZ|^#Bb@!=T`%d53f9A%)^LLJ1xO42{-4jns?yu!yrP000>X1^@s6#OZ}&0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&Hc3Q5RCwBqR%vV-RS=%teY@-R700gY zm?n19Bqa%Lm6l$lKvhc1Srzz!03jhH1PCPlA^Haigg`=-I0OO-ajOy%DrW=;DnL*{ z15wihNUAn8hvOW!<6~{F_g?00nqs#Fb)+YI*YCZV`R4m(%zXCq30N}1v9M68`k#IC ziv#27+)iK_9WG@KfJfw6N#y530qv08aoAh3Qmg`|BTl|J|8XwxgmN zP^xMO1_LZlSfGohXFE2`WQ%?DK!e#fFqZ8Q!s#604BQA{nBacao5({UFRyt1t$`PQ z8=Z!#YT{K45Z$uf-#NUvRIaVa7Rz03gmn%=L0|s5^<59QUlBf*mla;A8BNof{N9tN zryo~!vkBO`%n|ajRHlD!p|T^=6f9z3#|WGYhGSTm%azvE6fNjNuw;e>8?H>ezkNg3 zCzYCtJ{<^RF;^#-|K7baKK$XpuLr?l+&V46DA%->v8maXzfz?aq9N%X)+2I2mro)v zp3dF?=Q69K9JIxn59tVxKo(;P`n}NE8iT&oiJyFasQ^yh8Fb>97BLNDwv5C$`18m< z7E=ehN)-(zXY(5yQpczzNi21@xBL-q@Wf5(PA1dYzGq(l^xN~|TM}b^Fy|bEn*Hflp1k+YtZeoVj!r+qAWAEi1%_A+(<_!0 zX?CHs<{}Zg+{SkTe_qw@r>D_OJKXx342pntluW9>$ zcqJYt(hF;I#cD?bv+CH=&`RicEH3@zc;bY^fuS{BZToli_Z`eD)*WwuHT(_=G;EkQ z+`6^v)y+MvM+h3E<_lXuH{7<+V7lq}0@54?Qe}X#b=|6pBFRTWfr)4+Fx=V_`7s&^ zkI9<7>DN>9U!}68TV1|j5L~|Q_ zV^}smsj7BZxSu8}34D3os>t&|`b@cVzPA)eS{QC&_r^xLmWNr>3$G;${{Hnj8&EBRF#$>|Z82 zk#T6vTwx#es0*bUmeMnwJuFJ#ei3+ zT)!^4+vnkjlCcnAVNtv#Xu|fQAaw;~TUpVNXg2c1xrjStVs>FOT=<^jptCJ@Xs%GX z(?E5{n*E2n6Oo}R4k8sPPw~g`0u*l(7wfX_zXvIMdUAf-g-~I{x%l!h4mx=!?FR9% z|925}62R$6htU7rcWEc4?F3wXP*GvjU|X22zMbne+fbxo`B#~rk9UQj-&>6!+D<6cJ zg)#th8BW^b%b>S2Nm+s&{B*FQsJ+;pHIG2bsEyK|YgWJ5*Aa7}syF)QV{pWVR941Y e{@=+z0t^7d5b}>|q?B?10000^@RCwCFmS=2@Q5eV1``+8?txIbZ z(TY&JYQ(M)#E$)e=m$a~))yg02q6(MVz2ljcEpOr3?i{b8`R!S)F^e)O4Yc-|7ri1 zr>~0EdXiu6x$k?{2&CLf`j0d`BMo7ja|N?iA-v5jAdi@ z;9xxMMtuS5djSrCXJy=dBuE0MK_-X>Ic_yU#*;w@Dzm6C2lN7K!P!4D(6&wRL!R+J ze`MSV^=Z=zBwb8^Q5X?pz7X1`WVxa33_4v)gJ?B51|23-~y>20eRNz5jiI z=logsO)%G2)7Y-|N}m|^3B-Y+jGC^c+_eRb6S)f>f+HYJd$28t;)ngyT5^4)eYiJn+a1LZ6d!WrCC z^u=?&q|F&{QJr0+0HkxA6AsI;wBfIW$!_L_aFPZZdUOm}R>Cb7(6B~e0-wn(p5u59 zm}Y_jV|gkJu)HyCOfVGIw+G~rqcl+DBS>X>I7Mp2Sg;wiJsOYXJGGQaKKsgq;32MD~ z=^mKLcMZXK8Yj-_&fjFtze*<*D=Z?lK@*OndGnI=_0-&ztWYB78S~9RWflp!tj9d; zM_y2P{Q^+lghFqva-Qi{w70VHe`&^d9(pjK@g`0=#pq_05ow!hLtqYB7&iv@hyy^{V@uo$d zvjBadk%s%M{}w)$z0Qt}lYW?@^zEaLmh?mljZ37yfegL=)VG@JBwufVa3#*>{~tV< zpsJ9>_EO%WQ--q=iYx>t_`j7Z&pwVNR9k~O;T8|?&9=R<`L;JkJei^j+6soeQwFnT zh%928@~C2XhpnYG|7R%u#SHAh&@(I`_kPlAvekGM=QdG!c7q2tY_wV=$Bq_y&$6ni z3l*>5{E5DoYPEL?3gNY1(Hh_SS*gIKIxSGpfec3{`Y|19>w=N_`8<{ZC{Ds73y2mX1V{B)Z!() zRF@P`-ZL~he1Q32p7g)S#%*C_RSD6u=!@t6*{Y?5O1ZXJqc7D0wgG3u)goatONIP$ z{Vn<%`kWu#fiivmn!hje_*HKhnt9(W%Jmg>*Z(N)f3T Date: Thu, 25 Dec 2014 19:17:52 +0100 Subject: [PATCH 154/172] Resized PayPal logo --- htdocs/paypal/img/object_paypal.png | Bin 4438 -> 4120 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/htdocs/paypal/img/object_paypal.png b/htdocs/paypal/img/object_paypal.png index 6b1f28eb73ea2cee17cdabbfd316134f42dec56b..74ac4392ded01a9a13c00027dcef80a6142c39ba 100644 GIT binary patch delta 744 zcmVz@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhP zJOBUy32;bRa{vGf6951U69E94oEQKA4Lxa8SaeuTOgdw+J3bA60!2wgK~yLeRZ&f7 z6G0e#Gdr_MlTAZXMB+~?)kbMW@FE5A50Aa*LA(?_35wvUS8-1wBG!v|^&m*T2yz~UYhZVq=4D$I0-=KJB6sqtAa8p3U0L#}eA>g(39h#89tspbKu|_^1j6dz4rCuB1M5yzsngv(Nmfk@|o&D9cSZ_LMWWW4k-D2}fa8Wgg? zAWxB;v74~3)k6@pvAbI}>*eR+-HBUPV?0rN$uUH1wH@^^G-zE)2=*7We$v;ad$Rg{ zC2TZ*;N9a53xe;<7^uAbX*81d={0gZQ8|&&NlBewdZqXDW{IC?uYAt(0mw!cOLe;S zSre_@meqx645bzzwF2=yiM1Hk|L a|JQHlz}o!ZyQowE0000BsjDj zkdP{Ygan65a6oO55C`Bwkx-AhA}-uOTzWt%P>CCtqL!Zum7=Jng&@+TKP~}7V#oHr z$INqfyKB2PBd_1j%$slKdo#O)K62p58!yr1{F_=etv-M1#1?H(xVeJOweP~(l`k%z zKYKNyG*jx{khML1`~rf94??y2sndJJF31LSyRNGj7ghDkQ%M6Sx!9fuI$zvH4hOIM zsr#HTTdq&j&%A48teRT=d@-`>rNDcLod;9UDzf>XqXxn{Xma6gU~D2f)C1s*6lP($ zE{7l4bVh$e1)I}=N6xrG(e)>HM~8bjP}%ZcLig41y1Bs-4!9EmwmB{*Kr5`XaYuSG zAg8!59X&hOAyEGlX#DlyNA&;P=0NVjI(qVDc5i(503chKgG%r($*4AiaQcJj5nagV z@}8!nC*HAMS$t1&=myAYcXWn5if&sN!2l%pB3*yi*ycd??9pg9Knu^kesQH%=mHqq zNp5au8i1V);y%I%na0t)#{7OltI2nfnXtX=bPB-9PR+o|c!rMXpp2&BgsTULP}<_? z4?nH3qeu`it|-O76oB$eb4+yFi}Zs~)U|Dl#PQaa+>geyM-&b%SZH$eV%%!hJhio& zDpP;T6nZO2oY(6ekR*!5u?4=y?#DEqJOn&C+i@<%;ADWCS1<3Mn!A$%fLGj`svv0` zi~kNjp)nFLh^$G$_X!iDgmM`u@;yp+l1U^PANb*`k7XGHR4SFsQe%9Uk`>hC=pUa6 z@%&-Ol%N1cl_!z5nQN&WnMaZhpjWT|sLp?$NdpiS%KQ%6C6^P694t+8*|C!?;dX#n z{6_V2(CceA)CVVC1Xh^WLoI&XMsc0{MR???OV&sv4K(s`Z@X$oU){{91+ W5LNtOQ{4Cf0000 Date: Thu, 25 Dec 2014 21:47:39 +0100 Subject: [PATCH 155/172] Fixed bug which didn't show documents in auto GED when an object had '/' in its ref --- htdocs/comm/propal/class/propal.class.php | 5 +++ htdocs/commande/class/commande.class.php | 5 +++ htdocs/compta/facture/class/facture.class.php | 6 +++- .../sociales/class/chargesociales.class.php | 5 +++ htdocs/contrat/class/contrat.class.php | 5 +++ htdocs/core/class/commonobject.class.php | 32 +++++++++++++++++++ htdocs/core/class/html.formfile.class.php | 15 +++++++-- htdocs/fichinter/class/fichinter.class.php | 5 +++ .../class/fournisseur.commande.class.php | 5 +++ .../fourn/class/fournisseur.facture.class.php | 5 +++ htdocs/product/class/product.class.php | 5 +++ htdocs/projet/class/project.class.php | 5 +++ 12 files changed, 95 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index be22043e4b5..589afedd00c 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -47,6 +47,11 @@ class Propal extends CommonObject public $fk_element='fk_propal'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + /** + * {@inheritdoc} + */ + protected $table_ref_field = 'ref'; + var $id; var $socid; // Id client diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 49ba2536bfa..06f381a41a9 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -44,6 +44,11 @@ class Commande extends CommonOrder public $fk_element = 'fk_commande'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + /** + * {@inheritdoc} + */ + protected $table_ref_field = 'ref'; + var $id; var $socid; // Id client diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 632381c8541..f81fb37849f 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -50,6 +50,11 @@ class Facture extends CommonInvoice public $fk_element = 'fk_facture'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + /** + * {@inheritdoc} + */ + protected $table_ref_field = 'facnumber'; + var $id; //! Id client var $socid; @@ -833,7 +838,6 @@ class Facture extends CommonInvoice return $result; } - /** * Get object and lines from database * diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index fb8bc162c83..1d684c65552 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -34,6 +34,11 @@ class ChargeSociales extends CommonObject public $table='chargesociales'; public $table_element='chargesociales'; + /** + * {@inheritdoc} + */ + protected $table_ref_field = 'ref'; + var $id; var $ref; var $date_ech; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index ae384195162..5265f7025c5 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -44,6 +44,11 @@ class Contrat extends CommonObject public $fk_element='fk_contrat'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + /** + * {@inheritdoc} + */ + protected $table_ref_field = 'ref'; + var $id; var $ref; var $ref_ext; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 54c7b9d860d..9fb4841c0a9 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -54,6 +54,12 @@ abstract class CommonObject // No constructor as it is an abstract class + /** + * Column name of the ref field. + * @var string + */ + protected $table_ref_field = ''; + /** * Check an object id/ref exists @@ -631,6 +637,32 @@ abstract class CommonObject } + /** + * Looks for an object with ref matching the wildcard provided + * It does only work when $this->table_ref_field is set + * + * @param string $ref Wildcard + * @return int >1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO + */ + public function fetchOneLike($ref) + { + if (!$this->table_ref_field) { + return 0; + } + + $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1'; + + $query = $this->db->query($sql); + + if (!$this->db->num_rows($query)) { + return 0; + } + + $result = $this->db->fetch_object($query); + + return $this->fetch($result->rowid); + } + /** * Load data for barcode into properties ->barcode_type* * Properties ->barcode_type that is id of barcode. Type is used to find other properties, but diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 1ef5045c845..34f6418de34 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -997,7 +997,6 @@ class FormFile if ($modulepart == 'user') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:'');} if (! $id && ! $ref) continue; - $found=0; if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) { @@ -1006,7 +1005,19 @@ class FormFile else { //print 'Fetch '.$id." - ".$ref.'
    '; - $result=$object_instance->fetch($id,$ref); + + if ($id) { + $result = $object_instance->fetch($id); + } else { + //fetchOneLike looks for objects with wildcards in its reference. + //It is useful for those masks who get underscores instead of their actual symbols + //fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned + //that's why we look only look fetchOneLike when fetch returns 0 + if (!$result = $object_instance->fetch('', $ref)) { + $result = $object_instance->fetchOneLike($ref); + } + } + if ($result > 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]=dol_clone($object_instance); } // Save object into a cache if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); } } diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 28ef737de13..4ab0cfdb96b 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -37,6 +37,11 @@ class Fichinter extends CommonObject public $fk_element='fk_fichinter'; public $table_element_line='fichinterdet'; + /** + * {@inheritdoc} + */ + protected $table_ref_field = 'ref'; + var $id; var $socid; // Id client diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 7593dcf9903..4fe4675f5d8 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -45,6 +45,11 @@ class CommandeFournisseur extends CommonOrder public $fk_element = 'fk_commande'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + /** + * {@inheritdoc} + */ + protected $table_ref_field = 'ref'; + var $id; var $ref; // TODO deprecated diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 95da7550db7..d9a4469481f 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -43,6 +43,11 @@ class FactureFournisseur extends CommonInvoice public $fk_element='fk_facture_fourn'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + /** + * {@inheritdoc} + */ + protected $table_ref_field = 'ref'; + var $rowid; var $ref; var $product_ref; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 390f250f5d9..ba179aef616 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -46,6 +46,11 @@ class Product extends CommonObject protected $isnolinkedbythird = 1; // No field fk_soc protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + /** + * {@inheritdoc} + */ + protected $table_ref_field = 'ref'; + var $regeximgext='\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff'; //! Identifiant unique diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 41ae40a259d..f762b10d2ca 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -38,6 +38,11 @@ class Project extends CommonObject public $fk_element = 'fk_projet'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + /** + * {@inheritdoc} + */ + protected $table_ref_field = 'ref'; + var $id; var $ref; var $description; From ca133d74acd8ccc25bd23bf25e143321e9f0d5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 25 Dec 2014 22:20:09 +0100 Subject: [PATCH 156/172] Corrected key not translated --- htdocs/ecm/index_auto.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index 7d0fc5c64bf..7626774b24c 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -409,7 +409,7 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED)) if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); } if (! empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBySocialContributions")); } if (! empty($conf->projet->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); } - if (! empty($conf->ficheinter->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsByInterventions")); } + if (! empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsByInterventions")); } $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsByUsers")); } From c870f0e3db09eda2ae2cdda07d8f473181e22885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 25 Dec 2014 22:30:47 +0100 Subject: [PATCH 157/172] Updated changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 7b5447aed23..3f752e4db68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ For users: - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe. - Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown - Fix: datepicker first day of week can be monday by setting into display setup +- Fix: [ bug #575 ] GED doesn't works if there is "/" in a mask For users, new experimental module (need to set feature level of instance to experimental to see them): - New: Module Accounting Expert to manage accountancy From 7b6a4d1bfd923dfca6c8a62ea46a9bbda0196cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 25 Dec 2014 22:50:15 +0100 Subject: [PATCH 158/172] Fix: [ bug #1715 ] Valign and width attributes are used in div tags --- htdocs/core/class/html.form.class.php | 16 ++++++++++++++-- htdocs/core/lib/agenda.lib.php | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 61d1c08f2aa..e61f1af9617 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -400,14 +400,26 @@ class Form else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; - if ($direction < 0) $s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.''; + if ($direction < 0) { + $s.='<'.$tag.$paramfortooltipimg; + if ($tag == 'td') { + $s .= 'valign="top" '; + } + $s.= 'width="14">'.$img.''; + } // Use another method to help avoid having a space in value in order to use this value with jquery // TODO add this in css //if ($text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.(($direction < 0)?' ':'').$text.(($direction > 0)?' ':'').''; $paramfortooltiptd.= (($direction < 0)?' style="padding-left: 3px !important;"':''); $paramfortooltiptd.= (($direction > 0)?' style="padding-right: 3px !important;"':''); if ((string) $text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.$text.''; - if ($direction > 0) $s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.''; + if ($direction > 0) { + $s.='<'.$tag.$paramfortooltipimg; + if ($tag == 'td') { + $s .= 'valign="top" '; + } + $s.= 'width="14">'.$img.''; + } if (empty($notabs)) $s.='
    '; return $s; diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index 3d51490f6b2..23a17534ccf 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -149,7 +149,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh if (! empty($conf->browser->phone)) print ''; else print '
    		'; print '\n"; From e7ebb78ffde0ea3bd64b3ee4d6cd2b79d891e0fc Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 26 Dec 2014 11:09:46 +0100 Subject: [PATCH 170/172] in PDF, no line jump after doc linked ref. Fix bug 1605. --- htdocs/core/lib/pdf.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index c8fb09a6195..129d32fc7d9 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -900,7 +900,7 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al if (! empty($linkedobject["date_title"]) && ! empty($linkedobject["date_value"])) { - $posy+=7; + $posy+=3; $pdf->SetXY($posx,$posy); $pdf->MultiCell($w, $h, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', $align); } From 5d80061caf2031d34ef027a63357ca22666177c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 26 Dec 2014 22:04:16 +0100 Subject: [PATCH 171/172] Mark property error as deprecated --- htdocs/core/class/commonobject.class.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 18927b9df51..0dedb135298 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -35,8 +35,18 @@ abstract class CommonObject { public $db; + + /** + * @var error Error string + * @deprecated Use instead the array of error strings + */ public $error; + + /** + * @var errors Aray of error string + */ public $errors; + public $canvas; // Contains canvas name if it is public $name; From 613d1b381b2f4fc4ad0482bb278059ceb9d29814 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 27 Dec 2014 01:10:42 +0100 Subject: [PATCH 172/172] Doxygen --- htdocs/contrat/class/contrat.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 5265f7025c5..fac549515fc 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -59,11 +59,11 @@ class Contrat extends CommonObject var $product; var $user_author; - var $date_creation; - var $date_validation; + var $date_creation; // date of creation + var $date_validation; // date of last update - var $date_contrat; - var $date_cloture; + var $date_contrat; // date when contract was signed + var $date_cloture; // deprecated (we close contract lines, not a contract) var $commercial_signature_id; var $commercial_suivi_id;
    '; From eb524cfd29a38d50dbb0c09ce579a18e9d320670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 25 Dec 2014 22:50:33 +0100 Subject: [PATCH 159/172] Copyright info --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e61f1af9617..e90dbdd203d 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -12,7 +12,7 @@ * Copyright (C) 2010 Juanjo Menent * Copyright (C) 2010-2014 Philippe Grand * Copyright (C) 2011 Herve Prot - * Copyright (C) 2012 Marcos García + * Copyright (C) 2012-2014 Marcos García * Copyright (C) 2013 Raphaël Doursenaud * Copyright (C) 2014 Alexandre Spangaro * From 2616deb58d5d2e94235dee46292c9bf6b15eabf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 25 Dec 2014 22:52:11 +0100 Subject: [PATCH 160/172] Copyright info --- htdocs/core/class/commonobject.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 9fb4841c0a9..d0e4e086640 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -6,7 +6,7 @@ * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2011-2014 Philippe Grand - * Copyright (C) 2012 Marcos García + * Copyright (C) 2012-2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From 5ec38d89ffd75482a23ede368a2645b1fde6792a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 25 Dec 2014 22:59:57 +0100 Subject: [PATCH 161/172] Fixed [ bug #1763 ] Undefined variable $interface in Project:574 --- htdocs/projet/class/project.class.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 41ae40a259d..fb98bec1c46 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -568,16 +568,9 @@ class Project extends CommonObject { // Call trigger $result=$this->call_trigger('PROJECT_DELETE',$user); - if ($result < 0) - { + + if ($result < 0) { $error++; - if (! empty($interface->errors)) - { - foreach ($interface->errors as $errmsg ) { - dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR); - $this->errors[] =$errmsg; - } - } } // End call triggers } From aec1bdb3c4bf2608963ca28fd3a771fd043135f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 25 Dec 2014 23:08:07 +0100 Subject: [PATCH 162/172] Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice --- htdocs/comm/propal.php | 5 +---- htdocs/commande/card.php | 4 ++-- htdocs/compta/facture.php | 6 +++--- htdocs/expedition/card.php | 4 +--- htdocs/fourn/commande/card.php | 12 +++--------- htdocs/fourn/facture/card.php | 8 ++------ htdocs/livraison/card.php | 4 +--- 7 files changed, 13 insertions(+), 30 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 5d20743d029..3744a9e4bab 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -189,8 +189,8 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { $tmp=getListOfModels($db, 'propal'); $keys=array_keys($tmp); $model=$keys[0]; } $ret = $object->fetch($id); // Reload to get new records + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } } @@ -499,9 +499,6 @@ else if ($action == 'add' && $user->rights->propal->creer) $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { - $tmp=getListOfModels($db, 'propal'); $keys=array_keys($tmp); $model=$keys[0]; - } $ret = $object->fetch($id); // Reload to get new records $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 1291d6cce26..62577387bbd 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -922,8 +922,8 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->co $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { $tmp=getListOfModels($db, 'order'); $keys=array_keys($tmp); $model=$keys[0]; } $ret = $object->fetch($id); // Reload to get new records + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } } @@ -971,8 +971,8 @@ else if ($action == 'confirm_modif' && $user->rights->commande->creer) { $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { $tmp=getListOfModels($db, 'order'); $keys=array_keys($tmp); $model=$keys[0]; } $ret = $object->fetch($id); // Reload to get new records + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 4f8eb73a8db..000b1f7de90 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -417,8 +417,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; } $ret = $object->fetch($id); // Reload to get new records + $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db,$result); } @@ -500,8 +500,8 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_ $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; } $ret = $object->fetch($id); // Reload to get new records + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } } @@ -1328,8 +1328,8 @@ else if ($action == 'addline' && $user->rights->facture->creer) $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; } $ret = $object->fetch($id); // Reload to get new records + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 6ee45778d18..423d1565f8c 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -279,10 +279,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { - $tmp=getListOfModels($db, 'shipping'); $keys=array_keys($tmp); $model=$keys[0]; - } $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db,$result); } diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 753f91fbdda..09556bd9125 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -357,10 +357,8 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer) $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { - $tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0]; - } $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db,$result); } @@ -462,10 +460,8 @@ else if ($action == 'update_line' && $user->rights->fournisseur->commande->creer $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { - $tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0]; - } $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db,$result); } @@ -526,10 +522,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fourn $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { - $tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0]; - } $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db,$result); } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 38a0f79a6ea..9542fc062e7 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -711,10 +711,8 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer) $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { - $tmp=getListOfModels($db, 'invoice_supplier'); $keys=array_keys($tmp); $model=$keys[0]; - } $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db,$result); } @@ -793,10 +791,8 @@ elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer) $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { - $tmp=getListOfModels($db, 'invoice_supplier'); $keys=array_keys($tmp); $model=$keys[0]; - } $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db,$result); } diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 2b6a74a519e..1a89a377fef 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -135,10 +135,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped $outputlangs->setDefaultLang($newlang); } $model=$object->modelpdf; - if (empty($model)) { - $tmp=getListOfModels($db, 'delivery'); $keys=array_keys($tmp); $model=$keys[0]; - } $ret = $object->fetch($id); // Reload to get new records + $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); if ($result < 0) dol_print_error($db,$result); } From f4def9ea288c0677117087f883e1625a01b1f358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Fri, 26 Dec 2014 00:07:24 +0100 Subject: [PATCH 163/172] Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers --- ChangeLog | 1 + htdocs/core/db/pgsql.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 949492346b2..48cc3247cb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.5.7 compared to 3.5.6 ***** Fix: Paypal link were broken dur to SSL v3 closed. +Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index efb9888f8b3..3af1c4bef83 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -1021,7 +1021,7 @@ class DoliDBPgsql extends DoliDB // Test charset match LC_TYPE (pgsql error otherwise) //print $charset.' '.setlocale(LC_CTYPE,'0'); exit; - $sql='CREATE DATABASE '.$database.' OWNER '.$owner.' ENCODING \''.$charset.'\''; + $sql='CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\''; dol_syslog($sql,LOG_DEBUG); $ret=$this->query($sql); return $ret; From 1d39c1acc22fdd7d2767fea7061b24b3242477d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Fri, 26 Dec 2014 00:12:16 +0100 Subject: [PATCH 164/172] Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script --- htdocs/core/db/pgsql.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index efb9888f8b3..f0f1f0333c8 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -402,7 +402,7 @@ class DoliDBPgsql extends DoliDB if ((! empty($host) && $host == "socket") && ! defined('NOLOCALSOCKETPGCONNECT')) { $con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'"; // $name may be empty - $this->db = pg_connect($con_string); + $this->db = @pg_connect($con_string); } // if local connection failed or not requested, use TCP/IP @@ -412,7 +412,7 @@ class DoliDBPgsql extends DoliDB if (! $port) $port = 5432; $con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'"; - $this->db = pg_connect($con_string); + $this->db = @pg_connect($con_string); } // now we test if at least one connect method was a success From 8e47fe9e1c0d6983fdffcab77d927c3528dda030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Fri, 26 Dec 2014 00:19:09 +0100 Subject: [PATCH 165/172] Fix: [ bug #1757 ] Sorting breaks product/service statistics --- ChangeLog | 1 + htdocs/product/popuprop.php | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 949492346b2..624f4ca15a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.5.7 compared to 3.5.6 ***** Fix: Paypal link were broken dur to SSL v3 closed. +Fix: [ bug #1757 ] Sorting breaks product/service statistics ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 5404dd1848a..b89fbc3b911 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2005 Laurent Destailleur * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -71,7 +72,9 @@ llxHeader('','',$helpurl); $sql = "SELECT count(*) as c"; $sql.= " FROM ".MAIN_DB_PREFIX."product"; $sql.= ' WHERE entity IN ('.getEntity('product', 1).')'; -if (isset($type)) $sql.= " AND fk_product_type = ".$type; +if ($type !== '') { + $sql.= " AND fk_product_type = ".$type; +} $result=$db->query($sql); if ($result) @@ -82,11 +85,14 @@ if ($result) $param = ''; $title = $langs->trans("ListProductServiceByPopularity"); -if (isset($type)) -{ +if ($type !== '') { $param = '&type='.$type; - $title = $langs->trans("ListProductByPopularity"); - if ($type == 1) $title = $langs->trans("ListServiceByPopularity"); + + if ($type == 1) { + $title = $langs->trans("ListServiceByPopularity"); + } else { + $title = $langs->trans("ListProductByPopularity"); + } } print_barre_liste($title, $page, "popuprop.php",$param,"","","",$num); @@ -106,7 +112,9 @@ $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd"; $sql.= ", ".MAIN_DB_PREFIX."product as p"; $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')'; $sql.= " AND p.rowid = pd.fk_product"; -if (isset($type)) $sql.= " AND fk_product_type = ".$type; +if ($type !== '') { + $sql.= " AND fk_product_type = ".$type; +} $sql.= " GROUP BY (p.rowid)"; $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit, $offset); From 745eece5fed0d9fbdb7bcd6a72c5efb189a3d438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Fri, 26 Dec 2014 00:34:57 +0100 Subject: [PATCH 166/172] Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL --- htdocs/install/mysql/tables/llx_usergroup_extrafields.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql index 333eb41ad08..0a89810dce5 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql @@ -21,6 +21,6 @@ CREATE TABLE IF NOT EXISTS llx_usergroup_extrafields ( tms timestamp, fk_object integer NOT NULL, import_key varchar(14) -- import key -) ENGINE=InnoDB ; +)ENGINE=innodb; From 420ebe0be914511eb6d303581a18f5cdf233a47b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 26 Dec 2014 04:04:16 +0100 Subject: [PATCH 167/172] Fix: Change order to create fields --- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 2281793929f..0b71a2fe6fe 100755 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -220,8 +220,8 @@ create table llx_accounting_fiscalyear fk_user_modif integer NULL )ENGINE=innodb; -ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref; -ALTER TABLE llx_contrat ADD COLUMN ref_supplier varchar(30) after ref_ext; +ALTER TABLE llx_contrat ADD COLUMN ref_supplier varchar(30) after ref; +ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref_supplier; ALTER TABLE llx_propal ADD COLUMN fk_shipping_method integer AFTER date_livraison; ALTER TABLE llx_commande ADD COLUMN fk_shipping_method integer AFTER date_livraison; From d8557d8af0dcb5bda7310fe6a6d507936dd33636 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 26 Dec 2014 05:16:00 +0100 Subject: [PATCH 168/172] Fixed: label --- htdocs/core/class/html.form.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 0152c34db7d..09e3404837d 100755 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1197,7 +1197,7 @@ class Form else $sql.= " WHERE u.entity IS NOT NULL"; } else - { + { if (! empty($conf->multicompany->transverse_mode)) { $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug"; @@ -1291,7 +1291,7 @@ class Form } else { - $out.=($moreinfo?' - ':' (').$obj->label; + $out.=($moreinfo?' - ':' (').($obj->label?$obj->label:$langs->trans("EntityNameNotDefined")); $moreinfo++; } } From a901329a7d7a5c46023017bbcf177cdcf687ab84 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 26 Dec 2014 09:29:27 +0100 Subject: [PATCH 169/172] Fix: Bad order field value --- htdocs/product/stats/facture.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 39768262f10..49e5651b065 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -2,6 +2,7 @@ /* Copyright (C) 2003-2007 Rodolphe Quiedeville * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2014 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -155,7 +156,7 @@ if ($id > 0 || ! empty($ref)) print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&id=".$product->id,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&id=".$product->id,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&id=".$product->id,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total_ht","","&id=".$product->id,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&id=".$product->id,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&id=".$product->id,'align="right"',$sortfield,$sortorder); print "