diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000000..143f0739505 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +# EditorConfig is awesome: http://EditorConfig.org + +# top-most EditorConfig file +root = true +# Unix-style newlines with a newline ending every file +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +[*.php] +indent_style = space +indent_size = 4 +[*.js] +indent_style = space +indent_size = 2 +[*.css] +indent_style = space +indent_size = 2 +[*.xml] +indent_style = space +indent_size = 4 diff --git a/.gitignore b/.gitignore index 9b639ce64a6..20c87aa1e42 100755 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ htdocs/conf/conf.php htdocs/conf/conf.php.old documents/ -custom/ custom2/ test/report/ nbproject diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 73b43e95f4b..0ca95ace51d 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -5,12 +5,13 @@ imports: filter: excluded_paths: - - 'build/*' - - 'dev/*' - - 'doc/*' - - 'test/*' - - 'htdocs/includes/*' - paths: { } + - build/* + - dev/* + - doc/* + - test/* + paths: + - htdocs/* + - scripts/* tools: # php_analyzer. Doc on https://scrutinizer-ci.com/docs/tools/php/php-analyzer/ @@ -18,15 +19,18 @@ tools: enabled: true extensions: - php - dependency_paths: { } + dependency_paths: + - htdocs/includes/ filter: excluded_paths: - - 'build/*' - - 'dev/*' - - 'doc/*' - - 'test/*' - - 'htdocs/includes/*' - paths: { } + - build/* + - dev/* + - doc/* + - test/* + - htdocs/includes/* + paths: + - htdocs/ + - scripts/ config: parameter_reference_check: enabled: true @@ -180,8 +184,38 @@ tools: - 'htdocs/includes/*' paths: { } + php_changetracking: + enabled: false + bug_patterns: + - '\bfix(?:es|ed)?\b' + feature_patterns: + - '\badd(?:s|ed)?\b' + - '\bimplement(?:s|ed)?\b' + filter: + excluded_paths: + - 'build/*' + - 'dev/*' + - 'doc/*' + - 'test/*' + - 'htdocs/includes/*' + paths: { } + # Coding-Style / Bug Detection - js_hint: false + js_hint: + enabled: false + use_native_config: true + extensions: + - js + filter: + excluded_paths: + - 'build/*' + - 'dev/*' + - 'doc/*' + - 'test/*' + - 'htdocs/includes/*' + paths: { } + config: { } + path_configs: { } before_commands: { } diff --git a/.travis.yml b/.travis.yml index 57781d47e44..98ebd9ceea3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,13 @@ before_script: # - echo Update composer # - ~/.phpenv/versions/$(phpenv version-name)/bin/composer.phar self-update - echo PHPUnit version + - which phpunit - phpunit --version - echo Install phpcs then show installed rules - pyrus install pear/PHP_CodeSniffer - phpenv rehash + - which phpcs + - phpcs --version - phpcs -i - echo Create dir $(pwd)/htdocs/documents - sudo mkdir -p $(pwd)/htdocs/documents/admin/temp; @@ -83,6 +86,8 @@ before_script: - sudo cat /etc/apache2/sites-available/default - sudo /etc/init.d/apache2 restart - wget http://localhost/ + - sudo cat /etc/apache2/envvars + - sudo cat /var/log/apache2/error.log - cat index.html @@ -97,13 +102,15 @@ script: - php upgrade.php 3.6.0 3.7.0 >> upgrade.log # - cat upgrade360370.log - php upgrade2.php 3.6.0 3.7.0 >> upgrade2.log + - php upgrade.php 3.7.0 3.8.0 >> upgrade.log + - php upgrade2.php 3.7.0 3.8.0 >> upgrade2.log # - cat upgrade2.log - cd ../.. - date - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php - date # - phpcs -p --warning-severity=0 -s --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ htdocs/core/class/dolgraph.class.php 2>&1 - - phpcs -p --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1 + - phpcs -p --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/htdocs/conf/conf.php,/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1 - date after_script: diff --git a/.tx/config b/.tx/config index c20f75769ae..e4d1fc65732 100644 --- a/.tx/config +++ b/.tx/config @@ -218,12 +218,6 @@ source_file = htdocs/langs/en_US/orders.lang source_lang = en_US type = MOZILLAPROPERTIES -[dolibarr.oscommerce] -file_filter = htdocs/langs//oscommerce.lang -source_file = htdocs/langs/en_US/oscommerce.lang -source_lang = en_US -type = MOZILLAPROPERTIES - [dolibarr.other] file_filter = htdocs/langs//other.lang source_file = htdocs/langs/en_US/other.lang @@ -242,6 +236,18 @@ source_file = htdocs/langs/en_US/paypal.lang source_lang = en_US type = MOZILLAPROPERTIES +[dolibarr.printipp] +file_filter = htdocs/langs//printipp.lang +source_file = htdocs/langs/en_US/printipp.lang +source_lang = en_US +type = MOZILLAPROPERTIES + +[dolibarr.productbatch] +file_filter = htdocs/langs//productbatch.lang +source_file = htdocs/langs/en_US/productbatch.lang +source_lang = en_US +type = MOZILLAPROPERTIES + [dolibarr.products] file_filter = htdocs/langs//products.lang source_file = htdocs/langs/en_US/products.lang @@ -260,6 +266,12 @@ source_file = htdocs/langs/en_US/propal.lang source_lang = en_US type = MOZILLAPROPERTIES +[dolibarr.resource] +file_filter = htdocs/langs//resource.lang +source_file = htdocs/langs/en_US/resource.lang +source_lang = en_US +type = MOZILLAPROPERTIES + [dolibarr.salaries] file_filter = htdocs/langs//salaries.lang source_file = htdocs/langs/en_US/salaries.lang @@ -313,4 +325,3 @@ file_filter = htdocs/langs//workflow.lang source_file = htdocs/langs/en_US/workflow.lang source_lang = en_US type = MOZILLAPROPERTIES - diff --git a/COPYRIGHT b/COPYRIGHT index fd54e10f354..2e1c6e921b9 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -26,7 +26,7 @@ TCPDF 6.0.093 LGPL-3+ Yes JS libraries: jQuery 1.8.2 MIT License Yes JS library jQuery UI 1.9.1 GPL and MIT License Yes JS library plugin UI -jQuery multiple-select 1.1.0 MIT License Yes JS library plugin for sexier multiselect +jQuery select2 3.5.2 GPL and Apache License Yes JS library plugin for sexier multiselect jQuery blockUI 2.43 GPL and MIT License Yes JS library plugin blockUI (to use ajax popups) jQuery Colorpicker 1.1 MIT License Yes JS library for color picker for a defined list of colors jQuery DataTables 1.9.4 BSD Yes JS library for tables output diff --git a/ChangeLog b/ChangeLog index 9f1ae0857a2..836f3f77594 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,8 +3,29 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 3.8 compared to 3.7.* ***** +For users: +- New: Use new combobox. +- New: Add hidden option MAXTABS_IN_CARD. +- Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined' +- Add Weighted average price as default price for buying price for margin calculation. Add option + MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace with first supplier price. +- Introduce option MAIN_HTML_TITLE to start to control format of html title content. +- Add extrafields on bank account cards. + +For translators: +- Update language files. +- New: When a translation is not available we always jump to en_US and only en_US. + +For developers: +- New: Function yn can show a visual checkbox. +- New: Introduced select2 jquery plugin. + + ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Match other auth system: Login can be done entering login or user + email (this open the road for SSO). - New: Agenda export by project #1967. - New: Increase length of thirdparty to 128 chars. - New: "Is Order shippable" icon #1975. @@ -80,8 +101,9 @@ For users: - New: Add dunning into accountancy report. - New: Add favorite button into country dictionary to put value on top select list - Upgrade phpexcel lib to 1.7.8 -- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export -- New : Option on extrafields to have them always editable regardless of the document status +- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export. +- New : Option on extrafields to have them always editable regardless of the document status. +- New : New module PrintIPP to print without opening document is available as stable. - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action - Fix: [ bug #1470, #1472, #1473] User trigger problem - Fix: [ bug #1489, #1491 ] Intervention trigger problem @@ -98,8 +120,11 @@ 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 +- 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 @@ -146,6 +171,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: @@ -160,8 +186,11 @@ Dolibarr better: creation of a pdf or odt, hook "afterPDFCreation" or "afterODTCreation" must be used instead. - A lot of pages called fiche.php were renamed into card.php - A lot of pages called liste.php were renamed into list.php +- If you used warehouse/stock module, recheck setup of stock increase/decrease rules of the + warehouse module and your Point Of Sale module if you use one. - +***** ChangeLog for 3.6.3 compared to 3.6.2 ***** +- Fix: ref_ext was not saved when recording a customer order from web service ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. @@ -172,7 +201,15 @@ Dolibarr better: - Fix: Civility & birthdate wasn't save into adherent module. - Fix: webservice Thirdparty parameter lastname for invidual creation is now lastname and not ref - Fix: Chars - is no more allowed into value for code for extra fields. -( Fix: [ bug #1622 ] Requesting holiday than spans across two years cause high CPU usage by Apache +- Fix: [ bug #1622 ] Requesting holiday than spans across two years cause high CPU usage by Apache +- Fix: [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state +- 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 +- Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify +- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks +- Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs ***** ChangeLog for 3.6.1 compared to 3.6.* ***** For users: @@ -313,8 +350,22 @@ 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. +Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers +Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H +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 +Fix: Can't update phone_pro from web service +Fix: Some security holes. +Fix: copy extrafields when creating order from proposal. +Fix: report on action was not filtering by environment. +Fix: Avoid missing class error. +Fix: Add function dolEscapeXML. +Fix: Bad days and month reported by function. +Fix: Bad margin calculation. ***** ChangeLog for 3.5.5 compared to 3.5.4 ***** Fix: Holiday module was broken. Initializaion of amount of holidays failed. diff --git a/build/debian/README.howto b/build/debian/README.howto index f9bb31c6fcf..6d5280e56c1 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -101,14 +101,38 @@ http://packages.qa.debian.org/package.html http://bugs.debian.org/package +##### Modify severity of a bug ticket + +- Send this email to control@bugs.debian.org and wait 10 minutes + +severity 123 xxx + + +##### Update but tracker system + +To set status of a bug to "pending" +> bts tag 999999 +pending + +or replay to email 999999@bugs.debian.org + submitter of bug +With a message starting with: + +Control: tag -1 +pending +Thanks. Fixed into git. + +or replay to email control@bugs.debian.org +With only message +tag 729538 +pending + + ##### Testing a package into unstable env -Check you have a mysql server available from another interface than localhost +Check you have a mysql server available from another interface than "localhost". Comment line in /etc/mysql/my.cnf if required and restart mysql #bind-address = 127.0.0.1 -Create a chroot called "unstable-amd64-sbuild" +Create a chroot called "unstable-amd64-sbuild". +Chroot env is stored into /srv/chroot directory. > sudo sbuild-createchroot --keyring= unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian Pour lister les env chroot @@ -116,6 +140,7 @@ Pour lister les env chroot Puis pour se connecter et préparer l'environnement > schroot -c name_of_chroot +> cat /etc/debian_chroot to check which debian branch we are into > vi /usr/sbin/policy-rc.d and replace return code 101 (not allowed) into 0 (ok) > apt-get install links mysql-client @@ -129,7 +154,10 @@ Pour tester un package > dpkg -i dolibarr*.deb ou pour avoir des traces: dpkg -D77777 -i dolibarr*.deb > apt-get install -f -Puis http://localhost/dolibarr/ (cela peut etre appeler depuis le hote). +If there is a problem launching apache, because port is already used, change it into your chroot install with +> vi /etc/apache2/ports.conf +Then restart. +Then you can call/test dolibarr with http://localhost:port/dolibarr/ (It can be also called from host). @@ -196,23 +224,6 @@ http://packages.qa.debian.org/t/tcpdf.html * Package will be into release when test will be moved as stable. - -##### Update but tracker system -To set status of a bug to pending -> bts tag 999999 +pending - -or replay to email 999999@bugs.debian.org + submitter of bug -With a message starting with: -Control: tag -1 +pending -and then a text like: -Thanks. Fixed into git. - -or replay to email control@bugs.debian.org -With only message -tag 729538 +pending - - - ##### Create/Maintain dolibarr package To update dolibarr debian package @@ -251,7 +262,7 @@ x.y.z+dfsgw Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit * Add an entry into debian/changelog -> dch -v x.y.z+dfsg-w "My comment" will add entry. +> dch -v x.y.z+dfsgw-v "My comment" will add entry. For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increaed for each new import) Then modify changelog to replace "version" or "unstable" with "UNRELEASED". Then check/modify also the user/date signature: diff --git a/build/debian/apache/.htaccess b/build/debian/apache/.htaccess index 8ab3fb95cd1..a59829d970b 100644 --- a/build/debian/apache/.htaccess +++ b/build/debian/apache/.htaccess @@ -1,7 +1,8 @@ +# File used to disable access into directory documents = 2.3> Require all denied -Order deny,allow -Deny from all - +Order deny, allow +Denied from all + \ No newline at end of file diff --git a/build/debian/apache/dolibarr.conf b/build/debian/apache/dolibarr.conf index ae1d7b46d8e..95eaae21190 100644 --- a/build/debian/apache/dolibarr.conf +++ b/build/debian/apache/dolibarr.conf @@ -10,12 +10,26 @@ Alias /dolibarr /usr/share/dolibarr/htdocs # DocumentRoot /usr/share/dolibarr/ # ErrorLog logs/ldap.example.com-error.log # CustomLog logs/ldap.example.com-access.log common +# +# = 2.3> +# Require all granted +# +# +# Order allow, deny +# Allow from all +# +# # # Directory for web pages - Order deny,allow - Allow from all + = 2.3> + Require all granted + + + Order allow, deny + Allow from all + DirectoryIndex index.php Options +FollowSymLinks +Indexes diff --git a/build/debian/changelog b/build/debian/changelog index d3772a76785..db3f1dc887b 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -3,81 +3,4 @@ dolibarr (3.7.0-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. - -- Laurent Destailleur (eldy) Tue, 21 Oct 2014 12:00:00 +0100 - -dolibarr (3.6.1-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * New upstream release. - - -- Laurent Destailleur (eldy) Tue, 23 Sep 2014 12:00:00 +0100 - -dolibarr (3.6.0-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * New upstream release. - - -- Laurent Destailleur (eldy) Tue, 15 July 2014 12:00:00 +0100 - -dolibarr (3.5.5-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * New upstream release. - - -- Laurent Destailleur (eldy) Tue, 8 July 2014 12:00:00 +0100 - -dolibarr (3.5.4-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * New upstream release. - - -- Laurent Destailleur (eldy) Tue, 1 July 2014 12:00:00 +0100 - -dolibarr (3.5.3-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * New upstream release. - - -- Laurent Destailleur (eldy) Fri, 2 May 2014 12:00:00 +0100 - -dolibarr (3.5.2-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * New upstream release. - - -- Laurent Destailleur (eldy) Fri, 14 March 2014 12:00:00 +0100 - -dolibarr (3.5.1-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * New upstream release. - - -- Laurent Destailleur (eldy) Fri, 7 Feb 2014 12:00:00 +0100 - -dolibarr (3.5.0-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * New upstream release. - - -- Laurent Destailleur (eldy) Fri, 31 Jan 2014 12:00:00 +0100 - -dolibarr (3.4.2-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * Maintenance release. - - -- Laurent Destailleur (eldy) Mon, 30 Dec 2013 12:00:00 +0100 - -dolibarr (3.4.1-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * Maintenance release. - - -- Laurent Destailleur (eldy) Mon, 27 Apr 2013 12:00:00 +0100 - -dolibarr (3.4.0-3) UNRELEASED; urgency=low - - [ Laurent Destailleur (eldy) ] - * Maintenance release. - - -- Laurent Destailleur (eldy) Mon, 22 Apr 2013 12:00:00 +0100 + -- Laurent Destailleur (eldy) Tue, 21 Oct 2014 12:00:00 +0100 diff --git a/build/doxygen/doxygen_footer.html b/build/doxygen/doxygen_footer.html index 1f4cbd00215..e11df270ddc 100755 --- a/build/doxygen/doxygen_footer.html +++ b/build/doxygen/doxygen_footer.html @@ -26,7 +26,7 @@ for $projectname by Doxygen $doxygenversio -
+
-
+
diff --git a/build/doxygen/doxygen_header.html b/build/doxygen/doxygen_header.html index 363d408d43c..0c2e189136b 100755 --- a/build/doxygen/doxygen_header.html +++ b/build/doxygen/doxygen_header.html @@ -24,7 +24,7 @@ File added into doxygen generated documentation
-
+
@@ -54,7 +54,7 @@ File added into doxygen generated documentation
$projectname
- $projectnumber
-
+
diff --git a/build/exe/doliwamp/.gitignore b/build/exe/doliwamp/.gitignore new file mode 100644 index 00000000000..ce74d54f78e --- /dev/null +++ b/build/exe/doliwamp/.gitignore @@ -0,0 +1 @@ +/doliwamp.tmp.iss diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 3a43f7fe656..6183bcac85c 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -16,10 +16,10 @@ [Setup] ; ----- Change this ----- AppName=DoliWamp -; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x -AppVerName=DoliWamp-3.7.0-beta -; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x -OutputBaseFilename=DoliWamp-3.7.0-beta +; Replace key with DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x +AppVerName=__FILENAMEEXEDOLIWAMP__ +; Replace key with DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x +OutputBaseFilename=__FILENAMEEXEDOLIWAMP__ ; ----- End of change ;OutputManifestFile=build\doliwampbuild.log ; Define full path from which all relative path are defined diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 370c04591a9..45e3bb621ce 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \author (c)2004-2013 Laurent Destailleur +# \author (c)2004-2014 Laurent Destailleur # # This is list of constant you can set to have generated packages moved into a specific dir: #DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild' @@ -365,6 +365,7 @@ if ($nboftargetok) { print "Clean $BUILDROOT\n"; $ret=`rm -f $BUILDROOT/$PROJECT/.buildpath`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`; + $ret=`rm -fr $BUILDROOT/$PROJECT/.editorconfig`; $ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`; $ret=`rm -fr $BUILDROOT/$PROJECT/.git*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.project`; @@ -373,7 +374,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`; $ret=`rm -fr $BUILDROOT/$PROJECT/.tx`; $ret=`rm -f $BUILDROOT/$PROJECT/build.xml`; - $ret=`rm -f $BUILDROOT/$PROJECT/quickbuild.xml`; $ret=`rm -f $BUILDROOT/$PROJECT/pom.xml`; $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`; @@ -897,78 +897,83 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; - $APSVERSION="1.2"; - print "Create APS files $BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\n"; - open (SPECFROM,"<$BUILDROOT/$PROJECT/build/aps/APP-META-$APSVERSION.xml") || die "Error"; - open (SPECTO,">$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml") || die "Error"; - while () { - $newbuild = $BUILD; - $newbuild =~ s/(dev|alpha)/0/gi; # dev - $newbuild =~ s/beta/1/gi; # beta - $newbuild =~ s/rc./2/gi; # rc - if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - # now newbuild is 0-0 or 0-3 for example - $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/; - $_ =~ s/__RELEASE__/$RPMSUBVERSION/; - print SPECTO $_; - } - close SPECFROM; - close SPECTO; - print "Version set to $MAJOR.$MINOR.$newbuild\n"; - #$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\""; - #$ret=`$cmd`; - $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\""; - $ret=`$cmd`; - $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\""; - $ret=`$cmd`; - - print "Remove other files\n"; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`; - - print "Build APP-LIST.xml files\n"; - - print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n"; - - print "Go to directory $BUILDROOT/$PROJECT.tmp\/$PROJECT\n"; - $olddir=getcwd(); - chdir("$BUILDROOT\/$PROJECT.tmp\/$PROJECT"); - $cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip \*"; - print $cmd."\n"; - $ret= `$cmd`; - chdir("$olddir"); - - # Move to final dir - print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n"; - $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`; - next; - } + $APSVERSION="1.2"; + print "Create APS files $BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\n"; + open (SPECFROM,"<$BUILDROOT/$PROJECT/build/aps/APP-META-$APSVERSION.xml") || die "Error"; + open (SPECTO,">$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml") || die "Error"; + while () { + $newbuild = $BUILD; + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc + if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example + $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/; + $_ =~ s/__RELEASE__/$RPMSUBVERSION/; + print SPECTO $_; + } + close SPECFROM; + close SPECTO; + print "Version set to $MAJOR.$MINOR.$newbuild\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\""; + $ret=`$cmd`; + $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\""; + $ret=`$cmd`; + + print "Remove other files\n"; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`; + + print "Build APP-LIST.xml files\n"; + + print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n"; + + print "Go to directory $BUILDROOT/$PROJECT.tmp\/$PROJECT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT\/$PROJECT.tmp\/$PROJECT"); + $cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip \*"; + print $cmd."\n"; + $ret= `$cmd`; + chdir("$olddir"); + + # Move to final dir + print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n"; + $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`; + next; + } if ($target eq 'EXEDOLIWAMP') { $NEWDESTI=$DESTI; mkdir($DESTI.'/package_windows'); if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; } - - print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n"; - unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"; - $SOURCEBACK=$SOURCE; - $SOURCEBACK =~ s/\//\\/g; - print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; - $cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\""; + print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n"; + unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"; + + $SOURCEBACK=$SOURCE; + $SOURCEBACK =~ s/\//\\/g; + + print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; + $ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`; + + print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"\n"; + $cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\""; print "$cmd\n"; $ret= `$cmd`; #print "$ret\n"; # Move to final dir print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; - rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"); - print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; - $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`; - next; - } - } + rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"); + print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; + $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`; + + $ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`; + + next; + } + } # Publish package for each target #-------------------------------- diff --git a/build/obs/README b/build/obs/README index 8fc4c27d9b2..cf312fc0e68 100644 --- a/build/obs/README +++ b/build/obs/README @@ -14,7 +14,7 @@ https://build.opensuse.org Packaging rules: http://en.opensuse.org/Portal:Packaging Add attributes: -OBS:Screenshots URL of screenshot +OBS:Screenshots URL of screenshot http://www.dolibarr.org/images/dolibarr_screenshot1.png OBS:QualityCategory Development|Testing|Stable|Private OBS:Maintained 1 @@ -29,12 +29,18 @@ To submit a snapshot for building, we should have a service file with content How to have such a service file created automatically ? -Click on "Add file", then select mode "Upload From: Remote URL" -Enter the Remote URL that should looks like this: http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-3.src.rpm -Then add into advanded - attributes +Go into project you want to update. It mught be: +- openSUSE Build Service > Projects > Application:ERP:Dolibarr > dolibarr +- or your private project + +Once logged, click on "Add file" in section "Source Files", then select mode "Upload From: Remote URL" +Keep empty for "Filename", choose "Remote URL" and enter into last field, URL that should looks like this: +http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.3.src.rpm + +Then add into Advanded - Attributes OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png -OBS:QualityCategory Testing +OBS:QualityCategory Stable|Testing|Development|Private # Move project into official directory diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 1007c84eb96..05de30b3d6d 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -334,27 +334,3 @@ fi %changelog * Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3 - Upstream release - -* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 -- Upstream release - -* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 -- Upstream release - -* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3 -- Upstream release - -* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3 -- Upstream release - -* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 -- Upstream release - -* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 -- Upstream release - -* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3 -- Upstream release - -* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3 -- Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 5fd9a74f1a6..9ba38083e46 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -571,26 +571,4 @@ fi * Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3 - Upstream release -* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 -- Upstream release -* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 -- Upstream release - -* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3 -- Upstream release - -* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3 -- Upstream release - -* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 -- Upstream release - -* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 -- Upstream release - -* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3 -- Upstream release - -* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3 -- Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index c6fda416db0..ec5dbc3b4a8 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -340,26 +340,4 @@ fi * Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3 - Upstream release -* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 -- Upstream release -* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 -- Upstream release - -* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3 -- Upstream release - -* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3 -- Upstream release - -* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 -- Upstream release - -* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 -- Upstream release - -* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3 -- Upstream release - -* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3 -- Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 935ebf2e6df..c770c25e2e6 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -351,26 +351,4 @@ fi * Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3 - Upstream release -* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3 -- Upstream release -* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3 -- Upstream release - -* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3 -- Upstream release - -* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3 -- Upstream release - -* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 -- Upstream release - -* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 -- Upstream release - -* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3 -- Upstream release - -* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3 -- Initial version (#723326) diff --git a/dev/codesniffer/README b/dev/codesniffer/README index b06a2b1e5f6..8a68d8a1140 100755 --- a/dev/codesniffer/README +++ b/dev/codesniffer/README @@ -1,9 +1,12 @@ README (English) -------------------------------- -This directory contains ruleset files to use to -develop Dolibarr EPR & CRM with Eclipse. +This directory contains ruleset files to use to develop Dolibarr EPR & CRM. -Note: You must setup the PTI plugin of Eclipse into PHPCodeSniffer menu with: +To install/upgrade phpcs: +> sudo pear upgrade PHP_CodeSniffer + +Note with Eclipse: You must setup the PTI plugin of Eclipse into PHPCodeSniffer menu with: * tab value to 4 -* path of code sniffer standard to dev/codesniffer \ No newline at end of file +* path of code sniffer standard to dev/codesniffer + diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml index 7e3057a6675..49af678ccff 100755 --- a/dev/codesniffer/ruleset.xml +++ b/dev/codesniffer/ruleset.xml @@ -6,10 +6,11 @@ */conf.php */includes/* */documents/* + */dev/vagrant/* */custom/* */nltechno* - - + + @@ -22,7 +23,23 @@ - + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + 0 @@ -158,18 +175,92 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 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); diff --git a/dev/optimize_images.sh b/dev/optimize_images.sh index 616eec75757..0d532d054ad 100755 --- a/dev/optimize_images.sh +++ b/dev/optimize_images.sh @@ -10,6 +10,7 @@ INPLACE='0' max_input_size=0 max_output_size=0 + usage() { cat </dev/null rm -fr $2.firstpass fi @@ -67,6 +69,25 @@ get_max_file_length() main() { + test=`type pngcrush >/dev/null 2>&1` + result=$? + if [ "x$result" == "x1" ]; then + echo "Tool pngcrush not found" && exit + fi + + test=`type optipng >/dev/null 2>&1` + result=$? + if [ "x$result" == "x1" ]; then + echo "Tool optipng not found" && exit + fi + + test=`type jpegtran >/dev/null 2>&1` + result=$? + if [ "x$result" == "x1" ]; then + echo "Tool jpegtran not found" && exit + fi + + # If $INPUT is empty, then we use current directory if [[ "$INPUT" == "" ]]; then INPUT=$(pwd) @@ -81,6 +102,8 @@ main() OUTPUT='/tmp/optimize' fi + echo "Mode is $INPLACE (1=Images are replaced, 0=New images are stored into $OUTPUT)" + # We create the output directory mkdir -p $OUTPUT @@ -96,6 +119,7 @@ main() # Search of all jpg/jpeg/png in $INPUT # We remove images from $OUTPUT if $OUTPUT is a subdirectory of $INPUT + echo "Scan $INPUT to find images" IMAGES=$(find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v $OUTPUT) if [ "$QUIET" == "0" ]; then @@ -103,6 +127,7 @@ main() echo fi for CURRENT_IMAGE in $IMAGES; do + echo "Process $CURRENT_IMAGE" filename=$(basename $CURRENT_IMAGE) if [ "$QUIET" == "0" ]; then printf '%s ' "$filename" @@ -155,6 +180,13 @@ SHORTOPTS="h,i:,o:,q,s,p" LONGOPTS="help,input:,output:,quiet,no-stats,inplace" ARGS=$(getopt -s bash --options $SHORTOPTS --longoptions $LONGOPTS --name $PROGNAME -- "$@") +# Syntax +if [ "x$1" != "xlist" -a "x$1" != "xfix" ] +then + echo "Usage: optimize_images.sh (list|fix) -i dirtoscan" + exit +fi + eval set -- "$ARGS" while true; do case $1 in @@ -191,5 +223,11 @@ while true; do shift done +# To convert +if [ "x$1" = "xlist" ] +then + INPLACE=0 +fi + main diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index 781bbc1f77c..4dddc5a8c80 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -1,5 +1,6 @@ + * Copyright (C) 2014 Juanjo Menent * Copyright (C) ---Put here your own copyright and developer email--- * * This program is free software; you can redistribute it and/or modify @@ -79,7 +80,7 @@ class Skeleton_Class extends CommonObject // Put here code to add control on parameters values // Insert request - $sql = "INSERT INTO ".MAIN_DB_PREFIX."mytable("; + $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."("; $sql.= " field1,"; $sql.= " field2"; //... @@ -91,13 +92,13 @@ class Skeleton_Class extends CommonObject $this->db->begin(); - dol_syslog(get_class($this)."::create", LOG_DEBUG); + dol_syslog(__METHOD__, LOG_DEBUG); $resql=$this->db->query($sql); if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } if (! $error) { - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."mytable"); + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element); if (! $notrigger) { @@ -116,7 +117,7 @@ class Skeleton_Class extends CommonObject { foreach($this->errors as $errmsg) { - dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR); + dol_syslog(__METHOD__." ".$errmsg, LOG_ERR); $this->error.=($this->error?', '.$errmsg:$errmsg); } $this->db->rollback(); @@ -145,7 +146,7 @@ class Skeleton_Class extends CommonObject $sql.= " t.field1,"; $sql.= " t.field2"; //... - $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t"; + $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t"; if ($ref) $sql.= " WHERE t.ref = '".$ref."'"; else $sql.= " WHERE t.rowid = ".$id; @@ -181,7 +182,7 @@ class Skeleton_Class extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user, $notrigger=0) { global $conf, $langs; $error=0; @@ -195,7 +196,7 @@ class Skeleton_Class extends CommonObject // Put here code to add a control on parameters values // Update request - $sql = "UPDATE ".MAIN_DB_PREFIX."mytable SET"; + $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET"; $sql.= " field1=".(isset($this->field1)?"'".$this->db->escape($this->field1)."'":"null").","; $sql.= " field2=".(isset($this->field2)?"'".$this->db->escape($this->field2)."'":"null").""; //... @@ -203,7 +204,7 @@ class Skeleton_Class extends CommonObject $this->db->begin(); - dol_syslog(get_class($this)."::update"); + dol_syslog(__METHOD__); $resql = $this->db->query($sql); if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } @@ -226,7 +227,7 @@ class Skeleton_Class extends CommonObject { foreach($this->errors as $errmsg) { - dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR); + dol_syslog(__METHOD__." ".$errmsg, LOG_ERR); $this->error.=($this->error?', '.$errmsg:$errmsg); } $this->db->rollback(); @@ -270,10 +271,10 @@ class Skeleton_Class extends CommonObject if (! $error) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."mytable"; + $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element; $sql.= " WHERE rowid=".$this->id; - dol_syslog(get_class($this)."::delete"); + dol_syslog(__METHOD__); $resql = $this->db->query($sql); if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } } @@ -283,7 +284,7 @@ class Skeleton_Class extends CommonObject { foreach($this->errors as $errmsg) { - dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR); + dol_syslog(__METHOD__." ".$errmsg, LOG_ERR); $this->error.=($this->error?', '.$errmsg:$errmsg); } $this->db->rollback(); diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php index deaecd95526..ac329318ae5 100644 --- a/dev/skeletons/skeleton_page.php +++ b/dev/skeletons/skeleton_page.php @@ -282,7 +282,7 @@ if ($action == 'create') print '
'; - print '
 
'; + print '
 
'; print ''; @@ -304,7 +304,7 @@ if (($id || $ref) && $action == 'edit') print '
'; - print '
'; + print '
'; print ''; diff --git a/dev/skeletons/skeleton_webservice_server.php b/dev/skeletons/skeleton_webservice_server.php index 52bb46455cb..54a050ff9da 100644 --- a/dev/skeletons/skeleton_webservice_server.php +++ b/dev/skeletons/skeleton_webservice_server.php @@ -141,7 +141,7 @@ $server->register( * @param array $authentication Array of authentication information * @param int $id Id of object * @param string $ref Ref of object - * @param ref_ext $ref_ext Ref external of object + * @param string $ref_ext Ref external of object * @return mixed */ function getSkeleton($authentication,$id,$ref='',$ref_ext='') diff --git a/dev/test/testdiv.php b/dev/test/testdiv.php index 8700be5b2ab..2f1bd9182ae 100644 --- a/dev/test/testdiv.php +++ b/dev/test/testdiv.php @@ -19,14 +19,14 @@ -
+
'; print ''; diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index dc8f50241a1..d35e6e8ddf6 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -26,7 +26,7 @@ */ require '../../main.inc.php'; - + // Class require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; @@ -44,7 +44,7 @@ $action = GETPOST('action', 'alpha'); // Other parameters ACCOUNTING_* $list = array ( - 'ACCOUNTING_SEPARATORCSV' + 'ACCOUNTING_SEPARATORCSV' ); /* @@ -52,26 +52,26 @@ $list = array ( */ if ($action == 'update') { $error = 0; - + $modelcsv = GETPOST('modelcsv', 'int'); - + if (! empty($modelcsv)) { - + if (! dolibarr_set_const($db, 'ACCOUNTING_MODELCSV', $modelcsv, 'chaine', 0, '', $conf->entity)) { $error ++; } } else { $error ++; } - + foreach ( $list as $constname ) { $constvalue = GETPOST($constname, 'alpha'); - + if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) { $error ++; } } - + if (! $error) { setEventMessage($langs->trans("SetupSaved")); } else { @@ -90,7 +90,7 @@ $form = new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup'); -$head = admin_accounting_prepare_head(null); +$head = admin_accounting_prepare_head(); dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron'); @@ -142,23 +142,23 @@ if ($num) { foreach ( $list as $key ) { $var = ! $var; - + print ''; - + // Param $label = $langs->trans($key); print '' . $label . ''; - + // Value print ''; print ''; print ''; } -print ''; print "\n"; print '
'; +print ''; llxFooter(); $db->close(); \ No newline at end of file diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index 5907c754644..4dd005fca85 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -59,10 +59,10 @@ $max=100; $form = new Form($db); -llxHeader('',$title); - $title = $langs->trans('FiscalYears'); +llxHeader('',$title,LOG_ERR); + print_fiche_titre($langs->trans('FiscalYears')); $sql = "SELECT f.rowid, f.label, f.date_start, f.date_end, f.statut, f.entity"; diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index 423ac88b490..4958749f0a5 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -200,8 +200,11 @@ if ($action == 'create') print ''; - print '
    '; - print '
'; + print ''; + print '     '; + print ''; + print '
'; print ''; } @@ -251,9 +254,11 @@ else if ($id) print ''; - print '
  '; + print '
'; + print ''; + print '     '; print ''; - print '
'; + print '
'; print ''; diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php index 9e5c59f4555..6358bf353f3 100644 --- a/htdocs/accountancy/admin/importaccounts.php +++ b/htdocs/accountancy/admin/importaccounts.php @@ -120,6 +120,9 @@ if ($result) { $i = 0; print_barre_liste($langs->trans("ImportAccount"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines); + print '
' . "\n"; + print ''; + print ''; print ''; print ''; @@ -132,9 +135,6 @@ if ($result) { $form = new Form($db); $htmlacc = new FormVentilation($db); - print '' . "\n"; - print ''; - $var = true; while ( $i < min($num_lines, $limit) ) { $objp = $db->fetch_object($result); diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index e72df6a0431..85e49028298 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -181,7 +181,6 @@ print '\n"; print ''; print '\n"; -print ''; print "
' . $langs->trans("accountingaccount") . '' . $langs->trans("label") . ''.nl2br($langs->trans('OptionModeTrueDesc')); print "
'.$langs->trans('OptionModeVirtual').''.nl2br($langs->trans('OptionModeVirtualDesc'))."
\n"; @@ -285,10 +284,10 @@ if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) { } print ''; -print ''; + print "\n"; print '

'; - +print ''; llxFooter(); $db->close(); \ No newline at end of file diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php index f7507cda234..bec3fee45e9 100644 --- a/htdocs/accountancy/admin/journaux.php +++ b/htdocs/accountancy/admin/journaux.php @@ -112,10 +112,10 @@ foreach ( $list as $key ) { print ''; } -print ''; print "\n"; print '
'; +print ''; print '
'; @@ -163,7 +163,6 @@ $db->free($resql); print "\n"; -print ''; print ''; print '
'; diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 608c62cf1d0..a24ed34e052 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -358,7 +358,8 @@ else print ''; print ''; } - print ""; + print ''; + print ''; } } } diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 21da5bacbb9..b2acc60fb6a 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -51,7 +51,7 @@ $offset = $conf->liste_limit * $page; $formventilation = new FormVentilation($db); -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_doc_type=""; $search_doc_ref=""; @@ -231,4 +231,4 @@ else { } llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index c442eacc23c..46a34698785 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -25,12 +25,13 @@ */ /** - * Classe permettant la gestion des comptes generaux de compta + * Class to manage accounting accounts */ class AccountingAccount { var $db; var $error; + var $errors; var $id; var $rowid; @@ -126,6 +127,8 @@ class AccountingAccount global $conf, $langs; $error = 0; + $now=dol_now(); + // Clean parameters if (isset($this->fk_pcg_version)) $this->fk_pcg_version = trim($this->fk_pcg_version); diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index 2788526de05..9d0de035223 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -27,9 +27,12 @@ /** * Class to manage accountancy book keeping */ -class BookKeeping +class BookKeeping extends CommonObject { var $db; + var $error; + var $errors; + var $id; var $doc_date; var $doc_type; diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 28d3d0c1f79..4249688fabe 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -127,8 +127,11 @@ if (! empty($id)) { print ''; print ''; - print '
    '; - print '
'; + print ''; + print '     '; + print ''; + print '
'; print ''; } else { diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index cb40b7b361b..663e763a9d3 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -2,7 +2,7 @@ /* Copyright (C) 2013 Olivier Geffroy * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2013-2014 Alexandre Spangaro - * Copyright (C) 2014 Juanjo Menent + * 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 @@ -26,7 +26,7 @@ */ require '../../main.inc.php'; - + // Class require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; @@ -43,7 +43,7 @@ if ($user->societe_id > 0) accessforbidden(); if (! $user->rights->accounting->ventilation->read) accessforbidden(); - + // Filter $year = $_GET["year"]; if ($year == 0) { @@ -57,10 +57,10 @@ if ($year == 0) { // Validate History $action = GETPOST('action'); if ($action == 'validatehistory') { - + $error = 0; $db->begin(); - + if ($db->type == 'pgsql') { $sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd"; $sql1 .= " SET fd.fk_code_ventilation = accnt.rowid"; @@ -75,8 +75,7 @@ if ($action == 'validatehistory') { $sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number"; $sql1 .= " AND fd.fk_code_ventilation = 0"; } - - dol_syslog("/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG); + $resql1 = $db->query($sql1); if (! $resql1) { $error ++; @@ -106,7 +105,6 @@ $sql .= " , " . MAIN_DB_PREFIX . "facture as f"; $sql .= " WHERE fd.fk_code_ventilation = 0"; $sql .= " AND f.rowid = fd.fk_facture AND f.fk_statut = 1;"; -dol_syslog("/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG); $result = $db->query($sql); if ($result) { $row = $db->fetch_row($result); @@ -162,15 +160,14 @@ if (! empty($conf->multicompany->enabled)) { $sql .= " GROUP BY fd.fk_code_ventilation"; -dol_syslog("/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG); $resql = $db->query($sql); if ($resql) { $i = 0; $num = $db->num_rows($resql); - + while ( $i < $num ) { $row = $db->fetch_row($resql); - + print '' . length_accountg($row[0]) . ''; print '' . $row[1] . ''; print '' . price($row[2]) . ''; @@ -235,15 +232,14 @@ if (! empty($conf->multicompany->enabled)) { $sql .= " AND f.entity = '" . $conf->entity . "'"; } -dol_syslog('accountancy/customer/index.php:: $sql=' . $sql); $resql = $db->query($sql); if ($resql) { $i = 0; $num = $db->num_rows($resql); - + while ( $i < $num ) { $row = $db->fetch_row($resql); - + print '' . $row[0] . ''; print '' . price($row[1]) . ''; print '' . price($row[2]) . ''; @@ -284,7 +280,7 @@ if (! empty($conf->margin->enabled)) { print '' . $langs->trans("NovemberMin") . ''; print '' . $langs->trans("DecemberMin") . ''; print '' . $langs->trans("Total") . ''; - + $sql = "SELECT '" . $langs->trans("Vide") . "' AS 'Marge',"; $sql .= " ROUND(SUM(IF(MONTH(f.datef)=1,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Janvier',"; $sql .= " ROUND(SUM(IF(MONTH(f.datef)=2,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Fevrier',"; @@ -303,20 +299,19 @@ if (! empty($conf->margin->enabled)) { $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture"; $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'"; $sql .= " AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'"; - + if (! empty($conf->multicompany->enabled)) { $sql .= " AND f.entity = '" . $conf->entity . "'"; } - - dol_syslog('accountancy/customer/index.php:: $sql=' . $sql); + $resql = $db->query($sql); if ($resql) { $i = 0; $num = $db->num_rows($resql); - + while ( $i < $num ) { $row = $db->fetch_row($resql); - + print '' . $row[0] . ''; print '' . price($row[1]) . ''; print '' . price($row[2]) . ''; diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 97d52124c01..d2f204c6b8c 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -58,8 +58,10 @@ if ($user->societe_id > 0) $action = GETPOST('action'); + + /* - * View + * Actions */ $year_current = strftime("%Y", dol_now()); @@ -152,9 +154,6 @@ if ($result) { dol_print_error($db); } -/* - * Actions -*/ // Bookkeeping Write if ($action == 'writebookkeeping') { $now = dol_now(); @@ -237,9 +236,16 @@ if ($action == 'writebookkeeping') { } } -// export csv -if ($action == 'export_csv') { +/* + * View + */ + +$companystatic = new Societe($db); + +// export csv +if ($action == 'export_csv') +{ $sep = $conf->global->ACCOUNTING_SEPARATORCSV; header('Content-Type: text/csv'); diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 670260f1287..f86e19050e4 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -53,7 +53,7 @@ if ($action == 'update' || $action == 'add') $constname=GETPOST('constname','alpha'); $constvalue=(GETPOST('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname) : GETPOST('constvalue')); - if (($constname=='ADHERENT_CARD_TYPE' || $constname=='ADHERENT_ETIQUETTE_TYPE') && $constvalue == -1) $constvalue=''; + if (($constname=='ADHERENT_CARD_TYPE' || $constname=='ADHERENT_ETIQUETTE_TYPE' || $constname=='ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && $constvalue == -1) $constvalue=''; if ($constname=='ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice { if ($constvalue) $constvalue=0; @@ -209,6 +209,23 @@ if ($conf->facture->enabled) } print "\n"; print ''; + + if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) + { + $var=!$var; + print '
'; + print ''; + print ''; + print ''; + print ''.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").''; + print ''; + print $form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS'); + print ''; + print ''; + print ''; + } + print "\n"; + print '
'; } print ''; diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index 740a5c97879..0f92e017437 100644 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -203,9 +203,9 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled)) print ''; -print '
'; -print '
'; -print '
'; +print '
'; +print ''; +print '
'; print ''; diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 102f45496c6..a4463766278 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -70,7 +70,7 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); // Get object canvas (By default, this is not defined, so standard usage of dolibarr) $object->getCanvas($rowid); $canvas = $object->canvas?$object->canvas:GETPOST("canvas"); -$objcanvas=''; +$objcanvas=null; if (! empty($canvas)) { require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; @@ -79,7 +79,7 @@ if (! empty($canvas)) } // Security check -$result=restrictedArea($user,'adherent',$rowid,'','','fk_soc', 'rowid', $objcanvas); +$result=restrictedArea($user, 'adherent', $rowid, '', '', 'fk_soc', 'rowid', $objcanvas); if ($rowid > 0) { @@ -291,8 +291,6 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer) //$object->note = trim($_POST["comment"]); $object->morphy = $_POST["morphy"]; - $object->amount = $_POST["amount"]; - if (GETPOST('deletephoto')) $object->photo=''; elseif (! empty($_FILES['photo']['name'])) $object->photo = dol_sanitizeFileName($_FILES['photo']['name']); @@ -917,7 +915,7 @@ else print "\n"; print '
'; - print '
'; + print '
'; print "\n"; @@ -1166,11 +1164,11 @@ else print ''; - print '
'; + print '
'; print ''; - print '       '; + print '     '; print ''; - print ''; print ''; diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index ded8e8ab50a..c01d3b5bc6b 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; @@ -315,13 +316,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $ } } else - { + { $error++; $errmsg=$acct->error; } } else - { + { $error++; $errmsg=$acct->error; } @@ -385,6 +386,8 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $ { // Add line to draft invoice $idprodsubscription=0; + if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) $idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS; + $vattouse=0; if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry') { @@ -947,9 +950,10 @@ if ($rowid) print ''.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->currency).''; // Label - print ''.$langs->trans("Label").''; - print ''; + print ''.$langs->trans("Label").''; + print ''; // Complementary action if (! empty($conf->banque->enabled) || ! empty($conf->facture->enabled)) @@ -990,7 +994,13 @@ if ($rowid) print $langs->trans("CreateDolibarrThirdParty"); print ')'; } - if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0).'.'; + if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0); + if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) + { + $prodtmp=new Product($db); + $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS); + print '. '.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(0)); + } print '
'; } // Add invoice with payments @@ -1009,7 +1019,13 @@ if ($rowid) print $langs->trans("CreateDolibarrThirdParty"); print ')'; } - if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0).'.'; + if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0); + if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) + { + $prodtmp=new Product($db); + $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS); + print '. '.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(0)); + } print '
'; } print ''; @@ -1078,11 +1094,11 @@ if ($rowid) print ''; print '
'; - print '
'; + print '
'; print ''; - print '     '; + print '     '; print ''; - print '
'; + print '
'; print ''; diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index cdbfabf4576..b7c65c3bbeb 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -465,8 +465,11 @@ class Adherent extends CommonObject $nbrowsaffected+=$this->db->affected_rows($resql); + $action='update'; + // Actions on extra fields (by external module) - $hookmanager->initHooks(array('memberdao')); + // FIXME le hook fait double emploi avec le trigger !! + $hookmanager->initHooks(array('memberdao')); $parameters=array('id'=>$this->id); $action=''; $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks @@ -1042,7 +1045,7 @@ class Adherent extends CommonObject * @param int $rowid Id of object to load * @param string $ref To load member from its ref * @param int $fk_soc To load member from its link to third party - * @param int $ref_ext External reference + * @param string $ref_ext External reference * @return int >0 if OK, 0 if not found, <0 if KO */ function fetch($rowid,$ref='',$fk_soc='',$ref_ext='') @@ -1303,7 +1306,7 @@ class Adherent extends CommonObject return $rowid; } else - { + { $this->db->rollback(); return -2; } @@ -1569,14 +1572,14 @@ class Adherent extends CommonObject } if ($option == 'category') { - $lien = ''; - $lienfin=''; + $lien = ''; + $lienfin=''; } $picto='user'; $label=$langs->trans("ShowMember"); - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; return $result; diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 2d5f3d835be..17f61bb27ba 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -277,7 +277,7 @@ class AdherentType extends CommonObject $picto='group'; $label=$langs->trans("ShowTypeCard",$this->libelle); - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$lien.($maxlen?dol_trunc($this->libelle,$maxlen):$this->libelle).$lienfin; return $result; diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index 24a56d5e7c7..e64a67d445d 100644 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -48,7 +48,6 @@ class AdherentStats extends Stats * @param DoliDB $db Database handler * @param int $socid Id third party * @param int $userid Id user for filter - * @return AdherentStats */ function __construct($db, $socid=0, $userid=0) { diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index 5193a729970..660be1f397a 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -271,7 +271,7 @@ class Cotisation extends CommonObject $picto='payment'; $label=$langs->trans("ShowSubscription"); - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$lien.$this->ref.$lienfin; return $result; diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index 01a3ccc83fc..6f0177d4b6f 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -180,7 +180,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') $head[$h][2] = 'info'; $h++; - dol_fiche_head($head, 'general', $langs->trans("Subscription")); + dol_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment'); print "\n"; print '
'; diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 887bac4e1e7..b88a39c76af 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -59,7 +59,7 @@ $pagenext = $page + 1; if (! $sortorder) { $sortorder=($filter=='outofdate'?"ASC":"DESC"); } if (! $sortfield) { $sortfield=($filter=='outofdate'?"d.datefin":"d.lastname"); } -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search=""; $search_ref=""; @@ -263,8 +263,7 @@ if ($resql) print ''; print ''; - print "\n"; - print '
'; + print "\n"; $var=True; while ($i < $num && $i < $conf->liste_limit) @@ -366,6 +365,7 @@ if ($resql) } print "\n"; + print ''; if ($num > $conf->liste_limit) { 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/adherents/type.php b/htdocs/adherents/type.php index 0ffdc8b7e7f..a17350a379d 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -271,9 +271,11 @@ if ($action == 'create') } print "\n"; - print '
'; - print '
    '; - print '
'; + print '
'; + print ''; + print '     '; + print ''; + print '
'; print "\n"; } @@ -678,8 +680,11 @@ if ($rowid > 0) print '

'; } - print '
   '; - print '
'; + print '
'; + print ''; + print '     '; + print ''; + print '
'; print ""; } diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 5ad9673a16f..5d10f4614cc 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -184,9 +184,9 @@ if (! empty($triggers)) } print ''; -print '
'; +print '
'; print ''; -print "
"; +print ""; print "\n"; diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 6b683c8b52b..d6ddf70528b 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -220,9 +220,9 @@ while ($i <= $MAXAGENDA) print ''; print '
'; -print '
'; -print "trans("Save")."\">"; -print "
"; +print '
'; +print ''; +print '
'; print "\n"; diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index a069a0718c9..033c5d35c18 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -157,7 +157,7 @@ print ''."\n"; print ''; -print '
'; +print '
'; print ''; diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 40454ed1302..671c24880bc 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -136,9 +136,9 @@ print ""; print ''; -print '
'; +print '
'; print "trans("Save")."\">"; -print "
"; +print ""; print "\n"; diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 9b5cb77e072..a63e310a9b3 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 @@ -87,9 +87,12 @@ $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup'); -print '
'; +print '
'; +print ''; +print ''; + $head = bank_admin_prepare_head(null); dol_fiche_head($head, 'general', $langs->trans("BankSetupModule"), 0, 'account'); @@ -102,9 +105,7 @@ print "\n"; $var=true; $var=! $var; -print ''; -print ''; -print ''; + print ''; print $langs->trans("FreeLegalTextOnChequeReceipts").' ('.$langs->trans("AddCRIfTooLong").')
'; print ''; @@ -188,6 +189,10 @@ while ($i < $nbofbank) print ''."\n"; -$db->close(); +dol_fiche_end(); + +print '
'; llxFooter(); + +$db->close(); diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php index b28c8b417c3..c896ecc5c48 100644 --- a/htdocs/admin/bank_extrafields.php +++ b/htdocs/admin/bank_extrafields.php @@ -68,7 +68,7 @@ print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup'); $head = bank_admin_prepare_head(null); -dol_fiche_head($head, 'attributes', $langs->trans("Bank"), 0, 'account'); +dol_fiche_head($head, 'attributes', $langs->trans("BankSetupModule"), 0, 'account'); print $langs->trans("DefineHereComplementaryAttributes",$textobject).'
'."\n"; 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 '
'; diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index c12e913e9c1..8b6d833778e 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -46,93 +46,97 @@ $boxes = array(); */ if ($action == 'addconst') - { dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity); } -if ($action == 'add') -{ +if ($action == 'add') { $error=0; - $db->begin(); + if (isset($_POST['boxid']) && is_array($_POST['boxid'])) + { + foreach($_POST['boxid'] as $boxid) + { + if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0) // 0=Home, 1=... + { + $pos = $boxid['pos']; - // Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos") - $distinctfkuser=array(); - if (! $error) - { - $sql = "SELECT fk_user"; - $sql.= " FROM ".MAIN_DB_PREFIX."user_param"; - $sql.= " WHERE param = 'MAIN_BOXES_".$db->escape(GETPOST("pos","alpha"))."' AND value = '1'"; - $sql.= " AND entity = ".$conf->entity; + // Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos") + $distinctfkuser=array(); + if (! $error) + { + $sql = "SELECT fk_user"; + $sql.= " FROM ".MAIN_DB_PREFIX."user_param"; + $sql.= " WHERE param = 'MAIN_BOXES_".$db->escape($pos)."' AND value = '1'"; + $sql.= " AND entity = ".$conf->entity; + dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i=0; + while ($i < $num) + { + $obj=$db->fetch_object($resql); + $distinctfkuser[$obj->fk_user]=$obj->fk_user; + $i++; + } + } + else + { + setEventMessage($db->lasterror(), 'errors'); + $error++; + } + } - dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i=0; - while ($i < $num) - { - $obj=$db->fetch_object($resql); - $distinctfkuser[$obj->fk_user]=$obj->fk_user; - $i++; - } - } - else - { - setEventMessage($db->lasterror(), 'errors'); - $error++; - } - } + $distinctfkuser['0']='0'; // Add entry for fk_user = 0. We must use string as key and val - $distinctfkuser['0']='0'; // Add entry for fk_user = 0. We must use string as key and val + foreach($distinctfkuser as $fk_user) + { + if (! $error && $fk_user != '') + { + $nbboxonleft=$nbboxonright=0; + $sql = "SELECT box_order FROM ".MAIN_DB_PREFIX."boxes WHERE position = ".$pos." AND fk_user = ".$fk_user." AND entity = ".$conf->entity; + dol_syslog("boxes.php activate box", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + while($obj = $db->fetch_object($resql)) + { + $boxorder=$obj->box_order; + if (preg_match('/A/',$boxorder)) $nbboxonleft++; + if (preg_match('/B/',$boxorder)) $nbboxonright++; + } + } + else dol_print_error($db); - foreach($distinctfkuser as $fk_user) - { - if (! $error && $fk_user != '') - { - $nbboxonleft=$nbboxonright=0; - $sql = "SELECT box_order FROM ".MAIN_DB_PREFIX."boxes WHERE position = ".GETPOST("pos","alpha")." AND fk_user = ".$fk_user." AND entity = ".$conf->entity; - dol_syslog("boxes.php activate box", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - while($obj = $db->fetch_object($resql)) - { - $boxorder=$obj->box_order; - if (preg_match('/A/',$boxorder)) $nbboxonleft++; - if (preg_match('/B/',$boxorder)) $nbboxonright++; - } - } - else dol_print_error($db); + $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes ("; + $sql.= "box_id, position, box_order, fk_user, entity"; + $sql.= ") values ("; + $sql.= $boxid['value'].", ".$pos.", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity; + $sql.= ")"; - $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes ("; - $sql.= "box_id, position, box_order, fk_user, entity"; - $sql.= ") values ("; - $sql.= GETPOST("boxid","int").", ".GETPOST("pos","alpha").", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity; - $sql.= ")"; - - dol_syslog("boxes.php activate box", LOG_DEBUG); - $resql = $db->query($sql); - if (! $resql) - { - setEventMessage($db->lasterror(), 'errors'); - $error++; - } - } - } - - if (! $error) - { - header("Location: boxes.php"); - $db->commit(); - exit; - } - else - { - $db->rollback(); - } + dol_syslog("boxes.php activate box", LOG_DEBUG); + $resql = $db->query($sql); + if (! $resql) + { + setEventMessage($db->lasterror(), 'errors'); + $error++; + } + } + } + } + } + } + if (! $error) + { + $db->commit(); + $action=''; + } + else + { + $db->rollback(); + } } if ($action == 'delete') @@ -317,14 +321,18 @@ if ($resql) $boxtoadd=InfoBox::listBoxes($db,'available',-1,null,$actives); print "
\n"; +print "\n\n".''."\n"; print_titre($langs->trans("BoxesAvailable")); -print ''; +print ''."\n"; +print ''."\n"; +print ''."\n"; +print '
'."\n"; print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; $var=true; foreach($boxtoadd as $box) @@ -341,12 +349,10 @@ foreach($boxtoadd as $box) } print "\n".''."\n"; - print ''; - print ''; - print ''; + print ''."\n"; print ''; + print ''."\n"; print ''; - print ''; + print ''."\n"; + print ''."\n"; // Pour chaque position possible, on affiche un lien d'activation si boite non deja active pour cette position - print ''; - print ''; - print ''; + print ''."\n"; } -print '
'.$langs->trans("Box").''.$langs->trans("Note").'/'.$langs->trans("Parameters").''.$langs->trans("SourceFile").''.$langs->trans("ActivateOn").''.$langs->trans("ActivateOn").'
'.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel); if (! empty($box->class) && preg_match('/graph_/',$box->class)) print ' ('.$langs->trans("Graph").')'; - print ''; if ($box->note == '(WarningUsingThisBoxSlowDown)') { @@ -354,22 +360,24 @@ foreach($boxtoadd as $box) print $langs->trans("WarningUsingThisBoxSlowDown"); } else print ($box->note?$box->note:' '); - print '' . $box->sourcefile . '' . $box->sourcefile . ''; - print $form->selectarray("pos",$pos_name,0,0,0,0,'',1); - print ''; - print ''; - print ' '; + print ''; + print $form->selectarray("boxid[".$box->box_id."][pos]", $pos_name, 0, 1, 0, 0, '', 1)."\n"; + print ''."\n"; print '
'; +print ''."\n"; +print '
'; +print ''; +print '
'."\n"; +print ''; +print "\n".''."\n"; // Activated boxes @@ -421,8 +429,8 @@ foreach($boxactivated as $key => $box) $hasprevious=($key != 0); print ''.($key+1).''; print ''; - print ($hasnext?''.img_down().' ':''); - print ($hasprevious?''.img_up().'':''); + print ($hasnext?''.img_down().' ':''); + print ($hasprevious?''.img_up().'':''); print ''; print ''; print ''.img_delete().''; @@ -436,13 +444,14 @@ print '
'; // Other parameters +print "\n\n".''."\n"; print_titre($langs->trans("Other")); -print ''; - -$var=false; print ''; print ''; print ''; +print '
'; + +$var=false; print ''; print ''; print ''; @@ -459,9 +468,10 @@ print ''."\n"; print ''; -print ''; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''; print ''; print '
'; +print ''; +print "\n".''."\n"; llxFooter(); diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index 3e85d377055..414e0ed1e99 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -94,7 +94,7 @@ print ''; print ''; -print '

'; +print '

'; print '

'; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 89a78b5d6da..aaa1949d7dd 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -147,7 +147,7 @@ if ($action == 'setModuleOptions') } // Activate a model -if ($action == 'set') +else if ($action == 'set') { $ret = addDocumentModel($value, $type, $label, $scandir); } @@ -222,7 +222,7 @@ else if ($action == 'set_COMMANDE_FREE_TEXT') } } -//Activate Set Shippable Icon In List +// Activate Set Shippable Icon In List else if ($action=="setshippableiconinlist") { $setshippableiconinlist = GETPOST('value','int'); $res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist,'yesno',0,'',$conf->entity); @@ -234,6 +234,23 @@ else if ($action=="setshippableiconinlist") { } } +// Activate ask for payment bank +else if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ORDER') +{ + $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_ORDER",$value,'chaine',0,'',$conf->entity); + + if (! $res > 0) $error++; + + if (! $error) + { + setEventMessage($langs->trans("SetupSaved")); + } + else + { + setEventMessage($langs->trans("Error"),'errors'); + } +} + /* * View @@ -249,7 +266,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup'); print '
'; -$head = order_admin_prepare_head(null); +$head = order_admin_prepare_head(); dol_fiche_head($head, 'general', $langs->trans("Orders"), 0, 'order'); @@ -576,6 +593,36 @@ if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) { print ''; print ''; +// Ask for payment bank during order +if ($conf->banque->enabled) +{ + $var=!$var; + print ''; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '; + if (! empty($conf->use_javascript_ajax)) + { + print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ORDER'); + } + else + { + if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER)) + { + print ''.img_picto($langs->trans("Disabled"),'switch_off').''; + } + else + { + print ''.img_picto($langs->trans("Enabled"),'switch_on').''; + } + } + print ''; +} +else +{ + $var=!$var; + print ''; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '.$langs->trans('NotAvailable').''; +} + print ''; print '
'; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 96dff7755af..a349973b3dc 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -668,11 +668,11 @@ if ($action == 'edit' || $action == 'updateedit') } - print '
'; + print '
'; print ''; - print '     '; + print '     '; print ''; - print '
'; + print ''; print '
'; print ''; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 610bf371f29..7b041fa3991 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(); @@ -134,7 +135,6 @@ print ''.nl2br($langs->trans('OptionModeTrueDesc')); print "\n"; print ' '.$langs->trans('OptionModeVirtual').''; print ''.nl2br($langs->trans('OptionModeVirtualDesc'))."\n"; -print ''; print "\n"; @@ -153,7 +153,7 @@ foreach ($list as $key) print ''; // Param - $libelle = $langs->trans($key); + $libelle = $langs->trans($key); print ''; // Value @@ -162,11 +162,10 @@ foreach ($list as $key) print ''; } -print ''; print "\n"; print '

'; - +print ''; $db->close(); llxFooter(); diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 48e637fb8a3..a64e3856dbc 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -260,7 +260,7 @@ if ($result) // Note print ''; - print ''; + print ''; print ''; // Entity limit to superadmin diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 2abb2b5acad..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 @@ -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,42 @@ 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 ''; +print ''."\n"; //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(); diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 274d1adc34e..b795f121234 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -177,7 +177,7 @@ if ($action == 'edit') print '
'; - print '
'; + print '
'; print '
'; print ''; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 4d33723a947..05402898ee6 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -192,7 +192,7 @@ $tabfield[3] = "code,libelle,country_id,country"; $tabfield[4] = "code,label"; $tabfield[5] = "code,label"; $tabfield[6] = "code,libelle,type,color,position"; -$tabfield[7] = "code,libelle,country_id,country,accountancy_code,deductible"; +$tabfield[7] = "code,libelle,country,accountancy_code,deductible"; $tabfield[8] = "code,libelle,country_id,country"; $tabfield[9] = "code,label,unicode"; $tabfield[10]= "country_id,country,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note"; @@ -453,8 +453,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $ok=1; foreach ($listfield as $f => $value) { + if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType'))) continue; // For some pages, country is not mandatory if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType'))) continue; // For some pages, country is not mandatory - if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryRegion','DictionaryCompanyType'))) continue; // For some pages, country is not mandatory if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue; if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue; if ($value == 'color' && empty($_POST['color'])) continue; @@ -1361,14 +1361,18 @@ function fieldList($fieldlist,$obj='',$tabname='') continue; } // For state page, we do not show the country input (we link to region, not country) print ''; - print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), 'country', '', 28); + $fieldname='country'; + print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28); print ''; } elseif ($fieldlist[$field] == 'country_id') { - $country_id = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0); - print ''; - print ''; - print ''; + if (! in_array('country',$fieldlist)) // If there is already a field country, we don't show country_id (avoid duplicate) + { + $country_id = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0); + print ''; + print ''; + print ''; + } } elseif ($fieldlist[$field] == 'region') { print ''; diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php index c81366bc5e9..dcac1079422 100644 --- a/htdocs/admin/dons.php +++ b/htdocs/admin/dons.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2012-2013 Juanjo Menent * Copyright (C) 2013 Philippe Grand - * Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2014 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,6 +37,8 @@ $typeconst=array('yesno','texte','chaine'); $action = GETPOST('action','alpha'); +$type='donation'; + /* * Action @@ -135,7 +137,7 @@ else if ($action == 'setart200') { $res = dolibarr_set_const($db, "DONATION_ART200", $setart200, 'yesno', 0, '', $conf->entity); if (! $res > 0) $error ++; - + if (! $error) { setEventMessage($langs->trans("SetupSaved"), 'mesgs'); } else { @@ -147,7 +149,7 @@ else if ($action == 'setart238') { $res = dolibarr_set_const($db, "DONATION_ART238", $setart238, 'yesno', 0, '', $conf->entity); if (! $res > 0) $error ++; - + if (! $error) { setEventMessage($langs->trans("SetupSaved"), 'mesgs'); } else { @@ -159,7 +161,7 @@ else if ($action == 'setart885') { $res = dolibarr_set_const($db, "DONATION_ART885", $setart885, 'yesno', 0, '', $conf->entity); if (! $res > 0) $error ++; - + if (! $error) { setEventMessage($langs->trans("SetupSaved"), 'mesgs'); } else { @@ -183,7 +185,10 @@ print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup'); * Params */ print_titre($langs->trans("Options")); - + +print '
'; +print ''; +print ''; print ''; print ''; print ''; @@ -192,9 +197,7 @@ print "\n"; $var=true; $var=! $var; -print ''; -print ''; -print ''; + print ''; print '
'.$langs->trans("Parameter").'
'; print $langs->trans("FreeTextOnDonations").'
'; print ''; @@ -207,11 +210,11 @@ print ''; /* * French params */ -if ($conf->global->MAIN_LANG_DEFAULT == "fr_FR") +if ($conf->global->MAIN_LANG_DEFAULT == "fr_FR") { print '
'; print_titre($langs->trans("FrenchOptions")); - + print ''; print ''; print ''; @@ -377,7 +380,7 @@ if (is_resource($handle)) print ''; - + // Preview print ''; print '
' . $langs->trans('Parameters') . ''; print $form->textwithpicto('',$htmltooltip,-1,0); print ''; print ''.img_object($langs->trans("Preview"),'generic').''; diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index 59205dcdbab..d5562248c55 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -78,15 +78,16 @@ print_fiche_titre($langs->trans("SecuritySetup"),'','setup'); print $langs->trans("LogEventDesc")."
\n"; print "
\n"; -$head=security_prepare_head(); - -dol_fiche_head($head, 'audit', $langs->trans("Security")); - print '
'; print ''; print ''; +$head=security_prepare_head(); + +dol_fiche_head($head, 'audit', $langs->trans("Security")); + + $var=true; print ""; print ""; @@ -109,14 +110,14 @@ foreach ($eventstolog as $key => $arr) } print '
'; -print '
'; +dol_fiche_end(); + +print '
'; print "trans("Save")."\">"; -print "
"; +print ""; print "
\n"; -print ''; - -$db->close(); llxFooter(); +$db->close(); diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index f23e80f78ff..520193a81c3 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -214,11 +214,11 @@ print '		http://news.google.com/news?ned=us&topic=h&output=rss
http://www.d print '
'; -print '

'; +print '
'; print ''; print ''; print ''; -print '

'; +print '


'; print ''; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 3c251cf6c3b..a7692655a0a 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -296,7 +296,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup'); print '
'; -$head = invoice_admin_prepare_head(null); +$head = invoice_admin_prepare_head(); dol_fiche_head($head, 'general', $langs->trans("Invoices"), 0, 'invoice'); /* diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index 2541a6265e7..a66c417923b 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -165,7 +165,7 @@ else $readonly=($mode=='dolibarr_readonly'?1:0); $editor=new DolEditor('formtestfield',isset($conf->global->FCKEDITOR_TEST)?$conf->global->FCKEDITOR_TEST:'Test','',200,$mode,'In', true, $uselocalbrowser, 1, 120, 8, $readonly); $editor->Create(); - print '

'."\n"; + print '
'."\n"; print '
'; print ''."\n"; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 5cdb41cbe23..6ebf107ffbe 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -53,29 +53,30 @@ $searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name if ($action == 'update') { - dolibarr_set_const($db, "MAIN_LANG_DEFAULT", $_POST["main_lang_default"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_MULTILANGS", $_POST["main_multilangs"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", $_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_START_WEEK", $_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", $_POST["MAIN_DEFAULT_WORKING_DAYS"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", $_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_SHOW_LOGO", $_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", $_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_LANG_DEFAULT", $_POST["main_lang_default"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_MULTILANGS", $_POST["main_multilangs"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", $_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_START_WEEK", $_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", $_POST["MAIN_DEFAULT_WORKING_DAYS"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", $_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_SHOW_LOGO", $_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_ACTIVATE_HTML5", $_POST["MAIN_ACTIVATE_HTML5"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", $_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_THEME", $_POST["main_theme"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_THEME", $_POST["main_theme"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE", $_POST["MAIN_SEARCHFORM_SOCIETE"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE",$_POST["MAIN_SEARCHFORM_PRODUITSERVICE"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE", $_POST["MAIN_SEARCHFORM_SOCIETE"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE", $_POST["MAIN_SEARCHFORM_PRODUITSERVICE"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER",$_POST["MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT",$_POST["MAIN_SEARCHFORM_ADHERENT"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT", $_POST["MAIN_SEARCHFORM_ADHERENT"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK", $_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0); // Param for all entities - dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", $_POST["MAIN_HELP_DISABLELINK"],'chaine',0,'',0); // Param for all entities + dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK", $_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0); // Param for all entities + dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", $_POST["MAIN_HELP_DISABLELINK"],'chaine',0,'',0); // Param for all entities // This one is not always defined if (isset($_POST["MAIN_USE_PREVIEW_TABS"])) dolibarr_set_const($db, "MAIN_USE_PREVIEW_TABS", $_POST["MAIN_USE_PREVIEW_TABS"],'chaine',0,'',$conf->entity); @@ -119,7 +120,7 @@ if ($action == 'edit') // Edit print_fiche_titre($langs->trans("Language"),'','').'
'; print ''; - print ''; + print ''; print ''; print ''; @@ -142,7 +143,7 @@ if ($action == 'edit') // Edit print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("Parameters").''.$langs->trans("Value").' 

'."\n"; // Themes - show_theme('',1); + show_theme(null,1); print '
'; // Liste des zone de recherche permanantes supportees @@ -161,7 +162,7 @@ if ($action == 'edit') // Edit // Other print ''; - print ''; + print ''; print ''; print ''; @@ -172,6 +173,17 @@ if ($action == 'edit') // Edit print ''; print ''; print ''; + + // Activate Html5 - Developement - Only available on Eldy template + if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_HTML5)) + { + $var=!$var; + print ''; + print ''; + print ''; + } // Max size of lists $var=!$var; @@ -287,9 +299,9 @@ if ($action == 'edit') // Edit print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("Parameters").''.$langs->trans("Value").' 
 
'.$langs->trans("EnableHtml5").''; + print $form->selectyesno('MAIN_ACTIVATE_HTML5',$conf->global->MAIN_ACTIVATE_HTML5,1); + print ' 
'."\n"; - print '
'; + print '
'; print ''; - print '
'; + print ''; print ''; print '
'; @@ -301,7 +313,7 @@ else // Show // Language print_fiche_titre($langs->trans("Language"),'','').'
'; print ''; - print ''; + print ''; $var=!$var; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").' 
'.$langs->trans("Parameters").''.$langs->trans("Value").' 
'.$langs->trans("DefaultLanguage").''; @@ -323,7 +335,7 @@ else // Show // Themes - show_theme('',0); + show_theme(null,0); print '
'; @@ -345,12 +357,21 @@ else // Show // Other $var=true; print ''; - print ''; + print ''; $var=!$var; print ''; print ''; print ""; + + // Activate Html5 - Developement - Only available on Eldy template + if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_HTML5)) + { + $var=!$var; + print ''; + print ''; + print ""; + } $var=!$var; print ''; diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index bbedab346d1..6ec184d68ec 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -109,7 +109,7 @@ if (empty($reshook)) print "
"; // Show logo - print '
'; + print '
'; } diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index ef893031db1..e84a3abfffa 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -239,7 +239,7 @@ print ''; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'.$langs->trans("EnableShowLogo").'' . yn($conf->global->MAIN_SHOW_LOGO) . ' 
'.$langs->trans("EnableHtml5").'' . yn($conf->global->MAIN_ACTIVATE_HTML5) . ' 
'.$langs->trans("DefaultMaxSizeList").'' . $conf->global->MAIN_SIZE_LISTE_LIMIT . 'secret
'; -print '
'; +print '
'; print ''; diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 5896ffc5416..2281f83bdd1 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -126,9 +126,9 @@ if ($action == 'edit') print '
'; - print '
'; + print '
'; print ''; - print '
'; + print ''; print ''; print '
'; diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php index f4d2010ca74..3e4a2c14a98 100644 --- a/htdocs/admin/mailman.php +++ b/htdocs/admin/mailman.php @@ -158,7 +158,8 @@ $head = mailmanspip_admin_prepare_head(); dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user'); -$var=!$var; +$var=true; + if (! empty($conf->global->ADHERENT_USE_MAILMAN)) { //$lien=img_picto($langs->trans("Active"),'tick').' '; diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 61914d1a09c..b39760c6907 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -477,11 +477,11 @@ if ($action == 'edit') print '">
'; - print '
'; + print '
'; print ''; - print '     '; + print '     '; print ''; - print '
'; + print ''; print ''; print '
'; diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 2e050a4bbe8..c5fb55cbce5 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -26,7 +26,6 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $action=GETPOST('action'); @@ -204,11 +203,11 @@ if ($action == 'edit') print ''; - print '
'; + print '
'; print ''; - print '     '; + print '     '; print ''; - print '
'; + print ''; print ''; } diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index ff015884bbc..c8964d7bbaa 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -369,9 +369,11 @@ if ($action == 'create') print ''; // Boutons - print '

'; - print '     '; - print '
'; + print '
'; + print ''; + print '     '; + print ''; + print '
'; print ''; } @@ -453,9 +455,11 @@ elseif ($action == 'edit') print ''; // Bouton - print '

'; - print '     '; - print '
'; + print '
'; + print ''; + print '     '; + print ''; + print '
'; print ''; diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index 215f2eae069..d7fce1c937d 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -326,6 +326,7 @@ if ($conf->use_javascript_ajax) ''.img_edit('default',0,'class="menuEdit" id="edit'.$menu['rowid'].'"').' '. ''.img_edit_add('default').' '. ''.img_delete('default').' '. + '     '. ''.img_picto("Monter","1uparrow").''.img_picto("Descendre","1downarrow").''. '' ); diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index fd3f74c06c2..e3524425c6c 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -520,11 +520,18 @@ else $var=!$var; print "\n"; $url='http://www.dolistore.com'; - print ''; + print ''; print ''.$langs->trans("DoliStoreDesc").''; - print ''.$url.''; + print ''.$url.''; print ''; + $var=!$var; + print "\n"; + $url='http://partners.dolibarr.org'; + print ''; + print ''.$langs->trans("DoliPartnersDesc").''; + print ''.$url.''; + print ''; print "\n"; } @@ -534,7 +541,7 @@ dol_fiche_end(); // Show warning about external users -if ($mode != 'marketplace') print '
'.showModulesExludedForExternal($modules).'

'."\n"; +if ($mode != 'marketplace') print info_admin(showModulesExludedForExternal($modules))."\n"; llxFooter(); diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 14aeba65c29..ce3c8d10f73 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -142,7 +142,7 @@ print ''; print '
'; -print '
'; +print '
'; print ''; diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php index 90ceed434c2..81b7e74a479 100644 --- a/htdocs/admin/order_extrafields.php +++ b/htdocs/admin/order_extrafields.php @@ -73,7 +73,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup'); print "
\n"; -$head = order_admin_prepare_head(null); +$head = order_admin_prepare_head(); dol_fiche_head($head, 'attributes', $langs->trans("Orders"), 0, 'order'); diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php index 8f1dfb80538..515714a51e4 100644 --- a/htdocs/admin/orderdet_extrafields.php +++ b/htdocs/admin/orderdet_extrafields.php @@ -74,7 +74,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup'); print "
\n"; -$head = order_admin_prepare_head(null); +$head = order_admin_prepare_head(); dol_fiche_head($head, 'attributeslines', $langs->trans("Orders"), 0, 'order'); diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index f21687eecf7..64a213467d4 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -250,9 +250,9 @@ if ($action == 'edit') // Edit print ''; - print '
'; + print '
'; print ''; - print '
'; + print ''; print ''; print '
'; diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 74a9b8c8434..907ed389b38 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -116,7 +116,7 @@ foreach ($modulesdir as $dir) $db->commit(); // Show warning about external users -print showModulesExludedForExternal($modules).'
'."\n"; +print info_admin(showModulesExludedForExternal($modules)).'
'."\n"; print "
\n"; diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 6094bb7e4f1..6592bf281e1 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 ''; @@ -161,7 +161,7 @@ print ''; print ''; print '
'; -print '
'; +print '
'; print ''; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 328866eb964..01f32740036 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -163,6 +163,22 @@ if ($action == 'setdefaultduration') } } +if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') +{ + $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL",$value,'chaine',0,'',$conf->entity); + + if (! $res > 0) $error++; + + if (! $error) + { + setEventMessage($langs->trans("SetupSaved")); + } + else + { + setEventMessage($langs->trans("Error"),'errors'); + } +} + // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...) if ($action == 'setModuleOptions') { @@ -247,7 +263,7 @@ $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup'); -$head = propal_admin_prepare_head(null); +$head = propal_admin_prepare_head(); dol_fiche_head($head, 'general', $langs->trans("Proposals"), 0, 'propal'); @@ -582,6 +598,35 @@ print '' print "\n"; print ''; +if ($conf->banque->enabled) +{ + $var=!$var; + print ''; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").' '; + if (! empty($conf->use_javascript_ajax)) + { + print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL'); + } + else + { + if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL)) + { + print ''.img_picto($langs->trans("Disabled"),'switch_off').''; + } + else + { + print ''.img_picto($langs->trans("Enabled"),'switch_on').''; + } + } + print ''; +} +else +{ + $var=!$var; + print ''; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").' '.$langs->trans('NotAvailable').''; +} + print ''; diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 050c92fd188..2e9d1f49169 100644 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -86,6 +86,13 @@ print_fiche_titre($langs->trans("SecuritySetup"),'','setup'); print $langs->trans("ProxyDesc")."
\n"; print "
\n"; + + +print '
'; +print ''; +print ''; + + $head=security_prepare_head(); dol_fiche_head($head, 'proxy', $langs->trans("Security")); @@ -118,10 +125,6 @@ if ($conf->use_javascript_ajax) // Timeout $var=true; -print ''; -print ''; -print ''; - print ''; print ''; @@ -196,14 +199,13 @@ print ''; print '
'; -print '
'; -print ''; -print '
'; - -print '
'; - dol_fiche_end(); +print '
'; +print ''; +print '
'; + +print ''; $db->close(); diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php index d7027d8a1dd..99651a4f4f3 100644 --- a/htdocs/admin/salaries.php +++ b/htdocs/admin/salaries.php @@ -23,7 +23,7 @@ */ require '../main.inc.php'; - + // Class require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; @@ -45,7 +45,7 @@ $list = array ( /* * Actions */ - + if ($action == 'update') { $error = 0; @@ -72,12 +72,12 @@ if ($action == 'update') * View */ -llxHeader(); +llxHeader('',$langs->trans('SalariesSetup')); $form = new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans('ConfigSalaries'),$linkback,'setup'); +print_fiche_titre($langs->trans('SalariesSetup'),$linkback,'setup'); print '
'; print ''; @@ -98,7 +98,7 @@ foreach ($list as $key) print ''; // Param - $label = $langs->trans($key); + $label = $langs->trans($key); print ''; // Value diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php new file mode 100644 index 00000000000..4c0dd435634 --- /dev/null +++ b/htdocs/admin/security_file.php @@ -0,0 +1,214 @@ + + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2013 Juanjo Menent + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/admin/security_file.php + * \ingroup core + * \brief Security options setup + */ + +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; + +$langs->load("users"); +$langs->load("admin"); +$langs->load("other"); + +if (! $user->admin) + accessforbidden(); + +$action=GETPOST('action','alpha'); + +$upload_dir=$conf->admin->dir_temp; + + +/* + * Actions + */ + +if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC)) +{ + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + + dol_add_file_process($upload_dir, 0, 0, 'userfile'); +} + +if (preg_match('/set_(.*)/',$action,$reg)) +{ + $code=$reg[1]; + $value=(GETPOST($code) ? GETPOST($code) : 1); + if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0) + { + Header("Location: ".$_SERVER["PHP_SELF"]); + exit; + } + else + { + dol_print_error($db); + } +} + +else if (preg_match('/del_(.*)/',$action,$reg)) +{ + $code=$reg[1]; + if (dolibarr_del_const($db, $code, $conf->entity) > 0) + { + Header("Location: ".$_SERVER["PHP_SELF"]); + exit; + } + else + { + dol_print_error($db); + } +} + +else if ($action == 'updateform') +{ + $res3=dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity); + $res4=dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity); + $res5=dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", $_POST["MAIN_ANTIVIRUS_COMMAND"],'chaine',0,'',$conf->entity); + $res6=dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity); + if ($res3 && $res4 && $res5 && $res6) setEventMessage($langs->trans("RecordModifiedSuccessfully")); +} + + + +// Delete file +else if ($action == 'delete') +{ + $langs->load("other"); + $file = $conf->admin->dir_temp . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). + $ret=dol_delete_file($file); + if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); + else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); + Header('Location: '.$_SERVER["PHP_SELF"]); + exit; +} + +/* + * View + */ + +$form = new Form($db); + +llxHeader('',$langs->trans("Files")); + +print_fiche_titre($langs->trans("SecuritySetup"),'','setup'); + +//print $langs->trans("FilesDesc")."
\n"; +//print "
\n"; + + + +print ''; +print ''; +print ''; + +$head=security_prepare_head(); + +dol_fiche_head($head, 'file', $langs->trans("Security")); + + +// Upload options +$var=false; + +print ''; +print ''; +print ''; +print ''; +print ''; + +print ''; +print ''; +print ''; +print ''; + +$var=!$var; +print ''; +print ''; +print ''; +print ''; + +// Use anti virus +$var=!$var; +print ""; +print ''; +print '"; +print ''; + +// Use anti virus +$var=!$var; +print ""; +print ''; +print '"; +print ''; + +print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'.$langs->trans("MaxSizeForUploadedFiles").'.'; +$max=@ini_get('upload_max_filesize'); +if ($max) print ' '.$langs->trans("MustBeLowerThanPHPLimit",$max*1024,$langs->trans("Kb")).'.'; +else print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.'; +print ''; +print ' '.$langs->trans("Kb"); +print '
'.$langs->trans("UMask").''; +print $form->textwithpicto('',$langs->trans("UMaskExplanation")); +print ''; +print ''; +print '
'.$langs->trans("AntiVirusCommand").'
'; +print $langs->trans("AntiVirusCommandExample"); +// Check command in inside safe_mode +print '		'; +if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) +{ + $langs->load("errors"); + $basedir=preg_replace('/"/','',dirname($conf->global->MAIN_ANTIVIRUS_COMMAND)); + $listdir=explode(';',ini_get('safe_mode_exec_dir')); + if (! in_array($basedir,$listdir)) + { + print img_warning($langs->trans('WarningSafeModeOnCheckExecDir')); + dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING); + } +} +print ''; +print "
'.$langs->trans("AntiVirusParam").'
'; +print $langs->trans("AntiVirusParamExample"); +print '		'; +print ''; +print "
'; + +dol_fiche_end(); + +print '
'; + +print ''; + + + +// Form to test upload +print '
'; +$formfile=new FormFile($db); +$formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestFileUploadForm"), 0, 0, 1, 50, '', '', 1, '', 0); + +// List of document +$filearray=dol_dir_list($upload_dir, "files", 0, '', '', 'name', SORT_ASC, 1); +$formfile->list_of_documents($filearray, '', 'admin_temp', ''); + +llxFooter(); +$db->close(); diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 8c65d1f3359..4dc0c0e06a3 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -37,20 +37,12 @@ if (! $user->admin) $action=GETPOST('action','alpha'); -$upload_dir=$conf->admin->dir_temp; /* * Actions */ -if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC)) -{ - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - - dol_add_file_process($upload_dir, 0, 0, 'userfile'); -} - if (preg_match('/set_(.*)/',$action,$reg)) { $code=$reg[1]; @@ -80,51 +72,15 @@ else if (preg_match('/del_(.*)/',$action,$reg)) } } -else if ($action == 'MAIN_SESSION_TIMEOUT') +else if ($action == 'updateform') { - if (! dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity)) dol_print_error($db); - else setEventMessage($langs->trans("RecordModifiedSuccessfully")); -} -else if ($action == 'MAIN_UPLOAD_DOC') -{ - if (! dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity)) dol_print_error($db); - else setEventMessage($langs->trans("RecordModifiedSuccessfully")); -} -else if ($action == 'MAIN_UMASK') -{ - if (! dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity)) dol_print_error($db); - else setEventMessage($langs->trans("RecordModifiedSuccessfully")); -} -else if ($action == 'MAIN_ANTIVIRUS_COMMAND') -{ - if (! dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", $_POST["MAIN_ANTIVIRUS_COMMAND"],'chaine',0,'',$conf->entity)) dol_print_error($db); - else setEventMessage($langs->trans("RecordModifiedSuccessfully")); -} -else if ($action == 'MAIN_ANTIVIRUS_PARAM') -{ - if (! dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity)) dol_print_error($db); - else setEventMessage($langs->trans("RecordModifiedSuccessfully")); -} -else if ($action == 'MAIN_APPLICATION_TITLE') -{ - if (! dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity)) dol_print_error($db); - else setEventMessage($langs->trans("RecordModifiedSuccessfully")); + $res1=dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", $_POST["MAIN_APPLICATION_TITLE"],'chaine',0,'',$conf->entity); + $res2=dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity); + if ($res1 && $res2) setEventMessage($langs->trans("RecordModifiedSuccessfully")); } -// Delete file -else if ($action == 'delete') -{ - $langs->load("other"); - $file = $conf->admin->dir_temp . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). - $ret=dol_delete_file($file); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); - Header('Location: '.$_SERVER["PHP_SELF"]); - exit; -} - /* * View */ @@ -138,59 +94,17 @@ print_fiche_titre($langs->trans("SecuritySetup"),'','setup'); print $langs->trans("MiscellaneousDesc")."
\n"; print "
\n"; + + +print '
'; +print ''; +print ''; + $head=security_prepare_head(); dol_fiche_head($head, 'misc', $langs->trans("Security")); -// Timeout -$var=true; - -print ''; -print ''; -print ''; -print ''; -print ''; -print "\n"; - -$var=!$var; -$sessiontimeout=ini_get("session.gc_maxlifetime"); -if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT=$sessiontimeout; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; - -$var=!$var; -$sessiontimeout=ini_get("session.gc_maxlifetime"); -if (empty($conf->global->MAIN_APPLICATION_TITLE)) $conf->global->MAIN_APPLICATION_TITLE=""; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; - -print '
'.$langs->trans("Parameters").''.$langs->trans("Value").' 
'.$langs->trans("SessionTimeOut").''; -print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); -print ''; -print ' '.strtolower($langs->trans("Seconds")); -print ''; -print ''; -print '
'.$langs->trans("HiddeNumVersion").''; -print $form->textwithpicto('',$langs->trans("HiddeNumVersionExample",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); -print ''; -print ' '; -print ''; -print ''; -print '
'; -print '
'; - - // Other Options $var=true; @@ -254,107 +168,50 @@ print ""; print ''; + print '
'; -// Upload options -$var=false; -print ''; +// Timeout +$var=true; + +print '
'; print ''; print ''; print ''; -print ''; -print ''; +print "\n"; -print ''; -print ''; +$var=!$var; +$sessiontimeout=ini_get("session.gc_maxlifetime"); +if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT=$sessiontimeout; print ''; -print ''; print ''; -print ''; -print ''; +print ''; $var=!$var; -print ''; -print ''; +$sessiontimeout=ini_get("session.gc_maxlifetime"); +if (empty($conf->global->MAIN_APPLICATION_TITLE)) $conf->global->MAIN_APPLICATION_TITLE=""; print ''; -print ''; print ''; -print ''; -print ''; - -// Use anti virus -$var=!$var; -print ''; -print ''; -print ""; -print ''; -print '"; -print ''; print ''; -print ''; - -// Use anti virus -$var=!$var; -print ''; -print ''; -print ""; -print ''; -print '"; -print ''; -print ''; -print ''; print '
'.$langs->trans("Parameters").''.$langs->trans("Value").' 
'.$langs->trans("MaxSizeForUploadedFiles").'.'; -$max=@ini_get('upload_max_filesize'); -if ($max) print ' '.$langs->trans("MustBeLowerThanPHPLimit",$max*1024,$langs->trans("Kb")).'.'; -else print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.'; +print ''.$langs->trans("SessionTimeOut").''; +print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); print ''; -print ' '.$langs->trans("Kb"); +print ' '.strtolower($langs->trans("Seconds")); print ''; -print ''; -print '
'.$langs->trans("UMask").''; -print $form->textwithpicto('',$langs->trans("UMaskExplanation")); +print ''.$langs->trans("MAIN_APPLICATION_TITLE").''; print ''; -print ''; -print ''; -print ''; -print '
'.$langs->trans("AntiVirusCommand").'
'; -print $langs->trans("AntiVirusCommandExample"); -// Check command in inside safe_mode -print '		'; -if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) -{ - $langs->load("errors"); - $basedir=preg_replace('/"/','',dirname($conf->global->MAIN_ANTIVIRUS_COMMAND)); - $listdir=explode(';',ini_get('safe_mode_exec_dir')); - if (! in_array($basedir,$listdir)) - { - print img_warning($langs->trans('WarningSafeModeOnCheckExecDir')); - dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING); - } -} -print ''; -print "'; -print ''; +print ' '; print '
'.$langs->trans("AntiVirusParam").'
'; -print $langs->trans("AntiVirusParamExample"); -print '		'; -print ''; -print "'; -print ''; -print '
'; dol_fiche_end(); -// Form to test upload -print '
'; -$formfile=new FormFile($db); -$formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestFileUploadForm"), 0, 0, 1, 50, '', '', 1, '', 0); +print '
'; + +print ''; -// List of document -$filearray=dol_dir_list($upload_dir, "files", 0, '', '', 'name', SORT_ASC, 1); -$formfile->list_of_documents($filearray, '', 'admin_temp', ''); llxFooter(); $db->close(); diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 0ba8427cca5..6213acec5b7 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -203,11 +203,11 @@ if ($action == 'edit') */ print ''; - print '
'; + print '
'; print ''; - print '     '; + print '     '; print ''; - print '
'; + print ''; print ''; print '
'; diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php index af46c074bb9..9c81338562e 100644 --- a/htdocs/admin/spip.php +++ b/htdocs/admin/spip.php @@ -117,10 +117,11 @@ $head = mailmanspip_admin_prepare_head(); dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user'); +$var=true; + /* * Spip */ -$var=!$var; if (! empty($conf->global->ADHERENT_USE_SPIP)) { //$lien=img_picto($langs->trans("Active"),'tick').' '; diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index d0582a91630..6b2c626da39 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -113,35 +113,20 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup'); $form=new Form($db); -$var=true; -print ''; -print ''; -print " \n"; -print " \n"; -print ''."\n"; -/* - * Formulaire parametres divers - */ +$disabled=''; +if (! empty($conf->productbatch->enabled)) +{ + $langs->load("productbatch"); + $disabled=' disabled="disabled"'; + print info_admin($langs->trans("WhenProductBatchModuleOnOptionAreForced")); +} -$var=!$var; - -print ""; -print ''; - -print '\n"; -print "\n"; -print '
'; -print '
".$langs->trans("Parameters")." 
'.$langs->trans("UserWarehouseAutoCreate").''; -print "
"; -print ''; -print ""; -print $form->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1); -print ''; -print '
'; -print "
'; -print '
'; +//if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) +//{ +print info_admin($langs->trans("IfYouUsePointOfSaleCheckModule")); +//} // Title rule for stock decrease print ''; @@ -160,8 +145,8 @@ if (! empty($conf->facture->enabled)) print ""; print ''; print ""; - print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1); - print ''; + print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1,$disabled); + print ''; print "\n\n\n"; } @@ -174,8 +159,8 @@ if (! empty($conf->commande->enabled)) print ""; print ''; print ""; - print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1); - print ''; + print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1,$disabled); + print ''; print "\n\n\n"; } @@ -188,11 +173,12 @@ if (! empty($conf->expedition->enabled)) print ""; print ''; print ""; - print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1); - print ''; + print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1,$disabled); + print ''; print "\n\n\n"; } print '
'; + print '
'; // Title rule for stock increase @@ -212,8 +198,8 @@ if (! empty($conf->fournisseur->enabled)) print "
"; print ''; print ""; - print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1); - print ''; + print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1,$disabled); + print ''; print "
\n\n\n"; } @@ -226,8 +212,8 @@ if (! empty($conf->fournisseur->enabled)) print "
"; print ''; print ""; - print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1); - print ''; + print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1,$disabled); + print ''; print "
\n\n\n"; } if (! empty($conf->fournisseur->enabled)) @@ -239,8 +225,8 @@ if (! empty($conf->fournisseur->enabled)) print "
"; print ''; print ""; - print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1); - print ''; + print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1,$disabled); + print ''; print "
\n\n\n"; } @@ -329,6 +315,34 @@ if ($virtualdiffersfromphysical) print ''; } + +$var=true; +print ''; + +print ''; +print " \n"; +print " \n"; +print ''."\n"; + +$var=!$var; + +print ""; +print ''; + +print '\n"; +print "\n"; +print '
'; +print '
".$langs->trans("Other")." 
'.$langs->trans("UserWarehouseAutoCreate").''; +print "
"; +print ''; +print ""; +print $form->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1); +print ''; +print '
'; +print "
'; +print '
'; + + llxFooter(); $db->close(); diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 5745c5f82ba..2f48eb2be79 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -198,7 +198,7 @@ print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup'); print "
"; -$head = supplierorder_admin_prepare_head(null); +$head = supplierorder_admin_prepare_head(); dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), 0, 'company'); diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index ac2ab824233..2d4be98f34a 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -199,7 +199,7 @@ print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup'); print "
"; -$head = supplierorder_admin_prepare_head(null); +$head = supplierorder_admin_prepare_head(); dol_fiche_head($head, 'order', $langs->trans("Suppliers"), 0, 'company'); diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php index ba584bdae8c..e47c8738041 100644 --- a/htdocs/admin/supplierinvoice_extrafields.php +++ b/htdocs/admin/supplierinvoice_extrafields.php @@ -38,6 +38,7 @@ if (!$user->admin) $langs->load("admin"); $langs->load("other"); $langs->load("bills"); +$langs->load("orders"); $langs->load("suppliers"); $extrafields = new ExtraFields($db); @@ -75,7 +76,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup'); print "
\n"; -$head = supplierorder_admin_prepare_head(null); +$head = supplierorder_admin_prepare_head(); dol_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), 0, 'company'); diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php index 4a2671942fa..96e20b92f17 100644 --- a/htdocs/admin/supplierorder_extrafields.php +++ b/htdocs/admin/supplierorder_extrafields.php @@ -73,7 +73,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup'); print "
\n"; -$head = supplierorder_admin_prepare_head(null); +$head = supplierorder_admin_prepare_head(); dol_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), 0, 'company'); diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index b69e8a4cacf..18de8bf6bfc 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -183,8 +183,9 @@ foreach ($syslogModules as $moduleName) { $module = new $moduleName; - $moduleactive=$module->isActive(); - if ($moduleactive == -1 && empty($conf->global->MAIN_FEATURES_LEVEL)) continue; // Some modules are hidden if not activable and not into debug mode (end user must not see them) + $moduleactive=(int) $module->isActive(); + //print $moduleName." = ".$moduleactive." - ".$module->getName()." ".($moduleactive == -1)."
\n"; + if (($moduleactive == -1) && empty($conf->global->MAIN_FEATURES_LEVEL)) continue; // Some modules are hidden if not activable and not into debug mode (end user must not see them) $var=!$var; print ''; @@ -199,7 +200,7 @@ foreach ($syslogModules as $moduleName) { foreach ($setuparray as $option) { - if (isset($_POST[$option['constant']])) $value=$_POST[$option['constant']]; + if (isset($_POST[$option['constant']])) $value=$_POST[$option['constant']]; else if (defined($option['constant'])) $value = constant($option['constant']); else $value = (isset($option['default']) ? $option['default'] : ''); @@ -220,7 +221,7 @@ foreach ($syslogModules as $moduleName) print "\n"; print "\n"; -print '
'; +print '
'."\n\n"; print_titre($langs->trans("SyslogLevel")); diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php index e7490225107..532293cdad2 100644 --- a/htdocs/admin/system/about.php +++ b/htdocs/admin/system/about.php @@ -51,8 +51,8 @@ print ''; print $langs->trans("Developpers").':'; print ''; //print "
\n"; @@ -61,31 +61,31 @@ print $langs->trans("OtherInformations").':'; print ''; print $langs->trans("Demo").':'; print ''; print $langs->trans("ModulesMarketPlaces").':'; print ''; @@ -94,7 +94,7 @@ print $langs->trans("HelpCenter").':'; print ''; @@ -104,11 +104,11 @@ print ''; @@ -120,11 +120,11 @@ $url='http://saas.dolibarr.org'; $title=$langs->trans("OfficialWebHostingService if (preg_match('/^fr_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Solutions_de_Cloud'; if (preg_match('/^es_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Soluciones_en_la_Nube'; print '
  • '; -print ''.$title.''; +print ''.$title.''; print '
    • '; $url='http://partners.dolibarr.org'; $title=$langs->trans("ReferencedPreferredPartners"); print '
  • '; -print ''.$title.''; +print ''.$title.''; print '
    • '; print ''; diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php index 27c447e7c15..0e49564ece7 100644 --- a/htdocs/admin/system/perf.php +++ b/htdocs/admin/system/perf.php @@ -24,6 +24,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("admin"); $langs->load("install"); @@ -51,6 +52,13 @@ print_fiche_titre($langs->trans("PerfDolibarr"),'','setup'); print $langs->trans("YouMayFindPerfAdviceHere",'http://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' ('.$langs->trans("Reload").')
    '; +// Recupere la version de PHP +$phpversion=version_php(); +print "
    PHP - ".$langs->trans("Version").": ".$phpversion."
    \n"; + +// Recupere la version du serveur web +print "
    Web server - ".$langs->trans("Version").": ".$_SERVER["SERVER_SOFTWARE"]."
    \n"; + // XDebug print '
    '; print ''.$langs->trans("XDebug").': '; diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index 22fecdfd524..681c5d43cf3 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -54,7 +54,7 @@ print "\n"; $var=false; -// Recupere la version de l'OS +// Recupere la version de PHP $phpversion=version_php(); print "'.$langs->trans("Version")."".$phpversion."\n"; diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index 8f82f33d039..a968b47050a 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -34,189 +34,195 @@ if (!$user->admin) accessforbidden(); llxHeader(); -if (!function_exists('eaccelerator_info')) -{ - print 'eAccelerator is not installed.'; - llxFooter(); - exit; +if (!function_exists('eaccelerator_info')) { + print 'eAccelerator is not installed.'; + llxFooter(); + exit; } $info = eaccelerator_info(); if (isset($_POST['caching'])) { - if ($info['cache']) { - eaccelerator_caching(false); - } else { - eaccelerator_caching(true); - } + if ($info['cache']) { + eaccelerator_caching(false); + } else { + eaccelerator_caching(true); + } } else if (isset($_POST['optimizer']) && function_exists('eaccelerator_optimizer')) { - if ($info['optimizer']) { - eaccelerator_optimizer(false); - } else { - eaccelerator_optimizer(true); - } + if ($info['optimizer']) { + eaccelerator_optimizer(false); + } else { + eaccelerator_optimizer(true); + } } else if (isset($_POST['clear'])) { - eaccelerator_clear(); + eaccelerator_clear(); } else if (isset($_POST['clean'])) { - eaccelerator_clean(); + eaccelerator_clean(); } else if (isset($_POST['purge'])) { - eaccelerator_purge(); + eaccelerator_purge(); } $info = eaccelerator_info(); if (!is_array($info)) { - dol_print_error('','An error occured getting eAccelerator information, this is caused if eAccelerator isn\'t initalised properly'); - exit; + dol_print_error('','An error occured getting eAccelerator information, this is caused if eAccelerator isn\'t initalised properly'); + exit; } - +/** + * Compare revisions + * + * @param array $x Parts of version 1 + * @param array $y Parts of version 2 + * @return int -1 if 1<2, 0 if 1=2, 1 if 1>2 + */ function compare($x, $y) { - global $sortby; + global $sortby; - if ( $x[$sortby] == $y[$sortby] ) - return 0; - else if ( $x[$sortby] < $y[$sortby] ) - return -1; - else - return 1; + if ( $x[$sortby] == $y[$sortby] ) { + return 0; + } else if ($x[$sortby] < $y[$sortby]) { + return -1; + } else { + return 1; + } } /** * Compare revisions * - * @param array $x Parts of version 1 - * @param array $y Parts of version 2 - * @return int 1 if 1<2, 0 if 1=2, -1 if 1>2 + * @param array $x Parts of version 1 + * @param array $y Parts of version 2 + * @return int 1 if 1<2, 0 if 1=2, -1 if 1>2 */ function revcompare($x, $y) { - global $sortby, $langs; + global $sortby, $langs; - if ( $x[$sortby] == $y[$sortby] ) - return 0; - else if ( $x[$sortby] < $y[$sortby] ) - return 1; - else - return -1; + if ($x[$sortby] == $y[$sortby]) { + return 0; + } else if ($x[$sortby] < $y[$sortby]) { + return 1; + } else { + return -1; + } } /** * Output table * - * @param array $list Array of records - * @return void + * @param array $list Array of records + * @return void */ function create_script_table($list) { - global $sortby,$bc,$langs; - $var=true; + global $sortby,$bc,$langs; + $var=true; - if (isset($_GET['order']) && ($_GET['order'] == "asc" || $_GET['order'] =="desc")) { - $order = $_GET['order']; - } else { - $order = "asc"; - } + if (isset($_GET['order']) && ($_GET['order'] == "asc" || $_GET['order'] =="desc")) { + $order = $_GET['order']; + } else { + $order = "asc"; + } - if (isset($_GET['sort'])) { - switch ($_GET['sort']) { - case "mtime": - case "size": - case "reloads": - case "hits": - $sortby = $_GET['sort']; - ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare')); - break; - default: - $sortby = "file"; - ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare')); - } - } + if (isset($_GET['sort'])) { + switch ($_GET['sort']) { + case "mtime": + case "size": + case "reloads": + case "hits": + $sortby = $_GET['sort']; + ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare')); + break; + default: + $sortby = "file"; + ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare')); + } + } - ?> - - - - - - - - - '; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + switch ($sortby) { + case "mtime": + case "size": + case "reloads": + case "hits": + ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare')); + break; + case "file": + default: + $sortby = "file"; + ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare')); - } + } + + foreach($list as $script) { + $var = ! $var; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + print '
    ">trans("Filename"); ?> ">trans("Date"); ?> ">trans("Size"); ?> ">trans("Reloads"); ?> ">trans("Hits"); ?> 
    '.$langs->trans("Filename").' '; + if($sortby == "file") + print ($order == "asc" ? "↓" : "↑").''.$langs->trans("Date").' '; + if($sortby == "mtime") + print ($order == "asc" ? "↓" : "↑").''.$langs->trans("Size").' '; + if($sortby == "size") + print ($order == "asc" ? "↓" : "↑").''.$langs->trans("Reloads").' '; + if($sortby == "reloads") + print ($order == "asc" ? "↓" : "↑").''.$langs->trans("Hits").' '; + if($sortby == "hits") + print ($order == "asc" ? "↓" : "↑").'
    '.dol_trunc($script['file'],80,'left').''.dol_print_date($script['mtime'],'dayhour').''.number_format($script['size'] / 1024, 2).'KB'.$script['reloads'].' ('.$script['usecount'].')'.$script['hits'].'
    '; - foreach($list as $script) { ?> - > - - - - KB - () - - - - - - - - - - - - - - > - - - - - - -
    NameCreatedtrans("Size"); ?>ttl
    - KB
    - '; + print ''; + print 'Name'; + print 'Created'; + print ''.$langs->trans("Size").''; + print 'ttl'; + print ''; + + foreach($list as $key) { + $var = !$var; + print ''; + print ''.dol_trunc($key['name'],80,'left').''; + print ''.dol_print_date($key['created'],'dayhour').''; + print ''.number_format($key['size']/1024, 3).'KB'; + print ''; + if ($key['ttl'] == -1) { + print 'expired'; + } elseif ($key['ttl'] == 0) { + print 'none'; + } else { + print dol_print_date($key['ttl'],'dayhour'); + } + print ''; + print ''; + } + print ''; } @@ -225,123 +231,117 @@ print_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel','', $var=true; -?> -
    +print '
    '; - - - - - > - - - - > - - - - > - - - - > - - - - > - - - - > - - - - > - - - -
    Information
    Caching enabled
    Optimizer enabled
    Memory usage% - ( - MB / - MB)
    Free memory in reserved cacheMB
    Cached scripts
    Removed scripts
    Cached keys
    -'; +print ''; +print 'Information'; +print ''; +$var = !$var; +print ''; +print 'Caching enabled'; +print ''.($info['cache']?'yes':'no').''; +print ''; +$var = !$var; +print ''; +print 'Optimizer enabled'; +print ''.$info['optimizer']?'yes':'no'.''; +print ''; +$var = !$var; +print ''; +print 'Memory usage'; +print ''.number_format(100 * $info['memoryAllocated']/$info['memorySize'], 2).'%('.number_format($info['memoryAllocated'] / (1024*1024), 2).'MB / '.number_format($info['memorySize']/(1024*1024), 2).'MB)'; +print ''; +$var = ! $var; +print ''; +print 'Free memory in reserved cache'; +print ''.number_format($info['memoryAvailable']/(1024*1024), 2).'MB'; +print ''; +$var = ! $var; +print ''; +print 'Cached scripts'; +print ''.$info['cachedScripts'].''; +print ''; +$var = ! $var; +print ''; +print 'Removed scripts'; +print ''.$info['removedScripts'].''; +print ''; +$var = ! $var; +print ''; +print 'Cached keys'; +print ''.(isset($info['cachedKeys'])?$info['cachedKeys']:'').''; +print ''; +print ''; $var=true; -$resCached = @eaccelerator_cached_scripts(); // If success return an array +$resCached = @eaccelerator_cached_scripts(); // If success return an array $resRemoved = @eaccelerator_removed_scripts(); -if (is_array($resCached) || is_array($resRemoved)) -{ - print "
    "; - print '
    '; - print ''; - print ''; - print ''; +if (is_array($resCached) || is_array($resRemoved)) { + print "
    "; + print ''; + print ''; + print '
    Actions
    '; + print ''; - if (is_array($resCached)) - { - $var = ! $var; - print ""; - print ""; - print ''; - print ""; - $var = ! $var; - print ""; - print ""; - print ''; - print ""; - } + if (is_array($resCached)) { + $var = ! $var; + print ""; + print ""; + print ''; + print ""; + $var = ! $var; + print ""; + print ""; + print ''; + print ""; + } - if (is_array($resRemoved)) - { - $var = ! $var; - print ""; - print ""; - print ''; - print ""; - $var = ! $var; - print ""; - print ""; - print ''; - print ""; - $var = ! $var; - print ""; - print ""; - print ''; - print "
    Actions
    Caching
    Optimizer
    Caching
    Optimizer
    Clear cache
    Clean cache
    Purge cache
    "; - } + if (is_array($resRemoved)) { + $var = ! $var; + print ""; + print "Clear cache"; + print ''; + print ""; + $var = ! $var; + print ""; + print "Clean cache"; + print ''; + print ""; + $var = ! $var; + print ""; + print "Purge cache"; + print ''; + print ""; + } - if (is_array($resCached)) - { - print "

    "; - print "Cached scripts
    "; - create_script_table($resCached); - } + if (is_array($resCached)) { + print "

    "; + print "Cached scripts
    "; + create_script_table($resCached); + } - if (is_array($resRemoved)) - { - print "

    "; - print "Removed scripts
    "; - create_script_table($resRemoved); - } -} -else -{ - print "

    "; - print "Check in your php.ini that eaccelerator.allowed_admin_path parameter is : "; - print "

    "; - print "".$_SERVER["SCRIPT_FILENAME"].""; - print "

    "; + if (is_array($resRemoved)) { + print "

    "; + print "Removed scripts
    "; + create_script_table($resRemoved); + } +} else { + print "

    "; + print "Check in your php.ini that eaccelerator.allowed_admin_path parameter is : "; + print "

    "; + print "".$_SERVER["SCRIPT_FILENAME"].""; + print "

    "; } -if (function_exists('eaccelerator_get')) -{ - print '

    '; - print 'Cached keys
    '; - $res=eaccelerator_list_keys(); - create_key_table($res); +if (function_exists('eaccelerator_get')) { + print '

    '; + print 'Cached keys
    '; + $res=eaccelerator_list_keys(); + create_key_table($res); } print "

    "; diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 203776bc7f9..0831571ace1 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -485,7 +485,7 @@ function backup_tables($outputfile, $tables='*') $row[$j] = "''"; } elseif(is_numeric($row[$j]) and !strcmp($row[$j], $row[$j]+0) ) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0) // if it's a number, we return it as-is - $row[$j] = $row[$j]; +// $row[$j] = $row[$j]; } else { // else for all other cases we escape the value and put quotes around $row[$j] = addslashes($row[$j]); $row[$j] = preg_replace("#\n#", "\\n", $row[$j]); diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php index ec72b30864f..abb9710cc03 100644 --- a/htdocs/admin/tools/index.php +++ b/htdocs/admin/tools/index.php @@ -53,7 +53,7 @@ print '

    '; // Show logo -print '
    '; +print '
    '; llxFooter(); $db->close(); diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index 4f3f14302fd..a872c0676f2 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -151,7 +151,7 @@ print ''; if ($choice != 'confirm_allfiles') { print '
    '; - print '
    '; + print '
    '; } print ''; diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php index d1dcb501f41..6b566e60f55 100644 --- a/htdocs/asterisk/cidlookup.php +++ b/htdocs/asterisk/cidlookup.php @@ -28,10 +28,17 @@ * */ -$phone = $_GET['phone']; include '../master.inc.php'; +$phone = GETPOST('phone'); + + +// Security check +if (empty($conf->clicktodial->enabled)) { + print "Error: Module Click to dial not active\n"; + exit; +} // Check parameters if (empty($phone)) diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php index d862cb5da8f..0ce692674b1 100644 --- a/htdocs/barcode/printsheet.php +++ b/htdocs/barcode/printsheet.php @@ -121,8 +121,8 @@ if ($action == 'builddoc') if (! $error) { $code=$forbarcode; - $generator=$stdobject->barcode_type_coder; - $encoding=strtoupper($stdobject->barcode_type_code); + $generator=$stdobject->barcode_type_coder; // coder (loaded by fetch_barcode). Engine. + $encoding=strtoupper($stdobject->barcode_type_code); // code (loaded by fetch_barcode). Example 'ean', 'isbn', ... $barcodeimage=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png'; $diroutput=$conf->barcode->dir_temp; diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php index 68adb30f7ab..95be1b5251a 100644 --- a/htdocs/bookmarks/admin/bookmark.php +++ b/htdocs/bookmarks/admin/bookmark.php @@ -80,7 +80,7 @@ print ''; print $langs->trans("NbOfBoomarkToShow").''; print ''; print ''; -print '
    '; +print '
    '; $db->close(); diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php index 640e7e72c57..a821cf8e94f 100644 --- a/htdocs/bookmarks/card.php +++ b/htdocs/bookmarks/card.php @@ -1,6 +1,7 @@ * Copyright (C) 2005-2013 Laurent Destailleur + * 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 @@ -43,6 +44,8 @@ $userid=GETPOST("userid","int"); $position=GETPOST("position","int"); $backtopage=GETPOST('backtopage','alpha'); +$bookmark=new Bookmark($db); + /* * Actions @@ -50,6 +53,13 @@ $backtopage=GETPOST('backtopage','alpha'); if ($action == 'add' || $action == 'addproduct' || $action == 'update') { + + if ($action == 'update') { + $invertedaction = 'edit'; + } else { + $invertedaction = 'create'; + } + $error = 0; if (GETPOST("cancel")) @@ -59,7 +69,6 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update') exit; } - $bookmark=new Bookmark($db); if ($action == 'update') $bookmark->fetch($_POST["id"]); $bookmark->fk_user=$userid; $bookmark->title=$title; @@ -69,12 +78,12 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update') if (! $title) { $error++; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("BookmarkTitle")), 'errors'); + setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->trans("BookmarkTitle")), 'errors'); } if (! $url) { $error++; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("UrlOrLink")), 'errors'); + setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->trans("UrlOrLink")), 'errors'); } if (! $error) @@ -95,43 +104,21 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update') if ($bookmark->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("WarningBookmarkAlreadyExists"), 'warnings'); + setEventMessage($langs->transnoentities("WarningBookmarkAlreadyExists"), 'warnings'); } else { setEventMessage($bookmark->error, 'errors'); } - $action='create'; + $action = $invertedaction; } } else { - $action='create'; + $action = $invertedaction; } } -if ($action == 'delete') -{ - $bookmark=new Bookmark($db); - $bookmark->id=$_GET["bid"]; - $bookmark->url=$user->id; - $bookmark->target=$user->id; - $bookmark->title='xxx'; - $bookmark->favicon='xxx'; - - $res=$bookmark->remove(); - if ($res > 0) - { - header("Location: ".$_SERVER["PHP_SELF"]); - exit; - } - else - { - setEventMessage($bookmark->error, 'errors'); - } -} - - /* * View */ @@ -141,6 +128,17 @@ llxHeader(); $form=new Form($db); +$head = array(); +$h=1; + +$head[$h][0] = $_SERVER["PHP_SELF"].($bookmark->id?'id='.$bookmark->id:''); +$head[$h][1] = $langs->trans("Card"); +$head[$h][2] = 'card'; +$h++; + +$hselected='card'; + + if ($action == 'create') { /* @@ -150,11 +148,11 @@ if ($action == 'create') print '
    '."\n"; print ''; print ''; - + print_fiche_titre($langs->trans("NewBookmark")); dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark'); - + print ''; print ''; @@ -175,16 +173,16 @@ if ($action == 'create') print 'position).'">'; print ''; - print '
    '.$langs->trans("BookmarkTitle").''.$langs->trans("SetHereATitleForLink").'
     

    '; - + print ''; + + dol_fiche_end(); + print '
    '; print '   '; print ''; print '
    '; print '
    '; - - dol_fiche_end(); } @@ -193,11 +191,15 @@ if ($id > 0 && ! preg_match('/^add/i',$action)) /* * Fact bookmark mode or visually edition */ - $bookmark=new Bookmark($db); $bookmark->fetch($id); - - dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark'); + $head = array( + array( + '', + $langs->trans('Card'), + 'card' + ) + ); if ($action == 'edit') { @@ -209,16 +211,37 @@ if ($id > 0 && ! preg_match('/^add/i',$action)) print ''; } + dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark'); + print ''; print ''; - print ''; - print ''; @@ -267,12 +290,14 @@ if ($id > 0 && ! preg_match('/^add/i',$action)) print '
    '.$langs->trans("Ref").''.$bookmark->ref.'
    '.$langs->trans("BookmarkTitle").''; + print '
    '; + if ($action == 'edit') { + print ''; + } + + print $langs->trans("BookmarkTitle"); + + if ($action == 'edit') { + print ''; + } + + print ''; if ($action == 'edit') print 'title).'">'; else print $bookmark->title; print '
    '.$langs->trans("UrlOrLink").''; + print '
    '; + if ($action == 'edit') { + print ''; + } + print $langs->trans("UrlOrLink"); + if ($action == 'edit') { + print ''; + } + print ''; if ($action == 'edit') print 'url).'">'; else print 'target?' target="_blank"':'').'>'.$bookmark->url.''; print '
    '; - if ($action == 'edit') print '
       
    '; - - if ($action == 'edit') print ''; - dol_fiche_end(); + if ($action == 'edit') + { + print '
       
    '; + print ''; + } + print "
    \n"; diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index 61dc0a91d7e..748a4d9b7fa 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -25,6 +25,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php'; $langs->load("bookmarks"); +$langs->load("admin"); // Security check if (! $user->rights->bookmark->lire) { @@ -58,7 +59,7 @@ if ($_GET["action"] == 'delete') } else { - $setEventMessage($bookmark->error, 'errors'); + setEventMessage($bookmark->error, 'errors'); } } diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 277dc81820b..861267b94f3 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -50,14 +50,13 @@ if (GETPOST('action','alpha') == 'set') $db->begin(); if (GETPOST('socid','int') < 0) $_POST["socid"]=''; - /*if (GETPOST("CASHDESK_ID_BANKACCOUNT") < 0) $_POST["CASHDESK_ID_BANKACCOUNT"]=''; - if (GETPOST("CASHDESK_ID_WAREHOUSE") < 0) $_POST["CASHDESK_ID_WAREHOUSE"]='';*/ - $res = dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",GETPOST('socid','int'),'chaine',0,'',$conf->entity); - $res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CASH",GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha'),'chaine',0,'',$conf->entity); - $res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CHEQUE",GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE','alpha'),'chaine',0,'',$conf->entity); - $res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CB",GETPOST('CASHDESK_ID_BANKACCOUNT_CB','alpha'),'chaine',0,'',$conf->entity); - $res = dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",GETPOST('CASHDESK_ID_WAREHOUSE','alpha'),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",(GETPOST('socid','int') > 0 ? GETPOST('socid','int') : ''),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CASH",(GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha') : ''),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CHEQUE",(GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE','alpha') : ''),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CB",(GETPOST('CASHDESK_ID_BANKACCOUNT_CB','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB','alpha') : ''),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",(GETPOST('CASHDESK_ID_WAREHOUSE','alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE','alpha') : ''),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",GETPOST('CASHDESK_NO_DECREASE_STOCK','alpha'),'chaine',0,'',$conf->entity); $res = dolibarr_set_const($db,"CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES','alpha'),'chaine',0,'',$conf->entity); dol_syslog("admin/cashdesk: level ".GETPOST('level','alpha')); @@ -129,9 +128,25 @@ if (! empty($conf->banque->enabled)) if (! empty($conf->stock->enabled)) { $var=!$var; - print ''.$langs->trans("CashDeskIdWareHouse").''; + print ''.$langs->trans("CashDeskDoNotDecreaseStock").''; // Force warehouse (this is not a default value) print ''; - print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE','',1); + print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK',$conf->global->CASHDESK_NO_DECREASE_STOCK,1); + print ''; + + $disabled=$conf->global->CASHDESK_NO_DECREASE_STOCK; + + $var=!$var; + print ''.$langs->trans("CashDeskIdWareHouse").''; // Force warehouse (this is not a default value) + print ''; + if (! $disabled) + { + print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE','',1,$disabled); + print ' ('.$langs->trans("Create").')'; + } + else + { + print $langs->trans("StockDecreaseForPointOfSaleDisabled"); + } print ''; } @@ -148,7 +163,7 @@ if (! empty($conf->service->enabled)) print ''; print '
    '; -print '
    '; +print '
    '; print "\n"; diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php index 9940e70cc93..6d8f5ca83ee 100644 --- a/htdocs/cashdesk/affContenu.php +++ b/htdocs/cashdesk/affContenu.php @@ -45,7 +45,17 @@ else -// Left area with selected articles (shopping cart) +$obj_facturation->calculTotaux(); // Redefine prix_total_ttc, prix_total_ht et montant_tva from $_SESSION['poscart'] + +$total_ttc = $obj_facturation->prixTotalTtc(); + +/*var_dump($obj_facturation); +var_dump($_SESSION['poscart']); +var_dump($total_ttc); +exit;*/ + + +// Left area with selected articles (area for article, amount and payments) print '
    '; $page=GETPOST('menu','alpha'); @@ -72,13 +82,10 @@ print '
    '; - // Right area with selected articles (shopping cart) print '
    '; require ('tpl/liste_articles.tpl.php'); -$obj_facturation->prixTotalHt($lst_total_ht); -$obj_facturation->prixTotalTtc($lst_total_ttc); print '
    '; diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index 0972527a73b..f62a9193830 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -222,6 +222,7 @@ p.titre { margin: 0 15px; padding: 0; max-width: 500px; + width: 100%; } .titre1 { @@ -308,7 +309,7 @@ p.titre { } .texte_ref { - width: 80px; + min-width: 150px; } .texte1,.texte1_off { @@ -321,8 +322,8 @@ p.titre { /* ------------------- */ .textarea_note { - width: 300px; - height: 150px; + width: 100%; + height: 50px; padding: 2px 2px; } @@ -362,7 +363,7 @@ p.titre { } .resume_label,.note_label { - width: 200px; + min-width: 200px; font-weight: bold; font-size: 1.1em; } diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php index 42e1c00f651..8953f7b0ccc 100644 --- a/htdocs/cashdesk/facturation_verif.php +++ b/htdocs/cashdesk/facturation_verif.php @@ -137,16 +137,17 @@ switch ( $_GET['action'] ) case 'ajout_article': // We have clicked on button "Add product" - //var_dump($obj_facturation); + //var_dump('ajout_article'); //exit; - if (! empty($obj_facturation->id)) // A product has been selected and stored in session + if (! empty($obj_facturation->id)) // A product was previously selected and stored in session, so we can add it { $obj_facturation->qte($_POST['txtQte']); $obj_facturation->tva($_POST['selTva']); $obj_facturation->remisePercent($_POST['txtRemise']); - $obj_facturation->ajoutArticle(); - + $obj_facturation->ajoutArticle(); // This add an entry into $_SESSION['poscart'] + // We update prixTotalTtc + } $redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menu=facturation'; @@ -160,7 +161,7 @@ switch ( $_GET['action'] ) } - +// We saved object obj_facturation $_SESSION['serObjFacturation'] = serialize($obj_facturation); header('Location: '.$redirection); diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php index f0545181ff0..3e6a88f252a 100644 --- a/htdocs/cashdesk/include/environnement.php +++ b/htdocs/cashdesk/include/environnement.php @@ -32,6 +32,7 @@ $conf_db_base = $dolibarr_main_db_name; $conf_fksoc = (! empty($_SESSION["CASHDESK_ID_THIRDPARTY"]))?$_SESSION["CASHDESK_ID_THIRDPARTY"]:($conf->global->CASHDESK_ID_THIRDPARTY>0?$conf->global->CASHDESK_ID_THIRDPARTY:0); // Identifiant unique correspondant a l'entrepot a utiliser $conf_fkentrepot = (! empty($_SESSION["CASHDESK_ID_WAREHOUSE"]))?$_SESSION["CASHDESK_ID_WAREHOUSE"]:($conf->global->CASHDESK_ID_WAREHOUSE>0?$conf->global->CASHDESK_ID_WAREHOUSE:0); +if (! empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) $conf_fkentrepot = 0; // If option to disable stock decrease is on, we set warehouse id to 0. // Identifiant unique correspondant au compte caisse / liquide $conf_fkaccount_cash = (! empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"]))?$_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"]:($conf->global->CASHDESK_ID_BANKACCOUNT_CASH>0?$conf->global->CASHDESK_ID_BANKACCOUNT_CASH:0); diff --git a/htdocs/cashdesk/include/keypad.php b/htdocs/cashdesk/include/keypad.php index 798c30c92fb..7560180396a 100644 --- a/htdocs/cashdesk/include/keypad.php +++ b/htdocs/cashdesk/include/keypad.php @@ -16,7 +16,7 @@ */ /** - * Return a string to outptu a keypad + * Return a string to output a keypad * * @param string $keypadname Key pad name * @param string $formname Form name @@ -24,6 +24,8 @@ */ function genkeypad($keypadname, $formname) { + global $conf; + if (empty($conf->global->CASHDESK_SHOW_KEYPAD)) return ''; // défine the font size of button diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php index a2eb40f2932..fa1c6723d20 100644 --- a/htdocs/cashdesk/index.php +++ b/htdocs/cashdesk/index.php @@ -99,16 +99,15 @@ print $form->select_company(GETPOST('socid','int')?GETPOST('socid','int'):$conf- print ''; print "\n"; -if (! empty($conf->stock->enabled)) +if (! empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) { $langs->load("stocks"); print ""; print ''.$langs->trans("Warehouse").''; print ''; $disabled=0; - if (! empty($conf->global->CASHDESK_ID_WAREHOUSE)) $disabled=1; // If a particular stock is defined, we disable choice - print $formproduct->selectWarehouses((GETPOST('warehouseid')?GETPOST('warehouseid'):(empty($conf->global->CASHDESK_ID_WAREHOUSE)?'ifone':$conf->global->CASHDESK_ID_WAREHOUSE)),'warehouseid','',!$disabled,$disabled); - //print ''; + if ($conf->global->CASHDESK_ID_WAREHOUSE > 0) $disabled=1; // If a particular stock is defined, we disable choice + print $formproduct->selectWarehouses((GETPOST('warehouseid')?GETPOST('warehouseid','int'):(empty($conf->global->CASHDESK_ID_WAREHOUSE)?'ifone':$conf->global->CASHDESK_ID_WAREHOUSE)),'warehouseid','',!$disabled,$disabled); print ''; print "\n"; } diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php index c96b4f2b6f1..db80866a77f 100644 --- a/htdocs/cashdesk/index_verif.php +++ b/htdocs/cashdesk/index_verif.php @@ -36,11 +36,11 @@ $langs->load("cashdesk"); $username = GETPOST("txtUsername"); $password = GETPOST("pwdPassword"); -$thirdpartyid = (GETPOST('socid','int')!='')?GETPOST('socid','int'):$conf->global->CASHDESK_ID_THIRDPARTY; -$warehouseid = (GETPOST("warehouseid")!='')?GETPOST("warehouseid"):$conf->global->CASHDESK_ID_WAREHOUSE; -$bankid_cash = (GETPOST("CASHDESK_ID_BANKACCOUNT_CASH")!='')?GETPOST("CASHDESK_ID_BANKACCOUNT_CASH"):$conf->global->CASHDESK_ID_BANKACCOUNT_CASH; -$bankid_cheque = (GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE")!='')?GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE"):$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE; -$bankid_cb = (GETPOST("CASHDESK_ID_BANKACCOUNT_CB")!='')?GETPOST("CASHDESK_ID_BANKACCOUNT_CB"):$conf->global->CASHDESK_ID_BANKACCOUNT_CB; +$thirdpartyid = (GETPOST('socid','int') > 0)?GETPOST('socid','int'):$conf->global->CASHDESK_ID_THIRDPARTY; +$warehouseid = (GETPOST("warehouseid") > 0)?GETPOST("warehouseid",'int'):$conf->global->CASHDESK_ID_WAREHOUSE; +$bankid_cash = (GETPOST("CASHDESK_ID_BANKACCOUNT_CASH") > 0)?GETPOST("CASHDESK_ID_BANKACCOUNT_CASH",'int'):$conf->global->CASHDESK_ID_BANKACCOUNT_CASH; +$bankid_cheque = (GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE") > 0)?GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE",'int'):$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE; +$bankid_cb = (GETPOST("CASHDESK_ID_BANKACCOUNT_CB") > 0)?GETPOST("CASHDESK_ID_BANKACCOUNT_CB",'int'):$conf->global->CASHDESK_ID_BANKACCOUNT_CB; // Check username if (empty($username)) @@ -58,15 +58,15 @@ if (! ($thirdpartyid > 0)) } // If we setup stock module to ask movement on invoices, we must not allow access if required setup not finished. -if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_BILL && ! ($warehouseid > 0)) +if (! empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK) && ! ($warehouseid > 0)) { - $retour=$langs->trans("CashDeskSetupStock"); + $retour=$langs->trans("CashDeskYouDidNotDisableStockDecease"); header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid.'&bankid_cash='.$bankid_cash.'&bankid_cheque='.$bankid_cheque.'&bankid_cb='.$bankid_cb); exit; } // If stock decrease on bill validation, check user has stock edit permissions -if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_BILL && ! empty($username)) +if (! empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK) && ! empty($username)) { $testuser=new User($db); $testuser->fetch(0,$username); @@ -117,8 +117,9 @@ if ( $retour >= 0 ) $_SESSION['uname'] = $username; $_SESSION['lastname'] = $tab['lastname']; $_SESSION['firstname'] = $tab['firstname']; - $_SESSION['CASHDESK_ID_THIRDPARTY'] = $thirdpartyid; - $_SESSION['CASHDESK_ID_WAREHOUSE'] = $warehouseid; + $_SESSION['CASHDESK_ID_THIRDPARTY'] = ($thirdpartyid > 0 ? $thirdpartyid : ''); + $_SESSION['CASHDESK_ID_WAREHOUSE'] = ($warehouseid > 0 ? $warehouseid : ''); + $_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] = ($bankid_cash > 0 ? $bankid_cash : ''); $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] = ($bankid_cheque > 0 ? $bankid_cheque : ''); $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] = ($bankid_cb > 0 ? $bankid_cb : ''); @@ -131,7 +132,6 @@ if ( $retour >= 0 ) { dol_print_error($db); } - } else { diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index eb0ef03f257..caf0cd94abd 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -16,7 +16,7 @@ */ // Instanciation et initialisation de l'objet xmlhttprequest -function file (fichier) { +function file(fichier) { // Instanciation de l'objet pour Mozilla, Konqueror, Opera, Safari, etc ... if (window.XMLHttpRequest) { @@ -51,7 +51,7 @@ function file (fichier) { // Affichage des donnees aTexte dans le bloc identifie par aId -function afficheDonnees (aId, aTexte) { +function afficheDonnees(aId, aTexte) { document.getElementById(aId).innerHTML = aTexte; @@ -59,7 +59,7 @@ function afficheDonnees (aId, aTexte) { // aCible : id du bloc de destination; aCode : argument a passer a la page php chargee du traitement et de l'affichage -function verifResultat (aCible, aCode) { +function verifResultat(aCible, aCode) { if (aCode != '') { if (texte = file ('facturation_dhtml.php?code='+escape(aCode))) { @@ -76,21 +76,9 @@ function verifResultat (aCible, aCode) { // Change dynamiquement la classe de l'element ayant l'id aIdElement pour aClasse -function setStyle (aIdElement, aClasse) { +function setStyle(aIdElement, aClasse) { aIdElement.className = aClasse; } - - - - - - - - - - - - diff --git a/htdocs/cashdesk/javascript/facturation1.js b/htdocs/cashdesk/javascript/facturation1.js index 11f1739e937..b0b9a45a028 100644 --- a/htdocs/cashdesk/javascript/facturation1.js +++ b/htdocs/cashdesk/javascript/facturation1.js @@ -16,7 +16,7 @@ */ // Calcul et affichage en temps reel des informations sur le produit en cours -function modif () { +function modif() { var prix_unit = parseFloat ( document.getElementById('frmQte').txtPrixUnit.value ); var qte = parseFloat ( document.getElementById('frmQte').txtQte.value ); @@ -71,7 +71,7 @@ function modif () { } // Affecte la source de la requete (liste deroulante ou champ texte 'ref') au champ cache -function setSource (aSrc) { +function setSource(aSrc) { document.getElementById('frmFacturation').hdnSource.value = aSrc; document.getElementById('frmFacturation').submit(); @@ -79,7 +79,7 @@ function setSource (aSrc) { } // Verification de la coherence des informations saisies dans le formulaire de choix du nombre d'articles -function verifSaisie () { +function verifSaisie() { if ( document.getElementById('frmQte').txtQte.value ) { @@ -95,17 +95,17 @@ function verifSaisie () { } // Verification de la coherence des informations saisies dans le formulaire de calcul de la difference -function verifDifference () { +function verifDifference() { var du = parseFloat ( document.getElementById('frmDifference').txtDu.value ); var encaisse = parseFloat ( document.getElementById('frmDifference').txtEncaisse.value ); - if ( encaisse > du ) { + if (encaisse > du) { resultat = Math.round ( (encaisse - du) * 100 ) / 100; document.getElementById('frmDifference').txtRendu.value = resultat.toFixed(2); - } else if ( encaisse == du ) { + } else if (encaisse == du) { document.getElementById('frmDifference').txtRendu.value = '0'; @@ -118,14 +118,14 @@ function verifDifference () { } // Affecte le moyen de paiement (ESP, CB ou CHQ) au champ cache en fonction du bouton clique -function verifClic (aChoix) { +function verifClic(aChoix) { document.getElementById('frmDifference').hdnChoix.value = aChoix; } // Determination du moyen de paiement, et validation du formulaire si les donnees sont coherentes -function verifReglement () { +function verifReglement() { var choix = document.getElementById('frmDifference').hdnChoix.value; var du = parseFloat (document.getElementById('frmDifference').txtDu.value); @@ -172,5 +172,4 @@ function verifReglement () { return false; } - } diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index f2258c6473e..338c0f23b16 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -43,6 +43,7 @@ $langs->load("cashdesk"); @@ -147,7 +148,7 @@ $langs->load("cashdesk"); - +
    @@ -192,9 +193,9 @@ $langs->load("cashdesk"); if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0) { $langs->load("errors"); - print ''; + print ''; } - else print ''; + else print ''; print ''; ?> diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php index 2fac2e2a16a..e4b6bc14436 100644 --- a/htdocs/cashdesk/tpl/liste_articles.tpl.php +++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php @@ -42,7 +42,7 @@ $tab=array(); $tab = $_SESSION['poscart']; $tab_size=count($tab); -if ($tab_size <= 0) print '
    '.$langs->trans("NoArticle").'

    '; +if ($tab_size <= 0) print '
    '.$langs->trans("NoArticle").'

    '; else { for ($i=0;$i < $tab_size;$i++) @@ -67,8 +67,6 @@ else } } -$obj_facturation->calculTotaux(); -$total_ttc = $obj_facturation->prixTotalTtc(); echo ('

    '.$langs->trans("Total").' : '.price(price2num($total_ttc, 'MT'),0,$langs,0,0,-1,$conf->currency).'

    '."\n"); ?>
    diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 4ee52ce0da6..ce38bb7d7e8 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -72,7 +72,7 @@ print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
    '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
    '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
    '; print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'
    ';*/ -if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && ! empty($conf->stock->enabled)) +if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && ! empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) { print $langs->trans("CashDeskWarehouse").': '.$warehouseLink; } diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index 15762ecf494..1aa1c0c4723 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -17,6 +17,7 @@ */ $langs->load("main"); +$langs->load("bills"); // Object $form must de defined @@ -111,8 +112,9 @@ $langs->load("main");

    trans("Notes"); ?>

    - " /> -

    trans("RestartSelling"); ?>

    +
    " />
    +
    trans("RestartSelling"); ?> +
    diff --git a/htdocs/cashdesk/tpl/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php index 9ebab951eb9..b00268d7b0a 100644 --- a/htdocs/cashdesk/tpl/validation2.tpl.php +++ b/htdocs/cashdesk/tpl/validation2.tpl.php @@ -18,10 +18,11 @@ */ $langs->load("main"); +$langs->load("bills"); ?> -

    trans("SellFinished"); ?>

    +

    trans("SellFinished"); ?>


    diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 173c1894555..27ce3380dd4 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -218,7 +218,33 @@ switch ($action) $resultcreate=$invoice->create($user,0,dol_stringtotime($obj_facturation->paiementLe())); if ($resultcreate > 0) { - $resultvalid=$invoice->validate($user, $obj_facturation->numInvoice(), (isset($_SESSION["CASHDESK_ID_WAREHOUSE"])?$_SESSION["CASHDESK_ID_WAREHOUSE"]:0)); + $warehouseidtodecrease=(isset($_SESSION["CASHDESK_ID_WAREHOUSE"])?$_SESSION["CASHDESK_ID_WAREHOUSE"]:0); + if (! empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) $warehouseidtodecrease=0; // If a particular stock is defined, we disable choice + + $resultvalid=$invoice->validate($user, $obj_facturation->numInvoice(), 0); + + if ($warehouseidtodecrease > 0) + { + // Decrease + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; + $langs->load("agenda"); + // Loop on each line + $cpt=count($invoice->lines); + for ($i = 0; $i < $cpt; $i++) + { + if ($invoice->lines[$i]->fk_product > 0) + { + $mouvP = new MouvementStock($db); + $mouvP->origin = &$invoice; + // We decrease stock for product + if ($invoice->type == $invoice::TYPE_CREDIT_NOTE) $result=$mouvP->reception($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos",$invoice->newref)); + else $result=$mouvP->livraison($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos",$invoice->newref)); + if ($result < 0) { + $error++; + } + } + } + } } else { @@ -232,7 +258,33 @@ switch ($action) $resultcreate=$invoice->create($user,0,0); if ($resultcreate > 0) { - $resultvalid=$invoice->validate($user, $obj_facturation->numInvoice(), (isset($_SESSION["CASHDESK_ID_WAREHOUSE"])?$_SESSION["CASHDESK_ID_WAREHOUSE"]:0)); + $warehouseidtodecrease=(isset($_SESSION["CASHDESK_ID_WAREHOUSE"])?$_SESSION["CASHDESK_ID_WAREHOUSE"]:0); + if (! empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) $warehouseidtodecrease=0; // If a particular stock is defined, we disable choice + + $resultvalid=$invoice->validate($user, $obj_facturation->numInvoice(), 0); + + if ($warehouseidtodecrease > 0) + { + // Decrease + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; + $langs->load("agenda"); + // Loop on each line + $cpt=count($invoice->lines); + for ($i = 0; $i < $cpt; $i++) + { + if ($invoice->lines[$i]->fk_product > 0) + { + $mouvP = new MouvementStock($db); + $mouvP->origin = &$invoice; + // We decrease stock for product + if ($invoice->type == $invoice::TYPE_CREDIT_NOTE) $result=$mouvP->reception($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos",$invoice->newref)); + else $result=$mouvP->livraison($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos",$invoice->newref)); + if ($result < 0) { + $error++; + } + } + } + } $id = $invoice->id; diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php index 672c92b9508..98eaa053635 100644 --- a/htdocs/categories/card.php +++ b/htdocs/categories/card.php @@ -256,11 +256,11 @@ if ($user->rights->categorie->creer) print ''; - print '

    '; + print '
    '; print ''; - print '     '; + print '     '; print ''; - print '
    '; + print '
    '; print ''; } diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index f7de102d96d..31b08437aef 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -107,7 +107,7 @@ class Categorie extends CommonObject $this->type = $res['type']; $this->entity = $res['entity']; - $this->fetch_optionals($this->id,$extralabels); + $this->fetch_optionals($this->id,null); $this->db->free($resql); @@ -198,6 +198,8 @@ class Categorie extends CommonObject { $this->id = $id; + $action='create'; + // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('HookModuleNamedao')); @@ -289,11 +291,13 @@ class Categorie extends CommonObject dol_syslog(get_class($this)."::update", LOG_DEBUG); if ($this->db->query($sql)) { + $action='update'; // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('HookCategorydao')); $parameters=array(); + $action='update'; $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks if (empty($reshook)) { @@ -408,6 +412,17 @@ class Categorie extends CommonObject $error++; } } + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_lang"; + $sql .= " WHERE fk_category = ".$this->id; + if (!$this->db->query($sql)) + { + $this->error=$this->db->lasterror(); + dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR); + $error++; + } + } // Delete category if (! $error) @@ -430,7 +445,7 @@ class Categorie extends CommonObject if ($result < 0) { $error++; - dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR); + dol_syslog(get_class($this)."::delete erreur ".$this->error, LOG_ERR); } } } @@ -788,7 +803,7 @@ class Categorie extends CommonObject */ function get_full_arbo($type,$markafterid=0) { - global $langs; + global $conf, $langs; $this->cats = array(); @@ -798,11 +813,9 @@ class Categorie extends CommonObject // Init $this->cats array $sql = "SELECT DISTINCT c.rowid, c.label, c.description, c.fk_parent"; // Distinct reduce pb with old tables with duplicates - if (! empty($conf->global->MAIN_MULTILANGS)) - $sql.= ", t.label as label_trans, t.description as description_trans"; + if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= ", t.label as label_trans, t.description as description_trans"; $sql.= " FROM ".MAIN_DB_PREFIX."categorie as c"; - if (! empty($conf->global->MAIN_MULTILANGS)) - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$current_lang."'"; + if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$current_lang."'"; $sql.= " WHERE c.entity IN (".getEntity('category',1).")"; $sql.= " AND c.type = ".$type; @@ -1263,15 +1276,15 @@ class Categorie extends CommonObject $result=''; $lien = ''; - $label=$langs->trans("ShowCategory").': '.$this->label; + $label=$langs->trans("ShowCategory").': '. ($this->ref?$this->ref:$this->label); $lienfin=''; $picto='category'; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.dol_trunc($this->ref,$maxlength).$lienfin; + if ($withpicto != 2) $result.=$lien.dol_trunc(($this->ref?$this->ref:$this->label),$maxlength).$lienfin; return $result; } @@ -1369,7 +1382,7 @@ class Categorie extends CommonObject // Objet $obj=array(); $obj['photo']=$photo; - if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']=$photo_vignette; + if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']='thumbs/' . $photo_vignette; else $obj['photo_vignette']=""; $tabobj[$nbphoto-1]=$obj; diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index aa82fdb455d..245509578d0 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -163,8 +163,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) print ''; print '
    '; -print '
    '; -print '
    '; +print '
    '; print ''; diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 69a8bb97eab..c54d7d889b2 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -241,7 +241,7 @@ if ($object->id) // Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine if ($obj['photo_vignette']) { - $filename='thumbs/'.$obj['photo_vignette']; + $filename=$obj['photo_vignette']; } else { diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php index 0c154a0b72f..98d4fb2b930 100644 --- a/htdocs/categories/traduction.php +++ b/htdocs/categories/traduction.php @@ -190,9 +190,11 @@ if ($action == 'edit') } } - print '
    '; - print '     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; @@ -266,9 +268,11 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service print ''; print ''; - print '
    '; - print '     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 96db3133cf9..faa4109f736 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -35,6 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'; require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; + if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; @@ -74,6 +76,7 @@ $cactioncomm = new CActionComm($db); $object = new ActionComm($db); $contact = new Contact($db); $extrafields = new ExtraFields($db); +$formfile = new FormFile($db); // fetch optionals attributes and labels $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); @@ -678,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 ''; @@ -710,9 +713,9 @@ if ($action == 'create') $events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); //For external user force the company to user company if (!empty($user->societe_id)) { - print $form->select_company($user->societe_id,'socid','',1,1,0,$events); + print $form->select_thirdparty_list($user->societe_id,'socid','',1,1,0,$events); } else { - print $form->select_company('','socid','',1,1,0,$events); + print $form->select_thirdparty_list('','socid','',1,1,0,$events); } } @@ -776,11 +779,11 @@ if ($action == 'create') print ''; - print '

    '; + print '
    '; print ''; - print '     '; + print '     '; print ''; - print '
    '; + print ''; print ""; } @@ -902,7 +905,7 @@ if ($id > 0) } // Assigned to - print ''.$langs->trans("ActionAffectedTo").''; + print ''.$langs->trans("ActionAssignedTo").''; $listofuserid=array(); if (empty($donotclearsession)) { @@ -925,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 ''; @@ -1010,9 +1013,11 @@ if ($id > 0) dol_fiche_end(); - print '
    '; - print '     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } @@ -1040,7 +1045,7 @@ if ($id > 0) print ''.$langs->trans("Title").''.$object->label.''; // Full day event - print ''.$langs->trans("EventOnFullDay").''.yn($object->fulldayevent).''; + print ''.$langs->trans("EventOnFullDay").''.yn($object->fulldayevent, 3).''; $rowspan=4; if (empty($conf->global->AGENDA_DISABLE_LOCATION)) $rowspan++; @@ -1072,7 +1077,7 @@ if ($id > 0) } // Assigned to - print ''.$langs->trans("ActionAffectedTo").''; + print ''.$langs->trans("ActionAssignedTo").''; $listofuserid=array(); if (empty($donotclearsession)) { @@ -1282,6 +1287,33 @@ if ($id > 0) print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' '; print ''."\n"; print ''; + + if (empty($conf->global->AGENDA_DISABLE_BUILDDOC)) + { + print '
     
    '; + print ''; // ancre + + /* + * Documents generes + */ + + $filedir=$conf->agenda->multidir_output[$conf->entity].'/'.$object->id; + $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id; + + $genallowed=$user->rights->agenda->myactions->create; + $delallowed=$user->rights->agenda->myactions->delete; + + $var=true; + + $somethingshown=$formfile->show_documents('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang); + + print '
    '; + + + print '
    '; + + print '
     
    '; + } } } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index b4a5fdeed60..5f1cb8f7c28 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -57,7 +57,7 @@ class ActionComm extends CommonObject var $datef; // Date action end (datep2) var $durationp = -1; // -1=Unkown duration // deprecated var $fulldayevent = 0; // 1=Event on full day - var $punctual = 1; // Milestone // TODO Not sure we need this. Milestone is already event with end date = start date + var $punctual = 1; // Milestone // deprecated. Milestone is already event with end date = start date var $percentage; // Percentage var $location; // Location @@ -241,8 +241,11 @@ class ActionComm extends CommonObject if (! $error) { + $action='create'; + // Actions on extra fields (by external module or standard code) - $hookmanager->initHooks(array('actioncommdao')); + // FIXME le hook fait double emploi avec le trigger !! + $hookmanager->initHooks(array('actioncommdao')); $parameters=array('actcomm'=>$this->id); $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks if (empty($reshook)) @@ -347,7 +350,7 @@ class ActionComm extends CommonObject $this->label = $obj->label; $this->datep = $this->db->jdate($obj->datep); $this->datef = $this->db->jdate($obj->datep2); - $this->durationp = $this->durationp; // deprecated +// $this->durationp = $this->durationp; // deprecated $this->datec = $this->db->jdate($obj->datec); $this->datem = $this->db->jdate($obj->datem); @@ -560,8 +563,10 @@ class ActionComm extends CommonObject dol_syslog(get_class($this)."::update", LOG_DEBUG); if ($this->db->query($sql)) { + $action='update'; // Actions on extra fields (by external module or standard code) + // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('actioncommdao')); $parameters=array('actcomm'=>$this->id); $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks @@ -878,23 +883,23 @@ class ActionComm extends CommonObject if ($withpicto == 2) { $libelle=$label; - if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->transnoentities("Action".$this->type_code); + if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->transnoentities("Action".$this->type_code); $libelleshort=''; } else { - $libelle=(empty($this->libelle)?$label:$this->libelle.(($label && $label != $this->libelle)?' '.$label:'')); - if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label; - $libelleshort=dol_trunc($libelle,$maxlength); + $libelle=(empty($this->libelle)?$label:$this->libelle.(($label && $label != $this->libelle)?' '.$label:'')); + if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label; + $libelleshort=dol_trunc($libelle,$maxlength); } if ($withpicto) { - if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) // Add code into () - { - $libelle.=(($this->type_code && $libelle!=$langs->transnoentities("Action".$this->type_code) && $langs->transnoentities("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->transnoentities("Action".$this->type_code).')':''); - } - $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle,($overwritepicto?$overwritepicto:'action')).$lienfin; + if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) // Add code into () + { + $libelle.=(($this->type_code && $libelle!=$langs->transnoentities("Action".$this->type_code) && $langs->transnoentities("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->transnoentities("Action".$this->type_code).')':''); + } + $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle, ($overwritepicto?$overwritepicto:'action'), 'class="classfortooltip"').$lienfin; } if ($withpicto==1) $result.=' '; $result.=$lien.$libelleshort.$lienfin; @@ -1137,7 +1142,7 @@ class ActionComm extends CommonObject */ function initAsSpecimen() { - global $user,$langs,$conf; + global $user,$langs,$conf,$user; $now=dol_now(); @@ -1161,6 +1166,9 @@ class ActionComm extends CommonObject $this->transparency=1; // 1 means opaque $this->priority=1; $this->note = 'Note'; + + $this->userownerid=$user->id; + $this->userassigned[$user->id]=array('id'=>$user->id, 'transparency'=> 1); } } diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index 065f01d2091..77dfea739e1 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -103,7 +103,7 @@ class CActionComm * @param string $idorcode 'id' or 'code' * @param string $excludetype Type to exclude * @param string $onlyautoornot Group list by auto events or not - * @return array Array of all event types if OK, <0 if KO + * @return mixed Array of all event types if OK, <0 if KO */ function liste_array($active='',$idorcode='id',$excludetype='',$onlyautoornot=0) { diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 53243d0c165..a53628e3d31 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -100,7 +100,7 @@ if (! $user->rights->agenda->allactions->read || $filter=='mine') // If no permi } // Purge search criteria -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $datestart=''; $dateend=''; @@ -136,6 +136,17 @@ $form=new Form($db); $nav=''; $nav.='  
    '; +if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav.=''; +if ($status || isset($_GET['status']) || isset($_POST['status'])) $nav.=''; +if ($filter) $nav.=''; +if ($filtera) $nav.=''; +if ($filtert) $nav.=''; +if ($filterd) $nav.=''; +if ($socid) $nav.=''; +if ($showbirthday) $nav.=''; +if ($pid) $nav.=''; +if ($type) $nav.=''; +if ($usergroup) $nav.=''; $nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1); $nav.=' '; $nav.='
    '; @@ -159,6 +170,7 @@ if ($socid) $param.="&socid=".$socid; if ($showbirthday) $param.="&showbirthday=1"; if ($pid) $param.="&projectid=".$pid; if ($type) $param.="&type=".$type; +if ($usergroup) $param.="&usergroup=".$usergroup; $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,"; $sql.= " a.id, a.datep as dp, a.datep2 as dp2,"; @@ -180,7 +192,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ut ON a.fk_user_action = ut.rowid"; if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu"; $sql.= " WHERE c.id = a.fk_action"; $sql.= ' AND a.fk_user_author = u.rowid'; -$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')'; // To limit to entity +$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')'; if ($actioncode) $sql.=" AND c.code='".$db->escape($actioncode)."'"; if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid); if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")"; @@ -203,11 +215,13 @@ if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0) if ($usergroup > 0) $sql.= ($filtera>0||$filtert>0||$filterd>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup; $sql.= ")"; } -if ($dateselect > 0) $sql.= " AND a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect+3600*24-1)."'"; +// The second or of next test is to take event with no end date (we suppose duration is 1 hour in such case) +if ($dateselect > 0) $sql.= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect+3600*24-1)."') OR (a.datep2 IS NULL AND a.datep > '".$db->idate($dateselect-3600)."' AND a.datep <= '".$db->idate($dateselect+3600*24-1)."'))"; if ($datestart > 0) $sql.= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart+3600*24-1)."'"; if ($dateend > 0) $sql.= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend+3600*24-1)."'"; $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1, $offset); + //print $sql; dol_syslog("comm/action/listactions.php", LOG_DEBUG); diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index da34983779a..22cf8841c02 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -201,6 +201,7 @@ if ($filter) $param.="&filter=".$filter; if ($filtera) $param.="&filtera=".$filtera; if ($filtert) $param.="&filtert=".$filtert; if ($filterd) $param.="&filterd=".$filterd; +if ($usergroup) $param.="&usergroup=".$usergroup; if ($socid) $param.="&socid=".$socid; if ($showbirthday) $param.="&showbirthday=1"; if ($pid) $param.="&projectid=".$pid; @@ -242,6 +243,20 @@ $nav.="   ('; +$nav.=''; +$nav.=''; +$nav.=''; +$nav.=''; +$nav.=''; +$nav.=''; +$nav.=''; +$nav.=''; +$nav.=''; +$nav.=''; +$nav.=''; +$nav.=''; +$nav.=''; + $nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1); $nav.=' '; $nav.=''; @@ -595,7 +610,7 @@ else $sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user"; - $sql.= " WHERE u.entity IN (".getEntity('user').")"; + $sql.= " WHERE u.entity IN (".getEntity('user',1).")"; if ($usergroup > 0) $sql.= " AND ug.fk_usergroup = ".$usergroup; if (GETPOST("usertodo","int",3) > 0) $sql.=" AND u.rowid = ".GETPOST("usertodo","int",3); //print $sql; @@ -659,10 +674,12 @@ while ($obj = $db->fetch_object($resql)) $todayarray=dol_getdate($now,'fast'); $sav = $tmpday; $showheader = true; +$var = false; foreach ($usernames as $username) { + $var = ! $var; echo ""; - echo '' . $username->getNomUrl(1). ''; + echo '' . $username->getNomUrl(1). ''; $tmpday = $sav; // Lopp on each day of week @@ -688,7 +705,7 @@ foreach ($usernames as $username) if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1; if ($today) $style='cal_today_peruser'; - show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype); + show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var); $i++; } @@ -785,9 +802,10 @@ $db->close(); * @param int $minheight Minimum height for each event. 60px by default. * @param boolean $showheader Show header * @param array $colorsbytype Array with colors by type + * @param string $var true or false for alternat style on tr/td * @return void */ -function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array()) +function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array(), $var=false) { global $db; global $user, $conf, $langs, $hookmanager, $action; @@ -989,8 +1007,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & } - if ($h == $begin_h) echo ''; - else echo ''; + if ($h == $begin_h) echo ''; + else echo ''; if (count($cases1[$h]) == 1) // 1 seul evenement { $ids=array_keys($cases1[$h]); @@ -1008,8 +1026,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, & if ($output[0]['color']) $color2 = $output[0]['color']; } else if (count($cases2[$h]) > 1) $color2='222222'; - $ids1=join(',',array_keys($cases1[$h])); - $ids2=join(',',array_keys($cases2[$h])); + $ids1='';$ids2=''; + if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1=join(',',array_keys($cases1[$h])); + if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2=join(',',array_keys($cases2[$h])); //var_dump($cases1[$h]); print ''; print '
    '; diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index a9a19f57a9e..24eb117684f 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -55,6 +55,7 @@ $result = restrictedArea($user, 'agenda', $socid, '', 'myactions'); /* * Actions */ + if ($action == 'builddoc') { $cat = new CommActionRapport($db, $month, $year); @@ -79,7 +80,7 @@ $sql.= " date_format(a.datep, '%Y') as year"; $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a,"; $sql.= " ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE a.fk_user_author = u.rowid"; -$sql.= " AND a.entity = ".$conf->entity; +$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')'; //$sql.= " AND percent = 100"; $sql.= " GROUP BY year, month, df"; $sql.= " ORDER BY year DESC, month DESC, df DESC"; diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 0ffcb351500..963847aee18 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -281,14 +281,14 @@ if ($action == 'create') print '
    '."\n"; - print '
    '; + print '
    '; print ''; if (! empty($backtopage)) { - print '     '; + print '     '; print ''; } - print '
    '."\n"; + print ''."\n"; print ''."\n"; @@ -381,11 +381,11 @@ elseif ($action == 'edit') print '
    '; - print '
    '; + print '
    '; print ''; - print '   '; + print '     '; print ''; - print '
    '; + print ''; print ''; } diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php index d41dd27b362..2a1a2286db5 100644 --- a/htdocs/comm/admin/propal_extrafields.php +++ b/htdocs/comm/admin/propal_extrafields.php @@ -69,7 +69,7 @@ $linkback='    '.$langs->trans("BackToM print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup'); -$head = propal_admin_prepare_head(null); +$head = propal_admin_prepare_head(); dol_fiche_head($head, 'attributes', $langs->trans("Proposals"), 0, 'propal'); diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php index e83f31e993f..40dbad4ef94 100644 --- a/htdocs/comm/admin/propaldet_extrafields.php +++ b/htdocs/comm/admin/propaldet_extrafields.php @@ -74,7 +74,7 @@ llxHeader('',$langs->trans("PropalSetup")); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup'); -$head = propal_admin_prepare_head(null); +$head = propal_admin_prepare_head(); dol_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), 0, 'propal'); diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index d0dd842cd7c..ecb171c6570 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -80,15 +80,20 @@ $parameters = array('socid' => $id); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); +//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) + if (! $cancelbutton) { - setEventMessage($object->errors, 'errors'); + $result=$object->fetch($id); + $object->code_compta=$_POST["customeraccountancycode"]; + $result=$object->update($object->id,$user,1,1,0); + if ($result < 0) + { + setEventMessage($object->errors, 'errors'); + } } $action=""; } @@ -100,6 +105,7 @@ if ($action == 'setconditions' && $user->rights->societe->creer) $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int')); if ($result < 0) dol_print_error($db,$object->error); } + // mode de reglement if ($action == 'setmode' && $user->rights->societe->creer) { @@ -107,16 +113,14 @@ if ($action == 'setmode' && $user->rights->societe->creer) $result=$object->setPaymentMethods(GETPOST('mode_reglement_id','int')); if ($result < 0) dol_print_error($db,$object->error); } + // assujetissement a la TVA if ($action == 'setassujtva' && $user->rights->societe->creer) { $object->fetch($id); $object->tva_assuj=$_POST['assujtva_value']; - - // TODO move to DAO class - $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET tva_assuj='".$_POST['assujtva_value']."' WHERE rowid='".$id."'"; - $result = $db->query($sql); - if (! $result) dol_print_error($result); + $result=$object->update($object->id); + if ($result < 0) dol_print_error($db,$object->error); } // set prospect level @@ -128,7 +132,7 @@ if ($action == 'setprospectlevel' && $user->rights->societe->creer) if ($result < 0) setEventMessage($object->error,'errors'); } -// Update communication level +// update prospect level if ($action == 'cstc') { $object->fetch($id); @@ -137,13 +141,16 @@ if ($action == 'cstc') if ($result < 0) setEventMessage($object->error,'errors'); } -// Update communication level +// update outstandng limit 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'); + } } @@ -151,14 +158,24 @@ if ($action == 'setOutstandingBill') * View */ -llxHeader('',$langs->trans('CustomerCard')); - - $contactstatic = new Contact($db); $userstatic=new User($db); $form = new Form($db); $formcompany=new FormCompany($db); +if ($id > 0 && empty($object->id)) +{ + // Load data of third party + $res=$object->fetch($id); + if ($object->id <= 0) dol_print_error($db,$object->error); +} + +$title=$langs->trans("CustomerCard"); +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name; +$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; +llxHeader('',$title,$help_url); + + if ($mode == 'search') { @@ -188,14 +205,6 @@ if ($mode == 'search') if ($id > 0) { - // Load data of third party - $object->fetch($id); - if ($object->id <= 0) - { - dol_print_error($db,$object->error); - } - - $head = societe_prepare_head($object); dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"),0,'company'); @@ -289,24 +298,15 @@ if ($id > 0) print ''; // Local Taxes - if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") + if ($mysoc->useLocalTax(1)) { - print ''.$langs->trans('LocalTax1IsUsedES').''; - print yn($object->localtax1_assuj); - print ''; - print ''.$langs->trans('LocalTax2IsUsedES').''; - print yn($object->localtax2_assuj); - print ''; - } - elseif($mysoc->localtax1_assuj=="1") - { - print ''.$langs->trans("LocalTax1IsUsedES").''; + print ''.$langs->trans("LocalTax1IsUsedES").''; print yn($object->localtax1_assuj); print ''; } - elseif($mysoc->localtax2_assuj=="1") + if ($mysoc->useLocalTax(2)) { - print ''.$langs->trans("LocalTax2IsUsedES").''; + print ''.$langs->trans("LocalTax2IsUsedES").''; print yn($object->localtax2_assuj); print ''; } @@ -530,6 +530,7 @@ if ($id > 0) while ($i < $num && $i < $MAXLIST) { $objp = $db->fetch_object($resql); + $var=!$var; print ""; print ''.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.''."\n"; if ( ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 ) @@ -539,7 +540,6 @@ if ($id > 0) print ''.dol_print_date($db->jdate($objp->dp),'day')."\n"; print ''.price($objp->total_ht).''; print ''.$propal_static->LibStatut($objp->fk_statut,5).''; - $var=!$var; $i++; } $db->free($resql); diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 4129b561ed1..636c8c5c737 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; if (! empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; if (! $user->rights->societe->lire) accessforbidden(); @@ -62,6 +63,7 @@ $form = new Form($db); $formfile = new FormFile($db); $companystatic=new Societe($db); if (! empty($conf->propal->enabled)) $propalstatic=new Propal($db); +if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db); llxHeader(); @@ -90,15 +92,15 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) if (! empty($conf->commande->enabled) && $user->rights->commande->lire) { $var=false; - print ''; print ''; print ''; + print '
    '; print ''; print ''; print ''; print ''; - print "
    '.$langs->trans("SearchACustomerOrder").'
    '; print ':
    :

    \n"; + print "
    \n"; } // Search contract @@ -234,7 +236,11 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) { $var=!$var; $obj = $db->fetch_object($resql); - print ''.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.''; + print ''; + $orderstatic->id=$obj->rowid; + $orderstatic->ref=$obj->ref; + print $orderstatic->getNomUrl(1); + print ''; print ''; $companystatic->id=$obj->socid; $companystatic->name=$obj->name; @@ -483,7 +489,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) @@ -514,7 +520,13 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) print ""; - print ''."\n"; + print ''; print ''."\n"; print ''; diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php index ac354d4d08d..06b26d88f48 100644 --- a/htdocs/comm/list.php +++ b/htdocs/comm/list.php @@ -48,16 +48,15 @@ $pagenext = $page + 1; if (! $sortorder) $sortorder="ASC"; if (! $sortfield) $sortfield="s.nom"; -$search_nom=GETPOST("search_nom"); +$search_company=GETPOST("search_company"); $search_zipcode=GETPOST("search_zipcode"); $search_town=GETPOST("search_town"); $search_code=GETPOST("search_code"); $search_compta=GETPOST("search_compta"); $search_status = GETPOST("search_status",'int'); -if ($search_status=='') $search_status=1; // always display activ customer first // Load sale and categ filters -$search_sale = GETPOST("search_sale"); +$search_sale = GETPOST("search_sale",'int'); $search_categ = GETPOST("search_categ",'int'); $catid = GETPOST("catid",'int'); // If the internal user must only see his customers, force searching by him @@ -76,23 +75,20 @@ $reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $a if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); // Do we click on purge search criteria ? -if (GETPOST("button_removefilter_x")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { - $search_categ=''; - $catid=''; - $search_sale=''; - $socname=""; - $search_nom=""; + $search_sale=""; + $search_categ=""; + $catid=""; + $search_company=""; $search_zipcode=""; $search_town=""; - $search_idprof1=''; - $search_idprof2=''; - $search_idprof3=''; - $search_idprof4=''; - $seach_status=1; + $search_code=''; + $search_compta=''; + $search_status=''; } - +if ($search_status=='') $search_status=1; // always display activ customer first /* * view @@ -107,23 +103,23 @@ llxHeader('',$langs->trans("ThirdParty"),$help_url); $sql = "SELECT s.rowid, s.nom as name, s.client, s.zip, s.town, st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta, s.status as status,"; $sql.= " s.datec, s.canvas"; -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects) +if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects) $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_societe"; // We need this table joined to the select in order to filter by categ -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale +if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st"; $sql.= " WHERE s.fk_stcomm = st.id"; $sql.= " AND s.client IN (1, 3)"; $sql.= ' AND s.entity IN ('.getEntity('societe', 1).')'; -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql.= " AND s.rowid = sc.fk_soc"; +if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc"; if ($socid) $sql.= " AND s.rowid = ".$socid; -if ($search_sale) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale +if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale if ($catid > 0) $sql.= " AND cs.fk_categorie = ".$catid; if ($catid == -2) $sql.= " AND cs.fk_categorie IS NULL"; if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ; if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL"; -if ($search_nom) { - $sql .= natural_search('s.nom', $search_nom); +if ($search_company) { + $sql .= natural_search('s.nom', $search_company); } if ($search_zipcode) $sql.= " AND s.zip LIKE '".$db->escape($search_zipcode)."%'"; if ($search_town) { @@ -134,7 +130,7 @@ if ($search_compta) $sql.= " AND s.code_compta LIKE '%".$db->escape($search_comp if ($search_status!='') $sql .= " AND s.status = ".$db->escape($search_status); // Insert sale filter -if ($search_sale) +if ($search_sale > 0) { $sql .= " AND sc.fk_user = ".$search_sale; } @@ -156,9 +152,9 @@ if ($result) { $num = $db->num_rows($result); - $param = "&search_nom=".$search_nom."&search_code=".$search_code."&search_zipcode=".$search_zipcode."&search_town=".$search_town; + $param = "&search_company=".$search_company."&search_code=".$search_code."&search_zipcode=".$search_zipcode."&search_town=".$search_town; if ($search_categ != '') $param.='&search_categ='.$search_categ; - if ($search_sale != '') $param.='&search_sale='.$search_sale; + if ($search_sale > 0) $param.='&search_sale='.$search_sale; if ($search_status != '') $param.='&search_status='.$search_status; print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); @@ -207,7 +203,7 @@ if ($result) print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 678ea8f622d..ca4c27bfdbc 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -94,6 +94,13 @@ $object->substitutionarrayfortest=array( //,'__PERSONALIZED__' => 'TESTPersonalized' // Not used yet ); +// List of sending methods +$listofmethods=array(); +$listofmethods['mail']='PHP mail function'; +//$listofmethods['simplemail']='Simplemail class'; +$listofmethods['smtps']='SMTP/SMTPS socket library'; + + /* * Actions @@ -701,7 +708,7 @@ if ($action == 'create') print ''; print '
    '.$langs->trans("ProposalsOpened").' ('.$num.')
    '.$langs->trans("ProposalsOpened").' '.$num.'
    '.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,44).''; + $companystatic->id=$obj->rowid; + $companystatic->name=$obj->name; + $companystatic->client=$obj->client; + $companystatic->canvas=$obj->canvas; + print $companystatic->getNomUrl(1, 'company', 44); + print ''; print dol_print_date($db->jdate($obj->dp),'day').''.price($obj->total_ttc).'
    '; - print ''; + print ''; print ''; @@ -235,7 +231,6 @@ if ($result) print ''; - print '  '; print ''; print '
    '; - print '
    '; + print '
    '; print ''; } @@ -741,10 +748,21 @@ else { // Define message to recommand from command line - // Pour des raisons de securite, on ne permet pas cette fonction via l'IHM, - // on affiche donc juste un message + $sendingmode=$conf->global->MAIN_MAIL_SENDMODE; + if (empty($sendingmode)) $sendingmode='mail'; // If not defined, we use php mail function - if (empty($conf->global->MAILING_LIMIT_SENDBYWEB)) + if (! empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail') + { + // EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent. + // You ensure that every user is using its own SMTP server. + $linktoadminemailbefore=''; + $linktoadminemailend=''; + setEventMessage($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), 'warnings'); + setEventMessage($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), 'warnings'); + if (! empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessage($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), 'warnings'); + $_GET["action"]=''; + } + else if (empty($conf->global->MAILING_LIMIT_SENDBYWEB)) { // Pour des raisons de securite, on ne permet pas cette fonction via l'IHM, // on affiche donc juste un message @@ -764,7 +782,7 @@ else } $text.=$langs->trans('ConfirmSendingEmailing').'
    '; $text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB); - print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('SendMailing'),$text,'sendallconfirmed',$formquestion,'',1,260); + print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('SendMailing'),$text,'sendallconfirmed',$formquestion,'',1,270); } } @@ -1139,11 +1157,11 @@ else print ''; - print '
    '; + print '
    '; print ''; - print '   '; + print '     '; print ''; - print '
    '; + print ''; print ''; print '
    '; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 49d2f1befa2..75f2399017b 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -276,7 +276,8 @@ if ($object->fetch($id) >= 0) $obj = new $classname($db); - $qualified=1; + // Check dependencies + $qualified=(isset($obj->enabled)?$obj->enabled:1); foreach ($obj->require_module as $key) { if (! $conf->$key->enabled || (! $user->admin && $obj->require_admin)) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 3eeef6916eb..7ef2f3bd4c9 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); @@ -553,6 +550,8 @@ else if ($action == 'setstatut' && $user->rights->propal->cloturer && ! GETPOST( } } +include DOL_DOCUMENT_ROOT.'/core/actions_printipp.inc.php'; + /* * Send mail @@ -603,16 +602,15 @@ else if ($action == 'addline' && $user->rights->propal->creer) { // Set if we used free entry or predefined product $predef=''; $product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):''); + $price_ht = GETPOST('price_ht'); if (GETPOST('prod_entry_mode') == 'free') { $idprod=0; - $price_ht = GETPOST('price_ht'); $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); } else { $idprod=GETPOST('idprod', 'int'); - $price_ht = ''; $tva_tx = ''; } @@ -1149,6 +1147,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->propal-> } } + /* * View */ @@ -1234,12 +1233,13 @@ if ($action == 'create') print '
    '; print ''; print ''; - if ($origin != 'project' && $originid) { print ''; print ''; } + dol_fiche_head(); + print ''; // Reference @@ -1310,9 +1310,11 @@ if ($action == 'create') print ''; // Bank Account - print ''; + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled) { + print ''; + } // What trigger creation print '
    ' . $langs->trans('BankAccount') . ''; - $form->select_comptes($fk_account, 'fk_account', 0, '', 1); - print '
    ' . $langs->trans('BankAccount') . ''; + $form->select_comptes($fk_account, 'fk_account', 0, '', 1); + print '
    ' . $langs->trans('Source') . ''; @@ -1431,16 +1433,13 @@ if ($action == 'create') print "
    \n"; - print '
    '; - - /* * Combobox pour la fonction de copie */ if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) print ''; - if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print ''; + if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '
    '; if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) { // For backward compatibility @@ -1510,14 +1509,16 @@ if ($action == 'create') } print ''; } - if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '

    '; - + if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print ''; + dol_fiche_end(); + $langs->load("bills"); - print '
    '; + print '
    '; print ''; - print ' '; - print '
    '; + print '     '; + print ''; + print ''; print "
    "; @@ -1892,7 +1893,7 @@ if ($action == 'create') print ''; } - if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL)) + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled) { // Bank Account print ''; @@ -2000,7 +2001,7 @@ if ($action == 'create') { $var = true; - // Add free products/services + // Add products/services form $object->formAddObjectLine(1, $mysoc, $soc); $parameters = array(); @@ -2105,12 +2106,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/apercu.php b/htdocs/comm/propal/apercu.php index e575c8f27fc..87281e7ea63 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -3,7 +3,8 @@ * Copyright (C) 2004 Eric Seigne * Copyright (C) 2004-2007 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2014 Frederic France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,14 +23,13 @@ /** * \file htdocs/comm/propal/apercu.php * \ingroup propal - * \brief Page de l'onglet apercu d'une propal + * \brief Preview tab of propal */ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; -if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('propal'); $langs->load("bills"); @@ -44,18 +44,11 @@ $result = restrictedArea($user, 'propal', $id); /* - * View + * View Mode */ llxHeader(); -$form = new Form($db); - -/* *************************************************************************** */ -/* */ -/* Mode fiche */ -/* */ -/* *************************************************************************** */ if ($id > 0 || ! empty($ref)) { @@ -73,29 +66,30 @@ if ($id > 0 || ! empty($ref)) /* * Propal */ - print ''; + print '
    '; - // Ref - print ''; + // Ref + print ''; + print ''; + print ''; - // Ref client - print ''; - print ''; + // Ref client + print ''; + print ''; + print ''; - $rowspan=2; - // Tiers - print ''; - print ''; + // Thirdparty + print ''; + print ''; + print ''; - // Ligne info remises tiers + // Status + print ''; + print ''; + print ''; + + // Discount print ''; + print '.'; + print ''; - // ligne - // partie Gauche - print ''; + // Date + print ''; + print ''; - // partie Droite sur $rowspan lignes - print ''; + print ''; + print ''; + + // Total VAT - left part + print ''; + print ''; + print ''; + + // Total TTC - left part + print ''; + print ''; + print ''; + + print '
    '.$langs->trans('Ref').''.$object->ref.'
    '.$langs->trans('Ref').''.$object->ref.'
    '; - print ''; - print '
    '; - print $langs->trans('RefCustomer').''; - print '
    '; - print '    		'; - print $object->ref_client; - print '
    '.$langs->trans('RefCustomer').''.$object->ref_client.'
    '.$langs->trans('Company').''.$soc->getNomUrl(1).'
    '.$langs->trans('Company').''.$soc->getNomUrl(1).'
    '.$langs->trans("Status").''.$object->getLibStatut(4).'
    '.$langs->trans('Discounts').''; if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent); else print $langs->trans("CompanyHasNoRelativeDiscount"); @@ -103,44 +97,43 @@ if ($id > 0 || ! empty($ref)) print '. '; if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); - print '.'; - print '
    '.$langs->trans('Date').''; - print dol_print_date($object->date,'daytext'); - print '
    '.$langs->trans('Date').''.dol_print_date($object->date,'daytext').''; + // Right part with $rowspan lines + $rowspan=4; + print ''; - /* - * Documents - */ - $objectref = dol_sanitizeFileName($object->ref); - $dir_output = $conf->propal->dir_output . "/"; - $filepath = $dir_output . $objectref . "/"; - $file = $filepath . $objectref . ".pdf"; - $filedetail = $filepath . $objectref . "-detail.pdf"; + /* + * Documents + */ + $objectref = dol_sanitizeFileName($object->ref); + $dir_output = $conf->propal->dir_output . "/"; + $filepath = $dir_output . $objectref . "/"; + $file = $filepath . $objectref . ".pdf"; + $filedetail = $filepath . $objectref . "-detail.pdf"; $relativepath = $objectref.'/'.$objectref.'.pdf'; $relativepathdetail = $objectref.'/'.$objectref.'-detail.pdf'; // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png") - $fileimage = $file.'_preview.png'; // If PDF has 1 page + $fileimage = $file.'_preview.png'; // If PDF has 1 page $fileimagebis = $file.'_preview-0.pdf.png'; // If PDF has more than one page $relativepathimage = $relativepath.'_preview.png'; - $var=true; + $var=true; // Si fichier PDF existe if (file_exists($file)) { $encfile = urlencode($file); - print_titre($langs->trans("Documents")); - print ''; + print '
    '; + print ''; - print ""; + print ''; print ''; @@ -166,13 +159,25 @@ if ($id > 0 || ! empty($ref)) } } - print ""; - print ''; + print ''; + print ''; - print ''; - print ''; - print ''; - print '
    '.$langs->trans("Documents").'
    ".$langs->trans("Propal")." PDF
    '.$langs->trans("Proposal").' PDF'.$object->ref.'.pdf
    '.$langs->trans('AmountHT').''.price($object->price).''.$langs->trans("Currency".$conf->currency).'
    '; + // Total HT - left part + print '
    '.$langs->trans('AmountHT').'' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '
    '.$langs->trans('AmountVAT').'' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '
    '.$langs->trans('AmountTTC').'' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '
    '; dol_fiche_end(); } @@ -183,10 +188,13 @@ if ($id > 0 || ! empty($ref)) } } +print ''; +print ''; +print '
    '; +print '
    '; // Si fichier png PDF d'1 page trouve if (file_exists($fileimage)) { - print ''; + print ''; } // Si fichier png PDF de plus d'1 page trouve elseif (file_exists($fileimagebis)) @@ -199,10 +207,13 @@ elseif (file_exists($fileimagebis)) if (file_exists($dir_output.$preview)) { - print '

    '; + print '

    '; } } } +print '

    '; +print '
    '; llxFooter(); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 15d85afec07..724a3ebe45c 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 @@ -416,7 +421,15 @@ class Propal extends CommonObject // infos marge - $this->line->fk_fournprice = $fk_fournprice; + if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) { + // by external module, take lowest buying price + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; + $productFournisseur = new ProductFournisseur($this->db); + $productFournisseur->find_min_price_product_fournisseur($fk_product); + $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id; + } else { + $this->line->fk_fournprice = $fk_fournprice; + } $this->line->pa_ht = $pa_ht; // Mise en option de la ligne @@ -567,7 +580,15 @@ class Propal extends CommonObject $this->line->skip_update_total = $skip_update_total; // infos marge - $this->line->fk_fournprice = $fk_fournprice; + if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) { + // by external module, take lowest buying price + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; + $productFournisseur = new ProductFournisseur($this->db); + $productFournisseur->find_min_price_product_fournisseur($fk_product); + $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id; + } else { + $this->line->fk_fournprice = $fk_fournprice; + } $this->line->pa_ht = $pa_ht; $this->line->date_start=$date_start; @@ -651,7 +672,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers * @return int <0 if KO, >=0 if OK */ - function create($user='', $notrigger=0) + function create($user, $notrigger=0) { global $langs,$conf,$mysoc,$hookmanager; $error=0; @@ -846,6 +867,8 @@ class Propal extends CommonObject $resql=$this->update_price(1); if ($resql) { + $action='update'; + // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('propaldao')); @@ -917,7 +940,7 @@ class Propal extends CommonObject { $this->products=$this->lines; - return $this->create(); + return $this->create($user); } /** @@ -1264,6 +1287,8 @@ class Propal extends CommonObject */ function update_extrafields($user) { + $action='update'; + // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('propaldao')); @@ -1967,16 +1992,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]; + } } } } @@ -2118,7 +2146,7 @@ class Propal extends CommonObject if (! $error) { - dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG); + dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG); $this->db->commit(); return 1; } @@ -2601,7 +2629,7 @@ class Propal extends CommonObject $picto='propal'; $label=$langs->trans("ShowPropal").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$lien.$this->ref.$lienfin; return $result; @@ -2879,7 +2907,7 @@ class PropaleLigne extends CommonObject $error=0; - dol_syslog("PropaleLigne::insert rang=".$this->rang); + dol_syslog(get_class($this)."::insert rang=".$this->rang); // Clean parameters if (empty($this->tva_tx)) $this->tva_tx=0; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 96d633bd834..c28128e81c5 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -56,6 +56,8 @@ $search_societe=GETPOST('search_societe','alpha'); $search_montant_ht=GETPOST('search_montant_ht','alpha'); $search_author=GETPOST('search_author','alpha'); $search_town=GETPOST('search_town','alpha'); +$viewstatut=$db->escape(GETPOST('viewstatut')); +$object_statut=$db->escape(GETPOST('propal_statut')); $sall=GETPOST("sall"); $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg")); @@ -78,6 +80,26 @@ if (! empty($socid)) } $result = restrictedArea($user, $module, $objectid, $dbtable); +if (GETPOST("button_removefilter") || GETPOST("button_removefilter_x")) // Both tests are required to be compatible with all browsers +{ + $search_categ=''; + $search_user=''; + $search_sale=''; + $search_ref=''; + $search_refcustomer=''; + $search_societe=''; + $search_montant_ht=''; + $search_author=''; + $search_town=''; + $year=''; + $month=''; + $viewstatut=''; + $object_statut=''; +} + +if($object_statut != '') +$viewstatut=$object_statut; + // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('propallist')); @@ -93,21 +115,6 @@ $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); -// Do we click on purge search criteria ? -if (GETPOST("button_removefilter_x")) -{ - $search_categ=''; - $search_user=''; - $search_sale=''; - $search_ref=''; - $search_refcustomer=''; - $search_societe=''; - $search_montant_ht=''; - $search_author=''; - $search_town=''; - $year=''; - $month=''; -} /* @@ -132,11 +139,6 @@ $offset = $conf->liste_limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -$viewstatut=$db->escape(GETPOST('viewstatut')); -$object_statut = $db->escape(GETPOST('propal_statut')); -if($object_statut != '') -$viewstatut=$object_statut; - if (! $sortfield) $sortfield='p.datep'; if (! $sortorder) $sortorder='DESC'; $limit = $conf->liste_limit; @@ -150,7 +152,7 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p'; if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid'; // We'll need this table joined to the select in order to filter by sale -if ($search_sale || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; +if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if ($search_user > 0) { $sql.=", ".MAIN_DB_PREFIX."element_contact as c"; @@ -322,10 +324,12 @@ if ($result) print ''; $formpropal->selectProposalStatus($viewstatut,1); print ''; + print ''; - print ''; - print ''; + print ''; + print ''; print ''; + print "\n"; $var=true; @@ -391,7 +395,7 @@ if ($result) // Date proposal print ''; - print dol_print_date($db->jdate($obj->dp), 'day'); + print dol_print_date($db->jdate($objp->dp), 'day'); print "\n"; // Date end validity @@ -431,14 +435,14 @@ if ($result) if($num<$limit){ $var=!$var; print ''.$langs->trans("TotalHT").''; - print ''.price($total).''; + print ''.price($total).''; print ''; } else { $var=!$var; print ''.$langs->trans("TotalHTforthispage").''; - print ''.price($total).''; + print ''.price($total).''; print ''; } diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 113618ffae8..dcebc06a43d 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -141,8 +141,8 @@ if ($resql) else dol_print_error($db); // Load sale and categ filters -$search_sale = GETPOST('search_sale'); -$search_categ = GETPOST('search_categ'); +$search_sale = GETPOST('search_sale','int'); +$search_categ = GETPOST('search_categ','int'); // If the internal user must only see his prospect, force searching by him if (!$user->rights->societe->client->voir && !$socid) $search_sale = $user->id; @@ -154,7 +154,7 @@ $sts = array(-1,0,1,2,3); $hookmanager->initHooks(array('prospectlist')); // Do we click on purge search criteria ? -if (GETPOST("button_removefilter_x")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $socname=""; $stcomm=""; @@ -200,11 +200,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)"; if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_societe"; // We need this table joined to the select in order to filter by categ -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale +if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale $sql.= " WHERE s.fk_stcomm = st.id"; $sql.= " AND s.client IN (2, 3)"; $sql.= ' AND s.entity IN ('.getEntity('societe', 1).')'; -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql.= " AND s.rowid = sc.fk_soc"; +if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc"; if ($socid) $sql.= " AND s.rowid = " .$socid; if (isset($stcomm) && $stcomm != '') $sql.= " AND s.fk_stcomm=".$stcomm; if ($catid > 0) $sql.= " AND cs.fk_categorie = ".$catid; @@ -229,7 +229,7 @@ if ($search_levels) $sql .= " AND s.fk_prospectlevel IN (".$search_levels.')'; } // Insert sale filter -if ($search_sale) +if ($search_sale > 0) { $sql .= " AND sc.fk_user = ".$db->escape($search_sale); } @@ -281,7 +281,7 @@ if ($resql) if ($search_level_from != '') $param.='&search_level_from='.$search_level_from; if ($search_level_to != '') $param.='&search_level_to='.$search_level_to; if ($search_categ != '') $param.='&search_categ='.$search_categ; - if ($search_sale != '') $param.='&search_sale='.$search_sale; + if ($search_sale > 0) $param.='&search_sale='.$search_sale; if ($search_status != '') $param.='&search_status='.$search_status; // $param and $urladd should have the same value $urladd = $param; diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index fe3e39d266d..b2d92dd55dc 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -136,14 +136,14 @@ if ($socid > 0) print ""; - print '
    '; + print '
    '; print ''; if (! empty($backtopage)) { - print '    '; + print '     '; print ''; } - print '
    '; + print ''; print ""; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 79f952fe7fd..b0475871458 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -278,14 +278,14 @@ if ($socid > 0) print ""; - print '
    '; + print '
    '; print ''; if (! empty($backtopage)) { - print '    '; + print '     '; print ''; } - print '
    '; + print ''; print ''; diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 839ca73d5b9..e6878eef179 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -3,7 +3,8 @@ * Copyright (C) 2004 Eric Seigne * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2011 Regis Houssin - * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2014 Frederic France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,21 +23,17 @@ /** * \file htdocs/commande/apercu.php * \ingroup commande - * \brief Page de l'onglet apercu d'une commande + * \brief Preview tab of order */ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; -if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; -if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('orders'); -$langs->load('propal'); $langs->load("bills"); $langs->load('compta'); -$langs->load('sendings'); // Security check $socid=0; @@ -47,19 +44,11 @@ $result=restrictedArea($user,'commande',$id,''); /* - * View + * View Mode */ llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes'); -$form = new Form($db); - -/* *************************************************************************** */ -/* */ -/* Mode fiche */ -/* */ -/* *************************************************************************** */ - if ($id > 0 || ! empty($ref)) { $object = new Commande($db); @@ -70,40 +59,46 @@ if ($id > 0 || ! empty($ref)) $soc->fetch($object->socid); - $head = commande_prepare_head($object); + $head = commande_prepare_head($object); dol_fiche_head($head, 'preview', $langs->trans("CustomerOrder"), 0, 'order'); - print ''; + print '
    '; // Ref - print '"; - print ''; - print '"; + print '"; + print ''; // Ref cde client - print ''; - print ''; - $nbrow=6; - print ''; + print ''; + print ''; - /* - * Documents - */ + // Client + print ''; + print ''; + print ''; + + // Statut + print ''; + print ''; + print ''; + + // Discount - left part + print ''; + print ''; + print ''; + + // Date - left part + print ''; + print ''; + + // Right part with $rowspan lines + $rowspan=4; + print '
    '.$langs->trans("Ref")."'.$object->ref.''.$langs->trans("Source").' : '.$object->getLabelSource(); - if ($object->source == 0) - { - // Propale - $propal = new Propal($db); - $propal->fetch($object->propale_id); - print ' -> '.$propal->ref.''; - } - print "
    '.$langs->trans("Ref")."'.$object->ref.'
    '; - print ''; - print '
    '; - print $langs->trans('RefCustomer').''; - print '
    '; - print '    		'; - print $object->ref_client; - print ''; + print '
    '.$langs->trans('RefCustomer').''.$object->ref_client.'
    '.$langs->trans("Customer").''.$soc->getNomUrl(1).'
    '.$langs->trans("Status").''.$object->getLibStatut(4).'
    '.$langs->trans('Discounts').''.$object->remise_percent.'%
    '.$langs->trans("Date").''.dol_print_date($object->date,"daytext").''; + + /* + * Documents + */ $objectref = dol_sanitizeFileName($object->ref); $dir_output = $conf->commande->dir_output . "/"; $filepath = $dir_output . $objectref . "/"; @@ -119,16 +114,16 @@ if ($id > 0 || ! empty($ref)) $var=true; - // Si fichier PDF existe + // if PDF file exist if (file_exists($file)) { $encfile = urlencode($file); - print_titre($langs->trans("Documents")); - print ''; + print '
    '; + print ''; print ""; - print ''; + print ''; print ''; print ''; print ''; @@ -139,7 +134,7 @@ if ($id > 0 || ! empty($ref)) { print ""; - print ''; + print ''; print ''; print ''; print ''; @@ -162,37 +157,24 @@ if ($id > 0 || ! empty($ref)) } } - print ""; + print ''; - // Client - print ""; - print ''; + // Total HT - left part + print ''; + print ''; print ''; - // Statut - print ''; - print "\n"; + // Total VAT - left part + print ''; + print ''; print ''; - // Date - print ''; - print "\n"; - print ''; + // Total TTC - left part + print ''; + print ''; + print ''; - // ligne 6 - // partie Gauche - print ''; - print ''; - print ''; - - // ligne 7 - // partie Gauche - print ''; - print ''; - print ''; - print '
    '.$langs->trans("Documents").'
    ".$langs->trans("Order")." PDF'.$object->ref.'.pdf'.$object->ref.'.pdf'.dol_print_size(dol_filesize($file)).''.dol_print_date(dol_filemtime($file),'dayhour').'
    Commande detaillee'.$object->ref.'-detail.pdf'.$object->ref.'-detail.pdf'.dol_print_size(dol_filesize($filedetail)).''.dol_print_date(dol_filemtime($filedetail),'dayhour').'
    ".$langs->trans("Customer")."'; - print ''.$soc->getNomUrl(1).''; - print '
    '.$langs->trans('AmountHT').'' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '
    '.$langs->trans("Status").'".$object->getLibStatut(4)."
    '.$langs->trans('AmountVAT').'' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '
    '.$langs->trans("Date").'".dol_print_date($object->date,"daytext")."
    '.$langs->trans('AmountTTC').'' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '
    '.$langs->trans('GlobalDiscount').''.$object->remise_percent.'%
    '.$langs->trans('AmountHT').''.price($object->total_ht).''.$langs->trans("Currency".$conf->currency).'
    '; + print '
    '; dol_fiche_end(); } @@ -203,10 +185,13 @@ if ($id > 0 || ! empty($ref)) } } +print ''; +print ''; +print '
    '; +print '
    '; // Si fichier png PDF d'1 page trouve if (file_exists($fileimage)) { - print ''; + print ''; } // Si fichier png PDF de plus d'1 page trouve elseif (file_exists($fileimagebis)) @@ -219,10 +204,13 @@ elseif (file_exists($fileimagebis)) if (file_exists($dir_output.$preview)) { - print '

    '; + print '

    '; } } } +print '

    '; +print '
    '; llxFooter(); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 4bf1eceb6dc..f20201ee5cc 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -523,16 +523,15 @@ else if ($action == 'addline' && $user->rights->commande->creer) { // Set if we used free entry or predefined product $predef=''; $product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):''); + $price_ht = GETPOST('price_ht'); if (GETPOST('prod_entry_mode') == 'free') { $idprod=0; - $price_ht = GETPOST('price_ht'); $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); } else { $idprod=GETPOST('idprod', 'int'); - $price_ht = ''; $tva_tx = ''; } @@ -922,8 +921,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 +970,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); } } @@ -1115,15 +1114,6 @@ else if ($action == 'remove_file') { } } -// Print file -else if ($action == 'print_file' and $user->rights->printipp->read) { - require_once DOL_DOCUMENT_ROOT . '/core/class/dolprintipp.class.php'; - $printer = new dolPrintIPP($db, $conf->global->PRINTIPP_HOST, $conf->global->PRINTIPP_PORT, $user->login, $conf->global->PRINTIPP_USER, $conf->global->PRINTIPP_PASSWORD); - $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha')); - setEventMessage($langs->trans("FileWasSentToPrinter", GETPOST('file'))); - $action = ''; -} - else if ($action == 'update_extras') { // Fill array 'array_options' with data from update form $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); @@ -1151,6 +1141,9 @@ else if ($action == 'update_extras') { $action = 'edit_extras'; } +include DOL_DOCUMENT_ROOT.'/core/actions_printipp.inc.php'; + + /* * Send mail */ @@ -1391,9 +1384,12 @@ if ($action == 'create' && $user->rights->commande->creer) { print ''; // Bank Account - print '' . $langs->trans('BankAccount') . ''; - $form->select_comptes($fk_account, 'fk_account', 0, '', 1); - print ''; + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled)) + { + print '' . $langs->trans('BankAccount') . ''; + $form->select_comptes($fk_account, 'fk_account', 0, '', 1); + print ''; + } // Delivery delay print '' . $langs->trans('AvailabilityPeriod') . ''; @@ -1530,7 +1526,7 @@ if ($action == 'create' && $user->rights->commande->creer) { print ''; // Button "Create Draft" - print '
    '; + print '
    '; print ''; @@ -1995,21 +1991,24 @@ if ($action == 'create' && $user->rights->commande->creer) { $rowspan ++; // Bank Account - print ''; - print ''; - print '
    '; - print $langs->trans('BankAccount'); - print ''; - if ($action != 'editbankaccount' && $user->rights->commande->creer) - 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 ''; - print ''; + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled)) + { + print ''; + print ''; + print '
    '; + print $langs->trans('BankAccount'); + print ''; + if ($action != 'editbankaccount' && $user->rights->commande->creer) + 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 ''; + print ''; + } // Total HT print '' . $langs->trans('AmountHT') . ''; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index ce3ec431180..967402b8d94 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 @@ -56,8 +61,9 @@ class Commande extends CommonOrder var $contactid; var $fk_project; var $statut; // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not) + var $facturee; // deprecated + var $billed; // billed or not - var $facturee; // Facturee ou non var $brouillon; var $cond_reglement_id; var $cond_reglement_code; @@ -430,6 +436,7 @@ class Commande extends CommonOrder if ($this->statut != 3) { + dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING); return 0; } @@ -664,19 +671,20 @@ class Commande extends CommonOrder $this->db->begin(); $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande ("; - $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_client, ref_int"; + $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_ext, ref_client, ref_int"; $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address"; $sql.= ", fk_shipping_method"; $sql.= ", remise_absolue, remise_percent"; $sql.= ", entity"; $sql.= ")"; $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id; - $sql.= ", ".($this->fk_project?$this->fk_project:"null"); + $sql.= ", ".($this->fk_project>0?$this->fk_project:"null"); $sql.= ", '".$this->db->idate($date)."'"; $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->source:'null'); $sql.= ", '".$this->db->escape($this->note_private)."'"; $sql.= ", '".$this->db->escape($this->note_public)."'"; - $sql.= ", '".$this->db->escape($this->ref_client)."'"; + $sql.= ", ".($this->ref_ext?"'".$this->db->escape($this->ref_ext)."'":"null"); + $sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null"); $sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null"); $sql.= ", '".$this->modelpdf."'"; $sql.= ", ".($this->cond_reglement_id>0?"'".$this->cond_reglement_id."'":"null"); @@ -801,6 +809,8 @@ class Commande extends CommonOrder if (! $error) { + $action='create'; + // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('orderdao')); @@ -998,7 +1008,12 @@ class Commande extends CommonOrder $line->marge_tx = $marginInfos[1]; $line->marque_tx = $marginInfos[2]; - $this->lines[$i] = $line; + // get extrafields from original line + $object->lines[$i]->fetch_optionals($object->lines[$i]->rowid); + foreach($object->lines[$i]->array_options as $options_key => $value) + $line->array_options[$options_key] = $value; + + $this->lines[$i] = $line; } $this->socid = $object->socid; @@ -1019,6 +1034,11 @@ class Commande extends CommonOrder $this->origin = $object->element; $this->origin_id = $object->id; + // get extrafields from original line + $object->fetch_optionals($object->id); + foreach($object->array_options as $options_key => $value) + $this->array_options[$options_key] = $value; + // Possibility to add external linked objects with hooks $this->linked_objects[$this->origin] = $this->origin_id; if (is_array($object->other_linked_objects) && ! empty($object->other_linked_objects)) @@ -1212,7 +1232,15 @@ class Commande extends CommonOrder $this->line->date_end=$date_end; // infos marge - $this->line->fk_fournprice = $fk_fournprice; + if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) { + // by external module, take lowest buying price + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; + $productFournisseur = new ProductFournisseur($this->db); + $productFournisseur->find_min_price_product_fournisseur($fk_product); + $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id; + } else { + $this->line->fk_fournprice = $fk_fournprice; + } $this->line->pa_ht = $pa_ht; // TODO Ne plus utiliser @@ -2409,7 +2437,15 @@ class Commande extends CommonOrder $this->line->skip_update_total=$skip_update_total; // infos marge - $this->line->fk_fournprice = $fk_fournprice; + if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) { + //by external module, take lowest buying price + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; + $productFournisseur = new ProductFournisseur($this->db); + $productFournisseur->find_min_price_product_fournisseur($fk_product); + $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id; + } else { + $this->line->fk_fournprice = $fk_fournprice; + } $this->line->pa_ht = $pa_ht; // TODO deprecated @@ -2448,6 +2484,131 @@ class Commande extends CommonOrder } } + /** + * Update database + * + * @param User $user User that modify + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int <0 if KO, >0 if OK + */ + function update($user=null, $notrigger=0) + { + global $conf, $langs; + $error=0; + + // Clean parameters + if (isset($this->ref)) $this->ref=trim($this->ref); + if (isset($this->ref_client)) $this->ref_client=trim($this->ref_client); + if (isset($this->note) || isset($this->note_private)) $this->note_private=(isset($this->note_private) ? trim($this->note_private) : trim($this->note)); + if (isset($this->note_public)) $this->note_public=trim($this->note_public); + if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf); + if (isset($this->import_key)) $this->import_key=trim($this->import_key); + + // Check parameters + // Put here code to add control on parameters values + + // Update request + $sql = "UPDATE ".MAIN_DB_PREFIX."commande SET"; + + $sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").","; + $sql.= " ref_client=".(isset($this->ref_client)?"'".$this->db->escape($this->ref_client)."'":"null").","; + $sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").","; + $sql.= " fk_soc=".(isset($this->socid)?$this->socid:"null").","; + $sql.= " date_commande=".(strval($this->date_commande)!='' ? "'".$this->db->idate($this->date_commande)."'" : 'null').","; + $sql.= " date_valid=".(strval($this->date_validation)!='' ? "'".$this->db->idate($this->date_validation)."'" : 'null').","; + $sql.= " tva=".(isset($this->total_tva)?$this->total_tva:"null").","; + $sql.= " localtax1=".(isset($this->total_localtax1)?$this->total_localtax1:"null").","; + $sql.= " localtax2=".(isset($this->total_localtax2)?$this->total_localtax2:"null").","; + $sql.= " total_ht=".(isset($this->total_ht)?$this->total_ht:"null").","; + $sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").","; + $sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").","; + $sql.= " fk_user_author=".(isset($this->user_author)?$this->user_author:"null").","; + $sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").","; + $sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").","; + $sql.= " fk_cond_reglement=".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null").","; + $sql.= " fk_mode_reglement=".(isset($this->mode_reglement_id)?$this->mode_reglement_id:"null").","; + $sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").","; + $sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").","; + $sql.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").","; + $sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null").""; + + $sql.= " WHERE rowid=".$this->id; + + $this->db->begin(); + + dol_syslog(get_class($this)."::update", LOG_DEBUG); + $resql = $this->db->query($sql); + if (! $resql) { + $error++; $this->errors[]="Error ".$this->db->lasterror(); + } + + if (! $error) + { + if (! $notrigger) + { + // Call trigger + $result=$this->call_trigger('ORDER_MODIFY',$user); + if ($result < 0) $error++; + // End call triggers + } + } + + // Commit or rollback + if ($error) + { + foreach($this->errors as $errmsg) + { + dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR); + $this->error.=($this->error?', '.$errmsg:$errmsg); + } + $this->db->rollback(); + return -1*$error; + } + else + { + $this->db->commit(); + return 1; + } + } + + /** + * Update value of extrafields on order + * + * @param User $user Object user that modify + * @return int <0 if ko, >0 if ok + */ + function update_extrafields($user) + { + $action='create'; + + // Actions on extra fields (by external module or standard code) + // FIXME le hook fait double emploi avec le trigger !! + $hookmanager->initHooks(array('orderdao')); + $parameters=array('id'=>$this->id); + $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$this->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + else if ($reshook < 0) $error++; + + if (!$error) + { + return 1; + } + else + { + return -1; + } + + } /** * Delete the customer order @@ -2639,22 +2800,22 @@ class Commande extends CommonOrder * Return label of status * * @param int $statut Id statut - * @param int $facturee if invoiced + * @param int $billed If invoiced * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label of status */ - function LibStatut($statut,$facturee,$mode) + function LibStatut($statut,$billed,$mode) { global $langs; - //print 'x'.$statut.'-'.$facturee; + //print 'x'.$statut.'-'.$billed; if ($mode == 0) { if ($statut==-1) return $langs->trans('StatusOrderCanceled'); if ($statut==0) return $langs->trans('StatusOrderDraft'); if ($statut==1) return $langs->trans('StatusOrderValidated'); if ($statut==2) return $langs->trans('StatusOrderSentShort'); - if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill'); - if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed'); + if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill'); + if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed'); } elseif ($mode == 1) { @@ -2662,8 +2823,8 @@ class Commande extends CommonOrder if ($statut==0) return $langs->trans('StatusOrderDraftShort'); if ($statut==1) return $langs->trans('StatusOrderValidatedShort'); if ($statut==2) return $langs->trans('StatusOrderSentShort'); - if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort'); - if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed'); + if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort'); + if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed'); } elseif ($mode == 2) { @@ -2671,8 +2832,8 @@ class Commande extends CommonOrder if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort'); if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort'); if ($statut==2) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort'); - if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort'); - if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort'); + if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort'); + if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort'); } elseif ($mode == 3) { @@ -2680,8 +2841,8 @@ class Commande extends CommonOrder if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0'); if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1'); if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3'); - if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7'); - if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6'); + if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7'); + if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6'); } elseif ($mode == 4) { @@ -2689,8 +2850,8 @@ class Commande extends CommonOrder if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft'); if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidated'); if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderSent'); - if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill'); - if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed'); + if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill'); + if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed'); } elseif ($mode == 5) { @@ -2698,8 +2859,8 @@ class Commande extends CommonOrder if ($statut==0) return ''.$langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0'); if ($statut==1) return ''.$langs->trans('StatusOrderValidatedShort').' '.img_picto($langs->trans('StatusOrderValidated'),'statut1'); if ($statut==2) return ''.$langs->trans('StatusOrderSentShort').' '.img_picto($langs->trans('StatusOrderSent'),'statut3'); - if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut7'); - if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessedShort').' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6'); + if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut7'); + if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessedShort').' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6'); } } @@ -2730,7 +2891,7 @@ class Commande extends CommonOrder $picto='order'; $label=$langs->trans("ShowOrder").': '.$this->ref; - if ($withpicto) $result.=($linkstart.img_object($label,$picto).$linkend); + if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$linkstart.$this->ref.$linkend; return $result; @@ -2920,43 +3081,6 @@ class Commande extends CommonOrder } } - /** - * Update value of extrafields on order - * - * @param User $user Object user that modify - * @return int <0 if ko, >0 if ok - */ - function update_extrafields($user) - { - // Actions on extra fields (by external module or standard code) - // FIXME le hook fait double emploi avec le trigger !! - $hookmanager->initHooks(array('orderdao')); - $parameters=array('id'=>$this->id); - $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - if (empty($reshook)) - { - if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used - { - $result=$this->insertExtraFields(); - if ($result < 0) - { - $error++; - } - } - } - else if ($reshook < 0) $error++; - - if (!$error) - { - return 1; - } - else - { - return -1; - } - - } - /** * Return an array of order lines * @@ -3070,8 +3194,7 @@ class Commande extends CommonOrder /** - * \class OrderLine - * \brief Classe de gestion des lignes de commande + * Class to mange order lines */ class OrderLine extends CommonOrderLine { @@ -3280,7 +3403,7 @@ class OrderLine extends CommonOrderLine $error=0; - dol_syslog("OrderLine::insert rang=".$this->rang); + dol_syslog(get_class($this)."::insert rang=".$this->rang); // Clean parameters if (empty($this->tva_tx)) $this->tva_tx=0; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index ea17d895b95..2c30f4128c6 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -70,7 +70,7 @@ $limit = $conf->liste_limit; $viewstatut=GETPOST('viewstatut'); // Purge search criteria -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_categ=''; $search_user=''; @@ -229,7 +229,7 @@ if ($resql) if ($viewstatut == 1) $title.=' - '.$langs->trans('StatusOrderValidatedShort'); if ($viewstatut == 2) - $title.=' - '.$langs->trans('StatusOrderOnProcessShort'); + $title.=' - '.$langs->trans('StatusOrderSentShort'); if ($viewstatut == 3) $title.=' - '.$langs->trans('StatusOrderToBillShort'); if ($viewstatut == 4) @@ -295,7 +295,7 @@ if ($resql) print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'c.total_ht','',$param, 'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'c.fk_statut','',$param,'align="right"',$sortfield,$sortorder); print ''; - + print ''; print ''; print ''; diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 1009b030210..99458e3aea0 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -496,7 +496,7 @@ if ($action == 'create' && !$error) } // Button "Create Draft" - print '
    '; + print '
    '; print "\n"; print ''; @@ -683,7 +683,7 @@ if (($action != 'create' && $action != 'add') || !$error) /* * Boutons actions */ - print '

    '.$langs->trans("CloseProcessedOrdersAutomatically"); + print '
    '.$langs->trans("CloseProcessedOrdersAutomatically"); print '
    '; print ''; print ''; @@ -691,6 +691,7 @@ if (($action != 'create' && $action != 'add') || !$error) //print ''.$langs->trans("GoBack").''; print ''; print '
    '; + print '
    '; print ''; $db->free($resql); } diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 30cf5b9c5ac..e5bafe8fed6 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -496,11 +496,11 @@ else unset($tblyear[1]); unset($tblyear[2]); - print '
    '; + print '
    '; print $show1; - print '
    '; + print '
    '; print $show2; - print '
    '; + print ''; print '
    '; } diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index b92aa1eb34a..03f0babe75d 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -63,8 +63,7 @@ if ($action == 'update' && ! $_POST["cancel"]) $account->number = trim($_POST["number"]); $account->cle_rib = trim($_POST["cle_rib"]); $account->bic = trim($_POST["bic"]); - $account->iban = trim($_POST["iban_prefix"]); - $account->iban_prefix = trim($_POST["iban_prefix"]); // deprecated + $account->iban = trim($_POST["iban"]); $account->domiciliation = trim($_POST["domiciliation"]); $account->proprio = trim($_POST["proprio"]); $account->owner_address = trim($_POST["owner_address"]); @@ -246,7 +245,7 @@ if (($_GET["id"] || $_GET["ref"]) && $action != 'edit') if ($account->getCountryCode() == 'IN') $bickey="SWIFT"; print ''.$langs->trans($ibankey).''; - print ''.$account->iban_prefix.''; + print ''.$account->iban.''; print ''.$langs->trans($bickey).''; print ''.$account->bic.''; @@ -423,7 +422,7 @@ if ($_GET["id"] && $action == 'edit' && $user->rights->banque->configurer) // IBAN print ''.$langs->trans($ibankey).''; - print ''; + print ''; print ''.$langs->trans($bickey).''; print ''; diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 9b4efe79eb1..c673c735c3c 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -143,7 +143,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"]) $account->number = trim($_POST["number"]); $account->cle_rib = trim($_POST["cle_rib"]); $account->bic = trim($_POST["bic"]); - $account->iban_prefix = trim($_POST["iban_prefix"]); + $account->iban = trim($_POST["iban"]); $account->domiciliation = trim($_POST["domiciliation"]); $account->proprio = trim($_POST["proprio"]); @@ -366,12 +366,15 @@ if ($action == 'create') } // Accountancy journal - print ''.$langs->trans("AccountancyJournal").''; - print ''; + if (! empty($conf->accounting->enabled)) + { + print ''.$langs->trans("AccountancyJournal").''; + print ''; + } print ''; - print '

    '; + print '
    '; print ''; } @@ -498,8 +501,11 @@ else print ''.$account->account_number.''; // Accountancy journal - print ''.$langs->trans("AccountancyJournal").''; - print ''.$account->accountancy_journal.''; + if (! empty($conf->accounting->enabled)) + { + print ''.$langs->trans("AccountancyJournal").''; + print ''.$account->accountancy_journal.''; + } print ''; @@ -670,13 +676,19 @@ else } // Accountancy journal - print ''.$langs->trans("AccountancyJournal").''; - print 'accountancy_journal).'">'; + if (! empty($conf->accounting->enabled)) + { + print ''.$langs->trans("AccountancyJournal").''; + print 'accountancy_journal).'">'; + } print ''; - print '

    '; - print '  
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index a50a7f448a9..f3c419c7517 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -59,7 +59,7 @@ class Account extends CommonObject //! BIC/SWIFT number var $bic; //! IBAN number (International Bank Account Number) - var $iban_prefix; + var $iban; // stored into iban_prefix field into database var $proprio; var $owner_address; @@ -220,7 +220,7 @@ class Account extends CommonObject /** * Add an entry into table ".MAIN_DB_PREFIX."bank * - * @param timsestmap $date Date operation + * @param timestamp $date Date operation * @param string $oper 1,2,3,4... (deprecated) or TYP,VIR,PRE,LIQ,VAD,CB,CHQ... * @param string $label Descripton * @param float $amount Amount @@ -678,7 +678,6 @@ class Account extends CommonObject $this->cle_rib = $obj->cle_rib; $this->bic = $obj->bic; $this->iban = $obj->iban; - $this->iban_prefix = $obj->iban; // deprecated $this->domiciliation = $obj->domiciliation; $this->proprio = $obj->proprio; $this->owner_address = $obj->owner_address; @@ -948,7 +947,7 @@ class Account extends CommonObject $lienfin=''; } - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAccount"),'account').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAccount").': '.$this->label, 'account', 'class="classfortooltip"').$lienfin.' '); $result.=$lien.$this->label.$lienfin; return $result; } @@ -1068,7 +1067,6 @@ class Account extends CommonObject $this->cle_rib = 50; $this->bic = 'AA12'; $this->iban = 'FR999999999'; - $this->iban_prefix = 'FR'; // deprecated $this->domiciliation = 'The bank addresse'; $this->proprio = 'Owner'; $this->owner_address = 'Owner address'; @@ -1202,7 +1200,7 @@ class AccountLine extends CommonObject * @param User $user User object that delete * @return int <0 if KO, >0 if OK */ - function delete($user=0) + function delete($user=null) { $nbko=0; @@ -1251,7 +1249,7 @@ class AccountLine extends CommonObject * @param User $user User object that delete * @return int <0 if KO, >0 if OK */ - function delete_urls($user=0) + function delete_urls($user=null) { $nbko=0; @@ -1489,7 +1487,7 @@ class AccountLine extends CommonObject $lien = ''; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowTransaction"),'account').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowTransaction"), 'account', 'class="classfortooltip"').$lienfin.' '); $result.=$lien.$this->rowid.$lienfin; if ($option == 'showall' || $option == 'showconciliated') $result.=' ('; diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index a1bc0191175..fb796b219ee 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -30,9 +30,7 @@ /** - * \class BankCateg - * \brief Class to manage bank categories - * \remarks Initialy built by build_class_from_table on 2009-01-02 15:26 + * Class to manage bank categories */ class BankCateg // extends CommonObject { @@ -172,7 +170,7 @@ class BankCateg // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -300,7 +298,7 @@ class BankCateg // extends CommonObject $error=0; - $object=new Bank_categ($this->db); + $object=new BankCateg($this->db); $this->db->begin(); 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 ''."\n"; print ''.dol_print_date($db->jdate($objp->dv),"day").""; - print '  '; + print ' '; print ''; print ''; print img_edit_remove() . " "; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 1e8196481e6..534a9bb0e95 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -73,7 +73,7 @@ $limit = $conf->liste_limit; if (! $sortorder) $sortorder='DESC'; if (! $sortfield) $sortfield='b.dateo'; -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $description=""; $type=""; @@ -175,7 +175,8 @@ if ($resql) print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num); } - print ''; + print ''."\n"; + print ''."\n"; $moreforfilter .= $langs->trans('Period') . ' ' . $langs->trans('StartDate') . ': '; $moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 1, 1); @@ -185,10 +186,10 @@ if ($resql) if ($moreforfilter) { print '
    '; print $moreforfilter; - print '
    '; + print ''."\n"; } - print ''; + print '
    '."\n"; print ''; print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('DateOperationShort'),$_SERVER['PHP_SELF'],'b.dateo','',$param,'align="center"',$sortfield,$sortorder); @@ -202,7 +203,6 @@ if ($resql) print ''; print "\n"; - print ''; print ''; print ''; print ''; @@ -228,35 +228,38 @@ if ($resql) print ''; print "\n"; - // Loop on each record - $total_debit=0; - $total_credit=0; - while ($i < min($num,$limit)) - { - $objp = $db->fetch_object($resql); - $printline=false; - //Search Description - if ($description) { - preg_match('/\((.+)\)/i',$objp->label,$reg); // Si texte entoure de parenthee on tente recherche de traduction - if ($reg[1]) { - if ($langs->transnoentities($reg[1])==$description) { - $printline=true; - } - }elseif ($objp->label==$description) {$printline=true;} - }else {$printline=true;} + // Loop on each record + $total_debit=0; + $total_credit=0; + while ($i < min($num,$limit)) { + $objp = $db->fetch_object($resql); + $printline=false; + //Search Description + if ($description) { + preg_match('/\((.+)\)/i',$objp->label,$reg); // Si texte entoure de parenthese on tente recherche de traduction + if ($reg[1]) { + if ($langs->transnoentities($reg[1])==$description) { + $printline=true; + } + } elseif ($objp->label==$description) { + $printline=true; + } + } else { + $printline=true; + } - if ($printline) { - $var=!$var; + if ($printline) { + $var=!$var; - print ""; + print ""; - // Ref - print ''; + // Ref + print ''; - // Date ope - print '\n"; + // Date ope + print '\n"; // Date value print '\n"; @@ -330,7 +333,7 @@ if ($resql) } print "
      '.$langs->trans("Account").'
      
    '; - print "rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid."   "; - print ''; + print "rowid.'">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'payment', 'class="classfortooltip"').' '.$objp->rowid."   "; + print ''.dol_print_date($db->jdate($objp->do),"day")."'.dol_print_date($db->jdate($objp->do),"day")."'.dol_print_date($db->jdate($objp->dv),"day")."
    "; - + print ''; $db->free($resql); } else diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 7ac510525be..1cb00e3ba51 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -157,7 +157,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $sql.= " ORDER BY dlr ASC"; // Supplier invoices - $sql2= " SELECT 'invoice_supplier' as family, ff.rowid as objid, ff.ref_supplier as ref, (-1*ff.total_ttc) as total_ttc, ff.type, ff.date_lim_reglement as dlr,"; + $sql2= " SELECT 'invoice_supplier' as family, ff.rowid as objid, ff.ref as ref, ff.ref_supplier as ref_supplier, (-1*ff.total_ttc) as total_ttc, ff.type, ff.date_lim_reglement as dlr,"; $sql2.= " s.rowid as socid, s.nom as name, s.fournisseur"; $sql2.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ff.fk_soc = s.rowid"; @@ -254,12 +254,13 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) if ($obj->family == 'invoice_supplier') { - // TODO This code is to avoid to count suppliers credit note (ff.type = 2) - // Ajouter gestion des avoirs fournisseurs, champ - if (($obj->total_ttc < 0 && $obj->type != 2) - || ($obj->total_ttc > 0 && $obj->type == 2)) + $showline=1; + // Uncomment this line to avoid to count suppliers credit note (ff.type = 2) + //$showline=(($obj->total_ttc < 0 && $obj->type != 2) || ($obj->total_ttc > 0 && $obj->type == 2)) + if ($showline) { - $facturefournstatic->ref=$obj->ref; + $ref=$obj->ref; + $facturefournstatic->ref=$ref; $facturefournstatic->id=$obj->objid; $facturefournstatic->type=$obj->type; $ref = $facturefournstatic->getNomUrl(1,''); @@ -298,7 +299,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) if ($paiement) $total_ttc = $obj->total_ttc - $paiement; $solde += $total_ttc; - // We discard with a remain to pay to 0 + // We discard lines with a remainder to pay to 0 if (price2num($total_ttc) != 0) { $var=!$var; diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 601db34c964..0672104ff60 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -182,7 +182,7 @@ print '"; -print '
    '; +print '
    '; print ""; 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) diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index 20433118bbf..bcef3512c33 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -303,8 +303,11 @@ if ($action == 'create') print ''; - print '
        '; - print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } @@ -396,9 +399,11 @@ else if ($id) print ''; - print '
      '; + print '
    '; + print ''; + print '     '; print ''; - print '
    '; + print ''; print ''; diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 4eab354577a..bb0e7d3506b 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -365,7 +365,7 @@ class Deplacement extends CommonObject $label=$langs->trans("Show").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; return $result; diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index 42a6713c1ce..e34e7c2b3a6 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -57,7 +57,7 @@ $limit = $conf->liste_limit; $year=GETPOST("year"); $month=GETPOST("month"); -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $search_name=""; diff --git a/htdocs/compta/dons/card.php b/htdocs/compta/dons/card.php index e453ef623c3..c365aa0928a 100644 --- a/htdocs/compta/dons/card.php +++ b/htdocs/compta/dons/card.php @@ -76,7 +76,7 @@ if ($action == 'update') if (empty($amount)) { - $setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Amount")), 'errors'); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Amount")), 'errors'); $action = "create"; $error++; } @@ -329,7 +329,7 @@ if ($action == 'create') $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$don,$action); // Note that $action and $object may have been modified by hook print "\n"; - print '
       
    '; + print '
       
    '; print "\n"; } @@ -429,7 +429,7 @@ if (! empty($id) && $action == 'edit') print "\n"; - print '
       
    '; + print '
       
    '; print "\n"; diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 61e1b9cd926..4d7c8931e31 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -719,7 +719,7 @@ class Don extends CommonObject $label=$langs->trans("ShowDonation").': '.$this->id; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->id.$lienfin; return $result; diff --git a/htdocs/compta/dons/list.php b/htdocs/compta/dons/list.php index 174b5357bb2..95011ca0b74 100644 --- a/htdocs/compta/dons/list.php +++ b/htdocs/compta/dons/list.php @@ -50,7 +50,7 @@ $search_amount = GETPOST('search_amount','alpha'); if (!$user->rights->don->lire) accessforbidden(); -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $search_company=""; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 9d003ae0aa7..373671fc89e 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); } } @@ -1115,16 +1115,15 @@ else if ($action == 'addline' && $user->rights->facture->creer) // Set if we used free entry or predefined product $predef=''; $product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):''); + $price_ht = GETPOST('price_ht'); if (GETPOST('prod_entry_mode') == 'free') { $idprod=0; - $price_ht = GETPOST('price_ht'); $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); } else { $idprod=GETPOST('idprod', 'int'); - $price_ht = ''; $tva_tx = ''; } @@ -1328,8 +1327,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); } @@ -1615,14 +1614,7 @@ else if ($action == 'remove_file') { } } -// Print file -else if ($action == 'print_file' and $user->rights->printipp->read) { - require_once DOL_DOCUMENT_ROOT . '/core/class/dolprintipp.class.php'; - $printer = new dolPrintIPP($db, $conf->global->PRINTIPP_HOST, $conf->global->PRINTIPP_PORT, $user->login, $conf->global->PRINTIPP_USER, $conf->global->PRINTIPP_PASSWORD); - $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha')); - setEventMessage($langs->trans("FileWasSentToPrinter", GETPOST('file'))); - $action = ''; -} +include DOL_DOCUMENT_ROOT.'/core/actions_printipp.inc.php'; if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->facture->creer) { @@ -1774,7 +1766,9 @@ if ($action == 'create') $ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : ''); $ref_int = (! empty($objectsrc->ref_int) ? $objectsrc->ref_int : ''); - $soc = $objectsrc->thirdparty; + // only if socid not filled else it's allready done upper + 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)); @@ -1793,7 +1787,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) @@ -2275,10 +2269,11 @@ if ($action == 'create') print "\n"; // Button "Create Draft" - print '
    '; + print '
    '; print ''; - print ' '; - print '
    '; + print '     '; + print ''; + print ''; print "\n"; @@ -3486,7 +3481,7 @@ if ($action == 'create') $i ++; } print ''; - print '
     
    '; + print '
     
    '; print ''; $db->free($resqlorderlist); } else { diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php index 4f5d2ba1bcf..6d60180593a 100644 --- a/htdocs/compta/facture/admin/facture_cust_extrafields.php +++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php @@ -70,7 +70,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup'); print '
    '; -$head = invoice_admin_prepare_head(null); +$head = invoice_admin_prepare_head(); dol_fiche_head($head, 'attributes', $langs->trans("Invoices"), 0, 'invoice'); diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php index 9c1240a28c9..fd4284a01dd 100644 --- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php +++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php @@ -71,7 +71,7 @@ $linkback='    '.$langs->trans("BackToM print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup'); print '
    '; -$head = invoice_admin_prepare_head(null); +$head = invoice_admin_prepare_head(); dol_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), 0, 'invoice'); diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 211d9241a8f..8f03e33bb03 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -3,7 +3,8 @@ * Copyright (C) 2004 Eric Seigne * Copyright (C) 2004-2007 Laurent Destailleur * Copyright (C) 2005-2011 Regis Houssin - * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2014 Frederic France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,9 +22,9 @@ */ /** - * \file htdocs/compta/facture/apercu.php - * \ingroup facture - * \brief Page de l'onglet apercu d'une facture + * \file htdocs/compta/facture/apercu.php + * \ingroup facture + * \brief Preview Tab of invoice */ require '../../main.inc.php'; @@ -67,12 +68,6 @@ if ($id > 0 || ! empty($ref)) $soc = new Societe($db); $soc->fetch($object->socid); - $author = new User($db); - if ($object->user_author) - { - $author->fetch($object->user_author); - } - $head = facture_prepare_head($object); dol_fiche_head($head, 'preview', $langs->trans("InvoiceCustomer"), 0, 'bill'); @@ -80,32 +75,28 @@ if ($id > 0 || ! empty($ref)) $totalpaye = $object->getSommePaiement(); /* - * Facture + * Invoice */ print ''; - $rowspan=3; // Ref - print ''; + print ''; + print ''; + print ''; // Ref customer - print ''; - print ''; + print ''; + print ''; + print ''; - // Societe + // Thirdparty print ''; print ''; print ''; // Type - print ''; + print ''; + print ''; + print ''; // Relative and absolute discounts $addabsolutediscount=' '.$langs->trans("AddGlobalDiscount").''; $addcreditnote=' '.$langs->trans("AddCreditNote").''; - print ''; + print ''; + print ''; + print ''; // Dates print ''; - print ''; - print ""; + print ''; - // Date payment term - print ''; - - // Conditions reglement - print ''; - print ''; - - // Mode de reglement - print ''; - - $nbrows=5; - if (! empty($conf->projet->enabled)) $nbrows++; - print ''; print '
    '.$langs->trans('Ref').''.$object->ref.'
    '.$langs->trans('Ref').''.$object->ref.'
    '; - print ''; - print '
    '; - print $langs->trans('RefCustomer'); - print '
    '; - print '    		'; - print $object->ref_client; - print '
    '.$langs->trans('RefCustomer').''.$object->ref_client.'
    '.$langs->trans("Company").''.$soc->getNomUrl(1,'compta').'
    '.$langs->trans('Type').''; + print '
    '.$langs->trans('Type').''; print $object->getLibType(); if ($object->type == Facture::TYPE_REPLACEMENT) { @@ -141,14 +132,15 @@ if ($id > 0 || ! empty($ref)) $facthatreplace->fetch($objectidnext); print ' ('.$langs->transnoentities("ReplacedByInvoice",$facthatreplace->getNomUrl(1)).')'; } - print '
    '.$langs->trans('Discounts'); - print ''; + print '
    '.$langs->trans('Discounts').''; if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent); else print $langs->trans("CompanyHasNoRelativeDiscount"); @@ -187,7 +179,7 @@ if ($id > 0 || ! empty($ref)) } else { - if ($absolute_creditnote > 0) // If not linke will be added later + if ($absolute_creditnote > 0) // If not linked will be added later { if ($object->statut == 0 && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'
    '; else print '.'; @@ -230,66 +222,17 @@ if ($id > 0 || ! empty($ref)) print $addabsolutediscount; //print '   -   '.$addcreditnote; // We disbale link to credit note }*/ - print '
    '.$langs->trans("Date").''.dol_print_date($object->date,"daytext").'
    '.dol_print_date($object->date,"daytext").'
    '; - print ''; - if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $object->brouillon && $user->rights->facture->creer) print ''; - print '
    '; - print $langs->trans('DateMaxPayment'); - print 'id.'">'.img_edit($langs->trans('SetDate'),1).'
    '; - print '    		'; - if ($object->type != Facture::TYPE_CREDIT_NOTE) - { - if ($action == 'editpaymentterm') - { - $form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->date_lim_reglement,'paymentterm'); - } - else - { - print dol_print_date($object->date_lim_reglement,'daytext'); - if ($object->date_lim_reglement < ($now - $conf->facture->client->warning_delay) && ! $object->paye && $object->statut == 1 && ! $object->am) print img_warning($langs->trans('Late')); - } - } - else - { - print ' '; - } - print '
    '.$langs->trans("PaymentConditionsShort").''; - $form->form_conditions_reglement($_SERVER["PHP_SELF"]."?facid=$object->id",$object->cond_reglement_id,"none"); - print '
    '; - print ''; - if ($action != 'editmode' && $object->brouillon && $user->rights->facture->creer) print ''; - print '
    '; - print $langs->trans('PaymentMode'); - print 'id.'">'.img_edit($langs->trans('SetMode'),1).'
    '; - print '    		'; - if ($action == 'editmode') - { - $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'mode_reglement_id'); - } - else - { - $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'none'); - } - print ''; + // Right part with $rowspan lines + $rowspan=5; + if (! empty($conf->projet->enabled)) $rowspan++; + print ''; /* * Documents @@ -303,7 +246,7 @@ if ($id > 0 || ! empty($ref)) $relativepathdetail = $objectref.'/'.$objectref.'-detail.pdf'; // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png") - $fileimage = $file.'_preview.png'; // If PDF has 1 page + $fileimage = $file.'_preview.png'; // If PDF has 1 page $fileimagebis = $file.'_preview-0.pdf.png'; // If PDF has more than one page $relativepathimage = $relativepath.'_preview.png'; @@ -313,8 +256,8 @@ if ($id > 0 || ! empty($ref)) if (file_exists($file)) { $encfile = urlencode($file); - print_titre($langs->trans("Documents")); - print ''; + print '
    '; + print ''; print ""; @@ -353,24 +296,32 @@ if ($id > 0 || ! empty($ref)) } print ""; + // Total HT print ''; - print ''; - print ''; + print ''; + print ''; - print ''; - print ''; - print ''; - print ''; + // Total VAT + print ''; + print ''; + print ''; + + // Total TTC + print ''; + print ''; + print ''; // Statut - print ''; + print ''; + print ''; + print ''; // Projet if (! empty($conf->projet->enabled)) { $langs->load("projects"); - print ''; - print ''; + print ''; print ''; + // Conditions de reglement + print ''; + // Date payment term print ''; print '
    '.$langs->trans("Documents").'
    ".$langs->trans("Bill")." PDF
    '.$langs->trans("AmountHT").''.price($object->total_ht).''.$langs->trans("Currency".$conf->currency).'
    ' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '
    '.$langs->trans('AmountVAT').''.price($object->total_tva).''.$langs->trans('Currency'.$conf->currency).'
    '.$langs->trans('AmountTTC').''.price($object->total_ttc).''.$langs->trans('Currency'.$conf->currency).'
    '.$langs->trans('AmountVAT').'' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '
    '.$langs->trans('AmountTTC').'' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '
    '.$langs->trans('Status').''.($object->getLibStatut(4,$totalpaye)).'
    '.$langs->trans('Status').''.($object->getLibStatut(4,$totalpaye)).'
    '.$langs->trans("Project").''; + print '
    '.$langs->trans("Project").''; if ($object->fk_project > 0) { $project = New Project($db); @@ -391,14 +342,17 @@ if ($id > 0 || ! empty($ref)) else { // Facture non trouvee - print $langs->trans("ErrorBillNotFound",$_GET["facid"]); + print $langs->trans("ErrorBillNotFound",$id); } } +print ''; +print ''; +print '
    '; +print '
    '; // Si fichier png PDF d'1 page trouve if (file_exists($fileimage)) { - print ''; + print ''; } // Si fichier png PDF de plus d'1 page trouve elseif (file_exists($fileimagebis)) @@ -411,11 +365,13 @@ elseif (file_exists($fileimagebis)) if (file_exists($dir_output.$preview)) { - print '

    '; + print '

    '; } } } - +print '

    '; +print '
    '; llxFooter(); diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index f6c0ab1a481..71634aaa3ad 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -566,7 +566,7 @@ class FactureRec extends Facture $label=$langs->trans("ShowInvoice").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; return $result; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 605d4920669..f4699debd52 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; @@ -464,6 +469,8 @@ class Facture extends CommonInvoice $result=$this->update_price(1); if ($result > 0) { + $action='create'; + // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('invoicedao')); @@ -733,6 +740,11 @@ class Facture extends CommonInvoice $marginInfos = getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht); $line->pa_ht = $marginInfos[0]; + // get extrafields from original line + $object->lines[$i]->fetch_optionals($object->lines[$i]->rowid); + foreach($object->lines[$i]->array_options as $options_key => $value) + $line->array_options[$options_key] = $value; + $this->lines[$i] = $line; } @@ -752,6 +764,11 @@ class Facture extends CommonInvoice $this->origin = $object->element; $this->origin_id = $object->id; + // get extrafields from original line + $object->fetch_optionals($object->id); + foreach($object->array_options as $options_key => $value) + $this->array_options[$options_key] = $value; + // Possibility to add external linked objects with hooks $this->linked_objects[$this->origin] = $this->origin_id; if (! empty($object->other_linked_objects) && is_array($object->other_linked_objects)) @@ -815,13 +832,12 @@ class Facture extends CommonInvoice $linkstart=''; $linkend=''; - if ($withpicto) $result.=($linkstart.img_object(($max?dol_trunc($label,$max):$label),$picto).$linkend); + if ($withpicto) $result.=($linkstart.img_object(($max?dol_trunc($label,$max):$label), $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$linkstart.($max?dol_trunc($this->ref,$max):$this->ref).$linkend; return $result; } - /** * Get object and lines from database * @@ -1040,7 +1056,7 @@ class Facture extends CommonInvoice * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -1588,7 +1604,7 @@ class Facture extends CommonInvoice * * @param User $user Object user that validate * @param string $force_number Reference to force on invoice - * @param int $idwarehouse Id of warehouse to use for stock decrease + * @param int $idwarehouse Id of warehouse to use for stock decrease if option to decreasenon stock is on (0=no decrease) * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers * @return int <0 if KO, >0 if OK */ @@ -1716,7 +1732,7 @@ class Facture extends CommonInvoice $result=$this->client->set_as_client(); // Si active on decremente le produit principal et ses composants a la validation de facture - if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL)) + if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse > 0) { require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $langs->load("agenda"); @@ -2191,7 +2207,15 @@ class Facture extends CommonInvoice $this->line->skip_update_total = $skip_update_total; // infos marge - $this->line->fk_fournprice = $fk_fournprice; + if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) { + // POS or external module, take lowest buying price + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; + $productFournisseur = new ProductFournisseur($this->db); + $productFournisseur->find_min_price_product_fournisseur($fk_product); + $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id; + } else { + $this->line->fk_fournprice = $fk_fournprice; + } $this->line->pa_ht = $pa_ht; if (is_array($array_option) && count($array_option)>0) { @@ -2459,7 +2483,7 @@ class Facture extends CommonInvoice * Return next reference of customer invoice not already used (or last reference) * according to numbering module defined into constant FACTURE_ADDON * - * @param Society $soc object company + * @param Societe $soc object company * @param string $mode 'next' for next value or 'last' for last value * @return string free ref or last ref */ @@ -2817,6 +2841,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) @@ -2862,21 +2888,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 @@ -3487,6 +3524,14 @@ class FactureLigne extends CommonInvoiceLine } } + // POS or by external module, take lowest buying price + if (!empty($this->fk_product) && empty($this->fk_fournprice) && empty($this->pa_ht)) { + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; + $productFournisseur = new ProductFournisseur($this->db); + $productFournisseur->find_min_price_product_fournisseur($this->fk_product); + $this->fk_fournprice = $productFournisseur->product_fourn_price_id; + } + $this->db->begin(); // Insertion dans base de la ligne diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index cdc935cde01..b75bb056e03 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -261,7 +261,7 @@ class PaymentTerm // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 320d86f3377..a010e7d7401 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -374,7 +374,7 @@ $search_montant_ttc = GETPOST("search_montant_ttc"); $late = GETPOST("late"); // Do we click on purge search criteria ? -if (GETPOST("button_removefilter_x")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=''; $search_refcustomer=''; @@ -429,7 +429,8 @@ if ($search_paymentmode) $sql .= " AND f.fk_mode_reglement = ".$search_payme if ($search_montant_ht) $sql .= " AND f.total = '".$db->escape($search_montant_ht)."'"; if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$db->escape($search_montant_ttc)."'"; if (GETPOST('sf_ref')) $sql .= " AND f.facnumber LIKE '%".$db->escape(GETPOST('sf_ref'))."%'"; -$sql.= " GROUP BY s.nom, s.rowid, s.email, f.rowid, f.facnumber, f.increment, f.total, f.tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp, f.datef, f.date_lim_reglement, f.paye, f.fk_statut, f.type "; +$sql.= " GROUP BY s.nom, s.rowid, s.email, f.rowid, f.facnumber, f.ref_client, f.increment, f.total, f.tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp,"; +$sql.= " f.datef, f.date_lim_reglement, f.paye, f.fk_statut, f.type, fk_mode_reglement"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= " ORDER BY "; $listfield=explode(',',$sortfield); diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index ba27f5659a9..56bd57c725a 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -111,7 +111,7 @@ $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); // Do we click on purge search criteria ? -if (GETPOST("button_removefilter_x")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_categ=''; $search_user=''; 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 ''; + 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 ''; - // Conditions de reglement - print ''; - - // Mode de reglement + // Payment mode 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/index.php b/htdocs/compta/index.php index fc2943f05e0..9265c9ee463 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 '
    '; 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).'
    '; 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 ''; @@ -587,7 +587,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print ''; print ''; print ''; - print ''; + print ''; print ''; } else @@ -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").'
    '.$langs->trans("Total").''.price($tot_ttc).'  
    '; print ""; - print ''; + print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; print ''; print ''; @@ -678,7 +678,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us $societestatic->name=$obj->name; $societestatic->client=1; print $societestatic->getNomUrl(1,'customer',44); - 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").''.price($obj->total_ht).''.price($obj->total_ttc).''.price($obj->total_ttc-$obj->tot_fttc).'
    '; - print ''; + print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''; print ''; print ''; @@ -777,7 +777,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $societestatic->name=$obj->name; $societestatic->client=1; print $societestatic->getNomUrl(1,'customer',44); - 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").''.price($obj->total).''.price($obj->total_ttc).''.price($obj->am).'
    '; - 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); diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index 1b16064ed9e..308bcac6dc9 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -190,8 +190,11 @@ if ($_GET["action"] == 'create') print "
    "; - print '
      '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index 4174d693da3..85da8e05476 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -127,7 +127,7 @@ class Localtax extends CommonObject * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; @@ -592,7 +592,7 @@ class Localtax extends CommonObject $picto='payment'; $label=$langs->trans("ShowVatPayment").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; return $result; diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 1ee31f5ebbd..33ebfd3b1be 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2014 Ferran Marcet +/* Copyright (C) 2011-2014 Juanjo Menent + * Copyright (C) 2014 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,9 +17,9 @@ */ /** - * \file htdocs/compta/localtax/index.php + * \file htdocs/compta/localtax/index.php * \ingroup tax - * \brief Index page of IRPF reports + * \brief Index page of IRPF reports */ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; @@ -30,8 +30,7 @@ $langs->load("other"); $localTaxType=GETPOST('localTaxType', 'int'); $year=$_GET["year"]; -if ($year == 0 ) -{ +if ($year == 0 ) { $year_current = strftime("%Y",time()); $year_start = $year_current; } else { @@ -41,21 +40,30 @@ if ($year == 0 ) // Security check $socid = isset($_GET["socid"])?$_GET["socid"]:''; -if ($user->societe_id) $socid=$user->societe_id; +if ($user->societe_id) + $socid=$user->societe_id; $result = restrictedArea($user, 'tax', '', '', 'charges'); // Define modetax (0 or 1) // 0=normal, 1=option vat for services is on debit $modetax = $conf->global->TAX_MODE; -if (isset($_GET["modetax"])) $modetax=$_GET["modetax"]; +if (isset($_GET["modetax"])) + $modetax=$_GET["modetax"]; +/** + * print function + * + * @param DoliDB $db Database + * @param string $sql sql + * @param string $date date + * @return void + */ function pt ($db, $sql, $date) { global $conf, $bc,$langs; $result = $db->query($sql); - if ($result) - { + if ($result) { $num = $db->num_rows($result); $i = 0; $total = 0; @@ -66,8 +74,7 @@ function pt ($db, $sql, $date) print ''."\n"; print "\n"; $var=True; - while ($i < $num) - { + while ($i < $num) { $obj = $db->fetch_object($result); $var=!$var; print ''; @@ -83,8 +90,7 @@ function pt ($db, $sql, $date) 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.'
     
    "; $db->free($result); - } - else { + } else { dol_print_error($db); } } @@ -96,17 +102,14 @@ function pt ($db, $sql, $date) llxHeader(); -if($localTaxType==1) -{ +if($localTaxType==1) { $LT='LT1'; $LTSummary='LT1Summary'; $LTPaid='LT1Paid'; $LTCustomer='LT1Customer'; $LTSupplier='LT1Supplier'; $CalcLT= $conf->global->MAIN_INFO_LOCALTAX_CALC1; -} -else -{ +} else { $LT='LT2'; $LTSummary='LT2Summary'; $LTPaid='LT2Paid'; @@ -138,18 +141,15 @@ print '
    '; print ""; print ""; print ""; -if($CalcLT==0) -{ - print ""; - print ""; +if($CalcLT==0) { + print ""; + print ""; } -if($CalcLT==1) -{ - print ""; +if($CalcLT==1) { + print ""; } -if($CalcLT==2) -{ - print ""; +if($CalcLT==2) { + print ""; } print ""; @@ -161,8 +161,7 @@ $y = $year_current ; $var=True; $total=0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0; $i=0; -for ($m = 1 ; $m < 13 ; $m++ ) -{ +for ($m = 1 ; $m < 13 ; $m++ ) { $coll_listsell = vat_by_date($db, $y, 0, 0, 0, $modetax, 'sell', $m); $coll_listbuy = vat_by_date($db, $y, 0, 0, 0, $modetax, 'buy', $m); @@ -175,72 +174,56 @@ for ($m = 1 ; $m < 13 ; $m++ ) $hookmanager->initHooks(array('externalbalance')); $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks - if (! is_array($coll_listbuy) && $coll_listbuy == -1) - { + if (! is_array($coll_listbuy) && $coll_listbuy == -1) { $langs->load("errors"); print ''; break; } - if (! is_array($coll_listbuy) && $coll_listbuy == -2) - { + if (! is_array($coll_listbuy) && $coll_listbuy == -2) { print ''; break; } $var=!$var; - print ""; + print ''; print ''; - if($CalcLT==0) - { - $x_coll = 0; - foreach($coll_listsell as $vatrate=>$val) - { + if($CalcLT==0) { + $x_coll = 0; + foreach($coll_listsell as $vatrate=>$val) { $x_coll+=$val[$localTaxType==1?'localtax1':'localtax2']; } $subtotalcoll = $subtotalcoll + $x_coll; print ""; $x_paye = 0; - foreach($coll_listbuy as $vatrate=>$val) - { + foreach($coll_listbuy as $vatrate=>$val) { $x_paye+=$val[$localTaxType==1?'localtax1':'localtax2']; } $subtotalpaye = $subtotalpaye + $x_paye; print ""; - } - elseif($CalcLT==1) - { + } elseif($CalcLT==1) { $x_paye = 0; - foreach($coll_listbuy as $vatrate=>$val) - { + foreach($coll_listbuy as $vatrate=>$val) { $x_paye+=$val[$localTaxType==1?'localtax1':'localtax2']; } $subtotalpaye = $subtotalpaye + $x_paye; print ""; - } - elseif($CalcLT==2) - { + } elseif($CalcLT==2) { $x_coll = 0; - foreach($coll_listsell as $vatrate=>$val) - { + foreach($coll_listsell as $vatrate=>$val) { $x_coll+=$val[$localTaxType==1?'localtax1':'localtax2']; } $subtotalcoll = $subtotalcoll + $x_coll; print ""; } - - if($CalcLT==0) - { - $diff= $x_coll - $x_paye; - } - elseif($CalcLT==1) - { - $diff= $x_paye; - } - elseif($CalcLT==2) - { - $diff= $x_coll; + + if($CalcLT==0) { + $diff= $x_coll - $x_paye; + } elseif($CalcLT==1) { + $diff= $x_paye; + } elseif($CalcLT==2) { + $diff= $x_coll; } $total = $total + $diff; @@ -251,23 +234,17 @@ for ($m = 1 ; $m < 13 ; $m++ ) print "\n"; $i++; - if ($i > 2) - { + if ($i > 2) { print ''; print ''; - if($CalcLT==0) - { + if($CalcLT==0) { print ''; print ''; print ''; - } - elseif($CalcLT==1) - { + } elseif($CalcLT==1) { print ''; print ''; - } - elseif($CalcLT==2) - { + } elseif($CalcLT==2) { print ''; print ''; } @@ -298,7 +275,7 @@ $sql.= " GROUP BY dm ASC"; pt($db, $sql,$langs->trans("Year")." $y"); -print "
    ".$langs->trans("Year")." $y".$langs->transcountry($LTCustomer,$mysoc->country_code)."".$langs->transcountry($LTSupplier,$mysoc->country_code)."".$langs->transcountry($LTCustomer,$mysoc->country_code)."".$langs->transcountry($LTSupplier,$mysoc->country_code)."".$langs->transcountry($LTSupplier,$mysoc->country_code)."".$langs->transcountry($LTSupplier,$mysoc->country_code)."".$langs->transcountry($LTCustomer,$mysoc->country_code)."".$langs->transcountry($LTCustomer,$mysoc->country_code)."".$langs->trans("TotalToPay")."
    '.$langs->trans("ErrorNoAccountancyModuleLoaded").'
    '.$langs->trans("FeatureNotYetAvailable").'
    '.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'".price($x_coll)."".price($x_paye)."".price($x_paye)."".price($x_coll)."
    '.$langs->trans("SubTotal").':'.price($subtotalcoll).''.price($subtotalpaye).''.price($subtotal).''.price($subtotalpaye).''.price($subtotal).''.price($subtotalcoll).''.price($subtotal).'
    "; +print '
    '; print '
    '; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 56278f15c5d..0ccf0dee6bf 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -626,7 +626,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $buttontitle=$langs->trans('ToMakePayment'); if ($facture->type == 2) $buttontitle=$langs->trans('ToMakePaymentBack'); - print '

    '; + print '
    '; print ' '.$checkboxlabel; /*if (! empty($conf->prelevement->enabled)) { @@ -634,7 +634,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie if (! empty($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS)) print '
    '.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed"); }*/ print '


    '; - print '
    '; + print ''; } // Form to confirm payment diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 0c5eeca3689..fbf9512e438 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -358,14 +358,14 @@ if ($action == 'new') print $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1); print '
    '; - print '
    '; + print '
    '; print ''; if ($filterdate || $filteraccountid > 0) { print '   '; print ''; } - print '
    '; + print ''; //print ''; print ''; print '
    '; diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 922ab54ac7c..9db0591ee33 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -773,7 +773,7 @@ class RemiseCheque extends CommonObject $lien = ''; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCheckReceipt"),'payment').$lienfin); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCheckReceipt"), 'payment', 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 27782259333..362493b7f19 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -29,6 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("banks"); $langs->load("categories"); +$langs->load("compta"); +$langs->load("bills"); // Security check if ($user->societe_id) $socid=$user->societe_id; diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 47a6ee8ba74..fdfe86ec178 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -61,7 +61,7 @@ $checkdepositstatic=new RemiseCheque($db); $accountstatic=new Account($db); // If click on purge search criteria ? -if (GETPOST("button_removefilter_x")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=''; $search_amount=''; diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 95503db6ff9..42542e43a9c 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -422,7 +422,6 @@ class Paiement extends CommonObject $totalamount=$this->amount; if (empty($totalamount)) $totalamount=$this->total; // For backward compatibility - if ($mode == 'payment') $totalamount=$totalamount; if ($mode == 'payment_supplier') $totalamount=-$totalamount; // Insert payment into llx_bank @@ -750,7 +749,7 @@ class Paiement extends CommonObject $lien = ''; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; return $result; diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index 65615b9bbf3..c7fd426babf 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -58,7 +58,7 @@ $limit = $conf->liste_limit; if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="p.rowid"; -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $search_account=""; diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 7e26fa5789f..1c452bc0b02 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -312,13 +312,11 @@ if ($_GET["action"] == 'create') print ""; - print '
    '; - + print '
    '; print ''; - print '   '; + print '     '; print ''; - - print '
    '; + print ''; print "\n"; } diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index e2a5e846b0a..9875c8df906 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -218,7 +218,7 @@ if ($id > 0) print '
    '; print '';*/ print '
    '; - print '
    '; + print '
    '; print ''; } @@ -235,7 +235,7 @@ if ($id > 0) print ''; print ''; print '
    '.$langs->trans("ThisWillAlsoAddPaymentOnInvoice"); - print '
    '; + print '
    '; print ''; } diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 66a1c81e8e9..d88bc8da8ac 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -56,6 +56,8 @@ class BonPrelevement extends CommonObject var $statut; // 0-Wait, 1-Trans, 2-Done var $labelstatut=array(); + var $invoice_in_error=array(); + /** * Constructor @@ -755,6 +757,8 @@ class BonPrelevement extends CommonObject $factures = array(); $factures_prev = array(); $factures_result = array(); + $factures_prev_id=array(); + $factures_errors=array(); if (! $error) { @@ -833,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 @@ -1130,7 +1134,7 @@ class BonPrelevement extends CommonObject $lienfin=''; } - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowWithdraw"),'payment').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowWithdraw"), 'payment', 'class="classfortooltip"').$lienfin.' '); $result.=$lien.$this->ref.$lienfin; return $result; } @@ -1630,7 +1634,7 @@ class BonPrelevement extends CommonObject * @param int $nombre 0 or 1 * @param float $total Total * @param string $CrLf End of line character - * @return SEPA + * @return string String with SEAP Sender */ function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf='\n') { // SEPA INITIALISATION @@ -1812,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 ''.$langs->trans("Invoice").''; print ''.$langs->trans("ThirdParty").''; + print ''.$langs->trans("RIB").''; print ''.$langs->trans("AmountTTC").''; print ''.$langs->trans("DateRequest").''; print ''; @@ -190,16 +195,22 @@ if ($resql) { $obj = $db->fetch_object($resql); $var=!$var; - print ''; + print ''; + print ''; $invoicestatic->id=$obj->rowid; $invoicestatic->ref=$obj->facnumber; print $invoicestatic->getNomUrl(1,'withdraw'); print ''; + // Thirdparty print ''; - $thirdpartystatic->id=$obj->socid; - $thirdpartystatic->name=$obj->name; - print $thirdpartystatic->getNomUrl(1,'customer'); + $thirdpartystatic->fetch($obj->socid); + print $thirdpartystatic->getNomUrl(1,'card'); print ''; + // RIB + print ''; + print $thirdpartystatic->display_rib(); + print ''; + // Amount print ''; print price($obj->total_ttc,0,$langs,0,0,-1,$conf->currency); print ''; @@ -211,7 +222,7 @@ if ($resql) $i++; } } - else print ''.$langs->trans("None").''; + else print ''.$langs->trans("None").''; print ""; 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..7907a55fda0 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 ''; @@ -216,7 +216,7 @@ if ($id) 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).'

    '; //Confirm Button - 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 ''.$obj->name."\n"; + $thirdparty=new Societe($db); + $thirdparty->fetch($obj->socid); + print ''; + print $thirdparty->getNomUrl(1); + print "\n"; print ''.price($obj->amount)."\n"; diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 0a68aa686ae..921736faedf 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -53,7 +53,7 @@ $ligne=new LignePrelevement($db,$user); $offset = $conf->liste_limit * $page ; -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_line=""; $search_bon=""; 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 ''.$langs->trans("Status").''.$langs->trans("Number").'%'; print ''.$langs->trans("Amount").'%'; - $var=True; + $var=false; while ($i < $num) { diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 3ee796c6134..16ef809f713 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -274,8 +274,11 @@ if ($action == 'create') print "
    "; - print '
      '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index 0644a5ae4fe..635ed77541f 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -73,7 +73,7 @@ class PaymentSalary extends CommonObject * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; @@ -127,7 +127,7 @@ class PaymentSalary extends CommonObject { // Call trigger $result=$this->call_trigger('PAYMENT_SALARY_MODIFY',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers //FIXME: Add rollback if trigger fail @@ -144,7 +144,7 @@ class PaymentSalary extends CommonObject * @param User $user User that load * @return int <0 if KO, >0 if OK */ - function fetch($id, $user=0) + function fetch($id, $user=null) { global $langs; $sql = "SELECT"; @@ -223,12 +223,12 @@ class PaymentSalary extends CommonObject global $conf, $langs; $error=0; - + // Call trigger $result=$this->call_trigger('PAYMENT_SALARY_DELETE',$user); if ($result < 0) return -1; // End call triggers - + $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary"; $sql.= " WHERE rowid=".$this->id; @@ -279,7 +279,7 @@ class PaymentSalary extends CommonObject function create($user) { global $conf,$langs; - + $error=0; // Clean parameters @@ -414,7 +414,6 @@ class PaymentSalary extends CommonObject $this->fk_user, DOL_URL_ROOT.'/user/card.php?id=', $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'), - '(User)', 'user' ); @@ -427,9 +426,9 @@ class PaymentSalary extends CommonObject // Call trigger $result=$this->call_trigger('PAYMENT_SALARY_CREATE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers - + } else $error++; @@ -494,7 +493,7 @@ class PaymentSalary extends CommonObject $picto='payment'; $label=$langs->trans("ShowSalaryPayment").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; return $result; diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index 17c3efdbfaa..678b3bfaa2e 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -64,7 +64,7 @@ else $typeid=$_REQUEST['typeid']; } -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $search_label=""; diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 44e62ad0f10..4e7211c75b1 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; @@ -62,17 +67,19 @@ class ChargeSociales extends CommonObject /** * Retrouve et charge une charge sociale * - * @param int $id 1 si trouve, 0 sinon + * @param int $id Id + * @param string $ref Ref * @return void */ - function fetch($id) + function fetch($id, $ref='') { $sql = "SELECT cs.rowid, cs.date_ech,"; $sql.= " cs.libelle as lib, cs.fk_type, cs.amount, cs.paye, cs.periode,"; $sql.= " c.libelle"; $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as cs, ".MAIN_DB_PREFIX."c_chargesociales as c"; $sql.= " WHERE cs.fk_type = c.id"; - $sql.= " AND cs.rowid = ".$id; + if ($ref) $sql.= " AND cs.rowid = ".$ref; + else $sql.= " AND cs.rowid = ".$id; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $resql=$this->db->query($sql); @@ -417,7 +424,7 @@ class ChargeSociales extends CommonObject $lien = ''; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution").': '.$this->lib,'bill').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution").': '.$this->lib, 'bill', 'class="classfortooltip"').$lienfin.' '); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; return $result; diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index fe2062e1ad7..a94afc98f6e 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -220,7 +220,7 @@ class PaymentSocialContribution extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -591,7 +591,7 @@ class PaymentSocialContribution extends CommonObject $lien = ''; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref, 'payment', 'class="classfortooltip"').$lienfin.' '); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; } diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index db4bef2abe6..31e98370003 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -68,7 +68,7 @@ else $typeid=$_REQUEST['typeid']; } -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $search_label=""; diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index e995ee45d54..8263dc76cb8 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -132,6 +132,8 @@ $tableparams = array_merge($commonparams, $tableparams); foreach($allparams as $key => $value) { $paramslink .= '&' . $key . '=' . $value; } + + /* * View */ @@ -174,12 +176,12 @@ report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportl // SQL request $catotal=0; -if ($modecompta == 'CREANCES-DETTES') +if ($modecompta == 'CREANCES-DETTES') { $sql = "SELECT DISTINCT p.rowid as rowid, p.ref as ref, p.label as label,"; $sql.= " sum(l.total_ht) as amount, sum(l.total_ttc) as amount_ttc"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as l, ".MAIN_DB_PREFIX."product as p"; - if ($selected_cat === -2) // Without any category + if ($selected_cat === -2) // Without any category { $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; } @@ -198,7 +200,7 @@ if ($modecompta == 'CREANCES-DETTES') if ($date_start && $date_end) { $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; } - if ($selected_cat === -2) // Without any category + if ($selected_cat === -2) // Without any category { $sql.=" AND cp.fk_product is null"; } @@ -209,7 +211,7 @@ if ($modecompta == 'CREANCES-DETTES') $sql.= " AND cp.fk_categorie = c.rowid AND cp.fk_product = p.rowid"; } $sql.= " AND f.entity = ".$conf->entity; - $sql.= " GROUP BY p.rowid"; + $sql.= " GROUP BY p.rowid, p.ref, p.label"; $sql.= " ORDER BY p.ref"; dol_syslog("cabyprodserv", LOG_DEBUG); @@ -390,7 +392,7 @@ if ($modecompta == 'CREANCES-DETTES') // $modecompta != 'CREANCES-DETTES' // "Calculation of part of each product for accountancy in this mode is not possible. When a partial payment (for example 5 euros) is done on an // invoice with 2 product (product A for 10 euros and product B for 20 euros), what is part of paiment for product A and part of paiment for product B ? - // Because there is no way to know this, this report is not relevant. + // Because there is no way to know this, this report is not relevant. print '
    '.$langs->trans("TurnoverPerProductInCommitmentAccountingNotRelevant") . '
    '; } diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index b3fb130e185..cfd816c29b6 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -209,6 +209,8 @@ $maxyear=substr($maxyearmonth,0,4); $nowyear=strftime("%Y",dol_now()); $nowyearmonth=strftime("%Y-%m",dol_now()); $maxyearmonth=max($maxyearmonth,$nowyearmonth); +$now=dol_now(); +$casenow = dol_print_date($now,"%Y-%m"); // Loop on each month $nb_mois_decalage = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START-1):0; @@ -220,22 +222,37 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++) print ""; print "".dol_print_date(dol_mktime(12,0,0,$mois_modulo,1,2000),"%B").""; - for ($annee = $year_start ; $annee <= $year_end ; $annee++) + for ($annee = $year_start -1 ; $annee <= $year_end ; $annee++) // We start one year before to have data to be able to make delta { - $now=dol_now(); $annee_decalage=$annee; if ($mois>12) {$annee_decalage=$annee+1;} - $casenow = dol_print_date($now,"%Y-%m"); $case = dol_print_date(dol_mktime(1,1,1,$mois_modulo,1,$annee_decalage),"%Y-%m"); $caseprev = dol_print_date(dol_mktime(1,1,1,$mois_modulo,1,$annee_decalage-1),"%Y-%m"); - if ($modecompta == 'CREANCES-DETTES') { - // Valeur CA du mois w/o VAT + if ($annee >= $year_start) + { + if ($modecompta == 'CREANCES-DETTES') { + // Valeur CA du mois w/o VAT + print ''; + if ($cum_ht[$case]) + { + $now_show_delta=1; // On a trouve le premier mois de la premiere annee generant du chiffre. + print ''.price($cum_ht[$case],1).''; + } + else + { + if ($minyearmonth < $case && $case <= max($maxyearmonth,$nowyearmonth)) { print '0'; } + else { print ' '; } + } + print ""; + } + + // Valeur CA du mois print ''; - if ($cum_ht[$case]) + if ($cum[$case]) { $now_show_delta=1; // On a trouve le premier mois de la premiere annee generant du chiffre. - print ''.price($cum_ht[$case],1).''; + print ''.price($cum[$case],1).''; } else { @@ -243,60 +260,46 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++) else { print ' '; } } print ""; - } - // Valeur CA du mois - print ''; - if ($cum[$case]) - { - $now_show_delta=1; // On a trouve le premier mois de la premiere annee generant du chiffre. - print ''.price($cum[$case],1).''; - } - else - { - if ($minyearmonth < $case && $case <= max($maxyearmonth,$nowyearmonth)) { print '0'; } - else { print ' '; } - } - print ""; - - // Pourcentage du mois - if ($annee_decalage > $minyear && $case <= $casenow) - { - if ($cum[$caseprev] && $cum[$case]) + // Pourcentage du mois + if ($annee_decalage > $minyear && $case <= $casenow) { - $percent=(round(($cum[$case]-$cum[$caseprev])/$cum[$caseprev],4)*100); - //print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X"; - print ''.($percent>=0?"+$percent":"$percent").'%'; + if ($cum[$caseprev] && $cum[$case]) + { + $percent=(round(($cum[$case]-$cum[$caseprev])/$cum[$caseprev],4)*100); + //print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X"; + print ''.($percent>=0?"+$percent":"$percent").'%'; + } + if ($cum[$caseprev] && ! $cum[$case]) + { + print '-100%'; + } + if (! $cum[$caseprev] && $cum[$case]) + { + //print '+Inf%'; + print '-'; + } + if (isset($cum[$caseprev]) && ! $cum[$caseprev] && ! $cum[$case]) + { + print '+0%'; + } + if (! isset($cum[$caseprev]) && ! $cum[$case]) + { + print '-'; + } } - if ($cum[$caseprev] && ! $cum[$case]) + else { - print '-100%'; + print ''; + if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } + else { print ' '; } + print ''; } - if (! $cum[$caseprev] && $cum[$case]) - { - //print '+Inf%'; - print '-'; - } - if (isset($cum[$caseprev]) && ! $cum[$caseprev] && ! $cum[$case]) - { - print '+0%'; - } - if (! isset($cum[$caseprev]) && ! $cum[$case]) - { - print '-'; - } - } - else - { - print ''; - if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } - else { print ' '; } - print ''; + if ($annee_decalage != $year_end) print ' '; } $total_ht[$annee]+=!empty($cum_ht[$case]) ? $cum_ht[$case] : 0;; $total[$annee]+=$cum[$case]; - if ($annee_decalage != $year_end) print ' '; } print ''; @@ -406,7 +409,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++) } if (! $total[$annee-1] && $total[$annee]) { - print '+Inf%'; + print '+zzzz'.$total[$annee-1].$langs->trans('Inf').'%'; } if (! $total[$annee-1] && ! $total[$annee]) { diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index 268a1af8e66..b612a9b6459 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -230,8 +230,11 @@ if ($action == 'create') print "
    "; - print '
      '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index 5d0762d3e35..96db35f915b 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -143,7 +143,7 @@ class Tva extends CommonObject * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; @@ -205,7 +205,7 @@ class Tva extends CommonObject * @param User $user User that load * @return int <0 if KO, >0 if OK */ - function fetch($id, $user=0) + function fetch($id, $user=null) { global $langs; $sql = "SELECT"; @@ -343,7 +343,7 @@ class Tva extends CommonObject } /** - * Total of the VAT from invoices emitted by the society. + * Total of the VAT from invoices emitted by the thirdparty. * * @param int $year Year * @return double Amount @@ -645,7 +645,7 @@ class Tva extends CommonObject $picto='payment'; $label=$langs->trans("ShowVatPayment").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; return $result; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 16652327ef3..c0dcff6d5c3 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -60,7 +60,7 @@ if (isset($_GET["modetax"])) $modetax=$_GET["modetax"]; * * @param DoliDB $db Database handler * @param string $sql SQL Request - * @param date $date Date + * @param string $date Date * @return void */ function pt ($db, $sql, $date) diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 8babbd58f7d..45a69076492 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -66,7 +66,7 @@ else $typeid=$_REQUEST['typeid']; } -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $search_label=""; @@ -97,7 +97,6 @@ if ($filtre) { if ($typeid) { $sql .= " AND t.fk_typepayment=".$typeid; } -$sql.= " GROUP BY t.rowid, t.fk_typepayment, t.amount, t.datev, t.label"; $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1,$offset); @@ -111,7 +110,7 @@ if ($result) $param=''; if ($typeid) $param.='&typeid='.$typeid; - + print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines); print '
    '; @@ -125,7 +124,7 @@ if ($result) print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre(""); print "\n"; - + print ''; print ''; print ''; @@ -138,21 +137,21 @@ if ($result) print ''; print ''; print "\n"; - + while ($i < min($num,$limit)) { $obj = $db->fetch_object($result); $var=!$var; - + if ($obj->payment_code <> '') { - $type = ''.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.''; + $type = ''.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.''; } else { $type = ' '; } - + print ""; $tva_static->id=$obj->rowid; @@ -172,12 +171,12 @@ if ($result) } print ''.$langs->trans("Total").''; print "".price($total).""; - print " "; + print " "; print ""; - + print '
    '; - + $db->free($result); } else @@ -186,6 +185,6 @@ else } -$db->close(); - llxFooter(); + +$db->close(); diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 32adc4b87c9..67147a6d06b 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -43,10 +43,10 @@ $dolibarr_main_document_root=''; // You can put several values, separated by a coma, but number of entries must match // number of entries into $dolibarr_main_document_root_alt. // Examples: -// $dolibarr_main_url_root_alt='/extensions'; +// $dolibarr_main_url_root_alt='/custom'; // $dolibarr_main_url_root_alt='/extensions1,/extensions2'; // -$dolibarr_main_url_root_alt=''; +//$dolibarr_main_url_root_alt='/custom'; // dolibarr_main_document_root_alt @@ -55,10 +55,10 @@ $dolibarr_main_url_root_alt=''; // You can put several values, separated by a coma, but number of entries must match // number of entries into $dolibarr_main_url_root_alt. // Examples: -// $dolibarr_main_document_root_alt='/var/www/dolibarr/htdocs/extensions'; +// $dolibarr_main_document_root_alt='/var/www/dolibarr/htdocs/custom'; // $dolibarr_main_document_root_alt='C:/My web sites/dolibarr/htdocs/extensions1,C:/My web sites/dolibarr/htdocs/extensions2'; // -$dolibarr_main_document_root_alt=''; +//$dolibarr_main_document_root_alt='/var/www/dolibarr/htdocs/custom'; // dolibarr_main_data_root diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php index a0605d3656e..70d6b41bf35 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php @@ -50,7 +50,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?> - trans("Company"); ?> + trans("ThirdParty"); ?> control->tpl['company']; ?> diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php index a445444e42c..3be1d16bc8d 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php @@ -59,7 +59,7 @@ echo $this->control->tpl['ajax_selectcountry']; - trans("Company"); ?> + trans("ThirdParty"); ?> control->tpl['company']; ?> diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php index 623fad27e77..0b4b8a07fcb 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php @@ -44,7 +44,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors'] - trans("Company"); ?> + trans("ThirdParty"); ?> control->tpl['company']; ?> diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index db83554c7ae..afa64c0733e 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -374,6 +374,7 @@ else /* * Onglets */ + $head=array(); if ($id > 0) { // Si edition contact deja existant @@ -386,9 +387,6 @@ else $head = contact_prepare_head($object); $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")); - dol_fiche_head($head, 'card', $title, 0, 'contact'); - - dol_htmloutput_events(); } if ($user->rights->societe->contact->creer) @@ -438,13 +436,16 @@ else print ''."\n"; } - print '
    '; print '
    '; print ''; print ''; print ''; + + dol_fiche_head($head, 'card', '', 0, ''); + print ''; + // Name print ''; print ''; @@ -456,7 +457,7 @@ else { if ($socid > 0) { - print ''; + print ''; print ''; @@ -464,7 +465,7 @@ else print ''; } else { - print ''; } @@ -611,17 +612,18 @@ else } print ''; - print "
    lastname).'" autofocus="autofocus">
    '; print $objsoc->getNomUrl(1); print '
    '; + print '
    '; print $form->select_company($socid,'socid','',1); print '


    "; + print ""; + print dol_fiche_end(); - print '
    '; + print '
    '; print ''; if (! empty($backtopage)) { print '     '; print ''; } - print '
    '; + print ''; print "
    "; } @@ -674,6 +676,8 @@ else print ''; if (! empty($backtopage)) print ''; + dol_fiche_head($head, 'card', $title, 0, 'contact'); + print ''; // Ref @@ -690,7 +694,7 @@ else // Company if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { - print ''; + print ''; print ''; @@ -856,13 +860,15 @@ else else print $langs->trans("NoDolibarrAccess"); print ''; - print '
    '; print $form->select_company(GETPOST('socid','int')?GETPOST('socid','int'):($object->socid?$object->socid:-1),'socid','',1); print '

    '; + print ''; - print '
    '; + print dol_fiche_end(); + + print '
    '; print ''; - print '   '; + print '     '; print ''; - print '
    '; + print ''; print ""; } @@ -878,6 +884,8 @@ else dol_htmloutput_errors($error,$errors); + dol_fiche_head($head, 'card', $title, 0, 'contact'); + if ($action == 'create_user') { // Full firstname and lastname separated with a dot : firstname.lastname @@ -924,7 +932,7 @@ else // Company if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { - print ''.$langs->trans("Company").''; + print ''.$langs->trans("ThirdParty").''; if ($object->socid > 0) { $objsoc->fetch($object->socid); @@ -1078,7 +1086,7 @@ else print ""; - print ""; + print dol_fiche_end(); // Barre d'actions print '
    '; @@ -1113,7 +1121,8 @@ else } } - print "

    "; + print ""; + print "
    "; if (! empty($conf->agenda->enabled)) { diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 3f81608c415..cbc813968d1 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -220,7 +220,7 @@ class Contact extends CommonObject * @param string $action Current action for hookmanager * @return int <0 if KO, >0 if OK */ - function update($id, $user=0, $notrigger=0, $action='update') + function update($id, $user=null, $notrigger=0, $action='update') { global $conf, $langs, $hookmanager; @@ -283,6 +283,8 @@ class Contact extends CommonObject unset($this->state_code); unset($this->state); + $action='update'; + // Actions on extra fields (by external module or standard code) $hookmanager->initHooks(array('contactdao')); $parameters=array('socid'=>$this->id); @@ -427,7 +429,7 @@ class Contact extends CommonObject * @param User $user User asking to change alert or birthday * @return int <0 if KO, >=0 if OK */ - function update_perso($id, $user=0) + function update_perso($id, $user=null) { $error=0; $result=false; @@ -492,7 +494,7 @@ class Contact extends CommonObject * @param User $user Utilisateur (abonnes aux alertes) qui veut les alertes de ce contact * @return int -1 if KO, 0 if OK but not found, 1 if OK */ - function fetch($id, $user=0) + function fetch($id, $user=null) { global $langs; @@ -558,7 +560,7 @@ class Contact extends CommonObject $this->email = $obj->email; $this->jabberid = $obj->jabberid; - $this->skype = $obj->skype; + $this->skype = $obj->skype; $this->priv = $obj->priv; $this->mail = $obj->email; @@ -895,7 +897,7 @@ class Contact extends CommonObject $lienfin=''; } - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowContact").': '.$this->getFullName($langs),'contact').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowContact").': '.$this->getFullName($langs), 'contact', 'class="classfortooltip"').$lienfin.' '); $result.=$lien.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$lienfin; return $result; } @@ -910,7 +912,7 @@ class Contact extends CommonObject global $langs; $langs->load("dict"); - $code=(! empty($this->civility_id)?$this->civility_id:(! empty($this->civility_id)?$this->civility_id:'')); + $code=(! empty($this->civility_id)?$this->civility_id:(! empty($this->civilite_id)?$this->civilite_id:'')); if (empty($code)) return ''; return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code); } diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php index bcb3b9c2be0..e9e9c70966c 100644 --- a/htdocs/contact/exportimport.php +++ b/htdocs/contact/exportimport.php @@ -77,11 +77,11 @@ if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) $objsoc = new Societe($db); $objsoc->fetch($contact->socid); - print ''.$langs->trans("Company").''.$objsoc->getNomUrl(1).''; + print ''.$langs->trans("ThirdParty").''.$objsoc->getNomUrl(1).''; } else { - print ''.$langs->trans("Company").''; + print ''.$langs->trans("ThirdParty").''; print $langs->trans("ContactNotLinkedToCompany"); print ''; } diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index fe3098eaa9a..170ed039904 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -105,11 +105,11 @@ if ($contact->socid > 0) $objsoc = new Societe($db); $objsoc->fetch($contact->socid); - print ''.$langs->trans("Company").''.$objsoc->getNomUrl(1).''; + print ''.$langs->trans("ThirdParty").''.$objsoc->getNomUrl(1).''; } else { - print ''.$langs->trans("Company").''; + print ''.$langs->trans("ThirdParty").''; print $langs->trans("ContactNotLinkedToCompany"); print ''; } diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 2e28328085a..4413b721fc9 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -53,7 +53,7 @@ $search_email=GETPOST("search_email"); $search_skype=GETPOST("search_skype"); $search_priv=GETPOST("search_priv"); $search_categ=GETPOST("search_categ",'int'); -$search_statu=GETPOST("search_status",'int'); +$search_status=GETPOST("search_status",'int'); if ($search_status=='') $search_status=1; // always display activ customer first @@ -96,9 +96,9 @@ else if ($type == "o") $urlfiche=""; } -if (GETPOST('button_removefilter')) +if (GETPOST('button_removefilter_x') || GETPOST('button_removefilter')) // Both tests are required to be compatible with all browsers { - $search_firstlast_only=""; + $search_firstlast_only=""; $search_lastname=""; $search_firstname=""; $search_societe=""; @@ -300,9 +300,9 @@ if ($result) print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.lastname", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("PostOrFunction"),$_SERVER["PHP_SELF"],"p.poste", $begin, $param, '', $sortfield,$sortorder); - if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param, '', $sortfield,$sortorder); + if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("Phone"),$_SERVER["PHP_SELF"],"p.phone", $begin, $param, '', $sortfield,$sortorder); - print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mob", $begin, $param, '', $sortfield,$sortorder); + print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mobile", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email", $begin, $param, '', $sortfield,$sortorder); if (! empty($conf->skype->enabled)) { print_liste_field_titre($langs->trans("Skype"),$_SERVER["PHP_SELF"],"p.skype", $begin, $param, '', $sortfield,$sortorder); } @@ -356,8 +356,8 @@ if ($result) print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status); print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php index 73b0f513db9..ab8101dd739 100644 --- a/htdocs/contact/note.php +++ b/htdocs/contact/note.php @@ -98,12 +98,12 @@ if ($id > 0) $objsoc = new Societe($db); $objsoc->fetch($object->socid); - print ''.$langs->trans("Company").''.$objsoc->getNomUrl(1).''; + print ''.$langs->trans("ThirdParty").''.$objsoc->getNomUrl(1).''; } else { - print ''.$langs->trans("Company").''; + print ''.$langs->trans("ThirdParty").''; print $langs->trans("ContactNotLinkedToCompany"); print ''; } diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 92ba03e9861..173ccbcb265 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -111,11 +111,11 @@ if ($action == 'edit') $objsoc = new Societe($db); $objsoc->fetch($object->socid); - print ''.$langs->trans("Company").''.$objsoc->getNomUrl(1).''; + print ''.$langs->trans("ThirdParty").''.$objsoc->getNomUrl(1).''; } else { - print ''.$langs->trans("Company").''; + print ''.$langs->trans("ThirdParty").''; print $langs->trans("ContactNotLinkedToCompany"); print ''; } @@ -145,11 +145,11 @@ if ($action == 'edit') print "
    "; - print '
    '; + print '
    '; print ''; - print '   '; + print '     '; print ''; - print '
    '; + print ''; print ""; } @@ -179,12 +179,12 @@ else $objsoc = new Societe($db); $objsoc->fetch($object->socid); - print ''.$langs->trans("Company").''.$objsoc->getNomUrl(1).''; + print ''.$langs->trans("ThirdParty").''.$objsoc->getNomUrl(1).''; } else { - print ''.$langs->trans("Company").''; + print ''.$langs->trans("ThirdParty").''; print $langs->trans("ContactNotLinkedToCompany"); print ''; } diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 836070f970b..4770ff10e50 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1,12 +1,13 @@ - * 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 * Copyright (C) 2013 Christophe Battarel * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2014 Ferran Marcet + * 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 @@ -273,7 +274,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) { @@ -536,10 +537,10 @@ else if ($action == 'addline' && $user->rights->contrat->creer) $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } - $model=$object->modelpdf; - if (empty($model)) { $tmp=getListOfModels($db, 'contract'); $keys=array_keys($tmp); $model=$keys[0]; } + $ret = $object->fetch($id); // Reload to get new records - $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + + $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } unset($_POST ['prod_entry_mode']); @@ -718,19 +719,25 @@ else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contra setEventMessage($object->error,'errors'); } } elseif ($action=='setref_supplier') { - $result = $object->fetch($id); - if ($result < 0) { - setEventMessage($object->errors,'errors'); - } - $object->ref_supplier=GETPOST('ref_supplier','alpha'); - $result = $object->update($user); - if ($result < 0) { - setEventMessage($object->errors,'errors'); - $action='editref_supplier'; - } else { - header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); - exit; + $cancelbutton = GETPOST('cancel'); + + if (!$cancelbutton) { + + $result = $object->fetch($id); + if ($result < 0) { + setEventMessage($object->errors, 'errors'); + } + $object->ref_supplier = GETPOST('ref_supplier', 'alpha'); + + $result = $object->update($user); + if ($result < 0) { + setEventMessage($object->errors, 'errors'); + $action = 'editref_supplier'; + } else { + header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); + exit; + } } } elseif ($action=='setref') { $object->ref=GETPOST('ref','alpha'); @@ -847,7 +854,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); @@ -935,8 +942,8 @@ if ($action == 'create') } print ''.$langs->trans('Ref').''.$tmpcode.''; - // Ref Int - print ''.$langs->trans('RefCustomer').''; + // Ref supplier + print ''.$langs->trans('RefSupplier').''; print ''; // Customer @@ -1020,13 +1027,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"; @@ -1043,6 +1055,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); @@ -1134,9 +1148,9 @@ else print ''; print ''; - print $form->editfieldkey("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer); + print $form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer); print ''; - print $form->editfieldval("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer); + print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer); print ''; print ''; @@ -1222,8 +1236,10 @@ else /* * Lines of contracts */ - $productstatic=new Product($db); + if ($conf->product->enabled) { + $productstatic=new Product($db); + } $usemargins=0; if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1; @@ -1290,7 +1306,8 @@ else $productstatic->ref=$objp->label; print $productstatic->getNomUrl(0,'',16); } - if ($objp->description) print '
    '.dol_nl2br($objp->description); + if (! empty($conf->global->PRODUIT_DESC_IN_FORM) and $objp->description) + print '
    '.dol_nl2br($objp->description); print ''; } else @@ -1664,7 +1681,7 @@ else } // Form to add new line - if ($user->rights->contrat->creer && ($object->statut >= 0)) + if ($user->rights->contrat->creer && ($object->statut == 0)) { $dateSelector=1; @@ -1713,6 +1730,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) { diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 5626719d96d..bbba602fa02 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -44,34 +44,149 @@ 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'; + + /** + * Id of the contract + * @var int + */ var $id; + + /** + * Reference of the contract + * @var string + */ var $ref; + + /** + * External reference of the contract. + * Used by 3rd party services + * @var string + */ var $ref_ext; + + /** + * Supplier reference of the contract + * @var string + */ var $ref_supplier; + + /** + * Client id linked to the contract + * @var int + */ var $socid; var $societe; // Objet societe + + /** + * Status of the contract + * @var int + */ var $statut=0; // 0=Draft, var $product; + /** + * TODO: Which is the correct one? + * Author of the contract + * @var + */ var $user_author; + + /** + * TODO: Which is the correct one? + * Author of the contract + * @var User + */ + public $user_creation; + + /** + * TODO: Which is the correct one? + * Author of the contract + * @var int + */ + public $fk_user_author; + + /** + * TODO: Which is the correct one? + * Author of the contract + * @var int + */ + public $user_author_id; + + /** + * @var User + */ + public $user_cloture; + + /** + * Date of creation + * @var int + */ var $date_creation; + + /** + * Date of last modification + * Not filled until you call ->info() + * @var int + */ + public $date_modification; + + /** + * Date of validation + * @var int + */ var $date_validation; + /** + * Date when contract was signed + * @var int + */ var $date_contrat; + + /** + * Date of contract closure + * @var int + * @deprecated we close contract lines, not a contract + */ var $date_cloture; var $commercial_signature_id; var $commercial_suivi_id; - var $note; // deprecated + /** + * @deprecated Use note_private or note_public instead + */ + var $note; + + /** + * Private note + * @var string + */ var $note_private; + + /** + * Public note + * @var string + */ var $note_public; var $modelpdf; + /** + * @deprecated Use fk_project instead + */ var $fk_projet; + public $fk_project; + var $extraparams=array(); + /** + * Contract lines + * @var ContratLigne[] + */ var $lines=array(); @@ -88,7 +203,7 @@ class Contrat extends CommonObject /** * Return next contract ref * - * @param Societe $soc objet society + * @param Societe $soc Thirdparty object * @return string free reference for contract */ function getNextNumRef($soc) @@ -138,8 +253,8 @@ class Contrat extends CommonObject * * @param User $user Objet User qui active le contrat * @param int $line_id Id de la ligne de detail a activer - * @param timestamp $date Date d'ouverture - * @param timestamp $date_end Date fin prevue + * @param int $date Date d'ouverture + * @param int|string $date_end Date fin prevue * @param string $comment A comment typed by user * @return int <0 if KO, >0 if OK */ @@ -185,7 +300,7 @@ class Contrat extends CommonObject * * @param User $user Objet User qui active le contrat * @param int $line_id Id de la ligne de detail a activer - * @param timestamp $date_end Date fin + * @param int $date_end Date fin * @param string $comment A comment typed by user * @return int <0 if KO, >0 if OK */ @@ -436,7 +551,9 @@ class Contrat extends CommonObject $this->ref_ext = $result["ref_ext"]; $this->statut = $result["statut"]; $this->mise_en_service = $this->db->jdate($result["datemise"]); + $this->date_contrat = $this->db->jdate($result["datecontrat"]); + $this->date_creation = $this->db->jdate($result["datecontrat"]); $this->user_author_id = $result["fk_user_author"]; @@ -465,6 +582,18 @@ class Contrat extends CommonObject $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); $this->fetch_optionals($this->id,$extralabels); + /* + * Lines + */ + + $this->lines = array(); + + $result=$this->fetch_lines(); + if ($result < 0) + { + $this->error=$this->db->error(); + return -3; + } return $this->id; } @@ -487,7 +616,7 @@ class Contrat extends CommonObject /** * Load lignes array into this->lines * - * @return Array Return array of contract lines + * @return ContratLigne[] Return array of contract lines */ function fetch_lines() { @@ -989,7 +1118,7 @@ class Contrat extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -1092,16 +1221,16 @@ class Contrat extends CommonObject * @param float $txlocaltax2 Local tax 2 rate * @param int $fk_product Id produit * @param float $remise_percent Pourcentage de remise de la ligne - * @param timestamp $date_start Date de debut prevue - * @param timestamp $date_end Date de fin prevue - * @param float $price_base_type HT or TTC + * @param int $date_start Date de debut prevue + * @param int $date_end Date de fin prevue + * @param string $price_base_type HT or TTC * @param float $pu_ttc Prix unitaire TTC * @param int $info_bits Bits de type de lignes * @param int $fk_fournprice Fourn price id * @param int $pa_ht Buying price HT * @return int <0 si erreur, >0 si ok */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0) { global $user, $langs, $conf, $mysoc; @@ -1249,20 +1378,20 @@ class Contrat extends CommonObject * @param float $pu Prix unitaire * @param int $qty Quantite * @param float $remise_percent Pourcentage de remise de la ligne - * @param timestamp $date_start Date de debut prevue - * @param timestamp $date_end Date de fin prevue + * @param int $date_start Date de debut prevue + * @param int $date_end Date de fin prevue * @param float $tvatx Taux TVA * @param float $localtax1tx Local tax 1 rate * @param float $localtax2tx Local tax 2 rate - * @param timestamp $date_debut_reel Date de debut reelle - * @param timestamp $date_fin_reel Date de fin reelle - * @param float $price_base_type HT or TTC + * @param int|string $date_debut_reel Date de debut reelle + * @param int|string $date_fin_reel Date de fin reelle + * @param string $price_base_type HT or TTC * @param int $info_bits Bits de type de lignes * @param int $fk_fournprice Fourn price id * @param int $pa_ht Buying price HT * @return int < 0 si erreur, > 0 si ok */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0, $localtax2tx=0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0.0, $localtax2tx=0.0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0) { global $user, $conf, $langs, $mysoc; @@ -1299,7 +1428,7 @@ class Contrat extends CommonObject $localtaxes_type=getLocalTaxesFromRate($tvatx, 0, $this->societe, $mysoc); - $tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtaxtx1, $txlocaltaxtx2, 0, $price_base_type, $info_bits, 1, '', $localtaxes_type); + $tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtax1tx, $localtax2tx, 0, $price_base_type, $info_bits, 1, '', $localtaxes_type); $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; $total_ttc = $tabprice[2]; @@ -1312,19 +1441,19 @@ class Contrat extends CommonObject // TODO A virer // Anciens indicateurs: $price, $remise (a ne plus utiliser) $remise = 0; - $price = price2num(round($pu_ht, 2)); + $price = price2num(round($pu, 2)); if (dol_strlen($remise_percent) > 0) { - $remise = round(($pu_ht * $remise_percent / 100), 2); - $price = $pu_ht - $remise; + $remise = round(($pu * $remise_percent / 100), 2); + $price = $pu - $remise; } if (empty($pa_ht)) $pa_ht=0; // si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente if ($pa_ht == 0) { - if ($pu_ht > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) - $pa_ht = $pu_ht * (1 - $remise_percent / 100); + if ($pu > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) + $pa_ht = $pu * (1 - $remise_percent / 100); } $sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description='".$this->db->escape($desc)."'"; @@ -1440,6 +1569,7 @@ class Contrat extends CommonObject * * @param User $user Object user * @return int <0 if KO, >0 if OK + * @deprecated This function will never be used. Status of a contract is status of its lines. */ function update_statut($user) { @@ -1550,7 +1680,7 @@ class Contrat extends CommonObject $label=$langs->trans("ShowContract").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.($maxlength?dol_trunc($this->ref,$maxlength):$this->ref).$lienfin; return $result; @@ -1857,7 +1987,6 @@ class Contrat extends CommonObject while ($xnbp < $nbp) { $line=new ContratLigne($this->db); - $line->desc=$langs->trans("Description")." ".$xnbp; $line->qty=1; $line->subprice=100; $line->price=100; @@ -1927,6 +2056,13 @@ class ContratLigne extends CommonObject var $fk_product; var $statut; // 0 inactive, 4 active, 5 closed var $label; + + /** + * @var string + * @deprecated Use $label instead + */ + public $libelle; + var $description; var $date_commande; var $date_ouverture_prevue; // date start planned @@ -1944,6 +2080,13 @@ class ContratLigne extends CommonObject var $fk_remise_except; var $subprice; // Unit price HT + + /** + * @var float + * @deprecated Use $price_ht instead + */ + public $price; + var $price_ht; var $total_ht; @@ -2066,7 +2209,7 @@ class ContratLigne extends CommonObject $label=$langs->trans("ShowContractOfService").': '.$this->label; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->label.$lienfin; return $result; @@ -2326,7 +2469,7 @@ class ContratLigne extends CommonObject $sql.= ",total_localtax1=".price2num($this->total_localtax1,'MT').""; $sql.= ",total_localtax2=".price2num($this->total_localtax2,'MT').""; $sql.= ",total_ttc=".price2num($this->total_ttc,'MT').""; - $sql.= " WHERE rowid = ".$this->rowid; + $sql.= " WHERE rowid = ".$this->id; dol_syslog(get_class($this)."::update_total", LOG_DEBUG); @@ -2385,39 +2528,4 @@ class ContratLigne extends CommonObject } } - /** - * Create a contract document on disk using template defined into CONTRACT_ADDON_PDF - * - * @param string $modele force le modele a utiliser ('' par defaut) - * @param Translate $outputlangs objet lang a utiliser pour traduction - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @return int 0 if KO, 1 if OK - */ - public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) - { - global $conf,$langs,$user,$hookmanager; - - $langs->load("contracts"); - - // Positionne modele sur le nom du modele de contrat a utiliser - if (! dol_strlen($modele)) - { - if (! empty($conf->global->CONTRACT_ADDON_PDF)) - { - $modele = $conf->global->CONTRACT_ADDON_PDF; - } - else - { - $modele = 'strato'; - } - } - - $modelpath = "core/modules/contract/doc/"; - - return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); - } } - - 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 ''; 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; diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index cf57e97933b..b83ecc329b7 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -58,7 +58,7 @@ $result = restrictedArea($user, 'contrat', $id); $staticcontrat=new Contrat($db); $staticcontratligne=new ContratLigne($db); -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_name=""; $search_contract=""; @@ -79,14 +79,13 @@ $now=dol_now(); llxHeader(); $sql = 'SELECT'; +$sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut, c.ref_supplier,"; +$sql.= " s.nom as name, s.rowid as socid,"; $sql.= ' SUM('.$db->ifsql("cd.statut=0",1,0).') as nb_initial,'; $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')",1,0).') as nb_running,'; $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')",1,0).') as nb_expired,'; $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')",1,0).') as nb_late,'; -$sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; -$sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut,"; -$sql.= " s.nom as name, s.rowid as socid"; -$sql.= " ,c.ref_supplier"; +$sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed'; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ", ".MAIN_DB_PREFIX."contrat as c"; @@ -107,7 +106,7 @@ if (!empty($search_ref_supplier)) { if ($sall) { $sql .= natural_search(array('s.nom', 'cd.label', 'cd.description'), $sall); } -$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.date_contrat, c.statut, s.nom, s.rowid"; +$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.date_contrat, c.statut, c.ref_supplier, s.nom, s.rowid"; $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($conf->liste_limit + 1, $offset); @@ -119,6 +118,7 @@ if ($resql) print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], '&search_contract='.$search_contract.'&search_name='.$search_name, $sortfield, $sortorder,'',$num); + print ''; print '
    '.$langs->trans("ListOfExpiredServices").' ('.$num.')
    '.$langs->trans("ListOfExpiredServices").' '.$num.'
    '; print ''; @@ -137,7 +137,6 @@ if ($resql) print ''; print "\n"; - print ''; print ''; print ''; print '\n"; - print ''; $var=true; while ($i < min($num,$limit)) @@ -180,7 +178,8 @@ if ($resql) } $db->free($resql); - print "
    '.$staticcontratligne->LibStatut(5,3).'
    '; @@ -154,7 +153,6 @@ if ($resql) print ''; print ''; print "
    "; + print ''; + print ''; } else { diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index b0fb4ed5edb..22ae64ef9cd 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -69,7 +69,7 @@ $staticcontrat=new Contrat($db); $staticcontratligne=new ContratLigne($db); $companystatic=new Societe($db); -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_name=""; $search_contract=""; diff --git a/htdocs/core/actions_printipp.inc.php b/htdocs/core/actions_printipp.inc.php new file mode 100644 index 00000000000..3c18faa813b --- /dev/null +++ b/htdocs/core/actions_printipp.inc.php @@ -0,0 +1,45 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file htdocs/core/actions_printipp.inc.php + * \brief Code for actions print_file to print file using ipp + */ + + +// $action must be defined +// $db, $user, $conf, $langs must be defined +// Filename to print must be provided into 'file' parameter + +// Print file +if ($action == 'print_file' and $user->rights->printipp->read) +{ + $langs->load("printipp"); + require_once DOL_DOCUMENT_ROOT . '/core/class/dolprintipp.class.php'; + $printer = new dolPrintIPP($db, $conf->global->PRINTIPP_HOST, $conf->global->PRINTIPP_PORT, $user->login, $conf->global->PRINTIPP_USER, $conf->global->PRINTIPP_PASSWORD); + $result = $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha')); + if ($result) + { + setEventMessage($result,'warnings'); + } + else + { + setEventMessage($langs->trans("FileWasSentToPrinter", basename(GETPOST('file')))); + } + $action = ''; +} diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index 51744775d9f..49de1529321 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -131,7 +131,6 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>'; $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>'; $message = $_POST['message']; - $sendtocc = $sendtocc; $sendtobcc= GETPOST('sendtoccc'); if ($mode == 'emailfromproposal') $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO); if ($mode == 'emailfromorder') $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO); @@ -146,10 +145,10 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO if ($message) { $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; - if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); - $actionmsg = dol_concatdesc($actionmsg, $message); + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } } diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index 738582ad931..89d05b92b79 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -159,6 +159,7 @@ class box_actions extends ModeleBoxes $actioncejour=false; $contents=$this->info_box_contents; $nblines=count($contents); + $bcx=array(); $bcx[0] = 'class="box_pair"'; $bcx[1] = 'class="box_impair"'; if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo")) diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php index c66326b27fb..45c8f1a4819 100644 --- a/htdocs/core/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -79,7 +79,7 @@ class box_comptes extends ModeleBoxes if ($user->rights->banque->lire) { $sql = "SELECT rowid, ref, label, bank, number, courant, clos, rappro, url,"; - $sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix,"; + $sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix as iban,"; $sql.= " domiciliation, proprio, owner_address,"; $sql.= " account_number, currency_code,"; $sql.= " min_allowed, min_desired, comment"; diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php index b272f350717..9b2a5437b8a 100644 --- a/htdocs/core/boxes/box_graph_invoices_permonth.php +++ b/htdocs/core/boxes/box_graph_invoices_permonth.php @@ -215,9 +215,9 @@ class box_graph_invoices_permonth extends ModeleBoxes $stringtoshow.='
    '; $stringtoshow.=''; $stringtoshow.=''; - $stringtoshow.=' '.$langs->trans("NumberOfBillsByMonth"); + $stringtoshow.=' '.$langs->trans("NumberOfBillsByMonth"); $stringtoshow.='   '; - $stringtoshow.=' '.$langs->trans("AmountOfBillsByMonthHT"); + $stringtoshow.=' '.$langs->trans("AmountOfBillsByMonthHT"); $stringtoshow.='
    '; $stringtoshow.=$langs->trans("Year").' '; $stringtoshow.=''; diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php index c882acd40c1..7c2aa53da97 100644 --- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php +++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php @@ -214,9 +214,9 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes $stringtoshow.=''; $stringtoshow.=''; $stringtoshow.=''; - $stringtoshow.=' '.$langs->trans("NumberOfBillsByMonth"); + $stringtoshow.=' '.$langs->trans("NumberOfBillsByMonth"); $stringtoshow.='   '; - $stringtoshow.=' '.$langs->trans("AmountOfBillsByMonthHT"); + $stringtoshow.=' '.$langs->trans("AmountOfBillsByMonthHT"); $stringtoshow.='
    '; $stringtoshow.=$langs->trans("Year").' '; $stringtoshow.=''; diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php index 5084691d321..75f0f60660f 100644 --- a/htdocs/core/boxes/box_graph_orders_permonth.php +++ b/htdocs/core/boxes/box_graph_orders_permonth.php @@ -215,9 +215,9 @@ class box_graph_orders_permonth extends ModeleBoxes $stringtoshow.=''; $stringtoshow.=''; $stringtoshow.=''; - $stringtoshow.=' '.$langs->trans("NumberOfOrdersByMonth"); + $stringtoshow.=' '.$langs->trans("NumberOfOrdersByMonth"); $stringtoshow.='   '; - $stringtoshow.=' '.$langs->trans("AmountOfOrdersByMonthHT"); + $stringtoshow.=' '.$langs->trans("AmountOfOrdersByMonthHT"); $stringtoshow.='
    '; $stringtoshow.=$langs->trans("Year").' '; $stringtoshow.=''; diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php index f398ae9dcb1..70d62cac348 100644 --- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php +++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php @@ -214,9 +214,9 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes $stringtoshow.=''; $stringtoshow.=''; $stringtoshow.=''; - $stringtoshow.=' '.$langs->trans("NumberOfOrdersByMonth"); + $stringtoshow.=' '.$langs->trans("NumberOfOrdersByMonth"); $stringtoshow.='   '; - $stringtoshow.=' '.$langs->trans("AmountOfOrdersByMonthHT"); + $stringtoshow.=' '.$langs->trans("AmountOfOrdersByMonthHT"); $stringtoshow.='
    '; $stringtoshow.=$langs->trans("Year").' '; $stringtoshow.=''; diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php index 974ccaed446..fd866f5df89 100644 --- a/htdocs/core/boxes/box_graph_propales_permonth.php +++ b/htdocs/core/boxes/box_graph_propales_permonth.php @@ -218,9 +218,9 @@ class box_graph_propales_permonth extends ModeleBoxes $stringtoshow.=''; $stringtoshow.=''; $stringtoshow.=''; - $stringtoshow.=' '.$langs->trans("NumberOfProposalsByMonth"); + $stringtoshow.=' '.$langs->trans("NumberOfProposalsByMonth"); $stringtoshow.='   '; - $stringtoshow.=' '.$langs->trans("AmountOfProposalsByMonthHT"); + $stringtoshow.=' '.$langs->trans("AmountOfProposalsByMonthHT"); $stringtoshow.='
    '; $stringtoshow.=$langs->trans("Year").' '; $stringtoshow.=''; diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php index 62ed89dd65b..ef38a2537e6 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 @@ -15,9 +16,9 @@ */ /** - * \file htdocs/core/boxes/box_activite.php - * \ingroup projet - * \brief Module to show Projet activity of the current Year + * \file htdocs/core/boxes/box_activite.php + * \ingroup projet + * \brief Module to show Projet activity of the current Year */ include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); @@ -36,23 +37,27 @@ class box_project extends ModeleBoxes var $info_box_head = array(); var $info_box_contents = array(); - /** - * \brief Constructeur de la classe - */ - function box_project() - { - global $langs; - $langs->load("boxes"); - $langs->load("projects"); + /** + * Constructor + * + * @param DoliDB $db Database handler + * @param string $param More parameters + */ + function __construct($db,$param='') + { + global $langs; + $langs->load("boxes"); + $langs->load("projects"); - $this->boxlabel="Projet"; - } + $this->db = $db; + $this->boxlabel="Projects"; + } /** * Load data for box to show them later * - * @param int $max Maximum number of records to load - * @return void + * @param int $max Maximum number of records to load + * @return void */ function loadBox($max=5) { @@ -63,18 +68,12 @@ 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 - if ($user->rights->projet->lire) - { + if ($user->rights->projet->lire) { $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut "; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; @@ -83,34 +82,37 @@ class box_project extends ModeleBoxes $sql.= " ORDER BY p.datec DESC"; $sql.= $db->plimit($max, 0); - $result = $db->query($sql); + $result = $db->query($sql); - if ($result) - { - $num = $db->num_rows($result); - $i = 0; - while ($i < $num) - { - $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"','logo' => 'object_projectpub'); + if ($result) { + $num = $db->num_rows($result); + $i = 0; + while ($i < $num) { + $objp = $db->fetch_object($result); - $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) - ); + $this->info_box_contents[$i][1] = array( + 'td' => 'align="left"', + '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 - ); + $this->info_box_contents[$i][2] = array( + 'td' => 'align="left"', + 'text' => $objp->title + ); $sql ="SELECT count(*) as nb, sum(progress) as totprogress"; $sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid"; $sql.=" WHERE p.entity = ".$conf->entity; $resultTask = $db->query($sql); - if ($resultTask) - { + if ($resultTask) { $objTask = $db->fetch_object($resultTask); $this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => number_format($objTask->nb, 0, ',', ' ')." ".$langs->trans("Tasks")); if ($objTask->nb > 0 ) @@ -118,9 +120,7 @@ class box_project extends ModeleBoxes else $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A "); $totalnbTask += $objTask->nb; - } - else - { + } else { $this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => number_format(0, 0, ',', ' ')); $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A "); } diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php index c15bc9831ce..d20ee2017d6 100644 --- a/htdocs/core/boxes/box_task.php +++ b/htdocs/core/boxes/box_task.php @@ -1,5 +1,6 @@ + * * 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 @@ -15,10 +16,10 @@ */ /** - * \file htdocs/core/boxes/box_task.php - * \ingroup Projet - * \brief Module to Task activity of the current year - * \version $Id: box_task.php,v 1.1 2012/09/11 Charles-François BENKE + * \file htdocs/core/boxes/box_task.php + * \ingroup Projet + * \brief Module to Task activity of the current year + * \version $Id: box_task.php,v 1.1 2012/09/11 Charles-François BENKE */ include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); @@ -29,34 +30,36 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); */ class box_task extends ModeleBoxes { - var $boxcode="projet"; - var $boximg="object_projecttask"; - var $boxlabel; - //var $depends = array("projet"); - var $db; - var $param; + var $boxcode="projet"; + var $boximg="object_projecttask"; + var $boxlabel; + //var $depends = array("projet"); + var $db; + var $param; - var $info_box_head = array(); - var $info_box_contents = array(); + var $info_box_head = array(); + var $info_box_contents = array(); - /** - * \brief Constructeur de la classe - * - * @return void - */ - function box_task() - { - global $langs; - $langs->load("boxes"); - $langs->load("projects"); - $this->boxlabel="Tasks"; - } + /** + * Constructor + * + * @param DoliDB $db Database handler + * @param string $param More parameters + */ + function __construct($db,$param='') + { + global $langs; + $langs->load("boxes"); + $langs->load("projects"); + $this->boxlabel="Tasks"; + $this->db = $db; + } /** * Load data for box to show them later * - * @param int $max Maximum number of records to load - * @return void + * @param int $max Maximum number of records to load + * @return void */ function loadBox($max=5) { @@ -75,8 +78,7 @@ class box_task extends ModeleBoxes $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead)); // list the summary of the orders - if ($user->rights->projet->lire) - { + if ($user->rights->projet->lire) { $sql = "SELECT pt.fk_statut, count(pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot"; $sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt"; @@ -88,23 +90,23 @@ class box_task extends ModeleBoxes $result = $db->query($sql); - if ($result) - { + if ($result) { $num = $db->num_rows($result); $i = 0; - while ($i < $num) - { - $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"','logo' => 'object_projecttask'); + while ($i < $num) { + $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"','logo' => 'object_projecttask'); - $objp = $db->fetch_object($result); - $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0) - ); + $objp = $db->fetch_object($result); + $this->info_box_contents[$i][1] = array( + 'td' => 'align="left"', + 'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0) + ); - $this->info_box_contents[$i][2] = array('td' => 'align="right"', - 'text' => $objp->nb." ".$langs->trans("Tasks"), - 'url' => DOL_URL_ROOT."/projet/tasks/index.php?leftmenu=projects&viewstatut=".$objp->fk_statut - ); + $this->info_box_contents[$i][2] = array( + 'td' => 'align="right"', + 'text' => $objp->nb." ".$langs->trans("Tasks"), + 'url' => DOL_URL_ROOT."/projet/tasks/index.php?leftmenu=projects&viewstatut=".$objp->fk_statut + ); $totalnb += $objp->nb; $this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5)); $totalplannedtot += $objp->plannedtot; @@ -126,7 +128,7 @@ class box_task extends ModeleBoxes $this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5)); $this->info_box_contents[$i][4] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5)); $this->info_box_contents[$i][5] = array('td' => '', 'text' => ""); - + } /** diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index 275154cd80e..c6b6dad7acb 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -181,6 +181,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" global $langs,$conf; $MAXLENGTHBOX=60; // Mettre 0 pour pas de limite + $bcx=array(); $bcx[0] = 'class="box_pair"'; $bcx[1] = 'class="box_impair"'; $var = false; @@ -227,7 +228,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" print ''; // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object print img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="boxhandle hideonsmartphone" style="cursor:move;"'); - print img_picto($langs->trans("Close",$this->box_id),'close_title','class="boxclose" rel="x:y" style="cursor:pointer;" id="imgclose'.$this->box_id.'"'); + print img_picto($langs->trans("Close2",$this->box_id),'close_title','class="boxclose" rel="x:y" style="cursor:pointer;" id="imgclose'.$this->box_id.'"'); $label=$head['text']; if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')'; print ''; diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php index 7d0bf5fad0c..5620e641df0 100644 --- a/htdocs/core/class/CSMSFile.class.php +++ b/htdocs/core/class/CSMSFile.class.php @@ -54,7 +54,6 @@ class CSMSFile * @param int $deferred Deferred or not * @param int $priority Priority * @param int $class Class - * @return int */ function __construct($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1) { diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php index 68241cb4d62..d7f765fa510 100644 --- a/htdocs/core/class/antivir.class.php +++ b/htdocs/core/class/antivir.class.php @@ -40,7 +40,6 @@ class AntiVir * Constructor * * @param DoliDB $db Database handler - * @return AntiVir */ function __construct($db) { diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php index 088dfaf327b..59980cea7a9 100644 --- a/htdocs/core/class/ccountry.class.php +++ b/htdocs/core/class/ccountry.class.php @@ -191,7 +191,7 @@ class Ccountry // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -256,10 +256,10 @@ class Ccountry // extends CommonObject /** - * Delete object in database + * Delete object in database * - * @param User $user User that delete - * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @param User $user User that delete + * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ function delete($user, $notrigger=0) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 26f209ed107..fbf5363b753 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -388,7 +388,7 @@ abstract class CommonDocGenerator $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true); $object->fetch_optionals($object->id,$extralabels); - $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key=$array_key,$outputlangs); + $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs); } return $resarray; } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index e85d3dbed71..c2718cf504c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3,10 +3,10 @@ * Copyright (C) 2005-2013 Regis Houssin * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2012 Christophe Battarel - * Copyright (C) 2010-2011 Juanjo Menent + * 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 @@ -34,9 +34,19 @@ */ abstract class CommonObject { - protected $db; + 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; @@ -47,6 +57,9 @@ abstract class CommonObject public $array_options=array(); + /** + * @var Societe + */ public $thirdparty; public $linkedObjectsIds; // Loaded by ->fetchObjectLinked @@ -54,6 +67,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 @@ -601,18 +620,22 @@ abstract class CommonObject /** * Load the third party of object, from id $this->socid or $this->fk_soc, into this->thirdparty * - * @return int <0 if KO, >0 if OK + * @param int $force_thirdparty_id Force thirdparty id + * @return int <0 if KO, >0 if OK */ - function fetch_thirdparty() + function fetch_thirdparty($force_thirdparty_id=0) { global $conf; - if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty)) return 0; + if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) return 0; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; + $idtofetch=isset($this->socid)?$this->socid:(isset($this->fk_soc)?$this->fk_soc:$this->fk_thirdparty); + if ($force_thirdparty_id) $idtofetch=$force_thirdparty_id; + $thirdparty = new Societe($this->db); - $result=$thirdparty->fetch(isset($this->socid)?$this->socid:(isset($this->fk_soc)?$this->fk_soc:$this->fk_thirdparty)); + $result=$thirdparty->fetch($idtofetch); $this->client = $thirdparty; // deprecated $this->thirdparty = $thirdparty; @@ -627,9 +650,35 @@ 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 + * Properties ->barcode_type that is id of barcode. Type is used to find other properties, but * if it is not defined, ->element must be defined to know default barcode type. * * @return int <0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded) @@ -1847,7 +1896,7 @@ abstract class CommonObject } } else - { + { $sql.= "(fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."')"; $sql.= " ".$clause." (fk_target = '".$targetid."' AND targettype = '".$targettype."')"; } @@ -2073,24 +2122,23 @@ abstract class CommonObject dol_syslog(get_class($this)."::setStatut", LOG_DEBUG); if ($this->db->query($sql)) { - if (! $error) - { - $trigkey=''; - if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED'; - if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED'; + $error = 0; - if ($trigkey) - { - // Appel des triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($this->db); - $result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf); - if ($result < 0) { - $error++; $this->errors=$interface->errors; - } - // Fin appel triggers - } - } + $trigkey=''; + if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED'; + if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED'; + + if ($trigkey) + { + // Appel des triggers + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; + $interface=new Interfaces($this->db); + $result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf); + if ($result < 0) { + $error++; $this->errors=$interface->errors; + } + // Fin appel triggers + } if (! $error) { @@ -2143,7 +2191,6 @@ abstract class CommonObject $obj = $this->db->fetch_object($resql); if ($obj) { - $this->id = $obj->rowid; $this->canvas = $obj->canvas; return 1; } @@ -3012,30 +3059,33 @@ abstract class CommonObject $marginInfo = $this->getMarginInfos($force_price); - print $langs->trans('ShowMarginInfos').' : '; - $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']; - print ''.img_picto($langs->trans("Disabled"),'switch_off').''; - print ''.img_picto($langs->trans("Enabled"),'switch_on').''; + if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) // FIXME Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better + { + print $langs->trans('ShowMarginInfos').' : '; + $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']; + print ''.img_picto($langs->trans("Disabled"),'switch_off').''; + print ''.img_picto($langs->trans("Enabled"),'switch_on').''; - print ''; - if (!empty($hidemargininfos)) print ''; + print ''; + if (!empty($hidemargininfos)) print ''; + } - print ''; + print '
    '; print ''; - print ''; - print ''; + print ''; + print ''; if ($conf->global->MARGIN_TYPE == "1") - print ''; + print ''; else - print ''; - print ''; + print ''; + print ''; if (! empty($conf->global->DISPLAY_MARGIN_RATES)) - print ''; + print ''; if (! empty($conf->global->DISPLAY_MARK_RATES)) - print ''; + print ''; print ''; if (! empty($conf->product->enabled)) @@ -3596,7 +3646,7 @@ abstract class CommonObject break; } - $out .= ''."\n"; + $out .= ''; if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= ''; else $out .= ''; @@ -3604,7 +3654,6 @@ abstract class CommonObject } } $out .= "\n"; - $out .= ' '; $out .= ' '; + '."\n"; + $out .= ' '."\n"; } return $out; } diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 8a17273435e..238cd171a5a 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -72,8 +72,6 @@ class Conf /** * Constructor - * - * @return Conf */ function __construct() { @@ -364,6 +362,27 @@ class Conf unset($this->global->PRODUIT_USE_SEARCH_TO_SELECT); unset($this->global->COMPANY_USE_SEARCH_TO_SELECT); unset($this->global->CONTACT_USE_SEARCH_TO_SELECT); + unset($this->global->PROJECT_USE_SEARCH_TO_SELECT); + } + + if (! empty($conf->productbatch->enabled)) + { + $this->global->STOCK_CALCULATE_ON_BILL=0; + $this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER=0; + $this->global->STOCK_CALCULATE_ON_SHIPMENT=1; + $this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL=0; + $this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER=0; + $this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER=1; + } + + if (! empty($conf->productbatch->enabled)) + { + $this->global->STOCK_CALCULATE_ON_BILL=0; + $this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER=0; + $this->global->STOCK_CALCULATE_ON_SHIPMENT=1; + $this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL=0; + $this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER=0; + $this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER=1; } // conf->currency @@ -373,6 +392,9 @@ class Conf // conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...) if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE='RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES' + // By default, suppliers ojbects can be linked to all projects + $conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1; + // conf->liste_limit = constante de taille maximale des listes if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25; $this->liste_limit=$this->global->MAIN_SIZE_LISTE_LIMIT; @@ -428,6 +450,9 @@ class Conf // Define list of limited modules if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,facture,categorie,commande,fournisseur,contact,propal,projet,contrat,societe,ficheinter,expedition,agenda,adherent'; // '' means 'all'. Note that contact is added here as it should be a module later. + // Enable select2 + if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)) $conf->global->MAIN_USE_JQUERY_MULTISELECT='select2'; + // Timeouts if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT=10; if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT=30; diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php index eea64ed10ac..027dda53dd3 100644 --- a/htdocs/core/class/ctypent.class.php +++ b/htdocs/core/class/ctypent.class.php @@ -198,7 +198,7 @@ class Ctypent // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php index f0291c9d567..98b1309149e 100644 --- a/htdocs/core/class/discount.class.php +++ b/htdocs/core/class/discount.class.php @@ -451,7 +451,7 @@ class DiscountAbsolute } - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$lien.$ref.$lienfin; return $result; diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php index 9844e6b74c9..7cddd4c16f5 100644 --- a/htdocs/core/class/dolgeoip.class.php +++ b/htdocs/core/class/dolgeoip.class.php @@ -40,7 +40,6 @@ class DolGeoIP * * @param string $type 'country' or 'city' * @param string $datfile Data file - * @return GeoIP */ function __construct($type,$datfile) { diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 33888b057b7..c400dc151d3 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -253,7 +253,7 @@ class DolGraph /** * Set legend * - * @param string $legend Legend + * @param array $legend Legend. Example: array('seriename1','seriname2',...) * @return void */ function SetLegend($legend) diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php index 942ee3da3c3..b6e09547743 100644 --- a/htdocs/core/class/dolprintipp.class.php +++ b/htdocs/core/class/dolprintipp.class.php @@ -45,7 +45,6 @@ class dolprintIPP * @param string $userid userid * @param string $user user * @param string $password password - * @return printIPP */ function __construct($db,$host,$port,$userid,$user,$password) { @@ -83,19 +82,22 @@ class dolprintIPP * @param string $file file * @param string $module module * - * @return void + * @return string '' if OK, Error message if KO */ - function print_file($file,$module) + function print_file($file, $module) { global $conf,$db; + include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php'; + $ipp = new CupsPrintIPP(); - $ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose + $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose $ipp->setHost($this->host); $ipp->setPort($this->port); $ipp->setJobName($file,true); $ipp->setUserName($this->userid); if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password); + // select printer uri for module order, propal,... $sql = 'SELECT rowid,printer_uri,copy FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"'; $result = $this->db->query($sql); @@ -108,13 +110,23 @@ class dolprintIPP } else { - $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT); + if (! empty($conf->global->PRINTIPP_URI_DEFAULT)) + { + $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT); + } + else + { + return 'NoDefaultPrinterDefined'; + } } } + // Set number of copy $ipp->setCopies($obj->copy); $ipp->setData(DOL_DATA_ROOT.'/'.$module.'/'.$file); $ipp->printJob(); + + return ''; } /** diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index e191773517b..299026a84bb 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -154,7 +154,7 @@ class Events // extends CommonObject * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; @@ -191,7 +191,7 @@ class Events // extends CommonObject * @param User $user User that load * @return int <0 if KO, >0 if OK */ - function fetch($id, $user=0) + function fetch($id, $user=null) { global $langs; diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 94898ec5452..30c97e9f1ef 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -56,7 +56,7 @@ class ExtraFields var $error; var $errno; - static $type2label=array( + public static $type2label=array( 'varchar'=>'String', 'text'=>'TextLong', 'int'=>'Int', @@ -510,17 +510,6 @@ class ExtraFields } - /** - * Load array of labels - * - * @return void - */ - function fetch_optionals() - { - $this->fetch_name_optionals_label(); - } - - /** * Load array this->attribute_xxx like attribute_label, attribute_type, ... * @@ -528,15 +517,14 @@ class ExtraFields * @param boolean $forceload Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED * @return array Array of attributes for all extra fields */ - function fetch_name_optionals_label($elementtype='adherent',$forceload=false) + function fetch_name_optionals_label($elementtype,$forceload=false) { global $conf; $array_name_label=array(); // For avoid conflicts with external modules - if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) - return $array_name_label; + if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label; $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable"; $sql.= " FROM ".MAIN_DB_PREFIX."extrafields"; @@ -569,13 +557,13 @@ class ExtraFields $this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable; } } - - return $array_name_label; } else { print dol_print_error($this->db); } + + return $array_name_label; } diff --git a/htdocs/core/class/google.class.php b/htdocs/core/class/google.class.php index 7f36c6f0d99..b0649f575fc 100644 --- a/htdocs/core/class/google.class.php +++ b/htdocs/core/class/google.class.php @@ -36,7 +36,6 @@ class GoogleAPI * * @param DoliDB $db Database handler * @param string $key Google key - * @return GoogleAPI */ function __construct($db,$key) { diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 298c36636bd..3ad0ec897f9 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -47,7 +47,7 @@ class HookManager /** * Constructor * - * @param DoliDB $db Handler acces base de donnees + * @param DoliDB $db Database handler */ function __construct($db) { @@ -56,13 +56,13 @@ class HookManager /** - * Init array this->hooks with instantiated action controlers. + * Init array $this->hooks with instantiated action controlers. * First, a hook is declared by a module by adding a constant MAIN_MODULE_MYMODULENAME_HOOKS * with value 'nameofcontext1:nameofcontext2:...' into $this->const of module descriptor file. - * This make conf->hooks_modules loaded with an entry ('modulename'=>array(nameofcontext1,nameofcontext2,...)) - * When initHooks function is called, with initHooks(list_of_contexts), an array this->hooks is defined with instance of controler + * This makes $conf->hooks_modules loaded with an entry ('modulename'=>array(nameofcontext1,nameofcontext2,...)) + * When initHooks function is called, with initHooks(list_of_contexts), an array $this->hooks is defined with instance of controler * class found into file /mymodule/class/actions_mymodule.class.php (if module has declared the context as a managed context). - * Then when a hook is executeHook('aMethod'...) is called, the method aMethod found into class will be executed. + * Then when a hook executeHooks('aMethod'...) is called, the method aMethod found into class will be executed. * * @param array $arraycontext Array list of searched hooks tab/features. For example: 'thirdpartycard' (for hook methods into page card thirdparty), 'thirdpartydao' (for hook methods into Societe), ... * @return int Always 1 @@ -116,7 +116,7 @@ class HookManager * @param array $parameters Array of parameters * @param Object $object Object to use hooks on * @param string $action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...) - * @return mixed For doActions,formObjectOptions,pdf_xxx: Return 0 if we want to keep standard actions, >0 if if want to stop standard actions, <0 means KO. + * @return mixed For doActions,formObjectOptions,pdf_xxx: Return 0 if we want to keep standard actions, >0 if we want to stop standard actions, <0 means KO. * For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Deprecated. Must always return an int and things to print into ->resprints. * Can also return some values into an array ->results. * $this->error or this->errors are also defined by class called by this function if error. @@ -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( @@ -149,11 +150,11 @@ class HookManager ) )) $hooktype='addreplace'; - // Loop on each hook to qualify modules that declared context + // Loop on each hook to qualify modules that have declared context $modulealreadyexecuted=array(); $resaction=0; $error=0; $result=''; $this->resPrint=''; $this->resArray=array(); - foreach($this->hooks as $context => $modules) // this->hooks is an array with context as key and value is an array of modules that handle this context + foreach($this->hooks as $context => $modules) // $this->hooks is an array with context as key and value is an array of modules that handle this context { if (! empty($modules)) { @@ -161,18 +162,18 @@ class HookManager { //print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."
    \n"; - // jump to next module/class if method does not exists + // jump to next module/class if method does not exist if (! method_exists($actionclassinstance,$method)) continue; - // test to avoid to run twice a hook, when a module implements several active contexts + // test to avoid running twice a hook, when a module implements several active contexts if (in_array($module,$modulealreadyexecuted)) continue; - $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method for avoid to run twice + $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method to avoid running twice - // Clean class (an error may have been set into a previous call of another method for same module/hook) + // Clean class (an error may have been set from a previous call of another method for same module/hook) $actionclassinstance->error=0; $actionclassinstance->errors=array(); - // Add current context for avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return; + // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return; $parameters['currentcontext'] = $context; // Hooks that must return int (hooks with type 'addreplace') if ($hooktype == 'addreplace') diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php old mode 100644 new mode 100755 index 03defa19129..46e99ba272e --- 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 * @@ -399,16 +399,28 @@ class Form if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; - if (empty($notabs)) $s.='
    '.$langs->trans('Margins').''.$langs->trans('SellingPrice').''.$langs->trans('Margins').''.$langs->trans('SellingPrice').''.$langs->trans('BuyingPrice').''.$langs->trans('BuyingPrice').''.$langs->trans('CostPrice').''.$langs->trans('Margin').''.$langs->trans('CostPrice').''.$langs->trans('Margin').''.$langs->trans('MarginRate').''.$langs->trans('MarginRate').''.$langs->trans('MarkRate').''.$langs->trans('MarkRate').'
    '; - if ($direction < 0) $s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.''; + if (empty($notabs)) $s.='
    '; + if ($direction < 0) { + $s.='<'.$tag.$paramfortooltipimg; + if ($tag == 'td') { + $s .= ' valign="top" width="14"'; + } + $s.= '>'.$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)?' ':'').''; + //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 (empty($notabs)) $s.='
    '; + if ((string) $text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.$text.''; + if ($direction > 0) { + $s.='<'.$tag.$paramfortooltipimg; + if ($tag == 'td') { + $s .= ' valign="top" width="14"'; + } + $s.= '>'.$img.''; + } + if (empty($notabs)) $s.=''; return $s; } @@ -746,7 +758,7 @@ class Form * @param int $showempty Add an empty field * @param int $showtype Show third party type in combolist (customer, prospect or supplier) * @param int $forcecombo Force to use combo box - * @param array $events Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled'))) + * @param array $events Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled'))) * @param int $limit Maximum number of elements * @return string HTML string with * @deprecated Use select_thirdparty instead @@ -816,14 +828,15 @@ class Form $resql=$this->db->query($sql); if ($resql) { - if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo) + if ($conf->use_javascript_ajax && ! $forcecombo) { include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; $out.= ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT); + $nodatarole=' data-role="none"'; } // Construct $out and $outarray - $out.= ''."\n"; $textifempty=''; // Do not use textempty = ' ' or ' ' here, or search on key will search on ' key'. @@ -1020,13 +1033,14 @@ class Form { $num=$this->db->num_rows($resql); - if ($conf->use_javascript_ajax && $conf->global->CONTACT_USE_SEARCH_TO_SELECT && ! $forcecombo && ! $options_only) + if ($conf->use_javascript_ajax && ! $forcecombo && ! $options_only) { include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; $out.= ajax_combobox($htmlname, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT); + $nodatarole=' data-role="none"'; } - if ($htmlname != 'none' || $options_only) $out.= ''; if ($showempty == 1) $out.= ''; if ($showempty == 2) $out.= ''; $num = $this->db->num_rows($resql); @@ -1183,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"; @@ -1199,7 +1213,7 @@ class Form if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN ('".$excludeUsers."')"; if (is_array($include) && $includeUsers) $sql.= " AND u.rowid IN ('".$includeUsers."')"; if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut <> 0"; - if (! empty($morefilter)) $sql.=$morefilter; + if (! empty($morefilter)) $sql.=" ".$morefilter; $sql.= " ORDER BY u.lastname ASC"; dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG); @@ -1210,7 +1224,15 @@ class Form $i = 0; if ($num) { - $out.= ''; if ($show_empty) $out.= ''."\n"; $userstatic=new User($this->db); @@ -1269,7 +1291,7 @@ class Form } else { - $out.=($moreinfo?' - ':' (').$obj->label; + $out.=($moreinfo?' - ':' (').($obj->label?$obj->label:$langs->trans("EntityNameNotDefined")); $moreinfo++; } } @@ -1281,7 +1303,7 @@ class Form } else { - $out.= ''; $out.= ''; } $out.= ''; @@ -1621,6 +1643,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); @@ -1640,11 +1664,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; @@ -1690,7 +1714,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; @@ -1816,7 +1840,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 { @@ -1849,7 +1873,7 @@ class Form $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,"; - $sql.= " s.nom as name"; + $sql.= " pfp.fk_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product"; if ($socid) $sql.= " AND pfp.fk_soc = ".$socid; @@ -1886,6 +1910,7 @@ class Form $result=$this->db->query($sql); if ($result) { + require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php'; $num = $this->db->num_rows($result); @@ -1923,13 +1948,24 @@ class Form $outval.=$objRef; if (! empty($objp->idprodfournprice)) $outval.=' ('.$objRefFourn.')'; $outval.=' - '; - $opt.=dol_trunc($objp->label,18).' - '; - $outval.=dol_trunc($label,18).' - '; + $opt.=dol_trunc($label, 72).' - '; + $outval.=dol_trunc($label, 72).' - '; if (! empty($objp->idprodfournprice)) { $outqty=$objp->quantity; $outdiscount=$objp->remise_percent; + if (!empty($objp->fk_price_expression)) { + $priceparser = new PriceParser($this->db); + $price_result = $priceparser->parseProductSupplier($objp->fk_product, $objp->fk_price_expression, $objp->quantity, $objp->tva_tx); + if ($price_result >= 0) { + $objp->fprice = $price_result; + if ($objp->quantity >= 1) + { + $objp->unitprice = $objp->fprice / $objp->quantity; + } + } + } if ($objp->quantity == 1) { $opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/"; @@ -2018,7 +2054,7 @@ class Form $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; $sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice,"; - $sql.= " s.nom as name"; + $sql.= " pfp.fk_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid"; @@ -2043,6 +2079,7 @@ class Form } else { + require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php'; $form.= ''; $i = 0; @@ -2057,6 +2094,17 @@ class Form } $opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - '; + if (!empty($objp->fk_price_expression)) { + $priceparser = new PriceParser($this->db); + $price_result = $priceparser->parseProductSupplier($objp->fk_product, $objp->fk_price_expression, $objp->quantity, $objp->tva_tx); + if ($price_result >= 0) { + $objp->fprice = $price_result; + if ($objp->quantity >= 1) + { + $objp->unitprice = $objp->fprice / $objp->quantity; + } + } + } if ($objp->quantity == 1) { $opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/"; @@ -2565,7 +2613,7 @@ class Form $i++; } print ""; - if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1); + if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); } else { print $langs->trans("NoShippingMethodDefined"); } @@ -2921,12 +2969,13 @@ class Form // Show JQuery confirm box. Note that global var $useglobalvars is used inside this template $formconfirm.= ''; + $formconfirm.= '
    '."\n"; - $formconfirm.= ''; + $formconfirm.= "\n"; } else { $formconfirm.= "\n\n"; $formconfirm.= ''."\n"; - $formconfirm.= ''; + $formconfirm.= ''."\n"; $formconfirm.= ''."\n"; $formconfirm.= ''."\n"; @@ -3039,13 +3089,14 @@ class Form /** * Show a form to select a project * - * @param int $page Page - * @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id) - * @param int $selected Id pre-selected project - * @param string $htmlname Name of select field + * @param int $page Page + * @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id) + * @param int $selected Id pre-selected project + * @param string $htmlname Name of select field + * @param int $discard_closed Hide all closed projects * @return void */ - function form_project($page, $socid, $selected='', $htmlname='projectid') + function form_project($page, $socid, $selected='', $htmlname='projectid', $discard_closed=0) { global $langs; @@ -3062,8 +3113,7 @@ class Form print ''; print '
    '; print ''; print ''; print '
    '; - //print "$socid,$selected,$htmlname"; - $formproject->select_projects($socid,$selected,$htmlname); + $formproject->select_projects($socid,$selected,$htmlname,20,0,1,$discard_closed); print '
    '; @@ -3735,7 +3785,7 @@ class Form * @param string $prefix Prefix for fields name * @param int $h 1=Show also hours * @param int $m 1=Show also minutes - * @param int $empty 0=Fields required, 1=Empty input is allowed + * @param int $empty 0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only * @param string $form_name Not used * @param int $d 1=Show days, month, years * @param int $addnowbutton Add a button "Now" @@ -3754,9 +3804,13 @@ class Form if($prefix=='') $prefix='re'; if($h == '') $h=0; if($m == '') $m=0; - if($empty == '') $empty=0; + $emptydate=0; + $emptyhours=0; + if ($empty == 1) { $emptydate=1; $emptyhours=1; } + if ($empty == 2) { $emptydate=0; $emptyhours=1; } + $orig_set_time=$set_time; - if ($set_time === '' && $empty == 0) + if ($set_time === '' && $emptydate == 0) { include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $set_time = dol_now('tzuser')-(getServerTimeZoneInt('now')*3600); // set_time must be relative to PHP server timezone @@ -3778,8 +3832,11 @@ class Form $syear = dol_print_date($set_time, "%Y"); $smonth = dol_print_date($set_time, "%m"); $sday = dol_print_date($set_time, "%d"); - $shour = dol_print_date($set_time, "%H"); - $smin = dol_print_date($set_time, "%M"); + if ($orig_set_time != '') + { + $shour = dol_print_date($set_time, "%H"); + $smin = dol_print_date($set_time, "%M"); + } } else { @@ -3841,7 +3898,7 @@ class Form // Day $retstring.=''; - if ($empty || $set_time == -1) + if ($emptydate || $set_time == -1) { $retstring.=''; } @@ -3854,7 +3911,7 @@ class Form $retstring.=""; $retstring.=''; - if ($empty || $set_time == -1) + if ($emptydate || $set_time == -1) { $retstring.=''; } @@ -3869,7 +3926,7 @@ class Form $retstring.=""; // Year - if ($empty || $set_time == -1) + if ($emptydate || $set_time == -1) { $retstring.=''; } @@ -3892,7 +3949,7 @@ class Form { // Show hour $retstring.=''; - if ($empty) $retstring.=''; + if ($emptyhours) $retstring.=''; for ($hour = 0; $hour < 24; $hour++) { if (strlen($hour) < 2) $hour = "0" . $hour; @@ -3906,7 +3963,7 @@ class Form { // Show minutes $retstring.=''; - if ($empty) $retstring.=''; + if ($emptyhours) $retstring.=''; for ($min = 0; $min < 60 ; $min++) { if (strlen($min) < 2) $min = "0" . $min; @@ -3965,18 +4022,22 @@ class Form /** * Function to show a form to select a duration on a page * - * @param string $prefix Prefix + * @param string $prefix Prefix for input fields * @param int $iSecond Default preselected duration (number of seconds) * @param int $disabled Disable the combo box * @param string $typehour If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a combo * @param string $minunderhours If 1, show minutes selection under the hours + * @param int $nooutput Do not output html string but return it * @return void */ - function select_duration($prefix, $iSecond='', $disabled=0, $typehour='select', $minunderhours=0) + function select_duration($prefix, $iSecond='', $disabled=0, $typehour='select', $minunderhours=0, $nooutput=0) { global $langs; + $retstring=''; + $hourSelected=0; $minSelected=0; + if ($iSecond) { require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; @@ -3987,36 +4048,51 @@ class Form if ($typehour=='select') { - print ''; for ($hour = 0; $hour < 25; $hour++) // For a duration, we allow 24 hours { - print '"; + $retstring.=">".$hour.""; } - print ""; + $retstring.=""; } elseif ($typehour=='text') { - print ''; + $retstring.=''; } - print ' '.$langs->trans('HourShort'); + else return 'BadValueForParameterTypeHour'; - if ($minunderhours) print '
    '; - else print " "; + $retstring.=' '.$langs->trans('HourShort'); - print ''; + for ($min = 0; $min <= 55; $min=$min+5) + { + $retstring.=''."\n"; while ($i < $num) @@ -4516,8 +4595,8 @@ class Form } else { - $out.= ''; } diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index 042474781d7..30ecadedb55 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -53,9 +53,10 @@ class FormAdmin * @param array $filter Array of keys to exclude in list * @param int $showempty Add empty value * @param int $showwarning Show a warning if language is not complete + * @param int $disabled Disable edit of select * @return string Return HTML select string with list of languages */ - function select_language($selected='',$htmlname='lang_id',$showauto=0,$filter=0,$showempty=0,$showwarning=0) + function select_language($selected='',$htmlname='lang_id',$showauto=0,$filter=0,$showempty=0,$showwarning=0,$disabled=0) { global $langs; @@ -63,7 +64,7 @@ class FormAdmin $out=''; - $out.= ''; if ($showempty) { $out.= ''; // Should use -1 to say nothing if (is_array($tab_categs)) @@ -349,16 +359,26 @@ class FormOther * @param string $htmlname Name of combo list (example: 'search_sale') * @param User $user Object user * @param int $showstatus 0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status + * @param int $showempty 1=show also an empty value * @return string Html combo list code */ - function select_salesrepresentatives($selected,$htmlname,$user,$showstatus=0) + function select_salesrepresentatives($selected,$htmlname,$user,$showstatus=0,$showempty=1) { 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 =''; + if ($showempty) $out.=''; // Get list of users allowed to be viewed $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login"; @@ -383,34 +403,35 @@ class FormOther { while ($obj_usr = $this->db->fetch_object($resql_usr)) { - $moreforfilter.=''; + $out.=($moreinfo?')':''); + $out.=''; } $this->db->free($resql_usr); } @@ -418,9 +439,9 @@ class FormOther { dol_print_error($this->db); } - $moreforfilter.=''; + $out.=''; - return $moreforfilter; + return $out; } /** @@ -560,13 +581,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 +597,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; @@ -1034,6 +1055,7 @@ class FormOther if ($nbboxactivated) { $langs->load("boxes"); + $langs->load("projects"); $emptybox=new ModeleBoxes($db); diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index 1a40d938329..c09b7237496 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -49,11 +49,12 @@ class FormProjets * @param int $selected Id project preselected * @param string $htmlname Nom de la zone html * @param int $maxlength Maximum length of label - * @param int $option_only Option only + * @param int $option_only Return only html options lines without the select tag * @param int $show_empty Add an empty line + * @param int $discard_closed Discard closed projects * @return int Nber of project if OK, <0 if KO */ - function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1) + function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0) { global $user,$conf,$langs; @@ -104,6 +105,12 @@ class FormProjets } else { + if ($discard_closed && $obj->fk_statut == 2) + { + $i++; + continue; + } + $labeltoshow=dol_trunc($obj->ref,18); //if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')'; //else $labeltoshow.=' ('.$langs->trans("Private").')'; diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php index 2b70053cb28..51841a27e24 100644 --- a/htdocs/core/class/html.formsms.class.php +++ b/htdocs/core/class/html.formsms.class.php @@ -277,7 +277,7 @@ function limitChars(textarea, limit, infodiv) { $defaultmessage=$this->withbody; } - $defaultmessage=make_substitutions($defaultmessage,$this->substit,$langs); + $defaultmessage=make_substitutions($defaultmessage,$this->substit); if (isset($_POST["message"])) $defaultmessage=$_POST["message"]; $defaultmessage=str_replace('\n',"\n",$defaultmessage); @@ -320,15 +320,14 @@ function limitChars(textarea, limit, infodiv) print "\n"; - print '
    '; - print "trans("SendSms")."\""; - print ">"; + print '
    '; + print ''; if ($this->withcancel) { - print "     "; - print "trans("Cancel")."\">"; + print '  &nbnp;  '; + print ''; } - print "
    \n"; + print ''; print "\n"; print "\n"; diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php index ab26ee68317..14d1bec0841 100644 --- a/htdocs/core/class/infobox.class.php +++ b/htdocs/core/class/infobox.class.php @@ -40,14 +40,14 @@ class InfoBox /** * Return array of boxes qualified for area and user * - * @param DoliDB $db Database handler - * @param string $mode 'available' or 'activated' - * @param string $zone Name or area (-1 for all, 0 for Homepage, 1 for xxx, ...) - * @param User $user Object user to filter - * @param array $excludelist Array of box id (box.box_id = boxes_def.rowid) to exclude - * @return array Array of boxes + * @param DoliDB $db Database handler + * @param string $mode 'available' or 'activated' + * @param string $zone Name or area (-1 for all, 0 for Homepage, 1 for xxx, ...) + * @param User|null $user Object user to filter + * @param array $excludelist Array of box id (box.box_id = boxes_def.rowid) to exclude + * @return array Array of boxes */ - static function listBoxes($db, $mode, $zone, $user, $excludelist=array()) + static function listBoxes($db, $mode, $zone, $user=null, $excludelist=array()) { global $conf; diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php index 88abc140104..95436a51e29 100644 --- a/htdocs/core/class/ldap.class.php +++ b/htdocs/core/class/ldap.class.php @@ -847,6 +847,7 @@ class Ldap */ function getAttributeValues($filterrecord,$attribute) { + $attributes=array(); $attributes[0] = $attribute; // We need to search for this user in order to get their entry. @@ -1075,9 +1076,9 @@ class Ldap $subcount = hexdec(substr($hex_sid,2,2)); // Get count of sub-auth entries $auth = hexdec(substr($hex_sid,4,12)); // SECURITY_NT_AUTHORITY $result = "$rev-$auth"; - for ($x=0;$x < $subcount; $x++) { - $subauth[$x] = hexdec($this->littleEndian(substr($hex_sid,16+($x*8),8))); // get all SECURITY_NT_AUTHORITY - $result .= "-".$subauth[$x]; + for ($x=0;$x < $subcount; $x++) + { + $result .= "-".hexdec($this->littleEndian(substr($hex_sid,16+($x*8),8))); // get all SECURITY_NT_AUTHORITY } return $result; } @@ -1090,9 +1091,9 @@ class Ldap * car conflit majuscule-minuscule. A n'utiliser que pour les pages * 'Fiche LDAP' qui affiche champ lisibles par defaut. * - * @param string $checkDn DN de recherche (Ex: ou=users,cn=my-domain,cn=com) - * @param string $filter Filtre de recherche (ex: (sn=nom_personne) ) - * @return array Tableau des reponses (cle en minuscule-valeur) + * @param string $checkDn DN de recherche (Ex: ou=users,cn=my-domain,cn=com) + * @param string $filter Search filter (ex: (sn=nom_personne) ) + * @return array|int Array with answers (key lowercased - value) */ function search($checkDn, $filter) { 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/class/menubase.class.php b/htdocs/core/class/menubase.class.php index c1c760a29e7..30f5960e0ce 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -74,7 +74,7 @@ class Menubase * @param User $user User that create * @return int <0 if KO, Id of record if OK */ - function create($user=0) + function create($user=null) { global $conf, $langs; @@ -185,7 +185,7 @@ class Menubase * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; @@ -250,7 +250,7 @@ class Menubase * @param User $user User that load * @return int <0 if KO, >0 if OK */ - function fetch($id, $user=0) + function fetch($id, $user=null) { global $langs; diff --git a/htdocs/core/class/mobiledetect.class.php b/htdocs/core/class/mobiledetect.class.php index 72d192a7614..297058698aa 100644 --- a/htdocs/core/class/mobiledetect.class.php +++ b/htdocs/core/class/mobiledetect.class.php @@ -637,6 +637,11 @@ class MobileDetect return null; } + /** + * getMobileHeaders + * + * @return string mobile Headers + */ public function getMobileHeaders() { return self::$mobileHeaders; diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php index 5165dcb4994..a5e01998ecd 100644 --- a/htdocs/core/class/openid.class.php +++ b/htdocs/core/class/openid.class.php @@ -247,6 +247,12 @@ class SimpleOpenID } } + /** + * array2url + * + * @param array $arr An array + * @return boolean|string false if KO, string of url if OK + */ function array2url($arr) { // converts associated array to URL Query String if (!is_array($arr)){ @@ -259,6 +265,14 @@ class SimpleOpenID return $query; } + /** + * FSOCK_Request + * + * @param string $url URL + * @param string $method Method + * @param string $params Params + * @return boolean|unknown + */ function FSOCK_Request($url, $method="GET", $params = "") { $fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds @@ -283,6 +297,14 @@ class SimpleOpenID } } + /** + * CURL_Request + * + * @param string $url URL + * @param string $method Method + * @param string $params Params + * @return boolean|unknown + */ function CURL_Request($url, $method="GET", $params = "") { // Remember, SSL MUST BE SUPPORTED if (is_array($params)) $params = $this->array2url($params); @@ -305,6 +327,12 @@ class SimpleOpenID return $response; } + /** + * HTML2OpenIDServer + * + * @param string $content Content + * @return array Array of servers + */ function HTML2OpenIDServer($content) { $get = array(); diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 6b24d5356df..7347b065a79 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -33,7 +33,6 @@ class Translate var $defaultlang; // Current language for current user var $direction = 'ltr'; // Left to right or Right to left - var $charset_inputfile=array(); // To store charset encoding used for language var $charset_output='UTF-8'; // Codage used by "trans" method outputs var $tab_translate=array(); // Array of all translations key=>value @@ -198,6 +197,12 @@ class Translate if ($alt < 1 && isset($langarray[1]) && strtolower($langarray[0]) == strtolower($langarray[1])) $alt=1; if ($alt < 2 && strtolower($langofdir) == 'en_us') $alt=2; + if (empty($langofdir)) // This may occurs when load is called without setting the language and without providing a value for forcelangdir + { + dol_syslog("Error: ".get_class($this)."::Load was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING); + return -1; + } + foreach($this->dir as $keydir => $searchdir) { // Directory of translation files diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php index 7e0333bc5aa..7c5c4898fce 100644 --- a/htdocs/core/datepicker.php +++ b/htdocs/core/datepicker.php @@ -2,6 +2,7 @@ /* Copyright (C) phpBSM * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2007 Regis Houssin + * Copyright (C) 2014 Juanjo Menent * * This file is a modified version of datepicker.php from phpBSM to fix some * bugs, to add new features and to dramatically increase speed. @@ -39,6 +40,7 @@ require_once '../main.inc.php'; if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang')); // If language was forced on URL by the main.inc.php $langs->load("main"); +$langs->load("agenda"); $right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); @@ -57,7 +59,7 @@ if (GETPOST('mode') && GETPOST('mode') == 'test') } else { - print 'Calendar'; + print ''.$langs->trans("Calendar").''; } // Define tradMonths javascript array (we define this in datapicker AND in parent page to avoid errors with IE8) @@ -183,6 +185,19 @@ function displayBox($selectedDate,$month,$year) onClick="loadMonth('','','','','defaultlang ?>')">>> + global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1; + if($startday==1) + {?> + trans("ShortMonday") ?> + trans("ShortTuesday") ?> + trans("ShortWednesday") ?> + trans("ShortThursday") ?> + trans("ShortFriday") ?> + trans("ShortSaturday") ?> + trans("ShortSunday") ?> + trans("ShortSunday") ?> trans("ShortMonday") ?> trans("ShortTuesday") ?> @@ -190,6 +205,8 @@ function displayBox($selectedDate,$month,$year) trans("ShortThursday") ?> trans("ShortFriday") ?> trans("ShortSaturday") ?> + 3600 with TZ+1 and gmt=0 * 19700101020000 -> 7200 whaterver is TZ if gmt=1 * - * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS) - * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ - * @return date Date TMS + * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS) + * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ + * @return timestamp|string Date TMS */ function jdate($string, $gm=false); diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index 21f0001b7e7..baf38bd9a39 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -158,8 +158,8 @@ abstract class DoliDB implements Database /** * Annulation d'une transaction et retour aux anciennes valeurs * - * @param string $log Add more log to default log line - * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur + * @param string $log Add more log to default log line + * @return resource|int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur */ function rollback($log='') { diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index a8f9e9aff50..0f86f01693c 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -53,7 +53,6 @@ class DoliDBMssql extends DoliDB * @param string $pass Mot de passe * @param string $name Nom de la database * @param int $port Port of database server - * @return int 1 if OK, 0 if not */ function __construct($type, $host, $user, $pass, $name='', $port=0) { diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php index dc0cbb1cb1b..bd3e77f37d5 100644 --- a/htdocs/core/db/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -50,7 +50,6 @@ class DoliDBMysql extends DoliDB * @param string $pass Mot de passe * @param string $name Nom de la database * @param int $port Port of database server - * @return int 1 if OK, 0 if not */ function __construct($type, $host, $user, $pass, $name='', $port=0) { diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index 9ec495f7ca5..cd692db677c 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -50,7 +50,6 @@ class DoliDBMysqli extends DoliDB * @param string $pass Mot de passe * @param string $name Nom de la database * @param int $port Port of database server - * @return int 1 if OK, 0 if not */ function __construct($type, $host, $user, $pass, $name='', $port=0) { @@ -357,7 +356,6 @@ class DoliDBMysqli extends DoliDB * @return int Nombre de lignes * @see num_rows */ - function affected_rows($resultset) { // If resultset not provided, we take the last used by connexion diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index a7baf59783d..19d0cabc07f 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -60,7 +60,6 @@ class DoliDBPgsql extends DoliDB * @param string $pass Mot de passe * @param string $name Nom de la database * @param int $port Port of database server - * @return int 1 if OK, 0 if not */ function __construct($type, $host, $user, $pass, $name='', $port=0) { @@ -389,7 +388,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 @@ -399,7 +398,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 @@ -669,7 +668,7 @@ class DoliDBPgsql extends DoliDB /** * Renvoie le code erreur generique de l'operation precedente. * - * @return error_num (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...) + * @return string Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...) */ function errno() { @@ -735,7 +734,7 @@ class DoliDBPgsql extends DoliDB /** * Renvoie le texte de l'erreur pgsql de l'operation precedente * - * @return error_text + * @return string Error text */ function error() { @@ -838,7 +837,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; diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index 53ecb880dce..b16114a773f 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -50,7 +50,6 @@ class DoliDBSqlite extends DoliDB * @param string $pass Mot de passe * @param string $name Nom de la database * @param int $port Port of database server - * @return int 1 if OK, 0 if not */ function __construct($type, $host, $user, $pass, $name='', $port=0) { @@ -536,7 +535,7 @@ class DoliDBSqlite extends DoliDB /** * Renvoie le code erreur generique de l'operation precedente. * - * @return string $error_num (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...) + * @return string Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...) */ function errno() { @@ -598,7 +597,7 @@ class DoliDBSqlite extends DoliDB /** * Renvoie le texte de l'erreur mysql de l'operation precedente. * - * @return string $error_text + * @return string Error text */ function error() { diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php index 72c36761386..7565aae8211 100644 --- a/htdocs/core/filemanagerdol/connectors/php/basexml.php +++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php @@ -47,6 +47,14 @@ function SetXmlHeaders() header('Content-Type: text/xml; charset=utf-8'); } +/** + * CreateXmlHeader + * + * @param string $command Command + * @param string $resourceType Resource type + * @param string $currentFolder Current folder + * @return void + */ function CreateXmlHeader( $command, $resourceType, $currentFolder ) { SetXmlHeaders(); @@ -63,6 +71,11 @@ function CreateXmlHeader( $command, $resourceType, $currentFolder ) $GLOBALS['HeaderSent'] = true ; } +/** + * CreateXmlFooter + * + * @return void + */ function CreateXmlFooter() { echo '' ; diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php index 6369ac9d3ae..3a0dc0378ea 100644 --- a/htdocs/core/filemanagerdol/connectors/php/commands.php +++ b/htdocs/core/filemanagerdol/connectors/php/commands.php @@ -53,6 +53,13 @@ function GetFolders( $resourceType, $currentFolder ) echo "" ; } +/** + * GetFoldersAndFiles + * + * @param string $resourceType Resource type + * @param string $currentFolder Current folder + * @return void + */ function GetFoldersAndFiles( $resourceType, $currentFolder ) { // Map the virtual path to the local server path. @@ -111,6 +118,13 @@ function GetFoldersAndFiles( $resourceType, $currentFolder ) echo '' ; } +/** + * Create folder + * + * @param string $resourceType Resource type + * @param string $currentFolder Current folder + * @return void + */ function CreateFolder( $resourceType, $currentFolder ) { if (!isset($_GET)) { diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php index 810f75601b6..23d4eb79d77 100644 --- a/htdocs/core/filemanagerdol/connectors/php/connector.php +++ b/htdocs/core/filemanagerdol/connectors/php/connector.php @@ -35,13 +35,18 @@ if ( !$Config['Enabled'] ) DoResponse(); +/** + * DoResponse + * + * @return void + */ function DoResponse() { if (!isset($_GET)) { global $_GET; } if ( !isset( $_GET['Command'] ) || !isset( $_GET['Type'] ) || !isset( $_GET['CurrentFolder'] ) ) - return ; + return; // Get the main request informaiton. $sCommand = $_GET['Command'] ; @@ -60,7 +65,7 @@ function DoResponse() if ( $sCommand == 'FileUpload' ) { FileUpload($sResourceType, $sCurrentFolder, $sCommand); - return ; + return; } CreateXmlHeader($sCommand, $sResourceType, $sCurrentFolder); @@ -70,16 +75,16 @@ function DoResponse() { case 'GetFolders' : GetFolders($sResourceType, $sCurrentFolder); - break ; + break; case 'GetFoldersAndFiles' : GetFoldersAndFiles($sResourceType, $sCurrentFolder); - break ; + break; case 'CreateFolder' : CreateFolder($sResourceType, $sCurrentFolder); - break ; + break; } CreateXmlFooter(); - exit ; + exit; } diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php index 4183b0e0573..966efd0f0af 100644 --- a/htdocs/core/filemanagerdol/connectors/php/io.php +++ b/htdocs/core/filemanagerdol/connectors/php/io.php @@ -115,11 +115,18 @@ function ServerMapFolder($resourceType, $folderPath, $sCommand) return CombinePaths($sResourceTypePath, $folderPath); } -function GetParentFolder( $folderPath ) +/** + * GetParentFolder + * + * @param string $folderPath Folder path + * @return string Parent folder + */ +function GetParentFolder($folderPath) { - $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ; - return preg_replace($sPattern, '', $folderPath); + $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ; + return preg_replace($sPattern, '', $folderPath); } + /** * CreateServerFolder * @@ -189,46 +196,57 @@ function CreateServerFolder($folderPath, $lastFolder = null) return '' ; } +/** + * Get Root Path + * + * @return string real path + */ function GetRootPath() { - if (!isset($_SERVER)) { - global $_SERVER; - } - $sRealPath = realpath('./'); - // #2124 ensure that no slash is at the end - $sRealPath = rtrim($sRealPath,"\\/"); + if (!isset($_SERVER)) { + global $_SERVER; + } + $sRealPath = realpath('./'); + // #2124 ensure that no slash is at the end + $sRealPath = rtrim($sRealPath,"\\/"); - $sSelfPath = $_SERVER['PHP_SELF'] ; - $sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/')); + $sSelfPath = $_SERVER['PHP_SELF'] ; + $sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/')); - $sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath); + $sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath); - $position = strpos($sRealPath, $sSelfPath); + $position = strpos($sRealPath, $sSelfPath); - // This can check only that this script isn't run from a virtual dir - // But it avoids the problems that arise if it isn't checked - if ( $position === false || $position <> strlen($sRealPath) - strlen($sSelfPath) ) - SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".'); + // This can check only that this script isn't run from a virtual dir + // But it avoids the problems that arise if it isn't checked + if ( $position === false || $position <> strlen($sRealPath) - strlen($sSelfPath) ) + SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".'); - return substr($sRealPath, 0, $position); + return substr($sRealPath, 0, $position); } // Emulate the asp Server.mapPath function. // given an url path return the physical directory that it corresponds to function Server_MapPath( $path ) { - // This function is available only for Apache - if (function_exists('apache_lookup_uri')) - { - $info = apache_lookup_uri($path); - return $info->filename . $info->path_info ; - } + // This function is available only for Apache + if (function_exists('apache_lookup_uri')) { + $info = apache_lookup_uri($path); + return $info->filename . $info->path_info ; + } - // This isn't correct but for the moment there's no other solution - // If this script is under a virtual directory or symlink it will detect the problem and stop - return GetRootPath() . $path ; + // This isn't correct but for the moment there's no other solution + // If this script is under a virtual directory or symlink it will detect the problem and stop + return GetRootPath() . $path ; } +/** + * Is Allowed Extension + * + * @param string $sExtension File extension + * @param string $resourceType ressource type + * @return boolean true or false + */ function IsAllowedExt($sExtension, $resourceType) { global $Config ; @@ -245,6 +263,12 @@ function IsAllowedExt($sExtension, $resourceType) return true ; } +/** + * Is Allowed Type + * + * @param string $resourceType ressource type + * @return boolean true or false + */ function IsAllowedType($resourceType) { global $Config ; @@ -257,8 +281,8 @@ function IsAllowedType($resourceType) /** * IsAllowedCommand * - * @param string $sCommand Command - * @return boolean True or false + * @param string $sCommand Command + * @return boolean True or false */ function IsAllowedCommand($sCommand) { diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php index cf329590aed..664ffbf2bdb 100644 --- a/htdocs/core/filemanagerdol/connectors/php/upload.php +++ b/htdocs/core/filemanagerdol/connectors/php/upload.php @@ -27,7 +27,14 @@ require 'util.php'; require 'io.php'; require 'commands.php'; -function SendError( $number, $text ) +/** + * SendError + * + * @param string $number Number + * @param string $text Text + * @return void + */ +function SendError($number, $text) { SendUploadResults($number, '', '', $text); } diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php index e7313c73aee..ea098ba10bb 100644 --- a/htdocs/core/lib/accounting.lib.php +++ b/htdocs/core/lib/accounting.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2013-2014 Alexandre Spangaro + * Copyright (C) 2013-2014 Alexandre Spangaro * Copyright (C) 2014 Florian Henry * * This program is free software; you can redistribute it and/or modify @@ -26,38 +26,39 @@ /** * Prepare array with list of admin tabs * + * @param Object $object Object instance we show card * @return array Array of tabs to show */ -function admin_accounting_prepare_head() +function admin_accounting_prepare_head($object=null) { global $langs, $conf; - + $h = 0; $head = array (); - + $head[$h][0] = dol_buildpath('/accountancy/admin/index.php', 1); $head[$h][1] = $langs->trans("Configuration"); $head[$h][2] = 'general'; $h ++; - + // Show more tabs from modules // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_admin'); - + $head[$h][0] = dol_buildpath('/accountancy/admin/journaux.php', 1); $head[$h][1] = $langs->trans("Journaux"); $head[$h][2] = 'journal'; $h ++; - + $head[$h][0] = dol_buildpath('/accountancy/admin/export.php', 1); $head[$h][1] = $langs->trans("Export"); $head[$h][2] = 'export'; $h ++; - + complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_admin', 'remove'); - + return $head; } @@ -70,23 +71,23 @@ function admin_accounting_prepare_head() function accounting_prepare_head($object) { global $langs, $conf; - + $h = 0; $head = array (); - + $head[$h][0] = dol_buildpath('/accountancy/admin/card.php', 1) . '?id=' . $object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'card'; $h ++; - + // Show more tabs from modules // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account'); - + complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account', 'remove'); - + return $head; } @@ -94,25 +95,25 @@ function accounting_prepare_head($object) * Return general accounting account with defined length * * @param string $account General accounting account - * @return string String with defined length + * @return string String with defined length */ function length_accountg($account) { global $conf; - + $g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT; - + if (! empty($g)) { // Clean parameters $i = strlen($account); - + if ($i >= 2) { while ( $i < $g ) { $account .= '0'; - + $i ++; } - + return $account; } else { return $account; @@ -126,25 +127,25 @@ function length_accountg($account) * Return auxiliary accounting account with defined length * * @param string $accounta Auxiliary accounting account - * @return string String with defined length + * @return string String with defined length */ function length_accounta($accounta) { global $conf, $langs; - + $a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT; - + if (! empty($a)) { // Clean parameters $i = strlen($accounta); - + if ($i >= 2) { while ( $i < $a ) { $accounta .= '0'; - + $i ++; } - + return $accounta; } else { return $accounta; @@ -160,8 +161,8 @@ function length_accounta($accounta) * @param string $txt Accounting account * @param int $len Length * @param int $end Number of characters - * - * @return string Formated string + * + * @return string Formated string */ function length_exportsage($txt, $len, $end) { @@ -169,11 +170,11 @@ function length_exportsage($txt, $len, $end) // problem with this function, but we need to have the number of letter if (strlen($txt) == $len) { $res = $txt; - } + } elseif (strlen($txt) > $len) { $res = substr($txt, 0, $len); - } + } else { if ($end == 1) { diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 075baf41161..a54cb5fcc79 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -516,11 +516,6 @@ function security_prepare_head() $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT."/admin/proxy.php"; - $head[$h][1] = $langs->trans("ExternalAccess"); - $head[$h][2] = 'proxy'; - $h++; - $head[$h][0] = DOL_URL_ROOT."/admin/security_other.php"; $head[$h][1] = $langs->trans("Miscellaneous"); $head[$h][2] = 'misc'; @@ -531,6 +526,16 @@ function security_prepare_head() $head[$h][2] = 'passwords'; $h++; + $head[$h][0] = DOL_URL_ROOT."/admin/security_file.php"; + $head[$h][1] = $langs->trans("Files"); + $head[$h][2] = 'file'; + $h++; + + $head[$h][0] = DOL_URL_ROOT."/admin/proxy.php"; + $head[$h][1] = $langs->trans("ExternalAccess"); + $head[$h][2] = 'proxy'; + $h++; + $head[$h][0] = DOL_URL_ROOT."/admin/events.php"; $head[$h][1] = $langs->trans("Audit"); $head[$h][2] = 'audit'; @@ -1193,7 +1198,7 @@ function showModulesExludedForExternal($modules) $text .= $langs->trans('Module'.$module->numero.'Name'); } } - return img_picto($langs->trans('InfoAdmin'), 'star').' '.$text; + return $text; } diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index 44e962de3ea..23a17534ccf 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -70,36 +70,13 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh { print ''; print ''; - //print $langs->trans("ActionsAskedBy"); - //print '  '; - //print $form->select_dolusers($filtera, 'userasked', 1, '', ! $canedit); - //print '   '.$langs->trans("or") . ' '; print $langs->trans("ActionsOwnedBy").'   '; print ''; - //print $langs->trans("User"); print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit); - if (! empty($conf->use_javascript_ajax)) - { - include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; - print ajax_combobox('usertodo'); - } - if (empty($conf->dol_optimize_smallscreen)) print '   '.$langs->trans("or") . ' '; - else print '
    '; - print $langs->trans("Group").'   '; + if (empty($conf->dol_optimize_smallscreen)) print '   '.$langs->trans("or") . ' '.$langs->trans("Group").'   '; print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit); - if (! empty($conf->use_javascript_ajax)) - { - print ajax_combobox('usergroup'); - } print ''; - /*print ''; - print ''; - print $langs->trans("or") . ' ' . $langs->trans("ActionsDoneBy"); - print '  '; - print $form->select_dolusers($filterd, 'userdone', 1, '', ! $canedit); - print '';*/ - include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php'; $formactions=new FormActions($db); @@ -147,16 +124,18 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh print ''; print ''.$langs->trans("WorkingTimeRange").''; print ""; - print ' - '; + print ''; + if (empty($conf->dol_use_jmobile)) print ' - '; print ''; - print ' '.$langs->trans("H"); + if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H"); print ''; // Filter on days print ''; print ''.$langs->trans("WorkingDaysRange").''; print ""; - print ' - '; + print ''; + if (empty($conf->dol_use_jmobile)) print ' - '; print ''; print ''; } @@ -170,7 +149,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh if (! empty($conf->browser->phone)) print ''; else print ''; - if (! empty($conf->browser->phone)) print '
    '; + if (! empty($conf->browser->phone)) print '
    '; else print ''; print ''; print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"p.lastname","",$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Poste"),$_SERVER["PHP_SELF"],"p.poste","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("PhonePro"),$_SERVER["PHP_SELF"],"p.phone","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mobile","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email","",$param,'',$sortfield,$sortorder); - if (! empty($conf->skype->enabled)) - { - $colspan++; - print ''; - } + print_liste_field_titre($langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email"),$_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$param,'',$sortfield,$sortorder); - // Copy to clipboard - print ""; // Add to agenda if (! empty($conf->agenda->enabled) && ! empty($user->rights->agenda->myactions->create)) { @@ -628,32 +618,24 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print ''; + // Name - Position print ''; - print ''; - print ''; + // Address / Phone + print ''; + // Email print ''; - print ''; - - print ''; - if (! empty($conf->skype->enabled)) - { - $colspan++; - print ''; - } - // Status print ''; - // Copy to clipboard - print ""; - // Add to agenda if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) { @@ -669,7 +651,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print ""; - $sql = "SELECT p.rowid, p.lastname, p.firstname, p.fk_pays as country_id, p.poste, p.phone, p.phone_mobile, p.fax, p.email, p.skype, p.statut "; + $sql = "SELECT p.rowid, p.lastname, p.firstname, p.fk_pays as country_id, p.poste, p.phone, p.phone_mobile, p.phone_perso, p.fax, p.email, p.skype, p.statut "; $sql .= ", p.civility as civility_id, p.address, p.zip, p.town"; $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p"; $sql .= " WHERE p.fk_soc = ".$object->id; @@ -681,7 +663,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') $result = $db->query($sql); $num = $db->num_rows($result); - $var=false; + $var=true; if ($num) { $i=0; @@ -699,74 +681,50 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') $contactstatic->firstname = $obj->firstname; $contactstatic->civility_id = $obj->civility_id; print $contactstatic->getNomUrl(1,'',0,'&backtopage='.urlencode($backtopage)); + print ''; - print ''; - $country_code = getCountry($obj->country_id, 'all'); - // Lien click to dial + // Address and phone print ''; - print ''; - print ''; - print ''; + $outdone=0; + $contactstatic->address = $obj->address; + $contactstatic->zip = $obj->zip; + $contactstatic->town = $obj->town; + $contactstatic->country_id = $obj->country_id; + $coords = $contactstatic->getFullAddress(1,', '); + if (! empty($conf->use_javascript_ajax)) + { + $namecoords = $contactstatic->getFullName($langs,1).'
    '.$coords; + // hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile + print ''; + print img_picto($langs->trans("Address"), 'object_address.png'); + print ' '; + } + if ($coords) { print dol_print_address($coords,'address_contact_'.$obj->rowid, 'contact', $obj->rowid); $outdone++; } + if ($obj->phone || $obj->phone_mobile || $obj->phone_perso) print ($outdone?'
    ':''); + if ($obj->phone) { print dol_print_phone($obj->phone,$country_code['code'],$obj->rowid,$object->id,'AC_TEL',' ','phone'); $outdone++; } + if ($obj->phone_mobile) { print dol_print_phone($obj->phone_mobile,$country_code['code'],$obj->rowid,$object->id,'AC_TEL',' ','phone'); $outdone++; } + if ($obj->phone_perso) { print dol_print_phone($obj->phone_perso,$country_code['code'],$obj->rowid,$object->id,'AC_TEL',' ','phone'); $outdone++; } + if ($obj->fax) { print dol_print_phone($obj->fax,$country_code['code'],$obj->rowid,$object->id,'AC_FAX',' ','fax'); $outdone++; } + print '
    '; + $outdone=0; + if ($obj->email) print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL',0,0,1); if (! empty($conf->skype->enabled)) { - print ''; + if ($obj->skype) print ($outdone?'
    ':'').dol_print_skype($obj->skype,$obj->rowid,$object->id,'AC_SKYPE'); } + print ''; // Status print ''; - print ''; - // Add to agenda if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) { print ''; @@ -788,7 +746,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') } else { - print ""; + print ""; print ''; print "\n"; } diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 4b9401498d7..d2c6ce4bd4f 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -169,7 +169,7 @@ function convertTime2Seconds($iHours=0,$iMinutes=0,$iSeconds=0) * @param string $format Output format (all: total delay days hour:min like "2 days 12:30"", allhourmin: total delay hours:min like "60:30", allhour: total delay hours without min/sec like "60:30", fullhour: total delay hour decimal like "60.5" for 60:30, hour: only hours part "12", min: only minutes part "30", sec: only seconds part, month: only month part, year: only year part); * @param int $lengthOfDay Length of day (default 86400 seconds for 1 day, 28800 for 8 hour) * @param int $lengthOfWeek Length of week (default 7) - * @return sTime Formated text of duration + * @return string Formated text of duration * Example: 0 return 00:00, 3600 return 1:00, 86400 return 1d, 90000 return 1 Day 01:00 */ function convertSecondToTime($iSecond, $format='all', $lengthOfDay=86400, $lengthOfWeek=7) diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php index 2f12976e49f..34294f502e8 100644 --- a/htdocs/core/lib/ecm.lib.php +++ b/htdocs/core/lib/ecm.lib.php @@ -31,19 +31,23 @@ */ function ecm_prepare_dasboard_head($object) { - global $langs, $conf, $user; + global $langs, $conf, $user, $form; + global $helptext1, $helptext2; + $h = 0; $head = array(); + $helptext =$langs->trans("ECMAreaDesc").'
    '; + $helptext.=$langs->trans("ECMAreaDesc2"); $head[$h][0] = DOL_URL_ROOT.'/ecm/index.php'; - $head[$h][1] = $langs->trans("ECMSectionsManual").img_help(1,$helptext1); + $head[$h][1] = $langs->trans("ECMSectionsManual").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3); $head[$h][2] = 'index'; $h++; if (! empty($conf->global->ECM_AUTO_TREE_ENABLED)) { $head[$h][0] = DOL_URL_ROOT.'/ecm/index_auto.php'; - $head[$h][1] = $langs->trans("ECMSectionsAuto").img_help(1,$helptext2); + $head[$h][1] = $langs->trans("ECMSectionsAuto").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3); $head[$h][2] = 'index_auto'; $h++; } diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php index c1e37f3c485..e4e7b04b057 100644 --- a/htdocs/core/lib/fourn.lib.php +++ b/htdocs/core/lib/fourn.lib.php @@ -160,10 +160,9 @@ function ordersupplier_prepare_head($object) /** * Return array head with list of tabs to view object informations. * - * @param Object $object order * @return array head array with tabs */ -function supplierorder_admin_prepare_head($object) +function supplierorder_admin_prepare_head() { global $langs, $conf, $user; @@ -180,7 +179,7 @@ function supplierorder_admin_prepare_head($object) $head[$h][2] = 'invoice'; $h++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'supplierorder_admin'); + complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin'); $head[$h][0] = DOL_URL_ROOT.'/admin/supplierorder_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFieldsSupplierOrders"); @@ -192,7 +191,7 @@ function supplierorder_admin_prepare_head($object) $head[$h][2] = 'supplierinvoice'; $h++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'supplierorder_admin','remove'); + complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin','remove'); return $head; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 09c38435c0a..d83d1e8b1a5 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -659,7 +659,7 @@ function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto */ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='', $pictoisfullpath=0) { - global $conf; + global $conf,$langs; $out="\n".'
    '."\n"; @@ -684,35 +684,82 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p } // Show tabs + $bactive=false; + // if =0 we don't use the feature + $limittoshow=($conf->global->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; + } + + if ($displaytab > $limittoshow) + { + $out.='
    '; + $out.=''.$langs->trans("More").'...'; + $out.='
    '.$outmore.'
    '; + $out.="
    \n"; + + $out.=""; } $out.="
    \n"; @@ -766,11 +813,12 @@ function dol_bc($var,$moreclass='') * @param Object $object A company or contact object * @param int $withcountry 1=Add country into address string * @param string $sep Separator to use to build string + * @param Tranlsate $outputlangs Object lang that contains language for text translation. * @return string Formated string */ -function dol_format_address($object,$withcountry=0,$sep="\n") +function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='') { - global $conf; + global $conf,$langs; $ret=''; $countriesusingstate=array('AU','US','IN','GB','ES','UK','TR'); @@ -799,7 +847,7 @@ function dol_format_address($object,$withcountry=0,$sep="\n") else if (in_array($object->country_code,array('ES','TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country { $ret .= ($ret ? $sep : '' ).$object->zip; - $ret .= ' '.$object->town; + $ret .= ($object->town?' '.$object->town:''); if ($object->state && in_array($object->country_code,$countriesusingstate)) { $ret.="\n".$object->state; @@ -809,14 +857,14 @@ function dol_format_address($object,$withcountry=0,$sep="\n") else // Other: title firstname name \n address lines \n zip town \n country { $ret .= ($ret ? $sep : '' ).$object->zip; - $ret .= ' '.$object->town; + $ret .= ($object->town?' '.$object->town:''); if ($object->state && in_array($object->country_code,$countriesusingstate)) { $ret.=", ".$object->state; } } - - if ($withcountry) $ret.=($object->country?$sep.$object->country:''); + if (! is_object($outputlangs)) $outputlangs=$langs; + if ($withcountry) $ret.=($object->country_code?($ret?$sep:'').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)):''); return $ret; } @@ -1027,6 +1075,8 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e */ function dol_getdate($timestamp,$fast=false) { + global $conf; + $usealternatemethod=false; if ($timestamp <= 0) $usealternatemethod=true; // <= 1970 if ($timestamp >= 2145913200) $usealternatemethod=true; // >= 2038 @@ -1038,6 +1088,19 @@ function dol_getdate($timestamp,$fast=false) else { $arrayinfo=getdate($timestamp); + + $startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1; + if($startday==1) + { + if ($arrayinfo["wday"]==0) + { + $arrayinfo["wday"]=6; + } + else + { + $arrayinfo["wday"]=$arrayinfo["wday"]-1; + } + } } return $arrayinfo; @@ -1100,7 +1163,11 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) $default_timezone=@date_default_timezone_get(); } } - else $localtz = new DateTimeZone('UTC'); + + if (empty($localtz)) { + $localtz = new DateTimeZone('UTC'); + } + $dt = new DateTime(null,$localtz); $dt->setDate($year,$month,$day); $dt->setTime((int) $hour, (int) $minute, (int) $second); @@ -1231,9 +1298,10 @@ function dol_print_url($url,$target='_blank',$max=32) * @param int $addlink 0=no link, 1=email has a html email link (+ link to create action if constant AGENDA_ADDACTIONFOREMAIL is on) * @param int $max Max number of characters to show * @param int $showinvalid Show warning if syntax email is wrong + * @param int $withpicto Show picto * @return string HTML Link */ -function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=1) +function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=1,$withpicto=0) { global $conf,$user,$langs; @@ -1259,7 +1327,7 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid= { $type='AC_EMAIL'; $link=''; if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link=''.img_object($langs->trans("AddAction"),"calendar").''; - $newemail='
    '; @@ -446,7 +425,7 @@ function actions_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id; $head[$h][1] = $langs->trans("Documents"); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if ($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'documents'; $h++; diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index f21d7d2ff02..96c7bc8d05a 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -320,74 +320,71 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0) { global $conf; - if (! empty($conf->browser->phone)) return ''; // combobox disabled for smartphones (does not works) + //if (! empty($conf->browser->phone)) return ''; // combobox disabled for smartphones (does not works) + //if (! empty($conf->dol_use_jmobile)) return ''; // select2 works with jmobile if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return ''; - - /* Some properties for combobox: - minLengthToAutocomplete: 2, - comboboxContainerClass: "comboboxContainer", - comboboxValueContainerClass: "comboboxValueContainer", - comboboxValueContentClass: "comboboxValueContent", - comboboxDropDownClass: "comboboxDropDownContainer", - comboboxDropDownButtonClass: "comboboxDropDownButton", - comboboxDropDownItemClass: "comboboxItem", - comboboxDropDownItemHoverClass: "comboboxItemHover", - comboboxDropDownGroupItemHeaderClass: "comboboxGroupItemHeader", - comboboxDropDownGroupItemContainerClass: "comboboxGroupItemContainer", - animationType: "slide", - width: "500px" */ - + if (empty($conf->use_javascript_ajax)) return ''; + + if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0; + $msg = '\n"; return $msg; diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php index bc0422a5fb4..243b862ff88 100644 --- a/htdocs/core/lib/barcode.lib.php +++ b/htdocs/core/lib/barcode.lib.php @@ -52,7 +52,6 @@ if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path t if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND'); else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION; -//dol_syslog("genbarcode_loc=".$genbarcode_loc." - env_windows=".$_SERVER['WINDIR']); diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 964dcfbb0c6..0504727b61e 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -217,10 +217,9 @@ function societe_prepare_head2($object) /** * Return array head with list of tabs to view object informations. * - * @param Object $object Thirdparty * @return array head array with tabs */ -function societe_admin_prepare_head($object) +function societe_admin_prepare_head() { global $langs, $conf, $user; @@ -236,7 +235,7 @@ function societe_admin_prepare_head($object) // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf,$langs,$object,$head,$h,'company_admin'); + complete_head_from_modules($conf,$langs,null,$head,$h,'company_admin'); $head[$h][0] = DOL_URL_ROOT.'/societe/admin/societe_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFieldsThirdParties"); @@ -248,7 +247,7 @@ function societe_admin_prepare_head($object) $head[$h][2] = 'attributes_contacts'; $h++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'company_admin','remove'); + complete_head_from_modules($conf,$langs,null,$head,$h,'company_admin','remove'); return $head; } @@ -562,6 +561,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') $search_status = GETPOST("search_status",'int'); if ($search_status=='') $search_status=1; // always display activ customer first $search_name = GETPOST("search_name",'alpha'); + $search_addressphone = GETPOST("search_addressphone",'alpha'); if (! $sortorder) $sortorder="ASC"; if (! $sortfield) $sortfield="p.lastname"; @@ -604,18 +604,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print '
    '.$langs->trans("Skype").' 
    '; print ''; print '  '; + //print ''; + print '    '; - print $form->selectarray('search_status', array('-1'=>'','0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status); + print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0,1),'1'=>$contactstatic->LibStatut(1,1)),$search_status); print ' 
    '; + if ($obj->poste) print $obj->poste; print ''.$obj->poste.''; - print dol_print_phone($obj->phone,$country_code['code'],$obj->rowid,$object->id,'AC_TEL'); - print ''; - print dol_print_phone($obj->phone_mobile,$country_code['code'],$obj->rowid,$object->id,'AC_TEL'); - print ''; - print dol_print_phone($obj->fax,$country_code['code'],$obj->rowid,$object->id,'AC_FAX'); - print ''; - print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL'); - print ''; - print dol_print_skype($obj->skype,$obj->rowid,$object->id,'AC_SKYPE'); - print ''.$contactstatic->getLibStatut(5).''; - if (! empty($conf->use_javascript_ajax)) - { - // Copy to clipboard - $coords = ''; - if (!empty($object->name)) $coords .= $object->name."
    "; - $coords .= $contactstatic->getFullName($langs,1).' '; - $coords .= "
    "; - if (!empty($obj->address)) - { - $coords .= dol_nl2br($obj->address,1,true)."
    "; - if (!empty($obj->zip)) $coords .= $obj->zip.' '; - if (!empty($obj->town)) $coords .= $obj->town; - if (!empty($obj->country_id)) $coords .= "
    ".$country_code['label']; - } - else if (!empty($object->address)) - { - $coords .= dol_nl2br($object->address,1,true)."
    "; - if (!empty($object->zip)) $coords .= $object->zip.' '; - if (!empty($object->town)) $coords .= $object->town; - if (!empty($object->country_id)) $coords .= "
    ".$country_code['label']; - } - // hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile - print ''; - print img_picto($langs->trans("Address"), 'object_address.png'); - print ''; - } - print '    		'; - if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) - { - print ''; - print img_object($langs->trans("Rendez-Vous"),"action_rdv"); - print ' '; - } print ''; print img_object($langs->trans("Event"),"action"); print '
    '.$langs->trans("None").'
    '.$newemail.'  '.$link.'
    '; + if ($link) $newemail='
    '.$newemail.' '.$link.'
    '; } } else @@ -1270,18 +1338,18 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid= $newemail.=img_warning($langs->trans("ErrorBadEMail",$email)); } } - return $newemail; + return '
    '.($withpicto?img_picto($langs->trans("EMail"), 'object_email.png').' ':'').$newemail.'
    '; } /** * Show Skype link * * @param string $skype Skype to show (only skype, without 'Name of recipient' before) - * @param int $cid Id of contact if known - * @param int $socid Id of third party if known - * @param int $addlink 0=no link to create action - * @param int $max Max number of characters to show - * @return string HTML Link + * @param int $cid Id of contact if known + * @param int $socid Id of third party if known + * @param int $addlink 0=no link to create action + * @param int $max Max number of characters to show + * @return string HTML Link */ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64) { @@ -1296,18 +1364,18 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64) $newskype=''; - $newskype.=' '; - $newskype.=' '; + $newskype.='    '; - $newskype.=' '; + $newskype.=''; $newskype.=''; if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) { $type='AC_SKYPE'; $link=''; if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link=''.img_object($langs->trans("AddAction"),"calendar").''; - $newskype='
    '.$newskype.'  '.$link.'
    '; + $newskype='
    '.$newskype.($link?' '.$link:'').'
    '; } } else @@ -1327,9 +1395,10 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64) * @param int $socid Id of third party if known * @param int $addlink ''=no link to create action, 'AC_TEL'=add link to clicktodial (if module enabled) and add link to create event (if conf->global->AGENDA_ADDACTIONFORPHONE set) * @param string $separ Separation between numbers for a better visibility example : xx.xx.xx.xx.xx + * @param string $withpicto Show picto * @return string Formated phone number */ -function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ=" ") +function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ=" ",$withpicto='') { global $conf,$user,$langs,$mysoc; @@ -1405,11 +1474,11 @@ function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ=" $type='AC_TEL'; $link=''; if ($addlink == 'AC_FAX') $type='AC_FAX'; if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link=''.img_object($langs->trans("AddAction"),"calendar").''; - if ($link) $newphone='
    '.$newphone.'  '.$link.'
    '; + if ($link) $newphone='
    '.$newphone.' '.$link.'
    '; } } - return $newphone; + return '
    '.($withpicto?img_picto(($withpicto=='fax'?$langs->trans("Fax"):$langs->trans("Phone")), 'object_'.($withpicto=='fax'?'phoning_fax':'phoning').'.png').' ':'').$newphone.'
    '; } /** @@ -1762,14 +1831,18 @@ 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; + if (empty($stringencoding)) $stringencoding='UTF-8'; + if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string; + // reduce for small screen + if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3); // We go always here if ($trunc == 'right') { @@ -2585,10 +2658,11 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m } /** - * Show a title (deprecated. use print_fiche_titre instead) + * Show a title. * * @param string $title Title to show * @return string Title to show + * @deprecated Use print_fiche_titre instead */ function print_titre($title) { @@ -2877,7 +2951,7 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou { if ($currency_code == 'auto') $currency_code=$conf->currency; - $listofcurrenciesbefore=array('USD'); + $listofcurrenciesbefore=array('USD','GBP','AUD'); if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code); else { @@ -2901,7 +2975,7 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou * 'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT) * 'MS'=Round to Max Shown (MAIN_MAX_DECIMALS_SHOWN) * @param int $alreadysqlnb Put 1 if you know that content is already universal format number - * @return string Amount with universal numeric format (Example: '99.99999') + * @return string Amount with universal numeric format (Example: '99.99999') or unchanged text if conversion fails. * * @see price Opposite function of price2num */ @@ -3575,7 +3649,7 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id * Return yes or no in current language * * @param string $yesno Value to test (1, 'yes', 'true' or 0, 'no', 'false') - * @param string $case 1=Yes/No, 0=yes/no + * @param string $case 1=Yes/No, 0=yes/no, 2=Disabled checkbox, 3=Disabled checkbox + Yes/No * @param int $color 0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color. * @return string HTML string */ @@ -3585,12 +3659,20 @@ function yn($yesno, $case=1, $color=0) $result='unknown'; if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') // A mettre avant test sur no a cause du == 0 { - $result=($case?$langs->trans("Yes"):$langs->trans("yes")); + $result=$langs->trans('yes'); + if ($case == 1 || $case == 3) $result=$langs->trans("Yes"); + if ($case == 2) $result=''; + if ($case == 3) $result=' '.$result; + $classname='ok'; } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') { - $result=($case?$langs->trans("No"):$langs->trans("no")); + $result=$langs->trans("no"); + if ($case == 1 || $case == 3) $result=$langs->trans("No"); + if ($case == 2) $result=''; + if ($case == 3) $result=' '.$result; + if ($color == 2) $classname='ok'; else $classname='error'; } @@ -3837,13 +3919,14 @@ function dol_html_entity_decode($a,$b,$c='UTF-8') /** * Replace htmlentities functions to manage errors * http://php.net/manual/en/function.htmlentities.php + * TODO Remove this function to replace it with direct htmlentities. * * @param string $string The input string. * @param int $flags Flags(see PHP doc above) * @param string $encoding Encoding * @param bool $double_encode When double_encode is turned off PHP will not encode existing html entities * @return string $ret Encoded string - * @deprecated Since PHP4 support is no longer available, this function does not make sense + * @deprecated Since PHP4 support is no longer available, this function does not make sense. */ function dol_htmlentities($string, $flags=null, $encoding='UTF-8', $double_encode=false) { @@ -3998,10 +4081,7 @@ function dol_concatdesc($text1,$text2,$forxml=false) } /** - * Make substition into a string - * There is two type of substitions: - * - From $substitutionarray (oldval=>newval) - * - From special constants (__XXX__=>f(objet->xxx)) by substitutions modules + * Make substition into a string replacing key with vals from $substitutionarray (oldval=>newval) * * @param string $chaine Source string in which we must do substitution * @param array $substitutionarray Array with key->val to substitute @@ -4609,26 +4689,26 @@ function picto_from_langcode($codelang) * Complete or removed entries into a head array (used to build tabs) with value added by external modules. * Such values are declared into $conf->modules_parts['tab']. * - * @param Conf $conf Object conf - * @param Translate $langs Object langs - * @param Object $object Object object - * @param array $head Object head - * @param int $h New position to fill - * @param string $type Value for object where objectvalue can be - * 'thirdparty' to add a tab in third party view - * 'intervention' to add a tab in intervention view - * 'supplier_order' to add a tab in supplier order view - * 'supplier_invoice' to add a tab in supplier invoice view - * 'invoice' to add a tab in customer invoice view - * 'order' to add a tab in customer order view - * 'product' to add a tab in product view - * 'propal' to add a tab in propal view - * 'user' to add a tab in user view - * 'group' to add a tab in group view - * 'member' to add a tab in fundation member view - * 'categories_x' to add a tab in category view ('x': type of category (0=product, 1=supplier, 2=customer, 3=member) - * 'ecm' to add a tab for another ecm view - * @param string $mode 'add' to complete head, 'remove' to remove entries + * @param Conf $conf Object conf + * @param Translate $langs Object langs + * @param Object|null $object Object object + * @param array $head Object head + * @param int $h New position to fill + * @param string $type Value for object where objectvalue can be + * 'thirdparty' to add a tab in third party view + * 'intervention' to add a tab in intervention view + * 'supplier_order' to add a tab in supplier order view + * 'supplier_invoice' to add a tab in supplier invoice view + * 'invoice' to add a tab in customer invoice view + * 'order' to add a tab in customer order view + * 'product' to add a tab in product view + * 'propal' to add a tab in propal view + * 'user' to add a tab in user view + * 'group' to add a tab in group view + * 'member' to add a tab in fundation member view + * 'categories_x' to add a tab in category view ('x': type of category (0=product, 1=supplier, 2=customer, 3=member) + * 'ecm' to add a tab for another ecm view + * @param string $mode 'add' to complete head, 'remove' to remove entries * @return void */ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode='add') @@ -4817,19 +4897,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..7517fac7d20 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -573,7 +573,7 @@ function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdopti /** * Return last or next value for a mask (according to area we should not reset) * - * @param DoliDB $db Database handler + * @param DoliDB $db Database handler * @param string $mask Mask to use * @param string $table Table containing field with counter * @param string $field Field containing already used values of counter @@ -581,8 +581,8 @@ function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdopti * @param Societe $objsoc The company that own the object we need a counter for * @param string $date Date to use for the {y},{m},{d} tags. * @param string $mode 'next' for next value or 'last' for last value - * @param bool $bentityon activate the entity filterdefault is true (for modules not compatible with multicompany) - * @return string New value (numeric) or error message + * @param bool $bentityon Activate the entity filter. Default is true (for modules not compatible with multicompany) + * @return string New value (numeric) or error message */ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$mode='next', $bentityon=true) { @@ -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; @@ -1836,3 +1837,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/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index b26326ae5e7..ac9da88bdc2 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -106,10 +106,9 @@ function facture_prepare_head($object) /** * Return array head with list of tabs to view object informations. * - * @param Object $object Invoice * @return array head array with tabs */ -function invoice_admin_prepare_head($object) +function invoice_admin_prepare_head() { global $langs, $conf, $user; @@ -125,7 +124,7 @@ function invoice_admin_prepare_head($object) // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice_admin'); + complete_head_from_modules($conf,$langs,null,$head,$h,'invoice_admin'); $head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facture_cust_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFieldsCustomerInvoices"); @@ -137,7 +136,7 @@ function invoice_admin_prepare_head($object) $head[$h][2] = 'attributeslines'; $h++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice_admin','remove'); + complete_head_from_modules($conf,$langs,null,$head,$h,'invoice_admin','remove'); return $head; } diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php index caee12ed135..d5a362663b7 100644 --- a/htdocs/core/lib/ldap.lib.php +++ b/htdocs/core/lib/ldap.lib.php @@ -117,7 +117,7 @@ function show_ldap_test_button($butlabel,$testlabel,$key,$dn,$objectclass) /** * Show a LDAP array into an HTML output array. * - * @param string $result Array to show. This array is already encoded into charset_output + * @param array $result Array to show. This array is already encoded into charset_output * @param int $level Level * @param int $count Count * @param string $var Var diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php index ba3e8344f47..abdf1b648a5 100644 --- a/htdocs/core/lib/order.lib.php +++ b/htdocs/core/lib/order.lib.php @@ -116,10 +116,9 @@ function commande_prepare_head($object) /** * Return array head with list of tabs to view object informations. * - * @param Object $object order - * @return array head array with tabs + * @return array head array with tabs */ -function order_admin_prepare_head($object) +function order_admin_prepare_head() { global $langs, $conf, $user; @@ -131,7 +130,7 @@ function order_admin_prepare_head($object) $head[$h][2] = 'general'; $h++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'order_admin'); + complete_head_from_modules($conf,$langs,null,$head,$h,'order_admin'); $head[$h][0] = DOL_URL_ROOT.'/admin/order_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFields"); @@ -143,7 +142,7 @@ function order_admin_prepare_head($object) $head[$h][2] = 'attributeslines'; $h++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'order_admin','remove'); + complete_head_from_modules($conf,$langs,null,$head,$h,'order_admin','remove'); return $head; } diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 5000e00b345..129d32fc7d9 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -312,7 +312,10 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target if ($mode == 'source') { - $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany))."\n"; + $withCountry = 0; + if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1; + + $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n"; if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS)) { @@ -489,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 */ @@ -510,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; @@ -526,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) @@ -609,7 +595,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default } $curx=$savcurx; - $cury+=10; + $cury+=9; } else { @@ -626,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)) @@ -644,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); } @@ -758,7 +761,9 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass // Capital if ($fromcompany->capital) { - $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($fromcompany->capital, 0, $outputlangs, 0, 0, 0, $conf->currency)); + $tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string + if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency)); + else $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs); } // Prof Id 1 if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2)) @@ -1268,7 +1273,7 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0) * * @param Object $object Object * @param int $i Current line number - * @param Tranlate $outputlangs Object langs for output + * @param Translate $outputlangs Object langs for output * @param int $hidedetails Hide value (0 = no, 1 = yes, 2 = just special lines) * @return void */ diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index b126df7bdc3..741dd98de6d 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -147,10 +147,9 @@ function product_prepare_head($object, $user) /** * Return array head with list of tabs to view object informations. * -* @param Object $object Product * @return array head array with tabs */ -function product_admin_prepare_head($object=null) +function product_admin_prepare_head() { global $langs, $conf, $user; @@ -166,14 +165,14 @@ function product_admin_prepare_head($object=null) // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname); to remove a tab - complete_head_from_modules($conf,$langs,$object,$head,$h,'product_admin'); + complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin'); $head[$h][0] = DOL_URL_ROOT.'/product/admin/product_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFields"); $head[$h][2] = 'attributes'; $h++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'product_admin','remove'); + complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin','remove'); return $head; } @@ -316,6 +315,7 @@ function measuring_units_string($unit,$measuring_style='') { global $langs; + $measuring_units=array(); if ($measuring_style == 'weight') { $measuring_units[3] = $langs->trans("WeightUnitton"); diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index b384ccceabe..a2c6cca18eb 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -357,7 +357,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t print ''; // Planned Workload (in working hours) - print ''; + print ''; $fullhour=convertSecondToTime($lines[$i]->planned_workload,'allhourmin'); $workingdelay=convertSecondToTime($lines[$i]->planned_workload,'all',86400,7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks if ($lines[$i]->planned_workload) @@ -384,10 +384,13 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t else print ''; print ''; - // Progress calculated - // Note: ->duration is in fact time spent i think + // Progress calculated (Note: ->duration is time spent) print ''; - if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %'; + if ($lines[$i]->planned_workload || $lines[$i]->duration) + { + if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %'; + else print $langs->trans('WorkloadNotDefined'); + } print ''; // Tick to drag and drop @@ -422,7 +425,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t print ''; print ''; print ''; - print ''; + print ''; print convertSecondToTime($total_projectlinesa_planned, 'allhourmin'); print ''; print ''; @@ -430,7 +433,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t print convertSecondToTime($total_projectlinesa_spent, 'allhourmin'); print ''; print ''; - if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent_if_planned / $total_projectlinesa_planned,2).' %'; + if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %'; print ''; if ($addordertick) print ''; print ''; @@ -562,13 +565,16 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr $disabledtask=1; } - print ''; - $s =$form->select_date('',$lines[$i]->id,'','','',"addtime",1,0,1,$disabledtask); + // Form to add new time + print ''; + $s=''; + $s.=$form->select_date('',$lines[$i]->id,0,0,2,"addtime",1,0,1,$disabledtask); $s.='   '; - $s.=$form->select_duration($lines[$i]->id,'',$disabledtask,'text'); + $s.=$form->select_duration($lines[$i]->id,'',$disabledtask,'text',0,1); $s.=' '; print $s; print ''; + print ''; if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject")); else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou")); diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php index 8a96b86c967..fd227d512b7 100644 --- a/htdocs/core/lib/propal.lib.php +++ b/htdocs/core/lib/propal.lib.php @@ -110,10 +110,9 @@ function propal_prepare_head($object) /** * Return array head with list of tabs to view object informations. * - * @param Object $object Propal * @return array head array with tabs */ -function propal_admin_prepare_head($object) +function propal_admin_prepare_head() { global $langs, $conf, $user; @@ -129,7 +128,7 @@ function propal_admin_prepare_head($object) // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf,$langs,$object,$head,$h,'propal_admin'); + complete_head_from_modules($conf,$langs,null,$head,$h,'propal_admin'); $head[$h][0] = DOL_URL_ROOT.'/comm/admin/propal_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFields"); @@ -141,7 +140,7 @@ function propal_admin_prepare_head($object) $head[$h][2] = 'attributeslines'; $h++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'propal_admin','remove'); + complete_head_from_modules($conf,$langs,null,$head,$h,'propal_admin','remove'); return $head; } diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php index 9c701441765..e6fbd7e59bc 100644 --- a/htdocs/core/lib/report.lib.php +++ b/htdocs/core/lib/report.lib.php @@ -26,15 +26,15 @@ /** * Show header of a VAT report * -* @param string $nom Name of report -* @param string $variante Link for alternate report -* @param string $period Period of report -* @param string $periodlink Link to switch period -* @param string $description Description -* @param date $builddate Date generation -* @param string $exportlink Link for export or '' -* @param array $moreparam Array with list of params to add into form -* @param string $calcmode Calculation mode +* @param string $nom Name of report +* @param string $variante Link for alternate report +* @param string $period Period of report +* @param string $periodlink Link to switch period +* @param string $description Description +* @param timestamp|integer $builddate Date generation +* @param string $exportlink Link for export or '' +* @param array $moreparam Array with list of params to add into form +* @param string $calcmode Calculation mode * @return void */ function report_header($nom,$variante,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='') @@ -79,7 +79,7 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat print ''; print ''; } - + // Ligne de la periode d'analyse du rapport print ''; print ''.$langs->trans("ReportPeriod").''; diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 630d2ae5b13..41b7996cbfd 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -126,7 +126,12 @@ function user_prepare_head($object) return $head; } - +/** + * Prepare array with list of tabs + * + * @param Group $object Object group + * @return array Array of tabs + */ function group_prepare_head($object) { global $langs, $conf, $user; @@ -242,9 +247,9 @@ function entity_prepare_head($object, $aEntities) /** * Show list of themes. Show all thumbs of themes * - * @param User $fuser User concerned or '' for global theme - * @param int $edit 1 to add edit form - * @param boolean $foruserprofile Show for user profile view + * @param User|null $fuser User concerned or null for global theme + * @param int $edit 1 to add edit form + * @param boolean $foruserprofile Show for user profile view * @return void */ function show_theme($fuser,$edit=0,$foruserprofile=false) @@ -265,7 +270,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) $selected_theme=''; if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME; - else $selected_theme=empty($fuser->conf->MAIN_THEME)?'':$fuser->conf->MAIN_THEME; + else $selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:''); $colspan=2; if ($foruserprofile) $colspan=4; diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php index d1555678313..8e5a8b13ea9 100644 --- a/htdocs/core/login/functions_dolibarr.php +++ b/htdocs/core/login/functions_dolibarr.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2007-2014 Laurent Destailleur * Copyright (C) 2007-2009 Regis Houssin * Copyright (C) 2010-2011 Juanjo Menent * @@ -20,7 +20,7 @@ /** * \file htdocs/core/login/functions_dolibarr.php * \ingroup core - * \brief Authentication functions for Dolibarr mode + * \brief Authentication functions for Dolibarr mode (check user on login or email and check pass) */ @@ -50,13 +50,15 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= { // If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko $table = MAIN_DB_PREFIX."user"; - $usernamecol = 'login'; + $usernamecol1 = 'login'; + $usernamecol2 = 'email'; $entitycol = 'entity'; - $sql ='SELECT rowid, entity, pass, pass_crypted'; + $sql ='SELECT rowid, login, entity, pass, pass_crypted'; $sql.=' FROM '.$table; - $sql.=' WHERE '.$usernamecol." = '".$db->escape($usertotest)."'"; - $sql.=' AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")"; + $sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'"; + if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'"; + $sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")"; dol_syslog("functions_dolibarr::check_user_password_dolibarr", LOG_DEBUG); $resql=$db->query($sql); @@ -106,7 +108,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= // Password ok ? if ($passok) { - $login=$usertotest; + $login=$obj->login; } else { diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index d640519594e..b5818362591 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -27,7 +27,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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 7, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 8, __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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/security_other.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 8, __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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 9, __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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 107__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/pdf.php?leftmenu=setup', 'PDF', 1, 'admin', '', '', 2, 10, __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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 11, __ENTITY__); @@ -187,27 +187,30 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__); -- Ventilation (accounting) -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->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'ventil', 6__+MAX_llx_menu__, '/compta/ventilation/index.php?leftmenu=ventil', 'Ventilation', 0, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 8, __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->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/list.php', 'ToDispatch', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/lignes.php', 'Dispatched', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/param/', 'Setup', 1, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2404__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2405__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/card.php?action=create', 'New', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2406__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2407__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2408__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__); --- Fiscal year -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->accounting->enabled"', __HANDLER__, 'left', 114__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'admin', '', '', 2, 5, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'ventil_customer', 6__+MAX_llx_menu__, '/accountancy/customer/index.php?leftmenu=ventil_customer', 'CustomersVentilation', 0, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 8, __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->accounting->enabled && $leftmenu=="ventil_customer"', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/accountancy/customer/list.php', 'ToDispatch', 1, 'accountancy', '$user->rights->accounting->ventilation->dispatch', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ventil_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/accountancy/customer/lines.php', 'Dispatched', 1, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 1, __ENTITY__); + +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 2410__+MAX_llx_menu__, 'accountancy', 'ventil_supplier', 6__+MAX_llx_menu__, '/accountancy/supplier/index.php?leftmenu=ventil_supplier', 'SuppliersVentilation', 0, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 9, __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->accounting->enabled && $conf->fournisseur->enabled && $leftmenu=="ventil_supplier"', __HANDLER__, 'left', 2411__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/list.php', 'ToDispatch', 1, 'accountancy', '$user->rights->accounting->ventilation->dispatch', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu=="ventil_supplier"', __HANDLER__, 'left', 2412__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/lines.php', 'Dispatched', 1, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 1, __ENTITY__); -- Rapports 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->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __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->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2702__+MAX_llx_menu__, 'accountancy', '', 2701__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2703__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2704__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2702__+MAX_llx_menu__, 'accountancy', '', 2701__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2703__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2704__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); +-- Book Keeping +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->accounting->enabled', __HANDLER__, 'left', 2720__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 6__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?leftmenu=bookkeeping', 'Bookkeeping', 0, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 12, __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->accounting->enabled && $leftmenu=="bookkeeping"', __HANDLER__, 'left', 2721__+MAX_llx_menu__, 'accountancy', '', 2720__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyyear.php', 'ByYear', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="bookkeeping"', __HANDLER__, 'left', 2722__+MAX_llx_menu__, 'accountancy', '', 2720__+MAX_llx_menu__, '/accountancy/bookkeeping/balancebymonth.php', 'AccountBalanceByMonth', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 1, __ENTITY__); +-- Fiscal year & Chart of accounts +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->accounting->enabled"', __HANDLER__, 'left', 2750__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'main', '$user->rights->accounting->fiscalyear', '', 2, 20, __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->accounting->enabled"', __HANDLER__, 'left', 2751__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy', 'Chartofaccounts', 1, 'main', '$user->rights->accounting->chartofaccount', '', 2, 21, __ENTITY__); -- Check deposit insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __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 ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__); @@ -231,7 +234,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/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index c411ef96039..e0f1e1b05d9 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -231,7 +231,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM print ''; print ''; print ''; print ''; print '
    '."\n"; @@ -273,6 +273,42 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM else dol_print_error($db); $db->free($resql); } + + if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy') // Entry in accountancy journal for each bank account + { + $newmenu->add('/accountancy/journal/index.php?leftmenu=journal',$langs->trans("Journaux"),0,$user->rights->banque->lire); + + if ($leftmenu == 'journal') + { + $sql = "SELECT rowid, label, accountancy_journal"; + $sql.= " FROM ".MAIN_DB_PREFIX."bank_account"; + $sql.= " WHERE entity = ".$conf->entity; + $sql.= " AND clos = 0"; + $sql.= " ORDER BY label"; + + $resql = $db->query($sql); + if ($resql) + { + $numr = $db->num_rows($resql); + $i = 0; + + if ($numr > 0) + + while ($i < $numr) + { + $objp = $db->fetch_object($resql); + $newmenu->add('/accountancy/journal/bankjournal.php?id_account='.$objp->rowid,$langs->trans("Journal").' - '.$objp->label,1,$user->rights->accounting->comptarapport->lire); + $i++; + } + } + else dol_print_error($db); + $db->free($resql); + + // Add other journal + $newmenu->add("/accountancy/journal/sellsjournal.php?leftmenu=journal",$langs->trans("SellsJournal"),1,$user->rights->accounting->comptarapport->lire); + $newmenu->add("/accountancy/journal/purchasesjournal.php?leftmenu=journal",$langs->trans("PurchasesJournal"),1,$user->rights->accounting->comptarapport->lire); + } + } if ($conf->ftp->enabled && $mainmenu == 'ftp') // Entry for FTP { diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index db8f216fd60..91a24db79ac 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -436,7 +436,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu print ''; print ''; print ''; print ''; print '
    '."\n"; @@ -487,7 +487,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } $newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"),1); $newmenu->add("/admin/delais.php?mainmenu=home",$langs->trans("Alerts"),1); - $newmenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1); + $newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"),1); $newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1); $newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1); $newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1); @@ -702,7 +702,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { $langs->load("contracts"); $newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("Contracts"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts'); - $newmenu->add("/contrat/card.php?&action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer); + $newmenu->add("/contrat/card.php?action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer); $newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire); $newmenu->add("/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire); if (empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire); @@ -1053,16 +1053,16 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu //if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire); } - // Stocks + // Warehouse if (! empty($conf->stock->enabled)) { $langs->load("stocks"); - $newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Stocks"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock'); - if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer); - if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire); - if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire); - if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); - if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); + $newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock'); + $newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer); + $newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire); + $newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire); + if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); + if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); } // Expeditions @@ -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); @@ -1233,7 +1233,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/adherents/list.php?leftmenu=members&statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate"),2,$user->rights->adherent->lire); $newmenu->add("/adherents/list.php?leftmenu=members&statut=1&filter=outofdate",$langs->trans("MenuMembersNotUpToDate"),2,$user->rights->adherent->lire); $newmenu->add("/adherents/list.php?leftmenu=members&statut=0",$langs->trans("MenuMembersResiliated"),2,$user->rights->adherent->lire); - $newmenu->add("/adherents/stats/geo.php?leftmenu=members&mode=memberbycountry",$langs->trans("MenuMembersStats"),1,$user->rights->adherent->lire); + $newmenu->add("/adherents/stats/index.php?leftmenu=members",$langs->trans("MenuMembersStats"),1,$user->rights->adherent->lire); $newmenu->add("/adherents/index.php?leftmenu=members&mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire); $newmenu->add("/adherents/list.php?leftmenu=members&statut=-1,1&mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer); @@ -1360,7 +1360,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu { for ($j=0; $j < $tabul; $j++) { - $tabstring.='     '; + $tabstring.='   '; } } diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 3e7803af70a..510a1bd88a1 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -1188,7 +1188,7 @@ class pdf_einstein extends ModelePDFCommandes if ($showaddress) { // Sender properties - $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); + $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client); // Show sender $posy=42; diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php index 0216bd4163a..2b8aaa21818 100644 --- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php @@ -1145,7 +1145,7 @@ class pdf_proforma extends ModelePDFCommandes if ($showaddress) { // Sender properties - $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); + $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client); // Show sender $posy=42; diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php index bd4cc333743..46364b23d0d 100644 --- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php +++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php @@ -53,6 +53,18 @@ class pdf_strato extends ModelePDFContract var $marge_haute; var $marge_basse; + /** + * Issuer + * @var Societe + */ + public $emetteur; + + /** + * Recipient + * @var Societe + */ + public $recipient; + /** * Constructor * @@ -227,29 +239,9 @@ class pdf_strato extends ModelePDFContract $iniY = $tab_top + 7; $curY = $tab_top + 7; - $nexY = $tab_top + 7; + $nexY = $tab_top + 2; $pdf->SetXY($this->marge_gauche, $tab_top); - $pdf->MultiCell(190,8,$outputlangs->transnoentities("Description"),0,'L',0); - $pdf->line($this->marge_gauche, $tab_top + 8, $this->page_largeur-$this->marge_droite, $tab_top + 8); - - $pdf->SetFont('', '', $default_font_size - 1); - - $pdf->MultiCell(0, 3, ''); // Set interline to 3 - $pdf->SetXY($this->marge_gauche, $tab_top + 8); - $text=$object->description; - if ($object->duree > 0) - { - $totaltime=convertSecondToTime($object->duree,'all',$conf->global->MAIN_DURATION_OF_WORKDAY); - $text.=($text?' - ':'').$langs->trans("Total").": ".$totaltime; - } - $desc=dol_htmlentitiesbr($text,1); - //print $outputlangs->convToOutputCharset($desc); exit; - - $pdf->writeHTMLCell(180, 3, 10, $tab_top + 8, $outputlangs->convToOutputCharset($desc), 0, 1); - $nexY = $pdf->GetY(); - - $pdf->line($this->marge_gauche, $nexY, $this->page_largeur-$this->marge_droite, $nexY); $pdf->MultiCell(0, 2, ''); // Set interline to 3. Then writeMultiCell must use 3 also. @@ -273,7 +265,20 @@ class pdf_strato extends ModelePDFContract $pageposbefore=$pdf->getPage(); // Description of product line - $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).''; + + if ($objectligne->datei) { + $datei = dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true); + } else { + $datei = $langs->trans("Unknown"); + } + + if ($objectligne->duration) { + $durationi = convertSecondToTime($objectligne->duration); + } else { + $durationi = $langs->trans("Unknown"); + } + + $txt=''.dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".$datei." - ".$outputlangs->transnoentities("Duration")." : ".$durationi,1,$outputlangs->charset_output).''; $desc=dol_htmlentitiesbr($objectligne->desc,1); $pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txt,$desc), 0, 1, 0); @@ -521,7 +526,7 @@ class pdf_strato extends ModelePDFContract $posy+=4; $pdf->SetXY($posx,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->datec,"day",false,$outputlangs,true), '', 'R'); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_creation,"day",false,$outputlangs,true), '', 'R'); if ($object->client->code_client) { @@ -543,7 +548,7 @@ class pdf_strato extends ModelePDFContract $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n"; } - $carac_emetteur .= pdf_build_address($outputlangs,$this->emetteur); + $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->client); // Show sender $posy=42; @@ -581,17 +586,17 @@ class pdf_strato extends ModelePDFContract $result=$object->fetch_contact($arrayidcontact[0]); } + $this->recipient = $object->client; + // Recipient name - if (! empty($usecontact)) - { + if (! empty($usecontact)) { // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; else $socname = $object->client->name; - $this->recipient->name=$outputlangs->convToOutputCharset($socname); + $this->recipient->name = $outputlangs->convToOutputCharset($socname); } - else - { - $this->recipient->name=$outputlangs->convToOutputCharset($object->client->name); + else { + $this->recipient->name = $outputlangs->convToOutputCharset($object->client->name); } $carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target'); diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html index 2dc9c72968c..ca3f3510eee 100644 --- a/htdocs/core/modules/dons/html_cerfafr.html +++ b/htdocs/core/modules/dons/html_cerfafr.html @@ -157,8 +157,8 @@
    -
    __Date__ & __Signature__
    -
    __NOW__
    +
    __Date__ & __Signature__
    +
    __NOW__
    diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index bdf61e3ea72..145eeafcdde 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -539,7 +539,7 @@ class pdf_merou extends ModelePdfExpedition $pdf->SetTextColor(0,0,0); // Sender properties - $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); + $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client); $pdf->SetFont('','', $default_font_size - 3); $pdf->SetXY($blSocX,$blSocY+4); diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index ccb4f93a611..ea6601b8396 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -587,7 +587,7 @@ class pdf_rouget extends ModelePdfExpedition $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n"; } - $carac_emetteur .= pdf_build_address($outputlangs,$this->emetteur); + $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->client); // Show sender $posx=$this->marge_gauche; diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 35a0ff47aa0..6d1f5636b85 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1434,7 +1434,7 @@ class pdf_crabe extends ModelePDFFactures if ($showaddress) { // Sender properties - $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); + $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client); // Show sender $posy=42; diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 0d09aa7ce6c..bd6ec1b60e9 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -270,7 +270,32 @@ class pdf_soleil extends ModelePDFFicheinter $txt=''.dol_htmlentitiesbr($txt,1,$outputlangs->charset_output).''; $desc=dol_htmlentitiesbr($objectligne->desc,1); + $pdf->startTransaction(); $pdf->writeHTMLCell(0, 0, $curX, $curY + 1, dol_concatdesc($txt,$desc), 0, 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(); @@ -522,7 +547,7 @@ class pdf_soleil extends ModelePDFFicheinter $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n"; } - $carac_emetteur .= pdf_build_address($outputlangs,$this->emetteur); + $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->client); // Show sender $posy=42; diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php index b8482a24c3e..50da9252ecc 100644 --- a/htdocs/core/modules/mailings/modules_mailings.php +++ b/htdocs/core/modules/mailings/modules_mailings.php @@ -27,8 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; /** - * \class MailingTargets - * \brief Parent class of emailing target selectors modules + * Parent class of emailing target selectors modules */ class MailingTargets // This can't be abstract as it is used for some method { diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php new file mode 100755 index 00000000000..3a47e6a70e9 --- /dev/null +++ b/htdocs/core/modules/modDynamicPrices.class.php @@ -0,0 +1,122 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \defgroup produit Module dynamic prices + * \brief Module to manage dynamic prices in products + * \file htdocs/core/modules/modDynamicPrices.class.php + * \ingroup produit + * \brief File to describe module to manage dynamic prices in products + */ +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; + + +/** + * Class descriptor of DynamicPrices module + */ +class modDynamicPrices extends DolibarrModules +{ + + /** + * Constructor. Define names, constants, directories, boxes, permissions + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + $this->db = $db; + $this->numero = 2200; + + $this->family = "products"; + // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) + $this->name = preg_replace('/^mod/i','',get_class($this)); + $this->description = "Enable the usage of math expressions for prices"; + $this->version = 'experimental'; // 'experimental' or 'dolibarr' or version + // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) + $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); + // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific) + $this->special = 0; + // Name of image file used for this module. + $this->picto='technic'; + + // Data directories to create when module is enabled + $this->dirs = array(); + + // Config pages + //------------- + //$this->config_page_url = array(); + + // Dependancies + //------------- + $this->depends = array(); + $this->requiredby = array(); + $this->langfiles = array("other"); + + // Constantes + //----------- + $this->const = array(); + + // New pages on tabs + // ----------------- + $this->tabs = array(); + + // Boxes + //------ + $this->boxes = array(); + + // Permissions + //------------ + $this->rights = array(); + $this->rights_class = 'dynamicprices'; + $r=0; + } + + + /** + * Function called when module is enabled. + * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. + * It also creates data directories + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + function init($options='') + { + // Prevent pb of modules not correctly disabled + //$this->remove($options); + + $sql = array(); + + return $this->_init($sql,$options); + } + + /** + * Function called when module is disabled. + * Remove from database constants, boxes and permissions from Dolibarr database. + * Data directories are not deleted + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + function remove($options='') + { + $sql = array(); + + return $this->_remove($sql,$options); + } + +} diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php index b17d82d051d..19100576a83 100644 --- a/htdocs/core/modules/modMargin.class.php +++ b/htdocs/core/modules/modMargin.class.php @@ -106,8 +106,8 @@ class modMargin extends DolibarrModules 'url'=>'/margin/index.php', 'langs'=>'margins', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position'=>100, - 'enabled'=>'$user->rights->margins->liretous', // Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled. - 'perms'=>'1', // Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules + 'enabled'=>'$conf->margin->enabled', // Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled. + 'perms'=>'$user->rights->margins->liretous', // Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules 'target'=>'', 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both $r++; diff --git a/htdocs/core/modules/modPrintIPP.class.php b/htdocs/core/modules/modPrintIPP.class.php index d9e2166b4e6..3cdcd6cdfa6 100644 --- a/htdocs/core/modules/modPrintIPP.class.php +++ b/htdocs/core/modules/modPrintIPP.class.php @@ -51,7 +51,7 @@ class modPrintIPP extends DolibarrModules // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) $this->name = preg_replace('/^mod/i','',get_class($this)); $this->description = "Print via Cups IPP Printer."; - $this->version = 'experimental'; // 'development' or 'experimental' or 'dolibarr' or version + $this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific) $this->special = 1; @@ -67,10 +67,11 @@ class modPrintIPP extends DolibarrModules $this->config_page_url = array("printipp.php@printipp"); // Dependances + $this->hidden = (! empty($_SERVER["WINDIR"])); $this->depends = array(); $this->requiredby = array(); - $this->phpmin = array(5,1); // Minimum version of PHP required by module - $this->need_dolibarr_version = array(3,2); // Minimum version of Dolibarr required by module + $this->phpmin = array(5,1); // Minimum version of PHP required by module + $this->need_dolibarr_version = array(3,7,-2); // Minimum version of Dolibarr required by module $this->conflictwith = array(); $this->langfiles = array("printipp"); diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php index 0cd30f04d22..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) @@ -67,7 +67,7 @@ class modProductBatch extends DolibarrModules $this->config_page_url = array(); // Dependencies - $this->depends = array("modProduct","modStock"); // List of modules id that must be enabled if this module is enabled + $this->depends = array("modProduct","modStock","modExpedition","modSupplier"); // List of modules id that must be enabled if this module is enabled. modExpedition is required to manage batch exit (by manual stock decrease on shipment), modSupplier to manage batch entry (after supplier order). $this->requiredby = array(); // List of modules id to disable if this one is disabled $this->phpmin = array(5,0); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,0); // Minimum version of Dolibarr required by module diff --git a/htdocs/core/modules/modSyncSupplierWebServices.class.php b/htdocs/core/modules/modSyncSupplierWebServices.class.php old mode 100755 new mode 100644 diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 1364aeff65e..f19d8a0e3a0 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -138,7 +138,7 @@ class doc_generic_project_odt extends ModelePDFProjects $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true); $object->fetch_optionals($object->id,$extralabels); - $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key=$array_key,$outputlangs); + $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs); } return $resarray; diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index 7f93851cc65..c074cba31e5 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -139,7 +139,7 @@ class doc_generic_task_odt extends ModelePDFTask $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true); $object->fetch_optionals($object->id,$extralabels); - $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key=$array_key,$outputlangs); + $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs); } return $resarray; diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 1cafa394e66..35953b8521f 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -1284,7 +1284,7 @@ class pdf_azur extends ModelePDFPropales $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n"; } - $carac_emetteur .= pdf_build_address($outputlangs,$this->emetteur); + $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->client); // Show sender $posy=42; diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 5865d431132..6b57b961da4 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -970,7 +970,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices if ($showaddress) { // Sender properties - $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); + $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client); // Show sender $posy=42; diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 5faed78985c..29bd483b39b 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -1022,7 +1022,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders if ($showaddress) { // Sender properties - $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); + $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client); // Show sender $posy=42; diff --git a/htdocs/core/modules/syslog/logHandler.php b/htdocs/core/modules/syslog/logHandler.php index d2fba9bd9d7..1701ca2bdce 100644 --- a/htdocs/core/modules/syslog/logHandler.php +++ b/htdocs/core/modules/syslog/logHandler.php @@ -1,4 +1,19 @@ . + * or see http://www.gnu.org/ + */ require_once DOL_DOCUMENT_ROOT.'/core/modules/syslog/logHandlerInterface.php'; diff --git a/htdocs/core/modules/syslog/logHandlerInterface.php b/htdocs/core/modules/syslog/logHandlerInterface.php index 7b5a4aa1bdd..f0d78735155 100644 --- a/htdocs/core/modules/syslog/logHandlerInterface.php +++ b/htdocs/core/modules/syslog/logHandlerInterface.php @@ -1,4 +1,25 @@ . + * or see http://www.gnu.org/ + */ + +/** + * \file htdocs/core/modules/syslog/logHandlerInterface.php + * \ingroup syslog + * \brief LogHandlerInterface + */ /** * LogHandlerInterface @@ -44,7 +65,7 @@ interface LogHandlerInterface /** * Return if logger active * - * @return boolen True if active + * @return boolean True if active */ public function isActive(); diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index 2d18c6154f8..3a51a5f7567 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -173,11 +173,11 @@ if (! empty($conf->use_javascript_ajax)) print '
    '; print ''.$langs->trans("Recenter").''; print $langs->trans("DefineNewAreaToPick").'...
    '; - print '
    '; + print '
    '; print '
    '; print ''; print '
    '; - print '

    '; + print '
    '; print '
    '.$langs->trans("NewSizeAfterCropping").': diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php index 9f1734b2326..49fefc3ebed 100644 --- a/htdocs/core/search_page.php +++ b/htdocs/core/search_page.php @@ -85,7 +85,7 @@ if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! em && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE)) { $langs->load("products"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', '', 'sall'.rand(0,10)); $nbofsearch++; } @@ -100,7 +100,7 @@ if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! em if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire) { $langs->load("members"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'sall'.rand(0,10)); $nbofsearch++; } diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index acc0cd6b502..6aaf0f5f28d 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -20,12 +20,8 @@ * $withproject (if we are on task contact) */ -if (! class_exists('Contact')) { - require DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; -} -if (! class_exists('FormCompany')) { - require DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -} +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $module = $object->element; @@ -96,13 +92,9 @@ $userstatic=new User($db); '; ?>
    trans("ThirdPartyContacts"); ?>
    - 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); - ?>
    socid; ?> - selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, $events); ?> + selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0); ?>
    select_contacts($selectedCompany, '', 'contactid'); ?> 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':'')); 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 ''; 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 ''; print '\n"; print ''; @@ -771,10 +787,13 @@ if ($action == 'create') print ''; if (! empty($conf->stock->enabled)) { - if (empty($conf->productbatch->enabled)) { - print ''; - } else { - print ''; + if (empty($conf->productbatch->enabled)) + { + print ''; + } + else + { + print ''; } } print "\n"; @@ -828,7 +847,7 @@ if ($action == 'create') print ''; } else - { + { print "'; $subj=0; print ''; - foreach ($product->stock_warehouse[GETPOST('entrepot_id','int')]->detail_batch as $dbatch) { + foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch) + { //var_dump($dbatch); $substock=$dbatch->qty +0 ; print ''; 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/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index c4f9ff2b206..bf5456a7d8d 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -78,18 +78,29 @@ $(document).ready(function () {
    - + + + + + + +
    + +
    - - - - +resArray['options'])) { @@ -104,16 +115,24 @@ if (! empty($hookmanager->resArray['options'])) { ?> - - + @@ -122,11 +141,10 @@ if (! empty($hookmanager->resArray['options'])) { -
    - -
    + +
    @@ -144,7 +162,7 @@ if ($forgetpasslink || $helpcenterlink) if ($dol_use_jmobile) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$dol_use_jmobile; echo '
    '; - echo '
    - + + - + - - + + = 0 && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) { + echo 'service->enabled) && $dateSelector) +if (! empty($conf->service->enabled) && $dateSelector && GETPOST('type') != '0') { if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10; else $colspan = 9; @@ -446,41 +448,74 @@ jQuery(document).ready(function() { setforpredef(); jQuery('#trlinefordates').show(); }); + + /* Sur changemenr de produit, on recharge la liste des prix fournisseur */ $("#idprod, #idprodfournprice").change(function() { setforpredef(); jQuery('#trlinefordates').show(); - rights->margins->creer) { ?> + rights->margins->creer) + { + $langs->load('stocks'); + ?> /* Code for margin */ $("#fournprice_predef options").remove(); $("#fournprice_predef").hide(); $("#buying_price").val("").show(); + /* Call post to load content of combo list fournprice_predef */ $.post('/fourn/ajax/getSupplierPrices.php', { 'idprod': $(this).val() }, function(data) { if (data && data.length > 0) { var options = ''; + var defaultkey = ''; + var defaultprice = ''; var i = 0; $(data).each(function() { - i++; - options += ''; + } + if (this.id == 'pmpprice') + { + var defaultbuyprice = global->MARGIN_PMP_AS_DEFAULT_BUY_PRICE)?int($conf->global->MARGIN_PMP_AS_DEFAULT_BUY_PRICE):1); ?>; + if (this.price > 0 && 1 == defaultbuyprice) { defaultkey = this.id; defaultprice = this.price; } + options += ''; + } }); - options += ''; - $("#buying_price").hide(); + options += ''; + + /* alert(defaultkey+' '+defaultprice); */ $("#fournprice_predef").html(options).show(); + $("#fournprice_predef").val(defaultkey); + + /* At loading, no product are yet selected, so we hide field of buying_price */ + $("#buying_price").hide(); + + /* Define default price at loading */ + var defaultprice = $("#fournprice_predef").find('option:selected').attr("price"); + $("#buying_price").val(defaultprice); + $("#fournprice_predef").change(function() { - var selval = $(this).find('option:selected').attr("price"); - if (selval) - $("#buying_price").val(selval).hide(); - else - $('#buying_price').show(); - }); + /* Hide field buying_price according to choice into list (if 'inputprice' or not) */ + var linevalue=$(this).find('option:selected').val(); + var pricevalue = $(this).find('option:selected').attr("price"); + if (linevalue != 'inputprice' && linevalue != 'pmpprice') { + $("#buying_price").val(pricevalue).hide(); /* We set value then hide field */ + } + if (linevalue == 'inputprice') { + $('#buying_price').show(); + } + if (linevalue == 'pmpprice') { + $("#buying_price").val(pricevalue); + $('#buying_price').hide(); + } + }); } }, 'json'); diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 1c8bb07f560..3d2ea127b85 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -45,7 +45,7 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0; global->MAIN_VIEW_LINE_NUMBER)) { ?> -
    - + + +" name="username" class="flat input-icon-user" size="20" value="" tabindex="1" autofocus="autofocus" /> +
    - +
    + +" name="password" class="flat input-icon-password" type="password" size="20" value="" tabindex="2" autocomplete="off" /> +
    +
    - - + + - +
    trans('VAT'); ?>trans('PriceUHT'); ?> trans('PriceUTTC'); ?> trans('Qty'); ?>trans('ReductionShort'); ?> '; if ($conf->global->MARGIN_TYPE == "1") echo $langs->trans('BuyingPrice'); else echo $langs->trans('CostPrice'); - echo ''; ?>
    +
    info_bits & 2) == 2) { ?> +
    - + + + + + +
    + +
    - - @@ -85,15 +94,24 @@ if (! empty($hookmanager->resArray['options'])) { } ?> - + - - + @@ -103,11 +121,9 @@ if (! empty($hookmanager->resArray['options'])) { -
    - -
    +
    @@ -116,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/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php index ef2963b28c1..d57b66cc331 100644 --- a/htdocs/core/tpl/resource_view.tpl.php +++ b/htdocs/core/tpl/resource_view.tpl.php @@ -32,7 +32,7 @@ if( (array) $linked_resources && count($linked_resources) > 0) print '
    '.$langs->trans('Resource').'
    '; print '
    '.$langs->trans('Busy').'
    '; print '
    '.$langs->trans('Mandatory').'
    '; - print '
    '.$langs->trans('Edit').'
    '; + print '
    '.$langs->trans('Action').'
    '; print ''; //print '
    '; @@ -86,8 +86,13 @@ if( (array) $linked_resources && count($linked_resources) > 0) print '
    '; print '
    '; - print ''.$langs->trans('Delete').''; - print ''.$langs->trans('Edit').''; + print ''; + print img_edit(); + print ''; + print ' '; + print ''; + print img_delete(); + print ''; print '
    '; print '
    '; @@ -105,4 +110,4 @@ else { print '
    '.$langs->trans('NoResourceLinked').'
    '; } -// FIN DU TPL +// FIN DU TPL \ No newline at end of file diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php index ba87e1172e1..d03dff03b3e 100644 --- a/htdocs/cron/admin/cron.php +++ b/htdocs/cron/admin/cron.php @@ -96,9 +96,9 @@ print ''; print '
    - id="username" name="username" class="flat" size="15" maxlength="40" value="" tabindex="1" /> + + +" id="username" name="username" class="flat input-icon-user" size="20" value="" tabindex="1" /> +
    +
    - - + + - +
    '; -print '
    '; +print '
    '; print ''; -print '
    '; +print '
    '; print ''; diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index 17704972170..4c3ac6b6928 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -472,8 +472,9 @@ if (($action=="create") || ($action=="edit")) print '

    '; print ''; + print '     '; print ''; - print ""; + print "
    "; print "\n"; diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index 23313d27f13..aaa69ec7f42 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -96,7 +96,7 @@ class Cronjob extends CommonObject $error=0; $now=dol_now(); - + // Clean parameters if (isset($this->label)) $this->label=trim($this->label); @@ -501,7 +501,7 @@ class Cronjob extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 79e5ae5b1a4..3c2844f3fe4 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -64,7 +64,7 @@ $pageprev = $page - 1; $pagenext = $page + 1; // Do we click on purge search criteria ? -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_label=''; $status=-1; diff --git a/htdocs/custom/README.md b/htdocs/custom/README.md new file mode 100644 index 00000000000..e46934902cb --- /dev/null +++ b/htdocs/custom/README.md @@ -0,0 +1,24 @@ +# DOLIBARR ERP & CRM custom directory for external modules. + +This directory is dedicated to store external modules. +To use it, just copy here the directory of the module into this directory. + +Note: On linux or MAC systems, it is better to unzip/store the external module directory into +a different place than this directory and just adding a symbolic link here to the htdocs directory +of the module. + +For example on Linux OS: Get the module from the command +mkdir ~/git; cd ~/git +git clone https://git.doliforge.org/p/newmodule/newmodule.git +Then create the symbolic link +ln -fs ~/git/newmodule/htdocs /path_to_dolibarr/htdocs/custom/newmodule + +WARNING !!! +You must also enable the custom directory into dolibarr conf/conf.php file by adding the following +two lines, so dolibarr will also scan this directories to find external external modules: + +$dolibarr_main_url_root_alt='/custom'; +$dolibarr_main_document_root_alt='/path_to_dolibarr/htdocs/custom/'; + +(This is not enabled by default because enabling external module may slow down application) + diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index aae1e275d8f..a4379250914 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -184,7 +184,7 @@ class EcmDirectory // extends CommonObject * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; @@ -428,7 +428,7 @@ class EcmDirectory // extends CommonObject $newref=$this->ref; $newlabel=$langs->trans("ShowECMSection").': '.$newref; - if ($withpicto) $result.=($lien.img_object($newlabel,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($newlabel, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.($max?dol_trunc($newref,$max,'middle'):$newref).$lienfin; return $result; diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php index dd40205fc13..b1f09ffcb22 100644 --- a/htdocs/ecm/docdir.php +++ b/htdocs/ecm/docdir.php @@ -175,11 +175,11 @@ if ($action == 'create') print '

    '; - print '
    '; + print '
    '; print ''; - print '     '; + print '     '; print ''; - print '
    '; + print '
    '; print ''; } diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 8f9bd5573bf..d675542140c 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -416,12 +416,6 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED)) print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager")); -$helptext1=''; $helptext2=''; -$helptext1.=$langs->trans("ECMAreaDesc"); -$helptext1.=$langs->trans("ECMAreaDesc2"); -$helptext2.=$langs->trans("ECMAreaDesc"); -$helptext2.=$langs->trans("ECMAreaDesc2"); - /* print '
    '; print $langs->trans("ECMAreaDesc")."
    "; 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")); } diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 8984e4c5424..7ccd24f871b 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -84,9 +84,26 @@ if ($id > 0 || ! empty($ref)) // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('expeditioncard','globalcard')); + /* * Actions */ + +$warehousecanbeselectedlater=1; +if (($action == 'create') || ($action == 'add')) +{ + if (! empty($conf->productbatch->enabled)) + { + if (! (GETPOST('entrepot_id','int') > 0)) + { + $langs->load("errors"); + setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors'); + header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id); + exit; + } + } +} + $parameters=array(); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -262,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); } @@ -593,7 +608,7 @@ if ($action == 'create') print_fiche_titre($langs->trans("CreateASending")); if (! $origin) { - $mesg='
    '.$langs->trans("ErrorBadParameters").'
    '; + setEventMessage($langs->trans("ErrorBadParameters"),'errors'); } dol_htmloutput_mesg($mesg); @@ -664,7 +679,8 @@ if ($action == 'create') print '
    '.$langs->trans("DateDeliveryPlanned").''; //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 "
    '.$langs->trans("Warehouse").' / '.$langs->trans("Stock").''.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' / '.$langs->trans("Stock").''.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')
    "; if ($type==1) $text = img_object($langs->trans('Service'),'service'); else $text = img_object($langs->trans('Product'),'product'); @@ -861,17 +880,19 @@ if ($action == 'create') $quantityAsked = $line->qty; $quantityToBeDelivered = $quantityAsked - $quantityDelivered; + $warehouse_id = GETPOST('entrepot_id','int'); + $defaultqty=0; - if (GETPOST('entrepot_id','int') > 0) + if ($warehouse_id > 0) { //var_dump($product); - $stock = $product->stock_warehouse[GETPOST('entrepot_id','int')]->real; + $stock = $product->stock_warehouse[$warehouse_id]->real; $stock+=0; // Convertit en numerique $defaultqty=min($quantityToBeDelivered, $stock); if (($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) || $defaultqty < 0) $defaultqty=0; } - if (empty($conf->productbatch->enabled) || ! ($product->hasbatch() and is_object($product->stock_warehouse[GETPOST('entrepot_id','int')]))) + if (empty($conf->productbatch->enabled) || ! ($product->hasbatch() and is_object($product->stock_warehouse[$warehouse_id]))) { // Quantity to send print ''; @@ -892,14 +913,14 @@ if ($action == 'create') // Show warehouse combo list $ent = "entl".$indiceAsked; $idl = "idl".$indiceAsked; - $tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int'); + $tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id; print $formproduct->selectWarehouses($tmpentrepot_id,'entl'.$indiceAsked,'',1,0,$line->fk_product); - if ($tmpentrepot_id > 0 && $tmpentrepot_id == GETPOST('entrepot_id','int')) + if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id) { //print $stock.' '.$quantityToBeDelivered; if ($stock < $quantityToBeDelivered) { - print ' '.img_warning($langs->trans("StockTooLow")); // Stock too low for entrepot_id but we may have change warehouse + print ' '.img_warning($langs->trans("StockTooLow")); // Stock too low for this $warehouse_id but you can change warehouse } } } @@ -934,11 +955,14 @@ if ($action == 'create') } } } - } else { + } + else + { print '
    '; @@ -946,8 +970,13 @@ if ($action == 'create') print ''; + + $staticwarehouse=new Entrepot($db); + $staticwarehouse->fetch($warehouse_id); + print $staticwarehouse->getNomUrl(0).' / '; + print ''; - print $langs->trans("DetailBatchFormat", dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->batch, $dbatch->qty); + print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty); if ($defaultqty<=0) { $defaultqty=0; } else { @@ -962,7 +991,7 @@ if ($action == 'create') print "
    "; - print '
    '; + print '
    '; print ''; @@ -1451,12 +1480,14 @@ else if ($id || $ref) } // Batch number managment - if (! empty($conf->productbatch->enabled)) { - if (isset($lines[$i]->detail_batch) ) { - print ''; + if (! empty($conf->productbatch->enabled)) + { + if (isset($lines[$i]->detail_batch)) + { + print ''; $detail = ''; foreach ($lines[$i]->detail_batch as $dbatch) { - $detail.= $langs->trans("DetailBatchFormat",dol_print_date($dbatch->eatby,"day"),dol_print_date($dbatch->sellby,"day"),$dbatch->batch,$dbatch->dluo_qty).'
    '; + $detail.= $langs->trans("DetailBatchFormat",$dbatch->batch,dol_print_date($dbatch->eatby,"day"),dol_print_date($dbatch->sellby,"day"),$dbatch->dluo_qty).'
    '; } print $form->textwithtooltip($langs->trans("DetailBatchNumber"),$detail); print ''; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index bb34f480d97..46f2cbc70fe 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -113,7 +113,7 @@ class Expedition extends CommonObject /** * Return next contract ref * - * @param Societe $soc Objet society + * @param Societe $soc Thirdparty object * @return string Free reference for contract */ function getNextNumRef($soc) @@ -604,9 +604,11 @@ class Expedition extends CommonObject if (! empty($conf->productbatch->enabled)) { $details=ExpeditionLigneBatch::FetchAll($this->db,$obj->rowid); - foreach ($details as $dbatch) { - $result=$mouvS->livraison_batch($dbatch->fk_origin_stock,$dbatch->dluo_qty); - if ($result < 0) { $error++; $this->errors[]=$mouvS->$error; break 2; } + if (! empty($details)) { + foreach ($details as $dbatch) { + $result=$mouvS->livraison_batch($dbatch->fk_origin_stock,$dbatch->dluo_qty); + if ($result < 0) { $error++; $this->errors[]=$mouvS->$error; break 2; } + } } } } @@ -800,7 +802,7 @@ class Expedition extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -1217,7 +1219,7 @@ class Expedition extends CommonObject $picto='sending'; $label=$langs->trans("ShowSending").': '.$this->ref; - if ($withpicto) $result.=($linkstart.img_object($label,$picto).$linkend); + if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$linkstart.$this->ref.$linkend; return $result; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index e3cb8305562..2b41a939c7b 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -114,7 +114,7 @@ if ($resql) /* * Commandes a traiter */ -$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid"; +$sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -136,7 +136,7 @@ if ($resql) $i = 0; print ''; print ''; - print ''; + print ''; $var = True; while ($i < $num) { @@ -146,13 +146,19 @@ if ($resql) print ''; print ''; + print ''; + print ''; + print ''; $i++; } print "
    '.$langs->trans("OrdersToProcess").'
    '.$langs->trans("OrdersToProcess").'
    '; $orderstatic->id=$obj->rowid; $orderstatic->ref=$obj->ref; + $orderstatic->statut=$obj->fk_statut; + $orderstatic->facturee=0; print $orderstatic->getNomUrl(1); print ''; $companystatic->name=$obj->name; $companystatic->id=$obj->socid; print $companystatic->getNomUrl(1,'customer',32); - print '
    '; + print $orderstatic->getLibStatut(3); + print '

    "; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 4cd62249545..2468c9084d2 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -36,7 +36,7 @@ $result = restrictedArea($user, 'expedition',$expeditionid,''); $search_ref_exp = GETPOST("search_ref_exp"); $search_ref_liv = GETPOST('search_ref_liv'); -$search_societe = GETPOST("search_societe"); +$search_company = GETPOST("search_company"); $sortfield = GETPOST('sortfield','alpha'); $sortorder = GETPOST('sortorder','alpha'); @@ -51,12 +51,12 @@ if (! $sortfield) $sortfield="e.ref"; if (! $sortorder) $sortorder="DESC"; $limit = $conf->liste_limit; -// Do we click on purge search criteria ? -if (GETPOST("button_removefilter_x")) +// Purge search criteria +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref_exp=''; $search_ref_liv=''; - $search_societe=''; + $search_company=''; } /* @@ -92,7 +92,7 @@ if ($socid) } if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp); if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv); -if ($search_societe) $sql .= natural_search('s.nom', $search_societe); +if ($search_company) $sql .= natural_search('s.nom', $search_company); $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1,$offset); @@ -107,23 +107,25 @@ if ($resql) $param=""; if ($search_ref_exp) $param.= "&search_ref_exp=".$search_ref_exp; if ($search_ref_liv) $param.= "&search_ref_liv=".$search_ref_liv; - if ($search_societe) $param.= "&search_societe=".$search_societe; + if ($search_company) $param.= "&search_company=".$search_company; print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num); $i = 0; + print '
    '."\n"; print ''; 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"; // Lignes des champs de filtre @@ -132,7 +134,7 @@ if ($resql) print ''; print ''; print ''; print ''; if($conf->livraison_bon->enabled) { @@ -141,13 +143,9 @@ if ($resql) print ''; print ''; } - print ''; + print ''; print ''; @@ -161,12 +159,15 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; + + // Ref print ""; print "\n"; + // Third party print ''; - // Date delivery planed + + // Date delivery planed print "'; + $warehousecanbeselectedlater=1; + if (! empty($conf->productbatch->enabled)) $warehousecanbeselectedlater=0; + + print ''.$langs->trans("WarehouseSource").''; print '
     
    '; - print ''; + print ''; print '  '; - // Développé dans la 3.7 - //print img_search(); - //print img_searchclear(); - print ''; + print ''; print ''; - print ''; print ''.$langs->trans("All").' / '.$langs->trans("None").''; print '
    "; $shipment->id=$objp->rowid; $shipment->ref=$objp->ref; print $shipment->getNomUrl(1); print "'; $companystatic->id=$objp->socid; @@ -174,7 +175,8 @@ if ($resql) $companystatic->name=$objp->socname; print $companystatic->getNomUrl(1); print '"; print dol_print_date($db->jdate($objp->date_expedition),"day"); /*$now = time(); diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index f1be4b07021..bce365447e1 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -643,7 +643,10 @@ if ($id > 0 || ! empty($ref)) if (! empty($conf->stock->enabled)) { - print ''.$langs->trans("WarehouseSource").''; print $formproduct->selectWarehouses(-1,'entrepot_id','',1); if (count($formproduct->cache_warehouses) <= 0) diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 442bb13acb2..1178a20b236 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -90,7 +90,7 @@ else print '
    '; print '
    '; -print '
    '; +print '
    '; if (count($export->array_export_code)) { if ($user->rights->export->creer) @@ -102,12 +102,12 @@ if (count($export->array_export_code)) print ''.$langs->trans("NewExport").''; } /* - print '
    rights->export->creer?'':' disabled="disabled"'); - print '>
    '; + print '>
    '; */ } -print '
    '; +print '
    '; print '
    '; print '
    '; diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php index 95d0a4397de..45f47c7d824 100644 --- a/htdocs/externalsite/admin/externalsite.php +++ b/htdocs/externalsite/admin/externalsite.php @@ -99,7 +99,7 @@ $var=!$var; print ""; print ''.$langs->trans("Label").""; print "global->EXTERNALSITE_LABEL) || $conf->global->EXTERNALSITE_LABEL=='ExternalSite')?'':$conf->global->EXTERNALSITE_LABEL)) . "\" size=\"12\">"; -print "My menu entry"; +print "".$langs->trans("ExampleMyMenuEntry").""; print ""; $var=!$var; @@ -114,9 +114,9 @@ print ""; print ""; -print '
    '; -print "trans("Save")."\">"; -print "
    "; +print '
    '; +print ''; +print '
    '; print "\n"; diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php index 0fca246e9ee..c0b5cf92e7e 100644 --- a/htdocs/externalsite/frames.php +++ b/htdocs/externalsite/frames.php @@ -58,10 +58,10 @@ print " <body> - <br><center> + <br><div class=\"center\"> Sorry, your browser is too old or not correctly configured to view this area.<br> Your browser must support frames.<br> - </center> + </div> </body> diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index 65721bdcce1..0d4d3421538 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -155,7 +155,7 @@ if ($id > 0 || ! empty($ref)) // Date print ''.$langs->trans("Date").''; - print "".dol_print_date($object->date,"daytext")."\n"; + print "".dol_print_date($object->datec,"daytext")."\n"; print ''; print ''; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 77c7e17ffb5..f618e6ff9ad 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -748,10 +748,10 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; if ($message) { - if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); - $actionmsg = dol_concatdesc($actionmsg, $message); + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } $actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref); } @@ -1122,9 +1122,9 @@ if ($action == 'create') print ''; } - print '

    '; + print '
    '; print ''; - print '
    '; + print '
    '; print ''; } @@ -1137,10 +1137,10 @@ if ($action == 'create') print ''; print ''; - print '
    '; + print '
    '; print ''; print ''; - print '
    '; + print '
    '; print ''; } @@ -1373,6 +1373,8 @@ else if ($id > 0 || ! empty($ref)) $sql.= ' ft.date as date_intervention'; $sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft'; $sql.= ' WHERE ft.fk_fichinter = '.$object->id; + if (!empty($conf->global->FICHINTER_HIDE_EMPTY_DURATION)) + $sql.= ' AND ft.duree <> 0'; $sql.= ' ORDER BY ft.rang ASC, ft.rowid'; $resql = $db->query($sql); @@ -1486,7 +1488,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 ''; print ''; diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index bc12821530f..b7887c25278 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 @@ -79,6 +84,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 +516,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]); + } /** @@ -561,7 +555,7 @@ class Fichinter extends CommonObject $label=$langs->trans("Show").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; return $result; @@ -572,7 +566,7 @@ class Fichinter extends CommonObject * Returns the next non used reference of intervention * depending on the module numbering assets within FICHEINTER_ADDON * - * @param Societe $soc Object society + * @param Societe $soc Thirdparty object * @return string Free reference for intervention */ function getNextNumRef($soc) diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 524feec13df..851077b510f 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -62,7 +62,7 @@ $search_desc=GETPOST('search_desc','alpha'); $search_status=GETPOST('search_status'); $sall=GETPOST('sall'); -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $search_company=""; @@ -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"; @@ -158,7 +164,7 @@ if ($result) } print ''; $liststatus=$interventionstatic->statuts_short; - print $form->selectarray('search_status', $liststatus, GETPOST('search_status'), 1, 0, 0, '', 1); + print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1); print ''; print ''; print ''; @@ -193,7 +199,7 @@ if ($result) print ''.convertSecondToTime($objp->duree).''; } print ''.$interventionstatic->LibStatut($objp->fk_statut,5).''; - + print ' '; print "\n"; @@ -207,7 +213,7 @@ if ($result) print ''.convertSecondToTime($total).'  '; print ''; } - + print ''; print "
    \n"; $db->free($result); diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index d69de2f1fae..ee269646c84 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -29,7 +29,7 @@ * \brief File that include conf.php file and commons lib like functions.lib.php */ -if (! defined('DOL_VERSION')) define('DOL_VERSION','3.7.0-beta'); +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.0-alpha'); if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php old mode 100644 new mode 100755 index a6695dc694d..e14e872a24f --- a/htdocs/fourn/ajax/getSupplierPrices.php +++ b/htdocs/fourn/ajax/getSupplierPrices.php @@ -17,7 +17,7 @@ /** * \file /htdocs/fourn/ajax/getSupplierPrices.php - * \brief File to return Ajax response on get supplier prices + * \brief File to return an Ajax response to get a supplier prices */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal @@ -28,6 +28,7 @@ if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; $idprod=GETPOST('idprod','int'); @@ -43,12 +44,15 @@ top_httphead(); //print ''."\n"; -if (! empty($idprod)) +if ($idprod > 0) { + $producttmp=new ProductFournisseur($db); + $producttmp->fetch($idprod); + $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; $sql.= " pfp.ref_fourn,"; $sql.= " pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.remise_percent, pfp.quantity, pfp.unitprice, pfp.charges, pfp.unitcharges,"; - $sql.= " s.nom as name"; + $sql.= " pfp.fk_price_expression, pfp.tva_tx, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = pfp.fk_soc"; @@ -66,11 +70,24 @@ if (! empty($idprod)) if ($num) { + require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php'; $i = 0; while ($i < $num) { $objp = $db->fetch_object($result); + if (!empty($objp->fk_price_expression)) { + $priceparser = new PriceParser($db); + $price_result = $priceparser->parseProductSupplier($idprod, $objp->fk_price_expression, $objp->quantity, $objp->tva_tx); + if ($price_result >= 0) { + $objp->fprice = $price_result; + if ($objp->quantity >= 1) + { + $objp->unitprice = $objp->fprice / $objp->quantity; + } + } + } + $price = $objp->fprice * (1 - $objp->remise_percent / 100); $unitprice = $objp->unitprice * (1 - $objp->remise_percent / 100); @@ -98,6 +115,7 @@ if (! empty($idprod)) if ($objp->duration) $label .= " - ".$objp->duration; $label = price($price,0,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit"); + if ($objp->ref_fourn) $label.=' ('.$objp->ref_fourn.')'; $prices[] = array("id" => $objp->idprodfournprice, "price" => price($price,0,'',0), "label" => $label, "title" => $title); $i++; @@ -106,6 +124,10 @@ if (! empty($idprod)) $db->free($result); } } + + // Add price for pmp + $price=$producttmp->pmp; + $prices[] = array("id" => 'pmpprice', "price" => $price, "label" => $langs->trans("PMPValueShort").': '.price($price,0,$langs,0,0,-1,$conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price,0,$langs,0,0,-1,$conf->currency)); } echo json_encode($prices); diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 93ea02b0759..0447bd0a758 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2014 Jean Heimburger @@ -62,13 +62,17 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e 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); - } + $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 @@ -94,12 +98,22 @@ if ($action == 'setmode' && $user->rights->societe->creer) $contactstatic = new Contact($db); $form = new Form($db); -if ($object->fetch($id)) +if ($id > 0 && empty($object->id)) { - llxHeader('',$langs->trans('SupplierCard')); + // Load data of third party + $res=$object->fetch($id); + if ($object->id <= 0) dol_print_error($db,$object->error); +} + +if ($object->id > 0) +{ + $title=$langs->trans("SupplierCard"); + if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name; + $help_url=''; + llxHeader('',$title, $help_url); /* - * Affichage onglets + * Show tabs */ $head = societe_prepare_head($object); @@ -174,24 +188,15 @@ if ($object->fetch($id)) print ''; // Local Taxes - if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") + if ($mysoc->useLocalTax(1)) { - print ''.$langs->trans('LocalTax1IsUsedES').''; - print yn($object->localtax1_assuj); - print ''; - print ''.$langs->trans('LocalTax2IsUsedES').''; - print yn($object->localtax2_assuj); - print ''; - } - elseif($mysoc->localtax1_assuj=="1") - { - print ''.$langs->trans("LocalTax1IsUsedES").''; + print ''.$langs->trans("LocalTax1IsUsed").''; print yn($object->localtax1_assuj); print ''; } - elseif($mysoc->localtax2_assuj=="1") + if ($mysoc->useLocalTax(2)) { - print ''.$langs->trans("LocalTax2IsUsedES").''; + print ''.$langs->trans("LocalTax2IsUsed").''; print yn($object->localtax2_assuj); print ''; } @@ -304,8 +309,8 @@ if ($object->fetch($id)) if ($user->rights->fournisseur->commande->lire) { - - + + // TODO move to DAO class // Check if there are supplier orders billable $sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,'; @@ -325,7 +330,7 @@ if ($object->fetch($id)) } else { setEventMessage($db->lasterror(),'errors'); } - + // TODO move to DAO class $sql = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p "; @@ -394,13 +399,13 @@ if ($object->fetch($id)) if ($user->rights->fournisseur->facture->lire) { // TODO move to DAO class - $sql = 'SELECT f.rowid,f.libelle,f.ref_supplier,f.fk_statut,f.datef as df,f.total_ttc as amount,f.paye,'; + $sql = 'SELECT f.rowid,f.libelle,f.ref,f.ref_supplier,f.fk_statut,f.datef as df,f.total_ttc as amount,f.paye,'; $sql.= ' SUM(pf.amount) as am'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON f.rowid=pf.fk_facturefourn'; $sql.= ' WHERE f.fk_soc = '.$object->id; $sql.= " AND f.entity =".$conf->entity; - $sql.= ' GROUP BY f.rowid,f.libelle,f.ref_supplier,f.fk_statut,f.datef,f.total_ttc,f.paye'; + $sql.= ' GROUP BY f.rowid,f.libelle,f.ref,f.ref_supplier,f.fk_statut,f.datef,f.total_ttc,f.paye'; $sql.= ' ORDER BY f.datef DESC'; $resql=$db->query($sql); if ($resql) @@ -425,7 +430,13 @@ if ($object->fetch($id)) print ''; print ''; print ''; - print img_object($langs->trans('ShowBill'),'bill').' '.$obj->ref_supplier.' '.dol_trunc($obj->libelle,14).''; + $facturestatic->id=$obj->rowid; + $facturestatic->ref=($obj->ref?$obj->ref:$obj->rowid).($obj->ref_supplier?' - '.$obj->ref_supplier:''); + //$facturestatic->ref_supplier=$obj->ref_supplier; + print $facturestatic->getNomUrl(1); + //print img_object($langs->trans('ShowBill'),'bill').' '.($obj->ref?$obj->ref:$obj->rowid).' - '.$obj->ref_supplier.''; + print ' '.dol_trunc($obj->libelle,14); + print ''; print ''.dol_print_date($db->jdate($obj->df),'day').''; print ''.price($obj->amount).''; print ''; @@ -455,11 +466,11 @@ if ($object->fetch($id)) $parameters = array(); $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been // modified by hook - if (empty($reshook)) + if (empty($reshook)) { print '
    '; - + if ($user->rights->fournisseur->commande->creer) { $langs->load("orders"); @@ -471,7 +482,7 @@ if ($object->fetch($id)) $langs->load("bills"); print ''.$langs->trans("AddBill").''; } - + if ($user->rights->fournisseur->facture->creer) { if (! empty($orders2invoice) && $orders2invoice > 0) print '
    '.$langs->trans("CreateInvoiceForThisCustomer").'
    '; diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 853109fe195..3ac895f2764 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 @@ -533,7 +538,7 @@ class CommandeFournisseur extends CommonOrder $picto='order'; $label=$langs->trans("ShowOrder").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$lien.$this->ref.$lienfin; return $result; @@ -828,7 +833,7 @@ class CommandeFournisseur extends CommonOrder $result = 0; if ($user->rights->fournisseur->commande->commander) { - $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_input_method=".$methode.",date_commande=".$this->db->idate("$date"); + $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_input_method=".$methode.", date_commande='".$this->db->idate($date)."'"; $sql .= " WHERE rowid = ".$this->id; dol_syslog(get_class($this)."::commande", LOG_DEBUG); @@ -953,6 +958,8 @@ class CommandeFournisseur extends CommonOrder if (! $error) { + $action='create'; + // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('supplierorderdao')); diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index db4212308de..b931b566a61 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; @@ -255,6 +260,8 @@ class FactureFournisseur extends CommonInvoice $result=$this->update_price(); if ($result > 0) { + $action='create'; + // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('supplierinvoicedao')); @@ -539,7 +546,7 @@ class FactureFournisseur extends CommonInvoice * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -1482,7 +1489,7 @@ class FactureFournisseur extends CommonInvoice $ref=$this->ref; if (empty($ref)) $ref=$this->id; - if ($withpicto) $result.=($lien.img_object($label,'bill').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($label, 'bill', 'class="classfortooltip"').$lienfin.' '); $result.=$lien.($max?dol_trunc($ref,$max):$ref).$lienfin; return $result; } @@ -1491,7 +1498,7 @@ class FactureFournisseur extends CommonInvoice * Return next reference of supplier invoice not already used (or last reference) * according to numbering module defined into constant INVOICE_SUPPLIER_ADDON_NUMBER * - * @param Society $soc object company + * @param Societe $soc Thirdparty object * @param string $mode 'next' for next value or 'last' for last value * @return string free ref or last ref */ diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php old mode 100644 new mode 100755 index 75ac674e877..52b9fc80c21 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php'; /** @@ -55,6 +56,8 @@ class ProductFournisseur extends Product var $fourn_unitprice; var $fourn_tva_npr; + var $fk_price_expression; + /** * Constructor @@ -320,13 +323,14 @@ class ProductFournisseur extends Product /** * Loads the price information of a provider * - * @param int $rowid Line id - * @return int < 0 if KO, 0 if OK but not found, > 0 if OK + * @param int $rowid Line id + * @param int $ignore_expression Ignores the math expression for calculating price and uses the db value instead + * @return int < 0 if KO, 0 if OK but not found, > 0 if OK */ - function fetch_product_fournisseur_price($rowid) + function fetch_product_fournisseur_price($rowid, $ignore_expression = 0) { $sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability,"; - $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges"; // , pfp.recuperableonly as fourn_tva_npr"; FIXME this field not exist in llx_product_fournisseur_price + $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges, pfp.fk_price_expression"; // , pfp.recuperableonly as fourn_tva_npr"; FIXME this field not exist in llx_product_fournisseur_price $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " WHERE pfp.rowid = ".$rowid; @@ -351,6 +355,25 @@ class ProductFournisseur extends Product $this->fk_product = $obj->fk_product; $this->fk_availability = $obj->fk_availability; //$this->fourn_tva_npr = $obj->fourn_tva_npr; // FIXME this field not exist in llx_product_fournisseur_price + $this->fk_price_expression = $obj->fk_price_expression; + + if (empty($ignore_expression) && !empty($this->fk_price_expression)) { + $priceparser = new PriceParser($this->db); + $price_result = $priceparser->parseProductSupplier($this->fk_product, $this->fk_price_expression, $this->fourn_qty, $this->fourn_tva_tx); + if ($price_result >= 0) { + $this->fourn_price = $price_result; + //recalculation of unitprice, as probably the price changed... + if ($this->fourn_qty!=0) + { + $this->fourn_unitprice = price2num($this->fourn_price/$this->fourn_qty,'MU'); + } + else + { + $this->fourn_unitprice=""; + } + } + } + return 1; } else @@ -379,7 +402,7 @@ class ProductFournisseur extends Product global $conf; $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,"; - $sql.= " pfp.rowid as product_fourn_pri_id, pfp.ref_fourn, pfp.fk_product as product_fourn_id,"; + $sql.= " pfp.rowid as product_fourn_pri_id, pfp.ref_fourn, pfp.fk_product as product_fourn_id, pfp.fk_price_expression,"; $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.unitcharges, pfp.info_bits"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -416,6 +439,16 @@ class ProductFournisseur extends Product $prodfourn->fk_availability = $record["fk_availability"]; $prodfourn->id = $prodid; $prodfourn->fourn_tva_npr = $record["info_bits"]; + $prodfourn->fk_price_expression = $record["fk_price_expression"]; + + if (!empty($prodfourn->fk_price_expression)) { + $priceparser = new PriceParser($this->db); + $price_result = $priceparser->parseProductSupplier($prodid, $prodfourn->fk_price_expression, $prodfourn->fourn_qty, $prodfourn->fourn_tva_tx); + if ($price_result >= 0) { + $prodfourn->fourn_price = $price_result; + $prodfourn->fourn_unitprice = null; //force recalculation of unitprice, as probably the price changed... + } + } if (!isset($prodfourn->fourn_unitprice)) { @@ -468,7 +501,7 @@ class ProductFournisseur extends Product $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,"; $sql.= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,"; $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges, "; - $sql.= " pfp.remise, pfp.remise_percent"; + $sql.= " pfp.remise, pfp.remise_percent, pfp.fk_price_expression"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")"; $sql.= " AND pfp.fk_product = ".$prodid; @@ -495,6 +528,7 @@ class ProductFournisseur extends Product $this->fourn_tva_tx = $record["tva_tx"]; $this->fourn_id = $record["fourn_id"]; $this->fourn_name = $record["supplier_name"]; + $this->fk_price_expression = $record["fk_price_expression"]; $this->id = $prodid; $this->db->free($resql); return 1; @@ -506,6 +540,39 @@ class ProductFournisseur extends Product } } + /** + * Sets the price expression + * + * @param string $expression_id Expression + * @return int <0 if KO, >0 if OK + */ + function setPriceExpression($expression_id) + { + global $conf; + + // Clean parameters + $this->db->begin(); + + $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price"; + $sql.= " SET fk_price_expression = ".$expression_id; + $sql.= " WHERE rowid = ".$this->product_fourn_price_id; + + dol_syslog(get_class($this)."::setPriceExpression", LOG_DEBUG); + + $resql = $this->db->query($sql); + if ($resql) + { + $this->db->commit(); + return 1; + } + else + { + $this->error=$this->db->error()." sql=".$sql; + $this->db->rollback(); + return -1; + } + } + /** * Display supplier of product * diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 59dc5dab3d1..443216d899d 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; /** - * \class PaiementFourn - * \brief Classe permettant la gestion des paiements des factures fournisseurs + * Class to manage payments for supplier invoices */ class PaiementFourn extends Paiement { @@ -345,7 +344,7 @@ class PaiementFourn extends Paiement */ function info($id) { - $sql = 'SELECT c.rowid, datec, fk_user_author, tms'; + $sql = 'SELECT c.rowid, datec, fk_user_author as fk_user_creat, tms'; $sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as c'; $sql.= ' WHERE c.rowid = '.$id; @@ -357,6 +356,7 @@ class PaiementFourn extends Paiement { $obj = $this->db->fetch_object($resql); $this->id = $obj->rowid; + if ($obj->fk_user_creat) { $cuser = new User($this->db); @@ -381,10 +381,10 @@ class PaiementFourn extends Paiement } /** - * Retourne la liste des factures sur lesquels porte le paiement + * Return list of supplier invoices the payment point to * - * @param string $filter Critere de filtre - * @return array Tableau des id de factures + * @param string $filter SQL filter + * @return array Array of supplier invoice id */ function getBillsArray($filter='') { @@ -499,7 +499,7 @@ class PaiementFourn extends Paiement $text=$langs->trans($reg[1]); } - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$text.$lienfin; return $result; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 0273dea94b9..b90bd275e4c 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -136,9 +136,10 @@ else if ($action == 'setmode' && $user->rights->fournisseur->commande->creer) } // bank account -else if ($action == 'setbankaccount' && $user->rights->fournisseur->commande->creer) { +else if ($action == 'setbankaccount' && $user->rights->fournisseur->commande->creer) +{ $result=$object->setBankAccount(GETPOST('fk_account', 'int')); - } +} // date de livraison if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->creer) @@ -356,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); } @@ -461,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); } @@ -525,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); } @@ -1268,10 +1263,14 @@ if ($action=="create") print ''; // Bank Account - print '' . $langs->trans('BankAccount') . ''; - $form->select_comptes($fk_account, 'fk_account', 0, '', 1); - print ''; - + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled)) + { + $langs->load("bank"); + print '' . $langs->trans('BankAccount') . ''; + $form->select_comptes($fk_account, 'fk_account', 0, '', 1); + print ''; + } + print ''.$langs->trans('NotePublic').''; print ''; $doleditor = new DolEditor('note_public', GETPOST('note_public'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); @@ -1302,7 +1301,7 @@ if ($action=="create") // Bouton "Create Draft" print "\n"; - print '
    '; + print '
    '; print "\n"; } @@ -1539,22 +1538,25 @@ elseif (! empty($object->id)) print ''; // Bank Account - print ''; - print ''; - print '
    '; - print $langs->trans('BankAccount'); - print ''; - if ($action != 'editbankaccount' && $user->rights->fournisseur->commande->creer) - 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 ''; - print ''; - + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled)) + { + print ''; + print ''; + print '
    '; + print $langs->trans('BankAccount'); + print ''; + if ($action != 'editbankaccount' && $user->rights->fournisseur->commande->creer) + 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 ''; + print ''; + } + // Delivery date planed print ''; print ''; print "
    '; diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index bea467340e6..11158b21f60 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -405,9 +405,9 @@ if ($id > 0 || ! empty($ref)) // print ' / '.$commande->ref_supplier; // Not yet available print '" class="flat">

    '; - print '
    '; + print '>'; } if (! $nbproduct && $nbfreeproduct) { diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index ab0fd08d3f0..4f0974abd10 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -58,7 +58,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande'); // Purge search criteria -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=''; $search_refsupp=''; @@ -123,7 +123,7 @@ if ($search_user) } if ($search_ttc) { - $sql .= " AND total_ttc = ".price2num($search_ttc); + $sql .= " AND total_ttc = '".$db->escape(price2num($search_ttc))."'"; } if ($sall) { diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php index 6c5ce8aa11c..6792e9356b1 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 ''; - + // 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 '
    '; 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,46 +541,47 @@ 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 ''; print '
    '; - + /* * Boutons actions */ - print '
    '; - print '
    '; + print '
    '; + print '
    '; print ''; print ''; print '
    '; // print ''.$langs->trans("GoBack").''; print ''; print '
    '; + print '
    '; print ''; $db->free($resql); } else { diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 38a0f79a6ea..05e8590628f 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); } @@ -1503,7 +1499,7 @@ if ($action == 'create') // Bouton "Create Draft" print "\n"; - print '
    '; + print '
    '; print "\n"; @@ -2368,7 +2364,7 @@ else $i ++; } print ''; - print '
     
    '; + print '
     
    '; print ''; $db->free($resqlorderlist); } else { diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index d47433af4f5..c7219c6e415 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -168,30 +168,6 @@ if ($object->id > 0) print $form->editfieldval("Label",'label',$object->label,$object,0); print ''; - // Status - $alreadypaid=$object->getSommePaiement(); - print ''.$langs->trans('Status').''.$object->getLibStatut(4,$alreadypaid).''; - - // Amount - print ''.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).''; - print ''.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).''; - - // Amount Local Taxes - //TODO: Place into a function to control showing by country or study better option - if ($societe->localtax1_assuj=="1") //Localtax1 - { - print ''.$langs->transcountry("AmountLT1",$societe->country_code).''; - print ''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).''; - print ' '; - } - if ($societe->localtax2_assuj=="1") //Localtax2 - { - print ''.$langs->transcountry("AmountLT2",$societe->country_code).''; - print ''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).''; - print ''; - } - print ''.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).''; - print '
    '; print ''; diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index 3253a79fcd8..83d4b830c5f 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -64,7 +64,7 @@ $pagenext = $page + 1; if (! $sortfield) $sortfield="f.date_lim_reglement"; if (! $sortorder) $sortorder="ASC"; -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $search_ref_supplier=""; @@ -117,7 +117,7 @@ if ($user->rights->fournisseur->facture->lire) if ($search_ref) { - $sql .= " AND f.rowid LIKE '%".$search_ref."%'"; + $sql .= " AND f.ref LIKE '%".$search_ref."%'"; } if ($search_ref_supplier) { @@ -241,7 +241,7 @@ if ($user->rights->fournisseur->facture->lire) print $facturestatic->getNomUrl(1); print "\n"; - print '\n"; + print ''; print '\n"; print '"; print ""; - // Affiche statut de la facture + // Show invoice status print ''; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 616e9690e8a..2a01602eadc 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -72,8 +72,9 @@ $search_amount_no_tax = GETPOST("search_amount_no_tax","alpha"); $search_amount_all_tax = GETPOST("search_amount_all_tax","alpha"); $month = GETPOST("month","int"); $year = GETPOST("year","int"); +$filter = GETPOST("filtre"); -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test must be present to be compatible with all browsers { $search_ref=""; $search_ref_supplier=""; @@ -83,6 +84,7 @@ if (GETPOST("button_removefilter")) $search_amount_all_tax=""; $year=""; $month=""; + $filter=""; } /* @@ -136,9 +138,9 @@ if ($socid) { $sql .= " AND s.rowid = ".$socid; } -if (GETPOST('filtre') && GETPOST('filtre') != -1) // GETPOST('filtre') may be a string +if ($filter && $filter != -1) // GETPOST('filtre') may be a string { - $filtrearr = explode(",", GETPOST('filtre')); + $filtrearr = explode(",", $filter); foreach ($filtrearr as $fil) { $filt = explode(":", $fil); @@ -148,7 +150,7 @@ if (GETPOST('filtre') && GETPOST('filtre') != -1) // GETPOST('filtre') may be a 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) @@ -217,7 +219,7 @@ if ($resql) if ($search_company) $param.='&search_company='.urlencode($search_company); if ($search_amount_no_tax) $param.='&search_amount_no_tax='.urlencode($search_amount_no_tax); if ($search_amount_all_tax) $param.='&search_amount_all_tax='.urlencode($search_amount_all_tax); - if (GETPOST("filtre") && GETPOST('filtre') != -1) $param.='&filtre='.urlencode(GETPOST("filtre")); + if ($filter && $filter != -1) $param.='&filtre='.urlencode($filter); print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); print ''; @@ -269,8 +271,8 @@ if ($resql) print ''; - + print ''; print "\n"; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index f467e9235ef..afd914546a6 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -417,8 +417,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie // Bouton Enregistrer if ($action != 'add_paiement') { - print '

    '.$langs->trans("ClosePaidInvoicesAutomatically"); - print '
    '; + print '<
    '.$langs->trans("ClosePaidInvoicesAutomatically"); + print '
    '; } // Form to confirm payment @@ -459,7 +459,7 @@ if (empty($action)) $search_amount=GETPOST('search_amount'); $search_company=GETPOST('search_company'); - if (GETPOST("button_removefilter")) + if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $search_account=""; @@ -536,7 +536,7 @@ if (empty($action)) print_liste_field_titre($langs->trans('ThirdParty'),$_SERVER["PHP_SELF"],'s.nom','',$paramlist,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Type'),$_SERVER["PHP_SELF"],'c.libelle','',$paramlist,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$paramlist,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'f.amount','',$paramlist,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'p.amount','',$paramlist,'align="right"',$sortfield,$sortorder); //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$paramlist,'',$sortfield,$sortorder); print ''; print "\n"; diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php index 296415c1aee..b0d7caf8695 100644 --- a/htdocs/fourn/list.php +++ b/htdocs/fourn/list.php @@ -60,7 +60,7 @@ if (! $sortfield) $sortfield="nom"; // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('supplierlist')); -if (GETPOST("button_removefilter_x")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $socname=""; $search_name=""; diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index 824919400a2..179e810d182 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -107,7 +107,7 @@ if ($action == 'setnum_paiement' && ! empty($_POST['num_paiement'])) $res = $object->update_num($_POST['num_paiement']); if ($res === 0) { - $setEventMessage($langs->trans('PaymentNumberUpdateSucceeded')); + setEventMessage($langs->trans('PaymentNumberUpdateSucceeded')); } else { diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index 5e3ea3f18f6..409b567959a 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -52,6 +52,6 @@ print '
    '.dol_trunc($objp->ref_supplier,12)."'.dol_trunc($objp->ref_supplier,12).''.dol_print_date($db->jdate($objp->df),'day')."'.dol_print_date($db->jdate($objp->datelimite),'day'); @@ -258,7 +258,7 @@ if ($user->rights->fournisseur->facture->lire) print "".price($objp->total_ttc)."".price($objp->am)."'; print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$objp->am); print '
    '; print ''; print ''; - $liststatus=array('paye:0'=>$langs->trans("Unpayed"), 'paye:1'=>$langs->trans("Payed")); - print $form->selectarray('filtre', $liststatus, GETPOST('filtre'), 1); + $liststatus=array('paye:0'=>$langs->trans("Unpaid"), 'paye:1'=>$langs->trans("Paid")); + print $form->selectarray('filtre', $liststatus, $filter, 1); print ''; print ''; print ''; @@ -329,7 +331,7 @@ if ($resql) //print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5,$objp->am); print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5); print ' 
     
    '; print '
    '; -$db->close(); - llxFooter(); + +$db->close(); diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index a7ab0d0576f..afaf4c8e796 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -118,6 +118,13 @@ if ($fourn_id > 0) { $sql .= " AND ppf.fk_soc = ".$fourn_id; } +// Count total nb of records without orderby and limit +$nbtotalofrecords = 0; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) +{ + $result = $db->query($sql); + $nbtotalofrecords = $db->num_rows($result); +} $sql .= " ORDER BY ".$sortfield." ".$sortorder; $sql .= $db->plimit($limit + 1, $offset); @@ -143,7 +150,7 @@ if ($resql) $param="&tobuy=".$tobuy."&sref=".$sref."&snom=".$snom."&fourn_id=".$fourn_id.(isset($type)?"&type=".$type:"").(empty($sRefSupplier)?"":"&srefsupplier=".$sRefSupplier); - print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num); + print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords); if (isset($catid)) diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index 1b252c480af..91d6aef388b 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.php @@ -198,7 +198,8 @@ else print ''; - ?>
    ">
    + ?> +
    ">
    '; } else print $form->select_users(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0); - //var_dump($cp->getConfCP('nbHolidayDeducted')); $nb_holiday = $cp->getCPforUser($user->id) / $cp->getConfCP('nbHolidayDeducted'); print '   '.$langs->trans('SoldeCPUser', round($nb_holiday,2)).''; print ''; @@ -823,11 +822,11 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create print '
    '; print ''."\n"; - print '
    '; + print '
    '; print ''; print '    '; print ''; - print '
    '; + print ''; } } diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 5ff23b45ec0..1a3e9f7ecd3 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -470,7 +470,7 @@ class Holiday extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -655,21 +655,21 @@ class Holiday extends CommonObject */ function getNomUrl($withpicto=0) { - global $langs; + global $langs; - $result=''; + $result=''; - $lien = ''; - $lienfin=''; + $lien = ''; + $lienfin=''; - $picto='holiday'; + $picto='holiday'; - $label=$langs->trans("Show").': '.$this->ref; + $label=$langs->trans("Show").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); - if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; - return $result; + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto && $withpicto != 2) $result.=' '; + if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + return $result; } @@ -1045,7 +1045,8 @@ class Holiday extends CommonObject $result = $this->db->query($sql); if($result) { $obj = $this->db->fetch_object($result); - return number_format($obj->nb_holiday,2); + //return number_format($obj->nb_holiday,2); + return $obj->nb_holiday; } else { return '0'; } diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 217cb16bad1..fa3f745de81 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -144,17 +144,14 @@ if($cp_events == 1) print '
    '; } -dol_fiche_head(); - print '
    '."\n"; print ''; print ''; print ""; -print ''; -print ''; +print ''; print ''; print ''; -print ''; +print ''; print ''; foreach($listUsers as $users) @@ -163,7 +160,6 @@ foreach($listUsers as $users) $var=!$var; print ''; - print ''; print '
    '.$langs->trans('ID').''.$langs->trans('Employee').''.$langs->trans('Employee').''.$langs->trans('Available').''.$langs->trans('Note').''.$langs->trans('UpdateButtonCP').'
    '.$users['rowid'].''; $userstatic->id=$users['rowid']; $userstatic->lastname=$users['name']; @@ -183,9 +179,6 @@ foreach($listUsers as $users) print '
    '; print '
    '; -dol_fiche_end(); - - llxFooter(); $db->close(); diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index e988e640711..86c4eca49eb 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -64,7 +64,7 @@ $search_employe = GETPOST('search_employe'); $search_valideur = GETPOST('search_valideur'); $search_statut = GETPOST('select_statut'); -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $month_create=""; diff --git a/htdocs/holiday/tomergewithdefine_holiday.php b/htdocs/holiday/tomergewithdefine_holiday.php index 4bf904528a0..46dde3028a4 100644 --- a/htdocs/holiday/tomergewithdefine_holiday.php +++ b/htdocs/holiday/tomergewithdefine_holiday.php @@ -46,7 +46,7 @@ llxHeader(array(),$langs->trans('CPTitreMenu')); print_fiche_titre($langs->trans('MenuConfCP')); -$congespayes = new Holidays($db); +$congespayes = new Holiday($db); $listUsers = $congespayes->fetchUsers(false, true); // Si il y a une action de mise à jour 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 + */ } } diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 125b8dc0285..9314059fb03 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -1278,7 +1278,7 @@ if ($step == 5 && $datatoimport) print '
    '; // Actions - print '
    '; + print '
    '; if ($user->rights->import->run) { print ''.$langs->trans("RunSimulateImportFile").''; @@ -1287,7 +1287,7 @@ if ($step == 5 && $datatoimport) { print ''.$langs->trans("RunSimulateImportFile").''; } - print '
    '; + print ''; } else { @@ -1401,15 +1401,15 @@ if ($step == 5 && $datatoimport) // Show import id $importid=dol_print_date(dol_now(),'%Y%m%d%H%M%S'); - print '
    '; + print '
    '; print $langs->trans("NowClickToRunTheImport",$langs->transnoentitiesnoconv("RunImportFile")).'
    '; print $langs->trans("DataLoadedWithId",$importid).'
    '; - print '
    '; + print ''; print '
    '; // Actions - print '
    '; + print '
    '; if ($user->rights->import->run) { if (empty($nboferrors)) @@ -1429,7 +1429,7 @@ if ($step == 5 && $datatoimport) print ''.$langs->trans("RunImportFile").''; } - print '
    '; + print ''; } } @@ -1664,12 +1664,12 @@ if ($step == 6 && $datatoimport) // Show result - print '
    '; print '
    '; + print '
    '; print $langs->trans("NbOfLinesImported",$nbok).'

    '; print $langs->trans("FileWasImported",$importid).'
    '; print $langs->trans("YouCanUseImportIdToFindRecord",$importid).'
    '; - print '
    '; + print ''; } diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 2ccb92e1970..ada73d97559 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -85,7 +85,7 @@ else print ''; print '
    '; -print '
    '; +print '
    '; if (count($import->array_import_code)) { //if ($user->rights->import->run) @@ -97,7 +97,7 @@ if (count($import->array_import_code)) // print ''.$langs->trans("NewImport").''; //} } -print '
    '; +print ''; print '
    '; diff --git a/htdocs/includes/evalmath/README.md b/htdocs/includes/evalmath/README.md new file mode 100755 index 00000000000..6011e3fb676 --- /dev/null +++ b/htdocs/includes/evalmath/README.md @@ -0,0 +1,11 @@ +evalmath.class.php +================== + +Version 1.0 + +Taken from http://www.phpclasses.org/browse/file/11680.html, cred to Miles Kaufmann + +This repository is cloned for two reasons: + +1. To allow downloading the code without signing in to phpclasses.org. +2. To add very small improvements to the code. diff --git a/htdocs/includes/evalmath/evalmath.class.php b/htdocs/includes/evalmath/evalmath.class.php new file mode 100755 index 00000000000..bd1755b0a20 --- /dev/null +++ b/htdocs/includes/evalmath/evalmath.class.php @@ -0,0 +1,393 @@ + + +================================================================================ + +NAME + EvalMath - safely evaluate math expressions + +SYNOPSIS + include('evalmath.class.php'); + $m = new EvalMath; + // basic evaluation: + $result = $m->evaluate('2+2'); + // supports: order of operation; parentheses; negation; built-in functions + $result = $m->evaluate('-8(5/2)^2*(1-sqrt(4))-8'); + // create your own variables + $m->evaluate('a = e^(ln(pi))'); + // or functions + $m->evaluate('f(x,y) = x^2 + y^2 - 2x*y + 1'); + // and then use them + $result = $m->evaluate('3*f(42,a)'); + +DESCRIPTION + Use the EvalMath class when you want to evaluate mathematical expressions + from untrusted sources. You can define your own variables and functions, + which are stored in the object. Try it, it's fun! + +METHODS + $m->evalute($expr) + Evaluates the expression and returns the result. If an error occurs, + prints a warning and returns false. If $expr is a function assignment, + returns true on success. + + $m->e($expr) + A synonym for $m->evaluate(). + + $m->vars() + Returns an associative array of all user-defined variables and values. + + $m->funcs() + Returns an array of all user-defined functions. + +PARAMETERS + $m->suppress_errors + Set to true to turn off warnings when evaluating expressions + + $m->last_error + If the last evaluation failed, contains a string describing the error. + (Useful when suppress_errors is on). + + $m->last_error_code + If the last evaluation failed, 2 element array with numeric code and extra info + +AUTHOR INFORMATION + Copyright 2005, Miles Kaufmann. + +LICENSE + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + 1 Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ + +class EvalMath { + + var $suppress_errors = false; + var $last_error = null; + var $last_error_code = null; + + var $v = array('e'=>2.71,'pi'=>3.14); // variables (and constants) + var $f = array(); // user-defined functions + var $vb = array('e', 'pi'); // constants + var $fb = array( // built-in functions + 'sin','sinh','arcsin','asin','arcsinh','asinh', + 'cos','cosh','arccos','acos','arccosh','acosh', + 'tan','tanh','arctan','atan','arctanh','atanh', + 'sqrt','abs','ln','log'); + + function EvalMath() { + // make the variables a little more accurate + $this->v['pi'] = pi(); + $this->v['e'] = exp(1); + } + + function e($expr) { + return $this->evaluate($expr); + } + + function evaluate($expr) { + $this->last_error = null; + $this->last_error_code = null; + $expr = trim($expr); + if (substr($expr, -1, 1) == ';') $expr = substr($expr, 0, strlen($expr)-1); // strip semicolons at the end + //=============== + // is it a variable assignment? + if (preg_match('/^\s*([a-z]\w*)\s*=\s*(.+)$/', $expr, $matches)) { + if (in_array($matches[1], $this->vb)) { // make sure we're not assigning to a constant + return $this->trigger(1, "cannot assign to constant '$matches[1]'", $matches[1]); + } + if (($tmp = $this->pfx($this->nfx($matches[2]))) === false) return false; // get the result and make sure it's good + $this->v[$matches[1]] = $tmp; // if so, stick it in the variable array + return $this->v[$matches[1]]; // and return the resulting value + //=============== + // is it a function assignment? + } elseif (preg_match('/^\s*([a-z]\w*)\s*\(\s*([a-z]\w*(?:\s*,\s*[a-z]\w*)*)\s*\)\s*=\s*(.+)$/', $expr, $matches)) { + $fnn = $matches[1]; // get the function name + if (in_array($matches[1], $this->fb)) { // make sure it isn't built in + return $this->trigger(2, "cannot redefine built-in function '$matches[1]()'", $matches[1]); + } + $args = explode(",", preg_replace("/\s+/", "", $matches[2])); // get the arguments + if (($stack = $this->nfx($matches[3])) === false) return false; // see if it can be converted to postfix + for ($i = 0; $iv)) { + $stack[$i] = $this->v[$token]; + } else { + return $this->trigger(3, "undefined variable '$token' in function definition", $token); + } + } + } + $this->f[$fnn] = array('args'=>$args, 'func'=>$stack); + return true; + //=============== + } else { + return $this->pfx($this->nfx($expr)); // straight up evaluation, woo + } + } + + function vars() { + $output = $this->v; + unset($output['pi']); + unset($output['e']); + return $output; + } + + function funcs() { + $output = array(); + foreach ($this->f as $fnn=>$dat) + $output[] = $fnn . '(' . implode(',', $dat['args']) . ')'; + return $output; + } + + //===================== HERE BE INTERNAL METHODS ====================\\ + + // Convert infix to postfix notation + function nfx($expr) { + + $index = 0; + $stack = new EvalMathStack; + $output = array(); // postfix form of expression, to be passed to pfx() + $expr = trim(strtolower($expr)); + + $ops = array('+', '-', '*', '/', '^', '_'); + $ops_r = array('+'=>0,'-'=>0,'*'=>0,'/'=>0,'^'=>1); // right-associative operator? + $ops_p = array('+'=>0,'-'=>0,'*'=>1,'/'=>1,'_'=>1,'^'=>2); // operator precedence + + $expecting_op = false; // we use this in syntax-checking the expression + // and determining when a - is a negation + + if (preg_match("/[^\w\s+*^\/()\.,-]/", $expr, $matches)) { // make sure the characters are all good + return $this->trigger(4, "illegal character '{$matches[0]}'", $matches[0]); + } + + while(1) { // 1 Infinite Loop ;) + $op = substr($expr, $index, 1); // get the first character at the current index + // find out if we're currently at the beginning of a number/variable/function/parenthesis/operand + $ex = preg_match('/^([a-z]\w*\(?|\d+(?:\.\d*)?|\.\d+|\()/', substr($expr, $index), $match); + //=============== + if ($op == '-' and !$expecting_op) { // is it a negation instead of a minus? + $stack->push('_'); // put a negation on the stack + $index++; + } elseif ($op == '_') { // we have to explicitly deny this, because it's legal on the stack + return $this->trigger(4, "illegal character '_'", "_"); // but not in the input expression + //=============== + } elseif ((in_array($op, $ops) or $ex) and $expecting_op) { // are we putting an operator on the stack? + if ($ex) { // are we expecting an operator but have a number/variable/function/opening parethesis? + $op = '*'; $index--; // it's an implicit multiplication + } + // heart of the algorithm: + while($stack->count > 0 and ($o2 = $stack->last()) and in_array($o2, $ops) and ($ops_r[$op] ? $ops_p[$op] < $ops_p[$o2] : $ops_p[$op] <= $ops_p[$o2])) { + $output[] = $stack->pop(); // pop stuff off the stack into the output + } + // many thanks: http://en.wikipedia.org/wiki/Reverse_Polish_notation#The_algorithm_in_detail + $stack->push($op); // finally put OUR operator onto the stack + $index++; + $expecting_op = false; + //=============== + } elseif ($op == ')' and $expecting_op) { // ready to close a parenthesis? + while (($o2 = $stack->pop()) != '(') { // pop off the stack back to the last ( + if (is_null($o2)) return $this->trigger(5, "unexpected ')'", ")"); + else $output[] = $o2; + } + if (preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) { // did we just close a function? + $fnn = $matches[1]; // get the function name + $arg_count = $stack->pop(); // see how many arguments there were (cleverly stored on the stack, thank you) + $output[] = $stack->pop(); // pop the function and push onto the output + if (in_array($fnn, $this->fb)) { // check the argument count + if($arg_count > 1) + return $this->trigger(6, "wrong number of arguments ($arg_count given, 1 expected)", array($arg_count, 1)); + } elseif (array_key_exists($fnn, $this->f)) { + if ($arg_count != count($this->f[$fnn]['args'])) + return $this->trigger(6, "wrong number of arguments ($arg_count given, " . count($this->f[$fnn]['args']) . " expected)", array($arg_count, count($this->f[$fnn]['args']))); + } else { // did we somehow push a non-function on the stack? this should never happen + return $this->trigger(7, "internal error"); + } + } + $index++; + //=============== + } elseif ($op == ',' and $expecting_op) { // did we just finish a function argument? + while (($o2 = $stack->pop()) != '(') { + if (is_null($o2)) return $this->trigger(5, "unexpected ','", ","); // oops, never had a ( + else $output[] = $o2; // pop the argument expression stuff and push onto the output + } + // make sure there was a function + if (!preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) + return $this->trigger(5, "unexpected ','", ","); + $stack->push($stack->pop()+1); // increment the argument count + $stack->push('('); // put the ( back on, we'll need to pop back to it again + $index++; + $expecting_op = false; + //=============== + } elseif ($op == '(' and !$expecting_op) { + $stack->push('('); // that was easy + $index++; + $allow_neg = true; + //=============== + } elseif ($ex and !$expecting_op) { // do we now have a function/variable/number? + $expecting_op = true; + $val = $match[1]; + if (preg_match("/^([a-z]\w*)\($/", $val, $matches)) { // may be func, or variable w/ implicit multiplication against parentheses... + if (in_array($matches[1], $this->fb) or array_key_exists($matches[1], $this->f)) { // it's a func + $stack->push($val); + $stack->push(1); + $stack->push('('); + $expecting_op = false; + } else { // it's a var w/ implicit multiplication + $val = $matches[1]; + $output[] = $val; + } + } else { // it's a plain old var or num + $output[] = $val; + } + $index += strlen($val); + //=============== + } elseif ($op == ')') { // miscellaneous error checking + return $this->trigger(5, "unexpected ')'", ")"); + } elseif (in_array($op, $ops) and !$expecting_op) { + return $this->trigger(8, "unexpected operator '$op'", $op); + } else { // I don't even want to know what you did to get here + return $this->trigger(9, "an unexpected error occured"); + } + if ($index == strlen($expr)) { + if (in_array($op, $ops)) { // did we end with an operator? bad. + return $this->trigger(10, "operator '$op' lacks operand", $op); + } else { + break; + } + } + while (substr($expr, $index, 1) == ' ') { // step the index past whitespace (pretty much turns whitespace + $index++; // into implicit multiplication if no operator is there) + } + + } + while (!is_null($op = $stack->pop())) { // pop everything off the stack and push onto output + if ($op == '(') return $this->trigger(11, "expecting ')'", ")"); // if there are (s on the stack, ()s were unbalanced + $output[] = $op; + } + return $output; + } + + // evaluate postfix notation + function pfx($tokens, $vars = array()) { + + if ($tokens == false) return false; + + $stack = new EvalMathStack; + + foreach ($tokens as $token) { // nice and easy + // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on + if (in_array($token, array('+', '-', '*', '/', '^'))) { + if (is_null($op2 = $stack->pop())) return $this->trigger(12, "internal error"); + if (is_null($op1 = $stack->pop())) return $this->trigger(13, "internal error"); + switch ($token) { + case '+': + $stack->push($op1+$op2); break; + case '-': + $stack->push($op1-$op2); break; + case '*': + $stack->push($op1*$op2); break; + case '/': + if ($op2 == 0) return $this->trigger(14, "division by zero"); + $stack->push($op1/$op2); break; + case '^': + $stack->push(pow($op1, $op2)); break; + } + // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on + } elseif ($token == "_") { + $stack->push(-1*$stack->pop()); + // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on + } elseif (preg_match("/^([a-z]\w*)\($/", $token, $matches)) { // it's a function! + $fnn = $matches[1]; + if (in_array($fnn, $this->fb)) { // built-in function: + if (is_null($op1 = $stack->pop())) return $this->trigger(15, "internal error"); + $fnn = preg_replace("/^arc/", "a", $fnn); // for the 'arc' trig synonyms + if ($fnn == 'ln') $fnn = 'log'; + eval('$stack->push(' . $fnn . '($op1));'); // perfectly safe eval() + } elseif (array_key_exists($fnn, $this->f)) { // user function + // get args + $args = array(); + for ($i = count($this->f[$fnn]['args'])-1; $i >= 0; $i--) { + if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop())) return $this->trigger(16, "internal error"); + } + $stack->push($this->pfx($this->f[$fnn]['func'], $args)); // yay... recursion!!!! + } + // if the token is a number or variable, push it on the stack + } else { + if (is_numeric($token)) { + $stack->push($token); + } elseif (array_key_exists($token, $this->v)) { + $stack->push($this->v[$token]); + } elseif (array_key_exists($token, $vars)) { + $stack->push($vars[$token]); + } else { + return $this->trigger(17, "undefined variable '$token'", $token); + } + } + } + // when we're out of tokens, the stack should have a single element, the final result + if ($stack->count != 1) return $this->trigger(18, "internal error"); + return $stack->pop(); + } + + // trigger an error, but nicely, if need be + function trigger($code, $msg, $info = null) { + $this->last_error = $msg; + $this->last_error_code = array($code, $info); + if (!$this->suppress_errors) trigger_error($msg, E_USER_WARNING); + return false; + } +} + +// for internal use +class EvalMathStack { + + var $stack = array(); + var $count = 0; + + function push($val) { + $this->stack[$this->count] = $val; + $this->count++; + } + + function pop() { + if ($this->count > 0) { + $this->count--; + return $this->stack[$this->count]; + } + return null; + } + + function last($n=1) { + if (isset($this->stack[$this->count-$n])) { + return $this->stack[$this->count-$n]; + } + return; + } +} diff --git a/htdocs/includes/jquery/plugins/multiple-select/LICENSE b/htdocs/includes/jquery/plugins/multiple-select/LICENSE deleted file mode 100644 index c3ebd2b5248..00000000000 --- a/htdocs/includes/jquery/plugins/multiple-select/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -(The MIT License) - -Copyright (c) 2012-2014 Zhixin Wen - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/multiple-select/README.md b/htdocs/includes/jquery/plugins/multiple-select/README.md deleted file mode 100644 index 81b82ba74c0..00000000000 --- a/htdocs/includes/jquery/plugins/multiple-select/README.md +++ /dev/null @@ -1,96 +0,0 @@ -# Multiple Select - -Multiple select is a jQuery plugin to select multiple elements with checkboxes :). - -To get started checkout examples and documentation at http://wenzhixin.net.cn/p/multiple-select - -## Contributors - -Multiple select is due to the excellent work of the following contributors: - - - - -< - - - - - - - -
    文翼GitHub/wenzhixin
    Gaurav JassalGitHub/creativeaura
    guliGitHub/guli
    jwheadonGitHub/jwheadon
    yxGitHub/qqfish
    Tobias MaceyGitHub/blarghmatey
    Jona GoldmanGitHub/jonagoldman
    Alex JeffreyGitHub/ajeffrey
    - -## Changelog - -### 1.1.0 - -* Fix #63: Add ```keepOpen``` option. -* Fix #62: Fix ```isOpen``` and ```filter``` options are both true bug. -* Fix #57: Fire onCheckAll event when literally select. -* Add data attributes for support. -* Fix #55: Add ```name``` option. - -### 1.0.9 - -* Fix #42: Add ```styler``` option to custom item style. -* Fix firefox click bug. -* Add ```allSelected```, ```minumimCountSelected``` and ```countSelected``` options. -* Fix #35: Add ```onFocus``` and ```onBlur``` events. -* Fix #25: Add ```focus``` and ```blur``` methods. -* Fix #31: Trigger the onCheckAll & onUncheckAll events when use filter to select all. - -### 1.0.8 - -* Update the license to The MIT License. -* Fix #47: Add ```No matches found``` message when there are no results found. -* Fix #43: Add ```position``` option. - -### 1.0.7 - -* Fix #44: The filters not working bugs. - -### 1.0.6 - -* Fix #21: Add ```single``` option. -* Add ```override``` option. -* Add ```container``` option. -* Fix #29: Update the optgroups select text. -* Fix #30: Image is not shown in Firefox 25.0.1. -* Fix #22: fix group filter problem. - -### 1.0.5 - -* Update the button text witdh. -* Add keyboard support. - -### 1.0.4 - -* Fix #12: Add ```width``` option. -* Fix #11: Add callback events. -* Add ```maxHeight``` option. - -### 1.0.3 - -* Fix #4: Add ```filter``` option. -* Support mobile devices. -* Fix #6: Add ```refresh``` method. - -### 1.0.2 - -* Fix #7: Add ```selected``` and ```disabled``` options. -* Fix #5: Add ```checkAll``` and ```uncheckAll``` methods. - -### 1.0.1 - -* Fix #3: Add optgroups support. -* Add ```placeholder``` option. -* Fix #2: use prop method instead of attr. - -### 1.0.0 - -* Initial release - -## LICENSE - -[The MIT License](https://github.com/wenzhixin/multiple-select/blob/master/LICENSE) \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js b/htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js deleted file mode 100644 index 32e6635bbaa..00000000000 --- a/htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js +++ /dev/null @@ -1,466 +0,0 @@ -/** - * @author zhixin wen - * @version 1.1.0 - * - * http://wenzhixin.net.cn/p/multiple-select/ - */ - -(function($) { - - 'use strict'; - - function MultipleSelect($el, options) { - var that = this, - name = $el.attr('name') || options.name || '', - elWidth = $el.width(); - - this.$el = $el.hide(); - this.options = options; - - this.$parent = $('
    '); - this.$choice = $(''); - this.$drop = $('
    '); - this.$el.after(this.$parent); - this.$parent.append(this.$choice); - this.$parent.append(this.$drop); - - if (this.$el.prop('disabled')) { - this.$choice.addClass('disabled'); - } - this.$choice.css('width', elWidth + 'px'); - this.$drop.css({ - width: (options.width || elWidth) + 'px' - }); - - if (!this.options.keepOpen) { - $('body').click(function(e) { - if ($(e.target)[0] === that.$choice[0] || - $(e.target).parents('.ms-choice')[0] === that.$choice[0]) { - return; - } - if (($(e.target)[0] === that.$drop[0] || - $(e.target).parents('.ms-drop')[0] !== that.$drop[0]) && - that.options.isOpen) { - that.close(); - } - }); - } - - this.selectAllName = 'name="selectAll' + name + '"'; - this.selectGroupName = 'name="selectGroup' + name + '"'; - this.selectItemName = 'name="selectItem' + name + '"'; - } - - MultipleSelect.prototype = { - constructor : MultipleSelect, - - init: function() { - var that = this, - html = []; - if (this.options.filter) { - html.push( - '
    ', - '', - '
    ' - ); - } - html.push('
      '); - if (this.options.selectAll && !this.options.single) { - html.push( - '
    • ', - '', - '
      • ' - ); - } - $.each(this.$el.children(), function(i, elm) { - html.push(that.optionToHtml(i, elm)); - }); - html.push('
    • No matches found
      • '); - html.push('
    '); - this.$drop.html(html.join('')); - this.$drop.find('ul').css('max-height', this.options.maxHeight + 'px'); - this.$drop.find('.multiple').css('width', this.options.multipleWidth + 'px'); - - this.$searchInput = this.$drop.find('.ms-search input'); - this.$selectAll = this.$drop.find('input[' + this.selectAllName + ']'); - this.$selectGroups = this.$drop.find('input[' + this.selectGroupName + ']'); - this.$selectItems = this.$drop.find('input[' + this.selectItemName + ']:enabled'); - this.$disableItems = this.$drop.find('input[' + this.selectItemName + ']:disabled'); - this.$noResults = this.$drop.find('.ms-no-results'); - this.events(); - this.update(); - - if (this.options.isOpen) { - this.open(); - } - }, - - optionToHtml: function(i, elm, group, groupDisabled) { - var that = this, - $elm = $(elm), - html = [], - multiple = this.options.multiple, - disabled, - type = this.options.single ? 'radio' : 'checkbox'; - - if ($elm.is('option')) { - var value = $elm.val(), - text = $elm.text(), - selected = $elm.prop('selected'), - style = this.options.styler(value) ? ' style="' + this.options.styler(value) + '"' : ''; - - disabled = groupDisabled || $elm.prop('disabled'); - html.push( - '', - '', - ' ', - text, - '', - '' - ); - } else if (!group && $elm.is('optgroup')) { - var _group = 'group_' + i, - label = $elm.attr('label'); - - disabled = $elm.prop('disabled'); - html.push( - '
  • ', - '', - '
    • '); - $.each($elm.children(), function(i, elm) { - html.push(that.optionToHtml(i, elm, _group, disabled)); - }); - } - return html.join(''); - }, - - events: function() { - var that = this; - this.$choice.off('click').on('click', function(e) { - e.preventDefault(); - that[that.options.isOpen ? 'close' : 'open'](); - }) - .off('focus').on('focus', this.options.onFocus) - .off('blur').on('blur', this.options.onBlur); - - this.$parent.off('keydown').on('keydown', function(e) { - switch (e.which) { - case 27: // esc key - that.close(); - that.$choice.focus(); - break; - } - }); - this.$searchInput.off('keyup').on('keyup', function() { - that.filter(); - }); - this.$selectAll.off('click').on('click', function() { - var checked = $(this).prop('checked'), - $items = that.$selectItems.filter(':visible'); - if ($items.length === that.$selectItems.length) { - that[checked ? 'checkAll' : 'uncheckAll'](); - } else { // when the filter option is true - that.$selectGroups.prop('checked', checked); - $items.prop('checked', checked); - that.options[checked ? 'onCheckAll' : 'onUncheckAll'](); - that.update(); - } - }); - this.$selectGroups.off('click').on('click', function() { - var group = $(this).parent().attr('data-group'), - $items = that.$selectItems.filter(':visible'), - $children = $items.filter('[data-group="' + group + '"]'), - checked = $children.length !== $children.filter(':checked').length; - $children.prop('checked', checked); - that.updateSelectAll(); - that.update(); - that.options.onOptgroupClick({ - label: $(this).parent().text(), - checked: checked, - children: $children.get() - }); - }); - this.$selectItems.off('click').on('click', function() { - that.updateSelectAll(); - that.update(); - that.updateOptGroupSelect(); - that.options.onClick({ - label: $(this).parent().text(), - value: $(this).val(), - checked: $(this).prop('checked') - }); - }); - }, - - open: function() { - if (this.$choice.hasClass('disabled')) { - return; - } - this.options.isOpen = true; - this.$choice.find('>div').addClass('open'); - this.$drop.show(); - if (this.options.container) { - var offset = this.$drop.offset(); - this.$drop.appendTo($(this.options.container)); - this.$drop.offset({ top: offset.top, left: offset.left }); - } - if (this.options.filter) { - this.$searchInput.val(''); - this.filter(); - } - this.options.onOpen(); - }, - - close: function() { - this.options.isOpen = false; - this.$choice.find('>div').removeClass('open'); - this.$drop.hide(); - if (this.options.container) { - this.$parent.append(this.$drop); - this.$drop.css({ - 'top': 'auto', - 'left': 'auto' - }) - } - this.options.onClose(); - }, - - update: function() { - var selects = this.getSelects('text'), - $span = this.$choice.find('>span'); - if (selects.length === this.$selectItems.length + this.$disableItems.length && this.options.allSelected) { - $span.removeClass('placeholder').html(this.options.allSelected); - } else if (selects.length > this.options.minumimCountSelected && this.options.countSelected) { - $span.removeClass('placeholder').html(this.options.countSelected - .replace('#', selects.length) - .replace('%', this.$selectItems.length + this.$disableItems.length)); - } else if (selects.length) { - $span.removeClass('placeholder').html(selects.join(', ')); - } else { - $span.addClass('placeholder').html(this.options.placeholder); - } - // set selects to select - this.$el.val(this.getSelects()); - }, - - updateSelectAll: function() { - var $items = this.$selectItems.filter(':visible'); - this.$selectAll.prop('checked', $items.length && - $items.length === $items.filter(':checked').length); - if (this.$selectAll.prop('checked')) { - this.options.onCheckAll(); - } - }, - - updateOptGroupSelect: function() { - var $items = this.$selectItems.filter(':visible'); - $.each(this.$selectGroups, function(i, val) { - var group = $(val).parent().attr('data-group'), - $children = $items.filter('[data-group="' + group + '"]'); - $(val).prop('checked', $children.length && - $children.length === $children.filter(':checked').length); - }); - }, - - //value or text, default: 'value' - getSelects: function(type) { - var that = this, - texts = [], - values = []; - this.$drop.find('input[' + this.selectItemName + ']:checked').each(function() { - texts.push($(this).parent().text()); - values.push($(this).val()); - }); - - if (type === 'text' && this.$selectGroups.length) { - texts = []; - this.$selectGroups.each(function() { - var html = [], - text = $.trim($(this).parent().text()), - group = $(this).parent().data('group'), - $children = that.$drop.find('[' + that.selectItemName + '][data-group="' + group + '"]'), - $selected = $children.filter(':checked'); - - if ($selected.length === 0) { - return; - } - - html.push('['); - html.push(text); - if ($children.length > $selected.length) { - var list = []; - $selected.each(function() { - list.push($(this).parent().text()); - }); - html.push(': ' + list.join(', ')); - } - html.push(']'); - texts.push(html.join('')); - }); - } - return type === 'text' ? texts : values; - }, - - setSelects: function(values) { - var that = this; - this.$selectItems.prop('checked', false); - $.each(values, function(i, value) { - that.$selectItems.filter('[value="' + value + '"]').prop('checked', true); - }); - this.$selectAll.prop('checked', this.$selectItems.length === - this.$selectItems.filter(':checked').length); - this.update(); - }, - - enable: function() { - this.$choice.removeClass('disabled'); - }, - - disable: function() { - this.$choice.addClass('disabled'); - }, - - checkAll: function() { - this.$selectItems.prop('checked', true); - this.$selectGroups.prop('checked', true); - this.$selectAll.prop('checked', true); - this.update(); - this.options.onCheckAll(); - }, - - uncheckAll: function() { - this.$selectItems.prop('checked', false); - this.$selectGroups.prop('checked', false); - this.$selectAll.prop('checked', false); - this.update(); - this.options.onUncheckAll(); - }, - - focus: function() { - this.$choice.focus(); - this.options.onFocus(); - }, - - blur: function() { - this.$choice.blur(); - this.options.onBlur(); - }, - - refresh: function() { - this.init(); - }, - - filter: function() { - var that = this, - text = $.trim(this.$searchInput.val()).toLowerCase(); - if (text.length === 0) { - this.$selectItems.parent().show(); - this.$disableItems.parent().show(); - this.$selectGroups.parent().show(); - } else { - this.$selectItems.each(function() { - var $parent = $(this).parent(); - $parent[$parent.text().toLowerCase().indexOf(text) < 0 ? 'hide' : 'show'](); - }); - this.$disableItems.parent().hide(); - this.$selectGroups.each(function() { - var $parent = $(this).parent(); - var group = $parent.attr('data-group'), - $items = that.$selectItems.filter(':visible'); - $parent[$items.filter('[data-group="' + group + '"]').length === 0 ? 'hide' : 'show'](); - }); - - //Check if no matches found - if (this.$selectItems.filter(':visible').length) { - this.$selectAll.parent().show(); - this.$noResults.hide(); - } else { - this.$selectAll.parent().hide(); - this.$noResults.show(); - } - } - this.updateOptGroupSelect(); - this.updateSelectAll(); - } - }; - - $.fn.multipleSelect = function() { - var option = arguments[0], - args = arguments, - - value, - allowedMethods = [ - 'getSelects', 'setSelects', - 'enable', 'disable', - 'checkAll', 'uncheckAll', - 'focus', 'blur', - 'refresh' - ]; - - this.each(function() { - var $this = $(this), - data = $this.data('multipleSelect'), - options = $.extend({}, $.fn.multipleSelect.defaults, - $this.data(), typeof option === 'object' && option); - - if (!data) { - data = new MultipleSelect($this, options); - $this.data('multipleSelect', data); - } - - if (typeof option === 'string') { - if ($.inArray(option, allowedMethods) < 0) { - throw "Unknown method: " + option; - } - value = data[option](args[1]); - } else { - data.init(); - } - }); - - return value ? value : this; - }; - - $.fn.multipleSelect.defaults = { - name: '', - isOpen: false, - placeholder: '', - selectAll: true, - selectAllText: 'Select all', - allSelected: 'All selected', - minumimCountSelected: 3, - countSelected: '# of % selected', - multiple: false, - multipleWidth: 80, - single: false, - filter: false, - width: undefined, - maxHeight: 250, - container: null, - position: 'bottom', - keepOpen: false, - - styler: function() {return false;}, - - onOpen: function() {return false;}, - onClose: function() {return false;}, - onCheckAll: function() {return false;}, - onUncheckAll: function() {return false;}, - onFocus: function() {return false;}, - onBlur: function() {return false;}, - onOptgroupClick: function() {return false;}, - onClick: function() {return false;} - }; -})(jQuery); diff --git a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.css b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.css deleted file mode 100644 index d824e0c7a2b..00000000000 --- a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.css +++ /dev/null @@ -1,183 +0,0 @@ -/** - * @author zhixin wen - */ - -.ms-parent { - display: inline-block; - position: relative; - vertical-align: middle; -} - -.ms-choice { - display: block; - height: 26px; - padding: 0; - overflow: hidden; - cursor: pointer; - border: 1px solid #aaa; - text-align: left; - white-space: nowrap; - line-height: 26px; - color: #444; - text-decoration: none; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #fff; -} - -.ms-choice.disabled { - background-color: #f4f4f4; - background-image: none; - border: 1px solid #ddd; - cursor: default; -} - -.ms-choice > span { - position: absolute; - top: 0; - left: 0; - right: 20px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - display: block; - padding-left: 8px; -} - -.ms-choice > span.placeholder { - color: #999; -} - -.ms-choice > div { - position: absolute; - top: 0; - right: 0; - width: 20px; - height: 25px; - background: url('multiple-select.png') right top no-repeat; -} - -.ms-choice > div.open { - background: url('multiple-select.png') left top no-repeat; -} - -.ms-drop { - overflow: hidden; - display: none; - margin-top: -1px; - padding: 0; - position: absolute; - z-index: 1000; - background: #fff; - color: #000; - border: 1px solid #aaa; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.ms-drop.bottom { - top: 100%; - -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); - -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); - box-shadow: 0 4px 5px rgba(0, 0, 0, .15); -} - -.ms-drop.top { - bottom: 100%; - -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); - -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); - box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); -} - -.ms-search { - display: inline-block; - margin: 0; - min-height: 26px; - padding: 4px; - position: relative; - white-space: nowrap; - width: 100%; - z-index: 10000; -} - -.ms-search input { - width: 100%; - height: auto !important; - min-height: 24px; - padding: 0 20px 0 5px; - margin: 0; - outline: 0; - font-family: sans-serif; - font-size: 1em; - border: 1px solid #aaa; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - background: #fff url('multiple-select.png') no-repeat 100% -22px; - background: url('multiple-select.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee)); - background: url('multiple-select.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%); - background: url('multiple-select.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%); - background: url('multiple-select.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%); - background: url('multiple-select.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%); - background: url('multiple-select.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%, #eeeeee 99%); -} - -.ms-search, .ms-search input { - -webkit-box-sizing: border-box; - -khtml-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -} - -.ms-drop ul { - overflow: auto; - margin: 0; - padding: 5px 8px; -} - -.ms-drop ul > li { - list-style: none; - display: list-item; - background-image: none; - position: static; -} - -.ms-drop ul > li .disabled { - opacity: .35; - filter: Alpha(Opacity=35); -} - -.ms-drop ul > li.multiple { - display: block; - float: left; -} - -.ms-drop ul > li.group { - clear: both; -} - -.ms-drop ul > li.multiple label { - width: 100%; - display: block; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.ms-drop ul > li label.optgroup { - font-weight: bold; -} - -.ms-drop input[type="checkbox"] { - vertical-align: middle; -} - -.ms-drop .ms-no-results { - display: none; -} \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json deleted file mode 100644 index dd636fda7e0..00000000000 --- a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "multiple-select", - "version": "1.1.0", - "title": "Multiple Select", - "description": "Multiple select is a jQuery plugin to select multiple elements with checkboxes :).", - "author": { - "name": "zhixin wen", - "email": "wenzhixin2010@gmail.com", - "url": "http://wenzhixin.net.cn/" - }, - "licenses": [ - { - "type": "MIT License", - "url": "http://opensource.org/licenses/MIT" - } - ], - "dependencies": { - "jquery": ">=1.7" - }, - "keywords": ["multiple.select", "select.list", "multiple.choose", "checkbox"], - "homepage": "http://wenzhixin.net.cn/p/multiple-select/", - "demo": "http://wenzhixin.net.cn/p/multiple-select/#examples", - "bugs": { - "url": "https://github.com/wenzhixin/multiple-select/issues" - }, - "docs": "http://wenzhixin.net.cn/p/multiple-select/#documentation", - "download": "https://github.com/wenzhixin/multiple-select/archive/master.zip" -} \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.png b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.png deleted file mode 100644 index 2a7ba608ea8..00000000000 Binary files a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.png and /dev/null differ diff --git a/htdocs/includes/jquery/plugins/select2/.gitignore b/htdocs/includes/jquery/plugins/select2/.gitignore new file mode 100644 index 00000000000..c6ef2182bdc --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/.gitignore @@ -0,0 +1,2 @@ +.idea + diff --git a/htdocs/includes/jquery/plugins/select2/CONTRIBUTING.md b/htdocs/includes/jquery/plugins/select2/CONTRIBUTING.md new file mode 100644 index 00000000000..bca4baf61a3 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/CONTRIBUTING.md @@ -0,0 +1,107 @@ +Contributing to Select2 +======================= +Looking to contribute something to Select2? **Here's how you can help.** + +Please take a moment to review this document in order to make the contribution +process easy and effective for everyone involved. + +Following these guidelines helps to communicate that you respect the time of +the developers managing and developing this open source project. In return, +they should reciprocate that respect in addressing your issue or assessing +patches and features. + +Using the issue tracker +----------------------- +When [reporting bugs][reporting-bugs] or +[requesting features][requesting-features], the +[issue tracker on GitHub][issue-tracker] is the recommended channel to use. + +The issue tracker **is not** a place for support requests. The +[mailing list][mailing-list] or [IRC channel][irc-channel] are better places to +get help. + +Reporting bugs with Select2 +--------------------------- +We really appreciate clear bug reports that _consistently_ show an issue +_within Select2_. + +The ideal bug report follows these guidelines: + +1. **Use the [GitHub issue search][issue-search]** — Check if the issue + has already been reported. +2. **Check if the issue has been fixed** — Try to reproduce the problem + using the code in the `master` branch. +3. **Isolate the problem** — Try to create an + [isolated test case][isolated-case] that consistently reproduces the problem. + +Please try to be as detailed as possible in your bug report, especially if an +isolated test case cannot be made. Some useful questions to include the answer +to are: + +- What steps can be used to reproduce the issue? +- What is the bug and what is the expected outcome? +- What browser(s) and Operating System have you tested with? +- Does the bug happen consistently across all tested browsers? +- What version of jQuery are you using? And what version of Select2? +- Are you using Select2 with other plugins? + +All of these questions will help people fix and identify any potential bugs. + +Requesting features in Select2 +------------------------------ +Select2 is a large library that carries with it a lot of functionality. Because +of this, many feature requests will not be implemented in the core library. + +Before starting work on a major feature for Select2, **contact the +[community][community] first** or you may risk spending a considerable amount of +time on something which the project developers are not interested in bringing +into the project. + +### Select2 4.0 + +Many feature requests will be closed off until 4.0, where Select2 plans to adopt +a more flexible API. If you are interested in helping with the development of +the next major Select2 release, please send a message to the +[mailing list][mailing-list] or [irc channel][irc-channel] for more information. + +Triaging issues and pull requests +--------------------------------- +Anyone can help the project maintainers triage issues and review pull requests. + +### Handling new issues + +Select2 regularly receives new issues which need to be tested and organized. + +When a new issue that comes in that is similar to another existing issue, it +should be checked to make sure it is not a duplicate. Duplicates issues should +be marked by replying to the issue with "Duplicate of #[issue number]" where +`[issue number]` is the url or issue number for the existing issue. This will +allow the project maintainers to quickly close off additional issues and keep +the discussion focused within a single issue. + +If you can test issues that are reported to Select2 that contain test cases and +confirm under what conditions bugs happen, that will allow others to identify +what causes a bug quicker. + +### Reviewing pull requests + +It is very common for pull requests to be opened for issues that contain a clear +solution to the problem. These pull requests should be rigorously reviewed by +the community before being accepted. If you are not sure about a piece of +submitted code, or know of a better way to do something, do not hesitate to make +a comment on the pull request. + +It should also be made clear that **all code contributed to Select** must be +licensable under the [Apache 2 or GPL 2 licenses][licensing]. Code that cannot +be released under either of these licenses **cannot be accepted** into the +project. + +[community]: https://github.com/ivaynberg/select2#community +[reporting-bugs]: #reporting-bugs-with-select2 +[requesting-features]: #requesting-features-in-select2 +[issue-tracker]: https://github.com/ivaynberg/select2/issues +[mailing-list]: https://github.com/ivaynberg/select2#mailing-list +[irc-channel]: https://github.com/ivaynberg/select2#irc-channel +[issue-search]: https://github.com/ivaynberg/select2/search?q=&type=Issues +[isolated-case]: http://css-tricks.com/6263-reduced-test-cases/ +[licensing]: https://github.com/ivaynberg/select2#copyright-and-license diff --git a/htdocs/includes/jquery/plugins/select2/LICENSE b/htdocs/includes/jquery/plugins/select2/LICENSE new file mode 100644 index 00000000000..0247cc76273 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/LICENSE @@ -0,0 +1,18 @@ +Copyright 2014 Igor Vaynberg + +Version: @@ver@@ Timestamp: @@timestamp@@ + +This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU +General Public License version 2 (the "GPL License"). You may choose either license to govern your +use of this software only upon the condition that you accept all of the terms of either the Apache +License or the GPL License. + +You may obtain a copy of the Apache License and the GPL License at: + +http://www.apache.org/licenses/LICENSE-2.0 +http://www.gnu.org/licenses/gpl-2.0.html + +Unless required by applicable law or agreed to in writing, software distributed under the Apache License +or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +either express or implied. See the Apache License and the GPL License for the specific language governing +permissions and limitations under the Apache License and the GPL License. diff --git a/htdocs/includes/jquery/plugins/select2/README.md b/htdocs/includes/jquery/plugins/select2/README.md new file mode 100644 index 00000000000..64380c45147 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/README.md @@ -0,0 +1,114 @@ +Select2 +======= + +Select2 is a jQuery-based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results. + +To get started, checkout examples and documentation at http://ivaynberg.github.com/select2 + +Use cases +--------- + +* Enhancing native selects with search. +* Enhancing native selects with a better multi-select interface. +* Loading data from JavaScript: easily load items via ajax and have them searchable. +* Nesting optgroups: native selects only support one level of nested. Select2 does not have this restriction. +* Tagging: ability to add new items on the fly. +* Working with large, remote datasets: ability to partially load a dataset based on the search term. +* Paging of large datasets: easy support for loading more pages when the results are scrolled to the end. +* Templating: support for custom rendering of results and selections. + +Browser compatibility +--------------------- +* IE 8+ +* Chrome 8+ +* Firefox 10+ +* Safari 3+ +* Opera 10.6+ + +Usage +----- +You can source Select2 directly from a CDN like [JSDliver](http://www.jsdelivr.com/#!select2) or [CDNJS](http://www.cdnjs.com/libraries/select2), [download it from this GitHub repo](https://github.com/ivaynberg/select2/tags), or use one of the integrations below. + +Integrations +------------ + +* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / [Apache Wicket](http://wicket.apache.org)) +* [select2-rails](https://github.com/argerim/select2-rails) (Ruby on Rails) +* [AngularUI](http://angular-ui.github.io/#ui-select) ([AngularJS](https://angularjs.org/)) +* [Django](https://github.com/applegrew/django-select2) +* [Symfony](https://github.com/19Gerhard85/sfSelect2WidgetsPlugin) +* [Symfony2](https://github.com/avocode/FormExtensions) +* [Bootstrap 2](https://github.com/t0m/select2-bootstrap-css) and [Bootstrap 3](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3) (CSS skins) +* [Meteor](https://github.com/nate-strauser/meteor-select2) (modern reactive JavaScript framework; + [Bootstrap 3 skin](https://github.com/esperadomedia/meteor-select2-bootstrap3-css/)) +* [Meteor](https://jquery-select2.meteor.com) +* [Yii 2.x](http://demos.krajee.com/widgets#select2) +* [Yii 1.x](https://github.com/tonybolzan/yii-select2) +* [AtmosphereJS](https://atmospherejs.com/package/jquery-select2) + +### Example Integrations + +* [Knockout.js](https://github.com/ivaynberg/select2/wiki/Knockout.js-Integration) +* [Socket.IO](https://github.com/ivaynberg/select2/wiki/Socket.IO-Integration) +* [PHP](https://github.com/ivaynberg/select2/wiki/PHP-Example) +* [.Net MVC] (https://github.com/ivaynberg/select2/wiki/.Net-MVC-Example) + +Internationalization (i18n) +--------------------------- + +Select2 supports multiple languages by simply including the right language JS +file (`select2_locale_it.js`, `select2_locale_nl.js`, etc.) after `select2.js`. + +Missing a language? Just copy `select2_locale_en.js.template`, translate +it, and make a pull request back to Select2 here on GitHub. + +Documentation +------------- + +The documentation for Select2 is available [through GitHub Pages](https://ivaynberg.github.io/select2/) and is located within this repository in the [`gh-pages` branch](https://github.com/ivaynberg/select2/tree/gh-pages). + +Community +--------- + +### Bug tracker + +Have a bug? Please create an issue here on GitHub! + +https://github.com/ivaynberg/select2/issues + +### Mailing list + +Have a question? Ask on our mailing list! + +select2@googlegroups.com + +https://groups.google.com/d/forum/select2 + +### IRC channel + +Need help implementing Select2 in your project? Ask in our IRC channel! + +**Network:** [Freenode](https://freenode.net/) (`chat.freenode.net`) + +**Channel:** `#select2` + +**Web access:** https://webchat.freenode.net/?channels=select2 + +Copyright and license +--------------------- + +Copyright 2012 Igor Vaynberg + +This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU +General Public License version 2 (the "GPL License"). You may choose either license to govern your +use of this software only upon the condition that you accept all of the terms of either the Apache +License or the GPL License. + +You may obtain a copy of the Apache License and the GPL License in the LICENSE file, or at: + +http://www.apache.org/licenses/LICENSE-2.0 +http://www.gnu.org/licenses/gpl-2.0.html + +Unless required by applicable law or agreed to in writing, software distributed under the Apache License +or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +either express or implied. See the Apache License and the GPL License for the specific language governing +permissions and limitations under the Apache License and the GPL License. diff --git a/htdocs/includes/jquery/plugins/select2/bower.json b/htdocs/includes/jquery/plugins/select2/bower.json new file mode 100644 index 00000000000..54d44c4593b --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/bower.json @@ -0,0 +1,8 @@ +{ + "name": "select2", + "version": "3.5.2", + "main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "select2-spinner.gif"], + "dependencies": { + "jquery": ">= 1.7.1" + } +} diff --git a/htdocs/includes/jquery/plugins/select2/component.json b/htdocs/includes/jquery/plugins/select2/component.json new file mode 100644 index 00000000000..8bd3c020a29 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/component.json @@ -0,0 +1,66 @@ +{ + "name": "select2", + "repo": "ivaynberg/select2", + "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.", + "version": "3.5.2", + "demo": "http://ivaynberg.github.io/select2/", + "keywords": [ + "jquery" + ], + "main": "select2.js", + "styles": [ + "select2.css", + "select2-bootstrap.css" + ], + "scripts": [ + "select2.js", + "select2_locale_ar.js", + "select2_locale_bg.js", + "select2_locale_ca.js", + "select2_locale_cs.js", + "select2_locale_da.js", + "select2_locale_de.js", + "select2_locale_el.js", + "select2_locale_es.js", + "select2_locale_et.js", + "select2_locale_eu.js", + "select2_locale_fa.js", + "select2_locale_fi.js", + "select2_locale_fr.js", + "select2_locale_gl.js", + "select2_locale_he.js", + "select2_locale_hr.js", + "select2_locale_hu.js", + "select2_locale_id.js", + "select2_locale_is.js", + "select2_locale_it.js", + "select2_locale_ja.js", + "select2_locale_ka.js", + "select2_locale_ko.js", + "select2_locale_lt.js", + "select2_locale_lv.js", + "select2_locale_mk.js", + "select2_locale_ms.js", + "select2_locale_nl.js", + "select2_locale_no.js", + "select2_locale_pl.js", + "select2_locale_pt-BR.js", + "select2_locale_pt-PT.js", + "select2_locale_ro.js", + "select2_locale_ru.js", + "select2_locale_sk.js", + "select2_locale_sv.js", + "select2_locale_th.js", + "select2_locale_tr.js", + "select2_locale_uk.js", + "select2_locale_vi.js", + "select2_locale_zh-CN.js", + "select2_locale_zh-TW.js" + ], + "images": [ + "select2-spinner.gif", + "select2.png", + "select2x2.png" + ], + "license": "MIT" +} diff --git a/htdocs/includes/jquery/plugins/select2/composer.json b/htdocs/includes/jquery/plugins/select2/composer.json new file mode 100644 index 00000000000..cd2d26a2a98 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/composer.json @@ -0,0 +1,29 @@ +{ + "name": + "ivaynberg/select2", + "description": "Select2 is a jQuery based replacement for select boxes.", + "version": "3.5.2", + "type": "component", + "homepage": "http://ivaynberg.github.io/select2/", + "license": "Apache-2.0", + "require": { + "robloach/component-installer": "*", + "components/jquery": ">=1.7.1" + }, + "extra": { + "component": { + "scripts": [ + "select2.js" + ], + "files": [ + "select2.js", + "select2_locale_*.js", + "select2.css", + "select2-bootstrap.css", + "select2-spinner.gif", + "select2.png", + "select2x2.png" + ] + } + } +} diff --git a/htdocs/includes/jquery/plugins/select2/package.json b/htdocs/includes/jquery/plugins/select2/package.json new file mode 100644 index 00000000000..709cb1c66b4 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/package.json @@ -0,0 +1,20 @@ +{ + "name" : "Select2", + "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.", + "homepage": "http://ivaynberg.github.io/select2", + "author": "Igor Vaynberg", + "repository": {"type": "git", "url": "git://github.com/ivaynberg/select2.git"}, + "main": "select2.js", + "version": "3.5.2", + "jspm": { + "main": "select2", + "files": ["select2.js", "select2.png", "select2.css", "select2-spinner.gif"], + "shim": { + "select2": { + "imports": ["jquery", "./select2.css!"], + "exports": "$" + } + }, + "buildConfig": { "uglify": true } + } +} diff --git a/htdocs/includes/jquery/plugins/select2/release.sh b/htdocs/includes/jquery/plugins/select2/release.sh new file mode 100644 index 00000000000..3b63f96621e --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/release.sh @@ -0,0 +1,79 @@ +#!/bin/bash +set -e + +echo -n "Enter the version for this release: " + +read ver + +if [ ! $ver ]; then + echo "Invalid version." + exit +fi + +name="select2" +js="$name.js" +mini="$name.min.js" +css="$name.css" +release="$name-$ver" +tag="$ver" +branch="build-$ver" +curbranch=`git branch | grep "*" | sed "s/* //"` +timestamp=$(date) +tokens="s/@@ver@@/$ver/g;s/\@@timestamp@@/$timestamp/g" +remote="origin" + +echo "Pulling from origin" + +git pull + +echo "Updating Version Identifiers" + +sed -E -e "s/\"version\": \"([0-9\.]+)\",/\"version\": \"$ver\",/g" -i -- bower.json select2.jquery.json component.json composer.json package.json + +git add bower.json +git add select2.jquery.json +git add component.json +git add composer.json +git add package.json + +git commit -m "modified version identifiers in descriptors for release $ver" +git push + +git branch "$branch" +git checkout "$branch" + +echo "Tokenizing..." + +find . -name "$js" | xargs -I{} sed -e "$tokens" -i -- {} +find . -name "$css" | xargs -I{} sed -e "$tokens" -i -- {} + +sed -e "s/latest/$ver/g" -i -- bower.json + +git add "$js" +git add "$css" + +echo "Minifying..." + +echo "/*" > "$mini" +cat LICENSE | sed "$tokens" >> "$mini" +echo "*/" >> "$mini" + +curl -s \ + --data-urlencode "js_code@$js" \ + http://marijnhaverbeke.nl/uglifyjs \ + >> "$mini" + +git add "$mini" + +git commit -m "release $ver" + +echo "Tagging..." +git tag -a "$tag" -m "tagged version $ver" +git push "$remote" --tags + +echo "Cleaning Up..." + +git checkout "$curbranch" +git branch -D "$branch" + +echo "Done" diff --git a/htdocs/includes/jquery/plugins/select2/select2-bootstrap.css b/htdocs/includes/jquery/plugins/select2/select2-bootstrap.css new file mode 100644 index 00000000000..3b83f0a2297 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2-bootstrap.css @@ -0,0 +1,87 @@ +.form-control .select2-choice { + border: 0; + border-radius: 2px; +} + +.form-control .select2-choice .select2-arrow { + border-radius: 0 2px 2px 0; +} + +.form-control.select2-container { + height: auto !important; + padding: 0; +} + +.form-control.select2-container.select2-dropdown-open { + border-color: #5897FB; + border-radius: 3px 3px 0 0; +} + +.form-control .select2-container.select2-dropdown-open .select2-choices { + border-radius: 3px 3px 0 0; +} + +.form-control.select2-container .select2-choices { + border: 0 !important; + border-radius: 3px; +} + +.control-group.warning .select2-container .select2-choice, +.control-group.warning .select2-container .select2-choices, +.control-group.warning .select2-container-active .select2-choice, +.control-group.warning .select2-container-active .select2-choices, +.control-group.warning .select2-dropdown-open.select2-drop-above .select2-choice, +.control-group.warning .select2-dropdown-open.select2-drop-above .select2-choices, +.control-group.warning .select2-container-multi.select2-container-active .select2-choices { + border: 1px solid #C09853 !important; +} + +.control-group.warning .select2-container .select2-choice div { + border-left: 1px solid #C09853 !important; + background: #FCF8E3 !important; +} + +.control-group.error .select2-container .select2-choice, +.control-group.error .select2-container .select2-choices, +.control-group.error .select2-container-active .select2-choice, +.control-group.error .select2-container-active .select2-choices, +.control-group.error .select2-dropdown-open.select2-drop-above .select2-choice, +.control-group.error .select2-dropdown-open.select2-drop-above .select2-choices, +.control-group.error .select2-container-multi.select2-container-active .select2-choices { + border: 1px solid #B94A48 !important; +} + +.control-group.error .select2-container .select2-choice div { + border-left: 1px solid #B94A48 !important; + background: #F2DEDE !important; +} + +.control-group.info .select2-container .select2-choice, +.control-group.info .select2-container .select2-choices, +.control-group.info .select2-container-active .select2-choice, +.control-group.info .select2-container-active .select2-choices, +.control-group.info .select2-dropdown-open.select2-drop-above .select2-choice, +.control-group.info .select2-dropdown-open.select2-drop-above .select2-choices, +.control-group.info .select2-container-multi.select2-container-active .select2-choices { + border: 1px solid #3A87AD !important; +} + +.control-group.info .select2-container .select2-choice div { + border-left: 1px solid #3A87AD !important; + background: #D9EDF7 !important; +} + +.control-group.success .select2-container .select2-choice, +.control-group.success .select2-container .select2-choices, +.control-group.success .select2-container-active .select2-choice, +.control-group.success .select2-container-active .select2-choices, +.control-group.success .select2-dropdown-open.select2-drop-above .select2-choice, +.control-group.success .select2-dropdown-open.select2-drop-above .select2-choices, +.control-group.success .select2-container-multi.select2-container-active .select2-choices { + border: 1px solid #468847 !important; +} + +.control-group.success .select2-container .select2-choice div { + border-left: 1px solid #468847 !important; + background: #DFF0D8 !important; +} diff --git a/htdocs/includes/jquery/plugins/select2/select2-spinner.gif b/htdocs/includes/jquery/plugins/select2/select2-spinner.gif new file mode 100644 index 00000000000..5b33f7e54f4 Binary files /dev/null and b/htdocs/includes/jquery/plugins/select2/select2-spinner.gif differ diff --git a/htdocs/includes/jquery/plugins/select2/select2.css b/htdocs/includes/jquery/plugins/select2/select2.css new file mode 100644 index 00000000000..2d07a0343b0 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2.css @@ -0,0 +1,704 @@ +/* +Version: 3.5.2 Timestamp: Sat Nov 1 14:43:36 EDT 2014 +*/ +.select2-container { + margin: 0; + position: relative; + display: inline-block; + /* inline-block for ie7 */ + zoom: 1; + *display: inline; + vertical-align: middle; +} + +.select2-container, +.select2-drop, +.select2-search, +.select2-search input { + /* + Force border-box so that % widths fit the parent + container without overlap because of margin/padding. + More Info : http://www.quirksmode.org/css/box.html + */ + -webkit-box-sizing: border-box; /* webkit */ + -moz-box-sizing: border-box; /* firefox */ + box-sizing: border-box; /* css3 */ +} + +.select2-container .select2-choice { + display: block; + height: 26px; + padding: 0 0 0 8px; + overflow: hidden; + position: relative; + + border: 1px solid #aaa; + white-space: nowrap; + line-height: 26px; + color: #444; + text-decoration: none; + + border-radius: 4px; + + background-clip: padding-box; + + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + + background-color: #fff; + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.5, #fff)); + background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 50%); + background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 50%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#ffffff', endColorstr = '#eeeeee', GradientType = 0); + background-image: linear-gradient(to top, #eee 0%, #fff 50%); +} + +html[dir="rtl"] .select2-container .select2-choice { + padding: 0 8px 0 0; +} + +.select2-container.select2-drop-above .select2-choice { + border-bottom-color: #aaa; + + border-radius: 0 0 4px 4px; + + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.9, #fff)); + background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 90%); + background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 90%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0); + background-image: linear-gradient(to bottom, #eee 0%, #fff 90%); +} + +.select2-container.select2-allowclear .select2-choice .select2-chosen { + margin-right: 42px; +} + +.select2-container .select2-choice > .select2-chosen { + margin-right: 26px; + display: block; + overflow: hidden; + + white-space: nowrap; + + text-overflow: ellipsis; + float: none; + width: auto; +} + +html[dir="rtl"] .select2-container .select2-choice > .select2-chosen { + margin-left: 26px; + margin-right: 0; +} + +.select2-container .select2-choice abbr { + display: none; + width: 12px; + height: 12px; + position: absolute; + right: 24px; + top: 8px; + + font-size: 1px; + text-decoration: none; + + border: 0; + background: url('select2.png') right top no-repeat; + cursor: pointer; + outline: 0; +} + +.select2-container.select2-allowclear .select2-choice abbr { + display: inline-block; +} + +.select2-container .select2-choice abbr:hover { + background-position: right -11px; + cursor: pointer; +} + +.select2-drop-mask { + border: 0; + margin: 0; + padding: 0; + position: fixed; + left: 0; + top: 0; + min-height: 100%; + min-width: 100%; + height: auto; + width: auto; + opacity: 0; + z-index: 9998; + /* styles required for IE to work */ + background-color: #fff; + filter: alpha(opacity=0); +} + +.select2-drop { + width: 100%; + margin-top: -1px; + position: absolute; + z-index: 9999; + top: 100%; + + background: #fff; + color: #000; + border: 1px solid #aaa; + border-top: 0; + + border-radius: 0 0 4px 4px; + + -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); + box-shadow: 0 4px 5px rgba(0, 0, 0, .15); +} + +.select2-drop.select2-drop-above { + margin-top: 1px; + border-top: 1px solid #aaa; + border-bottom: 0; + + border-radius: 4px 4px 0 0; + + -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); + box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); +} + +.select2-drop-active { + border: 1px solid #5897fb; + border-top: none; +} + +.select2-drop.select2-drop-above.select2-drop-active { + border-top: 1px solid #5897fb; +} + +.select2-drop-auto-width { + border-top: 1px solid #aaa; + width: auto; +} + +.select2-drop-auto-width .select2-search { + padding-top: 4px; +} + +.select2-container .select2-choice .select2-arrow { + display: inline-block; + width: 18px; + height: 100%; + position: absolute; + right: 0; + top: 0; + + border-left: 1px solid #aaa; + border-radius: 0 4px 4px 0; + + background-clip: padding-box; + + background: #ccc; + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee)); + background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%); + background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#cccccc', GradientType = 0); + background-image: linear-gradient(to top, #ccc 0%, #eee 60%); +} + +html[dir="rtl"] .select2-container .select2-choice .select2-arrow { + left: 0; + right: auto; + + border-left: none; + border-right: 1px solid #aaa; + border-radius: 4px 0 0 4px; +} + +.select2-container .select2-choice .select2-arrow b { + display: block; + width: 100%; + height: 100%; + background: url('select2.png') no-repeat 0 1px; +} + +html[dir="rtl"] .select2-container .select2-choice .select2-arrow b { + background-position: 2px 1px; +} + +.select2-search { + display: inline-block; + width: 100%; + min-height: 26px; + margin: 0; + padding-left: 4px; + padding-right: 4px; + + position: relative; + z-index: 10000; + + white-space: nowrap; +} + +.select2-search input { + width: 100%; + height: auto !important; + min-height: 26px; + padding: 4px 20px 4px 5px; + margin: 0; + + outline: 0; + font-family: sans-serif; + font-size: 1em; + + border: 1px solid #aaa; + border-radius: 0; + + -webkit-box-shadow: none; + box-shadow: none; + + background: #fff url('select2.png') no-repeat 100% -22px; + background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); + background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; +} + +html[dir="rtl"] .select2-search input { + padding: 4px 5px 4px 20px; + + background: #fff url('select2.png') no-repeat -37px -22px; + background: url('select2.png') no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); + background: url('select2.png') no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('select2.png') no-repeat -37px -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('select2.png') no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; +} + +.select2-drop.select2-drop-above .select2-search input { + margin-top: 4px; +} + +.select2-search input.select2-active { + background: #fff url('select2-spinner.gif') no-repeat 100%; + background: url('select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); + background: url('select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('select2-spinner.gif') no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; +} + +.select2-container-active .select2-choice, +.select2-container-active .select2-choices { + border: 1px solid #5897fb; + outline: none; + + -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3); + box-shadow: 0 0 5px rgba(0, 0, 0, .3); +} + +.select2-dropdown-open .select2-choice { + border-bottom-color: transparent; + -webkit-box-shadow: 0 1px 0 #fff inset; + box-shadow: 0 1px 0 #fff inset; + + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + + background-color: #eee; + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #fff), color-stop(0.5, #eee)); + background-image: -webkit-linear-gradient(center bottom, #fff 0%, #eee 50%); + background-image: -moz-linear-gradient(center bottom, #fff 0%, #eee 50%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0); + background-image: linear-gradient(to top, #fff 0%, #eee 50%); +} + +.select2-dropdown-open.select2-drop-above .select2-choice, +.select2-dropdown-open.select2-drop-above .select2-choices { + border: 1px solid #5897fb; + border-top-color: transparent; + + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(0.5, #eee)); + background-image: -webkit-linear-gradient(center top, #fff 0%, #eee 50%); + background-image: -moz-linear-gradient(center top, #fff 0%, #eee 50%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0); + background-image: linear-gradient(to bottom, #fff 0%, #eee 50%); +} + +.select2-dropdown-open .select2-choice .select2-arrow { + background: transparent; + border-left: none; + filter: none; +} +html[dir="rtl"] .select2-dropdown-open .select2-choice .select2-arrow { + border-right: none; +} + +.select2-dropdown-open .select2-choice .select2-arrow b { + background-position: -18px 1px; +} + +html[dir="rtl"] .select2-dropdown-open .select2-choice .select2-arrow b { + background-position: -16px 1px; +} + +.select2-hidden-accessible { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} + +/* results */ +.select2-results { + max-height: 200px; + padding: 0 0 0 4px; + margin: 4px 4px 4px 0; + position: relative; + overflow-x: hidden; + overflow-y: auto; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} + +html[dir="rtl"] .select2-results { + padding: 0 4px 0 0; + margin: 4px 0 4px 4px; +} + +.select2-results ul.select2-result-sub { + margin: 0; + padding-left: 0; +} + +.select2-results li { + list-style: none; + display: list-item; + background-image: none; +} + +.select2-results li.select2-result-with-children > .select2-result-label { + font-weight: bold; +} + +.select2-results .select2-result-label { + padding: 3px 7px 4px; + margin: 0; + cursor: pointer; + + min-height: 1em; + + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.select2-results-dept-1 .select2-result-label { padding-left: 20px } +.select2-results-dept-2 .select2-result-label { padding-left: 40px } +.select2-results-dept-3 .select2-result-label { padding-left: 60px } +.select2-results-dept-4 .select2-result-label { padding-left: 80px } +.select2-results-dept-5 .select2-result-label { padding-left: 100px } +.select2-results-dept-6 .select2-result-label { padding-left: 110px } +.select2-results-dept-7 .select2-result-label { padding-left: 120px } + +.select2-results .select2-highlighted { + background: #3875d7; + color: #fff; +} + +.select2-results li em { + background: #feffde; + font-style: normal; +} + +.select2-results .select2-highlighted em { + background: transparent; +} + +.select2-results .select2-highlighted ul { + background: #fff; + color: #000; +} + +.select2-results .select2-no-results, +.select2-results .select2-searching, +.select2-results .select2-ajax-error, +.select2-results .select2-selection-limit { + background: #f4f4f4; + display: list-item; + padding-left: 5px; +} + +/* +disabled look for disabled choices in the results dropdown +*/ +.select2-results .select2-disabled.select2-highlighted { + color: #666; + background: #f4f4f4; + display: list-item; + cursor: default; +} +.select2-results .select2-disabled { + background: #f4f4f4; + display: list-item; + cursor: default; +} + +.select2-results .select2-selected { + display: none; +} + +.select2-more-results.select2-active { + background: #f4f4f4 url('select2-spinner.gif') no-repeat 100%; +} + +.select2-results .select2-ajax-error { + background: rgba(255, 50, 50, .2); +} + +.select2-more-results { + background: #f4f4f4; + display: list-item; +} + +/* disabled styles */ + +.select2-container.select2-container-disabled .select2-choice { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #ddd; + cursor: default; +} + +.select2-container.select2-container-disabled .select2-choice .select2-arrow { + background-color: #f4f4f4; + background-image: none; + border-left: 0; +} + +.select2-container.select2-container-disabled .select2-choice abbr { + display: none; +} + + +/* multiselect */ + +.select2-container-multi .select2-choices { + height: auto !important; + height: 1%; + margin: 0; + padding: 0 5px 0 0; + position: relative; + + border: 1px solid #aaa; + cursor: text; + overflow: hidden; + + background-color: #fff; + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eee), color-stop(15%, #fff)); + background-image: -webkit-linear-gradient(top, #eee 1%, #fff 15%); + background-image: -moz-linear-gradient(top, #eee 1%, #fff 15%); + background-image: linear-gradient(to bottom, #eee 1%, #fff 15%); +} + +html[dir="rtl"] .select2-container-multi .select2-choices { + padding: 0 0 0 5px; +} + +.select2-locked { + padding: 3px 5px 3px 5px !important; +} + +.select2-container-multi .select2-choices { + min-height: 26px; +} + +.select2-container-multi.select2-container-active .select2-choices { + border: 1px solid #5897fb; + outline: none; + + -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3); + box-shadow: 0 0 5px rgba(0, 0, 0, .3); +} +.select2-container-multi .select2-choices li { + float: left; + list-style: none; +} +html[dir="rtl"] .select2-container-multi .select2-choices li +{ + float: right; +} +.select2-container-multi .select2-choices .select2-search-field { + margin: 0; + padding: 0; + white-space: nowrap; +} + +.select2-container-multi .select2-choices .select2-search-field input { + padding: 5px; + margin: 1px 0; + + font-family: sans-serif; + font-size: 100%; + color: #666; + outline: 0; + border: 0; + -webkit-box-shadow: none; + box-shadow: none; + background: transparent !important; +} + +.select2-container-multi .select2-choices .select2-search-field input.select2-active { + background: #fff url('select2-spinner.gif') no-repeat 100% !important; +} + +.select2-default { + color: #999 !important; +} + +.select2-container-multi .select2-choices .select2-search-choice { + padding: 3px 5px 3px 18px; + margin: 3px 0 3px 5px; + position: relative; + + line-height: 13px; + color: #333; + cursor: default; + border: 1px solid #aaaaaa; + + border-radius: 3px; + + -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05); + box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05); + + background-clip: padding-box; + + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + + background-color: #e4e4e4; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0); + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee)); + background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); + background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); + background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); +} +html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice +{ + margin: 3px 5px 3px 0; + padding: 3px 18px 3px 5px; +} +.select2-container-multi .select2-choices .select2-search-choice .select2-chosen { + cursor: default; +} +.select2-container-multi .select2-choices .select2-search-choice-focus { + background: #d4d4d4; +} + +.select2-search-choice-close { + display: block; + width: 12px; + height: 13px; + position: absolute; + right: 3px; + top: 4px; + + font-size: 1px; + outline: none; + background: url('select2.png') right top no-repeat; +} +html[dir="rtl"] .select2-search-choice-close { + right: auto; + left: 3px; +} + +.select2-container-multi .select2-search-choice-close { + left: 3px; +} + +html[dir="rtl"] .select2-container-multi .select2-search-choice-close { + left: auto; + right: 2px; +} + +.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { + background-position: right -11px; +} +.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close { + background-position: right -11px; +} + +/* disabled styles */ +.select2-container-multi.select2-container-disabled .select2-choices { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #ddd; + cursor: default; +} + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice { + padding: 3px 5px 3px 5px; + border: 1px solid #ddd; + background-image: none; + background-color: #f4f4f4; +} + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close { display: none; + background: none; +} +/* end multiselect */ + + +.select2-result-selectable .select2-match, +.select2-result-unselectable .select2-match { + text-decoration: underline; +} + +.select2-offscreen, .select2-offscreen:focus { + clip: rect(0 0 0 0) !important; + width: 1px !important; + height: 1px !important; + border: 0 !important; + margin: 0 !important; + padding: 0 !important; + overflow: hidden !important; + position: absolute !important; + outline: 0 !important; + left: 0px !important; + top: 0px !important; +} + +.select2-display-none { + display: none; +} + +.select2-measure-scrollbar { + position: absolute; + top: -10000px; + left: -10000px; + width: 100px; + height: 100px; + overflow: scroll; +} + +/* Retina-ize icons */ + +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 2dppx) { + .select2-search input, + .select2-search-choice-close, + .select2-container .select2-choice abbr, + .select2-container .select2-choice .select2-arrow b { + background-image: url('select2x2.png') !important; + background-repeat: no-repeat !important; + background-size: 60px 40px !important; + } + + .select2-search input { + background-position: 100% -21px !important; + } +} diff --git a/htdocs/includes/jquery/plugins/select2/select2.jquery.json b/htdocs/includes/jquery/plugins/select2/select2.jquery.json new file mode 100644 index 00000000000..b005d8a2017 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2.jquery.json @@ -0,0 +1,36 @@ +{ + "name": "select2", + "title": "Select2", + "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.", + "keywords": [ + "select", + "autocomplete", + "typeahead", + "dropdown", + "multiselect", + "tag", + "tagging" + ], + "version": "3.5.2", + "author": { + "name": "Igor Vaynberg", + "url": "https://github.com/ivaynberg" + }, + "licenses": [ + { + "type": "Apache", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + }, + { + "type": "GPL v2", + "url": "http://www.gnu.org/licenses/gpl-2.0.html" + } + ], + "bugs": "https://github.com/ivaynberg/select2/issues", + "homepage": "http://ivaynberg.github.com/select2", + "docs": "http://ivaynberg.github.com/select2/", + "download": "https://github.com/ivaynberg/select2/tags", + "dependencies": { + "jquery": ">=1.7.1" + } +} diff --git a/htdocs/includes/jquery/plugins/select2/select2.js b/htdocs/includes/jquery/plugins/select2/select2.js new file mode 100644 index 00000000000..a7a7c044497 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2.js @@ -0,0 +1,3541 @@ +/* +Copyright 2012 Igor Vaynberg + +Version: 3.5.2 Timestamp: Sat Nov 1 14:43:36 EDT 2014 + +This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU +General Public License version 2 (the "GPL License"). You may choose either license to govern your +use of this software only upon the condition that you accept all of the terms of either the Apache +License or the GPL License. + +You may obtain a copy of the Apache License and the GPL License at: + + http://www.apache.org/licenses/LICENSE-2.0 + http://www.gnu.org/licenses/gpl-2.0.html + +Unless required by applicable law or agreed to in writing, software distributed under the +Apache License or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the Apache License and the GPL License for +the specific language governing permissions and limitations under the Apache License and the GPL License. +*/ +(function ($) { + if(typeof $.fn.each2 == "undefined") { + $.extend($.fn, { + /* + * 4-10 times faster .each replacement + * use it carefully, as it overrides jQuery context of element on each iteration + */ + each2 : function (c) { + var j = $([0]), i = -1, l = this.length; + while ( + ++i < l + && (j.context = j[0] = this[i]) + && c.call(j[0], i, j) !== false //"this"=DOM, i=index, j=jQuery object + ); + return this; + } + }); + } +})(jQuery); + +(function ($, undefined) { + "use strict"; + /*global document, window, jQuery, console */ + + if (window.Select2 !== undefined) { + return; + } + + var AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer, + lastMousePosition={x:0,y:0}, $document, scrollBarDimensions, + + KEY = { + TAB: 9, + ENTER: 13, + ESC: 27, + SPACE: 32, + LEFT: 37, + UP: 38, + RIGHT: 39, + DOWN: 40, + SHIFT: 16, + CTRL: 17, + ALT: 18, + PAGE_UP: 33, + PAGE_DOWN: 34, + HOME: 36, + END: 35, + BACKSPACE: 8, + DELETE: 46, + isArrow: function (k) { + k = k.which ? k.which : k; + switch (k) { + case KEY.LEFT: + case KEY.RIGHT: + case KEY.UP: + case KEY.DOWN: + return true; + } + return false; + }, + isControl: function (e) { + var k = e.which; + switch (k) { + case KEY.SHIFT: + case KEY.CTRL: + case KEY.ALT: + return true; + } + + if (e.metaKey) return true; + + return false; + }, + isFunctionKey: function (k) { + k = k.which ? k.which : k; + return k >= 112 && k <= 123; + } + }, + MEASURE_SCROLLBAR_TEMPLATE = "
    ", + + DIACRITICS = {"\u24B6":"A","\uFF21":"A","\u00C0":"A","\u00C1":"A","\u00C2":"A","\u1EA6":"A","\u1EA4":"A","\u1EAA":"A","\u1EA8":"A","\u00C3":"A","\u0100":"A","\u0102":"A","\u1EB0":"A","\u1EAE":"A","\u1EB4":"A","\u1EB2":"A","\u0226":"A","\u01E0":"A","\u00C4":"A","\u01DE":"A","\u1EA2":"A","\u00C5":"A","\u01FA":"A","\u01CD":"A","\u0200":"A","\u0202":"A","\u1EA0":"A","\u1EAC":"A","\u1EB6":"A","\u1E00":"A","\u0104":"A","\u023A":"A","\u2C6F":"A","\uA732":"AA","\u00C6":"AE","\u01FC":"AE","\u01E2":"AE","\uA734":"AO","\uA736":"AU","\uA738":"AV","\uA73A":"AV","\uA73C":"AY","\u24B7":"B","\uFF22":"B","\u1E02":"B","\u1E04":"B","\u1E06":"B","\u0243":"B","\u0182":"B","\u0181":"B","\u24B8":"C","\uFF23":"C","\u0106":"C","\u0108":"C","\u010A":"C","\u010C":"C","\u00C7":"C","\u1E08":"C","\u0187":"C","\u023B":"C","\uA73E":"C","\u24B9":"D","\uFF24":"D","\u1E0A":"D","\u010E":"D","\u1E0C":"D","\u1E10":"D","\u1E12":"D","\u1E0E":"D","\u0110":"D","\u018B":"D","\u018A":"D","\u0189":"D","\uA779":"D","\u01F1":"DZ","\u01C4":"DZ","\u01F2":"Dz","\u01C5":"Dz","\u24BA":"E","\uFF25":"E","\u00C8":"E","\u00C9":"E","\u00CA":"E","\u1EC0":"E","\u1EBE":"E","\u1EC4":"E","\u1EC2":"E","\u1EBC":"E","\u0112":"E","\u1E14":"E","\u1E16":"E","\u0114":"E","\u0116":"E","\u00CB":"E","\u1EBA":"E","\u011A":"E","\u0204":"E","\u0206":"E","\u1EB8":"E","\u1EC6":"E","\u0228":"E","\u1E1C":"E","\u0118":"E","\u1E18":"E","\u1E1A":"E","\u0190":"E","\u018E":"E","\u24BB":"F","\uFF26":"F","\u1E1E":"F","\u0191":"F","\uA77B":"F","\u24BC":"G","\uFF27":"G","\u01F4":"G","\u011C":"G","\u1E20":"G","\u011E":"G","\u0120":"G","\u01E6":"G","\u0122":"G","\u01E4":"G","\u0193":"G","\uA7A0":"G","\uA77D":"G","\uA77E":"G","\u24BD":"H","\uFF28":"H","\u0124":"H","\u1E22":"H","\u1E26":"H","\u021E":"H","\u1E24":"H","\u1E28":"H","\u1E2A":"H","\u0126":"H","\u2C67":"H","\u2C75":"H","\uA78D":"H","\u24BE":"I","\uFF29":"I","\u00CC":"I","\u00CD":"I","\u00CE":"I","\u0128":"I","\u012A":"I","\u012C":"I","\u0130":"I","\u00CF":"I","\u1E2E":"I","\u1EC8":"I","\u01CF":"I","\u0208":"I","\u020A":"I","\u1ECA":"I","\u012E":"I","\u1E2C":"I","\u0197":"I","\u24BF":"J","\uFF2A":"J","\u0134":"J","\u0248":"J","\u24C0":"K","\uFF2B":"K","\u1E30":"K","\u01E8":"K","\u1E32":"K","\u0136":"K","\u1E34":"K","\u0198":"K","\u2C69":"K","\uA740":"K","\uA742":"K","\uA744":"K","\uA7A2":"K","\u24C1":"L","\uFF2C":"L","\u013F":"L","\u0139":"L","\u013D":"L","\u1E36":"L","\u1E38":"L","\u013B":"L","\u1E3C":"L","\u1E3A":"L","\u0141":"L","\u023D":"L","\u2C62":"L","\u2C60":"L","\uA748":"L","\uA746":"L","\uA780":"L","\u01C7":"LJ","\u01C8":"Lj","\u24C2":"M","\uFF2D":"M","\u1E3E":"M","\u1E40":"M","\u1E42":"M","\u2C6E":"M","\u019C":"M","\u24C3":"N","\uFF2E":"N","\u01F8":"N","\u0143":"N","\u00D1":"N","\u1E44":"N","\u0147":"N","\u1E46":"N","\u0145":"N","\u1E4A":"N","\u1E48":"N","\u0220":"N","\u019D":"N","\uA790":"N","\uA7A4":"N","\u01CA":"NJ","\u01CB":"Nj","\u24C4":"O","\uFF2F":"O","\u00D2":"O","\u00D3":"O","\u00D4":"O","\u1ED2":"O","\u1ED0":"O","\u1ED6":"O","\u1ED4":"O","\u00D5":"O","\u1E4C":"O","\u022C":"O","\u1E4E":"O","\u014C":"O","\u1E50":"O","\u1E52":"O","\u014E":"O","\u022E":"O","\u0230":"O","\u00D6":"O","\u022A":"O","\u1ECE":"O","\u0150":"O","\u01D1":"O","\u020C":"O","\u020E":"O","\u01A0":"O","\u1EDC":"O","\u1EDA":"O","\u1EE0":"O","\u1EDE":"O","\u1EE2":"O","\u1ECC":"O","\u1ED8":"O","\u01EA":"O","\u01EC":"O","\u00D8":"O","\u01FE":"O","\u0186":"O","\u019F":"O","\uA74A":"O","\uA74C":"O","\u01A2":"OI","\uA74E":"OO","\u0222":"OU","\u24C5":"P","\uFF30":"P","\u1E54":"P","\u1E56":"P","\u01A4":"P","\u2C63":"P","\uA750":"P","\uA752":"P","\uA754":"P","\u24C6":"Q","\uFF31":"Q","\uA756":"Q","\uA758":"Q","\u024A":"Q","\u24C7":"R","\uFF32":"R","\u0154":"R","\u1E58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1E5A":"R","\u1E5C":"R","\u0156":"R","\u1E5E":"R","\u024C":"R","\u2C64":"R","\uA75A":"R","\uA7A6":"R","\uA782":"R","\u24C8":"S","\uFF33":"S","\u1E9E":"S","\u015A":"S","\u1E64":"S","\u015C":"S","\u1E60":"S","\u0160":"S","\u1E66":"S","\u1E62":"S","\u1E68":"S","\u0218":"S","\u015E":"S","\u2C7E":"S","\uA7A8":"S","\uA784":"S","\u24C9":"T","\uFF34":"T","\u1E6A":"T","\u0164":"T","\u1E6C":"T","\u021A":"T","\u0162":"T","\u1E70":"T","\u1E6E":"T","\u0166":"T","\u01AC":"T","\u01AE":"T","\u023E":"T","\uA786":"T","\uA728":"TZ","\u24CA":"U","\uFF35":"U","\u00D9":"U","\u00DA":"U","\u00DB":"U","\u0168":"U","\u1E78":"U","\u016A":"U","\u1E7A":"U","\u016C":"U","\u00DC":"U","\u01DB":"U","\u01D7":"U","\u01D5":"U","\u01D9":"U","\u1EE6":"U","\u016E":"U","\u0170":"U","\u01D3":"U","\u0214":"U","\u0216":"U","\u01AF":"U","\u1EEA":"U","\u1EE8":"U","\u1EEE":"U","\u1EEC":"U","\u1EF0":"U","\u1EE4":"U","\u1E72":"U","\u0172":"U","\u1E76":"U","\u1E74":"U","\u0244":"U","\u24CB":"V","\uFF36":"V","\u1E7C":"V","\u1E7E":"V","\u01B2":"V","\uA75E":"V","\u0245":"V","\uA760":"VY","\u24CC":"W","\uFF37":"W","\u1E80":"W","\u1E82":"W","\u0174":"W","\u1E86":"W","\u1E84":"W","\u1E88":"W","\u2C72":"W","\u24CD":"X","\uFF38":"X","\u1E8A":"X","\u1E8C":"X","\u24CE":"Y","\uFF39":"Y","\u1EF2":"Y","\u00DD":"Y","\u0176":"Y","\u1EF8":"Y","\u0232":"Y","\u1E8E":"Y","\u0178":"Y","\u1EF6":"Y","\u1EF4":"Y","\u01B3":"Y","\u024E":"Y","\u1EFE":"Y","\u24CF":"Z","\uFF3A":"Z","\u0179":"Z","\u1E90":"Z","\u017B":"Z","\u017D":"Z","\u1E92":"Z","\u1E94":"Z","\u01B5":"Z","\u0224":"Z","\u2C7F":"Z","\u2C6B":"Z","\uA762":"Z","\u24D0":"a","\uFF41":"a","\u1E9A":"a","\u00E0":"a","\u00E1":"a","\u00E2":"a","\u1EA7":"a","\u1EA5":"a","\u1EAB":"a","\u1EA9":"a","\u00E3":"a","\u0101":"a","\u0103":"a","\u1EB1":"a","\u1EAF":"a","\u1EB5":"a","\u1EB3":"a","\u0227":"a","\u01E1":"a","\u00E4":"a","\u01DF":"a","\u1EA3":"a","\u00E5":"a","\u01FB":"a","\u01CE":"a","\u0201":"a","\u0203":"a","\u1EA1":"a","\u1EAD":"a","\u1EB7":"a","\u1E01":"a","\u0105":"a","\u2C65":"a","\u0250":"a","\uA733":"aa","\u00E6":"ae","\u01FD":"ae","\u01E3":"ae","\uA735":"ao","\uA737":"au","\uA739":"av","\uA73B":"av","\uA73D":"ay","\u24D1":"b","\uFF42":"b","\u1E03":"b","\u1E05":"b","\u1E07":"b","\u0180":"b","\u0183":"b","\u0253":"b","\u24D2":"c","\uFF43":"c","\u0107":"c","\u0109":"c","\u010B":"c","\u010D":"c","\u00E7":"c","\u1E09":"c","\u0188":"c","\u023C":"c","\uA73F":"c","\u2184":"c","\u24D3":"d","\uFF44":"d","\u1E0B":"d","\u010F":"d","\u1E0D":"d","\u1E11":"d","\u1E13":"d","\u1E0F":"d","\u0111":"d","\u018C":"d","\u0256":"d","\u0257":"d","\uA77A":"d","\u01F3":"dz","\u01C6":"dz","\u24D4":"e","\uFF45":"e","\u00E8":"e","\u00E9":"e","\u00EA":"e","\u1EC1":"e","\u1EBF":"e","\u1EC5":"e","\u1EC3":"e","\u1EBD":"e","\u0113":"e","\u1E15":"e","\u1E17":"e","\u0115":"e","\u0117":"e","\u00EB":"e","\u1EBB":"e","\u011B":"e","\u0205":"e","\u0207":"e","\u1EB9":"e","\u1EC7":"e","\u0229":"e","\u1E1D":"e","\u0119":"e","\u1E19":"e","\u1E1B":"e","\u0247":"e","\u025B":"e","\u01DD":"e","\u24D5":"f","\uFF46":"f","\u1E1F":"f","\u0192":"f","\uA77C":"f","\u24D6":"g","\uFF47":"g","\u01F5":"g","\u011D":"g","\u1E21":"g","\u011F":"g","\u0121":"g","\u01E7":"g","\u0123":"g","\u01E5":"g","\u0260":"g","\uA7A1":"g","\u1D79":"g","\uA77F":"g","\u24D7":"h","\uFF48":"h","\u0125":"h","\u1E23":"h","\u1E27":"h","\u021F":"h","\u1E25":"h","\u1E29":"h","\u1E2B":"h","\u1E96":"h","\u0127":"h","\u2C68":"h","\u2C76":"h","\u0265":"h","\u0195":"hv","\u24D8":"i","\uFF49":"i","\u00EC":"i","\u00ED":"i","\u00EE":"i","\u0129":"i","\u012B":"i","\u012D":"i","\u00EF":"i","\u1E2F":"i","\u1EC9":"i","\u01D0":"i","\u0209":"i","\u020B":"i","\u1ECB":"i","\u012F":"i","\u1E2D":"i","\u0268":"i","\u0131":"i","\u24D9":"j","\uFF4A":"j","\u0135":"j","\u01F0":"j","\u0249":"j","\u24DA":"k","\uFF4B":"k","\u1E31":"k","\u01E9":"k","\u1E33":"k","\u0137":"k","\u1E35":"k","\u0199":"k","\u2C6A":"k","\uA741":"k","\uA743":"k","\uA745":"k","\uA7A3":"k","\u24DB":"l","\uFF4C":"l","\u0140":"l","\u013A":"l","\u013E":"l","\u1E37":"l","\u1E39":"l","\u013C":"l","\u1E3D":"l","\u1E3B":"l","\u017F":"l","\u0142":"l","\u019A":"l","\u026B":"l","\u2C61":"l","\uA749":"l","\uA781":"l","\uA747":"l","\u01C9":"lj","\u24DC":"m","\uFF4D":"m","\u1E3F":"m","\u1E41":"m","\u1E43":"m","\u0271":"m","\u026F":"m","\u24DD":"n","\uFF4E":"n","\u01F9":"n","\u0144":"n","\u00F1":"n","\u1E45":"n","\u0148":"n","\u1E47":"n","\u0146":"n","\u1E4B":"n","\u1E49":"n","\u019E":"n","\u0272":"n","\u0149":"n","\uA791":"n","\uA7A5":"n","\u01CC":"nj","\u24DE":"o","\uFF4F":"o","\u00F2":"o","\u00F3":"o","\u00F4":"o","\u1ED3":"o","\u1ED1":"o","\u1ED7":"o","\u1ED5":"o","\u00F5":"o","\u1E4D":"o","\u022D":"o","\u1E4F":"o","\u014D":"o","\u1E51":"o","\u1E53":"o","\u014F":"o","\u022F":"o","\u0231":"o","\u00F6":"o","\u022B":"o","\u1ECF":"o","\u0151":"o","\u01D2":"o","\u020D":"o","\u020F":"o","\u01A1":"o","\u1EDD":"o","\u1EDB":"o","\u1EE1":"o","\u1EDF":"o","\u1EE3":"o","\u1ECD":"o","\u1ED9":"o","\u01EB":"o","\u01ED":"o","\u00F8":"o","\u01FF":"o","\u0254":"o","\uA74B":"o","\uA74D":"o","\u0275":"o","\u01A3":"oi","\u0223":"ou","\uA74F":"oo","\u24DF":"p","\uFF50":"p","\u1E55":"p","\u1E57":"p","\u01A5":"p","\u1D7D":"p","\uA751":"p","\uA753":"p","\uA755":"p","\u24E0":"q","\uFF51":"q","\u024B":"q","\uA757":"q","\uA759":"q","\u24E1":"r","\uFF52":"r","\u0155":"r","\u1E59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1E5B":"r","\u1E5D":"r","\u0157":"r","\u1E5F":"r","\u024D":"r","\u027D":"r","\uA75B":"r","\uA7A7":"r","\uA783":"r","\u24E2":"s","\uFF53":"s","\u00DF":"s","\u015B":"s","\u1E65":"s","\u015D":"s","\u1E61":"s","\u0161":"s","\u1E67":"s","\u1E63":"s","\u1E69":"s","\u0219":"s","\u015F":"s","\u023F":"s","\uA7A9":"s","\uA785":"s","\u1E9B":"s","\u24E3":"t","\uFF54":"t","\u1E6B":"t","\u1E97":"t","\u0165":"t","\u1E6D":"t","\u021B":"t","\u0163":"t","\u1E71":"t","\u1E6F":"t","\u0167":"t","\u01AD":"t","\u0288":"t","\u2C66":"t","\uA787":"t","\uA729":"tz","\u24E4":"u","\uFF55":"u","\u00F9":"u","\u00FA":"u","\u00FB":"u","\u0169":"u","\u1E79":"u","\u016B":"u","\u1E7B":"u","\u016D":"u","\u00FC":"u","\u01DC":"u","\u01D8":"u","\u01D6":"u","\u01DA":"u","\u1EE7":"u","\u016F":"u","\u0171":"u","\u01D4":"u","\u0215":"u","\u0217":"u","\u01B0":"u","\u1EEB":"u","\u1EE9":"u","\u1EEF":"u","\u1EED":"u","\u1EF1":"u","\u1EE5":"u","\u1E73":"u","\u0173":"u","\u1E77":"u","\u1E75":"u","\u0289":"u","\u24E5":"v","\uFF56":"v","\u1E7D":"v","\u1E7F":"v","\u028B":"v","\uA75F":"v","\u028C":"v","\uA761":"vy","\u24E6":"w","\uFF57":"w","\u1E81":"w","\u1E83":"w","\u0175":"w","\u1E87":"w","\u1E85":"w","\u1E98":"w","\u1E89":"w","\u2C73":"w","\u24E7":"x","\uFF58":"x","\u1E8B":"x","\u1E8D":"x","\u24E8":"y","\uFF59":"y","\u1EF3":"y","\u00FD":"y","\u0177":"y","\u1EF9":"y","\u0233":"y","\u1E8F":"y","\u00FF":"y","\u1EF7":"y","\u1E99":"y","\u1EF5":"y","\u01B4":"y","\u024F":"y","\u1EFF":"y","\u24E9":"z","\uFF5A":"z","\u017A":"z","\u1E91":"z","\u017C":"z","\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z","\u0386":"\u0391","\u0388":"\u0395","\u0389":"\u0397","\u038A":"\u0399","\u03AA":"\u0399","\u038C":"\u039F","\u038E":"\u03A5","\u03AB":"\u03A5","\u038F":"\u03A9","\u03AC":"\u03B1","\u03AD":"\u03B5","\u03AE":"\u03B7","\u03AF":"\u03B9","\u03CA":"\u03B9","\u0390":"\u03B9","\u03CC":"\u03BF","\u03CD":"\u03C5","\u03CB":"\u03C5","\u03B0":"\u03C5","\u03C9":"\u03C9","\u03C2":"\u03C3"}; + + $document = $(document); + + nextUid=(function() { var counter=1; return function() { return counter++; }; }()); + + + function reinsertElement(element) { + var placeholder = $(document.createTextNode('')); + + element.before(placeholder); + placeholder.before(element); + placeholder.remove(); + } + + function stripDiacritics(str) { + // Used 'uni range + named function' from http://jsperf.com/diacritics/18 + function match(a) { + return DIACRITICS[a] || a; + } + + return str.replace(/[^\u0000-\u007E]/g, match); + } + + function indexOf(value, array) { + var i = 0, l = array.length; + for (; i < l; i = i + 1) { + if (equal(value, array[i])) return i; + } + return -1; + } + + function measureScrollbar () { + var $template = $( MEASURE_SCROLLBAR_TEMPLATE ); + $template.appendTo(document.body); + + var dim = { + width: $template.width() - $template[0].clientWidth, + height: $template.height() - $template[0].clientHeight + }; + $template.remove(); + + return dim; + } + + /** + * Compares equality of a and b + * @param a + * @param b + */ + function equal(a, b) { + if (a === b) return true; + if (a === undefined || b === undefined) return false; + if (a === null || b === null) return false; + // Check whether 'a' or 'b' is a string (primitive or object). + // The concatenation of an empty string (+'') converts its argument to a string's primitive. + if (a.constructor === String) return a+'' === b+''; // a+'' - in case 'a' is a String object + if (b.constructor === String) return b+'' === a+''; // b+'' - in case 'b' is a String object + return false; + } + + /** + * Splits the string into an array of values, transforming each value. An empty array is returned for nulls or empty + * strings + * @param string + * @param separator + */ + function splitVal(string, separator, transform) { + var val, i, l; + if (string === null || string.length < 1) return []; + val = string.split(separator); + for (i = 0, l = val.length; i < l; i = i + 1) val[i] = transform(val[i]); + return val; + } + + function getSideBorderPadding(element) { + return element.outerWidth(false) - element.width(); + } + + function installKeyUpChangeEvent(element) { + var key="keyup-change-value"; + element.on("keydown", function () { + if ($.data(element, key) === undefined) { + $.data(element, key, element.val()); + } + }); + element.on("keyup", function () { + var val= $.data(element, key); + if (val !== undefined && element.val() !== val) { + $.removeData(element, key); + element.trigger("keyup-change"); + } + }); + } + + + /** + * filters mouse events so an event is fired only if the mouse moved. + * + * filters out mouse events that occur when mouse is stationary but + * the elements under the pointer are scrolled. + */ + function installFilteredMouseMove(element) { + element.on("mousemove", function (e) { + var lastpos = lastMousePosition; + if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) { + $(e.target).trigger("mousemove-filtered", e); + } + }); + } + + /** + * Debounces a function. Returns a function that calls the original fn function only if no invocations have been made + * within the last quietMillis milliseconds. + * + * @param quietMillis number of milliseconds to wait before invoking fn + * @param fn function to be debounced + * @param ctx object to be used as this reference within fn + * @return debounced version of fn + */ + function debounce(quietMillis, fn, ctx) { + ctx = ctx || undefined; + var timeout; + return function () { + var args = arguments; + window.clearTimeout(timeout); + timeout = window.setTimeout(function() { + fn.apply(ctx, args); + }, quietMillis); + }; + } + + function installDebouncedScroll(threshold, element) { + var notify = debounce(threshold, function (e) { element.trigger("scroll-debounced", e);}); + element.on("scroll", function (e) { + if (indexOf(e.target, element.get()) >= 0) notify(e); + }); + } + + function focus($el) { + if ($el[0] === document.activeElement) return; + + /* set the focus in a 0 timeout - that way the focus is set after the processing + of the current event has finished - which seems like the only reliable way + to set focus */ + window.setTimeout(function() { + var el=$el[0], pos=$el.val().length, range; + + $el.focus(); + + /* make sure el received focus so we do not error out when trying to manipulate the caret. + sometimes modals or others listeners may steal it after its set */ + var isVisible = (el.offsetWidth > 0 || el.offsetHeight > 0); + if (isVisible && el === document.activeElement) { + + /* after the focus is set move the caret to the end, necessary when we val() + just before setting focus */ + if(el.setSelectionRange) + { + el.setSelectionRange(pos, pos); + } + else if (el.createTextRange) { + range = el.createTextRange(); + range.collapse(false); + range.select(); + } + } + }, 0); + } + + function getCursorInfo(el) { + el = $(el)[0]; + var offset = 0; + var length = 0; + if ('selectionStart' in el) { + offset = el.selectionStart; + length = el.selectionEnd - offset; + } else if ('selection' in document) { + el.focus(); + var sel = document.selection.createRange(); + length = document.selection.createRange().text.length; + sel.moveStart('character', -el.value.length); + offset = sel.text.length - length; + } + return { offset: offset, length: length }; + } + + function killEvent(event) { + event.preventDefault(); + event.stopPropagation(); + } + function killEventImmediately(event) { + event.preventDefault(); + event.stopImmediatePropagation(); + } + + function measureTextWidth(e) { + if (!sizer){ + var style = e[0].currentStyle || window.getComputedStyle(e[0], null); + sizer = $(document.createElement("div")).css({ + position: "absolute", + left: "-10000px", + top: "-10000px", + display: "none", + fontSize: style.fontSize, + fontFamily: style.fontFamily, + fontStyle: style.fontStyle, + fontWeight: style.fontWeight, + letterSpacing: style.letterSpacing, + textTransform: style.textTransform, + whiteSpace: "nowrap" + }); + sizer.attr("class","select2-sizer"); + $(document.body).append(sizer); + } + sizer.text(e.val()); + return sizer.width(); + } + + function syncCssClasses(dest, src, adapter) { + var classes, replacements = [], adapted; + + classes = $.trim(dest.attr("class")); + + if (classes) { + classes = '' + classes; // for IE which returns object + + $(classes.split(/\s+/)).each2(function() { + if (this.indexOf("select2-") === 0) { + replacements.push(this); + } + }); + } + + classes = $.trim(src.attr("class")); + + if (classes) { + classes = '' + classes; // for IE which returns object + + $(classes.split(/\s+/)).each2(function() { + if (this.indexOf("select2-") !== 0) { + adapted = adapter(this); + + if (adapted) { + replacements.push(adapted); + } + } + }); + } + + dest.attr("class", replacements.join(" ")); + } + + + function markMatch(text, term, markup, escapeMarkup) { + var match=stripDiacritics(text.toUpperCase()).indexOf(stripDiacritics(term.toUpperCase())), + tl=term.length; + + if (match<0) { + markup.push(escapeMarkup(text)); + return; + } + + markup.push(escapeMarkup(text.substring(0, match))); + markup.push(""); + markup.push(escapeMarkup(text.substring(match, match + tl))); + markup.push(""); + markup.push(escapeMarkup(text.substring(match + tl, text.length))); + } + + function defaultEscapeMarkup(markup) { + var replace_map = { + '\\': '\', + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''', + "/": '/' + }; + + return String(markup).replace(/[&<>"'\/\\]/g, function (match) { + return replace_map[match]; + }); + } + + /** + * Produces an ajax-based query function + * + * @param options object containing configuration parameters + * @param options.params parameter map for the transport ajax call, can contain such options as cache, jsonpCallback, etc. see $.ajax + * @param options.transport function that will be used to execute the ajax request. must be compatible with parameters supported by $.ajax + * @param options.url url for the data + * @param options.data a function(searchTerm, pageNumber, context) that should return an object containing query string parameters for the above url. + * @param options.dataType request data type: ajax, jsonp, other datatypes supported by jQuery's $.ajax function or the transport function if specified + * @param options.quietMillis (optional) milliseconds to wait before making the ajaxRequest, helps debounce the ajax function if invoked too often + * @param options.results a function(remoteData, pageNumber, query) that converts data returned form the remote request to the format expected by Select2. + * The expected format is an object containing the following keys: + * results array of objects that will be used as choices + * more (optional) boolean indicating whether there are more results available + * Example: {results:[{id:1, text:'Red'},{id:2, text:'Blue'}], more:true} + */ + function ajax(options) { + var timeout, // current scheduled but not yet executed request + handler = null, + quietMillis = options.quietMillis || 100, + ajaxUrl = options.url, + self = this; + + return function (query) { + window.clearTimeout(timeout); + timeout = window.setTimeout(function () { + var data = options.data, // ajax data function + url = ajaxUrl, // ajax url string or function + transport = options.transport || $.fn.select2.ajaxDefaults.transport, + // deprecated - to be removed in 4.0 - use params instead + deprecated = { + type: options.type || 'GET', // set type of request (GET or POST) + cache: options.cache || false, + jsonpCallback: options.jsonpCallback||undefined, + dataType: options.dataType||"json" + }, + params = $.extend({}, $.fn.select2.ajaxDefaults.params, deprecated); + + data = data ? data.call(self, query.term, query.page, query.context) : null; + url = (typeof url === 'function') ? url.call(self, query.term, query.page, query.context) : url; + + if (handler && typeof handler.abort === "function") { handler.abort(); } + + if (options.params) { + if ($.isFunction(options.params)) { + $.extend(params, options.params.call(self)); + } else { + $.extend(params, options.params); + } + } + + $.extend(params, { + url: url, + dataType: options.dataType, + data: data, + success: function (data) { + // TODO - replace query.page with query so users have access to term, page, etc. + // added query as third paramter to keep backwards compatibility + var results = options.results(data, query.page, query); + query.callback(results); + }, + error: function(jqXHR, textStatus, errorThrown){ + var results = { + hasError: true, + jqXHR: jqXHR, + textStatus: textStatus, + errorThrown: errorThrown + }; + + query.callback(results); + } + }); + handler = transport.call(self, params); + }, quietMillis); + }; + } + + /** + * Produces a query function that works with a local array + * + * @param options object containing configuration parameters. The options parameter can either be an array or an + * object. + * + * If the array form is used it is assumed that it contains objects with 'id' and 'text' keys. + * + * If the object form is used it is assumed that it contains 'data' and 'text' keys. The 'data' key should contain + * an array of objects that will be used as choices. These objects must contain at least an 'id' key. The 'text' + * key can either be a String in which case it is expected that each element in the 'data' array has a key with the + * value of 'text' which will be used to match choices. Alternatively, text can be a function(item) that can extract + * the text. + */ + function local(options) { + var data = options, // data elements + dataText, + tmp, + text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search + + if ($.isArray(data)) { + tmp = data; + data = { results: tmp }; + } + + if ($.isFunction(data) === false) { + tmp = data; + data = function() { return tmp; }; + } + + var dataItem = data(); + if (dataItem.text) { + text = dataItem.text; + // if text is not a function we assume it to be a key name + if (!$.isFunction(text)) { + dataText = dataItem.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available + text = function (item) { return item[dataText]; }; + } + } + + return function (query) { + var t = query.term, filtered = { results: [] }, process; + if (t === "") { + query.callback(data()); + return; + } + + process = function(datum, collection) { + var group, attr; + datum = datum[0]; + if (datum.children) { + group = {}; + for (attr in datum) { + if (datum.hasOwnProperty(attr)) group[attr]=datum[attr]; + } + group.children=[]; + $(datum.children).each2(function(i, childDatum) { process(childDatum, group.children); }); + if (group.children.length || query.matcher(t, text(group), datum)) { + collection.push(group); + } + } else { + if (query.matcher(t, text(datum), datum)) { + collection.push(datum); + } + } + }; + + $(data().results).each2(function(i, datum) { process(datum, filtered.results); }); + query.callback(filtered); + }; + } + + // TODO javadoc + function tags(data) { + var isFunc = $.isFunction(data); + return function (query) { + var t = query.term, filtered = {results: []}; + var result = isFunc ? data(query) : data; + if ($.isArray(result)) { + $(result).each(function () { + var isObject = this.text !== undefined, + text = isObject ? this.text : this; + if (t === "" || query.matcher(t, text)) { + filtered.results.push(isObject ? this : {id: this, text: this}); + } + }); + query.callback(filtered); + } + }; + } + + /** + * Checks if the formatter function should be used. + * + * Throws an error if it is not a function. Returns true if it should be used, + * false if no formatting should be performed. + * + * @param formatter + */ + function checkFormatter(formatter, formatterName) { + if ($.isFunction(formatter)) return true; + if (!formatter) return false; + if (typeof(formatter) === 'string') return true; + throw new Error(formatterName +" must be a string, function, or falsy value"); + } + + /** + * Returns a given value + * If given a function, returns its output + * + * @param val string|function + * @param context value of "this" to be passed to function + * @returns {*} + */ + function evaluate(val, context) { + if ($.isFunction(val)) { + var args = Array.prototype.slice.call(arguments, 2); + return val.apply(context, args); + } + return val; + } + + function countResults(results) { + var count = 0; + $.each(results, function(i, item) { + if (item.children) { + count += countResults(item.children); + } else { + count++; + } + }); + return count; + } + + /** + * Default tokenizer. This function uses breaks the input on substring match of any string from the + * opts.tokenSeparators array and uses opts.createSearchChoice to create the choice object. Both of those + * two options have to be defined in order for the tokenizer to work. + * + * @param input text user has typed so far or pasted into the search field + * @param selection currently selected choices + * @param selectCallback function(choice) callback tho add the choice to selection + * @param opts select2's opts + * @return undefined/null to leave the current input unchanged, or a string to change the input to the returned value + */ + function defaultTokenizer(input, selection, selectCallback, opts) { + var original = input, // store the original so we can compare and know if we need to tell the search to update its text + dupe = false, // check for whether a token we extracted represents a duplicate selected choice + token, // token + index, // position at which the separator was found + i, l, // looping variables + separator; // the matched separator + + if (!opts.createSearchChoice || !opts.tokenSeparators || opts.tokenSeparators.length < 1) return undefined; + + while (true) { + index = -1; + + for (i = 0, l = opts.tokenSeparators.length; i < l; i++) { + separator = opts.tokenSeparators[i]; + index = input.indexOf(separator); + if (index >= 0) break; + } + + if (index < 0) break; // did not find any token separator in the input string, bail + + token = input.substring(0, index); + input = input.substring(index + separator.length); + + if (token.length > 0) { + token = opts.createSearchChoice.call(this, token, selection); + if (token !== undefined && token !== null && opts.id(token) !== undefined && opts.id(token) !== null) { + dupe = false; + for (i = 0, l = selection.length; i < l; i++) { + if (equal(opts.id(token), opts.id(selection[i]))) { + dupe = true; break; + } + } + + if (!dupe) selectCallback(token); + } + } + } + + if (original!==input) return input; + } + + function cleanupJQueryElements() { + var self = this; + + $.each(arguments, function (i, element) { + self[element].remove(); + self[element] = null; + }); + } + + /** + * Creates a new class + * + * @param superClass + * @param methods + */ + function clazz(SuperClass, methods) { + var constructor = function () {}; + constructor.prototype = new SuperClass; + constructor.prototype.constructor = constructor; + constructor.prototype.parent = SuperClass.prototype; + constructor.prototype = $.extend(constructor.prototype, methods); + return constructor; + } + + AbstractSelect2 = clazz(Object, { + + // abstract + bind: function (func) { + var self = this; + return function () { + func.apply(self, arguments); + }; + }, + + // abstract + init: function (opts) { + var results, search, resultsSelector = ".select2-results"; + + // prepare options + this.opts = opts = this.prepareOpts(opts); + + this.id=opts.id; + + // destroy if called on an existing component + if (opts.element.data("select2") !== undefined && + opts.element.data("select2") !== null) { + opts.element.data("select2").destroy(); + } + + this.container = this.createContainer(); + + this.liveRegion = $('.select2-hidden-accessible'); + if (this.liveRegion.length == 0) { + this.liveRegion = $("", { + role: "status", + "aria-live": "polite" + }) + .addClass("select2-hidden-accessible") + .appendTo(document.body); + } + + this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid()); + this.containerEventName= this.containerId + .replace(/([.])/g, '_') + .replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1'); + this.container.attr("id", this.containerId); + + this.container.attr("title", opts.element.attr("title")); + + this.body = $(document.body); + + syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass); + + this.container.attr("style", opts.element.attr("style")); + this.container.css(evaluate(opts.containerCss, this.opts.element)); + this.container.addClass(evaluate(opts.containerCssClass, this.opts.element)); + + this.elementTabIndex = this.opts.element.attr("tabindex"); + + // swap container for the element + this.opts.element + .data("select2", this) + .attr("tabindex", "-1") + .before(this.container) + .on("click.select2", killEvent); // do not leak click events + + this.container.data("select2", this); + + this.dropdown = this.container.find(".select2-drop"); + + syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass); + + this.dropdown.addClass(evaluate(opts.dropdownCssClass, this.opts.element)); + this.dropdown.data("select2", this); + this.dropdown.on("click", killEvent); + + this.results = results = this.container.find(resultsSelector); + this.search = search = this.container.find("input.select2-input"); + + this.queryCount = 0; + this.resultsPage = 0; + this.context = null; + + // initialize the container + this.initContainer(); + + this.container.on("click", killEvent); + + installFilteredMouseMove(this.results); + + this.dropdown.on("mousemove-filtered", resultsSelector, this.bind(this.highlightUnderEvent)); + this.dropdown.on("touchstart touchmove touchend", resultsSelector, this.bind(function (event) { + this._touchEvent = true; + this.highlightUnderEvent(event); + })); + this.dropdown.on("touchmove", resultsSelector, this.bind(this.touchMoved)); + this.dropdown.on("touchstart touchend", resultsSelector, this.bind(this.clearTouchMoved)); + + // Waiting for a click event on touch devices to select option and hide dropdown + // otherwise click will be triggered on an underlying element + this.dropdown.on('click', this.bind(function (event) { + if (this._touchEvent) { + this._touchEvent = false; + this.selectHighlighted(); + } + })); + + installDebouncedScroll(80, this.results); + this.dropdown.on("scroll-debounced", resultsSelector, this.bind(this.loadMoreIfNeeded)); + + // do not propagate change event from the search field out of the component + $(this.container).on("change", ".select2-input", function(e) {e.stopPropagation();}); + $(this.dropdown).on("change", ".select2-input", function(e) {e.stopPropagation();}); + + // if jquery.mousewheel plugin is installed we can prevent out-of-bounds scrolling of results via mousewheel + if ($.fn.mousewheel) { + results.mousewheel(function (e, delta, deltaX, deltaY) { + var top = results.scrollTop(); + if (deltaY > 0 && top - deltaY <= 0) { + results.scrollTop(0); + killEvent(e); + } else if (deltaY < 0 && results.get(0).scrollHeight - results.scrollTop() + deltaY <= results.height()) { + results.scrollTop(results.get(0).scrollHeight - results.height()); + killEvent(e); + } + }); + } + + installKeyUpChangeEvent(search); + search.on("keyup-change input paste", this.bind(this.updateResults)); + search.on("focus", function () { search.addClass("select2-focused"); }); + search.on("blur", function () { search.removeClass("select2-focused");}); + + this.dropdown.on("mouseup", resultsSelector, this.bind(function (e) { + if ($(e.target).closest(".select2-result-selectable").length > 0) { + this.highlightUnderEvent(e); + this.selectHighlighted(e); + } + })); + + // trap all mouse events from leaving the dropdown. sometimes there may be a modal that is listening + // for mouse events outside of itself so it can close itself. since the dropdown is now outside the select2's + // dom it will trigger the popup close, which is not what we want + // focusin can cause focus wars between modals and select2 since the dropdown is outside the modal. + this.dropdown.on("click mouseup mousedown touchstart touchend focusin", function (e) { e.stopPropagation(); }); + + this.nextSearchTerm = undefined; + + if ($.isFunction(this.opts.initSelection)) { + // initialize selection based on the current value of the source element + this.initSelection(); + + // if the user has provided a function that can set selection based on the value of the source element + // we monitor the change event on the element and trigger it, allowing for two way synchronization + this.monitorSource(); + } + + if (opts.maximumInputLength !== null) { + this.search.attr("maxlength", opts.maximumInputLength); + } + + var disabled = opts.element.prop("disabled"); + if (disabled === undefined) disabled = false; + this.enable(!disabled); + + var readonly = opts.element.prop("readonly"); + if (readonly === undefined) readonly = false; + this.readonly(readonly); + + // Calculate size of scrollbar + scrollBarDimensions = scrollBarDimensions || measureScrollbar(); + + this.autofocus = opts.element.prop("autofocus"); + opts.element.prop("autofocus", false); + if (this.autofocus) this.focus(); + + this.search.attr("placeholder", opts.searchInputPlaceholder); + }, + + // abstract + destroy: function () { + var element=this.opts.element, select2 = element.data("select2"), self = this; + + this.close(); + + if (element.length && element[0].detachEvent && self._sync) { + element.each(function () { + if (self._sync) { + this.detachEvent("onpropertychange", self._sync); + } + }); + } + if (this.propertyObserver) { + this.propertyObserver.disconnect(); + this.propertyObserver = null; + } + this._sync = null; + + if (select2 !== undefined) { + select2.container.remove(); + select2.liveRegion.remove(); + select2.dropdown.remove(); + element + .show() + .removeData("select2") + .off(".select2") + .prop("autofocus", this.autofocus || false); + if (this.elementTabIndex) { + element.attr({tabindex: this.elementTabIndex}); + } else { + element.removeAttr("tabindex"); + } + element.show(); + } + + cleanupJQueryElements.call(this, + "container", + "liveRegion", + "dropdown", + "results", + "search" + ); + }, + + // abstract + optionToData: function(element) { + if (element.is("option")) { + return { + id:element.prop("value"), + text:element.text(), + element: element.get(), + css: element.attr("class"), + disabled: element.prop("disabled"), + locked: equal(element.attr("locked"), "locked") || equal(element.data("locked"), true) + }; + } else if (element.is("optgroup")) { + return { + text:element.attr("label"), + children:[], + element: element.get(), + css: element.attr("class") + }; + } + }, + + // abstract + prepareOpts: function (opts) { + var element, select, idKey, ajaxUrl, self = this; + + element = opts.element; + + if (element.get(0).tagName.toLowerCase() === "select") { + this.select = select = opts.element; + } + + if (select) { + // these options are not allowed when attached to a select because they are picked up off the element itself + $.each(["id", "multiple", "ajax", "query", "createSearchChoice", "initSelection", "data", "tags"], function () { + if (this in opts) { + throw new Error("Option '" + this + "' is not allowed for Select2 when attached to a ", + "
    ", + "
    ", + " ", + " ", + "
    ", + "
      ", + "
    ", + "
    "].join("")); + return container; + }, + + // single + enableInterface: function() { + if (this.parent.enableInterface.apply(this, arguments)) { + this.focusser.prop("disabled", !this.isInterfaceEnabled()); + } + }, + + // single + opening: function () { + var el, range, len; + + if (this.opts.minimumResultsForSearch >= 0) { + this.showSearch(true); + } + + this.parent.opening.apply(this, arguments); + + if (this.showSearchInput !== false) { + // IE appends focusser.val() at the end of field :/ so we manually insert it at the beginning using a range + // all other browsers handle this just fine + + this.search.val(this.focusser.val()); + } + if (this.opts.shouldFocusInput(this)) { + this.search.focus(); + // move the cursor to the end after focussing, otherwise it will be at the beginning and + // new text will appear *before* focusser.val() + el = this.search.get(0); + if (el.createTextRange) { + range = el.createTextRange(); + range.collapse(false); + range.select(); + } else if (el.setSelectionRange) { + len = this.search.val().length; + el.setSelectionRange(len, len); + } + } + + // initializes search's value with nextSearchTerm (if defined by user) + // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter + if(this.search.val() === "") { + if(this.nextSearchTerm != undefined){ + this.search.val(this.nextSearchTerm); + this.search.select(); + } + } + + this.focusser.prop("disabled", true).val(""); + this.updateResults(true); + this.opts.element.trigger($.Event("select2-open")); + }, + + // single + close: function () { + if (!this.opened()) return; + this.parent.close.apply(this, arguments); + + this.focusser.prop("disabled", false); + + if (this.opts.shouldFocusInput(this)) { + this.focusser.focus(); + } + }, + + // single + focus: function () { + if (this.opened()) { + this.close(); + } else { + this.focusser.prop("disabled", false); + if (this.opts.shouldFocusInput(this)) { + this.focusser.focus(); + } + } + }, + + // single + isFocused: function () { + return this.container.hasClass("select2-container-active"); + }, + + // single + cancel: function () { + this.parent.cancel.apply(this, arguments); + this.focusser.prop("disabled", false); + + if (this.opts.shouldFocusInput(this)) { + this.focusser.focus(); + } + }, + + // single + destroy: function() { + $("label[for='" + this.focusser.attr('id') + "']") + .attr('for', this.opts.element.attr("id")); + this.parent.destroy.apply(this, arguments); + + cleanupJQueryElements.call(this, + "selection", + "focusser" + ); + }, + + // single + initContainer: function () { + + var selection, + container = this.container, + dropdown = this.dropdown, + idSuffix = nextUid(), + elementLabel; + + if (this.opts.minimumResultsForSearch < 0) { + this.showSearch(false); + } else { + this.showSearch(true); + } + + this.selection = selection = container.find(".select2-choice"); + + this.focusser = container.find(".select2-focusser"); + + // add aria associations + selection.find(".select2-chosen").attr("id", "select2-chosen-"+idSuffix); + this.focusser.attr("aria-labelledby", "select2-chosen-"+idSuffix); + this.results.attr("id", "select2-results-"+idSuffix); + this.search.attr("aria-owns", "select2-results-"+idSuffix); + + // rewrite labels from original element to focusser + this.focusser.attr("id", "s2id_autogen"+idSuffix); + + elementLabel = $("label[for='" + this.opts.element.attr("id") + "']"); + this.opts.element.focus(this.bind(function () { this.focus(); })); + + this.focusser.prev() + .text(elementLabel.text()) + .attr('for', this.focusser.attr('id')); + + // Ensure the original element retains an accessible name + var originalTitle = this.opts.element.attr("title"); + this.opts.element.attr("title", (originalTitle || elementLabel.text())); + + this.focusser.attr("tabindex", this.elementTabIndex); + + // write label for search field using the label from the focusser element + this.search.attr("id", this.focusser.attr('id') + '_search'); + + this.search.prev() + .text($("label[for='" + this.focusser.attr('id') + "']").text()) + .attr('for', this.search.attr('id')); + + this.search.on("keydown", this.bind(function (e) { + if (!this.isInterfaceEnabled()) return; + + // filter 229 keyCodes (input method editor is processing key input) + if (229 == e.keyCode) return; + + if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) { + // prevent the page from scrolling + killEvent(e); + return; + } + + switch (e.which) { + case KEY.UP: + case KEY.DOWN: + this.moveHighlight((e.which === KEY.UP) ? -1 : 1); + killEvent(e); + return; + case KEY.ENTER: + this.selectHighlighted(); + killEvent(e); + return; + case KEY.TAB: + this.selectHighlighted({noFocus: true}); + return; + case KEY.ESC: + this.cancel(e); + killEvent(e); + return; + } + })); + + this.search.on("blur", this.bind(function(e) { + // a workaround for chrome to keep the search field focussed when the scroll bar is used to scroll the dropdown. + // without this the search field loses focus which is annoying + if (document.activeElement === this.body.get(0)) { + window.setTimeout(this.bind(function() { + if (this.opened()) { + this.search.focus(); + } + }), 0); + } + })); + + this.focusser.on("keydown", this.bind(function (e) { + if (!this.isInterfaceEnabled()) return; + + if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) { + return; + } + + if (this.opts.openOnEnter === false && e.which === KEY.ENTER) { + killEvent(e); + return; + } + + if (e.which == KEY.DOWN || e.which == KEY.UP + || (e.which == KEY.ENTER && this.opts.openOnEnter)) { + + if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) return; + + this.open(); + killEvent(e); + return; + } + + if (e.which == KEY.DELETE || e.which == KEY.BACKSPACE) { + if (this.opts.allowClear) { + this.clear(); + } + killEvent(e); + return; + } + })); + + + installKeyUpChangeEvent(this.focusser); + this.focusser.on("keyup-change input", this.bind(function(e) { + if (this.opts.minimumResultsForSearch >= 0) { + e.stopPropagation(); + if (this.opened()) return; + this.open(); + } + })); + + selection.on("mousedown touchstart", "abbr", this.bind(function (e) { + if (!this.isInterfaceEnabled()) { + return; + } + + this.clear(); + killEventImmediately(e); + this.close(); + + if (this.selection) { + this.selection.focus(); + } + })); + + selection.on("mousedown touchstart", this.bind(function (e) { + // Prevent IE from generating a click event on the body + reinsertElement(selection); + + if (!this.container.hasClass("select2-container-active")) { + this.opts.element.trigger($.Event("select2-focus")); + } + + if (this.opened()) { + this.close(); + } else if (this.isInterfaceEnabled()) { + this.open(); + } + + killEvent(e); + })); + + dropdown.on("mousedown touchstart", this.bind(function() { + if (this.opts.shouldFocusInput(this)) { + this.search.focus(); + } + })); + + selection.on("focus", this.bind(function(e) { + killEvent(e); + })); + + this.focusser.on("focus", this.bind(function(){ + if (!this.container.hasClass("select2-container-active")) { + this.opts.element.trigger($.Event("select2-focus")); + } + this.container.addClass("select2-container-active"); + })).on("blur", this.bind(function() { + if (!this.opened()) { + this.container.removeClass("select2-container-active"); + this.opts.element.trigger($.Event("select2-blur")); + } + })); + this.search.on("focus", this.bind(function(){ + if (!this.container.hasClass("select2-container-active")) { + this.opts.element.trigger($.Event("select2-focus")); + } + this.container.addClass("select2-container-active"); + })); + + this.initContainerWidth(); + this.opts.element.hide(); + this.setPlaceholder(); + + }, + + // single + clear: function(triggerChange) { + var data=this.selection.data("select2-data"); + if (data) { // guard against queued quick consecutive clicks + var evt = $.Event("select2-clearing"); + this.opts.element.trigger(evt); + if (evt.isDefaultPrevented()) { + return; + } + var placeholderOption = this.getPlaceholderOption(); + this.opts.element.val(placeholderOption ? placeholderOption.val() : ""); + this.selection.find(".select2-chosen").empty(); + this.selection.removeData("select2-data"); + this.setPlaceholder(); + + if (triggerChange !== false){ + this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data }); + this.triggerChange({removed:data}); + } + } + }, + + /** + * Sets selection based on source element's value + */ + // single + initSelection: function () { + var selected; + if (this.isPlaceholderOptionSelected()) { + this.updateSelection(null); + this.close(); + this.setPlaceholder(); + } else { + var self = this; + this.opts.initSelection.call(null, this.opts.element, function(selected){ + if (selected !== undefined && selected !== null) { + self.updateSelection(selected); + self.close(); + self.setPlaceholder(); + self.nextSearchTerm = self.opts.nextSearchTerm(selected, self.search.val()); + } + }); + } + }, + + isPlaceholderOptionSelected: function() { + var placeholderOption; + if (this.getPlaceholder() === undefined) return false; // no placeholder specified so no option should be considered + return ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.prop("selected")) + || (this.opts.element.val() === "") + || (this.opts.element.val() === undefined) + || (this.opts.element.val() === null); + }, + + // single + prepareOpts: function () { + var opts = this.parent.prepareOpts.apply(this, arguments), + self=this; + + if (opts.element.get(0).tagName.toLowerCase() === "select") { + // install the selection initializer + opts.initSelection = function (element, callback) { + var selected = element.find("option").filter(function() { return this.selected && !this.disabled }); + // a single select box always has a value, no need to null check 'selected' + callback(self.optionToData(selected)); + }; + } else if ("data" in opts) { + // install default initSelection when applied to hidden input and data is local + opts.initSelection = opts.initSelection || function (element, callback) { + var id = element.val(); + //search in data by id, storing the actual matching item + var match = null; + opts.query({ + matcher: function(term, text, el){ + var is_match = equal(id, opts.id(el)); + if (is_match) { + match = el; + } + return is_match; + }, + callback: !$.isFunction(callback) ? $.noop : function() { + callback(match); + } + }); + }; + } + + return opts; + }, + + // single + getPlaceholder: function() { + // if a placeholder is specified on a single select without a valid placeholder option ignore it + if (this.select) { + if (this.getPlaceholderOption() === undefined) { + return undefined; + } + } + + return this.parent.getPlaceholder.apply(this, arguments); + }, + + // single + setPlaceholder: function () { + var placeholder = this.getPlaceholder(); + + if (this.isPlaceholderOptionSelected() && placeholder !== undefined) { + + // check for a placeholder option if attached to a select + if (this.select && this.getPlaceholderOption() === undefined) return; + + this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(placeholder)); + + this.selection.addClass("select2-default"); + + this.container.removeClass("select2-allowclear"); + } + }, + + // single + postprocessResults: function (data, initial, noHighlightUpdate) { + var selected = 0, self = this, showSearchInput = true; + + // find the selected element in the result list + + this.findHighlightableChoices().each2(function (i, elm) { + if (equal(self.id(elm.data("select2-data")), self.opts.element.val())) { + selected = i; + return false; + } + }); + + // and highlight it + if (noHighlightUpdate !== false) { + if (initial === true && selected >= 0) { + this.highlight(selected); + } else { + this.highlight(0); + } + } + + // hide the search box if this is the first we got the results and there are enough of them for search + + if (initial === true) { + var min = this.opts.minimumResultsForSearch; + if (min >= 0) { + this.showSearch(countResults(data.results) >= min); + } + } + }, + + // single + showSearch: function(showSearchInput) { + if (this.showSearchInput === showSearchInput) return; + + this.showSearchInput = showSearchInput; + + this.dropdown.find(".select2-search").toggleClass("select2-search-hidden", !showSearchInput); + this.dropdown.find(".select2-search").toggleClass("select2-offscreen", !showSearchInput); + //add "select2-with-searchbox" to the container if search box is shown + $(this.dropdown, this.container).toggleClass("select2-with-searchbox", showSearchInput); + }, + + // single + onSelect: function (data, options) { + + if (!this.triggerSelect(data)) { return; } + + var old = this.opts.element.val(), + oldData = this.data(); + + this.opts.element.val(this.id(data)); + this.updateSelection(data); + + this.opts.element.trigger({ type: "select2-selected", val: this.id(data), choice: data }); + + this.nextSearchTerm = this.opts.nextSearchTerm(data, this.search.val()); + this.close(); + + if ((!options || !options.noFocus) && this.opts.shouldFocusInput(this)) { + this.focusser.focus(); + } + + if (!equal(old, this.id(data))) { + this.triggerChange({ added: data, removed: oldData }); + } + }, + + // single + updateSelection: function (data) { + + var container=this.selection.find(".select2-chosen"), formatted, cssClass; + + this.selection.data("select2-data", data); + + container.empty(); + if (data !== null) { + formatted=this.opts.formatSelection(data, container, this.opts.escapeMarkup); + } + if (formatted !== undefined) { + container.append(formatted); + } + cssClass=this.opts.formatSelectionCssClass(data, container); + if (cssClass !== undefined) { + container.addClass(cssClass); + } + + this.selection.removeClass("select2-default"); + + if (this.opts.allowClear && this.getPlaceholder() !== undefined) { + this.container.addClass("select2-allowclear"); + } + }, + + // single + val: function () { + var val, + triggerChange = false, + data = null, + self = this, + oldData = this.data(); + + if (arguments.length === 0) { + return this.opts.element.val(); + } + + val = arguments[0]; + + if (arguments.length > 1) { + triggerChange = arguments[1]; + } + + if (this.select) { + this.select + .val(val) + .find("option").filter(function() { return this.selected }).each2(function (i, elm) { + data = self.optionToData(elm); + return false; + }); + this.updateSelection(data); + this.setPlaceholder(); + if (triggerChange) { + this.triggerChange({added: data, removed:oldData}); + } + } else { + // val is an id. !val is true for [undefined,null,'',0] - 0 is legal + if (!val && val !== 0) { + this.clear(triggerChange); + return; + } + if (this.opts.initSelection === undefined) { + throw new Error("cannot call val() if initSelection() is not defined"); + } + this.opts.element.val(val); + this.opts.initSelection(this.opts.element, function(data){ + self.opts.element.val(!data ? "" : self.id(data)); + self.updateSelection(data); + self.setPlaceholder(); + if (triggerChange) { + self.triggerChange({added: data, removed:oldData}); + } + }); + } + }, + + // single + clearSearch: function () { + this.search.val(""); + this.focusser.val(""); + }, + + // single + data: function(value) { + var data, + triggerChange = false; + + if (arguments.length === 0) { + data = this.selection.data("select2-data"); + if (data == undefined) data = null; + return data; + } else { + if (arguments.length > 1) { + triggerChange = arguments[1]; + } + if (!value) { + this.clear(triggerChange); + } else { + data = this.data(); + this.opts.element.val(!value ? "" : this.id(value)); + this.updateSelection(value); + if (triggerChange) { + this.triggerChange({added: value, removed:data}); + } + } + } + } + }); + + MultiSelect2 = clazz(AbstractSelect2, { + + // multi + createContainer: function () { + var container = $(document.createElement("div")).attr({ + "class": "select2-container select2-container-multi" + }).html([ + "
      ", + "
    • ", + " ", + " ", + "
      • ", + "
    ", + "
    ", + "
      ", + "
    ", + "
    "].join("")); + return container; + }, + + // multi + prepareOpts: function () { + var opts = this.parent.prepareOpts.apply(this, arguments), + self=this; + + // TODO validate placeholder is a string if specified + if (opts.element.get(0).tagName.toLowerCase() === "select") { + // install the selection initializer + opts.initSelection = function (element, callback) { + + var data = []; + + element.find("option").filter(function() { return this.selected && !this.disabled }).each2(function (i, elm) { + data.push(self.optionToData(elm)); + }); + callback(data); + }; + } else if ("data" in opts) { + // install default initSelection when applied to hidden input and data is local + opts.initSelection = opts.initSelection || function (element, callback) { + var ids = splitVal(element.val(), opts.separator, opts.transformVal); + //search in data by array of ids, storing matching items in a list + var matches = []; + opts.query({ + matcher: function(term, text, el){ + var is_match = $.grep(ids, function(id) { + return equal(id, opts.id(el)); + }).length; + if (is_match) { + matches.push(el); + } + return is_match; + }, + callback: !$.isFunction(callback) ? $.noop : function() { + // reorder matches based on the order they appear in the ids array because right now + // they are in the order in which they appear in data array + var ordered = []; + for (var i = 0; i < ids.length; i++) { + var id = ids[i]; + for (var j = 0; j < matches.length; j++) { + var match = matches[j]; + if (equal(id, opts.id(match))) { + ordered.push(match); + matches.splice(j, 1); + break; + } + } + } + callback(ordered); + } + }); + }; + } + + return opts; + }, + + // multi + selectChoice: function (choice) { + + var selected = this.container.find(".select2-search-choice-focus"); + if (selected.length && choice && choice[0] == selected[0]) { + + } else { + if (selected.length) { + this.opts.element.trigger("choice-deselected", selected); + } + selected.removeClass("select2-search-choice-focus"); + if (choice && choice.length) { + this.close(); + choice.addClass("select2-search-choice-focus"); + this.opts.element.trigger("choice-selected", choice); + } + } + }, + + // multi + destroy: function() { + $("label[for='" + this.search.attr('id') + "']") + .attr('for', this.opts.element.attr("id")); + this.parent.destroy.apply(this, arguments); + + cleanupJQueryElements.call(this, + "searchContainer", + "selection" + ); + }, + + // multi + initContainer: function () { + + var selector = ".select2-choices", selection; + + this.searchContainer = this.container.find(".select2-search-field"); + this.selection = selection = this.container.find(selector); + + var _this = this; + this.selection.on("click", ".select2-container:not(.select2-container-disabled) .select2-search-choice:not(.select2-locked)", function (e) { + _this.search[0].focus(); + _this.selectChoice($(this)); + }); + + // rewrite labels from original element to focusser + this.search.attr("id", "s2id_autogen"+nextUid()); + + this.search.prev() + .text($("label[for='" + this.opts.element.attr("id") + "']").text()) + .attr('for', this.search.attr('id')); + this.opts.element.focus(this.bind(function () { this.focus(); })); + + this.search.on("input paste", this.bind(function() { + if (this.search.attr('placeholder') && this.search.val().length == 0) return; + if (!this.isInterfaceEnabled()) return; + if (!this.opened()) { + this.open(); + } + })); + + this.search.attr("tabindex", this.elementTabIndex); + + this.keydowns = 0; + this.search.on("keydown", this.bind(function (e) { + if (!this.isInterfaceEnabled()) return; + + ++this.keydowns; + var selected = selection.find(".select2-search-choice-focus"); + var prev = selected.prev(".select2-search-choice:not(.select2-locked)"); + var next = selected.next(".select2-search-choice:not(.select2-locked)"); + var pos = getCursorInfo(this.search); + + if (selected.length && + (e.which == KEY.LEFT || e.which == KEY.RIGHT || e.which == KEY.BACKSPACE || e.which == KEY.DELETE || e.which == KEY.ENTER)) { + var selectedChoice = selected; + if (e.which == KEY.LEFT && prev.length) { + selectedChoice = prev; + } + else if (e.which == KEY.RIGHT) { + selectedChoice = next.length ? next : null; + } + else if (e.which === KEY.BACKSPACE) { + if (this.unselect(selected.first())) { + this.search.width(10); + selectedChoice = prev.length ? prev : next; + } + } else if (e.which == KEY.DELETE) { + if (this.unselect(selected.first())) { + this.search.width(10); + selectedChoice = next.length ? next : null; + } + } else if (e.which == KEY.ENTER) { + selectedChoice = null; + } + + this.selectChoice(selectedChoice); + killEvent(e); + if (!selectedChoice || !selectedChoice.length) { + this.open(); + } + return; + } else if (((e.which === KEY.BACKSPACE && this.keydowns == 1) + || e.which == KEY.LEFT) && (pos.offset == 0 && !pos.length)) { + + this.selectChoice(selection.find(".select2-search-choice:not(.select2-locked)").last()); + killEvent(e); + return; + } else { + this.selectChoice(null); + } + + if (this.opened()) { + switch (e.which) { + case KEY.UP: + case KEY.DOWN: + this.moveHighlight((e.which === KEY.UP) ? -1 : 1); + killEvent(e); + return; + case KEY.ENTER: + this.selectHighlighted(); + killEvent(e); + return; + case KEY.TAB: + this.selectHighlighted({noFocus:true}); + this.close(); + return; + case KEY.ESC: + this.cancel(e); + killEvent(e); + return; + } + } + + if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) + || e.which === KEY.BACKSPACE || e.which === KEY.ESC) { + return; + } + + if (e.which === KEY.ENTER) { + if (this.opts.openOnEnter === false) { + return; + } else if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) { + return; + } + } + + this.open(); + + if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) { + // prevent the page from scrolling + killEvent(e); + } + + if (e.which === KEY.ENTER) { + // prevent form from being submitted + killEvent(e); + } + + })); + + this.search.on("keyup", this.bind(function (e) { + this.keydowns = 0; + this.resizeSearch(); + }) + ); + + this.search.on("blur", this.bind(function(e) { + this.container.removeClass("select2-container-active"); + this.search.removeClass("select2-focused"); + this.selectChoice(null); + if (!this.opened()) this.clearSearch(); + e.stopImmediatePropagation(); + this.opts.element.trigger($.Event("select2-blur")); + })); + + this.container.on("click", selector, this.bind(function (e) { + if (!this.isInterfaceEnabled()) return; + if ($(e.target).closest(".select2-search-choice").length > 0) { + // clicked inside a select2 search choice, do not open + return; + } + this.selectChoice(null); + this.clearPlaceholder(); + if (!this.container.hasClass("select2-container-active")) { + this.opts.element.trigger($.Event("select2-focus")); + } + this.open(); + this.focusSearch(); + e.preventDefault(); + })); + + this.container.on("focus", selector, this.bind(function () { + if (!this.isInterfaceEnabled()) return; + if (!this.container.hasClass("select2-container-active")) { + this.opts.element.trigger($.Event("select2-focus")); + } + this.container.addClass("select2-container-active"); + this.dropdown.addClass("select2-drop-active"); + this.clearPlaceholder(); + })); + + this.initContainerWidth(); + this.opts.element.hide(); + + // set the placeholder if necessary + this.clearSearch(); + }, + + // multi + enableInterface: function() { + if (this.parent.enableInterface.apply(this, arguments)) { + this.search.prop("disabled", !this.isInterfaceEnabled()); + } + }, + + // multi + initSelection: function () { + var data; + if (this.opts.element.val() === "" && this.opts.element.text() === "") { + this.updateSelection([]); + this.close(); + // set the placeholder if necessary + this.clearSearch(); + } + if (this.select || this.opts.element.val() !== "") { + var self = this; + this.opts.initSelection.call(null, this.opts.element, function(data){ + if (data !== undefined && data !== null) { + self.updateSelection(data); + self.close(); + // set the placeholder if necessary + self.clearSearch(); + } + }); + } + }, + + // multi + clearSearch: function () { + var placeholder = this.getPlaceholder(), + maxWidth = this.getMaxSearchWidth(); + + if (placeholder !== undefined && this.getVal().length === 0 && this.search.hasClass("select2-focused") === false) { + this.search.val(placeholder).addClass("select2-default"); + // stretch the search box to full width of the container so as much of the placeholder is visible as possible + // we could call this.resizeSearch(), but we do not because that requires a sizer and we do not want to create one so early because of a firefox bug, see #944 + this.search.width(maxWidth > 0 ? maxWidth : this.container.css("width")); + } else { + this.search.val("").width(10); + } + }, + + // multi + clearPlaceholder: function () { + if (this.search.hasClass("select2-default")) { + this.search.val("").removeClass("select2-default"); + } + }, + + // multi + opening: function () { + this.clearPlaceholder(); // should be done before super so placeholder is not used to search + this.resizeSearch(); + + this.parent.opening.apply(this, arguments); + + this.focusSearch(); + + // initializes search's value with nextSearchTerm (if defined by user) + // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter + if(this.search.val() === "") { + if(this.nextSearchTerm != undefined){ + this.search.val(this.nextSearchTerm); + this.search.select(); + } + } + + this.updateResults(true); + if (this.opts.shouldFocusInput(this)) { + this.search.focus(); + } + this.opts.element.trigger($.Event("select2-open")); + }, + + // multi + close: function () { + if (!this.opened()) return; + this.parent.close.apply(this, arguments); + }, + + // multi + focus: function () { + this.close(); + this.search.focus(); + }, + + // multi + isFocused: function () { + return this.search.hasClass("select2-focused"); + }, + + // multi + updateSelection: function (data) { + var ids = [], filtered = [], self = this; + + // filter out duplicates + $(data).each(function () { + if (indexOf(self.id(this), ids) < 0) { + ids.push(self.id(this)); + filtered.push(this); + } + }); + data = filtered; + + this.selection.find(".select2-search-choice").remove(); + $(data).each(function () { + self.addSelectedChoice(this); + }); + self.postprocessResults(); + }, + + // multi + tokenize: function() { + var input = this.search.val(); + input = this.opts.tokenizer.call(this, input, this.data(), this.bind(this.onSelect), this.opts); + if (input != null && input != undefined) { + this.search.val(input); + if (input.length > 0) { + this.open(); + } + } + + }, + + // multi + onSelect: function (data, options) { + + if (!this.triggerSelect(data) || data.text === "") { return; } + + this.addSelectedChoice(data); + + this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data }); + + // keep track of the search's value before it gets cleared + this.nextSearchTerm = this.opts.nextSearchTerm(data, this.search.val()); + + this.clearSearch(); + this.updateResults(); + + if (this.select || !this.opts.closeOnSelect) this.postprocessResults(data, false, this.opts.closeOnSelect===true); + + if (this.opts.closeOnSelect) { + this.close(); + this.search.width(10); + } else { + if (this.countSelectableResults()>0) { + this.search.width(10); + this.resizeSearch(); + if (this.getMaximumSelectionSize() > 0 && this.val().length >= this.getMaximumSelectionSize()) { + // if we reached max selection size repaint the results so choices + // are replaced with the max selection reached message + this.updateResults(true); + } else { + // initializes search's value with nextSearchTerm and update search result + if(this.nextSearchTerm != undefined){ + this.search.val(this.nextSearchTerm); + this.updateResults(); + this.search.select(); + } + } + this.positionDropdown(); + } else { + // if nothing left to select close + this.close(); + this.search.width(10); + } + } + + // since its not possible to select an element that has already been + // added we do not need to check if this is a new element before firing change + this.triggerChange({ added: data }); + + if (!options || !options.noFocus) + this.focusSearch(); + }, + + // multi + cancel: function () { + this.close(); + this.focusSearch(); + }, + + addSelectedChoice: function (data) { + var enableChoice = !data.locked, + enabledItem = $( + "
  • " + + "
    " + + " " + + "
    • "), + disabledItem = $( + "
  • " + + "
    " + + "
    • "); + var choice = enableChoice ? enabledItem : disabledItem, + id = this.id(data), + val = this.getVal(), + formatted, + cssClass; + + formatted=this.opts.formatSelection(data, choice.find("div"), this.opts.escapeMarkup); + if (formatted != undefined) { + choice.find("div").replaceWith($("
    ").html(formatted)); + } + cssClass=this.opts.formatSelectionCssClass(data, choice.find("div")); + if (cssClass != undefined) { + choice.addClass(cssClass); + } + + if(enableChoice){ + choice.find(".select2-search-choice-close") + .on("mousedown", killEvent) + .on("click dblclick", this.bind(function (e) { + if (!this.isInterfaceEnabled()) return; + + this.unselect($(e.target)); + this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus"); + killEvent(e); + this.close(); + this.focusSearch(); + })).on("focus", this.bind(function () { + if (!this.isInterfaceEnabled()) return; + this.container.addClass("select2-container-active"); + this.dropdown.addClass("select2-drop-active"); + })); + } + + choice.data("select2-data", data); + choice.insertBefore(this.searchContainer); + + val.push(id); + this.setVal(val); + }, + + // multi + unselect: function (selected) { + var val = this.getVal(), + data, + index; + selected = selected.closest(".select2-search-choice"); + + if (selected.length === 0) { + throw "Invalid argument: " + selected + ". Must be .select2-search-choice"; + } + + data = selected.data("select2-data"); + + if (!data) { + // prevent a race condition when the 'x' is clicked really fast repeatedly the event can be queued + // and invoked on an element already removed + return; + } + + var evt = $.Event("select2-removing"); + evt.val = this.id(data); + evt.choice = data; + this.opts.element.trigger(evt); + + if (evt.isDefaultPrevented()) { + return false; + } + + while((index = indexOf(this.id(data), val)) >= 0) { + val.splice(index, 1); + this.setVal(val); + if (this.select) this.postprocessResults(); + } + + selected.remove(); + + this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data }); + this.triggerChange({ removed: data }); + + return true; + }, + + // multi + postprocessResults: function (data, initial, noHighlightUpdate) { + var val = this.getVal(), + choices = this.results.find(".select2-result"), + compound = this.results.find(".select2-result-with-children"), + self = this; + + choices.each2(function (i, choice) { + var id = self.id(choice.data("select2-data")); + if (indexOf(id, val) >= 0) { + choice.addClass("select2-selected"); + // mark all children of the selected parent as selected + choice.find(".select2-result-selectable").addClass("select2-selected"); + } + }); + + compound.each2(function(i, choice) { + // hide an optgroup if it doesn't have any selectable children + if (!choice.is('.select2-result-selectable') + && choice.find(".select2-result-selectable:not(.select2-selected)").length === 0) { + choice.addClass("select2-selected"); + } + }); + + if (this.highlight() == -1 && noHighlightUpdate !== false && this.opts.closeOnSelect === true){ + self.highlight(0); + } + + //If all results are chosen render formatNoMatches + if(!this.opts.createSearchChoice && !choices.filter('.select2-result:not(.select2-selected)').length > 0){ + if(!data || data && !data.more && this.results.find(".select2-no-results").length === 0) { + if (checkFormatter(self.opts.formatNoMatches, "formatNoMatches")) { + this.results.append("
  • " + evaluate(self.opts.formatNoMatches, self.opts.element, self.search.val()) + "
    • "); + } + } + } + + }, + + // multi + getMaxSearchWidth: function() { + return this.selection.width() - getSideBorderPadding(this.search); + }, + + // multi + resizeSearch: function () { + var minimumWidth, left, maxWidth, containerLeft, searchWidth, + sideBorderPadding = getSideBorderPadding(this.search); + + minimumWidth = measureTextWidth(this.search) + 10; + + left = this.search.offset().left; + + maxWidth = this.selection.width(); + containerLeft = this.selection.offset().left; + + searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding; + + if (searchWidth < minimumWidth) { + searchWidth = maxWidth - sideBorderPadding; + } + + if (searchWidth < 40) { + searchWidth = maxWidth - sideBorderPadding; + } + + if (searchWidth <= 0) { + searchWidth = minimumWidth; + } + + this.search.width(Math.floor(searchWidth)); + }, + + // multi + getVal: function () { + var val; + if (this.select) { + val = this.select.val(); + return val === null ? [] : val; + } else { + val = this.opts.element.val(); + return splitVal(val, this.opts.separator, this.opts.transformVal); + } + }, + + // multi + setVal: function (val) { + var unique; + if (this.select) { + this.select.val(val); + } else { + unique = []; + // filter out duplicates + $(val).each(function () { + if (indexOf(this, unique) < 0) unique.push(this); + }); + this.opts.element.val(unique.length === 0 ? "" : unique.join(this.opts.separator)); + } + }, + + // multi + buildChangeDetails: function (old, current) { + var current = current.slice(0), + old = old.slice(0); + + // remove intersection from each array + for (var i = 0; i < current.length; i++) { + for (var j = 0; j < old.length; j++) { + if (equal(this.opts.id(current[i]), this.opts.id(old[j]))) { + current.splice(i, 1); + if(i>0){ + i--; + } + old.splice(j, 1); + j--; + } + } + } + + return {added: current, removed: old}; + }, + + + // multi + val: function (val, triggerChange) { + var oldData, self=this; + + if (arguments.length === 0) { + return this.getVal(); + } + + oldData=this.data(); + if (!oldData.length) oldData=[]; + + // val is an id. !val is true for [undefined,null,'',0] - 0 is legal + if (!val && val !== 0) { + this.opts.element.val(""); + this.updateSelection([]); + this.clearSearch(); + if (triggerChange) { + this.triggerChange({added: this.data(), removed: oldData}); + } + return; + } + + // val is a list of ids + this.setVal(val); + + if (this.select) { + this.opts.initSelection(this.select, this.bind(this.updateSelection)); + if (triggerChange) { + this.triggerChange(this.buildChangeDetails(oldData, this.data())); + } + } else { + if (this.opts.initSelection === undefined) { + throw new Error("val() cannot be called if initSelection() is not defined"); + } + + this.opts.initSelection(this.opts.element, function(data){ + var ids=$.map(data, self.id); + self.setVal(ids); + self.updateSelection(data); + self.clearSearch(); + if (triggerChange) { + self.triggerChange(self.buildChangeDetails(oldData, self.data())); + } + }); + } + this.clearSearch(); + }, + + // multi + onSortStart: function() { + if (this.select) { + throw new Error("Sorting of elements is not supported when attached to instead."); + } + + // collapse search field into 0 width so its container can be collapsed as well + this.search.width(0); + // hide the container + this.searchContainer.hide(); + }, + + // multi + onSortEnd:function() { + + var val=[], self=this; + + // show search and move it to the end of the list + this.searchContainer.show(); + // make sure the search container is the last item in the list + this.searchContainer.appendTo(this.searchContainer.parent()); + // since we collapsed the width in dragStarted, we resize it here + this.resizeSearch(); + + // update selection + this.selection.find(".select2-search-choice").each(function() { + val.push(self.opts.id($(this).data("select2-data"))); + }); + this.setVal(val); + this.triggerChange(); + }, + + // multi + data: function(values, triggerChange) { + var self=this, ids, old; + if (arguments.length === 0) { + return this.selection + .children(".select2-search-choice") + .map(function() { return $(this).data("select2-data"); }) + .get(); + } else { + old = this.data(); + if (!values) { values = []; } + ids = $.map(values, function(e) { return self.opts.id(e); }); + this.setVal(ids); + this.updateSelection(values); + this.clearSearch(); + if (triggerChange) { + this.triggerChange(this.buildChangeDetails(old, this.data())); + } + } + } + }); + + $.fn.select2 = function () { + + var args = Array.prototype.slice.call(arguments, 0), + opts, + select2, + method, value, multiple, + allowedMethods = ["val", "destroy", "opened", "open", "close", "focus", "isFocused", "container", "dropdown", "onSortStart", "onSortEnd", "enable", "disable", "readonly", "positionDropdown", "data", "search"], + valueMethods = ["opened", "isFocused", "container", "dropdown"], + propertyMethods = ["val", "data"], + methodsMap = { search: "externalSearch" }; + + this.each(function () { + if (args.length === 0 || typeof(args[0]) === "object") { + opts = args.length === 0 ? {} : $.extend({}, args[0]); + opts.element = $(this); + + if (opts.element.get(0).tagName.toLowerCase() === "select") { + multiple = opts.element.prop("multiple"); + } else { + multiple = opts.multiple || false; + if ("tags" in opts) {opts.multiple = multiple = true;} + } + + select2 = multiple ? new window.Select2["class"].multi() : new window.Select2["class"].single(); + select2.init(opts); + } else if (typeof(args[0]) === "string") { + + if (indexOf(args[0], allowedMethods) < 0) { + throw "Unknown method: " + args[0]; + } + + value = undefined; + select2 = $(this).data("select2"); + if (select2 === undefined) return; + + method=args[0]; + + if (method === "container") { + value = select2.container; + } else if (method === "dropdown") { + value = select2.dropdown; + } else { + if (methodsMap[method]) method = methodsMap[method]; + + value = select2[method].apply(select2, args.slice(1)); + } + if (indexOf(args[0], valueMethods) >= 0 + || (indexOf(args[0], propertyMethods) >= 0 && args.length == 1)) { + return false; // abort the iteration, ready to return first matched value + } + } else { + throw "Invalid arguments to select2 plugin: " + args; + } + }); + return (value === undefined) ? this : value; + }; + + // plugin defaults, accessible to users + $.fn.select2.defaults = { + width: "copy", + loadMorePadding: 0, + closeOnSelect: true, + openOnEnter: true, + containerCss: {}, + dropdownCss: {}, + containerCssClass: "", + dropdownCssClass: "", + formatResult: function(result, container, query, escapeMarkup) { + var markup=[]; + markMatch(this.text(result), query.term, markup, escapeMarkup); + return markup.join(""); + }, + transformVal: function(val) { + return $.trim(val); + }, + formatSelection: function (data, container, escapeMarkup) { + return data ? escapeMarkup(this.text(data)) : undefined; + }, + sortResults: function (results, container, query) { + return results; + }, + formatResultCssClass: function(data) {return data.css;}, + formatSelectionCssClass: function(data, container) {return undefined;}, + minimumResultsForSearch: 0, + minimumInputLength: 0, + maximumInputLength: null, + maximumSelectionSize: 0, + id: function (e) { return e == undefined ? null : e.id; }, + text: function (e) { + if (e && this.data && this.data.text) { + if ($.isFunction(this.data.text)) { + return this.data.text(e); + } else { + return e[this.data.text]; + } + } else { + return e.text; + } + }, + matcher: function(term, text) { + return stripDiacritics(''+text).toUpperCase().indexOf(stripDiacritics(''+term).toUpperCase()) >= 0; + }, + separator: ",", + tokenSeparators: [], + tokenizer: defaultTokenizer, + escapeMarkup: defaultEscapeMarkup, + blurOnChange: false, + selectOnBlur: false, + adaptContainerCssClass: function(c) { return c; }, + adaptDropdownCssClass: function(c) { return null; }, + nextSearchTerm: function(selectedObject, currentSearchTerm) { return undefined; }, + searchInputPlaceholder: '', + createSearchChoicePosition: 'top', + shouldFocusInput: function (instance) { + // Attempt to detect touch devices + var supportsTouchEvents = (('ontouchstart' in window) || + (navigator.msMaxTouchPoints > 0)); + + // Only devices which support touch events should be special cased + if (!supportsTouchEvents) { + return true; + } + + // Never focus the input if search is disabled + if (instance.opts.minimumResultsForSearch < 0) { + return false; + } + + return true; + } + }; + + $.fn.select2.locales = []; + + $.fn.select2.locales['en'] = { + formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; }, + formatNoMatches: function () { return "No matches found"; }, + formatAjaxError: function (jqXHR, textStatus, errorThrown) { return "Loading failed"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1 ? "" : "s"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1 ? "" : "s"); }, + formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); }, + formatLoadMore: function (pageNumber) { return "Loading more results…"; }, + formatSearching: function () { return "Searching…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['en']); + + $.fn.select2.ajaxDefaults = { + transport: $.ajax, + params: { + type: "GET", + cache: false, + dataType: "json" + } + }; + + // exports + window.Select2 = { + query: { + ajax: ajax, + local: local, + tags: tags + }, util: { + debounce: debounce, + markMatch: markMatch, + escapeMarkup: defaultEscapeMarkup, + stripDiacritics: stripDiacritics + }, "class": { + "abstract": AbstractSelect2, + "single": SingleSelect2, + "multi": MultiSelect2 + } + }; + +}(jQuery)); diff --git a/htdocs/includes/jquery/plugins/select2/select2.min.js b/htdocs/includes/jquery/plugins/select2/select2.min.js new file mode 100644 index 00000000000..b56419e2e79 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2.min.js @@ -0,0 +1,23 @@ +/* +Copyright 2014 Igor Vaynberg + +Version: 3.5.2 Timestamp: Sat Nov 1 14:43:36 EDT 2014 + +This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU +General Public License version 2 (the "GPL License"). You may choose either license to govern your +use of this software only upon the condition that you accept all of the terms of either the Apache +License or the GPL License. + +You may obtain a copy of the Apache License and the GPL License at: + +http://www.apache.org/licenses/LICENSE-2.0 +http://www.gnu.org/licenses/gpl-2.0.html + +Unless required by applicable law or agreed to in writing, software distributed under the Apache License +or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +either express or implied. See the Apache License and the GPL License for the specific language governing +permissions and limitations under the Apache License and the GPL License. +*/ +!function(a){"undefined"==typeof a.fn.each2&&a.extend(a.fn,{each2:function(b){for(var c=a([0]),d=-1,e=this.length;++dc;c+=1)if(r(a,b[c]))return c;return-1}function q(){var b=a(l);b.appendTo(document.body);var c={width:b.width()-b[0].clientWidth,height:b.height()-b[0].clientHeight};return b.remove(),c}function r(a,c){return a===c?!0:a===b||c===b?!1:null===a||null===c?!1:a.constructor===String?a+""==c+"":c.constructor===String?c+""==a+"":!1}function s(a,b,c){var d,e,f;if(null===a||a.length<1)return[];for(d=a.split(b),e=0,f=d.length;f>e;e+=1)d[e]=c(d[e]);return d}function t(a){return a.outerWidth(!1)-a.width()}function u(c){var d="keyup-change-value";c.on("keydown",function(){a.data(c,d)===b&&a.data(c,d,c.val())}),c.on("keyup",function(){var e=a.data(c,d);e!==b&&c.val()!==e&&(a.removeData(c,d),c.trigger("keyup-change"))})}function v(c){c.on("mousemove",function(c){var d=h;(d===b||d.x!==c.pageX||d.y!==c.pageY)&&a(c.target).trigger("mousemove-filtered",c)})}function w(a,c,d){d=d||b;var e;return function(){var b=arguments;window.clearTimeout(e),e=window.setTimeout(function(){c.apply(d,b)},a)}}function x(a,b){var c=w(a,function(a){b.trigger("scroll-debounced",a)});b.on("scroll",function(a){p(a.target,b.get())>=0&&c(a)})}function y(a){a[0]!==document.activeElement&&window.setTimeout(function(){var d,b=a[0],c=a.val().length;a.focus();var e=b.offsetWidth>0||b.offsetHeight>0;e&&b===document.activeElement&&(b.setSelectionRange?b.setSelectionRange(c,c):b.createTextRange&&(d=b.createTextRange(),d.collapse(!1),d.select()))},0)}function z(b){b=a(b)[0];var c=0,d=0;if("selectionStart"in b)c=b.selectionStart,d=b.selectionEnd-c;else if("selection"in document){b.focus();var e=document.selection.createRange();d=document.selection.createRange().text.length,e.moveStart("character",-b.value.length),c=e.text.length-d}return{offset:c,length:d}}function A(a){a.preventDefault(),a.stopPropagation()}function B(a){a.preventDefault(),a.stopImmediatePropagation()}function C(b){if(!g){var c=b[0].currentStyle||window.getComputedStyle(b[0],null);g=a(document.createElement("div")).css({position:"absolute",left:"-10000px",top:"-10000px",display:"none",fontSize:c.fontSize,fontFamily:c.fontFamily,fontStyle:c.fontStyle,fontWeight:c.fontWeight,letterSpacing:c.letterSpacing,textTransform:c.textTransform,whiteSpace:"nowrap"}),g.attr("class","select2-sizer"),a(document.body).append(g)}return g.text(b.val()),g.width()}function D(b,c,d){var e,g,f=[];e=a.trim(b.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each2(function(){0===this.indexOf("select2-")&&f.push(this)})),e=a.trim(c.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each2(function(){0!==this.indexOf("select2-")&&(g=d(this),g&&f.push(g))})),b.attr("class",f.join(" "))}function E(a,b,c,d){var e=o(a.toUpperCase()).indexOf(o(b.toUpperCase())),f=b.length;return 0>e?(c.push(d(a)),void 0):(c.push(d(a.substring(0,e))),c.push(""),c.push(d(a.substring(e,e+f))),c.push(""),c.push(d(a.substring(e+f,a.length))),void 0)}function F(a){var b={"\\":"\","&":"&","<":"<",">":">",'"':""","'":"'","/":"/"};return String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})}function G(c){var d,e=null,f=c.quietMillis||100,g=c.url,h=this;return function(i){window.clearTimeout(d),d=window.setTimeout(function(){var d=c.data,f=g,j=c.transport||a.fn.select2.ajaxDefaults.transport,k={type:c.type||"GET",cache:c.cache||!1,jsonpCallback:c.jsonpCallback||b,dataType:c.dataType||"json"},l=a.extend({},a.fn.select2.ajaxDefaults.params,k);d=d?d.call(h,i.term,i.page,i.context):null,f="function"==typeof f?f.call(h,i.term,i.page,i.context):f,e&&"function"==typeof e.abort&&e.abort(),c.params&&(a.isFunction(c.params)?a.extend(l,c.params.call(h)):a.extend(l,c.params)),a.extend(l,{url:f,dataType:c.dataType,data:d,success:function(a){var b=c.results(a,i.page,i);i.callback(b)},error:function(a,b,c){var d={hasError:!0,jqXHR:a,textStatus:b,errorThrown:c};i.callback(d)}}),e=j.call(h,l)},f)}}function H(b){var d,e,c=b,f=function(a){return""+a.text};a.isArray(c)&&(e=c,c={results:e}),a.isFunction(c)===!1&&(e=c,c=function(){return e});var g=c();return g.text&&(f=g.text,a.isFunction(f)||(d=g.text,f=function(a){return a[d]})),function(b){var g,d=b.term,e={results:[]};return""===d?(b.callback(c()),void 0):(g=function(c,e){var h,i;if(c=c[0],c.children){h={};for(i in c)c.hasOwnProperty(i)&&(h[i]=c[i]);h.children=[],a(c.children).each2(function(a,b){g(b,h.children)}),(h.children.length||b.matcher(d,f(h),c))&&e.push(h)}else b.matcher(d,f(c),c)&&e.push(c)},a(c().results).each2(function(a,b){g(b,e.results)}),b.callback(e),void 0)}}function I(c){var d=a.isFunction(c);return function(e){var f=e.term,g={results:[]},h=d?c(e):c;a.isArray(h)&&(a(h).each(function(){var a=this.text!==b,c=a?this.text:this;(""===f||e.matcher(f,c))&&g.results.push(a?this:{id:this,text:this})}),e.callback(g))}}function J(b,c){if(a.isFunction(b))return!0;if(!b)return!1;if("string"==typeof b)return!0;throw new Error(c+" must be a string, function, or falsy value")}function K(b,c){if(a.isFunction(b)){var d=Array.prototype.slice.call(arguments,2);return b.apply(c,d)}return b}function L(b){var c=0;return a.each(b,function(a,b){b.children?c+=L(b.children):c++}),c}function M(a,c,d,e){var h,i,j,k,l,f=a,g=!1;if(!e.createSearchChoice||!e.tokenSeparators||e.tokenSeparators.length<1)return b;for(;;){for(i=-1,j=0,k=e.tokenSeparators.length;k>j&&(l=e.tokenSeparators[j],i=a.indexOf(l),!(i>=0));j++);if(0>i)break;if(h=a.substring(0,i),a=a.substring(i+l.length),h.length>0&&(h=e.createSearchChoice.call(this,h,c),h!==b&&null!==h&&e.id(h)!==b&&null!==e.id(h))){for(g=!1,j=0,k=c.length;k>j;j++)if(r(e.id(h),e.id(c[j]))){g=!0;break}g||d(h)}}return f!==a?a:void 0}function N(){var b=this;a.each(arguments,function(a,c){b[c].remove(),b[c]=null})}function O(b,c){var d=function(){};return d.prototype=new b,d.prototype.constructor=d,d.prototype.parent=b.prototype,d.prototype=a.extend(d.prototype,c),d}if(window.Select2===b){var c,d,e,f,g,i,j,h={x:0,y:0},k={TAB:9,ENTER:13,ESC:27,SPACE:32,LEFT:37,UP:38,RIGHT:39,DOWN:40,SHIFT:16,CTRL:17,ALT:18,PAGE_UP:33,PAGE_DOWN:34,HOME:36,END:35,BACKSPACE:8,DELETE:46,isArrow:function(a){switch(a=a.which?a.which:a){case k.LEFT:case k.RIGHT:case k.UP:case k.DOWN:return!0}return!1},isControl:function(a){var b=a.which;switch(b){case k.SHIFT:case k.CTRL:case k.ALT:return!0}return a.metaKey?!0:!1},isFunctionKey:function(a){return a=a.which?a.which:a,a>=112&&123>=a}},l="
    ",m={"\u24b6":"A","\uff21":"A","\xc0":"A","\xc1":"A","\xc2":"A","\u1ea6":"A","\u1ea4":"A","\u1eaa":"A","\u1ea8":"A","\xc3":"A","\u0100":"A","\u0102":"A","\u1eb0":"A","\u1eae":"A","\u1eb4":"A","\u1eb2":"A","\u0226":"A","\u01e0":"A","\xc4":"A","\u01de":"A","\u1ea2":"A","\xc5":"A","\u01fa":"A","\u01cd":"A","\u0200":"A","\u0202":"A","\u1ea0":"A","\u1eac":"A","\u1eb6":"A","\u1e00":"A","\u0104":"A","\u023a":"A","\u2c6f":"A","\ua732":"AA","\xc6":"AE","\u01fc":"AE","\u01e2":"AE","\ua734":"AO","\ua736":"AU","\ua738":"AV","\ua73a":"AV","\ua73c":"AY","\u24b7":"B","\uff22":"B","\u1e02":"B","\u1e04":"B","\u1e06":"B","\u0243":"B","\u0182":"B","\u0181":"B","\u24b8":"C","\uff23":"C","\u0106":"C","\u0108":"C","\u010a":"C","\u010c":"C","\xc7":"C","\u1e08":"C","\u0187":"C","\u023b":"C","\ua73e":"C","\u24b9":"D","\uff24":"D","\u1e0a":"D","\u010e":"D","\u1e0c":"D","\u1e10":"D","\u1e12":"D","\u1e0e":"D","\u0110":"D","\u018b":"D","\u018a":"D","\u0189":"D","\ua779":"D","\u01f1":"DZ","\u01c4":"DZ","\u01f2":"Dz","\u01c5":"Dz","\u24ba":"E","\uff25":"E","\xc8":"E","\xc9":"E","\xca":"E","\u1ec0":"E","\u1ebe":"E","\u1ec4":"E","\u1ec2":"E","\u1ebc":"E","\u0112":"E","\u1e14":"E","\u1e16":"E","\u0114":"E","\u0116":"E","\xcb":"E","\u1eba":"E","\u011a":"E","\u0204":"E","\u0206":"E","\u1eb8":"E","\u1ec6":"E","\u0228":"E","\u1e1c":"E","\u0118":"E","\u1e18":"E","\u1e1a":"E","\u0190":"E","\u018e":"E","\u24bb":"F","\uff26":"F","\u1e1e":"F","\u0191":"F","\ua77b":"F","\u24bc":"G","\uff27":"G","\u01f4":"G","\u011c":"G","\u1e20":"G","\u011e":"G","\u0120":"G","\u01e6":"G","\u0122":"G","\u01e4":"G","\u0193":"G","\ua7a0":"G","\ua77d":"G","\ua77e":"G","\u24bd":"H","\uff28":"H","\u0124":"H","\u1e22":"H","\u1e26":"H","\u021e":"H","\u1e24":"H","\u1e28":"H","\u1e2a":"H","\u0126":"H","\u2c67":"H","\u2c75":"H","\ua78d":"H","\u24be":"I","\uff29":"I","\xcc":"I","\xcd":"I","\xce":"I","\u0128":"I","\u012a":"I","\u012c":"I","\u0130":"I","\xcf":"I","\u1e2e":"I","\u1ec8":"I","\u01cf":"I","\u0208":"I","\u020a":"I","\u1eca":"I","\u012e":"I","\u1e2c":"I","\u0197":"I","\u24bf":"J","\uff2a":"J","\u0134":"J","\u0248":"J","\u24c0":"K","\uff2b":"K","\u1e30":"K","\u01e8":"K","\u1e32":"K","\u0136":"K","\u1e34":"K","\u0198":"K","\u2c69":"K","\ua740":"K","\ua742":"K","\ua744":"K","\ua7a2":"K","\u24c1":"L","\uff2c":"L","\u013f":"L","\u0139":"L","\u013d":"L","\u1e36":"L","\u1e38":"L","\u013b":"L","\u1e3c":"L","\u1e3a":"L","\u0141":"L","\u023d":"L","\u2c62":"L","\u2c60":"L","\ua748":"L","\ua746":"L","\ua780":"L","\u01c7":"LJ","\u01c8":"Lj","\u24c2":"M","\uff2d":"M","\u1e3e":"M","\u1e40":"M","\u1e42":"M","\u2c6e":"M","\u019c":"M","\u24c3":"N","\uff2e":"N","\u01f8":"N","\u0143":"N","\xd1":"N","\u1e44":"N","\u0147":"N","\u1e46":"N","\u0145":"N","\u1e4a":"N","\u1e48":"N","\u0220":"N","\u019d":"N","\ua790":"N","\ua7a4":"N","\u01ca":"NJ","\u01cb":"Nj","\u24c4":"O","\uff2f":"O","\xd2":"O","\xd3":"O","\xd4":"O","\u1ed2":"O","\u1ed0":"O","\u1ed6":"O","\u1ed4":"O","\xd5":"O","\u1e4c":"O","\u022c":"O","\u1e4e":"O","\u014c":"O","\u1e50":"O","\u1e52":"O","\u014e":"O","\u022e":"O","\u0230":"O","\xd6":"O","\u022a":"O","\u1ece":"O","\u0150":"O","\u01d1":"O","\u020c":"O","\u020e":"O","\u01a0":"O","\u1edc":"O","\u1eda":"O","\u1ee0":"O","\u1ede":"O","\u1ee2":"O","\u1ecc":"O","\u1ed8":"O","\u01ea":"O","\u01ec":"O","\xd8":"O","\u01fe":"O","\u0186":"O","\u019f":"O","\ua74a":"O","\ua74c":"O","\u01a2":"OI","\ua74e":"OO","\u0222":"OU","\u24c5":"P","\uff30":"P","\u1e54":"P","\u1e56":"P","\u01a4":"P","\u2c63":"P","\ua750":"P","\ua752":"P","\ua754":"P","\u24c6":"Q","\uff31":"Q","\ua756":"Q","\ua758":"Q","\u024a":"Q","\u24c7":"R","\uff32":"R","\u0154":"R","\u1e58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1e5a":"R","\u1e5c":"R","\u0156":"R","\u1e5e":"R","\u024c":"R","\u2c64":"R","\ua75a":"R","\ua7a6":"R","\ua782":"R","\u24c8":"S","\uff33":"S","\u1e9e":"S","\u015a":"S","\u1e64":"S","\u015c":"S","\u1e60":"S","\u0160":"S","\u1e66":"S","\u1e62":"S","\u1e68":"S","\u0218":"S","\u015e":"S","\u2c7e":"S","\ua7a8":"S","\ua784":"S","\u24c9":"T","\uff34":"T","\u1e6a":"T","\u0164":"T","\u1e6c":"T","\u021a":"T","\u0162":"T","\u1e70":"T","\u1e6e":"T","\u0166":"T","\u01ac":"T","\u01ae":"T","\u023e":"T","\ua786":"T","\ua728":"TZ","\u24ca":"U","\uff35":"U","\xd9":"U","\xda":"U","\xdb":"U","\u0168":"U","\u1e78":"U","\u016a":"U","\u1e7a":"U","\u016c":"U","\xdc":"U","\u01db":"U","\u01d7":"U","\u01d5":"U","\u01d9":"U","\u1ee6":"U","\u016e":"U","\u0170":"U","\u01d3":"U","\u0214":"U","\u0216":"U","\u01af":"U","\u1eea":"U","\u1ee8":"U","\u1eee":"U","\u1eec":"U","\u1ef0":"U","\u1ee4":"U","\u1e72":"U","\u0172":"U","\u1e76":"U","\u1e74":"U","\u0244":"U","\u24cb":"V","\uff36":"V","\u1e7c":"V","\u1e7e":"V","\u01b2":"V","\ua75e":"V","\u0245":"V","\ua760":"VY","\u24cc":"W","\uff37":"W","\u1e80":"W","\u1e82":"W","\u0174":"W","\u1e86":"W","\u1e84":"W","\u1e88":"W","\u2c72":"W","\u24cd":"X","\uff38":"X","\u1e8a":"X","\u1e8c":"X","\u24ce":"Y","\uff39":"Y","\u1ef2":"Y","\xdd":"Y","\u0176":"Y","\u1ef8":"Y","\u0232":"Y","\u1e8e":"Y","\u0178":"Y","\u1ef6":"Y","\u1ef4":"Y","\u01b3":"Y","\u024e":"Y","\u1efe":"Y","\u24cf":"Z","\uff3a":"Z","\u0179":"Z","\u1e90":"Z","\u017b":"Z","\u017d":"Z","\u1e92":"Z","\u1e94":"Z","\u01b5":"Z","\u0224":"Z","\u2c7f":"Z","\u2c6b":"Z","\ua762":"Z","\u24d0":"a","\uff41":"a","\u1e9a":"a","\xe0":"a","\xe1":"a","\xe2":"a","\u1ea7":"a","\u1ea5":"a","\u1eab":"a","\u1ea9":"a","\xe3":"a","\u0101":"a","\u0103":"a","\u1eb1":"a","\u1eaf":"a","\u1eb5":"a","\u1eb3":"a","\u0227":"a","\u01e1":"a","\xe4":"a","\u01df":"a","\u1ea3":"a","\xe5":"a","\u01fb":"a","\u01ce":"a","\u0201":"a","\u0203":"a","\u1ea1":"a","\u1ead":"a","\u1eb7":"a","\u1e01":"a","\u0105":"a","\u2c65":"a","\u0250":"a","\ua733":"aa","\xe6":"ae","\u01fd":"ae","\u01e3":"ae","\ua735":"ao","\ua737":"au","\ua739":"av","\ua73b":"av","\ua73d":"ay","\u24d1":"b","\uff42":"b","\u1e03":"b","\u1e05":"b","\u1e07":"b","\u0180":"b","\u0183":"b","\u0253":"b","\u24d2":"c","\uff43":"c","\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\xe7":"c","\u1e09":"c","\u0188":"c","\u023c":"c","\ua73f":"c","\u2184":"c","\u24d3":"d","\uff44":"d","\u1e0b":"d","\u010f":"d","\u1e0d":"d","\u1e11":"d","\u1e13":"d","\u1e0f":"d","\u0111":"d","\u018c":"d","\u0256":"d","\u0257":"d","\ua77a":"d","\u01f3":"dz","\u01c6":"dz","\u24d4":"e","\uff45":"e","\xe8":"e","\xe9":"e","\xea":"e","\u1ec1":"e","\u1ebf":"e","\u1ec5":"e","\u1ec3":"e","\u1ebd":"e","\u0113":"e","\u1e15":"e","\u1e17":"e","\u0115":"e","\u0117":"e","\xeb":"e","\u1ebb":"e","\u011b":"e","\u0205":"e","\u0207":"e","\u1eb9":"e","\u1ec7":"e","\u0229":"e","\u1e1d":"e","\u0119":"e","\u1e19":"e","\u1e1b":"e","\u0247":"e","\u025b":"e","\u01dd":"e","\u24d5":"f","\uff46":"f","\u1e1f":"f","\u0192":"f","\ua77c":"f","\u24d6":"g","\uff47":"g","\u01f5":"g","\u011d":"g","\u1e21":"g","\u011f":"g","\u0121":"g","\u01e7":"g","\u0123":"g","\u01e5":"g","\u0260":"g","\ua7a1":"g","\u1d79":"g","\ua77f":"g","\u24d7":"h","\uff48":"h","\u0125":"h","\u1e23":"h","\u1e27":"h","\u021f":"h","\u1e25":"h","\u1e29":"h","\u1e2b":"h","\u1e96":"h","\u0127":"h","\u2c68":"h","\u2c76":"h","\u0265":"h","\u0195":"hv","\u24d8":"i","\uff49":"i","\xec":"i","\xed":"i","\xee":"i","\u0129":"i","\u012b":"i","\u012d":"i","\xef":"i","\u1e2f":"i","\u1ec9":"i","\u01d0":"i","\u0209":"i","\u020b":"i","\u1ecb":"i","\u012f":"i","\u1e2d":"i","\u0268":"i","\u0131":"i","\u24d9":"j","\uff4a":"j","\u0135":"j","\u01f0":"j","\u0249":"j","\u24da":"k","\uff4b":"k","\u1e31":"k","\u01e9":"k","\u1e33":"k","\u0137":"k","\u1e35":"k","\u0199":"k","\u2c6a":"k","\ua741":"k","\ua743":"k","\ua745":"k","\ua7a3":"k","\u24db":"l","\uff4c":"l","\u0140":"l","\u013a":"l","\u013e":"l","\u1e37":"l","\u1e39":"l","\u013c":"l","\u1e3d":"l","\u1e3b":"l","\u017f":"l","\u0142":"l","\u019a":"l","\u026b":"l","\u2c61":"l","\ua749":"l","\ua781":"l","\ua747":"l","\u01c9":"lj","\u24dc":"m","\uff4d":"m","\u1e3f":"m","\u1e41":"m","\u1e43":"m","\u0271":"m","\u026f":"m","\u24dd":"n","\uff4e":"n","\u01f9":"n","\u0144":"n","\xf1":"n","\u1e45":"n","\u0148":"n","\u1e47":"n","\u0146":"n","\u1e4b":"n","\u1e49":"n","\u019e":"n","\u0272":"n","\u0149":"n","\ua791":"n","\ua7a5":"n","\u01cc":"nj","\u24de":"o","\uff4f":"o","\xf2":"o","\xf3":"o","\xf4":"o","\u1ed3":"o","\u1ed1":"o","\u1ed7":"o","\u1ed5":"o","\xf5":"o","\u1e4d":"o","\u022d":"o","\u1e4f":"o","\u014d":"o","\u1e51":"o","\u1e53":"o","\u014f":"o","\u022f":"o","\u0231":"o","\xf6":"o","\u022b":"o","\u1ecf":"o","\u0151":"o","\u01d2":"o","\u020d":"o","\u020f":"o","\u01a1":"o","\u1edd":"o","\u1edb":"o","\u1ee1":"o","\u1edf":"o","\u1ee3":"o","\u1ecd":"o","\u1ed9":"o","\u01eb":"o","\u01ed":"o","\xf8":"o","\u01ff":"o","\u0254":"o","\ua74b":"o","\ua74d":"o","\u0275":"o","\u01a3":"oi","\u0223":"ou","\ua74f":"oo","\u24df":"p","\uff50":"p","\u1e55":"p","\u1e57":"p","\u01a5":"p","\u1d7d":"p","\ua751":"p","\ua753":"p","\ua755":"p","\u24e0":"q","\uff51":"q","\u024b":"q","\ua757":"q","\ua759":"q","\u24e1":"r","\uff52":"r","\u0155":"r","\u1e59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1e5b":"r","\u1e5d":"r","\u0157":"r","\u1e5f":"r","\u024d":"r","\u027d":"r","\ua75b":"r","\ua7a7":"r","\ua783":"r","\u24e2":"s","\uff53":"s","\xdf":"s","\u015b":"s","\u1e65":"s","\u015d":"s","\u1e61":"s","\u0161":"s","\u1e67":"s","\u1e63":"s","\u1e69":"s","\u0219":"s","\u015f":"s","\u023f":"s","\ua7a9":"s","\ua785":"s","\u1e9b":"s","\u24e3":"t","\uff54":"t","\u1e6b":"t","\u1e97":"t","\u0165":"t","\u1e6d":"t","\u021b":"t","\u0163":"t","\u1e71":"t","\u1e6f":"t","\u0167":"t","\u01ad":"t","\u0288":"t","\u2c66":"t","\ua787":"t","\ua729":"tz","\u24e4":"u","\uff55":"u","\xf9":"u","\xfa":"u","\xfb":"u","\u0169":"u","\u1e79":"u","\u016b":"u","\u1e7b":"u","\u016d":"u","\xfc":"u","\u01dc":"u","\u01d8":"u","\u01d6":"u","\u01da":"u","\u1ee7":"u","\u016f":"u","\u0171":"u","\u01d4":"u","\u0215":"u","\u0217":"u","\u01b0":"u","\u1eeb":"u","\u1ee9":"u","\u1eef":"u","\u1eed":"u","\u1ef1":"u","\u1ee5":"u","\u1e73":"u","\u0173":"u","\u1e77":"u","\u1e75":"u","\u0289":"u","\u24e5":"v","\uff56":"v","\u1e7d":"v","\u1e7f":"v","\u028b":"v","\ua75f":"v","\u028c":"v","\ua761":"vy","\u24e6":"w","\uff57":"w","\u1e81":"w","\u1e83":"w","\u0175":"w","\u1e87":"w","\u1e85":"w","\u1e98":"w","\u1e89":"w","\u2c73":"w","\u24e7":"x","\uff58":"x","\u1e8b":"x","\u1e8d":"x","\u24e8":"y","\uff59":"y","\u1ef3":"y","\xfd":"y","\u0177":"y","\u1ef9":"y","\u0233":"y","\u1e8f":"y","\xff":"y","\u1ef7":"y","\u1e99":"y","\u1ef5":"y","\u01b4":"y","\u024f":"y","\u1eff":"y","\u24e9":"z","\uff5a":"z","\u017a":"z","\u1e91":"z","\u017c":"z","\u017e":"z","\u1e93":"z","\u1e95":"z","\u01b6":"z","\u0225":"z","\u0240":"z","\u2c6c":"z","\ua763":"z","\u0386":"\u0391","\u0388":"\u0395","\u0389":"\u0397","\u038a":"\u0399","\u03aa":"\u0399","\u038c":"\u039f","\u038e":"\u03a5","\u03ab":"\u03a5","\u038f":"\u03a9","\u03ac":"\u03b1","\u03ad":"\u03b5","\u03ae":"\u03b7","\u03af":"\u03b9","\u03ca":"\u03b9","\u0390":"\u03b9","\u03cc":"\u03bf","\u03cd":"\u03c5","\u03cb":"\u03c5","\u03b0":"\u03c5","\u03c9":"\u03c9","\u03c2":"\u03c3"};i=a(document),f=function(){var a=1;return function(){return a++}}(),c=O(Object,{bind:function(a){var b=this;return function(){a.apply(b,arguments)}},init:function(c){var d,e,g=".select2-results";this.opts=c=this.prepareOpts(c),this.id=c.id,c.element.data("select2")!==b&&null!==c.element.data("select2")&&c.element.data("select2").destroy(),this.container=this.createContainer(),this.liveRegion=a(".select2-hidden-accessible"),0==this.liveRegion.length&&(this.liveRegion=a("",{role:"status","aria-live":"polite"}).addClass("select2-hidden-accessible").appendTo(document.body)),this.containerId="s2id_"+(c.element.attr("id")||"autogen"+f()),this.containerEventName=this.containerId.replace(/([.])/g,"_").replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g,"\\$1"),this.container.attr("id",this.containerId),this.container.attr("title",c.element.attr("title")),this.body=a(document.body),D(this.container,this.opts.element,this.opts.adaptContainerCssClass),this.container.attr("style",c.element.attr("style")),this.container.css(K(c.containerCss,this.opts.element)),this.container.addClass(K(c.containerCssClass,this.opts.element)),this.elementTabIndex=this.opts.element.attr("tabindex"),this.opts.element.data("select2",this).attr("tabindex","-1").before(this.container).on("click.select2",A),this.container.data("select2",this),this.dropdown=this.container.find(".select2-drop"),D(this.dropdown,this.opts.element,this.opts.adaptDropdownCssClass),this.dropdown.addClass(K(c.dropdownCssClass,this.opts.element)),this.dropdown.data("select2",this),this.dropdown.on("click",A),this.results=d=this.container.find(g),this.search=e=this.container.find("input.select2-input"),this.queryCount=0,this.resultsPage=0,this.context=null,this.initContainer(),this.container.on("click",A),v(this.results),this.dropdown.on("mousemove-filtered",g,this.bind(this.highlightUnderEvent)),this.dropdown.on("touchstart touchmove touchend",g,this.bind(function(a){this._touchEvent=!0,this.highlightUnderEvent(a)})),this.dropdown.on("touchmove",g,this.bind(this.touchMoved)),this.dropdown.on("touchstart touchend",g,this.bind(this.clearTouchMoved)),this.dropdown.on("click",this.bind(function(){this._touchEvent&&(this._touchEvent=!1,this.selectHighlighted())})),x(80,this.results),this.dropdown.on("scroll-debounced",g,this.bind(this.loadMoreIfNeeded)),a(this.container).on("change",".select2-input",function(a){a.stopPropagation()}),a(this.dropdown).on("change",".select2-input",function(a){a.stopPropagation()}),a.fn.mousewheel&&d.mousewheel(function(a,b,c,e){var f=d.scrollTop();e>0&&0>=f-e?(d.scrollTop(0),A(a)):0>e&&d.get(0).scrollHeight-d.scrollTop()+e<=d.height()&&(d.scrollTop(d.get(0).scrollHeight-d.height()),A(a))}),u(e),e.on("keyup-change input paste",this.bind(this.updateResults)),e.on("focus",function(){e.addClass("select2-focused")}),e.on("blur",function(){e.removeClass("select2-focused")}),this.dropdown.on("mouseup",g,this.bind(function(b){a(b.target).closest(".select2-result-selectable").length>0&&(this.highlightUnderEvent(b),this.selectHighlighted(b))})),this.dropdown.on("click mouseup mousedown touchstart touchend focusin",function(a){a.stopPropagation()}),this.nextSearchTerm=b,a.isFunction(this.opts.initSelection)&&(this.initSelection(),this.monitorSource()),null!==c.maximumInputLength&&this.search.attr("maxlength",c.maximumInputLength);var h=c.element.prop("disabled");h===b&&(h=!1),this.enable(!h);var i=c.element.prop("readonly");i===b&&(i=!1),this.readonly(i),j=j||q(),this.autofocus=c.element.prop("autofocus"),c.element.prop("autofocus",!1),this.autofocus&&this.focus(),this.search.attr("placeholder",c.searchInputPlaceholder)},destroy:function(){var a=this.opts.element,c=a.data("select2"),d=this;this.close(),a.length&&a[0].detachEvent&&d._sync&&a.each(function(){d._sync&&this.detachEvent("onpropertychange",d._sync)}),this.propertyObserver&&(this.propertyObserver.disconnect(),this.propertyObserver=null),this._sync=null,c!==b&&(c.container.remove(),c.liveRegion.remove(),c.dropdown.remove(),a.show().removeData("select2").off(".select2").prop("autofocus",this.autofocus||!1),this.elementTabIndex?a.attr({tabindex:this.elementTabIndex}):a.removeAttr("tabindex"),a.show()),N.call(this,"container","liveRegion","dropdown","results","search")},optionToData:function(a){return a.is("option")?{id:a.prop("value"),text:a.text(),element:a.get(),css:a.attr("class"),disabled:a.prop("disabled"),locked:r(a.attr("locked"),"locked")||r(a.data("locked"),!0)}:a.is("optgroup")?{text:a.attr("label"),children:[],element:a.get(),css:a.attr("class")}:void 0},prepareOpts:function(c){var d,e,g,h,i=this;if(d=c.element,"select"===d.get(0).tagName.toLowerCase()&&(this.select=e=c.element),e&&a.each(["id","multiple","ajax","query","createSearchChoice","initSelection","data","tags"],function(){if(this in c)throw new Error("Option '"+this+"' is not allowed for Select2 when attached to a ","
    ","
    "," "," ","
    ","
      ","
    ","
    "].join(""));return b},enableInterface:function(){this.parent.enableInterface.apply(this,arguments)&&this.focusser.prop("disabled",!this.isInterfaceEnabled())},opening:function(){var c,d,e;this.opts.minimumResultsForSearch>=0&&this.showSearch(!0),this.parent.opening.apply(this,arguments),this.showSearchInput!==!1&&this.search.val(this.focusser.val()),this.opts.shouldFocusInput(this)&&(this.search.focus(),c=this.search.get(0),c.createTextRange?(d=c.createTextRange(),d.collapse(!1),d.select()):c.setSelectionRange&&(e=this.search.val().length,c.setSelectionRange(e,e))),""===this.search.val()&&this.nextSearchTerm!=b&&(this.search.val(this.nextSearchTerm),this.search.select()),this.focusser.prop("disabled",!0).val(""),this.updateResults(!0),this.opts.element.trigger(a.Event("select2-open"))},close:function(){this.opened()&&(this.parent.close.apply(this,arguments),this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus())},focus:function(){this.opened()?this.close():(this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus())},isFocused:function(){return this.container.hasClass("select2-container-active")},cancel:function(){this.parent.cancel.apply(this,arguments),this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus()},destroy:function(){a("label[for='"+this.focusser.attr("id")+"']").attr("for",this.opts.element.attr("id")),this.parent.destroy.apply(this,arguments),N.call(this,"selection","focusser")},initContainer:function(){var b,g,c=this.container,d=this.dropdown,e=f();this.opts.minimumResultsForSearch<0?this.showSearch(!1):this.showSearch(!0),this.selection=b=c.find(".select2-choice"),this.focusser=c.find(".select2-focusser"),b.find(".select2-chosen").attr("id","select2-chosen-"+e),this.focusser.attr("aria-labelledby","select2-chosen-"+e),this.results.attr("id","select2-results-"+e),this.search.attr("aria-owns","select2-results-"+e),this.focusser.attr("id","s2id_autogen"+e),g=a("label[for='"+this.opts.element.attr("id")+"']"),this.opts.element.focus(this.bind(function(){this.focus()})),this.focusser.prev().text(g.text()).attr("for",this.focusser.attr("id"));var h=this.opts.element.attr("title");this.opts.element.attr("title",h||g.text()),this.focusser.attr("tabindex",this.elementTabIndex),this.search.attr("id",this.focusser.attr("id")+"_search"),this.search.prev().text(a("label[for='"+this.focusser.attr("id")+"']").text()).attr("for",this.search.attr("id")),this.search.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()&&229!=a.keyCode){if(a.which===k.PAGE_UP||a.which===k.PAGE_DOWN)return A(a),void 0;switch(a.which){case k.UP:case k.DOWN:return this.moveHighlight(a.which===k.UP?-1:1),A(a),void 0;case k.ENTER:return this.selectHighlighted(),A(a),void 0;case k.TAB:return this.selectHighlighted({noFocus:!0}),void 0;case k.ESC:return this.cancel(a),A(a),void 0}}})),this.search.on("blur",this.bind(function(){document.activeElement===this.body.get(0)&&window.setTimeout(this.bind(function(){this.opened()&&this.search.focus()}),0)})),this.focusser.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()&&a.which!==k.TAB&&!k.isControl(a)&&!k.isFunctionKey(a)&&a.which!==k.ESC){if(this.opts.openOnEnter===!1&&a.which===k.ENTER)return A(a),void 0;if(a.which==k.DOWN||a.which==k.UP||a.which==k.ENTER&&this.opts.openOnEnter){if(a.altKey||a.ctrlKey||a.shiftKey||a.metaKey)return;return this.open(),A(a),void 0}return a.which==k.DELETE||a.which==k.BACKSPACE?(this.opts.allowClear&&this.clear(),A(a),void 0):void 0}})),u(this.focusser),this.focusser.on("keyup-change input",this.bind(function(a){if(this.opts.minimumResultsForSearch>=0){if(a.stopPropagation(),this.opened())return;this.open()}})),b.on("mousedown touchstart","abbr",this.bind(function(a){this.isInterfaceEnabled()&&(this.clear(),B(a),this.close(),this.selection&&this.selection.focus())})),b.on("mousedown touchstart",this.bind(function(c){n(b),this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.opened()?this.close():this.isInterfaceEnabled()&&this.open(),A(c)})),d.on("mousedown touchstart",this.bind(function(){this.opts.shouldFocusInput(this)&&this.search.focus()})),b.on("focus",this.bind(function(a){A(a)})),this.focusser.on("focus",this.bind(function(){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active")})).on("blur",this.bind(function(){this.opened()||(this.container.removeClass("select2-container-active"),this.opts.element.trigger(a.Event("select2-blur")))})),this.search.on("focus",this.bind(function(){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active")})),this.initContainerWidth(),this.opts.element.hide(),this.setPlaceholder()},clear:function(b){var c=this.selection.data("select2-data");if(c){var d=a.Event("select2-clearing");if(this.opts.element.trigger(d),d.isDefaultPrevented())return;var e=this.getPlaceholderOption();this.opts.element.val(e?e.val():""),this.selection.find(".select2-chosen").empty(),this.selection.removeData("select2-data"),this.setPlaceholder(),b!==!1&&(this.opts.element.trigger({type:"select2-removed",val:this.id(c),choice:c}),this.triggerChange({removed:c}))}},initSelection:function(){if(this.isPlaceholderOptionSelected())this.updateSelection(null),this.close(),this.setPlaceholder();else{var c=this;this.opts.initSelection.call(null,this.opts.element,function(a){a!==b&&null!==a&&(c.updateSelection(a),c.close(),c.setPlaceholder(),c.nextSearchTerm=c.opts.nextSearchTerm(a,c.search.val()))})}},isPlaceholderOptionSelected:function(){var a;return this.getPlaceholder()===b?!1:(a=this.getPlaceholderOption())!==b&&a.prop("selected")||""===this.opts.element.val()||this.opts.element.val()===b||null===this.opts.element.val()},prepareOpts:function(){var b=this.parent.prepareOpts.apply(this,arguments),c=this;return"select"===b.element.get(0).tagName.toLowerCase()?b.initSelection=function(a,b){var d=a.find("option").filter(function(){return this.selected&&!this.disabled});b(c.optionToData(d))}:"data"in b&&(b.initSelection=b.initSelection||function(c,d){var e=c.val(),f=null;b.query({matcher:function(a,c,d){var g=r(e,b.id(d));return g&&(f=d),g},callback:a.isFunction(d)?function(){d(f)}:a.noop})}),b},getPlaceholder:function(){return this.select&&this.getPlaceholderOption()===b?b:this.parent.getPlaceholder.apply(this,arguments)},setPlaceholder:function(){var a=this.getPlaceholder();if(this.isPlaceholderOptionSelected()&&a!==b){if(this.select&&this.getPlaceholderOption()===b)return;this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(a)),this.selection.addClass("select2-default"),this.container.removeClass("select2-allowclear")}},postprocessResults:function(a,b,c){var d=0,e=this;if(this.findHighlightableChoices().each2(function(a,b){return r(e.id(b.data("select2-data")),e.opts.element.val())?(d=a,!1):void 0}),c!==!1&&(b===!0&&d>=0?this.highlight(d):this.highlight(0)),b===!0){var g=this.opts.minimumResultsForSearch;g>=0&&this.showSearch(L(a.results)>=g)}},showSearch:function(b){this.showSearchInput!==b&&(this.showSearchInput=b,this.dropdown.find(".select2-search").toggleClass("select2-search-hidden",!b),this.dropdown.find(".select2-search").toggleClass("select2-offscreen",!b),a(this.dropdown,this.container).toggleClass("select2-with-searchbox",b))},onSelect:function(a,b){if(this.triggerSelect(a)){var c=this.opts.element.val(),d=this.data();this.opts.element.val(this.id(a)),this.updateSelection(a),this.opts.element.trigger({type:"select2-selected",val:this.id(a),choice:a}),this.nextSearchTerm=this.opts.nextSearchTerm(a,this.search.val()),this.close(),b&&b.noFocus||!this.opts.shouldFocusInput(this)||this.focusser.focus(),r(c,this.id(a))||this.triggerChange({added:a,removed:d})}},updateSelection:function(a){var d,e,c=this.selection.find(".select2-chosen");this.selection.data("select2-data",a),c.empty(),null!==a&&(d=this.opts.formatSelection(a,c,this.opts.escapeMarkup)),d!==b&&c.append(d),e=this.opts.formatSelectionCssClass(a,c),e!==b&&c.addClass(e),this.selection.removeClass("select2-default"),this.opts.allowClear&&this.getPlaceholder()!==b&&this.container.addClass("select2-allowclear")},val:function(){var a,c=!1,d=null,e=this,f=this.data();if(0===arguments.length)return this.opts.element.val();if(a=arguments[0],arguments.length>1&&(c=arguments[1]),this.select)this.select.val(a).find("option").filter(function(){return this.selected}).each2(function(a,b){return d=e.optionToData(b),!1}),this.updateSelection(d),this.setPlaceholder(),c&&this.triggerChange({added:d,removed:f});else{if(!a&&0!==a)return this.clear(c),void 0;if(this.opts.initSelection===b)throw new Error("cannot call val() if initSelection() is not defined");this.opts.element.val(a),this.opts.initSelection(this.opts.element,function(a){e.opts.element.val(a?e.id(a):""),e.updateSelection(a),e.setPlaceholder(),c&&e.triggerChange({added:a,removed:f})})}},clearSearch:function(){this.search.val(""),this.focusser.val("")},data:function(a){var c,d=!1;return 0===arguments.length?(c=this.selection.data("select2-data"),c==b&&(c=null),c):(arguments.length>1&&(d=arguments[1]),a?(c=this.data(),this.opts.element.val(a?this.id(a):""),this.updateSelection(a),d&&this.triggerChange({added:a,removed:c})):this.clear(d),void 0)}}),e=O(c,{createContainer:function(){var b=a(document.createElement("div")).attr({"class":"select2-container select2-container-multi"}).html(["
      ","
    • "," "," ","
      • ","
    ","
    ","
      ","
    ","
    "].join(""));return b},prepareOpts:function(){var b=this.parent.prepareOpts.apply(this,arguments),c=this;return"select"===b.element.get(0).tagName.toLowerCase()?b.initSelection=function(a,b){var d=[];a.find("option").filter(function(){return this.selected&&!this.disabled}).each2(function(a,b){d.push(c.optionToData(b))}),b(d)}:"data"in b&&(b.initSelection=b.initSelection||function(c,d){var e=s(c.val(),b.separator,b.transformVal),f=[];b.query({matcher:function(c,d,g){var h=a.grep(e,function(a){return r(a,b.id(g))}).length;return h&&f.push(g),h},callback:a.isFunction(d)?function(){for(var a=[],c=0;c0||(this.selectChoice(null),this.clearPlaceholder(),this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.open(),this.focusSearch(),b.preventDefault()))})),this.container.on("focus",b,this.bind(function(){this.isInterfaceEnabled()&&(this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"),this.clearPlaceholder())})),this.initContainerWidth(),this.opts.element.hide(),this.clearSearch()},enableInterface:function(){this.parent.enableInterface.apply(this,arguments)&&this.search.prop("disabled",!this.isInterfaceEnabled())},initSelection:function(){if(""===this.opts.element.val()&&""===this.opts.element.text()&&(this.updateSelection([]),this.close(),this.clearSearch()),this.select||""!==this.opts.element.val()){var c=this;this.opts.initSelection.call(null,this.opts.element,function(a){a!==b&&null!==a&&(c.updateSelection(a),c.close(),c.clearSearch())})}},clearSearch:function(){var a=this.getPlaceholder(),c=this.getMaxSearchWidth();a!==b&&0===this.getVal().length&&this.search.hasClass("select2-focused")===!1?(this.search.val(a).addClass("select2-default"),this.search.width(c>0?c:this.container.css("width"))):this.search.val("").width(10)},clearPlaceholder:function(){this.search.hasClass("select2-default")&&this.search.val("").removeClass("select2-default")},opening:function(){this.clearPlaceholder(),this.resizeSearch(),this.parent.opening.apply(this,arguments),this.focusSearch(),""===this.search.val()&&this.nextSearchTerm!=b&&(this.search.val(this.nextSearchTerm),this.search.select()),this.updateResults(!0),this.opts.shouldFocusInput(this)&&this.search.focus(),this.opts.element.trigger(a.Event("select2-open"))},close:function(){this.opened()&&this.parent.close.apply(this,arguments)},focus:function(){this.close(),this.search.focus()},isFocused:function(){return this.search.hasClass("select2-focused")},updateSelection:function(b){var c=[],d=[],e=this;a(b).each(function(){p(e.id(this),c)<0&&(c.push(e.id(this)),d.push(this))}),b=d,this.selection.find(".select2-search-choice").remove(),a(b).each(function(){e.addSelectedChoice(this)}),e.postprocessResults()},tokenize:function(){var a=this.search.val();a=this.opts.tokenizer.call(this,a,this.data(),this.bind(this.onSelect),this.opts),null!=a&&a!=b&&(this.search.val(a),a.length>0&&this.open())},onSelect:function(a,c){this.triggerSelect(a)&&""!==a.text&&(this.addSelectedChoice(a),this.opts.element.trigger({type:"selected",val:this.id(a),choice:a}),this.nextSearchTerm=this.opts.nextSearchTerm(a,this.search.val()),this.clearSearch(),this.updateResults(),(this.select||!this.opts.closeOnSelect)&&this.postprocessResults(a,!1,this.opts.closeOnSelect===!0),this.opts.closeOnSelect?(this.close(),this.search.width(10)):this.countSelectableResults()>0?(this.search.width(10),this.resizeSearch(),this.getMaximumSelectionSize()>0&&this.val().length>=this.getMaximumSelectionSize()?this.updateResults(!0):this.nextSearchTerm!=b&&(this.search.val(this.nextSearchTerm),this.updateResults(),this.search.select()),this.positionDropdown()):(this.close(),this.search.width(10)),this.triggerChange({added:a}),c&&c.noFocus||this.focusSearch())},cancel:function(){this.close(),this.focusSearch()},addSelectedChoice:function(c){var j,k,d=!c.locked,e=a("
    • "),f=a("
    • "),g=d?e:f,h=this.id(c),i=this.getVal();j=this.opts.formatSelection(c,g.find("div"),this.opts.escapeMarkup),j!=b&&g.find("div").replaceWith(a("
    ").html(j)),k=this.opts.formatSelectionCssClass(c,g.find("div")),k!=b&&g.addClass(k),d&&g.find(".select2-search-choice-close").on("mousedown",A).on("click dblclick",this.bind(function(b){this.isInterfaceEnabled()&&(this.unselect(a(b.target)),this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus"),A(b),this.close(),this.focusSearch())})).on("focus",this.bind(function(){this.isInterfaceEnabled()&&(this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"))})),g.data("select2-data",c),g.insertBefore(this.searchContainer),i.push(h),this.setVal(i)},unselect:function(b){var d,e,c=this.getVal();if(b=b.closest(".select2-search-choice"),0===b.length)throw"Invalid argument: "+b+". Must be .select2-search-choice";if(d=b.data("select2-data")){var f=a.Event("select2-removing");if(f.val=this.id(d),f.choice=d,this.opts.element.trigger(f),f.isDefaultPrevented())return!1;for(;(e=p(this.id(d),c))>=0;)c.splice(e,1),this.setVal(c),this.select&&this.postprocessResults();return b.remove(),this.opts.element.trigger({type:"select2-removed",val:this.id(d),choice:d}),this.triggerChange({removed:d}),!0}},postprocessResults:function(a,b,c){var d=this.getVal(),e=this.results.find(".select2-result"),f=this.results.find(".select2-result-with-children"),g=this;e.each2(function(a,b){var c=g.id(b.data("select2-data"));p(c,d)>=0&&(b.addClass("select2-selected"),b.find(".select2-result-selectable").addClass("select2-selected"))}),f.each2(function(a,b){b.is(".select2-result-selectable")||0!==b.find(".select2-result-selectable:not(.select2-selected)").length||b.addClass("select2-selected")}),-1==this.highlight()&&c!==!1&&this.opts.closeOnSelect===!0&&g.highlight(0),!this.opts.createSearchChoice&&!e.filter(".select2-result:not(.select2-selected)").length>0&&(!a||a&&!a.more&&0===this.results.find(".select2-no-results").length)&&J(g.opts.formatNoMatches,"formatNoMatches")&&this.results.append("
  • "+K(g.opts.formatNoMatches,g.opts.element,g.search.val())+"
    • ")},getMaxSearchWidth:function(){return this.selection.width()-t(this.search)},resizeSearch:function(){var a,b,c,d,e,f=t(this.search);a=C(this.search)+10,b=this.search.offset().left,c=this.selection.width(),d=this.selection.offset().left,e=c-(b-d)-f,a>e&&(e=c-f),40>e&&(e=c-f),0>=e&&(e=a),this.search.width(Math.floor(e))},getVal:function(){var a;return this.select?(a=this.select.val(),null===a?[]:a):(a=this.opts.element.val(),s(a,this.opts.separator,this.opts.transformVal))},setVal:function(b){var c;this.select?this.select.val(b):(c=[],a(b).each(function(){p(this,c)<0&&c.push(this)}),this.opts.element.val(0===c.length?"":c.join(this.opts.separator)))},buildChangeDetails:function(a,b){for(var b=b.slice(0),a=a.slice(0),c=0;c0&&c--,a.splice(d,1),d--);return{added:b,removed:a}},val:function(c,d){var e,f=this;if(0===arguments.length)return this.getVal();if(e=this.data(),e.length||(e=[]),!c&&0!==c)return this.opts.element.val(""),this.updateSelection([]),this.clearSearch(),d&&this.triggerChange({added:this.data(),removed:e}),void 0;if(this.setVal(c),this.select)this.opts.initSelection(this.select,this.bind(this.updateSelection)),d&&this.triggerChange(this.buildChangeDetails(e,this.data()));else{if(this.opts.initSelection===b)throw new Error("val() cannot be called if initSelection() is not defined");this.opts.initSelection(this.opts.element,function(b){var c=a.map(b,f.id);f.setVal(c),f.updateSelection(b),f.clearSearch(),d&&f.triggerChange(f.buildChangeDetails(e,f.data()))})}this.clearSearch()},onSortStart:function(){if(this.select)throw new Error("Sorting of elements is not supported when attached to instead.");this.search.width(0),this.searchContainer.hide()},onSortEnd:function(){var b=[],c=this;this.searchContainer.show(),this.searchContainer.appendTo(this.searchContainer.parent()),this.resizeSearch(),this.selection.find(".select2-search-choice").each(function(){b.push(c.opts.id(a(this).data("select2-data")))}),this.setVal(b),this.triggerChange()},data:function(b,c){var e,f,d=this;return 0===arguments.length?this.selection.children(".select2-search-choice").map(function(){return a(this).data("select2-data")}).get():(f=this.data(),b||(b=[]),e=a.map(b,function(a){return d.opts.id(a)}),this.setVal(e),this.updateSelection(b),this.clearSearch(),c&&this.triggerChange(this.buildChangeDetails(f,this.data())),void 0)}}),a.fn.select2=function(){var d,e,f,g,h,c=Array.prototype.slice.call(arguments,0),i=["val","destroy","opened","open","close","focus","isFocused","container","dropdown","onSortStart","onSortEnd","enable","disable","readonly","positionDropdown","data","search"],j=["opened","isFocused","container","dropdown"],k=["val","data"],l={search:"externalSearch"};return this.each(function(){if(0===c.length||"object"==typeof c[0])d=0===c.length?{}:a.extend({},c[0]),d.element=a(this),"select"===d.element.get(0).tagName.toLowerCase()?h=d.element.prop("multiple"):(h=d.multiple||!1,"tags"in d&&(d.multiple=h=!0)),e=h?new window.Select2["class"].multi:new window.Select2["class"].single,e.init(d);else{if("string"!=typeof c[0])throw"Invalid arguments to select2 plugin: "+c;if(p(c[0],i)<0)throw"Unknown method: "+c[0];if(g=b,e=a(this).data("select2"),e===b)return;if(f=c[0],"container"===f?g=e.container:"dropdown"===f?g=e.dropdown:(l[f]&&(f=l[f]),g=e[f].apply(e,c.slice(1))),p(c[0],j)>=0||p(c[0],k)>=0&&1==c.length)return!1}}),g===b?this:g},a.fn.select2.defaults={width:"copy",loadMorePadding:0,closeOnSelect:!0,openOnEnter:!0,containerCss:{},dropdownCss:{},containerCssClass:"",dropdownCssClass:"",formatResult:function(a,b,c,d){var e=[];return E(this.text(a),c.term,e,d),e.join("")},transformVal:function(b){return a.trim(b)},formatSelection:function(a,c,d){return a?d(this.text(a)):b},sortResults:function(a){return a},formatResultCssClass:function(a){return a.css},formatSelectionCssClass:function(){return b},minimumResultsForSearch:0,minimumInputLength:0,maximumInputLength:null,maximumSelectionSize:0,id:function(a){return a==b?null:a.id},text:function(b){return b&&this.data&&this.data.text?a.isFunction(this.data.text)?this.data.text(b):b[this.data.text]:b.text +},matcher:function(a,b){return o(""+b).toUpperCase().indexOf(o(""+a).toUpperCase())>=0},separator:",",tokenSeparators:[],tokenizer:M,escapeMarkup:F,blurOnChange:!1,selectOnBlur:!1,adaptContainerCssClass:function(a){return a},adaptDropdownCssClass:function(){return null},nextSearchTerm:function(){return b},searchInputPlaceholder:"",createSearchChoicePosition:"top",shouldFocusInput:function(a){var b="ontouchstart"in window||navigator.msMaxTouchPoints>0;return b?a.opts.minimumResultsForSearch<0?!1:!0:!0}},a.fn.select2.locales=[],a.fn.select2.locales.en={formatMatches:function(a){return 1===a?"One result is available, press enter to select it.":a+" results are available, use up and down arrow keys to navigate."},formatNoMatches:function(){return"No matches found"},formatAjaxError:function(){return"Loading failed"},formatInputTooShort:function(a,b){var c=b-a.length;return"Please enter "+c+" or more character"+(1==c?"":"s")},formatInputTooLong:function(a,b){var c=a.length-b;return"Please delete "+c+" character"+(1==c?"":"s")},formatSelectionTooBig:function(a){return"You can only select "+a+" item"+(1==a?"":"s")},formatLoadMore:function(){return"Loading more results\u2026"},formatSearching:function(){return"Searching\u2026"}},a.extend(a.fn.select2.defaults,a.fn.select2.locales.en),a.fn.select2.ajaxDefaults={transport:a.ajax,params:{type:"GET",cache:!1,dataType:"json"}},window.Select2={query:{ajax:G,local:H,tags:I},util:{debounce:w,markMatch:E,escapeMarkup:F,stripDiacritics:o},"class":{"abstract":c,single:d,multi:e}}}}(jQuery); \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/select2/select2.png b/htdocs/includes/jquery/plugins/select2/select2.png new file mode 100644 index 00000000000..1d804ffb996 Binary files /dev/null and b/htdocs/includes/jquery/plugins/select2/select2.png differ diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ar.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ar.js new file mode 100644 index 00000000000..e991b726cff --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_ar.js @@ -0,0 +1,19 @@ +/** + * Select2 Arabic translation. + * + * Author: Adel KEDJOUR + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['ar'] = { + formatNoMatches: function () { return "لم يتم العثور على مطابقات"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; if (n == 1){ return "الرجاء إدخال حرف واحد على الأكثر"; } return n == 2 ? "الرجاء إدخال حرفين على الأكثر" : "الرجاء إدخال " + n + " على الأكثر"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; if (n == 1){ return "الرجاء إدخال حرف واحد على الأقل"; } return n == 2 ? "الرجاء إدخال حرفين على الأقل" : "الرجاء إدخال " + n + " على الأقل "; }, + formatSelectionTooBig: function (limit) { if (limit == 1){ return "يمكنك أن تختار إختيار واحد فقط"; } return limit == 2 ? "يمكنك أن تختار إختيارين فقط" : "يمكنك أن تختار " + limit + " إختيارات فقط"; }, + formatLoadMore: function (pageNumber) { return "تحميل المزيد من النتائج…"; }, + formatSearching: function () { return "البحث…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ar']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_az.js b/htdocs/includes/jquery/plugins/select2/select2_locale_az.js new file mode 100644 index 00000000000..19fd95b7a5f --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_az.js @@ -0,0 +1,20 @@ +/** + * Select2 Azerbaijani translation. + * + * Author: Farhad Safarov + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['az'] = { + formatMatches: function (matches) { return matches + " nəticə mövcuddur, hərəkət etdirmək üçün yuxarı və aşağı düymələrindən istifadə edin."; }, + formatNoMatches: function () { return "Nəticə tapılmadı"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return n + " simvol daxil edin"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return n + " simvol silin"; }, + formatSelectionTooBig: function (limit) { return "Sadəcə " + limit + " element seçə bilərsiniz"; }, + formatLoadMore: function (pageNumber) { return "Daha çox nəticə yüklənir…"; }, + formatSearching: function () { return "Axtarılır…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['az']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_bg.js b/htdocs/includes/jquery/plugins/select2/select2_locale_bg.js new file mode 100644 index 00000000000..3283d0ae5d2 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_bg.js @@ -0,0 +1,20 @@ +/** + * Select2 Bulgarian translation. + * + * @author Lubomir Vikev + * @author Uriy Efremochkin + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['bg'] = { + formatNoMatches: function () { return "Няма намерени съвпадения"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Моля въведете още " + n + " символ" + (n > 1 ? "а" : ""); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Моля въведете с " + n + " по-малко символ" + (n > 1 ? "а" : ""); }, + formatSelectionTooBig: function (limit) { return "Можете да направите до " + limit + (limit > 1 ? " избора" : " избор"); }, + formatLoadMore: function (pageNumber) { return "Зареждат се още…"; }, + formatSearching: function () { return "Търсене…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['bg']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ca.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ca.js new file mode 100644 index 00000000000..dbea39e930b --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_ca.js @@ -0,0 +1,19 @@ +/** + * Select2 Catalan translation. + * + * Author: David Planella + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['ca'] = { + formatNoMatches: function () { return "No s'ha trobat cap coincidència"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Introduïu " + n + " caràcter" + (n == 1 ? "" : "s") + " més"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Introduïu " + n + " caràcter" + (n == 1? "" : "s") + "menys"; }, + formatSelectionTooBig: function (limit) { return "Només podeu seleccionar " + limit + " element" + (limit == 1 ? "" : "s"); }, + formatLoadMore: function (pageNumber) { return "S'estan carregant més resultats…"; }, + formatSearching: function () { return "S'està cercant…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ca']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_cs.js b/htdocs/includes/jquery/plugins/select2/select2_locale_cs.js new file mode 100644 index 00000000000..ef121856485 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_cs.js @@ -0,0 +1,51 @@ +/** + * Select2 Czech translation. + * + * Author: Michal Marek + * Author - sklonovani: David Vallner + */ +(function ($) { + "use strict"; + // use text for the numbers 2 through 4 + var smallNumbers = { + 2: function(masc) { return (masc ? "dva" : "dvě"); }, + 3: function() { return "tři"; }, + 4: function() { return "čtyři"; } + } + $.fn.select2.locales['cs'] = { + formatNoMatches: function () { return "Nenalezeny žádné položky"; }, + formatInputTooShort: function (input, min) { + var n = min - input.length; + if (n == 1) { + return "Prosím zadejte ještě jeden znak"; + } else if (n <= 4) { + return "Prosím zadejte ještě další "+smallNumbers[n](true)+" znaky"; + } else { + return "Prosím zadejte ještě dalších "+n+" znaků"; + } + }, + formatInputTooLong: function (input, max) { + var n = input.length - max; + if (n == 1) { + return "Prosím zadejte o jeden znak méně"; + } else if (n <= 4) { + return "Prosím zadejte o "+smallNumbers[n](true)+" znaky méně"; + } else { + return "Prosím zadejte o "+n+" znaků méně"; + } + }, + formatSelectionTooBig: function (limit) { + if (limit == 1) { + return "Můžete zvolit jen jednu položku"; + } else if (limit <= 4) { + return "Můžete zvolit maximálně "+smallNumbers[limit](false)+" položky"; + } else { + return "Můžete zvolit maximálně "+limit+" položek"; + } + }, + formatLoadMore: function (pageNumber) { return "Načítají se další výsledky…"; }, + formatSearching: function () { return "Vyhledávání…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['cs']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_da.js b/htdocs/includes/jquery/plugins/select2/select2_locale_da.js new file mode 100644 index 00000000000..702238b9a09 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_da.js @@ -0,0 +1,19 @@ +/** + * Select2 Danish translation. + * + * Author: Anders Jenbo + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['da'] = { + formatNoMatches: function () { return "Ingen resultater fundet"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Angiv venligst " + n + " tegn mere"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Angiv venligst " + n + " tegn mindre"; }, + formatSelectionTooBig: function (limit) { return "Du kan kun vælge " + limit + " emne" + (limit === 1 ? "" : "r"); }, + formatLoadMore: function (pageNumber) { return "Indlæser flere resultater…"; }, + formatSearching: function () { return "Søger…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['da']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_de.js b/htdocs/includes/jquery/plugins/select2/select2_locale_de.js new file mode 100644 index 00000000000..e27541720c2 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_de.js @@ -0,0 +1,18 @@ +/** + * Select2 German translation + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['de'] = { + formatNoMatches: function () { return "Keine Übereinstimmungen gefunden"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Bitte " + n + " Zeichen mehr eingeben"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Bitte " + n + " Zeichen weniger eingeben"; }, + formatSelectionTooBig: function (limit) { return "Sie können nur " + limit + " Eintr" + (limit === 1 ? "ag" : "äge") + " auswählen"; }, + formatLoadMore: function (pageNumber) { return "Lade mehr Ergebnisse…"; }, + formatSearching: function () { return "Suche…"; }, + formatMatches: function (matches) { return matches + " Ergebnis " + (matches > 1 ? "se" : "") + " verfügbar, zum Navigieren die Hoch-/Runter-Pfeiltasten verwenden."; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['de']); +})(jQuery); \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_el.js b/htdocs/includes/jquery/plugins/select2/select2_locale_el.js new file mode 100644 index 00000000000..d17459e1df3 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_el.js @@ -0,0 +1,19 @@ +/** + * Select2 Greek translation. + * + * @author Uriy Efremochkin + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['el'] = { + formatNoMatches: function () { return "Δεν βρέθηκαν αποτελέσματα"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Παρακαλούμε εισάγετε " + n + " περισσότερο" + (n > 1 ? "υς" : "") + " χαρακτήρ" + (n > 1 ? "ες" : "α"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Παρακαλούμε διαγράψτε " + n + " χαρακτήρ" + (n > 1 ? "ες" : "α"); }, + formatSelectionTooBig: function (limit) { return "Μπορείτε να επιλέξετε μόνο " + limit + " αντικείμεν" + (limit > 1 ? "α" : "ο"); }, + formatLoadMore: function (pageNumber) { return "Φόρτωση περισσότερων…"; }, + formatSearching: function () { return "Αναζήτηση…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['el']); +})(jQuery); \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_en.js.template b/htdocs/includes/jquery/plugins/select2/select2_locale_en.js.template new file mode 100644 index 00000000000..f758b110079 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_en.js.template @@ -0,0 +1,20 @@ +/** + * Select2 translation. + * + * Author: Your Name + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['en'] = { + formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; }, + formatNoMatches: function () { return "No matches found"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1 ? "" : "s"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1 ? "" : "s"); }, + formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); }, + formatLoadMore: function (pageNumber) { return "Loading more results…"; }, + formatSearching: function () { return "Searching…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['en']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_es.js b/htdocs/includes/jquery/plugins/select2/select2_locale_es.js new file mode 100644 index 00000000000..92a19861e40 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_es.js @@ -0,0 +1,19 @@ +/** + * Select2 Spanish translation + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['es'] = { + formatMatches: function (matches) { if (matches === 1) { return "Un resultado disponible, presione enter para seleccionarlo."; } return matches + " resultados disponibles, use las teclas de dirección para navegar."; }, + formatNoMatches: function () { return "No se encontraron resultados"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Por favor, introduzca " + n + " car" + (n == 1? "ácter" : "acteres"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Por favor, elimine " + n + " car" + (n == 1? "ácter" : "acteres"); }, + formatSelectionTooBig: function (limit) { return "Sólo puede seleccionar " + limit + " elemento" + (limit == 1 ? "" : "s"); }, + formatLoadMore: function (pageNumber) { return "Cargando más resultados…"; }, + formatSearching: function () { return "Buscando…"; }, + formatAjaxError: function() { return "La carga falló"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['es']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_et.js b/htdocs/includes/jquery/plugins/select2/select2_locale_et.js new file mode 100644 index 00000000000..4d69f55e3fb --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_et.js @@ -0,0 +1,19 @@ +/** + * Select2 Estonian translation. + * + * Author: Kuldar Kalvik + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['et'] = { + formatNoMatches: function () { return "Tulemused puuduvad"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Sisesta " + n + " täht" + (n == 1 ? "" : "e") + " rohkem"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Sisesta " + n + " täht" + (n == 1? "" : "e") + " vähem"; }, + formatSelectionTooBig: function (limit) { return "Saad vaid " + limit + " tulemus" + (limit == 1 ? "e" : "t") + " valida"; }, + formatLoadMore: function (pageNumber) { return "Laen tulemusi.."; }, + formatSearching: function () { return "Otsin.."; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['et']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_eu.js b/htdocs/includes/jquery/plugins/select2/select2_locale_eu.js new file mode 100644 index 00000000000..67ae8d05ae5 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_eu.js @@ -0,0 +1,45 @@ +/** + * Select2 Basque translation. + * + * Author: Julen Ruiz Aizpuru + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['eu'] = { + formatNoMatches: function () { + return "Ez da bat datorrenik aurkitu"; + }, + formatInputTooShort: function (input, min) { + var n = min - input.length; + if (n === 1) { + return "Idatzi karaktere bat gehiago"; + } else { + return "Idatzi " + n + " karaktere gehiago"; + } + }, + formatInputTooLong: function (input, max) { + var n = input.length - max; + if (n === 1) { + return "Idatzi karaktere bat gutxiago"; + } else { + return "Idatzi " + n + " karaktere gutxiago"; + } + }, + formatSelectionTooBig: function (limit) { + if (limit === 1 ) { + return "Elementu bakarra hauta dezakezu"; + } else { + return limit + " elementu hauta ditzakezu soilik"; + } + }, + formatLoadMore: function (pageNumber) { + return "Emaitza gehiago kargatzen…"; + }, + formatSearching: function () { + return "Bilatzen…"; + } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['eu']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_fa.js b/htdocs/includes/jquery/plugins/select2/select2_locale_fa.js new file mode 100644 index 00000000000..b3ffd8b7da6 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_fa.js @@ -0,0 +1,21 @@ +/** + * Select2 Persian translation. + * + * Author: Ali Choopan + * Author: Ebrahim Byagowi + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['fa'] = { + formatMatches: function (matches) { return matches + " نتیجه موجود است، کلیدهای جهت بالا و پایین را برای گشتن استفاده کنید."; }, + formatNoMatches: function () { return "نتیجه‌ای یافت نشد."; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "لطفاً " + n + " نویسه بیشتر وارد نمایید"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "لطفاً " + n + " نویسه را حذف کنید."; }, + formatSelectionTooBig: function (limit) { return "شما فقط می‌توانید " + limit + " مورد را انتخاب کنید"; }, + formatLoadMore: function (pageNumber) { return "در حال بارگیری موارد بیشتر…"; }, + formatSearching: function () { return "در حال جستجو…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['fa']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_fi.js b/htdocs/includes/jquery/plugins/select2/select2_locale_fi.js new file mode 100644 index 00000000000..6487fbdad35 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_fi.js @@ -0,0 +1,30 @@ +/** + * Select2 Finnish translation + */ +(function ($) { + "use strict"; + $.fn.select2.locales['fi'] = { + formatNoMatches: function () { + return "Ei tuloksia"; + }, + formatInputTooShort: function (input, min) { + var n = min - input.length; + return "Ole hyvä ja anna " + n + " merkkiä lisää"; + }, + formatInputTooLong: function (input, max) { + var n = input.length - max; + return "Ole hyvä ja anna " + n + " merkkiä vähemmän"; + }, + formatSelectionTooBig: function (limit) { + return "Voit valita ainoastaan " + limit + " kpl"; + }, + formatLoadMore: function (pageNumber) { + return "Ladataan lisää tuloksia…"; + }, + formatSearching: function () { + return "Etsitään…"; + } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_fr.js b/htdocs/includes/jquery/plugins/select2/select2_locale_fr.js new file mode 100644 index 00000000000..d5485d6be76 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_fr.js @@ -0,0 +1,18 @@ +/** + * Select2 French translation + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['fr'] = { + formatMatches: function (matches) { return matches + " résultats sont disponibles, utilisez les flèches haut et bas pour naviguer."; }, + formatNoMatches: function () { return "Aucun résultat trouvé"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Saisissez " + n + " caractère" + (n == 1? "" : "s") + " supplémentaire" + (n == 1? "" : "s") ; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Supprimez " + n + " caractère" + (n == 1? "" : "s"); }, + formatSelectionTooBig: function (limit) { return "Vous pouvez seulement sélectionner " + limit + " élément" + (limit == 1 ? "" : "s"); }, + formatLoadMore: function (pageNumber) { return "Chargement de résultats supplémentaires…"; }, + formatSearching: function () { return "Recherche en cours…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['fr']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_gl.js b/htdocs/includes/jquery/plugins/select2/select2_locale_gl.js new file mode 100644 index 00000000000..9335167da96 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_gl.js @@ -0,0 +1,45 @@ +/** + * Select2 Galician translation + * + * Author: Leandro Regueiro + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['gl'] = { + formatNoMatches: function () { + return "Non se atoparon resultados"; + }, + formatInputTooShort: function (input, min) { + var n = min - input.length; + if (n === 1) { + return "Engada un carácter"; + } else { + return "Engada " + n + " caracteres"; + } + }, + formatInputTooLong: function (input, max) { + var n = input.length - max; + if (n === 1) { + return "Elimine un carácter"; + } else { + return "Elimine " + n + " caracteres"; + } + }, + formatSelectionTooBig: function (limit) { + if (limit === 1 ) { + return "Só pode seleccionar un elemento"; + } else { + return "Só pode seleccionar " + limit + " elementos"; + } + }, + formatLoadMore: function (pageNumber) { + return "Cargando máis resultados…"; + }, + formatSearching: function () { + return "Buscando…"; + } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['gl']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_he.js b/htdocs/includes/jquery/plugins/select2/select2_locale_he.js new file mode 100644 index 00000000000..789dcdcaaf2 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_he.js @@ -0,0 +1,19 @@ +/** +* Select2 Hebrew translation. +* +* Author: Yakir Sitbon +*/ +(function ($) { + "use strict"; + + $.fn.select2.locales['he'] = { + formatNoMatches: function () { return "לא נמצאו התאמות"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "נא להזין עוד " + n + " תווים נוספים"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "נא להזין פחות " + n + " תווים"; }, + formatSelectionTooBig: function (limit) { return "ניתן לבחור " + limit + " פריטים"; }, + formatLoadMore: function (pageNumber) { return "טוען תוצאות נוספות…"; }, + formatSearching: function () { return "מחפש…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['he']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_hr.js b/htdocs/includes/jquery/plugins/select2/select2_locale_hr.js new file mode 100644 index 00000000000..ce8051c788e --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_hr.js @@ -0,0 +1,24 @@ +/** + * Select2 Croatian translation. + * + * @author Edi Modrić + * @author Uriy Efremochkin + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['hr'] = { + formatNoMatches: function () { return "Nema rezultata"; }, + formatInputTooShort: function (input, min) { return "Unesite još" + character(min - input.length); }, + formatInputTooLong: function (input, max) { return "Unesite" + character(input.length - max) + " manje"; }, + formatSelectionTooBig: function (limit) { return "Maksimalan broj odabranih stavki je " + limit; }, + formatLoadMore: function (pageNumber) { return "Učitavanje rezultata…"; }, + formatSearching: function () { return "Pretraga…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['hr']); + + function character (n) { + return " " + n + " znak" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "a" : "" : "ova"); + } +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_hu.js b/htdocs/includes/jquery/plugins/select2/select2_locale_hu.js new file mode 100644 index 00000000000..f431f246360 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_hu.js @@ -0,0 +1,17 @@ +/** + * Select2 Hungarian translation + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['hu'] = { + formatNoMatches: function () { return "Nincs találat."; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Túl rövid. Még " + n + " karakter hiányzik."; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Túl hosszú. " + n + " karakterrel több, mint kellene."; }, + formatSelectionTooBig: function (limit) { return "Csak " + limit + " elemet lehet kiválasztani."; }, + formatLoadMore: function (pageNumber) { return "Töltés…"; }, + formatSearching: function () { return "Keresés…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['hu']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_id.js b/htdocs/includes/jquery/plugins/select2/select2_locale_id.js new file mode 100644 index 00000000000..e9c1fd9b974 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_id.js @@ -0,0 +1,19 @@ +/** + * Select2 Indonesian translation. + * + * Author: Ibrahim Yusuf + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['id'] = { + formatNoMatches: function () { return "Tidak ada data yang sesuai"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Masukkan " + n + " huruf lagi" + (n == 1 ? "" : "s"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Hapus " + n + " huruf" + (n == 1 ? "" : "s"); }, + formatSelectionTooBig: function (limit) { return "Anda hanya dapat memilih " + limit + " pilihan" + (limit == 1 ? "" : "s"); }, + formatLoadMore: function (pageNumber) { return "Mengambil data…"; }, + formatSearching: function () { return "Mencari…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['id']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_is.js b/htdocs/includes/jquery/plugins/select2/select2_locale_is.js new file mode 100644 index 00000000000..273f33de8c0 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_is.js @@ -0,0 +1,17 @@ +/** + * Select2 Icelandic translation. + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['is'] = { + formatNoMatches: function () { return "Ekkert fannst"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Vinsamlegast skrifið " + n + " staf" + (n > 1 ? "i" : "") + " í viðbót"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Vinsamlegast styttið texta um " + n + " staf" + (n > 1 ? "i" : ""); }, + formatSelectionTooBig: function (limit) { return "Þú getur aðeins valið " + limit + " atriði"; }, + formatLoadMore: function (pageNumber) { return "Sæki fleiri niðurstöður…"; }, + formatSearching: function () { return "Leita…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['is']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_it.js b/htdocs/includes/jquery/plugins/select2/select2_locale_it.js new file mode 100644 index 00000000000..6e2b8e23709 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_it.js @@ -0,0 +1,17 @@ +/** + * Select2 Italian translation + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['it'] = { + formatNoMatches: function () { return "Nessuna corrispondenza trovata"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Inserisci ancora " + n + " caratter" + (n == 1? "e" : "i"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Inserisci " + n + " caratter" + (n == 1? "e" : "i") + " in meno"; }, + formatSelectionTooBig: function (limit) { return "Puoi selezionare solo " + limit + " element" + (limit == 1 ? "o" : "i"); }, + formatLoadMore: function (pageNumber) { return "Caricamento in corso…"; }, + formatSearching: function () { return "Ricerca…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['it']); +})(jQuery); \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ja.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ja.js new file mode 100644 index 00000000000..7dbd8d7ee86 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_ja.js @@ -0,0 +1,17 @@ +/** + * Select2 Japanese translation. + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['ja'] = { + formatNoMatches: function () { return "該当なし"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "後" + n + "文字入れてください"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "検索文字列が" + n + "文字長すぎます"; }, + formatSelectionTooBig: function (limit) { return "最多で" + limit + "項目までしか選択できません"; }, + formatLoadMore: function (pageNumber) { return "読込中･･･"; }, + formatSearching: function () { return "検索中･･･"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ja']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ka.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ka.js new file mode 100644 index 00000000000..6cbe1d8f31e --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_ka.js @@ -0,0 +1,19 @@ +/** + * Select2 Georgian (Kartuli) translation. + * + * Author: Dimitri Kurashvili dimakura@gmail.com + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['ka'] = { + formatNoMatches: function () { return "ვერ მოიძებნა"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "გთხოვთ შეიყვანოთ კიდევ " + n + " სიმბოლო"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "გთხოვთ წაშალოთ " + n + " სიმბოლო"; }, + formatSelectionTooBig: function (limit) { return "თქვენ შეგიძლიათ მხოლოდ " + limit + " ჩანაწერის მონიშვნა"; }, + formatLoadMore: function (pageNumber) { return "შედეგის ჩატვირთვა…"; }, + formatSearching: function () { return "ძებნა…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ka']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ko.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ko.js new file mode 100644 index 00000000000..bf036e09e6e --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_ko.js @@ -0,0 +1,19 @@ +/** + * Select2 Korean translation. + * + * @author Swen Mun + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['ko'] = { + formatNoMatches: function () { return "결과 없음"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "너무 짧습니다. "+n+"글자 더 입력해주세요."; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "너무 깁니다. "+n+"글자 지워주세요."; }, + formatSelectionTooBig: function (limit) { return "최대 "+limit+"개까지만 선택하실 수 있습니다."; }, + formatLoadMore: function (pageNumber) { return "불러오는 중…"; }, + formatSearching: function () { return "검색 중…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ko']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_lt.js b/htdocs/includes/jquery/plugins/select2/select2_locale_lt.js new file mode 100644 index 00000000000..7d7040f72f1 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_lt.js @@ -0,0 +1,26 @@ +/** + * Select2 Lithuanian translation. + * + * @author CRONUS Karmalakas + * @author Uriy Efremochkin + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['lt'] = { + formatNoMatches: function () { return "Atitikmenų nerasta"; }, + formatInputTooShort: function (input, min) { return "Įrašykite dar" + character(min - input.length); }, + formatInputTooLong: function (input, max) { return "Pašalinkite" + character(input.length - max); }, + formatSelectionTooBig: function (limit) { + return "Jūs galite pasirinkti tik " + limit + " element" + ((limit%100 > 9 && limit%100 < 21) || limit%10 == 0 ? "ų" : limit%10 > 1 ? "us" : "ą"); + }, + formatLoadMore: function (pageNumber) { return "Kraunama daugiau rezultatų…"; }, + formatSearching: function () { return "Ieškoma…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['lt']); + + function character (n) { + return " " + n + " simbol" + ((n%100 > 9 && n%100 < 21) || n%10 == 0 ? "ių" : n%10 > 1 ? "ius" : "į"); + } +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_lv.js b/htdocs/includes/jquery/plugins/select2/select2_locale_lv.js new file mode 100644 index 00000000000..4afc5b41c80 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_lv.js @@ -0,0 +1,19 @@ +/** + * Select2 Latvian translation. + * + * @author Uriy Efremochkin + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['lv'] = { + formatNoMatches: function () { return "Sakritību nav"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Lūdzu ievadiet vēl " + n + " simbol" + (n == 11 ? "us" : n%10 == 1 ? "u" : "us"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Lūdzu ievadiet par " + n + " simbol" + (n == 11 ? "iem" : n%10 == 1 ? "u" : "iem") + " mazāk"; }, + formatSelectionTooBig: function (limit) { return "Jūs varat izvēlēties ne vairāk kā " + limit + " element" + (limit == 11 ? "us" : limit%10 == 1 ? "u" : "us"); }, + formatLoadMore: function (pageNumber) { return "Datu ielāde…"; }, + formatSearching: function () { return "Meklēšana…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['lv']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_mk.js b/htdocs/includes/jquery/plugins/select2/select2_locale_mk.js new file mode 100644 index 00000000000..8a51a9e0b3c --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_mk.js @@ -0,0 +1,19 @@ +/** + * Select2 Macedonian translation. + * + * Author: Marko Aleksic + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['mk'] = { + formatNoMatches: function () { return "Нема пронајдено совпаѓања"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Ве молиме внесете уште " + n + " карактер" + (n == 1 ? "" : "и"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Ве молиме внесете " + n + " помалку карактер" + (n == 1? "" : "и"); }, + formatSelectionTooBig: function (limit) { return "Можете да изберете само " + limit + " ставк" + (limit == 1 ? "а" : "и"); }, + formatLoadMore: function (pageNumber) { return "Вчитување резултати…"; }, + formatSearching: function () { return "Пребарување…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['mk']); +})(jQuery); \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ms.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ms.js new file mode 100644 index 00000000000..46588d6d72c --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_ms.js @@ -0,0 +1,19 @@ +/** + * Select2 Malay translation. + * + * Author: Kepoweran + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['ms'] = { + formatNoMatches: function () { return "Tiada padanan yang ditemui"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Sila masukkan " + n + " aksara lagi"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Sila hapuskan " + n + " aksara"; }, + formatSelectionTooBig: function (limit) { return "Anda hanya boleh memilih " + limit + " pilihan"; }, + formatLoadMore: function (pageNumber) { return "Sedang memuatkan keputusan…"; }, + formatSearching: function () { return "Mencari…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ms']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_nb.js b/htdocs/includes/jquery/plugins/select2/select2_locale_nb.js new file mode 100644 index 00000000000..cb5dfaeef22 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_nb.js @@ -0,0 +1,22 @@ +/** + * Select2 Norwegian Bokmål translation. + * + * Author: Torgeir Veimo + * Author: Bjørn Johansen + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['nb'] = { + formatMatches: function (matches) { if (matches === 1) { return "Ett resultat er tilgjengelig, trykk enter for å velge det."; } return matches + " resultater er tilgjengelig. Bruk piltastene opp og ned for å navigere."; }, + formatNoMatches: function () { return "Ingen treff"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Vennligst skriv inn " + n + (n>1 ? " flere tegn" : " tegn til"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Vennligst fjern " + n + " tegn"; }, + formatSelectionTooBig: function (limit) { return "Du kan velge maks " + limit + " elementer"; }, + formatLoadMore: function (pageNumber) { return "Laster flere resultater …"; }, + formatSearching: function () { return "Søker …"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['no']); +})(jQuery); + diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_nl.js b/htdocs/includes/jquery/plugins/select2/select2_locale_nl.js new file mode 100644 index 00000000000..985741ec20f --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_nl.js @@ -0,0 +1,17 @@ +/** + * Select2 Dutch translation + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['nl'] = { + formatNoMatches: function () { return "Geen resultaten gevonden"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Vul nog " + n + " karakter" + (n == 1? "" : "s") + " in"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Haal " + n + " karakter" + (n == 1? "" : "s") + " weg"; }, + formatSelectionTooBig: function (limit) { return "Maximaal " + limit + " item" + (limit == 1 ? "" : "s") + " toegestaan"; }, + formatLoadMore: function (pageNumber) { return "Meer resultaten laden…"; }, + formatSearching: function () { return "Zoeken…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['nl']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_pl.js b/htdocs/includes/jquery/plugins/select2/select2_locale_pl.js new file mode 100644 index 00000000000..87c26194131 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_pl.js @@ -0,0 +1,54 @@ +/** + * Select2 Polish translation. + * + * @author Jan Kondratowicz + * @author Uriy Efremochkin + * @author Michał Połtyn + * @author Damian Zajkowski + */ +(function($) { + "use strict"; + + $.fn.select2.locales['pl'] = { + formatNoMatches: function() { + return "Brak wyników"; + }, + formatInputTooShort: function(input, min) { + return "Wpisz co najmniej" + character(min - input.length, "znak", "i"); + }, + formatInputTooLong: function(input, max) { + return "Wpisana fraza jest za długa o" + character(input.length - max, "znak", "i"); + }, + formatSelectionTooBig: function(limit) { + return "Możesz zaznaczyć najwyżej" + character(limit, "element", "y"); + }, + formatLoadMore: function(pageNumber) { + return "Ładowanie wyników…"; + }, + formatSearching: function() { + return "Szukanie…"; + } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['pl']); + + function character(n, word, pluralSuffix) { + //Liczba pojedyncza - brak suffiksu + //jeden znak + //jeden element + var suffix = ''; + if (n > 1 && n < 5) { + //Liczaba mnoga ilość od 2 do 4 - własny suffiks + //Dwa znaki, trzy znaki, cztery znaki. + //Dwa elementy, trzy elementy, cztery elementy + suffix = pluralSuffix; + } else if (n == 0 || n >= 5) { + //Ilość 0 suffiks ów + //Liczaba mnoga w ilości 5 i więcej - suffiks ów (nie poprawny dla wszystkich wyrazów, np. 100 wiadomości) + //Zero znaków, Pięć znaków, sześć znaków, siedem znaków, osiem znaków. + //Zero elementów Pięć elementów, sześć elementów, siedem elementów, osiem elementów. + suffix = 'ów'; + } + return " " + n + " " + word + suffix; + } +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_pt-BR.js b/htdocs/includes/jquery/plugins/select2/select2_locale_pt-BR.js new file mode 100644 index 00000000000..51b037de580 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_pt-BR.js @@ -0,0 +1,18 @@ +/** + * Select2 Brazilian Portuguese translation + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['pt-BR'] = { + formatNoMatches: function () { return "Nenhum resultado encontrado"; }, + formatAjaxError: function () { return "Erro na busca"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Digite " + (min == 1 ? "" : "mais") + " " + n + " caracter" + (n == 1? "" : "es"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " caracter" + (n == 1? "" : "es"); }, + formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); }, + formatLoadMore: function (pageNumber) { return "Carregando mais resultados…"; }, + formatSearching: function () { return "Buscando…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-BR']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_pt-PT.js b/htdocs/includes/jquery/plugins/select2/select2_locale_pt-PT.js new file mode 100644 index 00000000000..ae55a4fc4ef --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_pt-PT.js @@ -0,0 +1,17 @@ +/** + * Select2 Portuguese (Portugal) translation + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['pt-PT'] = { + formatNoMatches: function () { return "Nenhum resultado encontrado"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Introduza " + n + " car" + (n == 1 ? "ácter" : "acteres"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " car" + (n == 1 ? "ácter" : "acteres"); }, + formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); }, + formatLoadMore: function (pageNumber) { return "A carregar mais resultados…"; }, + formatSearching: function () { return "A pesquisar…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-PT']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ro.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ro.js new file mode 100644 index 00000000000..21b0cf18186 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_ro.js @@ -0,0 +1,17 @@ +/** + * Select2 Romanian translation. + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['ro'] = { + formatNoMatches: function () { return "Nu a fost găsit nimic"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Vă rugăm să introduceți incă " + n + " caracter" + (n == 1 ? "" : "e"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Vă rugăm să introduceți mai puțin de " + n + " caracter" + (n == 1? "" : "e"); }, + formatSelectionTooBig: function (limit) { return "Aveți voie să selectați cel mult " + limit + " element" + (limit == 1 ? "" : "e"); }, + formatLoadMore: function (pageNumber) { return "Se încarcă…"; }, + formatSearching: function () { return "Căutare…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ro']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_rs.js b/htdocs/includes/jquery/plugins/select2/select2_locale_rs.js new file mode 100644 index 00000000000..72c16389c9e --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_rs.js @@ -0,0 +1,19 @@ +/** + * Select2 Serbian translation. + * + * @author Limon Monte + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['rs'] = { + formatNoMatches: function () { return "Ništa nije pronađeno"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Ukucajte bar još " + n + " simbol" + (n % 10 == 1 && n % 100 != 11 ? "" : "a"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Obrišite " + n + " simbol" + (n % 10 == 1 && n % 100 != 11 ? "" : "a"); }, + formatSelectionTooBig: function (limit) { return "Možete izabrati samo " + limit + " stavk" + (limit % 10 == 1 && limit % 100 != 11 ? "u" : (limit % 10 >= 2 && limit % 10 <= 4 && (limit % 100 < 12 || limit % 100 > 14)? "e" : "i")); }, + formatLoadMore: function (pageNumber) { return "Preuzimanje još rezultata…"; }, + formatSearching: function () { return "Pretraga…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['rs']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ru.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ru.js new file mode 100644 index 00000000000..2a6c7702c42 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_ru.js @@ -0,0 +1,23 @@ +/** + * Select2 Russian translation. + * + * @author Uriy Efremochkin + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['ru'] = { + formatNoMatches: function () { return "Совпадений не найдено"; }, + formatInputTooShort: function (input, min) { return "Пожалуйста, введите еще хотя бы" + character(min - input.length); }, + formatInputTooLong: function (input, max) { return "Пожалуйста, введите на" + character(input.length - max) + " меньше"; }, + formatSelectionTooBig: function (limit) { return "Вы можете выбрать не более " + limit + " элемент" + (limit%10 == 1 && limit%100 != 11 ? "а" : "ов"); }, + formatLoadMore: function (pageNumber) { return "Загрузка данных…"; }, + formatSearching: function () { return "Поиск…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ru']); + + function character (n) { + return " " + n + " символ" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 20) ? n%10 > 1 ? "a" : "" : "ов"); + } +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_sk.js b/htdocs/includes/jquery/plugins/select2/select2_locale_sk.js new file mode 100644 index 00000000000..027530c9388 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_sk.js @@ -0,0 +1,50 @@ +/** + * Select2 Slovak translation. + * + * Author: David Vallner + */ +(function ($) { + "use strict"; + // use text for the numbers 2 through 4 + var smallNumbers = { + 2: function(masc) { return (masc ? "dva" : "dve"); }, + 3: function() { return "tri"; }, + 4: function() { return "štyri"; } + }; + $.fn.select2.locales['sk'] = { + formatNoMatches: function () { return "Nenašli sa žiadne položky"; }, + formatInputTooShort: function (input, min) { + var n = min - input.length; + if (n == 1) { + return "Prosím, zadajte ešte jeden znak"; + } else if (n <= 4) { + return "Prosím, zadajte ešte ďalšie "+smallNumbers[n](true)+" znaky"; + } else { + return "Prosím, zadajte ešte ďalších "+n+" znakov"; + } + }, + formatInputTooLong: function (input, max) { + var n = input.length - max; + if (n == 1) { + return "Prosím, zadajte o jeden znak menej"; + } else if (n >= 2 && n <= 4) { + return "Prosím, zadajte o "+smallNumbers[n](true)+" znaky menej"; + } else { + return "Prosím, zadajte o "+n+" znakov menej"; + } + }, + formatSelectionTooBig: function (limit) { + if (limit == 1) { + return "Môžete zvoliť len jednu položku"; + } else if (limit >= 2 && limit <= 4) { + return "Môžete zvoliť najviac "+smallNumbers[limit](false)+" položky"; + } else { + return "Môžete zvoliť najviac "+limit+" položiek"; + } + }, + formatLoadMore: function (pageNumber) { return "Načítavajú sa ďalšie výsledky…"; }, + formatSearching: function () { return "Vyhľadávanie…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['sk']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_sv.js b/htdocs/includes/jquery/plugins/select2/select2_locale_sv.js new file mode 100644 index 00000000000..96f8c0a881d --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_sv.js @@ -0,0 +1,19 @@ +/** + * Select2 Swedish translation. + * + * Author: Jens Rantil + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['sv'] = { + formatNoMatches: function () { return "Inga träffar"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Var god skriv in " + n + (n>1 ? " till tecken" : " tecken till"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Var god sudda ut " + n + " tecken"; }, + formatSelectionTooBig: function (limit) { return "Du kan max välja " + limit + " element"; }, + formatLoadMore: function (pageNumber) { return "Laddar fler resultat…"; }, + formatSearching: function () { return "Söker…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['sv']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_th.js b/htdocs/includes/jquery/plugins/select2/select2_locale_th.js new file mode 100644 index 00000000000..7f3e6ef8c39 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_th.js @@ -0,0 +1,19 @@ +/** + * Select2 Thai translation. + * + * Author: Atsawin Chaowanakritsanakul + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['th'] = { + formatNoMatches: function () { return "ไม่พบข้อมูล"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "โปรดพิมพ์เพิ่มอีก " + n + " ตัวอักษร"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "โปรดลบออก " + n + " ตัวอักษร"; }, + formatSelectionTooBig: function (limit) { return "คุณสามารถเลือกได้ไม่เกิน " + limit + " รายการ"; }, + formatLoadMore: function (pageNumber) { return "กำลังค้นข้อมูลเพิ่ม…"; }, + formatSearching: function () { return "กำลังค้นข้อมูล…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['th']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_tr.js b/htdocs/includes/jquery/plugins/select2/select2_locale_tr.js new file mode 100644 index 00000000000..1dda95ca376 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_tr.js @@ -0,0 +1,19 @@ +/** + * Select2 Turkish translation. + * + * Author: Salim KAYABAŞI + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['tr'] = { + formatNoMatches: function () { return "Sonuç bulunamadı"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "En az " + n + " karakter daha girmelisiniz"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return n + " karakter azaltmalısınız"; }, + formatSelectionTooBig: function (limit) { return "Sadece " + limit + " seçim yapabilirsiniz"; }, + formatLoadMore: function (pageNumber) { return "Daha fazla…"; }, + formatSearching: function () { return "Aranıyor…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['tr']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ug-CN.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ug-CN.js new file mode 100644 index 00000000000..579588a7ac0 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_ug-CN.js @@ -0,0 +1,16 @@ +/** + * Select2 Uyghur translation + */ +(function ($) { + "use strict"; + $.fn.select2.locales['ug-CN'] = { + formatNoMatches: function () { return "ماس كېلىدىغان ئۇچۇر تېپىلمىدى"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "يەنە " + n + " ھەرپ كىرگۈزۈڭ";}, + formatInputTooLong: function (input, max) { var n = input.length - max; return "" + n + "ھەرپ ئۆچۈرۈڭ";}, + formatSelectionTooBig: function (limit) { return "ئەڭ كۆپ بولغاندا" + limit + " تال ئۇچۇر تاللىيالايسىز"; }, + formatLoadMore: function (pageNumber) { return "ئۇچۇرلار ئوقۇلىۋاتىدۇ…"; }, + formatSearching: function () { return "ئىزدەۋاتىدۇ…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ug-CN']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_uk.js b/htdocs/includes/jquery/plugins/select2/select2_locale_uk.js new file mode 100644 index 00000000000..b5bd0e02d2c --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_uk.js @@ -0,0 +1,25 @@ +/** + * Select2 Ukrainian translation. + * + * @author bigmihail + * @author Uriy Efremochkin + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['uk'] = { + formatMatches: function (matches) { return character(matches, "результат") + " знайдено, використовуйте клавіші зі стрілками вверх та вниз для навігації."; }, + formatNoMatches: function () { return "Нічого не знайдено"; }, + formatInputTooShort: function (input, min) { return "Введіть буль ласка ще " + character(min - input.length, "символ"); }, + formatInputTooLong: function (input, max) { return "Введіть буль ласка на " + character(input.length - max, "символ") + " менше"; }, + formatSelectionTooBig: function (limit) { return "Ви можете вибрати лише " + character(limit, "елемент"); }, + formatLoadMore: function (pageNumber) { return "Завантаження даних…"; }, + formatSearching: function () { return "Пошук…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['uk']); + + function character (n, word) { + return n + " " + word + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "и" : "" : "ів"); + } +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_vi.js b/htdocs/includes/jquery/plugins/select2/select2_locale_vi.js new file mode 100644 index 00000000000..cc67065f972 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_vi.js @@ -0,0 +1,20 @@ +/** + * Select2 Vietnamese translation. + * + * Author: Long Nguyen + */ +(function ($) { + "use strict"; + + $.fn.select2.locales['vi'] = { + formatNoMatches: function () { return "Không tìm thấy kết quả"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Vui lòng nhập nhiều hơn " + n + " ký tự" + (n == 1 ? "" : "s"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Vui lòng nhập ít hơn " + n + " ký tự" + (n == 1? "" : "s"); }, + formatSelectionTooBig: function (limit) { return "Chỉ có thể chọn được " + limit + " tùy chọn" + (limit == 1 ? "" : "s"); }, + formatLoadMore: function (pageNumber) { return "Đang lấy thêm kết quả…"; }, + formatSearching: function () { return "Đang tìm…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['vi']); +})(jQuery); + diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_zh-CN.js b/htdocs/includes/jquery/plugins/select2/select2_locale_zh-CN.js new file mode 100644 index 00000000000..e988dac1a4c --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_zh-CN.js @@ -0,0 +1,16 @@ +/** + * Select2 Chinese translation + */ +(function ($) { + "use strict"; + $.fn.select2.locales['zh-CN'] = { + formatNoMatches: function () { return "没有找到匹配项"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "请再输入" + n + "个字符";}, + formatInputTooLong: function (input, max) { var n = input.length - max; return "请删掉" + n + "个字符";}, + formatSelectionTooBig: function (limit) { return "你只能选择最多" + limit + "项"; }, + formatLoadMore: function (pageNumber) { return "加载结果中…"; }, + formatSearching: function () { return "搜索中…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-CN']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_zh-TW.js b/htdocs/includes/jquery/plugins/select2/select2_locale_zh-TW.js new file mode 100644 index 00000000000..85dbd5afc23 --- /dev/null +++ b/htdocs/includes/jquery/plugins/select2/select2_locale_zh-TW.js @@ -0,0 +1,16 @@ +/** + * Select2 Traditional Chinese translation + */ +(function ($) { + "use strict"; + $.fn.select2.locales['zh-TW'] = { + formatNoMatches: function () { return "沒有找到相符的項目"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "請再輸入" + n + "個字元";}, + formatInputTooLong: function (input, max) { var n = input.length - max; return "請刪掉" + n + "個字元";}, + formatSelectionTooBig: function (limit) { return "你只能選擇最多" + limit + "項"; }, + formatLoadMore: function (pageNumber) { return "載入中…"; }, + formatSearching: function () { return "搜尋中…"; } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-TW']); +})(jQuery); diff --git a/htdocs/includes/jquery/plugins/select2/select2x2.png b/htdocs/includes/jquery/plugins/select2/select2x2.png new file mode 100644 index 00000000000..4bdd5c961d4 Binary files /dev/null and b/htdocs/includes/jquery/plugins/select2/select2x2.png differ 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; diff --git a/htdocs/install/check.php b/htdocs/install/check.php index d815d67dd59..f7f5ae4b960 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013-2014 Juanjo Menent @@ -71,12 +71,12 @@ if (! empty($useragent)) // Check PHP version -if (versioncompare(versionphparray(),array(4,3,10)) < 0) // Minimum to use (error if lower) +if (versioncompare(versionphparray(),array(5,2,3)) < 0) // Minimum to use (error if lower) { - print 'Error '.$langs->trans("ErrorPHPVersionTooLow",'4.3.10'); + print 'Error '.$langs->trans("ErrorPHPVersionTooLow",'5.2.3'); $checksok=0; // 0=error, 1=warning } -else if (versioncompare(versionphparray(),array(5,3,0)) < 0) // Minimum supported (error if lower) +else if (versioncompare(versionphparray(),array(5,3,0)) < 0) // Minimum supported (warning if lower) { print 'Error '.$langs->trans("ErrorPHPVersionTooLow",'5.3.0'); $checksok=0; // 0=error, 1=warning @@ -349,7 +349,7 @@ else { $choice .= '
    '; //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE); - $choice .= '
    '.$langs->trans("InstallChoiceSuggested").'
    '; + $choice .= '
    '.$langs->trans("InstallChoiceSuggested").'
    '; // Ok '; $foundrecommandedchoice=1; // To show only once } @@ -380,22 +380,14 @@ else $allowupgrade=false; } if (defined("MAIN_NOT_INSTALLED")) $allowupgrade=false; - $migrationscript=array( //array('from'=>'2.0.0', 'to'=>'2.1.0'), - //array('from'=>'2.1.0', 'to'=>'2.2.0'), - //array('from'=>'2.2.0', 'to'=>'2.4.0'), - //array('from'=>'2.4.0', 'to'=>'2.5.0'), - //array('from'=>'2.5.0', 'to'=>'2.6.0'), - array('from'=>'2.6.0', 'to'=>'2.7.0'), - array('from'=>'2.7.0', 'to'=>'2.8.0'), - array('from'=>'2.8.0', 'to'=>'2.9.0'), - array('from'=>'2.9.0', 'to'=>'3.0.0'), - array('from'=>'3.0.0', 'to'=>'3.1.0'), + $migrationscript=array( array('from'=>'3.0.0', 'to'=>'3.1.0'), array('from'=>'3.1.0', 'to'=>'3.2.0'), array('from'=>'3.2.0', 'to'=>'3.3.0'), array('from'=>'3.3.0', 'to'=>'3.4.0'), array('from'=>'3.4.0', 'to'=>'3.5.0'), array('from'=>'3.5.0', 'to'=>'3.6.0'), - array('from'=>'3.6.0', 'to'=>'3.7.0') + array('from'=>'3.6.0', 'to'=>'3.7.0'), + array('from'=>'3.7.0', 'to'=>'3.8.0') ); $count=0; @@ -449,12 +441,12 @@ else { $choice .= '
    '; //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE); - $choice .= '
    '.$langs->trans("InstallChoiceSuggested").'
    '; + $choice .= '
    '.$langs->trans("InstallChoiceSuggested").'
    '; if ($count < count($migarray)) // There is other choices after { print $langs->trans("MigrateIsDoneStepByStep",DOL_VERSION); } - $choice .= '
    '; + $choice .= ''; } $choice .= ''; diff --git a/htdocs/install/default.css b/htdocs/install/default.css index c3feead7a8f..c3d97cdaa74 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -296,3 +296,7 @@ background-color: #dfd; background-repeat: repeat-x; background-position: top left; } + +.center { + text-align: center; +} diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 4238884a6f5..d6a5d086b31 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -115,7 +115,6 @@ if (empty($versionfrom) && empty($versionto) && ! is_writable($conffile)) if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) { - print '
    '.$langs->trans("DolibarrWorkBoard").''.$langs->trans("Number").''.$langs->trans("Late").''.$langs->trans("DolibarrWorkBoard").''.$langs->trans("Number").''.$langs->trans("Late").'    
    '; $error=0; // If password is encoded, we decode it @@ -298,12 +297,9 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action)) $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT',1).",".$db->encrypt($setuplang,1).",'chaine',0,'Default language',1)"); //if (! $resql) dol_print_error($db,'Error in setup program'); - print '
    '; - $db->close(); } -print "
    "; // Create lock file @@ -341,9 +337,9 @@ if ($action == "set") print $langs->trans("YouNeedToPersonalizeSetup")."

    "; - print '
    '; + print '
    '; print $langs->trans("GoToSetupArea"); - print '
    '; + print ''; } else { @@ -353,9 +349,9 @@ if ($action == "set") print $langs->trans("MigrationNotFinished").'
    '; print "
    "; - print '
    '; + print '
    '; print $langs->trans("GoToUpgradePage"); - print '
    '; + print ''; } } // If upgrade @@ -389,9 +385,9 @@ elseif (empty($action) || preg_match('/upgrade/i',$action)) print "
    "; - print '
    '; + print '
    '; print $langs->trans("GoToDolibarr"); - print '
    '; + print ''; } else { @@ -401,9 +397,9 @@ elseif (empty($action) || preg_match('/upgrade/i',$action)) print "
    "; - print '
    '; + print '
    '; print $langs->trans("GoToUpgradePage"); - print '
    '; + print ''; } } else diff --git a/htdocs/install/index.php b/htdocs/install/index.php index fb346ea0033..4508a266b08 100644 --- a/htdocs/install/index.php +++ b/htdocs/install/index.php @@ -49,7 +49,7 @@ pHeader("", "check"); // Etape suivante = check // Ask installation language -print '

    '; +print '

    '; print ''; print ''; @@ -58,7 +58,7 @@ print $formadmin->select_language('auto','selectlang',1,0,0,1); print ''; print ''; -print '
    '; +print ''; print '

    '.$langs->trans("SomeTranslationAreUncomplete"); diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 513c8b527d2..a0e1e058860 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -84,7 +84,7 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'56','Soci insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'57','Société par actions simplifiée (SAS)'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'58','Entreprise Unipersonnelle à Responsabilité Limitée (EURL)'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'59','Société par actions simplifiée unipersonnelle (SASU)'); - +insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'60', 'Entreprise Individuelle à Responsabilité Limitée (EIRL)'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'61','Caisse d''épargne et de prévoyance'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'62','Groupement d''intérêt économique (GIE)'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'63','Société coopérative agricole'); diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 01d2894bca6..f0d3d94de3b 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) @@ -240,6 +243,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); 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 0cbede46864..ad05f850e16 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 @@ -18,6 +18,7 @@ -- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user); -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (1, '60', 'Entreprise Individuelle à Responsabilité Limitée (EIRL)', 1); --insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modified','Executed when a intervention is modified','ficheinter',19); --insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_DELETE','Intervention delete','Executed when a intervention is delete','ficheinter',19); @@ -27,6 +28,11 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2); +-- VPGSQL8.2 ALTER TABLE llx_contrat ALTER COLUMN fk_commercial_signature DROP NOT NULL; +-- VPGSQL8.2 ALTER TABLE llx_contrat ALTER COLUMN fk_commercial_suivi DROP NOT NULL; +ALTER TABLE llx_contrat MODIFY fk_commercial_signature integer NULL; +ALTER TABLE llx_contrat MODIFY fk_commercial_suivi integer NULL; + ALTER TABLE llx_notify ADD COLUMN fk_soc integer NULL after fk_action; ALTER TABLE llx_notify ADD COLUMN type varchar(16) DEFAULT 'email' after fk_soc; @@ -85,7 +91,6 @@ ALTER TABLE llx_bank_account ADD COLUMN accountancy_journal varchar(3) DEFAULT N ALTER TABLE llx_accountingaccount add column entity integer DEFAULT 1 NOT NULL AFTER rowid; ALTER TABLE llx_accountingaccount add column datec datetime AFTER entity; -ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec; ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label; ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author; @@ -97,6 +102,8 @@ UPDATE llx_const SET name = 'ACCOUNTING_PRODUCT_BUY_ACCOUNT' WHERE name = 'COMPT UPDATE llx_const SET name = 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT' WHERE name = 'COMPTA_PRODUCT_SOLD_ACCOUNT'; UPDATE llx_const SET name = 'ACCOUNTING_SERVICE_BUY_ACCOUNT' WHERE name = 'COMPTA_SERVICE_BUY_ACCOUNT'; UPDATE llx_const SET name = 'ACCOUNTING_SERVICE_SOLD_ACCOUNT' WHERE name = 'COMPTA_SERVICE_SOLD_ACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_VAT_ACCOUNT' WHERE name = 'COMPTA_VAT_ACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_VAT_BUY_ACCOUNT' WHERE name = 'COMPTA_VAT_BUY_ACCOUNT'; -- Compatibility with module Accounting Expert UPDATE llx_const SET name = 'ACCOUNTING_SEPARATORCSV' WHERE name = 'ACCOUNTINGEX_SEPARATORCSV'; @@ -122,6 +129,7 @@ DROP TABLE llx_compta_compte_generaux; -- Align size for accounting account ALTER TABLE llx_accountingaccount MODIFY COLUMN account_number varchar(32); ALTER TABLE llx_accountingaccount MODIFY COLUMN account_parent varchar(32); +ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec; ALTER TABLE llx_accountingdebcred MODIFY COLUMN account_number varchar(32); ALTER TABLE llx_bank_account MODIFY COLUMN account_number varchar(32); ALTER TABLE llx_c_chargesociales MODIFY COLUMN accountancy_code varchar(32); @@ -182,7 +190,6 @@ ALTER TABLE llx_product MODIFY COLUMN fk_barcode_type INTEGER NULL DEFAULT NULL; UPDATE llx_product SET fk_barcode_type = NULL WHERE fk_barcode_type = 0; ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type); UPDATE llx_product SET fk_barcode_type = NULL WHERE fk_barcode_type NOT IN (SELECT rowid from llx_c_barcode_type); ---ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type (rowid); -- Added missing relations of llx_product_price @@ -213,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; @@ -1119,3 +1126,24 @@ ALTER TABLE llx_extrafields ADD alwayseditable INTEGER DEFAULT 0 AFTER pos; -- add supplier webservice fields ALTER TABLE llx_societe ADD webservices_url varchar(255) DEFAULT NULL; ALTER TABLE llx_societe ADD webservices_key varchar(128) DEFAULT NULL; + +-- changes size of ref in commande_fourn and facture_fourn +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN ref VARCHAR(255); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN ref_ext VARCHAR(255); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN ref_supplier VARCHAR(255); + +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; + +ALTER TABLE llx_resource MODIFY COLUMN entity integer DEFAULT 1 NOT NULL; + +-- This request make mysql drop (mysql bug, so we add it at end): +ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type(rowid); + diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql new file mode 100755 index 00000000000..755195c2a61 --- /dev/null +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -0,0 +1,32 @@ +-- +-- Be carefull to requests order. +-- This file must be loaded by calling /install/index.php page +-- when current version is 3.8.0 or higher. +-- +-- To rename a table: ALTER TABLE llx_table RENAME TO llx_table_new; +-- To add a column: ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol; +-- To rename a column: ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60); +-- To drop a column: ALTER TABLE llx_table DROP COLUMN oldname; +-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60); +-- To drop a foreign key: ALTER TABLE llx_table DROP FOREIGN KEY fk_name; +-- To restrict request to Mysql version x.y use -- VMYSQLx.y +-- To restrict request to Pgsql version x.y use -- VPGSQLx.y +-- To make pk to be auto increment (mysql): VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT; +-- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE +-- To set a field as NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL; +-- To set a field as default NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL; +-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user); +-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); + +--create table for price expressions and add column in product supplier +create table llx_c_price_expression +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + title varchar(20) NOT NULL, + expression varchar(80) NOT NULL +)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); diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index 4083ba2f7b9..9e1ca7bb6f9 100755 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -115,7 +115,7 @@ ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseu -- Fix: deprecated tag to new one update llx_opensurvey_sondage set format = 'D' where format = 'D+'; update llx_opensurvey_sondage set format = 'A' where format = 'A+'; - +update llx_opensurvey_sondage set tms = now(); -- ALTER TABLE llx_facture_fourn ALTER COLUMN fk_cond_reglement DROP NOT NULL; @@ -204,3 +204,13 @@ UPDATE llx_projet_task_time set task_datehour = task_date where task_datehour IS -- GRANT ALL ON *.* TO 'myuser'@'%'; -- flush privileges; +-- Fix type of product 2 does not exists +update llx_propaldet set product_type = 1 where product_type = 2; +update llx_commandedet set product_type = 1 where product_type = 2; +update llx_facturedet set product_type = 1 where product_type = 2; +--update llx_propaldet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0; +--update llx_commandedet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0; +--update llx_facturedet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0; + + + diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index c42cf377b85..f68d99f6a72 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -51,10 +51,10 @@ create table llx_actioncomm priority smallint, fulldayevent smallint NOT NULL default 0, - punctual smallint NOT NULL default 1, + punctual smallint NOT NULL default 1, -- deprecated. milestone is event with date start = date end percent smallint NOT NULL default 0, location varchar(128), - durationp real, -- duree planifiee + durationp real, -- planed duration durationa real, -- deprecated note text, diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index bb2da7841b8..ac060bc0df3 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -38,7 +38,7 @@ create table llx_bank_account number varchar(255), cle_rib varchar(5), bic varchar(11), - iban_prefix varchar(34), -- 34 according to ISO 13616 + iban_prefix varchar(34), -- full iban. 34 according to ISO 13616 country_iban varchar(2), -- deprecated cle_iban varchar(2), domiciliation varchar(255), diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 427d031a705..66194440610 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -21,5 +21,8 @@ ALTER TABLE llx_c_departements ADD UNIQUE uk_departements (code_departement,fk_r ALTER TABLE llx_c_departements ADD INDEX idx_departements_fk_region (fk_region); +-- NOTE: We duplicate creation of unique keys on llx_c_regions NOW to be able to create foreign keys. +ALTER TABLE llx_c_regions ADD UNIQUE INDEX uk_code_region (code_region); + ALTER TABLE llx_c_departements ADD CONSTRAINT fk_departements_fk_region FOREIGN KEY (fk_region) REFERENCES llx_c_regions (code_region); diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql b/htdocs/install/mysql/tables/llx_c_price_expression.sql similarity index 75% rename from dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql rename to htdocs/install/mysql/tables/llx_c_price_expression.sql index 002509b4787..4c1788e4276 100755 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql +++ b/htdocs/install/mysql/tables/llx_c_price_expression.sql @@ -1,5 +1,5 @@ --- =================================================================== --- Copyright (C) 2005 Laurent Destailleur +-- ============================================================================ +-- Copyright (C) 2014 Ion agorria -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -14,7 +14,11 @@ -- 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); +create table llx_c_price_expression +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + title varchar(20) NOT NULL, + expression varchar(80) NOT NULL +)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 2ecf9e10442..ff87110c72a 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -23,11 +23,11 @@ create table llx_commande_fournisseur ( rowid integer AUTO_INCREMENT PRIMARY KEY, - ref varchar(30) NOT NULL, -- order number + ref varchar(255) NOT NULL, -- order number entity integer DEFAULT 1 NOT NULL, -- multi company id - ref_ext varchar(30), -- reference into an external system (not used by dolibarr) - ref_supplier varchar(30), + ref_ext varchar(64), -- reference into an external system (not used by dolibarr) + ref_supplier varchar(255), fk_soc integer NOT NULL, fk_projet integer DEFAULT 0, -- project id diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 4631b660d46..5efbcdfe1fa 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -33,8 +33,8 @@ create table llx_contrat date_cloture datetime, fk_soc integer NOT NULL, fk_projet integer, - fk_commercial_signature integer NOT NULL, -- obsolete - fk_commercial_suivi integer NOT NULL, -- obsolete + fk_commercial_signature integer, -- obsolete + fk_commercial_suivi integer, -- obsolete fk_user_author integer NOT NULL default 0, fk_user_mise_en_service integer, fk_user_cloture integer, 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_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 433bef887f1..9757f749cd0 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -65,6 +65,7 @@ create table llx_facture fk_account integer, -- bank account fk_currency varchar(3), -- currency code + fk_cond_reglement integer DEFAULT 1 NOT NULL, -- condition de reglement (30 jours, fin de mois ...) fk_mode_reglement integer, -- mode de reglement (Virement, Prelevement) date_lim_reglement date, -- date limite de reglement diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 3a71c2455aa..33773b7a9cb 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -22,11 +22,11 @@ create table llx_facture_fourn ( rowid integer AUTO_INCREMENT PRIMARY KEY, - ref varchar(30), - ref_supplier varchar(50) NOT NULL, + ref varchar(255), + ref_supplier varchar(255) NOT NULL, entity integer DEFAULT 1 NOT NULL, -- multi company id - ref_ext varchar(30), -- reference into an external system (not used by dolibarr) + ref_ext varchar(255), -- reference into an external system (not used by dolibarr) type smallint DEFAULT 0 NOT NULL, fk_soc integer NOT NULL, diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 947a65fa5ff..cba4b580cf0 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -1,8 +1,8 @@ -- =========================================================================== --- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2012 Laurent Destailleur --- Copyright (C) 2009 Regis Houssin --- Copyright (C) 2010 Juanjo Menent +-- Copyright (C) 2003 Rodolphe Quiedeville +-- Copyright (C) 2012-2014 Laurent Destailleur +-- Copyright (C) 2009 Regis Houssin +-- Copyright (C) 2010 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 @@ -31,17 +31,21 @@ create table llx_facture_rec remise real DEFAULT 0, remise_percent real DEFAULT 0, remise_absolue real DEFAULT 0, + tva double(24,8) DEFAULT 0, localtax1 double(24,8) DEFAULT 0, -- amount localtax1 localtax2 double(24,8) DEFAULT 0, -- amount localtax2 + revenuestamp double(24,8) DEFAULT 0, -- amount total revenuestamp total double(24,8) DEFAULT 0, total_ttc double(24,8) DEFAULT 0, fk_user_author integer, -- createur + fk_projet integer, -- projet auquel est associe la facture - fk_cond_reglement integer DEFAULT 0, -- condition de reglement + + fk_cond_reglement integer DEFAULT 0, -- condition de reglement fk_mode_reglement integer DEFAULT 0, -- mode de reglement (Virement, Prelevement) - date_lim_reglement date, -- date limite de reglement + date_lim_reglement date, -- date limite de reglement note_private text, note_public text, @@ -49,8 +53,9 @@ create table llx_facture_rec usenewprice integer DEFAULT 0, frequency integer, unit_frequency varchar(2) DEFAULT 'd', + date_when datetime DEFAULT NULL, -- date for next gen (when an invoice is generated, this field must be updated with next date) date_last_gen datetime DEFAULT NULL, -- date for last gen (date with last successfull generation of invoice) nb_gen_done integer DEFAULT NULL, -- nb of generation done (when an invoice is generated, this field must incremented) - nb_gen_max integer DEFAULT NULL -- maximum number of generation + nb_gen_max integer DEFAULT NULL -- maximum number of generation )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 8da2d147574..05bfa71ec2e 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -1,6 +1,6 @@ -- =================================================================== -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2009 Laurent Destailleur +-- Copyright (C) 2009-2014 Laurent Destailleur -- Copyright (C) 2010 Juanjo Menent -- Copyright (C) 2010-2012 Regis Houssin -- @@ -28,23 +28,23 @@ create table llx_facturedet_rec product_type integer DEFAULT 0, label varchar(255) DEFAULT NULL, description text, - tva_tx double(6,3) DEFAULT 19.6, -- taux tva + tva_tx double(6,3), -- taux tva localtax1_tx double(6,3) DEFAULT 0, -- localtax1 rate - localtax1_type varchar(10) NULL, -- localtax1 type + localtax1_type varchar(10) NULL, -- localtax1 type localtax2_tx double(6,3) DEFAULT 0, -- localtax2 rate - localtax2_type varchar(10) NULL, -- localtax2 type + localtax2_type varchar(10) NULL, -- localtax2 type qty real, -- quantity - remise_percent real DEFAULT 0, -- pourcentage de remise - remise real DEFAULT 0, -- montant de la remise + remise_percent real DEFAULT 0, -- pourcentage de remise + remise real DEFAULT 0, -- montant de la remise subprice double(24,8), -- prix avant remise price double(24,8), -- prix final total_ht double(24,8), -- Total HT de la ligne toute quantity et incluant remise ligne et globale total_tva double(24,8), -- Total TVA de la ligne toute quantity et incluant remise ligne et globale - total_localtax1 double(24,8) DEFAULT 0, -- Total LocalTax1 for total quantity of line - total_localtax2 double(24,8) DEFAULT 0, -- total LocalTax2 for total quantity of line + total_localtax1 double(24,8) DEFAULT 0, -- Total LocalTax1 for total quantity of line + total_localtax2 double(24,8) DEFAULT 0, -- total LocalTax2 for total quantity of line total_ttc double(24,8), -- Total TTC de la ligne toute quantity et incluant remise ligne et globale - info_bits integer DEFAULT 0, -- TVA NPR ou non - special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales - rang integer DEFAULT 0 -- ordre d'affichage - + info_bits integer DEFAULT 0, -- TVA NPR ou non + special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales + rang integer DEFAULT 0, -- ordre d'affichage + fk_contract_line integer NULL -- id of contract line when predefined invoice comes from contract lines )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql old mode 100644 new mode 100755 index e48c3ce6f82..a0554d4345c --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -39,5 +39,6 @@ create table llx_product_fournisseur_price tva_tx double(6,3) NOT NULL, info_bits integer NOT NULL DEFAULT 0, fk_user integer, + fk_price_expression integer, -- Link to the rule for dynamic amount calculation import_key varchar(14) -- Import key )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/install/mysql/tables/llx_resource.sql b/htdocs/install/mysql/tables/llx_resource.sql index 91ebbe8b75d..0d67075f1ea 100755 --- a/htdocs/install/mysql/tables/llx_resource.sql +++ b/htdocs/install/mysql/tables/llx_resource.sql @@ -17,7 +17,7 @@ CREATE TABLE llx_resource ( rowid integer AUTO_INCREMENT PRIMARY KEY, - entity integer, + entity integer DEFAULT 1 NOT NULL, ref varchar(255), description text, fk_code_type_resource varchar(32), diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index cc5a5985eeb..0500c32c744 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -32,7 +32,7 @@ create table llx_societe_rib number varchar(255), -- account number cle_rib varchar(5), -- key of bank account bic varchar(20), -- 11 according to ISO 9362 (we keep 20 for backward compatibility) - iban_prefix varchar(34), -- 34 according to ISO 13616 + iban_prefix varchar(34), -- full iban. 34 according to ISO 13616 domiciliation varchar(255), proprio varchar(60), owner_address varchar(255), 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; diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index d96c5f48bfc..3bf5255a5fc 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -54,6 +54,7 @@ CREATE OR REPLACE FUNCTION dol_util_triggerall(DoEnable boolean) RETURNS integer -- Add triggers for timestamp fields CREATE OR REPLACE FUNCTION update_modified_column_tms() RETURNS TRIGGER AS $$ BEGIN NEW.tms = now(); RETURN NEW; END; $$ LANGUAGE plpgsql; +CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_accountingaccount FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_accountingtransaction FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_actioncomm FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_adherent FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 48f4b5a6aa6..a8bbfdd09af 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -510,9 +510,9 @@ if (empty($actiondone)) } -print '
    '; +print '
    '; print $langs->trans("GoToDolibarr"); -print '
    '; +print ''; pFooter(1,$setuplang); diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php old mode 100755 new mode 100644 index 396c9f96b01..e93b27ab6e9 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -75,21 +75,21 @@ if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initial * View */ -if (! $versionfrom && ! $versionto) -{ +if (! $versionfrom && ! $versionto) +{ print 'Error: Parameter versionfrom or versionto missing.'."\n"; print 'Upgrade must be ran from cmmand line with parameters or called from page install/index.php (like a first install) instead of page install/upgrade.php'."\n"; // Test if batch mode $sapi_type = php_sapi_name(); - $script_file = basename(__FILE__); + $script_file = basename(__FILE__); $path=dirname(__FILE__).'/'; if (substr($sapi_type, 0, 3) == 'cli') { print 'Syntax from command line: '.$script_file." x.y.z a.b.c\n"; - } - exit; -} - + } + exit; +} + pHeader('',"upgrade2",GETPOST('action'),'versionfrom='.$versionfrom.'&versionto='.$versionto); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php old mode 100755 new mode 100644 index 3a02a78f9e8..57004f3cb16 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -83,20 +83,20 @@ if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initial * View */ -if (! $versionfrom && ! $versionto) -{ - print 'Error: Parameter versionfrom or versionto missing.'."\n"; - print 'Upgrade must be ran from cmmand line with parameters or called from page install/index.php (like a first install) instead of page install/upgrade.php'."\n"; - // Test if batch mode - $sapi_type = php_sapi_name(); - $script_file = basename(__FILE__); - $path=dirname(__FILE__).'/'; - if (substr($sapi_type, 0, 3) == 'cli') - { - print 'Syntax from command line: '.$script_file." x.y.z a.b.c\n"; - } - exit; -} +if (! $versionfrom && ! $versionto) +{ + print 'Error: Parameter versionfrom or versionto missing.'."\n"; + print 'Upgrade must be ran from cmmand line with parameters or called from page install/index.php (like a first install) instead of page install/upgrade.php'."\n"; + // Test if batch mode + $sapi_type = php_sapi_name(); + $script_file = basename(__FILE__); + $path=dirname(__FILE__).'/'; + if (substr($sapi_type, 0, 3) == 'cli') + { + print 'Syntax from command line: '.$script_file." x.y.z a.b.c\n"; + } + exit; +} pHeader('','etape5',GETPOST("action")?GETPOST("action"):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto); @@ -363,7 +363,22 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) { // Reload modules (this must be always and only into last targeted version) - migrate_reload_modules($db,$langs,$conf); + $listofmodule=array( + 'MAIN_MODULE_AGENDA', + 'MAIN_MODULE_SOCIETE', + 'MAIN_MODULE_PRODUIT', + 'MAIN_MODULE_SERVICE', + 'MAIN_MODULE_COMMANDE', + 'MAIN_MODULE_FACTURE', + 'MAIN_MODULE_FOURNISSEUR', + 'MAIN_MODULE_USER', + 'MAIN_MODULE_DEPLACEMENT', + 'MAIN_MODULE_DON', + 'MAIN_MODULE_ECM', + 'MAIN_MODULE_PAYBOX', + 'MAIN_MODULE_OPENSURVEY' + ); + migrate_reload_modules($db,$langs,$conf,$listofmodule); // Reload menus (this must be always and only into last targeted version) migrate_reload_menu($db,$langs,$conf,$versionto); @@ -1523,7 +1538,7 @@ function migrate_price_contrat($db,$langs,$conf) // On met a jour les 3 nouveaux champs $contratligne= new ContratLigne($db); //$contratligne->fetch($rowid); Non requis car le update_total ne met a jour que chp redefinis - $contratligne->rowid=$rowid; + $contratligne->id=$rowid; $result=calcul_price_total($qty,$pu,$remise_percent,$txtva,0,0,0,'HT',$info_bits,0,$tmpmysoc); $total_ht = $result[0]; @@ -3634,137 +3649,172 @@ function migrate_delete_old_dir($db,$langs,$conf) * We must do this when internal menu of module or permissions has changed * or when triggers have moved. * - * @param DoliDB $db Database handler - * @param Translate $langs Object langs - * @param Conf $conf Object conf + * @param DoliDB $db Database handler + * @param Translate $langs Object langs + * @param Conf $conf Object conf + * @param array $listofmodule List of modules * @return void */ -function migrate_reload_modules($db,$langs,$conf) +function migrate_reload_modules($db,$langs,$conf,$listofmodule=array()) { dolibarr_install_syslog("upgrade2::migrate_reload_modules"); - if (! empty($conf->global->MAIN_MODULE_AGENDA)) + // Module to reload if no info is provided + if (count($listofmodule) == 0) { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda"); - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php'; - if ($res) { - $mod=new modAgenda($db); - $mod->remove('noboxes'); - $mod->init('newboxdefonly'); - } - } - if (! empty($conf->global->MAIN_MODULE_SOCIETE)) - { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe"); - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php'; - if ($res) { - $mod=new modSociete($db); - $mod->remove('noboxes'); - $mod->init('newboxdefonly'); - } - } - if (! empty($conf->global->MAIN_MODULE_PRODUIT)) // Permission has changed into 2.7 - { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit"); - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php'; - if ($res) { - $mod=new modProduct($db); - //$mod->remove('noboxes'); - $mod->init('newboxdefonly'); - } - } - if (! empty($conf->global->MAIN_MODULE_SERVICE)) // Permission has changed into 2.7 - { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service"); - if ($res) { - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php'; - $mod=new modService($db); - //$mod->remove('noboxes'); - $mod->init('newboxdefonly'); - } - } - if (! empty($conf->global->MAIN_MODULE_COMMANDE)) // Permission has changed into 2.9 - { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande"); - if ($res) { - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php'; - $mod=new modCommande($db); - //$mod->remove('noboxes'); - $mod->init('newboxdefonly'); - } - } - if (! empty($conf->global->MAIN_MODULE_FACTURE)) // Permission has changed into 2.9 - { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture"); - if ($res) { - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php'; - $mod=new modFacture($db); - //$mod->remove('noboxes'); - $mod->init('newboxdefonly'); - } - } - if (! empty($conf->global->MAIN_MODULE_FOURNISSEUR)) // Permission has changed into 2.9 - { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur"); - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php'; - if ($res) { - $mod=new modFournisseur($db); - //$mod->remove('noboxes'); - $mod->init('newboxdefonly'); - } + $listofmodule=array( + 'MAIN_MODULE_AGENDA', + 'MAIN_MODULE_SOCIETE', + 'MAIN_MODULE_PRODUIT', + 'MAIN_MODULE_SERVICE', + 'MAIN_MODULE_COMMANDE', + 'MAIN_MODULE_FACTURE', + 'MAIN_MODULE_FOURNISSEUR', + 'MAIN_MODULE_USER', + 'MAIN_MODULE_DEPLACEMENT', + 'MAIN_MODULE_DON', + 'MAIN_MODULE_ECM', + 'MAIN_MODULE_PAYBOX', + 'MAIN_MODULE_OPENSURVEY' + ); } - if (! empty($conf->global->MAIN_MODULE_USER)) // Permission has changed into 3.0 + foreach($listofmodule as $moduletoreload) { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User"); - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php'; - if ($res) { - $mod=new modUser($db); - //$mod->remove('noboxes'); // We need to remove because id of module has changed - $mod->init('newboxdefonly'); - } - } - if (! empty($conf->global->MAIN_MODULE_DEPLACEMENT)) // Permission has changed into 3.0 - { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement"); - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php'; - if ($res) { - $mod=new modDeplacement($db); - //$mod->remove('noboxes'); // We need to remove because a permission id has been removed - $mod->init('newboxdefonly'); - } - } - if (! empty($conf->global->MAIN_MODULE_DON)) // Permission has changed into 3.0 - { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don"); - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php'; - if ($res) { - $mod=new modDon($db); - //$mod->remove('noboxes'); // We need to remove because a permission id has been removed - $mod->init('newboxdefonly'); - } - } - if (! empty($conf->global->MAIN_MODULE_ECM)) // Permission has changed into 3.0 and 3.1 - { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM"); - if ($res) { - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php'; - $mod=new modECM($db); - $mod->remove('noboxes'); // We need to remove because a permission id has been removed - $mod->init('newboxdefonly'); - } - } - if (! empty($conf->global->MAIN_MODULE_PAYBOX)) // Permission has changed into 3.0 - { - dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox"); - $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php'; - if ($res) { - $mod=new modPaybox($db); - $mod->remove('noboxes'); // We need to remove because id of module has changed - $mod->init('newboxdefonly'); - } - } + if (empty($moduletoreload) || empty($conf->global->$moduletoreload)) continue; + if ($moduletoreload == 'MAIN_MODULE_AGENDA') + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda"); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php'; + if ($res) { + $mod=new modAgenda($db); + $mod->remove('noboxes'); + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_SOCIETE') + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe"); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php'; + if ($res) { + $mod=new modSociete($db); + $mod->remove('noboxes'); + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_PRODUIT') // Permission has changed into 2.7 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit"); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php'; + if ($res) { + $mod=new modProduct($db); + //$mod->remove('noboxes'); + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_SERVICE') // Permission has changed into 2.7 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service"); + if ($res) { + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php'; + $mod=new modService($db); + //$mod->remove('noboxes'); + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_COMMANDE') // Permission has changed into 2.9 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande"); + if ($res) { + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php'; + $mod=new modCommande($db); + //$mod->remove('noboxes'); + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_FACTURE') // Permission has changed into 2.9 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture"); + if ($res) { + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php'; + $mod=new modFacture($db); + //$mod->remove('noboxes'); + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR') // Permission has changed into 2.9 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur"); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php'; + if ($res) { + $mod=new modFournisseur($db); + //$mod->remove('noboxes'); + $mod->init('newboxdefonly'); + } + } + + if ($moduletoreload == 'MAIN_MODULE_USER') // Permission has changed into 3.0 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User"); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php'; + if ($res) { + $mod=new modUser($db); + //$mod->remove('noboxes'); // We need to remove because id of module has changed + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT') // Permission has changed into 3.0 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement"); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php'; + if ($res) { + $mod=new modDeplacement($db); + //$mod->remove('noboxes'); // We need to remove because a permission id has been removed + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_DON') // Permission has changed into 3.0 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don"); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php'; + if ($res) { + $mod=new modDon($db); + //$mod->remove('noboxes'); // We need to remove because a permission id has been removed + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_ECM') // Permission has changed into 3.0 and 3.1 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM"); + if ($res) { + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php'; + $mod=new modECM($db); + $mod->remove('noboxes'); // We need to remove because a permission id has been removed + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_PAYBOX') // Permission has changed into 3.0 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox"); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php'; + if ($res) { + $mod=new modPaybox($db); + $mod->remove('noboxes'); // We need to remove because id of module has changed + $mod->init('newboxdefonly'); + } + } + if ($moduletoreload == 'MAIN_MODULE_OPENSURVEY') // Permission has changed into 3.0 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Opensurvey"); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php'; + if ($res) { + $mod=new modOpenSurvey($db); + $mod->remove('noboxes'); // We need to remove because menu entries has changed + $mod->init('newboxdefonly'); + } + } + } } diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/ar_SA/accountancy.lang +++ b/htdocs/langs/ar_SA/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index 76d3acd579b..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=المشاريع -Module400Desc=إدارة المشاريع داخل وحدات أخرى +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=الإخطارات -Module600Desc=إرسال الإشعارات عن طريق البريد الإلكتروني على بعض الفعاليات التجارية Dolibarr لطرف ثالث اتصالات +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=التبرعات Module700Desc=التبرعات إدارة Module1200Name=فرس النبي @@ -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 @@ -514,20 +521,20 @@ Module5000Name=شركة متعددة Module5000Desc=يسمح لك لإدارة الشركات المتعددة Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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=نقطة البيع Module50100Desc=نقطة بيع وحدة -Module50200Name= باي بال -Module50200Desc= وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع بايبال +Module50200Name=باي بال +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 @@ -606,15 +613,16 @@ Permission151=قراءة أوامر دائمة Permission152=إعداد أوامر دائمة Permission153=قراءة أوامر دائمة إيصالات Permission154=الائتمان / ورفض أوامر دائمة ايصالات -Permission161=قراءة العقود -Permission162=إنشاء / تغيير العقود -Permission163=تفعيل خدمة للعقد -Permission164=تعطيل خدمة للعقد -Permission165=حذف العقود -Permission171=قراءة رحلات -Permission172=إنشاء / تغيير الرحلات -Permission173=حذف رحلات -Permission178=رحلات التصدير +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=قراءة الموردين Permission181=قراءة مورد أوامر Permission182=إنشاء / تغيير المورد أوامر @@ -671,7 +679,7 @@ Permission300=شريط قراءة المدونات Permission301=إنشاء / تغيير شريط الرموز Permission302=حذف شريط الرموز Permission311=قراءة الخدمات -Permission312=إسناد عقود الخدمة +Permission312=Assign service/subscription to contract Permission331=قراءة العناوين Permission332=إنشاء / تغيير العناوين Permission333=حذف العناوين @@ -701,8 +709,8 @@ Permission701=قراءة التبرعات Permission702=إنشاء / تعديل والهبات Permission703=حذف التبرعات Permission1001=قراءة مخزونات -Permission1002=إنشاء / تغيير المخزونات -Permission1003=حذف الأرصدة +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=قراءة تحركات الأسهم Permission1005=إنشاء / تعديل تحركات الأسهم Permission1101=قراءة تسليم أوامر @@ -778,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 @@ -887,6 +896,7 @@ PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليم DefaultLanguage=اللغة الافتراضية لاستخدام (شفرة اللغة) EnableMultilangInterface=تتيح واجهة متعددة اللغات EnableShowLogo=عرض الشعار على اليسار القائمة +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=النظام الخاص بك تم تحديث بنجاح CompanyInfo=الشركة / المؤسسة المعلومات CompanyIds=الشركة / المؤسسة الهويات @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=عودة رمز المحاسبة التي بناها: ModuleCompanyCodePanicum=العودة فارغة مدونة المحاسبة. ModuleCompanyCodeDigitaria=قانون المحاسبة طرف ثالث يعتمد على الرمز. الشفرة تتكون من طابع "جيم" في المركز الأول يليه 5 الحروف الأولى من طرف ثالث المدونة. UseNotifications=استخدام الإخطارات -NotificationsDesc=إشعارات البريد الإلكتروني ميزة تسمح لك صمت إرسال البريد الآلي ، وبالنسبة لبعض الأحداث Dolibarr ، لأطراف ثالثة (العملاء أو الموردين) التي هي لتهيئتها. اختيار نشط الاشعار الاتصالات واعتماد أهداف واحدة لطرف ثالث في الوقت المناسب. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=وثائق قوالب DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=علامة مائية على مشروع الوثيقة @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم UseOptionLineIfNoQuantity=خط من المنتجات / الخدمات ذات الصفر المبلغ يعتبر خيارا FreeLegalTextOnProposal=نص تجارية حرة على مقترحات WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=أوامر إدارة الإعداد OrdersNumberingModules=أوامر الترقيم نمائط @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=للمصادقة على النظام بعد اقتراح أوثق ، لا يجعل من الممكن للخطوة من جانب النظام المؤقت FreeLegalTextOnOrders=بناء على أوامر النص الحر WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي ClickToDialUrlDesc=ودعا الموقع عندما تنقر على الهاتف picto ذلك. Dans l' رابط ، vous pouvez utiliser ليه balises
    ٪ ٪ 1 $ ق qui الأمصال remplacé قدم المساواة جنيه téléphone دي l' appelé
    ٪ ٪ 2 $ ق qui الأمصال remplacé لو قدم المساواة téléphone دي l' appelant جنيه مصري vôtre)
    ٪ ٪ ل 3 دولار qui الأمصال remplacé vôtre ادخل clicktodial الفقرة (défini سور vôtre فيشه utilisateur)
    ٪ ٪ 4 $ ق qui الأمصال remplacé الفقرة vôtre يذكره دي clicktodial عتيق (défini سور vôtre فيشه utilisateur). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=الترقيم وحدات التدخل TemplatePDFInterventions=تدخل بطاقة نماذج الوثائق WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=عقود وحدة الإعداد +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=عقود ترقيم الوحدات TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=المنتجات وحدة الإعداد ServiceSetup=خدمات وحدة الإعداد @@ -1382,9 +1393,10 @@ MailingSetup=إعداد وحدة الارسال بالبريد الالكترو MailingEMailFrom=مرسل البريد الالكتروني (من) لرسائل البريد الإلكتروني التي بعث بها وحدة الإنترنت MailingEMailError=بريد إلكتروني العودة (إلى أخطاء) لرسائل البريد الإلكتروني مع الأخطاء ##### Notification ##### -NotificationSetup=الإخطار بو الإعداد وحدة البريد الإلكتروني +NotificationSetup=EMail notification module setup NotificationEMailFrom=مرسل البريد الالكتروني (من) لإرسال رسائل البريد الإلكتروني لالإخطارات -ListOfAvailableNotifications=قائمة الإخطارات المتاحة (هذا يعتمد على وحدات قائمة المنشط) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=ارسال وحدة الإعداد SendingsReceiptModel=ارسال استلام نموذج @@ -1412,8 +1424,9 @@ OSCommerceTestOk=علاقة الخادم '٪ ق' على قاعدة البيان OSCommerceTestKo1=علاقة الخادم '٪ ق' تنجح ولكن قاعدة البيانات '٪ ق' لا يمكن التوصل إليها. OSCommerceTestKo2=علاقة الخادم '٪ ق' مستخدم '٪ ق' فشلت. ##### Stock ##### -StockSetup=تكوين وحدة المخزون -UserWarehouse=استخدام الأرصدة الشخصية للمستخدم +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=حذف من القائمة TreeMenu=شجرة القوائم @@ -1478,11 +1491,14 @@ ClickToDialDesc=هذا النموذج يسمح لإضافة رمز بعد رقم ##### Point Of Sales (CashDesk) ##### CashDesk=نقاط البيع CashDeskSetup=مكتب الإعداد وحدة نقدية -CashDeskThirdPartyForSell=عامة لاستخدام طرف ثالث لتبيعها +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=الحساب النقدي لاستخدامها لتبيع CashDeskBankAccountForCheque= حساب لاستخدام لتلقي المدفوعات عن طريق الشيكات CashDeskBankAccountForCB= حساب لاستخدام لاستلام المبالغ النقدية عن طريق بطاقات الائتمان -CashDeskIdWareHouse=Datawarehous لتبيع للمستخدم +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. ##### Bookmark ##### BookmarkSetup=إعداد وحدة المرجعية BookmarkDesc=هذا النموذج يسمح لك لإدارة العناوين. يمكنك أيضا إضافة أي Dolibarr اختصارات لصفحات أو مواقع الويب externale على القائمة اليمنى. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang index 33367cff796..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=عرض قائمة @@ -41,9 +42,10 @@ AutoActions= إكمال تلقائي AgendaAutoActionDesc= عرف الأحداث التي تريد من دوليبار إنشائها تلقائيا في جدوال الأعمال. إذا لم تقم بإختيار أي شي (الخيار الإفتراضي), سوف يتم فقط إدخال الأنشطلة إلى جدول الأعمال يدوياً AgendaSetupOtherDesc= تسمح لك هذه الصفحة بنقل الأحداث إلى تقويم خارجي مثل جوجل, تندربيرد وغيرها, وذلك بإستخدام الخيارات في هذه الصفحة AgendaExtSitesDesc=تسمح لك هذه الصفحة بتعريف مصادر خارجية للتقويم وذلك لرؤية الأحداث الخاصة بالتقويم الخاص بهم في تقويم دوليبار -ActionsEvents= الأحداث التي ستمكن دوليبار من إنشاء أعمال تلقائية في جدول الأعمال -PropalValidatedInDolibarr= تم تفعيل %s من الإقتراح -InvoiceValidatedInDolibarr= تم توثيق %s من الفاتورة +ActionsEvents=الأحداث التي ستمكن دوليبار من إنشاء أعمال تلقائية في جدول الأعمال +PropalValidatedInDolibarr=تم تفعيل %s من الإقتراح +InvoiceValidatedInDolibarr=تم توثيق %s من الفاتورة +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=الفاتورة %s للذهاب بها إلى حالة المسودة InvoiceDeleteDolibarr=تم حذف %s من الفاتورة OrderValidatedInDolibarr= تم توثيق %s من الطلب @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=تم الموافقة على %s من الطلب OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=الطلب %s للذهاب بها إلى حالة المسودة OrderCanceledInDolibarr=تم إلغاء %s من الطلب -InterventionValidatedInDolibarr=تم توثيق %s من التدخل ProposalSentByEMail=تم إرسال العرض الرسمي %s بواسطة البريد الإلكتروني OrderSentByEMail=تم إرسال طلبية العميل %s بواسطة البريد الإلكتروني InvoiceSentByEMail=تم إرسال فاتروة العميل %s بواسطة البريد الإلكتروني @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=تم إرسال طلبية المزود %s بواسطة SupplierInvoiceSentByEMail=تم إرسال فاتروة المزود%s بواسطة البريد الإلكتروني ShippingSentByEMail=تم إرسال الشحنة %s بواسطة البريد الإلكتروني ShippingValidated= Shipping %s validated -InterventionSentByEMail=تم إرسال التدخل %s بواسطة البريد الإلكتروني -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= تم إنشاء طرف ثالث أو خارجي DateActionPlannedStart= التاريخ المخطط للبدء DateActionPlannedEnd= التاريخ المخطط للإنهاء @@ -70,9 +69,9 @@ DateActionStart= تاريخ البدء DateActionEnd= تاريخ النهاية AgendaUrlOptions1=يمكنك أيضا إضافة المعايير التالية لترشيح النتائج: AgendaUrlOptions2=login=login=%s لتقييد الانتاج المنشأ أو الذي تم الإنتهاء منه بواسطة المستخدم %s -AgendaUrlOptions3=logina=logina=%s لتقييد الانتاج للإجراءات التي أنشأها المستخدم %s +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=logint=%s لتقييد الانتاج للإجراءات المناطة للمستخدم %s -AgendaUrlOptions5=logind=logind=%s لتقييد الانتاج للإجراءات التي قام بها المستخدم %s +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=أظهر تاريخ الميلاد في عناوين الإتصال AgendaHideBirthdayEvents=أخفي تاريخ الميلاد في عناوين الإتصال Busy=مشغول @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=عنوان المتصفح للدخول لملف .ical ExtSiteNoLabel=لا يوجد وصف WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang index 6a931ac16af..828582f7b39 100644 --- a/htdocs/langs/ar_SA/bills.lang +++ b/htdocs/langs/ar_SA/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=علما الائتمان InvoiceAvoirAsk=علما الائتمان لتصحيح الفاتورة InvoiceAvoirDesc=الفضل في المذكرة سلبية الفاتورة تستخدم لحل كون فاتورة بمبلغ قد يختلف عن المبلغ المدفوع فعلا (لأنه دفع الكثير من العملاء عن طريق الخطأ ، أو لن تدفع بالكامل منذ عودته لبعض المنتجات على سبيل المثال). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=يستعاض عن فاتورة ٪ ق ReplacementInvoice=استبدال الفاتورة ReplacedByInvoice=بعبارة فاتورة ق ٪ @@ -87,7 +87,7 @@ ClassifyCanceled=تصنيف 'المهجورة' ClassifyClosed=تصنيف 'مغلقة' ClassifyUnBilled=Classify 'Unbilled' CreateBill=إنشاء الفاتورة -AddBill=تضيف المذكرة الائتمان أو فاتورة +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=شطب فاتورة SearchACustomerInvoice=البحث عن زبون فاتورة @@ -99,7 +99,7 @@ DoPaymentBack=هل لدفع الظهر ConvertToReduc=تحويل الخصم في المستقبل EnterPaymentReceivedFromCustomer=دخول الدفع الواردة من العملاء EnterPaymentDueToCustomer=من المقرر أن يسدد العميل -DisabledBecauseRemainderToPayIsZero=لأن بقية المعوقين الدفع صفر +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=مبلغ PriceBase=سعر الأساس BillStatus=حالة الفاتورة @@ -137,8 +137,6 @@ BillFrom=من BillTo=مشروع قانون ل ActionsOnBill=الإجراءات على فاتورة NewBill=فاتورة جديدة -Prélèvements=من أجل الوقوف -Prélèvements=من أجل الوقوف LastBills=آخر الفواتير ق ٪ LastCustomersBills=٪ ق الماضي فواتير العملاء LastSuppliersBills=٪ ق الماضي فواتير الموردين @@ -156,9 +154,9 @@ ConfirmCancelBill=هل أنت متأكد من أنك تريد إلغاء الف ConfirmCancelBillQuestion=لماذا تريدها لتصنيف هذه الفاتورة 'المهجورة؟ ConfirmClassifyPaidPartially=هل أنت متأكد من أنك تريد تغيير فاتورة ٪ ق لمركز paid؟ ConfirmClassifyPaidPartiallyQuestion=هذه الفاتورة لم تدفع بالكامل. ما هي أسباب قريبة لك هذه الفاتورة؟ -ConfirmClassifyPaidPartiallyReasonAvoir=دفع ما تبقى (٪ ق ٪) هي الخصم الممنوح لدفع مبلغ من قبل. أنا مع تصحيح وضع ضريبة القيمة المضافة علما ائتمان. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=دفع ما تبقى (٪ ق ٪) هي الخصم الممنوح لدفع مبلغ من قبل. إنني أقبل أن تفقد ضريبة القيمة المضافة على هذا الخصم. -ConfirmClassifyPaidPartiallyReasonDiscountVat=دفع ما تبقى (٪ ق ٪) هي الخصم الممنوح لدفع مبلغ من قبل. أنا استرداد ضريبة القيمة المضافة على هذا الائتمان والخصم من دون ملاحظة. +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=العملاء سيئة ConfirmClassifyPaidPartiallyReasonProductReturned=المنتجات عاد جزئيا ConfirmClassifyPaidPartiallyReasonOther=التخلي عن المبلغ لسبب آخر @@ -191,9 +189,9 @@ AlreadyPaid=دفعت بالفعل AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=دفعت بالفعل (بدون تلاحظ الائتمان والودائع) Abandoned=المهجورة -RemainderToPay=تبقى على الدفع -RemainderToTake=ما تبقى لاتخاذ -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=المبلغ المطالب به ExcessReceived=تلقى الزائدة @@ -219,19 +217,18 @@ NoInvoice=لا الفاتورة ClassifyBill=تصنيف الفاتورة SupplierBillsToPay=دفع فواتير الموردين CustomerBillsUnpaid=فواتير غير مدفوعة للعملاء -DispenseMontantLettres=ليه factures rédigées قدم المساواة طرائق mécanographiques sont l' arrêté dispensées دي én lettres -DispenseMontantLettres=ليه factures rédigées قدم المساواة طرائق mécanographiques sont l' arrêté dispensées دي én lettres +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=غير القابلة للاسترداد SetConditions=تحدد شروط الدفع SetMode=حدد طريقة الدفع Billed=فواتير -RepeatableInvoice=محددة مسبقا فاتورة -RepeatableInvoices=محددة مسبقا والفواتير -Repeatable=محددة مسبقا -Repeatables=محددة مسبقا -ChangeIntoRepeatableInvoice=تحويل محددة مسبقا -CreateRepeatableInvoice=إنشاء فاتورة محددة مسبقا -CreateFromRepeatableInvoice=خلق من فاتورة محددة مسبقا +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=فواتير العملاء والفواتير 'خطوط CustomersInvoicesAndPayments=العملاء والفواتير والمدفوعات ExportDataset_invoice_1=قائمة العملاء والفواتير والفواتير 'خطوط diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang index acdb64f3317..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=فرعية @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang index 8b753c5849c..a086e30b48c 100644 --- a/htdocs/langs/ar_SA/compta.lang +++ b/htdocs/langs/ar_SA/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=قانون محاسبة العملاء سي SuppliersProductsSellSalesTurnover=وقد ولدت عن طريق الدوران مبيعات الموردين المنتجات. CheckReceipt=التحقق من إيداع CheckReceiptShort=التحقق من إيداع +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=خصم جديد NewCheckDeposit=تأكد من ايداع جديدة NewCheckDepositOn=تهيئة لتلقي الودائع على حساب : ٪ ق @@ -196,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 689f6b4ca52..133036960c0 100644 --- a/htdocs/langs/ar_SA/contracts.lang +++ b/htdocs/langs/ar_SA/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=عقود منطقة ListOfContracts=قائمة العقود -LastContracts=آخر تعديل العقود ق ٪ +LastModifiedContracts=Last %s modified contracts AllContracts=جميع العقود ContractCard=عقد بطاقة ContractStatus=عقد مركز @@ -27,7 +27,7 @@ MenuRunningServices=ادارة الخدمات MenuExpiredServices=انتهت الخدمات MenuClosedServices=أغلقت الخدمات NewContract=العقد الجديد -AddContract=إضافة العقد +AddContract=Create contract SearchAContract=بحث عقد DeleteAContract=الغاء العقد CloseAContract=وثيقة العقد @@ -53,7 +53,7 @@ ListOfRunningContractsLines=قائمة تشغيل خطوط العقد ListOfRunningServices=لائحة ادارة الخدمات NotActivatedServices=لا تنشيط الخدمات) بين مصدق العقود) BoardNotActivatedServices=خدمات لتفعيل العقود بين مصدق -LastContracts=آخر تعديل العقود ق ٪ +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/cron.lang b/htdocs/langs/ar_SA/cron.lang index 8688153967d..d8af5980ceb 100644 --- a/htdocs/langs/ar_SA/cron.lang +++ b/htdocs/langs/ar_SA/cron.lang @@ -1,10 +1,8 @@ # Dolibarr language file - Source file is en_US - cron -# # About page About = حول CronAbout = About Cron CronAboutPage = Cron about page - # Right Permission23101 = Read Scheduled task Permission23102 = Create/update Scheduled task @@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman 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 jobs -CronListInactive= List of disabled jobs -CronListActive= List of active jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list CronDateLastRun=Last run CronLastOutput=Last run output diff --git a/htdocs/langs/ar_SA/donations.lang b/htdocs/langs/ar_SA/donations.lang index 987a8142059..a6bc12ad61a 100644 --- a/htdocs/langs/ar_SA/donations.lang +++ b/htdocs/langs/ar_SA/donations.lang @@ -4,7 +4,7 @@ Donations=التبرعات DonationRef=Donation ref. Donor=الجهات المانحة Donors=الجهات المانحة -AddDonation=إضافة تبرع +AddDonation=Create a donation NewDonation=منحة جديدة ShowDonation=Show donation DonationPromise=هدية الوعد @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/ar_SA/externalsite.lang index 44a6efa2334..a3b4dddc6b2 100644 --- a/htdocs/langs/ar_SA/externalsite.lang +++ b/htdocs/langs/ar_SA/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=رابط الإعداد لموقع خارجي ExternalSiteURL=الخارجية الموقع URL ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang index 2c37582091f..0e453b01075 100644 --- a/htdocs/langs/ar_SA/holiday.lang +++ b/htdocs/langs/ar_SA/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=تحديث CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=اسم Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=القيمة -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=صحة UpdateEventCP=Update events diff --git a/htdocs/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang index cf6fe19175f..a3c527f874d 100644 --- a/htdocs/langs/ar_SA/interventions.lang +++ b/htdocs/langs/ar_SA/interventions.lang @@ -3,7 +3,7 @@ Intervention=التدخل Interventions=المداخلات InterventionCard=تدخل البطاقة NewIntervention=التدخل الجديدة -AddIntervention=إضافة التدخل +AddIntervention=Create intervention ListOfInterventions=قائمة التدخلات EditIntervention=Editer التدخل ActionsOnFicheInter=إجراءات على التدخل @@ -30,6 +30,15 @@ StatusInterInvoiced=فواتير RelatedInterventions=التدخلات المتعلقة ShowIntervention=عرض التدخل SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=ممثل متابعة التدخل TypeContact_fichinter_internal_INTERVENING=التدخل diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang index 6ccd3b41b77..03b8db4771f 100644 --- a/htdocs/langs/ar_SA/mails.lang +++ b/htdocs/langs/ar_SA/mails.lang @@ -115,7 +115,7 @@ SentBy=أرسلها 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=ولكن يمكنك إرسالها عبر الإنترنت عن طريق إضافة معلمة MAILING_LIMIT_SENDBYWEB مع قيمة الحد الأقصى لعدد من رسائل البريد الإلكتروني التي تريد إرسالها من خلال هذه الدورة. 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=لائحة واضحة ToClearAllRecipientsClickHere=من الواضح أن المستفيدين قائمة لهذا البريد الإلكتروني ، انقر على زر ToAddRecipientsChooseHere=إضافة إلى المتلقين ، وتختار في هذه القوائم @@ -133,6 +133,9 @@ Notifications=الإخطارات NoNotificationsWillBeSent=إشعارات البريد الإلكتروني لا يجري التخطيط لهذا الحدث ، وشركة ANotificationsWillBeSent=1 سيتم إرسال الإشعار عن طريق البريد الإلكتروني SomeNotificationsWillBeSent=ق ٪ سوف يتم إرسال الإخطارات عبر البريد الإلكتروني -AddNewNotification=تفعيل جديد طلب إخطار بالبريد الإلكتروني -ListOfActiveNotifications=قائمة البريد الإلكتروني لجميع طلبات الإخطار +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=أرسلت قائمة جميع اشعارات بالبريد الالكتروني +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang index e8ff1e2b3f2..65692d8c64d 100644 --- a/htdocs/langs/ar_SA/main.lang +++ b/htdocs/langs/ar_SA/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=فشلت في العثور على المس ErrorNoVATRateDefinedForSellerCountry=خطأ ، لم يعرف لمعدلات ضريبة القيمة المضافة فى البلاد ٪ ق. ErrorNoSocialContributionForSellerCountry=خطأ ، لا يوجد نوع المساهمة الاجتماعية المحددة للبلد '%s'. ErrorFailedToSaveFile=خطأ ، وفشلت في انقاذ الملف. -ErrorOnlyPngJpgSupported=خطأ فقط. بابوا نيو غينيا ، وجيه. شكل صورة ملف الدعم. -ErrorImageFormatNotSupported=PHP الخاص بك لا يدعم وظائف لتحويل الصور من هذا الشكل. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=لون الخلفية الافتراضي +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=يتم تحديد ملف مرفق لكنه لم يكن بعد تحميلها. انقر على "ملف إرفاق" لهذا الغرض. NbOfEntries=ملاحظة : إدخالات GoToWikiHelpPage=الانترنت تساعد على قراءة (على ضرورة الوصول إلى الإنترنت) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=قادري MonthOfDay=خلال شهر من اليوم HourShort=حاء +MinuteShort=mn Rate=سعر UseLocalTax=Include tax Bytes=بايت @@ -340,6 +341,7 @@ FullList=القائمة الكاملة Statistics=احصاءات OtherStatistics=آخر الإحصاءات Status=حالة +Favorite=Favorite ShortInfo=Info. Ref=المرجع. RefSupplier=المرجع. المورد @@ -365,6 +367,7 @@ ActionsOnCompany=الأعمال حول هذا الطرف الثالث ActionsOnMember=أحداث حول هذا العضو NActions=ق ٪ الإجراءات NActionsLate=ق ٪ في وقت متأخر +RequestAlreadyDone=Request already recorded Filter=فلتر RemoveFilter=إزالة فلتر ChartGenerated=رسم ولدت @@ -645,6 +648,7 @@ OptionalFieldsSetup=اضافية سمات الإعداد URLPhoto=للتسجيل من الصورة / الشعار SetLinkToThirdParty=ربط طرف ثالث آخر CreateDraft=خلق مشروع +SetToDraft=Back to draft ClickToEdit=انقر للتحرير ObjectDeleted=%s الكائن المحذوف ByCountry=حسب البلد @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=يوم الاثنين Tuesday=الثلاثاء diff --git a/htdocs/langs/ar_SA/margins.lang b/htdocs/langs/ar_SA/margins.lang index ac2e3e87070..d9ad810fa75 100644 --- a/htdocs/langs/ar_SA/margins.lang +++ b/htdocs/langs/ar_SA/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=المنتج أو الخدمة AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=تاريخ البدء EndDate=نهاية التاريخ Launch=يبدأ - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/ar_SA/orders.lang index b2a84c2c709..fa265e9fe8e 100644 --- a/htdocs/langs/ar_SA/orders.lang +++ b/htdocs/langs/ar_SA/orders.lang @@ -2,7 +2,7 @@ OrdersArea=أوامر منطقة العملاء SuppliersOrdersArea=الموردين أوامر المنطقة OrderCard=من أجل بطاقة -# OrderId=Order Id +OrderId=Order Id Order=ترتيب Orders=أوامر OrderLine=من أجل خط @@ -28,7 +28,7 @@ StatusOrderCanceledShort=ألغى StatusOrderDraftShort=مسودة StatusOrderValidatedShort=صادق StatusOrderSentShort=في عملية -# StatusOrderSent=Shipment in process +StatusOrderSent=Shipment in process StatusOrderOnProcessShort=على عملية StatusOrderProcessedShort=تجهيز StatusOrderToBillShort=على مشروع قانون @@ -53,9 +53,9 @@ ShippingExist=شحنة موجود DraftOrWaitingApproved=الموافقة على مشروع أو لم يأمر بعد DraftOrWaitingShipped=مشروع مصادق عليه أو لم تشحن MenuOrdersToBill=أوامر لمشروع قانون -# MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=من أجل البحث -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=سفينة المنتج Discount=الخصم CreateOrder=خلق أمر @@ -65,14 +65,14 @@ ValidateOrder=من أجل التحقق من صحة UnvalidateOrder=Unvalidate النظام DeleteOrder=من أجل حذف CancelOrder=من أجل إلغاء -AddOrder=من أجل إضافة +AddOrder=Create order AddToMyOrders=أضف إلى أوامر AddToOtherOrders=إضافة إلى أوامر أخرى -# AddToDraftOrders=Add to draft order +AddToDraftOrders=Add to draft order ShowOrder=وتبين من أجل NoOpenedOrders=أي أوامر فتح NoOtherOpenedOrders=أي أوامر فتح -# NoDraftOrders=No draft orders +NoDraftOrders=No draft orders OtherOrders=أوامر أخرى LastOrders=ق الماضي أوامر ٪ LastModifiedOrders=آخر تعديل أوامر ق ٪ @@ -82,7 +82,7 @@ NbOfOrders=عدد الأوامر OrdersStatistics=أوامر إحصاءات OrdersStatisticsSuppliers=المورد أوامر إحصاءات NumberOfOrdersByMonth=عدد أوامر الشهر -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=قائمة الأوامر CloseOrder=وثيق من أجل ConfirmCloseOrder=هل أنت متأكد من أجل اقفال هذا؟ مرة واحدة أمر قد انتهى ، فإنه لا يمكن إلا أن يكون فواتير. @@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=هل أنت متأكد أنك تريد استعادة ConfirmCancelOrder=هل أنت متأكد من أنك تريد إلغاء هذا النظام؟ ConfirmMakeOrder=هل أنت متأكد من أن يؤكد لك هذا النظام على ٪ ق؟ GenerateBill=توليد الفاتورة -# ClassifyShipped=Classify delivered +ClassifyShipped=Classify delivered ClassifyBilled=تصنيف "فواتير" ComptaCard=بطاقة المحاسبة DraftOrders=مشروع أوامر @@ -101,7 +101,6 @@ RelatedOrders=الأوامر ذات الصلة OnProcessOrders=على عملية أوامر RefOrder=المرجع. ترتيب RefCustomerOrder=المرجع. عملاء النظام -CustomerOrder=عملاء النظام RefCustomerOrderShort=المرجع. العملاء. ترتيب SendOrderByMail=لكي ترسل عن طريق البريد ActionsOnOrder=إجراءات من أجل @@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=لم تعرف COMMANDE_SUPPLIER_ADDON Error_COMMANDE_ADDON_NotDefined=لم تعرف COMMANDE_ADDON مستمر Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=لم يتم تحميل الملف وحدة '٪ ق' Error_FailedToLoad_COMMANDE_ADDON_File=لم يتم تحميل الملف وحدة '٪ ق' -# Error_OrderNotChecked=No orders to invoice selected - - +Error_OrderNotChecked=No orders to invoice selected # Sources OrderSource0=اقتراح التجارية OrderSource1=الإنترنت @@ -144,25 +141,22 @@ OrderSource5=التجارية OrderSource6=مخزن QtyOrdered=الكمية أمرت AddDeliveryCostLine=تضاف تكلفة توصيل خط يبين الوزن من أجل - # Documents models PDFEinsteinDescription=من أجل نموذج كامل (logo...) PDFEdisonDescription=نموذج النظام بسيطة -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes OrderByMail=بريد OrderByFax=الفاكس OrderByEMail=بريد إلكتروني OrderByWWW=على الانترنت OrderByPhone=هاتف - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/ar_SA/oscommerce.lang b/htdocs/langs/ar_SA/oscommerce.lang deleted file mode 100644 index a6668b2519f..00000000000 --- a/htdocs/langs/ar_SA/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=نظام التشغيل والتجارة -OSCommerceSetup=نظام تشغيل وحدة التجارة الإعداد -OSCommerceSetupSaved=التجارة إعداد نظام التشغيل الموفرة -OSCommerceServer=نظام تشغيل الخادم المضيف التجارة / الملكية الفكرية -OSCommerceDatabaseName=اسم قاعدة بيانات نظام التشغيل والتجارة -OSCommercePrefix=نظام التشغيل التجاري بادئة الجداول -OSCommerceUser=قاعدة بيانات التجارة ادخل نظام التشغيل diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang index f349799841d..4500fbcdd8b 100644 --- a/htdocs/langs/ar_SA/other.lang +++ b/htdocs/langs/ar_SA/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=رمز الحماية Calendar=التقويم -AddTrip=إضافة رحلة Tools=أدوات ToolsDesc=ويكرس هذا المجال لمجموعة الأدوات المتنوعة التي لم تتوفر في إدخالات القوائم الأخرى.

    ويمكن الوصول إلى هذه الأدوات من القائمة على الجانب. Birthday=عيد ميلاد @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=عدد الملفات المرفقة / وثائق TotalSizeOfAttachedFiles=اجمالى حجم الملفات المرفقة / وثائق MaxSize=الحجم الأقصى @@ -80,6 +80,16 @@ ModifiedBy=المعدلة ق ٪ ValidatedBy=يصادق عليها ق ٪ CanceledBy=ألغى به ق ٪ ClosedBy=أغلقت ٪ ق +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=تم حذف الملف DirWasRemoved=دليل أزيل FeatureNotYetAvailableShort=متاحة في الإصدار التالي @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=إضافة الدخول في التقويم ق ٪ -NewCompanyToDolibarr=وأضافت الشركة ل ٪ الى Dolibarr -ContractValidatedInDolibarr=ق ٪ العقد المصادق عليه في Dolibarr -ContractCanceledInDolibarr=٪ ق الغاء العقد في Dolibarr -ContractClosedInDolibarr=ق ٪ مغلقا عقد في Dolibarr -PropalClosedSignedInDolibarr=اقتراح ٪ ق الذي وقع في Dolibarr -PropalClosedRefusedInDolibarr=ق رفض الاقتراح ٪ في Dolibarr -PropalValidatedInDolibarr=اقتراح ٪ في التحقق من صحة المستندات Dolibarr -InvoiceValidatedInDolibarr=فاتورة ٪ في التحقق من صحة المستندات Dolibarr -InvoicePaidInDolibarr=ق ٪ الفاتورة المدفوعة في تغيير Dolibarr -InvoiceCanceledInDolibarr=فاتورة ٪ ق الغى في Dolibarr -PaymentDoneInDolibarr=ق ٪ الدفع به في Dolibarr -CustomerPaymentDoneInDolibarr=العميل بدفع ٪ ق عمله في Dolibarr -SupplierPaymentDoneInDolibarr=المورد ٪ ق دفع به في Dolibarr -MemberValidatedInDolibarr=عضو ٪ في التحقق من صحة المستندات Dolibarr -MemberResiliatedInDolibarr=عضو في resiliated ٪ ق Dolibarr -MemberDeletedInDolibarr=عضو ٪ ق حذفها من Dolibarr -MemberSubscriptionAddedInDolibarr=الاكتتاب عضو ق ٪ وأضاف في Dolibarr -ShipmentValidatedInDolibarr=%s شحنة التحقق من صحتها في Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=تصدير ExportsArea=صادرات المنطقة diff --git a/htdocs/langs/ar_SA/paybox.lang b/htdocs/langs/ar_SA/paybox.lang index 4e950f0ba13..36cef5fe4cc 100644 --- a/htdocs/langs/ar_SA/paybox.lang +++ b/htdocs/langs/ar_SA/paybox.lang @@ -32,6 +32,9 @@ VendorName=اسم البائع CSSUrlForPaymentForm=عزيزي ورقة النمط المغلق للنموذج الدفع MessageOK=رسالة على الصفحة التحقق من صحة الدفع عودة MessageKO=رسالة في إلغاء دفع الصفحة عودة -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/ar_SA/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang index 82b1e7a1126..8821b3f6aca 100644 --- a/htdocs/langs/ar_SA/sendings.lang +++ b/htdocs/langs/ar_SA/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=لحظة، ويتم إنشاء لشحنة جدي RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=القبض على العملاء diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang index 6c31869aa9d..d2157295ec9 100644 --- a/htdocs/langs/ar_SA/stocks.lang +++ b/htdocs/langs/ar_SA/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=مستودع العلامة مطلوبة CorrectStock=تصحيح الأوراق المالية ListOfWarehouses=لائحة المخازن ListOfStockMovements=قائمة الحركات الأسهم -StocksArea=مخزون المنطقة +StocksArea=Warehouses area Location=عوضا عن LocationSummary=باختصار اسم الموقع NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang index 9e27d64edff..e0d5726d41b 100644 --- a/htdocs/langs/ar_SA/users.lang +++ b/htdocs/langs/ar_SA/users.lang @@ -63,7 +63,6 @@ ShowGroup=وتبين لفريق ShowUser=وتظهر للمستخدم NonAffectedUsers=غير المتأثرة المستخدمين UserModified=المعدل المستخدم بنجاح -GroupModified=تعديل المجموعة بنجاح PhotoFile=ملف الصور UserWithDolibarrAccess=مع وصول المستخدمين Dolibarr ListOfUsersInGroup=قائمة المستخدمين في هذه المجموعة @@ -103,7 +102,7 @@ UserDisabled=مستخدم ٪ ق المعوقين UserEnabled=مستخدم ٪ ق تفعيلها UserDeleted=ق إزالة المستخدم ٪ NewGroupCreated=أنشأت مجموعة ق ٪ -GroupModified=تعديل المجموعة بنجاح +GroupModified=Group %s modified GroupDeleted=فريق ازالة ق ٪ ConfirmCreateContact=هل أنت متأكد من خلق Dolibarr حساب هذا الاتصال؟ ConfirmCreateLogin=هل أنت متأكد من خلق Dolibarr حساب هذا؟ @@ -114,8 +113,10 @@ YourRole=الأدوار الخاص YourQuotaOfUsersIsReached=يتم التوصل إلى حصة الخاص بك من المستخدمين النشطين! NbOfUsers=ملحوظة من المستخدمين DontDowngradeSuperAdmin=يمكن فقط superadmin تقليله a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang index 25dfca75494..5d7a45bbe66 100644 --- a/htdocs/langs/ar_SA/withdrawals.lang +++ b/htdocs/langs/ar_SA/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=ورود LastWithdrawalReceipts=ق الماضي سحب إيصالات ٪ WithdrawedBills=Withdrawed الفواتير WithdrawalsLines=خطوط السحب -RequestStandingOrderToTreat=طلب لأوامر دائمة لمعالجة -RequestStandingOrderTreated=طلب تعامل أوامر دائمة +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=الزبون أوامر دائمة CustomerStandingOrder=يقف النظام العميل NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=طريقة البث Send=إرسال Lines=خطوط StandingOrderReject=رفض إصدار -InvoiceRefused=تهمة الرفض لزبون WithdrawalRefused=سحب Refuseds WithdrawalRefusedConfirm=هل أنت متأكد أنك تريد الدخول في رفض الانسحاب للمجتمع RefusedData=تاريخ الرفض RefusedReason=أسباب الرفض RefusedInvoicing=رفض الفواتير NoInvoiceRefused=لا تهمة الرفض -InvoiceRefused=تهمة الرفض لزبون +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=حالة StatusUnknown=غير معروف StatusWaiting=انتظار @@ -76,13 +76,14 @@ WithBankUsingRIB=عن الحسابات المصرفية باستخدام RIB WithBankUsingBANBIC=عن الحسابات المصرفية باستخدام IBAN / BIC / SWIFT BankToReceiveWithdraw=حساب مصرفي لتلقي تنسحب CreditDate=الائتمان على -WithdrawalFileNotCapable=غير قادر على توليد سحب ملف استلام لبلدك +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/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang index 8cab9d2b651..56ea784ecdf 100644 --- a/htdocs/langs/bg_BG/accountancy.lang +++ b/htdocs/langs/bg_BG/accountancy.lang @@ -7,7 +7,7 @@ Chartofaccounts=Chart of accounts Fiscalyear=Fiscal years Menuaccount=Accounting accounts Menuthirdpartyaccount=Thirdparty accounts -MenuTools=Tools +MenuTools=Инструменти ConfigAccountingExpert=Configuration of the module accounting expert Journaux=Journals @@ -25,19 +25,19 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin -Reports=Reports +Reports=Отчети ByCustomerInvoice=By invoices customers -ByMonth=By Month +ByMonth=По месец NewAccount=New accounting account Update=Update -List=List +List=Списък Create=Create UpdateAccount=Modification of an accounting account UpdateMvts=Modification of a movement @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -66,11 +66,11 @@ Lineofinvoice=Line of invoice 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 ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -92,17 +92,17 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) -Doctype=Type of document -Docdate=Date -Docref=Reference -Numerocompte=Account -Code_tiers=Thirdparty -Labelcompte=Label account -Debit=Debit -Credit=Credit -Amount=Amount +Doctype=Тип на документа +Docdate=Дата +Docref=Справка +Numerocompte=Сметка +Code_tiers=Трета страна +Labelcompte=Етикет на сметка +Debit=Дебит +Credit=Кредит +Amount=Сума Sens=Sens -Codejournal=Journal +Codejournal=Дневник DelBookKeeping=Delete the records of the general ledger @@ -140,19 +140,19 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account -ValidateHistory=Validate Automatically +ValidateHistory=Валидирайте автоматично -ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used +ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не можете да изтриете тази счетоводна сметка, защото се използва. -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index 7141ecac2a9..0516b22b16e 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -12,10 +12,10 @@ SessionId=ID на сесията SessionSaveHandler=Handler за да запазите сесията SessionSavePath=Място за съхранение на сесията PurgeSessions=Изчистване на сесиите -ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself). +ConfirmPurgeSessions=Сигурни ли сте, че желаете да изчистите всички сесии? Това ще прекъсне всички потребители (освен Вас). NoSessionListWithThisHandler=Запиши сесиен манипулатор конфигурирани във вашата PHP, не позволява да се изброят всички текущи сесии. LockNewSessions=Заключване за нови свързвания -ConfirmLockNewSessions=Сигурен ли сте, че искате да ограничите всяка нова връзка Dolibarr за себе си. Само %s потребителят ще бъде в състояние да се свърже след това. +ConfirmLockNewSessions=Сигурни ли сте, че желаете да ограничите всяка нова връзка Dolibarr за себе си. Само %s потребителят ще бъде в състояние да се свърже след това. UnlockNewSessions=Разрешаване на свързването YourSession=Вашата сесия Sessions=Потребителска сесия @@ -42,20 +42,22 @@ RestoreLock=Възстановете файла %s, само с прав SecuritySetup=Настройки на сигурността ErrorModuleRequirePHPVersion=Грешка, този модул изисква PHP версия %s или по-висока ErrorModuleRequireDolibarrVersion=Грешка, този модул изисква Dolibarr версия %s или по-висока -ErrorDecimalLargerThanAreForbidden=Грешка, с точност по-висока от %s не се поддържа. +ErrorDecimalLargerThanAreForbidden=Грешка, точност по-висока от %s не се поддържа. DictionarySetup=Dictionary setup Dictionary=Dictionaries Chartofaccounts=Chart of accounts Fiscalyear=Fiscal years -ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record -ErrorCodeCantContainZero=Code can't contain value 0 -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +ErrorReservedTypeSystemSystemAuto=Стойност 'система' и 'автосистема' за типа са запазени. Може да използвате за стойност 'потребител' при добавяне на ваш личен запис. +ErrorCodeCantContainZero=Кода не може да съдържа стойност 0 +DisableJavascript=Изключете функциите JavaScript и Ajax (Препоръчва се за незрящи и при текстови браузъри) ConfirmAjax=Използвайте Аякс потвърждение изскачащи прозорци UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. +UseSearchToSelectCompany=Използвайте автоматично довършване на полета, за избране на трети страни, вместо да използват списъка от полето. 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). +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=Показване на пълните събития дати в третия лист @@ -70,16 +72,16 @@ CurrentTimeZone=TimeZone PHP (сървър) MySQLTimeZone=TimeZone MySql (database) TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). Space=Пространство -Table=Table +Table=Таблица Fields=Полетата -Index=Index +Index=Индекс Mask=Маска NextValue=Следваща стойност NextValueForInvoices=Следваща стойност (фактури) NextValueForCreditNotes=Следваща стойност (кредитни известия) NextValueForDeposit=Next value (deposit) NextValueForReplacements=Next value (replacements) -MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на %s %s, независимо от стойността на този параметър е +MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на %s %s, независимо от стойността на този параметър е NoMaxSizeByPHPLimit=Забележка: Не срокът се определя в конфигурацията на вашия PHP MaxSizeForUploadedFiles=Максимален размер за качените файлове (0 за да забраните качване) UseCaptchaCode=Използвайте графичен код (CAPTCHA) на страницата за вход @@ -118,28 +120,28 @@ ParameterInDolibarr=Параметър %s LanguageParameter=Езиков параметър %s LanguageBrowserParameter=Параметър %s LocalisationDolibarrParameters=Локализация параметри -ClientTZ=Client Time Zone (user) -ClientHour=Client time (user) -OSTZ=Server OS Time Zone -PHPTZ=PHP server Time Zone +ClientTZ=Часова зона на клиента (потребител) +ClientHour=Час на клиента (потребител) +OSTZ=Часова зона на Операционната Система +PHPTZ=Часова зона на PHP Сървъра PHPServerOffsetWithGreenwich=PHP сървъра компенсира широчина Гринуич (секунди) ClientOffsetWithGreenwich=Клиент / Browser компенсира широчина Гринуич (секунди) DaylingSavingTime=Лятното часово време -CurrentHour=PHP Time (server) -CompanyTZ=Company Time Zone (main company) -CompanyHour=Company Time (main company) +CurrentHour=Час на PHP (сървър) +CompanyTZ=Часова зона на фирмата (основна фирма) +CompanyHour=Час на фирмата (основна фирма) CurrentSessionTimeOut=Продължителност на текущата сесия 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 околната среда Box=Кутия Boxes=Кутии MaxNbOfLinesForBoxes=Максимален брой на редовете за кутии -PositionByDefault=Подразбиране за -Position=Position +PositionByDefault=Default order +Position=Длъжност MenusDesc=Менюта мениджърите определят съдържанието на две ленти с менюта (хоризонтална лента и вертикална лента). MenusEditorDesc=Менюто редактор ви позволяват да определите персонализирани вписвания в менютата. Използвайте го внимателно, за да се избегне dolibarr нестабилна и записи в менюто постоянно недостижим.
    Някои модули добавяне на записи в менютата (в менюто Всички в повечето случаи). Ако сте премахнали някои от тези записи по погрешка, можете да ги възстановите, като изключите и отново да активирате модула. MenuForUsers=Меню за потребители -LangFile=.lang file +LangFile=.lang файл System=Система SystemInfo=Системна информация SystemTools=Системни инструменти @@ -171,7 +173,7 @@ ImportMethod=Внос метод ToBuildBackupFileClickHere=За изграждането на резервно копие на файла, натиснете тук . ImportMySqlDesc=За да импортирате архивния файл, трябва да използвате MySQL команда от командния ред: ImportPostgreSqlDesc=За да импортирате архивния файл, трябва да използвате pg_restore команда от командния ред: -ImportMySqlCommand=%s %s <mybackupfile.sql +ImportMySqlCommand=%s %s < mybackupfile.sql ImportPostgreSqlCommand=%s %s mybackupfile.sql FileNameToGenerate=Име на генерирания файл Compression=Компресия @@ -208,10 +210,11 @@ 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=Кутии наличните -BoxesActivated=Кутии активира +BoxesAvailable=Налични Кутии +BoxesActivated=Активирани Кутии ActivateOn=Активиране на ActiveOn=Активирана SourceFile=Изходният файл @@ -238,7 +241,7 @@ OfficialWebSiteFr=Френски официален уеб сайт OfficialWiki=Dolibarr документация на Wiki OfficialDemo=Dolibarr онлайн демо OfficialMarketPlace=Официален магазин за външни модули/добавки -OfficialWebHostingService=Referenced web hosting services (Cloud hosting) +OfficialWebHostingService=Препоръчителен уеб хостинг услуги (хостинг в интернет облак) ReferencedPreferredPartners=Preferred Partners OtherResources=Autres ressources ForDocumentationSeeWiki=Документация за потребител или разработчик (Doc, често задавани въпроси ...),
    можете да намерите в Dolibarr Wiki:
    %s @@ -283,11 +286,11 @@ ModuleFamilyProjects=Проекти / съвместна работа ModuleFamilyOther=Друг ModuleFamilyTechnic=Mutli модули инструменти ModuleFamilyExperimental=Експериментални модули -ModuleFamilyFinancial=Финансови Модули (Счетоводство / Каса) +ModuleFamilyFinancial=Финансови Модули (Счетоводство/Каса) ModuleFamilyECM=Електронно Управление на Съдържанието (ECM) MenuHandlers=Меню работещи MenuAdmin=Menu Editor -DoNotUseInProduction=Do not use in production +DoNotUseInProduction=Не използвайте на продукшън платформа ThisIsProcessToFollow=Това е настройка на процеса: StepNb=Стъпка %s FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s). @@ -302,7 +305,7 @@ CurrentVersion=Текуща версия на Dolibarr CallUpdatePage=Отидете на страницата, която се актуализира структурата на базата данни и презареждане на: %s. LastStableVersion=Последна стабилна версия GenericMaskCodes=Можете да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове:
    {000000} съответства на номер, който се увеличава на всеки %s. Влез като много нули като желаната дължина на брояча. Броячът ще бъде завършен с нули от ляво, за да има колкото се може повече нули като маска.
    {000000 000} същата като предишната, но компенсира, съответстваща на броя на правото на знака + се прилага започва на първи %s.
    {000000 @} същата като предишната, но броячът се нулира, когато месеца Х е достигнал (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация). Ако тази опция се използва и х е 2 или по-висока, тогава последователност {гг} {mm} или {гггг} {mm} също е задължително.
    {DD} ден (01 до 31).
    {Mm} месец (01 до 12).
    {Гг} {гггг} или {Y} година над 2, 4 или 1 брой.
    -GenericMaskCodes2={cccc} the client code on n characters
    {cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
    {tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
    +GenericMaskCodes2={cccc} клиентския код в знака n
    {cccc000}клиентския код в знак n се следва от брояч предназначен за клиента. Този брояч предназначен за клиента се нулира в същото време в което и глобалния брояч.
    {tttt} Кодът на типа трети страни в знака n (погледнете речник-типове трети страни).
    GenericMaskCodes3=Всички други символи на маската ще останат непокътнати.
    Интервалите не са разрешени.
    GenericMaskCodes4a=Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:
    GenericMaskCodes4b=Пример за трета страна е създаден на 2007-03-01:
    @@ -437,14 +440,14 @@ Module52Name=Запаси Module52Desc=Управление на склад (продукти) Module53Name=Услуги Module53Desc=Управление на услуги -Module54Name=Договори -Module54Desc=Управлението на договорите и услуги +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Баркодове 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=Проекти -Module400Desc=Управление на проекти вътре в други модули +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Известия -Module600Desc=Изпращане известия по имейл за някои бизнес събития в Dolibarr към трети лица +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Дарения Module700Desc=Управление на дарения Module1200Name=Богомолка @@ -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 Клиент @@ -514,20 +521,20 @@ Module5000Name=Няколко фирми Module5000Desc=Позволява ви да управлявате няколко фирми Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Отпуски -Module20000Desc=Управление на отпуските на служителите +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=Точка на продажбите Module50100Desc=Точка на продажбите модул -Module50200Name= Paypal -Module50200Desc= Модул предлага онлайн страница на плащане с кредитна карта с Paypal +Module50200Name=Paypal +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=Полета @@ -606,15 +613,16 @@ Permission151=Нареждания за периодични преводи Permission152=Създаване / промяна на постоянни нареждания, искане Permission153=Кутия постоянни нареждания разписки Permission154=Кредит / отказват постоянни постъпления поръчки -Permission161=Прочети договори -Permission162=Създаване / промяна на договорите -Permission163=Активиране на услугата на договор -Permission164=Изключване услуга на договор -Permission165=Изтриване на договори -Permission171=Прочети пътувания -Permission172=Създаване / промяна пътувания -Permission173=Изтриване пътувания -Permission178=Износ пътувания +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Прочети доставчици Permission181=Доставчика поръчки Permission182=Създаване / промяна на доставчика поръчки @@ -671,7 +679,7 @@ Permission300=Баркодове Permission301=Създаване / промяна на баркодове Permission302=Изтриване на баркодове Permission311=Прочети услуги -Permission312=Присвояване услуга за сключване на договор +Permission312=Assign service/subscription to contract Permission331=Прочетете отметките Permission332=Създаване / промяна на отметки Permission333=Изтриване на отметки @@ -701,8 +709,8 @@ Permission701=Прочети дарения Permission702=Създаване / промяна на дарения Permission703=Изтриване на дарения Permission1001=Прочети запаси -Permission1002=Създаване / промяна на запасите -Permission1003=Изтриване на запасите +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Движението на стоковите наличности Permission1005=Създаване / промяна на движението на стоковите наличности Permission1101=Поръчките за доставка @@ -778,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 @@ -887,6 +896,7 @@ PermanentLeftSearchForm=Постоянна форма за търсене в л DefaultLanguage=Език по подразбиране (код на езика) EnableMultilangInterface=Разрешаване на многоезичен интерфейс EnableShowLogo=Показване на логото в лявото меню +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Вашата система е актуализиран успешно CompanyInfo=Информация за фирмата/организацията CompanyIds=Идентичност на фирмата/организацията @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Имайте впредвид, че само следните модули са отворени за външни потребители (каквито и да са правата на тези потребители): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Връщане счетоводна код, постр ModuleCompanyCodePanicum=Връща празна код счетоводство. ModuleCompanyCodeDigitaria=Счетоводството код зависи от код на трето лице. Код се състои от буквата "C" на първа позиция, следван от първите 5 символа на код на трета страна. UseNotifications=Използвайте уведомления -NotificationsDesc=Функцията за уведомления по имейл позволява тихо изпращане на автоматичен мейл, за някои събития в Dolibarr, на трети лица (клиенти и доставчици), които са конфигурирани. Избор на активно уведомяване и цели контакти е направен на една трета страна в момента. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Документи шаблони DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Воден знак върху проект на документ @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Добавяне на способността дат UseOptionLineIfNoQuantity=Линия на продукт / услуга с нулева сума се разглежда като вариант FreeLegalTextOnProposal=Свободен текст на търговски предложения WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Настройки за управление на поръчки OrdersNumberingModules=Поръчки номериране модули @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Да се ​​потвърди ред след предложението близо, това прави възможно да не се увеличат с временния ред FreeLegalTextOnOrders=Свободен текст на поръчки WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Кликнете, за да наберете настройка модул ClickToDialUrlDesc=Адреса нарича, когато се извършва едно кликване на телефона пиктограма. URL, можете да използвате маркери
    __PHONETO__, Които ще бъдат заменени с телефонния номер на лицето, да се обадите
    __PHONEFROM__, Че ще бъде заменен с телефонния номер на повикващата лице (твое)
    __LOGIN__, Които ще бъдат заменени с clicktodial вход (определено на вашето потребителско карта)
    __PASS__, Които ще бъдат заменени с clicktodial вашата парола (определено на вашето потребителско карта). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Модули за намеса номериране TemplatePDFInterventions=Намеса карти документи модели WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Договори модул за настройка +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Договори за номериране модули TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Продукти модул за настройка ServiceSetup=Услуги модул за настройка @@ -1382,9 +1393,10 @@ MailingSetup=Настройка на модул Имейли MailingEMailFrom=Изпращач (От) за имейли, изпратени от модула за електронна поща MailingEMailError=Върнете имейл (грешки) за имейли с грешки ##### Notification ##### -NotificationSetup=Настройки на модул за уведомление по e-mail +NotificationSetup=EMail notification module setup NotificationEMailFrom=Изпращач (От) за имейли, изпратени за уведомления -ListOfAvailableNotifications=Списък на наличните уведомления (Този списък зависи от активирани модули) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Изпращане модул за настройка SendingsReceiptModel=Изпращане получаване модел @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Връзка към "%s" сървър на "%s&q OSCommerceTestKo1=Свързване към сървър "%s успее, но база данни" %s "не може да бъде постигнато. OSCommerceTestKo2=Връзка към сървъра "%s" с потребителя %s "се провали. ##### Stock ##### -StockSetup=Наличност модулна конфигурация -UserWarehouse=Използване на потребителски поименни акции +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Меню заличават TreeMenu=Tree менюта @@ -1478,11 +1491,14 @@ ClickToDialDesc=Този модул позволява да добавите и ##### Point Of Sales (CashDesk) ##### CashDesk=Точка на продажбите CashDeskSetup=Точка на продажбите модул за настройка -CashDeskThirdPartyForSell=Generic трета страна да използва за продава +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Акаунт по подразбиране да се използва за получаване на парични плащания CashDeskBankAccountForCheque= Акаунт по подразбиране да се използва за получаване на плащания с чек CashDeskBankAccountForCB= Акаунт по подразбиране да се използва за получаване на парични плащания с кредитни карти -CashDeskIdWareHouse=Склад да се използва за продава +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. ##### Bookmark ##### BookmarkSetup=Bookmark настройка модул BookmarkDesc=Този модул ви позволява да управлявате отметките. Можете да добавяте преки пътища към страници на Dolibarr или външни уеб сайтове в лявото меню. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang index 33d388b055f..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=Списъчен изглед @@ -41,9 +42,10 @@ AutoActions= Автоматично попълване AgendaAutoActionDesc= Определете тук събития, за които искате Dolibarr да създадете автоматично събитие в дневния ред. Ако нищо не се проверява (по подразбиране), само ръчни действия ще бъдат включени в дневния ред. AgendaSetupOtherDesc= Тази страница предоставя възможности да се допусне износ на вашите събития Dolibarr в външен календар (Thunderbird, Google Calendar, ...) AgendaExtSitesDesc=Тази страница позволява да се обяви външните източници на календари, за да видят своите събития в дневния ред Dolibarr. -ActionsEvents= Събития, за които Dolibarr ще създаде действие в дневния ред автоматично -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Фактура %s валидирани +ActionsEvents=Събития, за които Dolibarr ще създаде действие в дневния ред автоматично +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Фактура %s валидирани +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Фактура %s се върнете в състояние на чернова InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Поръчка %s валидирани @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Поръчка %s одобрен OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Поръчка %s се върне в състояние на чернова OrderCanceledInDolibarr=Поръчка %s отменен -InterventionValidatedInDolibarr=Намеса %s валидирани ProposalSentByEMail=Търговски %s предложението, изпратено по електронна поща OrderSentByEMail=, Изпратени по електронната поща %s поръчка на клиента InvoiceSentByEMail=, Изпратени по електронната поща %s клиенти фактура @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=%s доставчик реда, изпратени по SupplierInvoiceSentByEMail=, Изпратени по електронната поща %s доставчик фактура ShippingSentByEMail=Доставка %s изпращат по електронна поща ShippingValidated= Shipping %s validated -InterventionSentByEMail=Намеса %s изпращат по електронна поща -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Създадено от трета страна DateActionPlannedStart= Планирана начална дата DateActionPlannedEnd= Планирана крайна дата @@ -70,9 +69,9 @@ DateActionStart= Начална дата DateActionEnd= Крайна дата AgendaUrlOptions1=Можете да добавите и следните параметри, за да филтрирате изход: AgendaUrlOptions2=вход = %s да ограничи изход към действия, създадени от засегнати или направено от потребителя %s. -AgendaUrlOptions3=logina = %s да се ограничи производството на действията, създадени от потребителя %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint = %s да се ограничи производството на действията, засегнати на потребителските %s. -AgendaUrlOptions5=logind = %s да се ограничи производството за действия, извършени от потребителя %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Показване на контактите, които имат рожден ден AgendaHideBirthdayEvents=Скриване на контактите, които имат рожден ден Busy=Зает @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL адрес за достъп до файла .Ical ExtSiteNoLabel=Няма описание WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang index ab562b577ab..35f5d89a4cd 100644 --- a/htdocs/langs/bg_BG/bills.lang +++ b/htdocs/langs/bg_BG/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Кредитно известие InvoiceAvoirAsk=Кредитно известие за коригиране на фактура InvoiceAvoirDesc=Кредитно известие е отрицателна фактура, използвани за решаване на факта, че фактурата е сумата, която се различава от сумата, наистина са платени (защото платил твърде много от грешка, или няма да се изплаща напълно, тъй като той се върна някои продукти, например). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Сменете фактура %s ReplacementInvoice=Подмяна фактура ReplacedByInvoice=Заменен с фактура %s @@ -87,7 +87,7 @@ ClassifyCanceled=Класифициране 'Изоставено' ClassifyClosed=Класифициране 'Затворено' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Създаване на фактура -AddBill=Добави фактура или кредитно известие +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Изтриване на фактура SearchACustomerInvoice=Търсене за клиент фактура @@ -99,7 +99,7 @@ DoPaymentBack=Направете плащане със задна дата ConvertToReduc=Конвертиране в бъдеще отстъпка EnterPaymentReceivedFromCustomer=Въведете получено плащане от клиент EnterPaymentDueToCustomer=Дължимото плащане на клиента -DisabledBecauseRemainderToPayIsZero=Хора с увреждания, тъй като остатъка за плащане е равна на нула +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Размер PriceBase=Цена база BillStatus=Състояние на фактурата @@ -137,8 +137,6 @@ BillFrom=От BillTo=За ActionsOnBill=Действия по фактура NewBill=Нова фактура -Prélèvements=Постоянния цел -Prélèvements=Постоянния цел LastBills=Последните %s фактури LastCustomersBills=Последните %s фактури на клиенти LastSuppliersBills=Последните %s фактури на доставчици @@ -156,9 +154,9 @@ ConfirmCancelBill=Сигурен ли сте, че искате да отмен ConfirmCancelBillQuestion=Защо искате да класифицирате тази фактура като "изоставена"? ConfirmClassifyPaidPartially=Сигурен ли сте, че искате да промените фактура %s до статута на платен? ConfirmClassifyPaidPartiallyQuestion=Тази фактура не е платена изцяло. Какви са причините за да се затвори тази фактура? -ConfirmClassifyPaidPartiallyReasonAvoir=Остатък за плащане (%s %s) е отстъпка, предоставена, тъй като плащането е направено преди термина. Нормализира ДДС кредитно известие. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Остатък за плащане (%s %s) е отстъпка, предоставена, тъй като плащането е направено преди термина. Приемам да губят ДДС върху тази отстъпка. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Остатък за плащане (%s %s) е отстъпка, предоставена, тъй като плащането е направено преди термина. Възстановяване на ДДС върху тази отстъпка, без кредитно известие. +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 клиента ConfirmClassifyPaidPartiallyReasonProductReturned=Продукти частично се завръща ConfirmClassifyPaidPartiallyReasonOther=Сума, изоставен за друга причина @@ -191,9 +189,9 @@ AlreadyPaid=Вече е платена AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Вече е платена (без кредитни известия и депозити) Abandoned=Изоставен -RemainderToPay=Остатък за плащане -RemainderToTake=Остатък да предприеме -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Претендираната сума ExcessReceived=Превишение получи @@ -219,19 +217,18 @@ NoInvoice=Липса на фактура ClassifyBill=Класифициране на фактурата SupplierBillsToPay=Доставчици фактури за плащане CustomerBillsUnpaid=Неплатени фактури на клиентите -DispenseMontantLettres=Законопроектът, изготвен от механографски са освободени от реда, в писма -DispenseMontantLettres=Законопроектът, изготвен от механографски са освободени от реда, в писма +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Невъзстановими SetConditions=Задайте условията за плащане SetMode=Задайте режим на плащане Billed=Таксува -RepeatableInvoice=Предварително дефиниран фактура -RepeatableInvoices=Предварително дефинирани фактури -Repeatable=Предварително дефинирани -Repeatables=Предварително дефинирани -ChangeIntoRepeatableInvoice=Конвертиране в предварително определен -CreateRepeatableInvoice=Създаване на предварително определен фактура -CreateFromRepeatableInvoice=Създаване на предварително определен фактура +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Клиенти фактури и фактури линии CustomersInvoicesAndPayments=Фактури и плащания на клиентите ExportDataset_invoice_1=Фактури списък с клиенти и фактура линии diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang index 3fab48d0857..a6142468ddf 100644 --- a/htdocs/langs/bg_BG/categories.lang +++ b/htdocs/langs/bg_BG/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Премахване от категорията DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang index b4930ceba6d..0830bcfd2d3 100644 --- a/htdocs/langs/bg_BG/compta.lang +++ b/htdocs/langs/bg_BG/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad код отчетност за клие SuppliersProductsSellSalesTurnover=Генерираният оборот от продажбите на продуктите на доставчика. CheckReceipt=Проверете депозит CheckReceiptShort=Проверете депозит +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Нов отстъпка NewCheckDeposit=Нова проверка депозит NewCheckDepositOn=Създаване на разписка за депозит по сметка: %s @@ -196,14 +197,10 @@ 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_VAT_ACCOUNT=Счетоводен код по подразбиране за начисляване на ДДС +ACCOUNTING_VAT_BUY_ACCOUNT=Счетоводен код по подразбиране за плащане на ДДС ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties -CloneTax=Clone a social contribution -ConfirmCloneTax=Confirm the clone of a social contribution -CloneTaxForNextMonth=Clone it for next month +CloneTax=Клониране на социално-осигурителни вноски +ConfirmCloneTax=Потвърдете клонирането на социално-осигурителните вноски +CloneTaxForNextMonth=Клониране за следващ месец diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang index 1c28e533303..1aa00c03e0e 100644 --- a/htdocs/langs/bg_BG/contracts.lang +++ b/htdocs/langs/bg_BG/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Договори област ListOfContracts=Списък на договорите -LastContracts=Последните %s променени договори +LastModifiedContracts=Last %s modified contracts AllContracts=Всички договори ContractCard=Карта на договор ContractStatus=Договор статус @@ -27,7 +27,7 @@ MenuRunningServices=Текущи услуги MenuExpiredServices=Изтекли услуги MenuClosedServices=Затворени услуги NewContract=Нов договор -AddContract=Добави договор +AddContract=Create contract SearchAContract=Търсене на договора DeleteAContract=Изтриване на договора CloseAContract=Затваряне на договора @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Списък на линиите на движени ListOfRunningServices=Списък на стартираните услуги NotActivatedServices=Неактивни услуги (сред валидирани договори) BoardNotActivatedServices=Услуги за да активирате сред утвърдени договори -LastContracts=Последните %s променени договори +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/cron.lang b/htdocs/langs/bg_BG/cron.lang index d7de40fd4ae..ac2ba5edc0a 100644 --- a/htdocs/langs/bg_BG/cron.lang +++ b/htdocs/langs/bg_BG/cron.lang @@ -1,10 +1,8 @@ # Dolibarr language file - Source file is en_US - cron -# # About page About = За CronAbout = About Cron CronAboutPage = Cron about page - # Right Permission23101 = Read Scheduled task Permission23102 = Create/update Scheduled task @@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman 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 jobs -CronListInactive= List of disabled jobs -CronListActive= List of active jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list CronDateLastRun=Last run CronLastOutput=Last run output @@ -77,13 +74,13 @@ CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dol CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -CronCommandHelp=The system command line to execute. +CronCommandHelp=Системния команден ред за стартиране. # Info -CronInfoPage=Information +CronInfoPage=Информация # Common -CronType=Task type +CronType=Тип на задачата CronType_method=Call method of a Dolibarr Class -CronType_command=Shell command -CronMenu=Cron -CronCannotLoadClass=Cannot load class %s or object %s +CronType_command=Терминална команда +CronMenu=Крон (софтуер за изпънение на автоматични задачи) +CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/bg_BG/donations.lang b/htdocs/langs/bg_BG/donations.lang index b080f9ba743..e64cf417e46 100644 --- a/htdocs/langs/bg_BG/donations.lang +++ b/htdocs/langs/bg_BG/donations.lang @@ -4,7 +4,7 @@ Donations=Дарения DonationRef=Дарение Donor=Дарител Donors=Дарители -AddDonation=Добавяне на дарение +AddDonation=Create a donation NewDonation=Ново дарение ShowDonation=Показване на дарение DonationPromise=Обещано дарение @@ -30,4 +30,9 @@ SearchADonation=Търсене на дарение DonationRecipient=Получател на дарението ThankYou=Благодарим Ви! IConfirmDonationReception=Получателят декларира, че е получил дарение на стойност -MinimumAmount=Minimum amount is %s +MinimumAmount=Минималното количество е %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/bg_BG/externalsite.lang index 88b4ac6bd79..b8235c9d6c2 100644 --- a/htdocs/langs/bg_BG/externalsite.lang +++ b/htdocs/langs/bg_BG/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Настройка на линк към външен сайт ExternalSiteURL=Външен URL адрес на сайта ExternalSiteModuleNotComplete=Модула Външен сайт не е конфигуриран правилно. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang index 9bf06f7c047..f3d9c9dcba9 100644 --- a/htdocs/langs/bg_BG/holiday.lang +++ b/htdocs/langs/bg_BG/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Актуализация CantUpdate=You cannot update this leave request. NoDateDebut=Трябва да изберете началната дата. NoDateFin=Трябва да изберете крайна дата. -ErrorDureeCP=Вашето искане за почивка не съдържа работен ден. -TitleValidCP=Утвърждава искането за отпуск +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Дата на утвърждаване TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Отхвърляне на заявлението за отпуск +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Вие трябва да изберете причина за отказ на искането. -TitleCancelCP=Анулира заявката празници +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Причина за отказа DateRefusCP=Дата на отказ @@ -78,7 +77,7 @@ ActionByCP=В изпълнение на UserUpdateCP=За потребителя PrevSoldeCP=Предишен баланс NewSoldeCP=Нов баланс -alreadyCPexist=Вече е направено искане за отпуск за този период. +alreadyCPexist=A leave request has already been done on this period. UserName=Име Employee=Служители FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Настройки на модула за отпуски +ConfCP=Configuration of leave request module DescOptionCP=Описание на опцията ValueOptionCP=Стойност -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Потвърждаване на конфигурацията -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Актуализира се успешно. ErrorUpdateConfCP=Възникна грешка по време на актуализацията, моля опитайте отново. -AddCPforUsers=Моля, добавете баланса на празниците на потребителите, като кликнете тук . -DelayForSubmitCP=Краен срок за кандидатстване за отпуск -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Проверка на UpdateEventCP=Актуализиране на събития diff --git a/htdocs/langs/bg_BG/interventions.lang b/htdocs/langs/bg_BG/interventions.lang index 583d7a4ea02..b283f32ebe4 100644 --- a/htdocs/langs/bg_BG/interventions.lang +++ b/htdocs/langs/bg_BG/interventions.lang @@ -3,7 +3,7 @@ Intervention=Намеса Interventions=Интервенциите InterventionCard=Интервенция карта NewIntervention=Нов намеса -AddIntervention=Добави намеса +AddIntervention=Create intervention ListOfInterventions=Списък на интервенциите EditIntervention=Редактиране намеса ActionsOnFicheInter=Действия на интервенцията @@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Име и подпис на намеса: NameAndSignatureOfExternalContact=Име и подпис на клиента: DocumentModelStandard=Стандартен документ модел за интервенции InterventionCardsAndInterventionLines=Interventions and lines of interventions -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +InterventionClassifyBilled=Класифицирай като "Таксувани" +InterventionClassifyUnBilled=Класифицирай като "Нетаксувани" StatusInterInvoiced=Таксува RelatedInterventions=Подобни интервенции ShowIntervention=Покажи намеса SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Представител проследяване намеса TypeContact_fichinter_internal_INTERVENING=Намеса diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang index 855a4099262..186205e9b8b 100644 --- a/htdocs/langs/bg_BG/mails.lang +++ b/htdocs/langs/bg_BG/mails.lang @@ -115,7 +115,7 @@ SentBy=Изпратено от 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=Все пак можете да ги изпратите онлайн чрез добавяне на параметър MAILING_LIMIT_SENDBYWEB със стойност на максимален брой на имейлите, които искате да изпратите от сесията. За това, отидете на дома - Setup - Други. 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Изчисти списъка ToClearAllRecipientsClickHere=Щракнете тук, за да изчистите списъка на получателите за този електронната поща ToAddRecipientsChooseHere=Добавяне на получатели, като изберете от списъците @@ -133,6 +133,9 @@ Notifications=Известия NoNotificationsWillBeSent=Не са планирани за това събитие и компания известия по имейл ANotificationsWillBeSent=1 уведомление ще бъде изпратено по имейл SomeNotificationsWillBeSent=%s уведомления ще бъдат изпратени по имейл -AddNewNotification=Активиране на ново искане за уведомяване имейл -ListOfActiveNotifications=Списък на всички активни заявки за уведомяване имейл +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Списък на всички имейли, изпратени уведомления +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang index 24d3d638aca..29482f0c53e 100644 --- a/htdocs/langs/bg_BG/main.lang +++ b/htdocs/langs/bg_BG/main.lang @@ -34,7 +34,7 @@ ErrorFailedToOpenFile=Файла %s не може да се отвори ErrorCanNotCreateDir=Не може да се създаде папка %s ErrorCanNotReadDir=Не може да се прочете директорията %s ErrorConstantNotDefined=Параметъра %s не е дефиниран -ErrorUnknown=Unknown error +ErrorUnknown=Непозната грешка ErrorSQL=SQL грешка ErrorLogoFileNotFound=Файла '%s' с логото не е открит ErrorGoToGlobalSetup=Отидете на настройките 'Фирма/Организация' за да настроите параметъра @@ -55,15 +55,15 @@ ErrorDuplicateField=Дублирана стойност в поле с уник ErrorSomeErrorWereFoundRollbackIsDone=Някои бяха открити грешки. Ние намаление на цените промени. ErrorConfigParameterNotDefined=Параметъра %s не е дефиниран в конфигурационния файл на Dolibarr conf.php. ErrorCantLoadUserFromDolibarrDatabase=Не можа да се намери потребител %s в базата данни на Dolibarr. -ErrorNoVATRateDefinedForSellerCountry=Грешка, без ДДС ставки, определени за "%s" страна. +ErrorNoVATRateDefinedForSellerCountry=Грешка, няма дефинирани ДДС ставки, за държавата '%s'. ErrorNoSocialContributionForSellerCountry=Грешка, не е социален тип участие, определено за "%s" страна. ErrorFailedToSaveFile=Грешка, файла не е записан. -ErrorOnlyPngJpgSupported=Грешка, поддържат се само PNG и JPG формати на изображението. -ErrorImageFormatNotSupported=Вашият PHP не поддържа функции за конвертиране на изображения от този формат. SetDate=Set date SelectDate=Select a date SeeAlso=Вижте също %s BackgroundColorByDefault=Подразбиращ се цвят на фона +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=Файлът е избран за прикачане, но все още не е качен. Кликнете върху "Прикачи файл". NbOfEntries=Брой на записите GoToWikiHelpPage=Прочетете онлайн помощта (Нуждаете се от достъп до интернет) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=Минута Rate=Процент UseLocalTax=с данък Bytes=Байта @@ -340,6 +341,7 @@ FullList=Пълен списък Statistics=Статистика OtherStatistics=Други статистически данни Status=Състояние +Favorite=Favorite ShortInfo=Инфо. Ref=Реф. RefSupplier=Реф. снабдител @@ -365,6 +367,7 @@ ActionsOnCompany=Събития за тази трета страна ActionsOnMember=Събития за този член NActions=%s събития NActionsLate=%s със забавено плащане +RequestAlreadyDone=Request already recorded Filter=Филтър RemoveFilter=Премахване на филтъра ChartGenerated=Графиката е генерирана @@ -645,6 +648,7 @@ OptionalFieldsSetup=Допълнителни атрибути за настро URLPhoto=URL на снимка/лого SetLinkToThirdParty=Връзка към друга трета страна CreateDraft=Създаване на проект +SetToDraft=Back to draft ClickToEdit=Кликнете, за да редактирате ObjectDeleted=Обекта %s е изтрит ByCountry=По държава @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Изберете елемент и натиснете Презареждане # Week day Monday=Понеделник Tuesday=Вторник diff --git a/htdocs/langs/bg_BG/margins.lang b/htdocs/langs/bg_BG/margins.lang index 982506dd363..8687a982af2 100644 --- a/htdocs/langs/bg_BG/margins.lang +++ b/htdocs/langs/bg_BG/margins.lang @@ -38,4 +38,7 @@ BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/bg_BG/orders.lang index 4078b1f6a97..cf43524bd3d 100644 --- a/htdocs/langs/bg_BG/orders.lang +++ b/htdocs/langs/bg_BG/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Пратка съществува DraftOrWaitingApproved=Проект или одобрен, все още не е осъден DraftOrWaitingShipped=Проект или потвърдено все още не са изпратени MenuOrdersToBill=Доставени поръчки -MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Търсене за SearchACustomerOrder=Search a customer order ShipProduct=Кораб продукт @@ -65,7 +65,7 @@ ValidateOrder=Валидиране за UnvalidateOrder=Unvalidate за DeleteOrder=Изтрий заявка CancelOrder=Отказ за -AddOrder=Добави за +AddOrder=Create order AddToMyOrders=Добави към моите заповеди AddToOtherOrders=Добави към други поръчки AddToDraftOrders=Add to draft order @@ -154,7 +154,6 @@ OrderByPhone=Телефон CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=No orders billable CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -MenuOrdersToBill2=Orders to bill OrderCreation=Order creation Ordered=Ordered OrderCreated=Your orders have been created diff --git a/htdocs/langs/bg_BG/oscommerce.lang b/htdocs/langs/bg_BG/oscommerce.lang deleted file mode 100644 index f586190d21b..00000000000 --- a/htdocs/langs/bg_BG/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce модул за настройка -OSCommerceSetupSaved=OS Commerce настройка спаси -OSCommerceServer=OS Commerce хост сървъра / IP -OSCommerceDatabaseName=OS Commerce името на базата данни -OSCommercePrefix=OS Commerce таблици префикс -OSCommerceUser=OS Commerce база данни за вход diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang index fc0d4504cd0..0e650cb6d81 100644 --- a/htdocs/langs/bg_BG/other.lang +++ b/htdocs/langs/bg_BG/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Код за сигурност Calendar=Календар -AddTrip=Добави пътуване Tools=Инструменти ToolsDesc=Тази област е посветена на група разни инструменти, достъпни в други вписвания в менюто.

    Тези инструменти могат да бъдат достигнати от менюто на страната. Birthday=Рожден ден @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Брой на прикачените файлове/документи TotalSizeOfAttachedFiles=Общ размер на прикачените файлове/документи MaxSize=Максимален размер @@ -80,6 +80,16 @@ ModifiedBy=Променено от %s ValidatedBy=Потвърдено от %s CanceledBy=Анулирано от %s ClosedBy=Затворен от %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Файла %s беше премахнат DirWasRemoved=Директорията %s беше премахната FeatureNotYetAvailableShort=Предлага се в следващата версия @@ -193,25 +203,26 @@ ForgetIfNothing=Ако не сте заявили промяната, прост ##### Calendar common ##### AddCalendarEntry=Добави запис в календара %s -NewCompanyToDolibarr=Фирмата %s е добавена в Dolibarr -ContractValidatedInDolibarr=Поръчки %s заверени в Dolibarr -ContractCanceledInDolibarr=Поръчки %s анулирани през Dolibarr -ContractClosedInDolibarr=Поръчки %s затворен в Dolibarr -PropalClosedSignedInDolibarr=Предложение %s подписан в Dolibarr -PropalClosedRefusedInDolibarr=Предложение %s отказва Dolibarr -PropalValidatedInDolibarr=Предложение %s заверени в Dolibarr -InvoiceValidatedInDolibarr=Фактура %s заверени в Dolibarr -InvoicePaidInDolibarr=Фактура променени %s на платен в Dolibarr -InvoiceCanceledInDolibarr=Фактура %s, анулирани през Dolibarr -PaymentDoneInDolibarr=Плащане %s направено в Dolibarr -CustomerPaymentDoneInDolibarr=Клиентско плащане %s направено в Dolibarr -SupplierPaymentDoneInDolibarr=Доставчик на платежни %s направи в Dolibarr -MemberValidatedInDolibarr=Държавите-%s, заверени в Dolibarr -MemberResiliatedInDolibarr=%s изключени членове в Dolibarr -MemberDeletedInDolibarr=Държавите-%s изтрит от Dolibarr -MemberSubscriptionAddedInDolibarr=Абонамент за държавите %s добави Dolibarr -ShipmentValidatedInDolibarr=Превоз %s валидирани в Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Износ ExportsArea=Износът площ diff --git a/htdocs/langs/bg_BG/paybox.lang b/htdocs/langs/bg_BG/paybox.lang index a1f339d5baa..b7dcd3ee0cc 100644 --- a/htdocs/langs/bg_BG/paybox.lang +++ b/htdocs/langs/bg_BG/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Съобщение за анулиране страница плаща NewPayboxPaymentReceived=New Paybox payment received NewPayboxPaymentFailed=New Paybox payment tried but failed PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID 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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/bg_BG/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang index be5354d1310..9f5a8b85470 100644 --- a/htdocs/langs/bg_BG/sendings.lang +++ b/htdocs/langs/bg_BG/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=За момента се извършва от RelatedShippings=Свързани shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Улов от клиента @@ -74,5 +76,5 @@ SumOfProductVolumes=Sum of product volumes SumOfProductWeights=Sum of product weights # warehouse details -DetailWarehouseNumber= Warehouse details -DetailWarehouseFormat= W:%s (Qty : %d) +DetailWarehouseNumber= Склад детайли +DetailWarehouseFormat= Тегло:%s (Количество : %d) diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang index 32f94bc24ee..8c7a397a104 100644 --- a/htdocs/langs/bg_BG/stocks.lang +++ b/htdocs/langs/bg_BG/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Изисква се етикет на склада CorrectStock=Промяна на наличност ListOfWarehouses=Списък на складовете ListOfStockMovements=Списък на движението на стоковите наличности -StocksArea=Наличности +StocksArea=Warehouses area Location=Място LocationSummary=Кратко наименование на място NumberOfDifferentProducts=Брой различни продукти diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang index 7b314b4b01d..cd53dfb8c2c 100644 --- a/htdocs/langs/bg_BG/users.lang +++ b/htdocs/langs/bg_BG/users.lang @@ -63,7 +63,6 @@ ShowGroup=Показване на групата ShowUser=Покажи потребителя NonAffectedUsers=За засегнатите потребители UserModified=Потребителя е променен успешно -GroupModified=Групата е променена успешно PhotoFile=Снимка UserWithDolibarrAccess=Потребител с Dolibarr достъп ListOfUsersInGroup=Списък на потребителите в групата @@ -103,7 +102,7 @@ UserDisabled=Потребителя %s е забранен UserEnabled=Потребителя %s е активиран UserDeleted=Потребителя %s е премахнат NewGroupCreated=Групата %s е създадена -GroupModified=Групата е променена успешно +GroupModified=Group %s modified GroupDeleted=Групата %s е премахната ConfirmCreateContact=Сигурни ли сте, че желаете да създадете Dolibarr акаунт за този контакт ? ConfirmCreateLogin=Сигурни ли сте, че желаете да създадете Dolibarr акаунт за този член ? @@ -114,8 +113,10 @@ YourRole=Вашите роли YourQuotaOfUsersIsReached=Вашата квота за активни потребители е достигната! NbOfUsers=Брой потребители DontDowngradeSuperAdmin=Само истинска черна нинджа може да убие друга черна нинджа -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Йерархичен изглед UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang index 703e5483714..cb289ea4725 100644 --- a/htdocs/langs/bg_BG/withdrawals.lang +++ b/htdocs/langs/bg_BG/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Получаване LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Изтеглените фактури WithdrawalsLines=Отнемане линии -RequestStandingOrderToTreat=Искане за постоянни нареждания за лечение -RequestStandingOrderTreated=Искане за нареждания за периодични преводи третират +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Клиентски поръчки постоянни CustomerStandingOrder=Заявка на клиента състояние NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Метод Предаване Send=Изпращам Lines=Линии StandingOrderReject=Издаде отхвърли -InvoiceRefused=Фактура отказа WithdrawalRefused=Оттегляне Отказ WithdrawalRefusedConfirm=Сигурен ли сте, че искате да въведете изтегляне отказ за обществото RefusedData=Дата на отхвърляне RefusedReason=Причина за отхвърляне RefusedInvoicing=Фактуриране отхвърлянето NoInvoiceRefused=Не зареждайте отхвърляне -InvoiceRefused=Фактура отказа +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Статус StatusUnknown=Неизвестен StatusWaiting=Чакане @@ -76,13 +76,14 @@ WithBankUsingRIB=За банкови сметки с помощта на RIB WithBankUsingBANBIC=За банкови сметки с IBAN / BIC / SWIFT BankToReceiveWithdraw=Банкова сметка за получаване оттегли CreditDate=Кредит за -WithdrawalFileNotCapable=Не може да се генерира файл за изтегляне разписка за вашата страна +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 8cab9d2b651..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 @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang index baf85be7ab3..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 @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Stock management (products) Module53Name=Services Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +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 -Module400Desc=Project management inside other modules +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow - Tok rada Module6000Desc=Upravljanje workflow-om - tokom rada -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=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 @@ -606,15 +613,16 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -701,8 +709,8 @@ Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Read stock movements Permission1005=Create/modify stock movements Permission1101=Read delivery orders @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatska detekcija nije moguća YouUseBestDriver=Možete koristiti driver %s koji je trenutno najbolji. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=Imate samo %s proizvoda/usluga u bazu podataka. To ne zahtijeva posebne optimizacije. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=Notifikacije E-mailovima omogućavaju vam da pošaljete automatski mail, za neke Dolibarr događaje, trećim strankama (kupci ili dobavljači) koji su prethodno konfigurirani. Izbor aktivnih notifikacija i viljanih kontakata se radi posebno za svaku treću stranku. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Vodeni žig na nacrte naloga (ništa, ako je prazno) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Vodeni žig na nacrte kartica za intervencije (ništa, ako je prazno) ##### Contracts ##### -ContractsSetup=Contracts module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Modeli za dokumente ugovora FreeLegalTextOnContracts=Slobodni tekst na ugovorima @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Fajlovi tipa %s nisu kompresovani od strane HTTP server CacheByServer=Keširanje na serveru CacheByClient=Keširanje u browser-u CompressionOfResources=Kompresija HTTP odgovora -TestNotPossibleWithCurrentBrowsers=Automatska detekcija nije moguća +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Products module setup ServiceSetup=Services module setup @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang index 131f21d749c..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 @@ -41,9 +42,10 @@ AutoActions= Automatsko popunjavanje AgendaAutoActionDesc= Ovdje definirajte događaje za koje želite da Dolibarr automatski kreira događaj u agendi. Ukoliko se ništa ne provjerava (po defaultu), samo manualne akcije će biti uključeni u dnevni red. AgendaSetupOtherDesc= Ova stranica pruža mogućnosti izvoza svojih Dolibarr događaja u eksterni kalendar (Thunderbird, Google Calendar, ...) AgendaExtSitesDesc=Ova stranica omogućava definisanje eksternih izvora kalendara da vidite svoje događaje u Dolibarr agendi. -ActionsEvents= Događaji za koje će Dolibarr stvoriti akciju u dnevni red automatski -PropalValidatedInDolibarr= Prijedlog %s potvrđen -InvoiceValidatedInDolibarr= Faktura %s potvrđena +ActionsEvents=Događaji za koje će Dolibarr stvoriti akciju u dnevni red automatski +PropalValidatedInDolibarr=Prijedlog %s potvrđen +InvoiceValidatedInDolibarr=Faktura %s potvrđena +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Faktura %s vraćena u status izrade InvoiceDeleteDolibarr=Faktura %s obrisana OrderValidatedInDolibarr= Narudžba %s potvrđena @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Narudžba %s odobrena OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=NArudžbu %s vratiti u status izrade OrderCanceledInDolibarr=Narudžba %s otkazana -InterventionValidatedInDolibarr=Intervencija %s potvrđena ProposalSentByEMail=Poslovni prijedlog %s poslan putem e-maila OrderSentByEMail=Narudžba za kupca %s poslana putem e-maila InvoiceSentByEMail=Fakture za kupca %s poslana putem e-maila @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Narudžba za dobavljača %s poslan putem e-maila SupplierInvoiceSentByEMail=Predračun dobavljača %s poslan putem e-maila ShippingSentByEMail=Dostava %s poslana putem e-maila ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervencija %s poslana putem e-maila -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Trća stranka kreirana DateActionPlannedStart= Planirani datum početka DateActionPlannedEnd= Planirani datum završetka @@ -70,9 +69,9 @@ DateActionStart= Datum početka DateActionEnd= Datum završetka AgendaUrlOptions1=Također možete dodati sljedeće parametre za filtriranje prikazanog: AgendaUrlOptions2=login =%s ​​da se ograniči prikaz na akcije kreiranje, dodiljene ili završene od strane korisnika %s. -AgendaUrlOptions3=logina=%s ​​da se ograniči prikaz na akcije kreirane od strane korisnika %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s ​​da se ograniči prikaz na akcije dodijeljene korisniku %s. -AgendaUrlOptions5=logind=%s ​​da se ograniči prikaz na akcije završene os strane korisnika %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Prikaži rođendane kontakata AgendaHideBirthdayEvents=Sakrij rođendane kontakata Busy=Zauzet @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL za pristup .ical fajla ExtSiteNoLabel=Nema opisa WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang index 4891062bdc8..c61f13b157f 100644 --- a/htdocs/langs/bs_BA/bills.lang +++ b/htdocs/langs/bs_BA/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit note InvoiceAvoirAsk=Credit note to correct invoice InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Zamijeni fakturu %s ReplacementInvoice=Zamjenska faktura ReplacedByInvoice=Zamijenjeno sa fakturom %s @@ -87,7 +87,7 @@ ClassifyCanceled=Označi kao 'Otkazano' ClassifyClosed=Označi kao 'Zaključeno' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Kreiraj predračun -AddBill=Add invoice or credit note +AddBill=Create invoice or credit note AddToDraftInvoices=Dodaj na uzorak fakture DeleteBill=Obriši fakturu SearchACustomerInvoice=Traži fakturu kupca @@ -99,7 +99,7 @@ DoPaymentBack=Izvrši povrat uplate ConvertToReduc=Pretvori u budući popust EnterPaymentReceivedFromCustomer=Unesi uplate primljene od kupca EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Onemogućeno, jer je ostatak za plaćanje nula +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Iznos PriceBase=Price base BillStatus=Status fakture @@ -137,8 +137,6 @@ BillFrom=Od BillTo=Račun za ActionsOnBill=Aktivnosti na fakturi NewBill=Nova faktura -Prélèvements=Trajni nalog -Prélèvements=Trajni nalog LastBills=Zadnjih %s faktura LastCustomersBills=Zadnjih %s faktura kupca LastSuppliersBills=Zadnjih %s faktura dobavljača @@ -156,9 +154,9 @@ ConfirmCancelBill=Jeste li sigurni da želite otkazati fakturu %s ? ConfirmCancelBillQuestion=Zašto želite da se ova faktura označi kao 'otkazano'? ConfirmClassifyPaidPartially=Jeste li sigurni da želite promijeniti fakturu %s na status plaćeno? ConfirmClassifyPaidPartiallyQuestion=Ova faktura nije u potpunosti plaćena. Koji su razlozi za zatvaranje fakture? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +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=Loš kupac ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvodi djelomično vraćeni ConfirmClassifyPaidPartiallyReasonOther=Iznos otkazan zbog drugog razloga @@ -191,9 +189,9 @@ AlreadyPaid=Već plaćeno AlreadyPaidBack=Već izvršen povrat uplate AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Otkazano -RemainderToPay=Ostatak za platiti -RemainderToTake=Ostatak za uzeti -RemainderToPayBack=Ostatak za povrat uplate +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Čekanje AmountExpected=Iznos za potraživati ExcessReceived=Višak primljen @@ -219,19 +217,18 @@ NoInvoice=Nema fakture ClassifyBill=Označi fakturu SupplierBillsToPay=Fakture dobavljača za platiti CustomerBillsUnpaid=NEplaćene fakture kupaca -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Nepovratno SetConditions=Postaviti uslova plaćanja SetMode=Postaviti način plaćanja Billed=Fakturisano -RepeatableInvoice=Predefinisana faktura -RepeatableInvoices=Predefinisane fakture -Repeatable=Predefinisano -Repeatables=Predefinisano -ChangeIntoRepeatableInvoice=Pretvori u predefinisano -CreateRepeatableInvoice=Kreiraj predefinisanu fakturu -CreateFromRepeatableInvoice=Kreiraj na osnovu predefinisane fakture +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Fakture kupaca i tekstovi faktura CustomersInvoicesAndPayments=Faktura kupaca i uplate ExportDataset_invoice_1=Lista faktura kupaca i tekstovi faktura diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang index 85e1c9cdccb..76e3aeecdc3 100644 --- a/htdocs/langs/bs_BA/categories.lang +++ b/htdocs/langs/bs_BA/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Veze između dobavljača i kategorija CatCusLinks=Links between customers/prospects and categories CatProdLinks=Veze između proizvoda/usluga i kategorija CatMemberLinks=Veze između članova i kategorija -CatProdLinks=Veze između proizvoda/usluga i kategorija -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Veze između dobavljača i kategorija DeleteFromCat=Ukloni iz kategorije DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang index 9f17662db0c..3cb7124de3a 100644 --- a/htdocs/langs/bs_BA/compta.lang +++ b/htdocs/langs/bs_BA/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 873955f9707..4952376c86c 100644 --- a/htdocs/langs/bs_BA/contracts.lang +++ b/htdocs/langs/bs_BA/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Područje za ugovore ListOfContracts=Lista ugovora -LastContracts=Zadnji %s izmijenjeni ugovori +LastModifiedContracts=Last %s modified contracts AllContracts=Svi ugovori ContractCard=Kartica ugovora ContractStatus=Status ugovora @@ -27,7 +27,7 @@ MenuRunningServices=Aktivne usluge MenuExpiredServices=Istekle usluge MenuClosedServices=Završene usluge NewContract=Novi ugovor -AddContract=Dodaj ugovor +AddContract=Create contract SearchAContract=Traži kontakt DeleteAContract=Obrisati ugovor CloseAContract=Zatvori ugovor @@ -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=Zadnji %s izmijenjeni ugovori +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/cron.lang b/htdocs/langs/bs_BA/cron.lang index a54ee84a1ba..95d35389d87 100644 --- a/htdocs/langs/bs_BA/cron.lang +++ b/htdocs/langs/bs_BA/cron.lang @@ -1,10 +1,8 @@ # Dolibarr language file - Source file is en_US - cron -# # About page About = O programu CronAbout = O Cron-u CronAboutPage = Stranica o Cron-u - # Right Permission23101 = Pročitaj redovne zadatke Permission23102 = Kreiraj/Ažuriraj redovni zadatak @@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes # Menu CronJobs=Scheduled jobs -CronListActive= Lista aktivnih poslova -CronListInactive= Lista onemogućenih poslova -CronListActive= Lista aktivnih poslova +CronListActive=List of active/scheduled jobs +CronListInactive=Lista onemogućenih poslova # Page list CronDateLastRun=Zadnje pokretanje CronLastOutput=Izvještaj o zadnjem pokretanju diff --git a/htdocs/langs/bs_BA/donations.lang b/htdocs/langs/bs_BA/donations.lang index 6700369f388..53b847f7c5a 100644 --- a/htdocs/langs/bs_BA/donations.lang +++ b/htdocs/langs/bs_BA/donations.lang @@ -4,7 +4,7 @@ Donations=Donacije DonationRef=Donacija ref. Donor=Donator Donors=Donatori -AddDonation=Dodaj donaciju +AddDonation=Create a donation NewDonation=Nova donacija ShowDonation=Prikaži donaciju DonationPromise=Obećanje za poklon @@ -31,3 +31,8 @@ DonationRecipient=Primalac donacije ThankYou=Hvala Vam IConfirmDonationReception=Primalac potvrđuje prijem, kao donacija, slijedeći iznos MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/bs_BA/externalsite.lang index 82cc682a42d..70845e9ccba 100644 --- a/htdocs/langs/bs_BA/externalsite.lang +++ b/htdocs/langs/bs_BA/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Podesi link za eksterni web sajt ExternalSiteURL=Link do eksternog web sajta ExternalSiteModuleNotComplete=Modul ExternalSite nije konfigurisan kako treba. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang index ab2993195de..23d4c100a2f 100644 --- a/htdocs/langs/bs_BA/holiday.lang +++ b/htdocs/langs/bs_BA/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Ažuriranje CantUpdate=You cannot update this leave request. NoDateDebut=Morate odabrati datum početka. NoDateFin=Morate odabrati datum završetka. -ErrorDureeCP=Vaš zahtjev za godišnji odmor ne sadrži radni dan. -TitleValidCP=Odobri zahtjev za godišnji odmor +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Datum odobrenja TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Odbiti zahtjev za godišnji odmor +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Morate odabrati razlog za odbijanje zahtjeva. -TitleCancelCP=Poništi zahtjev za godišnji odmor +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Razlog za odbijanje DateRefusCP=Datum odbijanja @@ -78,7 +77,7 @@ ActionByCP=Izvršeno od strane UserUpdateCP=Za korisnika PrevSoldeCP=Prethodno stanje NewSoldeCP=Novo stanje -alreadyCPexist=Zahtjev za godišnji odmor je vec završen za ovaj period. +alreadyCPexist=A leave request has already been done on this period. UserName=Naziv Employee=Zaposlenik FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Ručno ažuriranje HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Konfiguracija modula za godišnje odmore +ConfCP=Configuration of leave request module DescOptionCP=Opis opcije ValueOptionCP=Vrijednost -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Potvrdite konfiguraciju -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Uspješno ažuriranje. ErrorUpdateConfCP=Došlo je do greške prilikom ažuriranja, molimo pokušajte ponovo. -AddCPforUsers=Molimo dodajte stanje godišnjih odmora za korisnika klikom ovdje. -DelayForSubmitCP=Rok za prijavu za godišnji odmor -AlertapprobatortorDelayCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da se ne poklapa sa rokovima +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Potvrdi UpdateEventCP=Ažuriraj događaje diff --git a/htdocs/langs/bs_BA/interventions.lang b/htdocs/langs/bs_BA/interventions.lang index 06f4edc8354..5f340d0b6c4 100644 --- a/htdocs/langs/bs_BA/interventions.lang +++ b/htdocs/langs/bs_BA/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervencija Interventions=Intervencije InterventionCard=Kartica intervencija NewIntervention=Nova intervencija -AddIntervention=Dodaj intervenciju +AddIntervention=Create intervention ListOfInterventions=Lista intervencija EditIntervention=Izimijeni intervenciju ActionsOnFicheInter=Akcije na intervencijama @@ -30,6 +30,15 @@ StatusInterInvoiced=Fakturisano RelatedInterventions=Povezane intervencije ShowIntervention=Prikaži intervenciju SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Predstavnik koji kontroliše intervenciju TypeContact_fichinter_internal_INTERVENING=Serviser diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang index 138d6b88d39..6ce54e5dbd9 100644 --- a/htdocs/langs/bs_BA/mails.lang +++ b/htdocs/langs/bs_BA/mails.lang @@ -115,7 +115,7 @@ SentBy=Poslano od MailingNeedCommand=Iz sigurnosnih razloga, slanje e-pošte je bolje kada se vrši sa komandne lnije. Ako imate pristup, pitajte vašeg server administratora da pokrene slijedeću liniju za slanje e-pošte svim primaocima: MailingNeedCommand2=Možete ih poslati online dodavanjem parametra MAILING_LIMIT_SENDBYWEB sa vrijednosti za maksimalni broj e-mailova koje želite poslati po sesiji. Za ovo idite na Početna - Postavke - Ostalo ConfirmSendingEmailing=Ako ne možete ili preferirate slanje preko www pretraživača, molim potvrdite da ste sigurni da želite poslati e-poštu sa vašeg pretraživača? -LimitSendingEmailing=Napomena: Slanje e-pošte preko interneta je ograničeno iz sigurnosnih razloga i timeout razloga primaocima %s od strane sesije za slanje. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Očisti listu ToClearAllRecipientsClickHere=Klikni ovdje da očistite listu primaoca za ovu e-poštu ToAddRecipientsChooseHere=Odaberi primaoce biranjem sa liste @@ -133,6 +133,9 @@ Notifications=Notifikacije NoNotificationsWillBeSent=Nema planiranih email notifikacija za ovaj događaj i kompaniju ANotificationsWillBeSent=1 notifikacija će biti poslana emailom SomeNotificationsWillBeSent=%s notifikacija će biti poslane emailom -AddNewNotification=Aktivirati novi zahtjev za notifikacije o slanje emaila -ListOfActiveNotifications=Lista svih aktivnih zahtjeva za notifikacije slanja emaila +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Lista svih notifikacija o slanju emaila +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang index 180cc0a7e78..6d3fa6abd67 100644 --- a/htdocs/langs/bs_BA/main.lang +++ b/htdocs/langs/bs_BA/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries GoToWikiHelpPage=Read online help (need Internet access) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier @@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events NActionsLate=%s late +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Remove filter ChartGenerated=Chart generated @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToThirdParty=Link to another third party CreateDraft=Create draft +SetToDraft=Back to draft ClickToEdit=Click to edit ObjectDeleted=Object %s deleted ByCountry=By country @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/bs_BA/margins.lang b/htdocs/langs/bs_BA/margins.lang index e8d5fed1af9..606d5e5053a 100644 --- a/htdocs/langs/bs_BA/margins.lang +++ b/htdocs/langs/bs_BA/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=Product or Service AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=Start date EndDate=End date Launch=Start - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/bs_BA/orders.lang index 42444f0ec1c..6ee9c19fa95 100644 --- a/htdocs/langs/bs_BA/orders.lang +++ b/htdocs/langs/bs_BA/orders.lang @@ -1,168 +1,162 @@ # Dolibarr language file - Source file is en_US - orders -# OrdersArea=Customers orders area -# SuppliersOrdersArea=Suppliers orders area -# OrderCard=Order card -# OrderId=Order Id -# Order=Order -# Orders=Orders -# OrderLine=Order line -# OrderFollow=Follow up -# OrderDate=Order date -# OrderToProcess=Order to process -# NewOrder=New order -# ToOrder=Make order -# MakeOrder=Make order -# SupplierOrder=Supplier order -# SuppliersOrders=Suppliers orders -# SuppliersOrdersRunning=Current suppliers orders -# CustomerOrder=Customer order -# CustomersOrders=Customer's orders -# CustomersOrdersRunning=Current customer's orders -# CustomersOrdersAndOrdersLines=Customer orders and order's lines -# OrdersToValid=Customer's orders to validate -# OrdersToBill=Customer's orders delivered -# OrdersInProcess=Customer's orders in process -# OrdersToProcess=Customer's orders to process -# SuppliersOrdersToProcess=Supplier's orders to process -# StatusOrderCanceledShort=Canceled -# StatusOrderDraftShort=Draft -# StatusOrderValidatedShort=Validated -# StatusOrderSentShort=In process -# StatusOrderSent=Shipment in process -# StatusOrderOnProcessShort=Reception -# StatusOrderProcessedShort=Processed -# StatusOrderToBillShort=Delivered -# StatusOrderToBill2Short=To bill -# StatusOrderApprovedShort=Approved -# StatusOrderRefusedShort=Refused -# StatusOrderToProcessShort=To process -# StatusOrderReceivedPartiallyShort=Partially received -# StatusOrderReceivedAllShort=Everything received -# StatusOrderCanceled=Canceled -# StatusOrderDraft=Draft (needs to be validated) -# StatusOrderValidated=Validated -# StatusOrderOnProcess=Waiting to receive -# StatusOrderProcessed=Processed -# StatusOrderToBill=Delivered -# StatusOrderToBill2=To bill -# StatusOrderApproved=Approved -# StatusOrderRefused=Refused -# StatusOrderReceivedPartially=Partially received -# StatusOrderReceivedAll=Everything received -# ShippingExist=A shipment exists -# DraftOrWaitingApproved=Draft or approved not yet ordered -# DraftOrWaitingShipped=Draft or validated not yet shipped -# MenuOrdersToBill=Orders delivered -# MenuOrdersToBill2=Orders to bill -# SearchOrder=Search order -# SearchACustomerOrder=Search a customer order -# ShipProduct=Ship product -# Discount=Discount -# CreateOrder=Create Order -# RefuseOrder=Refuse order -# ApproveOrder=Accept order -# ValidateOrder=Validate order -# UnvalidateOrder=Unvalidate order -# DeleteOrder=Delete order -# CancelOrder=Cancel order -# AddOrder=Add order -# AddToMyOrders=Add to my orders -# AddToOtherOrders=Add to other orders -# AddToDraftOrders=Add to draft order -# ShowOrder=Show order -# NoOpenedOrders=No opened orders -# NoOtherOpenedOrders=No other opened orders -# NoDraftOrders=No draft orders -# OtherOrders=Other orders -# LastOrders=Last %s orders -# LastModifiedOrders=Last %s modified orders -# LastClosedOrders=Last %s closed orders -# AllOrders=All orders -# NbOfOrders=Number of orders -# OrdersStatistics=Order's statistics -# OrdersStatisticsSuppliers=Supplier order's statistics -# NumberOfOrdersByMonth=Number of orders by month -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) -# ListOfOrders=List of orders -# CloseOrder=Close order -# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. -# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. -# ConfirmDeleteOrder=Are you sure you want to delete this order ? -# ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? -# ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? -# ConfirmCancelOrder=Are you sure you want to cancel this order ? -# ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? -# GenerateBill=Generate invoice -# ClassifyShipped=Classify delivered -# ClassifyBilled=Classify billed -# ComptaCard=Accountancy card -# DraftOrders=Draft orders -# RelatedOrders=Related orders -# OnProcessOrders=In process orders -# RefOrder=Ref. order -# RefCustomerOrder=Ref. customer order -# CustomerOrder=Customer order -# RefCustomerOrderShort=Ref. cust. order -# SendOrderByMail=Send order by mail -# ActionsOnOrder=Events on order -# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order -# OrderMode=Order method -# AuthorRequest=Request author -# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address -# RunningOrders=Orders on process -# UserWithApproveOrderGrant=Users granted with "approve orders" permission. -# PaymentOrderRef=Payment of order %s -# CloneOrder=Clone order -# ConfirmCloneOrder=Are you sure you want to clone this order %s ? -# DispatchSupplierOrder=Receiving supplier order %s +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id +Order=Order +Orders=Orders +OrderLine=Order line +OrderFollow=Follow up +OrderDate=Order date +OrderToProcess=Order to process +NewOrder=New order +ToOrder=Make order +MakeOrder=Make order +SupplierOrder=Supplier order +SuppliersOrders=Suppliers orders +SuppliersOrdersRunning=Current suppliers orders +CustomerOrder=Customer order +CustomersOrders=Customer's orders +CustomersOrdersRunning=Current customer's orders +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customer's orders to validate +OrdersToBill=Customer's orders delivered +OrdersInProcess=Customer's orders in process +OrdersToProcess=Customer's orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderSentShort=In process +StatusOrderSent=Shipment in process +StatusOrderOnProcessShort=Reception +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=Delivered +StatusOrderToBill2Short=To bill +StatusOrderApprovedShort=Approved +StatusOrderRefusedShort=Refused +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received +StatusOrderCanceled=Canceled +StatusOrderDraft=Draft (needs to be validated) +StatusOrderValidated=Validated +StatusOrderOnProcess=Waiting to receive +StatusOrderProcessed=Processed +StatusOrderToBill=Delivered +StatusOrderToBill2=To bill +StatusOrderApproved=Approved +StatusOrderRefused=Refused +StatusOrderReceivedPartially=Partially received +StatusOrderReceivedAll=Everything received +ShippingExist=A shipment exists +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders +SearchOrder=Search order +SearchACustomerOrder=Search a customer order +ShipProduct=Ship product +Discount=Discount +CreateOrder=Create Order +RefuseOrder=Refuse order +ApproveOrder=Accept order +ValidateOrder=Validate order +UnvalidateOrder=Unvalidate order +DeleteOrder=Delete order +CancelOrder=Cancel order +AddOrder=Create order +AddToMyOrders=Add to my orders +AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order +ShowOrder=Show order +NoOpenedOrders=No opened orders +NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders +AllOrders=All orders +NbOfOrders=Number of orders +OrdersStatistics=Order's statistics +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +ListOfOrders=List of orders +CloseOrder=Close order +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +GenerateBill=Generate invoice +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s ##### Types de contacts ##### -# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order -# TypeContact_commande_internal_SHIPPING=Representative following-up shipping -# TypeContact_commande_external_BILLING=Customer invoice contact -# TypeContact_commande_external_SHIPPING=Customer shipping contact -# TypeContact_commande_external_CUSTOMER=Customer contact following-up order -# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order -# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping -# TypeContact_order_supplier_external_BILLING=Supplier invoice contact -# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact -# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order - -# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined -# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined -# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' -# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' -# Error_OrderNotChecked=No orders to invoice selected - +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected # Sources -# OrderSource0=Commercial proposal -# OrderSource1=Internet -# OrderSource2=Mail campaign -# OrderSource3=Phone compaign -# OrderSource4=Fax campaign -# OrderSource5=Commercial -# OrderSource6=Store -# QtyOrdered=Qty ordered -# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order - +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign +OrderSource5=Commercial +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order # Documents models -# PDFEinsteinDescription=A complete order model (logo...) -# PDFEdisonDescription=A simple order model -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes -# OrderByMail=Mail -# OrderByFax=Fax -# OrderByEMail=EMail -# OrderByWWW=Online -# OrderByPhone=Phone - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/bs_BA/oscommerce.lang b/htdocs/langs/bs_BA/oscommerce.lang deleted file mode 100644 index e7532487d48..00000000000 --- a/htdocs/langs/bs_BA/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce podešavanje modula -OSCommerceSetupSaved=OS Commerce postavke snimljene -OSCommerceServer=OS Commerce server host / IP -OSCommerceDatabaseName=OS Commerce ime baze podataka -OSCommercePrefix=OS Commerce prefiks tabela -OSCommerceUser=OS Commerce login baze podataka diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang index b56ef294495..88991888183 100644 --- a/htdocs/langs/bs_BA/other.lang +++ b/htdocs/langs/bs_BA/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/bs_BA/paybox.lang b/htdocs/langs/bs_BA/paybox.lang index b689bb6cebf..aced32a4944 100644 --- a/htdocs/langs/bs_BA/paybox.lang +++ b/htdocs/langs/bs_BA/paybox.lang @@ -1,37 +1,40 @@ # Dolibarr language file - Source file is en_US - paybox -# PayBoxSetup=PayBox module setup -# PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) -# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects -# PaymentForm=Payment form -# WelcomeOnPaymentPage=Welcome on our online payment service -# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. -# ThisIsInformationOnPayment=This is information on payment to do -# ToComplete=To complete -# YourEMail=Email to receive payment confirmation -# Creditor=Creditor -# PaymentCode=Payment code -# PayBoxDoPayment=Go on payment -# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information -# PleaseBePatient=Please, be patient -# Continue=Next -# ToOfferALinkForOnlinePayment=URL for %s payment -# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order -# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice -# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line -# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount -# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription -# YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. -# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. -# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. -# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. -# AccountParameter=Account parameters -# UsageParameter=Usage parameters -# InformationToFindParameters=Help to find your %s account information -# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment -# VendorName=Name of vendor -# CSSUrlForPaymentForm=CSS style sheet url for payment form -# MessageOK=Message on validated payment return page -# MessageKO=Message on canceled payment return page -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/bs_BA/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang index 9bdc4e0100c..60d641fecdc 100644 --- a/htdocs/langs/bs_BA/sendings.lang +++ b/htdocs/langs/bs_BA/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=U ovom trenutku, nova pošiljka se kreira sa kar RelatedShippings=Povezana otpremanja ShipmentLine=Tekst pošiljke CarrierList=Lista transportera +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang index a5372800bf6..59e621fff2d 100644 --- a/htdocs/langs/bs_BA/stocks.lang +++ b/htdocs/langs/bs_BA/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Naziv za skladište je potreban CorrectStock=Ispravi zalihu ListOfWarehouses=Lista skladišta ListOfStockMovements=Lista kretanja zaliha -StocksArea=Dio za zalihe +StocksArea=Warehouses area Location=Lokacija LocationSummary=Skraćeni naziv lokacije NumberOfDifferentProducts=Broj različitih proizvoda diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang index b2508ca7742..97d04af3c0a 100644 --- a/htdocs/langs/bs_BA/users.lang +++ b/htdocs/langs/bs_BA/users.lang @@ -63,7 +63,6 @@ ShowGroup=Prikaži grupu ShowUser=Prikaži korisnika NonAffectedUsers=Nedodijeljen korisnici UserModified=Korisnik uspješno izmijenjen -GroupModified=Grupa uspješno izmijenjena PhotoFile=Foto fajl UserWithDolibarrAccess=Korisnik sa Dolibarr pristupom ListOfUsersInGroup=Lista korisnika u ovoj grupi @@ -103,7 +102,7 @@ UserDisabled=Korisnik %s isključen UserEnabled=Korisnik %s aktiviran UserDeleted=Korisnik %s uklonjen NewGroupCreated=Grupa %s kreirana -GroupModified=Grupa uspješno izmijenjena +GroupModified=Group %s modified GroupDeleted=Grupa %s uklonjena ConfirmCreateContact=Jeste li sigurni da želite kreirati Dolibarr račun za ovaj kontakt? ConfirmCreateLogin=Jeste li sigurni da želite stvoriti Dolibarr račun za ovog člana? @@ -114,8 +113,10 @@ YourRole=Vaše uloga YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je postignuta! NbOfUsers=Broj korisnika DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina -HierarchicalResponsible=Hijerarhijska odgovornost +HierarchicalResponsible=Supervisor HierarchicView=Hijerarhijski prikaz UseTypeFieldToChange=Koristite polja Tip za promjene OpenIDURL=OpenID URL LoginUsingOpenID=Koristiti OpenID za login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang index d4c8547adfb..e4e4dce6e69 100644 --- a/htdocs/langs/bs_BA/withdrawals.lang +++ b/htdocs/langs/bs_BA/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Priznanica LastWithdrawalReceipts=Posljednjih %s priznanica podizanja WithdrawedBills=Podignute fakture WithdrawalsLines=Tekst podizanja -RequestStandingOrderToTreat=Zahtjev za razmatranje trajnim naloga -RequestStandingOrderTreated=Zahtjev za razmatrene trajne naloge +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Trajnih nalozi kupca CustomerStandingOrder=Trajni nalog kupca NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Poslati Lines=Tekst StandingOrderReject=Issue a rejection -InvoiceRefused=Faktura odbijena WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Jeste li sigurni da želite da unesete odbijenicu povlačenja za društvo RefusedData=Datum odbacivanja RefusedReason=Razlog za odbijanje RefusedInvoicing=Naplate odbijanja NoInvoiceRefused=Ne naplatiti odbijanje -InvoiceRefused=Faktura odbijena +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Nepoznato StatusWaiting=Čekanje @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/ca_ES/accountancy.lang +++ b/htdocs/langs/ca_ES/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index e7a3ca54464..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 @@ -437,14 +440,14 @@ Module52Name=Stocks de productes Module52Desc=Gestió de stocks de productes Module53Name=Serveis Module53Desc=Gestió de serveis -Module54Name=Contractes -Module54Desc=Gestió de contractes +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Codis de barra 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=Projectes -Module400Desc=Gestió dels projectes en els altres mòduls +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Notificacions -Module600Desc=Enviament de notificacions (per correu electrònic) sobre els esdeveniments de treball Dolibarr +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donacions Module700Desc=Gestió de donacions Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-empresa Module5000Desc=Permet gestionar diverses empreses Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Dies lliures -Module20000Desc=Gestió dels dies lliures dels empleats +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 Module50100Desc=Terminal Punt de Venda per a la venda al taulell -Module50200Name= Paypal -Module50200Desc= Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paypal +Module50200Name=Paypal +Module50200Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) 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 @@ -606,15 +613,16 @@ Permission151=Consultar domiciliacions Permission152=Crear/modificar domiciliacions Permission153=Enviar domiciliacions Permission154=Abonar/tornar domiciliacions -Permission161=Consultar contractes de servei -Permission162=Crear/modificar contractes de servei -Permission163=Activar els serveis d'un contracte -Permission164=Desactivar els serveis d'un contracte -Permission165=Eliminar contractes -Permission171=Llegir els desplaçaments -Permission172=Crear/modificar els desplaçaments -Permission173=Eliminar desplaçaments -Permission178=Exportar desplaçaments +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Consultar proveïdors Permission181=Consultar comandes a proveïdors Permission182=Crear/modificar comandes a proveïdors @@ -671,7 +679,7 @@ Permission300=Consultar codis de barra Permission301=Crear/modificar codis de barra Permission302=Eliminar codi de barra Permission311=Consultar serveis -Permission312=Assignar serveis a un contracte +Permission312=Assign service/subscription to contract Permission331=Consultar bookmarks Permission332=Crear/modificar bookmarks Permission333=Eliminar bookmarks @@ -701,8 +709,8 @@ Permission701=Consultar donacions Permission702=Crear/modificar donacions Permission703=Eliminar donacions Permission1001=Consultar stocks -Permission1002=Crear/modificar stocks -Permission1003=Eliminar stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Consultar moviments de stock Permission1005=Crear/modificar moviments de stock Permission1101=Consultar ordres d'enviament @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Sí a l'estiu OnlyFollowingModulesAreOpenedToExternalUsers=Recordeu que només els mòduls següents estan oberts a usuaris externs (siguin quins siguin els permisos dels usuaris): SuhosinSessionEncrypt=Emmagatzematge de sessions xifrades per Suhosin ConditionIsCurrently=Actualment la condició és %s -TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb el navegador actual YouUseBestDriver=Està utilitzant el driver %s, actualment és el millor driver disponible. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=Té %s productes/serveis a la base de dades. No és necessària cap optimització en particular. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Retorna un codi comptable compost de
    %s seguit del ModuleCompanyCodePanicum=Retorna un codi comptable buit. ModuleCompanyCodeDigitaria=Retorna un codi comptable compost seguint el codi de tercer. El codi està format per caràcter 'C' en primera posició seguit dels 5 primers caràcters del codi tercer. UseNotifications=Utilitza notificacions -NotificationsDesc=La funció de les notificacions permet enviar automàticament un correu electrònic per a un determinat esdeveniment Dolibarr en les empreses configurades per a això +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Models de documents DocumentModelOdt=Generació des dels documents amb format OpenDocument (Arxiu .ODT OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Marca d'aigua en els documents esborrany @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Possibilitat de seleccionar una adreça d'enviament UseOptionLineIfNoQuantity=Una línia de producte/servei que té una quantitat nul·la es considera com una opció FreeLegalTextOnProposal=Text lliure en pressupostos WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Configuració del mòdul comandes OrdersNumberingModules=Mòduls de numeració de les comandes @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Validar la comanda després del tancament del pressupost, permet no passar per la comanda provisional FreeLegalTextOnOrders=Text lliure en comandes WatermarkOnDraftOrders=Marca d'aigua en comandes esborrany (en cas d'estar buit) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Configuració del mòdul Click To Dial ClickToDialUrlDesc=Url de trucada fent clic en la icona telèfon. Dans l'url, vous pouvez utiliser les balises
    __PHONETO__ qui sera remplacé par le téléphone de l'appelé
    __PHONEFROM__ qui sera remplacé par le téléphone de l'appelant (le votre)
    __LOGIN__ qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)
    __PASS__ qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Mòduls de numeració de les fitxes d'intervenció TemplatePDFInterventions=Model de documents de les fitxes d'intervenció WatermarkOnDraftInterventionCards=Marca d'aigua en fitxes d'intervenció (en cas d'estar buit) ##### Contracts ##### -ContractsSetup=Configuració del mòdul contractes +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Mòduls de numeració dels contratos TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Fitxers de tipus %s no són comprimits pel servidor HTT CacheByServer=Memòria cau amb el servidor CacheByClient=Memòria cau mitjançant el navegador CompressionOfResources=Compressió de les respostes HTTP -TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb el navegador actual +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Configuració del mòdul Productes ServiceSetup=Configuració del mòdul Serveis @@ -1382,9 +1393,10 @@ MailingSetup=Configuració del mòdul E-Mailing MailingEMailFrom=E-Mail emissor (From) dels correus enviats per E-Mailing MailingEMailError=E-mail de resposta (Errors-to) per a les respostes sobre enviaments per e-mailing amb error. ##### Notification ##### -NotificationSetup=Configuració del mòdul notificacions +NotificationSetup=EMail notification module setup NotificationEMailFrom=E-Mail emissor (From) dels correus enviats a través de notificacions -ListOfAvailableNotifications=Llistat de notificacions disponibles (depèn dels mòduls activats) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Configuració del mòdul Expedicions SendingsReceiptModel=Model de notes de lliurament @@ -1412,8 +1424,9 @@ OSCommerceTestOk=La connexió al servidor '%s' sobre la base '%s' per l'usuari ' OSCommerceTestKo1=La connexió al servidor '%s' sobre la base '%s' per l'usuari '%s' no s'ha pogut fer. OSCommerceTestKo2=La connexió al servidor '%s' per l'usuari '%s' ha fallat. ##### Stock ##### -StockSetup=Configuració del mòdul Stock -UserWarehouse=Utilitzar els stocks personals d'usuaris +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menú eliminat TreeMenu=Estructura dels menús @@ -1478,11 +1491,14 @@ ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de te ##### Point Of Sales (CashDesk) ##### CashDesk=TPV CashDeskSetup=Mòdul de configuració Terminal Punt de Venda -CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa) CashDeskBankAccountForCheque= Compte per defecte a utilitzar per als cobraments amb xecs CashDeskBankAccountForCB= Compte per defecte a utilitzar per als cobraments amb targeta de crèdit -CashDeskIdWareHouse=Magatzem a ultilitzar per a les vendes +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. ##### Bookmark ##### BookmarkSetup=Configuració del mòdul Bookmark BookmarkDesc=Aquest mòdul li permet gestionar els enllaços i accessos directes. També permet afegir qualsevol pàgina de Dolibarr o enllaç web al menú d'accés ràpid de l'esquerra. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang index 6a2347b2cf8..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 @@ -41,9 +42,10 @@ AutoActions= Inclusió automàtica a l'agenda AgendaAutoActionDesc= Indiqueu en aquesta pestanya els esdeveniments per els que desitja que Dolibarr creu automàticament una acció a l'agenda. Si no es marca cap cas (per defecte), només les accions manuals s'han d'incloure en l'agenda. AgendaSetupOtherDesc= Aquesta pàgina permet configurar algunes opcions que permeten exportar una vista de la seva agenda Dolibar a un calendari extern (thunderbird, google calendar, ...) AgendaExtSitesDesc=Aquesta pàgina permet configurar calendaris externs per a la seva visualització en l'agenda de Dolibarr. -ActionsEvents= Esdeveniments per a què Dolibarr crei una acció de forma automàtica -PropalValidatedInDolibarr= Pressupost %s validat -InvoiceValidatedInDolibarr= Factura %s validada +ActionsEvents=Esdeveniments per a què Dolibarr crei una acció de forma automàtica +PropalValidatedInDolibarr=Pressupost %s validat +InvoiceValidatedInDolibarr=Factura %s validada +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Factura %s tornada a borrador InvoiceDeleteDolibarr=Factura %s eliminada OrderValidatedInDolibarr= Comanda %s validada @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Comanda %s aprovada OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Comanda %s tordada a borrador OrderCanceledInDolibarr=Commanda %s anul·lada -InterventionValidatedInDolibarr=Intervenció %s validada ProposalSentByEMail=Pressupost %s enviat per e-mail OrderSentByEMail=Comanda de client %s enviada per e-mail InvoiceSentByEMail=Factura a client %s enviada per e-mail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Comanda a proveïdor %s enviada per e-mail SupplierInvoiceSentByEMail=Factura de proveïdor %s enviada per e-mail ShippingSentByEMail=Expedició %s enviada per e-mail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervenció %s enviada per e-mail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Tercer creat DateActionPlannedStart= Data d'inici prevista DateActionPlannedEnd= Data fi prevista @@ -70,9 +69,9 @@ DateActionStart= Data d'inici DateActionEnd= Data finalització AgendaUrlOptions1=Podeu també afegir aquests paràmetres al filtre de sortida: AgendaUrlOptions2=login=%s per a restringir insercions a accions creades, que afectin o realitzades per l'usuari %s. -AgendaUrlOptions3=logina=%s per a restringir insercions a accciones creades per l'usuari %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s per a restringir insercions a accions que afectin a l'usuari %s. -AgendaUrlOptions5=logind=%s per a restringir insercions a accions realitzades per l'usuari %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Mostra aniversari dels contactes AgendaHideBirthdayEvents=Amaga aniversari dels contacte Busy=Ocupat @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=Url d'accés a l'arxiu. ical ExtSiteNoLabel=Sense descripció WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang index 33a1facd88d..a6103e5a9d1 100644 --- a/htdocs/langs/ca_ES/bills.lang +++ b/htdocs/langs/ca_ES/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Abonament InvoiceAvoirAsk=Abonament per corregir la factura InvoiceAvoirDesc=El abonament és una factura negativa destinada a compensar un import de factura que difereix de l'import realment pagat (per haver pagat de més o per devolució de productes, per exemple). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Rectificar la factura %s ReplacementInvoice=Rectificació factura ReplacedByInvoice=Rectificada per la factura %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classificar 'Abandonat' ClassifyClosed=Classificar 'Tancat' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Crear factura -AddBill=Crear factura o abonament +AddBill=Create invoice or credit note AddToDraftInvoices=Afegir a factura esborrany DeleteBill=Eliminar factura SearchACustomerInvoice=Cercar una factura a client @@ -99,7 +99,7 @@ DoPaymentBack=Emetre reembossament ConvertToReduc=Convertir en reducció futura EnterPaymentReceivedFromCustomer=Afegir pagament rebut de client EnterPaymentDueToCustomer=Fer pagament d'abonaments al client -DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0 +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Import PriceBase=Preu base BillStatus=Estat de la factura @@ -137,8 +137,6 @@ BillFrom=Emissor BillTo=Enviar a ActionsOnBill=Eventos sobre la factura NewBill=Nova factura -Prélèvements=Domiciliacions -Prélèvements=Domiciliacions LastBills=Les %s últimes factures LastCustomersBills=Les %s últimes factures a clients LastSuppliersBills=Les %s últimes factures de proveïdors @@ -156,9 +154,9 @@ ConfirmCancelBill=Esteu segur de voler anul·lar la factura %s? ConfirmCancelBillQuestion=Per quina raó vol abandonar la factura? ConfirmClassifyPaidPartially=Esteu segur de voler classificar la factura %s com pagada? ConfirmClassifyPaidPartiallyQuestion=Aquesta factura no ha estat totalment pagada. Per què vol classificar-la com a pagada? -ConfirmClassifyPaidPartiallyReasonAvoir=La resta a pagar (%s %s) s'ha regularitzat (ja que article s'ha tornat, oblidat lliurar, descompte no definit ...) mitjançant un abonament -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar (%s %s) és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte -ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar (%s %s) és un descompte +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=Client morós ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part ConfirmClassifyPaidPartiallyReasonOther=D'altra raó @@ -191,9 +189,9 @@ AlreadyPaid=Ja pagat AlreadyPaidBack=Ja reemborsat AlreadyPaidNoCreditNotesNoDeposits=Ja pagat (exclosos els abonaments i bestretes) Abandoned=Abandonada -RemainderToPay=Queda per pagar -RemainderToTake=Queda per cobrar -RemainderToPayBack=Queda per reemborsar +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pendent AmountExpected=Import reclamat ExcessReceived=Rebut en excés @@ -219,19 +217,18 @@ NoInvoice=Cap factura ClassifyBill=Classificar la factura SupplierBillsToPay=Factures de proveïdors a pagar CustomerBillsUnpaid=Factures a clients pendents de cobrament -DispenseMontantLettres=Les factures redactactades per processos mecànics estan exemptes de l'ordre en lletres -DispenseMontantLettres=Les factures redactactades per processos mecànics estan exemptes de l'ordre en lletres +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=No percebut recuperable SetConditions=Definir condicions de pagament SetMode=Definir mode de pagament Billed=Facturat -RepeatableInvoice=Factura recurrent -RepeatableInvoices=Factures recurrents -Repeatable=Recurrent -Repeatables=Recurrents -ChangeIntoRepeatableInvoice=Convertir en recurrent -CreateRepeatableInvoice=Crear factura recurrent -CreateFromRepeatableInvoice=Crear desde factura recurrent +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Factures a clients i línies de factures CustomersInvoicesAndPayments=Factures a clients i pagaments ExportDataset_invoice_1=Factures a clients i línies de factura diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang index 84f2b0eef27..c6e5221d79e 100644 --- a/htdocs/langs/ca_ES/categories.lang +++ b/htdocs/langs/ca_ES/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Proveïdors CatCusLinks=Clients/Clients potencials CatProdLinks=Productes CatMemberLinks=Membres -CatProdLinks=Productes -CatCusLinks=Clients/Clients potencials -CatSupLinks=Proveïdors DeleteFromCat=Eliminar de la categoria DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang index 0fd90f71cf4..098a65b11f5 100644 --- a/htdocs/langs/ca_ES/compta.lang +++ b/htdocs/langs/ca_ES/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Codi comptable incorrecte per a %s SuppliersProductsSellSalesTurnover=Volum de vendes generat per la venda dels productes dels proveïdors CheckReceipt=Llista de remeses CheckReceiptShort=Remeses +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Nova remesa NewCheckDeposit=Nou ingrés NewCheckDepositOn=Crear nova remesa al compte: %s @@ -196,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 3fb7712ca6b..be202d8b593 100644 --- a/htdocs/langs/ca_ES/contracts.lang +++ b/htdocs/langs/ca_ES/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Àrea contractes ListOfContracts=Llistat de contractes -LastContracts=Els % darrers contractes +LastModifiedContracts=Last %s modified contracts AllContracts=Tots els contractes ContractCard=Fitxa contracte ContractStatus=Estat del contracte @@ -27,7 +27,7 @@ MenuRunningServices=Serveis actius MenuExpiredServices=Serveis expirats MenuClosedServices=Serveis tancats NewContract=Nou contracte -AddContract=Crear contracte +AddContract=Create contract SearchAContract=Cercar un contracte DeleteAContract=Eliminar un contracte CloseAContract=Tancar un contracte @@ -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=Els % darrers contractes +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/cron.lang b/htdocs/langs/ca_ES/cron.lang index 2e72b0e027e..c2c93bdb4f9 100644 --- a/htdocs/langs/ca_ES/cron.lang +++ b/htdocs/langs/ca_ES/cron.lang @@ -1,10 +1,8 @@ # Dolibarr language file - Source file is en_US - cron -# # About page About = Sobre CronAbout = Sobre Cron CronAboutPage = Sobre Cron - # Right Permission23101 = Veure les tasques programades Permission23102 = Crear/Modificar les tasques programades @@ -20,9 +18,8 @@ CronExplainHowToRunUnix=En un entorn Unix pot parametritzar crontab per executar CronExplainHowToRunWin=En un entorn Microsoft (tm) Windows pot utilitzar el planificador de tasques per llançar aquesta comanda cada minut # Menu CronJobs=Tasques programades -CronListActive= Llistat de tasques planificades actives -CronListInactive= Llistat de tasques planificades inactives -CronListActive= Llistat de tasques planificades actives +CronListActive=List of active/scheduled jobs +CronListInactive=Llistat de tasques planificades inactives # Page list CronDateLastRun=Últim llançament CronLastOutput=Última sortida diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang index acb0fb19fe9..66d683b5b62 100644 --- a/htdocs/langs/ca_ES/donations.lang +++ b/htdocs/langs/ca_ES/donations.lang @@ -4,7 +4,7 @@ Donations=Donacións DonationRef=Ref. donació Donor=Donant Donors=Donants -AddDonation=Afegir donació +AddDonation=Create a donation NewDonation=Nova donació ShowDonation=Mostrar donació DonationPromise=Promesa de donació @@ -31,3 +31,8 @@ DonationRecipient=Beneficiari ThankYou=Moltes gràcies IConfirmDonationReception=El beneficiari confirma la recepció, com a donació, de la següent quantitat MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/ca_ES/externalsite.lang index d7c5e94190e..7a234510913 100644 --- a/htdocs/langs/ca_ES/externalsite.lang +++ b/htdocs/langs/ca_ES/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Configuració de l'enllaç al lloc web extern ExternalSiteURL=URL del lloc extern ExternalSiteModuleNotComplete=El mòdul Lloc web extern no ha estat configurat correctament. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang index ecb44efd043..87309561946 100644 --- a/htdocs/langs/ca_ES/holiday.lang +++ b/htdocs/langs/ca_ES/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Actualitzar CantUpdate=You cannot update this leave request. NoDateDebut=Ha d'indicar una data d'inici. NoDateFin=Ha d'indicar una data de fi. -ErrorDureeCP=La seva petició de vacances no conté cap dia hàbil. -TitleValidCP=Validar la petició de vacances +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Data de validació TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Rebutjar la petició de vacances +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Ha de seleccionar un motiu per rebutjar aquesta petició. -TitleCancelCP=Anul·lar la petició de vacances +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Motiu del rebuig DateRefusCP=Data del rebuig @@ -78,7 +77,7 @@ ActionByCP=Realitzat per UserUpdateCP=Per a l'usuari PrevSoldeCP=Saldo anterior NewSoldeCP=Nou saldo -alreadyCPexist=Ja s'ha efectuat una petició de vacances per a aquest període. +alreadyCPexist=A leave request has already been done on this period. UserName=Nom Cognoms Employee=Empleat FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Actualització manual HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuració del mòdul Vacacions +ConfCP=Configuration of leave request module DescOptionCP=Descripció de l'opció ValueOptionCP=Valor -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validar la configuració -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Actualització efectuada correctament. ErrorUpdateConfCP=S'ha produït un error durant l'actualització, torne a provar. -AddCPforUsers=Afegiu els saldos de vacances dels usuaris fent clic aquí. -DelayForSubmitCP=Antelació mínima per sol·licitar vacances -AlertapprobatortorDelayCP=Advertir al validador si la petició no correspon a la data límit +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validar UpdateEventCP=Actualitzar els esdeveniments diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang index 2e5093731d3..0bdcd01a5bf 100644 --- a/htdocs/langs/ca_ES/interventions.lang +++ b/htdocs/langs/ca_ES/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervenció Interventions=Intervencions InterventionCard=Fitxa intervenció NewIntervention=Nova itervenció -AddIntervention=Crear intervenció +AddIntervention=Create intervention ListOfInterventions=Llista d'intervencions EditIntervention=Editar ActionsOnFicheInter=Esdeveniments sobre l'intervenció @@ -30,6 +30,15 @@ StatusInterInvoiced=Facturado RelatedInterventions=Intervencions adjuntes ShowIntervention=Mostrar intervenció SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguiment de la intervenció TypeContact_fichinter_internal_INTERVENING=Interventor diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang index 04b854775b4..5983e04c208 100644 --- a/htdocs/langs/ca_ES/mails.lang +++ b/htdocs/langs/ca_ES/mails.lang @@ -115,7 +115,7 @@ SentBy=Enviat por MailingNeedCommand=Per raons de seguretat, l'enviament d'un E-Mailing en massa es pot fer en línia de comandes. Demani al seu administrador que llanci la comanda següent per per enviar la correspondència a tots els destinataris: MailingNeedCommand2=Podeu enviar en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb un valor nombre que indica el màxim nombre d'e-mails enviats per sessió. Per això aneu a Inici - Configuració - Varis ConfirmSendingEmailing=Confirma l'enviament de l'e-mailing? -LimitSendingEmailing=L'enviament d'un e-mailing des de les pantalles està limitat per raons de seguretat i de timeout a %s destinataris per sessió d'enviament. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Buidar llista ToClearAllRecipientsClickHere=Per buidar la llista dels destinataris d'aquest E-Mailing, feu clic al botó ToAddRecipientsChooseHere=Per afegir destinataris, escolliu els que figuren en les llistes a continuació @@ -133,6 +133,9 @@ Notifications=Notificacions NoNotificationsWillBeSent=Cap notificació per e-mail està prevista per a aquest esdeveniment i empresa ANotificationsWillBeSent=1 notificació serà enviada per e-mail SomeNotificationsWillBeSent=%s notificacions seran enviades per e-mail -AddNewNotification=Activar una nova sol·licitud de notificació -ListOfActiveNotifications=Llista de les sol·licituds de notificacions actives +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Llista de notificacions d'e-mails enviades +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index 4d0d7d3144e..3ca3d451105 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossible trobar l'usuari %s a la ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al país '%s'. ErrorNoSocialContributionForSellerCountry=Error, cap tipus de càrrega social definida per al país '%s'. ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat. -ErrorOnlyPngJpgSupported=Error, només estan suportats els formats d'imatge jpg i png. -ErrorImageFormatNotSupported=El seu PHP no suporta les funcions de conversió d'aquest format d'imatge. SetDate=Set date SelectDate=Select a date SeeAlso=Veure també %s BackgroundColorByDefault=Color de fons +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=Un arxiu ha estat seleccionat per adjuntar, però encara no ha estat pujat. Feu clic a "Adjuntar aquest arxiu" per a això. NbOfEntries=Nº d'entrades GoToWikiHelpPage=Consultar l'ajuda (pot requerir accés a Internet) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Trimistre MonthOfDay=Mes del dia HourShort=H +MinuteShort=mn Rate=Tipus UseLocalTax=Incloure taxes Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Llista completa Statistics=Estadístiques OtherStatistics=Altres estadístiques Status=Estat +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. proveïdor @@ -365,6 +367,7 @@ ActionsOnCompany=Esdeveniments respecte aquest tercer ActionsOnMember=Esdeveniments respecte aquest membre NActions=%s esdeveniments NActionsLate=%s en retard +RequestAlreadyDone=Request already recorded Filter=Filtre RemoveFilter=Eliminar filtre ChartGenerated=Gràfics generats @@ -645,6 +648,7 @@ OptionalFieldsSetup=Configuració dels atributs opcionals URLPhoto=Url de la foto/logo SetLinkToThirdParty=Vincular a un altre tercer CreateDraft=Crea esborrany +SetToDraft=Back to draft ClickToEdit=Clic per a editar ObjectDeleted=Objecte %s eliminat ByCountry=Per país @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Dilluns Tuesday=Dimarts diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang index 9d9e17edf80..3f31b5c8dff 100644 --- a/htdocs/langs/ca_ES/margins.lang +++ b/htdocs/langs/ca_ES/margins.lang @@ -10,24 +10,18 @@ MarkRate=Marge sobre venda DisplayMarginRates=Mostrar els marges sobre cost DisplayMarkRates=Mostrar els marges sobre venda InputPrice=Introduir un preu - margin=Gestió de marges margesSetup=Configuració de la gestió de marges - MarginDetails=Detalls de marges realitzats - ProductMargins=Marges per producte CustomerMargins=Marges per client SalesRepresentativeMargins=Sales representative margins - ProductService=Producte o servei AllProducts=Tots els productes i serveis ChooseProduct/Service=Trieu el producte o servei - StartDate=Data d'inici EndDate=Data de fi Launch=Començar - ForceBuyingPriceIfNull=Forçar el preu de compra si no s'ha indicat ForceBuyingPriceIfNullDetails=Amb "ON", la línia es considera un marge nul (es forçarà el preu de compra amb el preu de venda), amb ("OFF") el marge és igual al preu de venda (preu de compra a 0). MARGIN_METHODE_FOR_DISCOUNT=Mètode de gestió de descomptes globals @@ -35,16 +29,16 @@ UseDiscountAsProduct=Com un producte UseDiscountAsService=Com un servei UseDiscountOnTotal=Sobre el total MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Indica si un descompte global es pren en compte com un producte, servei o només en el total a l'hora de calcular els marges. - MARGIN_TYPE=Tipus de marge gestionat MargeBrute=Marge brut MargeNette=Marge net MARGIN_TYPE_DETAILS=Marge brut: Preu de venda sense IVA - Preu de compra sense IVA
    Marge net: Preu de venda sense IVA - Costos - CostPrice=Preu de compra BuyingCost=Costos UnitCharges=Càrrega unitària Charges=Càrreges - AgentContactType=Tipus de contacte comissionat -AgentContactTypeDetails=Indica el tipus de contacte enllaçat a les factures que seran associats als agents comercials +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/ca_ES/orders.lang index 4f0f5757ca6..ce45b85671b 100644 --- a/htdocs/langs/ca_ES/orders.lang +++ b/htdocs/langs/ca_ES/orders.lang @@ -53,9 +53,9 @@ ShippingExist=Existeix una expedició DraftOrWaitingApproved=Esborrany o aprovat encara no controlat DraftOrWaitingShipped=Esborrany o validada encara no expedida MenuOrdersToBill=Comandes a facturar -MenuOrdersToBill2=Comandes facturables +MenuOrdersToBill2=Billable orders SearchOrder=Cercar una comanda -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=Enviar producte Discount=Descompte CreateOrder=Crear comanda @@ -65,7 +65,7 @@ ValidateOrder=Validar la comanda UnvalidateOrder=Desvalidar la comanda DeleteOrder=Eliminar la comanda CancelOrder=Anul·lar la comanda -AddOrder=Crear comanda +AddOrder=Create order AddToMyOrders=afegir a les meves comandes AddToOtherOrders=Afegir a altres comandes AddToDraftOrders=Afegir a comanda esborrany @@ -101,7 +101,6 @@ RelatedOrders=Comandes adjuntes OnProcessOrders=Comandes en procés RefOrder=Ref. comanda RefCustomerOrder=Ref. comanda client -CustomerOrder=Comada de client RefCustomerOrderShort=Ref. com. client SendOrderByMail=Enviar comanda per e-mail ActionsOnOrder=Esdeveniments sobre la comanda @@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON no definida Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Error en la càrrega de l'arxiu mòdul '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Error en la càrrega de l'arxiu mòdul '%s' Error_OrderNotChecked=No s'han seleccionat comandes a facturar - - # Sources OrderSource0=Pressupost OrderSource1=Internet @@ -144,25 +141,22 @@ OrderSource5=Comercial OrderSource6=Revistes QtyOrdered=Qt. demanda AddDeliveryCostLine=Afegir una línia de despeses de ports indicant el pes de la comanda - # Documents models PDFEinsteinDescription=Model de comanda complet (logo...) PDFEdisonDescription=Model de comanda simple -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes OrderByMail=Correu OrderByFax=Fax OrderByEMail=E-Mail OrderByWWW=En línia OrderByPhone=Telèfon - CreateInvoiceForThisCustomer=Facturar comandes NoOrdersToInvoice=Sense comandes facturables CloseProcessedOrdersAutomatically=Classificar automàticament com "Processades" les comandes seleccionades. -MenuOrdersToBill2=Comandes facturables OrderCreation=Creació comanda Ordered=Comandat OrderCreated=Les seves comandes han estat creats OrderFail=S'ha produït un error durant la creació de les seves comandes CreateOrders=Crear comandes -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/ca_ES/oscommerce.lang b/htdocs/langs/ca_ES/oscommerce.lang deleted file mode 100644 index 528d57c53d2..00000000000 --- a/htdocs/langs/ca_ES/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Configuració del mòdul OS Commerce -OSCommerceSetupSaved=Configuració OS Commerce desada -OSCommerceServer=Nom/IP servidor de la base de dades OS commerce -OSCommerceDatabaseName=Nom de la base de dades OS Commerce -OSCommercePrefix=Prefix taules OS Commerce -OSCommerceUser=Usuari de la base de dades OS Commerce diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang index 8a44388eb17..ae25227403d 100644 --- a/htdocs/langs/ca_ES/other.lang +++ b/htdocs/langs/ca_ES/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Codi de seguretat Calendar=Calendari -AddTrip=Crear honorari Tools=Utilitats ToolsDesc=Aquesta àrea està dedicada al reagrupament de diverses utilitats no disponibles a les altres entrades de menú.

    La llista d'aquestes utilitats és accessible mitjançant el menú del costat. Birthday=Aniversari @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Número arxius/documents adjunts TotalSizeOfAttachedFiles=Mida total dels arxius/documents adjunts MaxSize=Tamany màxim @@ -80,6 +80,16 @@ ModifiedBy=Modificat per %s ValidatedBy=Validat per %s CanceledBy=Anul·lat per %s ClosedBy=Tancat per %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=L'arxiu %s s'ha eliminat DirWasRemoved=La carpeta %s s'ha eliminat FeatureNotYetAvailableShort=Disponible en una propera versió @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Afegir entrada al calendari -NewCompanyToDolibarr=Empresa %s inserida en Dolibarr -ContractValidatedInDolibarr=Contracte %s validat en Dolibarr -ContractCanceledInDolibarr=Contracte %s anul·lat en Dolibarr -ContractClosedInDolibarr=Contracte %s tancat en Dolibarr -PropalClosedSignedInDolibarr=Pressupost %s signat en Dolibarr -PropalClosedRefusedInDolibarr=Pressupost %s signat en Dolibarr -PropalValidatedInDolibarr=Pressupost %s validat en Dolibarr -InvoiceValidatedInDolibarr=Factura %s validada en Dolibarr -InvoicePaidInDolibarr=Factura %s passada a pagada en Dolibarr -InvoiceCanceledInDolibarr=Factura %s anul·lada en Dolibarr -PaymentDoneInDolibarr=Pagamat %s realitzat en Dolibarr -CustomerPaymentDoneInDolibarr=Pagament de client %s en Dolibarr -SupplierPaymentDoneInDolibarr=Pagament a proveïdor %s en Dolibarr -MemberValidatedInDolibarr=Membre %s validat en Dolibarr -MemberResiliatedInDolibarr=Membre %s donat de baixa en Dolibarr -MemberDeletedInDolibarr=Membre %s eliminat de Dolibarr -MemberSubscriptionAddedInDolibarr=Subscripció del membre %s afegida a Dolibarr -ShipmentValidatedInDolibarr=Expedició %s validada en Dolibarr -ShipmentDeletedInDolibarr=Expedició %s eliminada de Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Exportació ExportsArea=Àrea d'exportacions diff --git a/htdocs/langs/ca_ES/paybox.lang b/htdocs/langs/ca_ES/paybox.lang index 5cbfcf6b506..352b631f646 100644 --- a/htdocs/langs/ca_ES/paybox.lang +++ b/htdocs/langs/ca_ES/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Missatge a la pàgina de retorn de pagament cancel·lat NewPayboxPaymentReceived=Nou pagament Paybox rebut NewPayboxPaymentFailed=Nou intent de pagament Paybox sense èxit PAYBOX_PAYONLINE_SENDEMAIL=E-Mail a avisar en cas de pagament (amb èxit o no) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/ca_ES/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang index ea18a7d79ba..1ccb69ba341 100644 --- a/htdocs/langs/ca_ES/sendings.lang +++ b/htdocs/langs/ca_ES/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=De moment, la creació d'una nova expedició es RelatedShippings=Expedició(ns) associades ShipmentLine=Línia d'expedició CarrierList=Llistat de transportistes +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Recollit pel client diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang index 79c2f835aa8..dda28770323 100644 --- a/htdocs/langs/ca_ES/stocks.lang +++ b/htdocs/langs/ca_ES/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=L'etiqueta del magatzem és obligatòria CorrectStock=Corregir estoc ListOfWarehouses=Llistat de magatzems ListOfStockMovements=Llistat de moviments de estoc -StocksArea=Àrea estocs +StocksArea=Warehouses area Location=Lloc LocationSummary=Nom curt del lloc NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang index e7a8b41db0a..9796f4d1115 100644 --- a/htdocs/langs/ca_ES/users.lang +++ b/htdocs/langs/ca_ES/users.lang @@ -63,7 +63,6 @@ ShowGroup=Veure grup ShowUser=Veure usuari NonAffectedUsers=Usuaris no destinats al grup UserModified=Usuari correctament modificat -GroupModified=Grup %s modificat PhotoFile=Arxiu foto UserWithDolibarrAccess=Usuari amb accés a Dolibarr ListOfUsersInGroup=Llista d'usuaris d'aquest grup @@ -103,7 +102,7 @@ UserDisabled=Usuari %s deshabilitat UserEnabled=Usuari %s activat UserDeleted=Usuari %s eliminat NewGroupCreated=Grup %s creat -GroupModified=Grup %s modificat +GroupModified=Group %s modified GroupDeleted=Grup %s eliminat ConfirmCreateContact=Esteu segur de voler crear un compte Dolibarr per a aquest contacte? ConfirmCreateLogin=Esteu segur que voleu crear un compte Dolibarr per a aquest membre? @@ -114,8 +113,10 @@ YourRole=Els seus rols YourQuotaOfUsersIsReached=Ha arribat a la seva quota d'usuaris actius! NbOfUsers=Nº d'usuaris DontDowngradeSuperAdmin=Només un superadmin pot degradar un superadmin -HierarchicalResponsible=Responsable jeràrquic +HierarchicalResponsible=Supervisor HierarchicView=Vista jeràrquica UseTypeFieldToChange=Modificar el camp Tipus per canviar OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang index 6ac3e2c7387..9a4eef3a705 100644 --- a/htdocs/langs/ca_ES/withdrawals.lang +++ b/htdocs/langs/ca_ES/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Ordre LastWithdrawalReceipts=Les %s últimes ordres de domiciliacions WithdrawedBills=Factures domiciliades WithdrawalsLines=Línies de domiciliació -RequestStandingOrderToTreat=Comandes de domiciliacions a tractar -RequestStandingOrderTreated=Comandes de domiciliacions processats +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Domiciliacions de clients CustomerStandingOrder=Domiciliació client NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Mètode enviament Send=Enviar Lines=línies StandingOrderReject=Emetre una devolució -InvoiceRefused=Factura tornada WithdrawalRefused=Devolució de domiciliació WithdrawalRefusedConfirm=¿Està segur de voler crear una devolució de domiciliació per a l'empresa RefusedData=Data de devolució RefusedReason=Motiu de devolució RefusedInvoicing=Facturació de la devolució NoInvoiceRefused=No facturar la devolució -InvoiceRefused=Factura tornada +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Estat StatusUnknown=Desconegut StatusWaiting=En espera @@ -76,13 +76,14 @@ WithBankUsingRIB=Per als comptes bancaris que utilitzen CCC WithBankUsingBANBIC=Per als comptes bancaris que utilitzen el codi BAN/BIC/SWIFT BankToReceiveWithdraw=Compte bancari receptor de les domiciliacions CreditDate=Abonada el -WithdrawalFileNotCapable=No es possible generar fitxer bancari de domiciliacio per al seu pais +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/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/cs_CZ/accountancy.lang +++ b/htdocs/langs/cs_CZ/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index 74903e0caeb..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 @@ -437,14 +440,14 @@ Module52Name=Zásoby Module52Desc=Skladové hospodářství (výrobky) Module53Name=Služby Module53Desc=Správa služeb -Module54Name=Smlouvy -Module54Desc=Smlouva a řízení služeb +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Čárové kódy 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=Projekty -Module400Desc=Projektový management uvnitř jiných modulů +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Upozornění -Module600Desc=Zasílat upozornění e-mailem na některých firemních akcí Dolibarr třetích stran kontakty +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Dary Module700Desc=Darování řízení Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-společnost Module5000Desc=Umožňuje spravovat více společností Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Prázdniny -Module20000Desc=Deklarovat a dodržovat zaměstnanci dovolenou +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 Module50100Desc=Místě prodeje modulu -Module50200Name= Paypal -Module50200Desc= Modul nabídnout on-line platby kreditní kartou stránku s Paypal +Module50200Name=Paypal +Module50200Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paypal 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 @@ -606,15 +613,16 @@ Permission151=Přečtěte si trvalé příkazy Permission152=Vytvořit / upravit trvalých příkazů žádost Permission153=Převodovka trvalých příkazů příjmy Permission154=Kredit / odmítnout trvalých příkazů příjmy -Permission161=Čtěte smlouvy -Permission162=Vytvořit / upravit smlouvy -Permission163=Aktivace služby smlouvy -Permission164=Zakázat službu smlouvy -Permission165=Odstranit smlouvy -Permission171=Přečtěte si výlety -Permission172=Vytvořit / upravit výlety -Permission173=Odstranit výlety -Permission178=Export výlety +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Přečtěte si dodavatele Permission181=Přečtěte si dodavatelských objednávek Permission182=Vytvořit / upravit dodavatelské objednávky @@ -671,7 +679,7 @@ Permission300=Přečtěte čárových kódů Permission301=Vytvořit / upravit čárových kódů Permission302=Odstranit čárových kódů Permission311=Přečtěte služby -Permission312=Přiřadit službu smlouvy +Permission312=Assign service/subscription to contract Permission331=Přečtěte si záložky Permission332=Vytvořit / upravit záložky Permission333=Odstranění záložky @@ -701,8 +709,8 @@ Permission701=Přečtěte si dary Permission702=Vytvořit / upravit dary Permission703=Odstranit dary Permission1001=Přečtěte si zásoby -Permission1002=Vytvořit / upravit zásoby -Permission1003=Odstranit zásoby +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Přečtěte skladové pohyby Permission1005=Vytvořit / upravit skladové pohyby Permission1101=Přečtěte si dodací @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Ano v létě OnlyFollowingModulesAreOpenedToExternalUsers=Na vědomí, že pouze následující moduly otevřel externím uživatelům (ať jsou povolení těchto uživatelů): SuhosinSessionEncrypt=Úložiště relace šifrována Suhosin ConditionIsCurrently=Podmínkou je v současné době %s -TestNotPossibleWithCurrentBrowsers=Automatická detekce není možné YouUseBestDriver=Pomocí ovladače %s, že je nejlepší řidič současné době k dispozici. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=Máte jen %s produktů / služeb do databáze. To však není nutné žádné zvláštní optimalizace. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Vrátit evidence kód postavený podle:
    %s násle ModuleCompanyCodePanicum=Zpět prázdný evidence kód. ModuleCompanyCodeDigitaria=Účetnictví kód závisí na kódu třetích stran. Kód se skládá ze znaku "C" na prvním místě následuje prvních 5 znaků kódu třetích stran. UseNotifications=Použití oznámení -NotificationsDesc=E-maily oznámení vám umožňuje odesílat automatické tiše mail, na některé události Dolibarr, třetím stranám (zákazníků nebo dodavatelů), které jsou konfigurovány pro. Volba aktivního oznámení a terče kontaktů se provádí jedna třetina stran v čase. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Dokumenty šablony DocumentModelOdt=Generování dokumentů z OpenDocuments šablon (. ODT nebo ODS. Soubory OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Vodoznak na návrhu dokumentu @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Přidat dodací lhůta schopnost UseOptionLineIfNoQuantity=Řada výrobků / služeb s nulové hodnoty je považován za možnost FreeLegalTextOnProposal=Volný text o obchodních návrhů WatermarkOnDraftProposal=Vodoznak na předloh návrhů komerčních (none-li prázdný) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Objednat řízení nastavení OrdersNumberingModules=Objednávky číslování modelů @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Pro potvrzení objednávky po návrhu užší, umožňuje, aby krok za prozatímní pořadí FreeLegalTextOnOrders=Volný text o objednávkách WatermarkOnDraftOrders=Vodoznak na konceptech objednávek (pokud žádný prázdný) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Klikněte pro Dial Nastavení modulu ClickToDialUrlDesc=Url volána, když se provádí kliknutím na tel. Piktogram. Do pole URL můžete použít značky
    __PHONETO__ Který bude nahrazen s telefonním číslem osoby volat
    __PHONEFROM__ Který bude nahrazen tel. číslo volajícího (vaše)
    __LOGIN__ Který bude nahrazen s clicktodial přihlášení (definované na kartě uživatele)
    __PASS__ Který bude nahrazen s clicktodial heslo (definované na kartě uživatele). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervenční číslování modely TemplatePDFInterventions=Intervenční karet dokumenty modely WatermarkOnDraftInterventionCards=Vodoznak na dokumentech intervenčních karty (pokud žádný prázdný) ##### Contracts ##### -ContractsSetup=Zakázky modul nastavení +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Zakázky číslování moduly TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Soubory typu %s nekomprimuje serveru HTTP CacheByServer=Cache serverem CacheByClient=Cache v prohlížeči CompressionOfResources=Komprese odpovědí HTTP -TestNotPossibleWithCurrentBrowsers=Automatická detekce není možné +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Produkty modul nastavení ServiceSetup=Služby modul nastavení @@ -1382,9 +1393,10 @@ MailingSetup=E-mailem Nastavení modulu MailingEMailFrom=Odesílatele (From) pro emailů zasílaných e-mailem na modul MailingEMailError=Zpět E-mail (chyby-do) e-maily s chybami ##### Notification ##### -NotificationSetup=Oznámení bu email modul nastavení +NotificationSetup=EMail notification module setup NotificationEMailFrom=Odesílatele (From) e-maily zaslané na oznámení -ListOfAvailableNotifications=Seznam dostupných oznámení (Tento seznam závisí na aktivovaných modulů) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Odeslání Nastavení modulu SendingsReceiptModel=Odeslání stvrzenky modelu @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Připojení k serveru "%s" na databázi "%s" OSCommerceTestKo1=Připojení k "%s" serveru úspěšná, ale databáze "%s" by nebylo možno dosáhnout. OSCommerceTestKo2=Připojení k serveru "%s" s uživatelem "%s 'se nezdařilo. ##### Stock ##### -StockSetup=Konfigurace modulu sklad -UserWarehouse=Používejte osobní uživatelské zásoby +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu smazán TreeMenu=Strom menu @@ -1478,11 +1491,14 @@ ClickToDialDesc=Tento modul umožňuje přidat ikonu po telefonních čísel. Kl ##### Point Of Sales (CashDesk) ##### CashDesk=Bod prodeje CashDeskSetup=Místě prodeje modulu nastavení -CashDeskThirdPartyForSell=Generic třetí stranou použít pro prodává +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Výchozí účet použít pro příjem plateb v hotovosti CashDeskBankAccountForCheque= Výchozí účet použít pro příjem plateb šekem CashDeskBankAccountForCB= Výchozí účet použít pro příjem plateb prostřednictvím kreditní karty -CashDeskIdWareHouse=Sklad použít pro prodává +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. ##### Bookmark ##### BookmarkSetup=Záložka Nastavení modulu BookmarkDesc=Tento modul umožňuje spravovat záložky. Můžete také přidat zástupce pro všechny Dolibarr stránky nebo externale webových stránek na vašem levém menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang index 7aa4baf3384..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 @@ -41,9 +42,10 @@ AutoActions= Automatické plnění AgendaAutoActionDesc= Definujte zde události, na které chcete Dolibarr vytvořit automaticky událost v programu. Pokud není zaškrtnutá (ve výchozím nastavení), bude pouze manuální činnosti být zahrnuty do pořadu jednání. AgendaSetupOtherDesc= Tato stránka poskytuje možnosti, jak dát export vašich akcí Dolibarr do externího kalendáře (thunderbird, Google kalendář, ...) AgendaExtSitesDesc=Tato stránka umožňuje deklarovat externí zdroje kalendářů vidět své akce do programu Dolibarr. -ActionsEvents= Události, pro které Dolibarr vytvoří akci v programu automaticky -PropalValidatedInDolibarr= Návrh %s ověřena -InvoiceValidatedInDolibarr= Faktura %s ověřena +ActionsEvents=Události, pro které Dolibarr vytvoří akci v programu automaticky +PropalValidatedInDolibarr=Návrh %s ověřena +InvoiceValidatedInDolibarr=Faktura %s ověřena +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Faktura %s vrátit do stavu návrhu InvoiceDeleteDolibarr=Faktura %s smazána OrderValidatedInDolibarr= Objednat %s ověřena @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Objednat %s schválen OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Objednat %s vrátit do stavu návrhu OrderCanceledInDolibarr=Objednat %s zrušen -InterventionValidatedInDolibarr=Intervenční %s ověřena ProposalSentByEMail=Komerční návrh %s zaslána e-mailem OrderSentByEMail=%s zákazníků objednávka zaslána e-mailem InvoiceSentByEMail=%s faktuře Zákazníka zaslána e-mailem @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=%s Dodavatel objednávka zaslána e-mailem SupplierInvoiceSentByEMail=%s dodavatelské faktury zasílané e-mailem ShippingSentByEMail=Přepravní %s zaslána e-mailem ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervenční %s zaslána e-mailem -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Třetí strana vytvořena DateActionPlannedStart= Plánované datum zahájení DateActionPlannedEnd= Plánované datum ukončení @@ -70,9 +69,9 @@ DateActionStart= Datum zahájení DateActionEnd= Datum ukončení AgendaUrlOptions1=Můžete také přidat následující parametry filtrování výstupu: AgendaUrlOptions2=login = %s omezit výstup na akce vytvořené, přidělených nebo provést uživatele %s. -AgendaUrlOptions3=Logina = %s omezit výstup na akce vytvořené uživatelem %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint = %s omezit výstup na akce přiřazených uživatelských %s. -AgendaUrlOptions5=logind = %s omezit výstup na akce provedené uživatelem %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Zobrazit narozeniny kontaktů AgendaHideBirthdayEvents=Skrýt narozeniny kontaktů Busy=Zaneprázdněný @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL pro přístup. Soubor iCal ExtSiteNoLabel=Ne Popis WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang index 30287679c90..69320cd4204 100644 --- a/htdocs/langs/cs_CZ/bills.lang +++ b/htdocs/langs/cs_CZ/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Dobropis InvoiceAvoirAsk=Dobropis opravit fakturu InvoiceAvoirDesc=Dobropis je negativní faktura slouží k řešení skutečnost, že faktura je množství, které se liší než částka skutečně vyplacena (protože zákazník zaplatil příliš mnoho omylem, nebo nebude vyplacena úplně, protože on se vrátil některé produkty, například). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Vyměňte faktury %s ReplacementInvoice=Náhradní faktura ReplacedByInvoice=Nahrazeno faktuře %s @@ -87,7 +87,7 @@ ClassifyCanceled=Klasifikovat "Opuštěné" ClassifyClosed=Klasifikaci "uzavřeným" ClassifyUnBilled=Classify 'Unbilled' CreateBill=Vytvořit fakturu -AddBill=Přidat fakturu nebo dobropis +AddBill=Create invoice or credit note AddToDraftInvoices=Přidat k návrhu fakturu DeleteBill=Odstranit fakturu SearchACustomerInvoice=Hledat zákaznické faktuře @@ -99,7 +99,7 @@ DoPaymentBack=Do platební záda ConvertToReduc=Převod do budoucnosti slevou EnterPaymentReceivedFromCustomer=Zadejte platby, které obdržel od zákazníka EnterPaymentDueToCustomer=Provést platbu ze strany zákazníka -DisabledBecauseRemainderToPayIsZero=Zakázáno, protože zbytek zaplatit, je nulová +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Množství PriceBase=Cena základní BillStatus=Stav faktury @@ -137,8 +137,6 @@ BillFrom=Z BillTo=Na ActionsOnBill=Akce na faktuře NewBill=Nová faktura -Prélèvements=Trvalý příkaz -Prélèvements=Trvalý příkaz LastBills=Poslední %s faktury LastCustomersBills=Poslední %s zákazníkům faktury LastSuppliersBills=Poslední %s dodavatelů faktury @@ -156,9 +154,9 @@ ConfirmCancelBill=Jste si jisti, že chcete zrušit faktury %s? ConfirmCancelBillQuestion=Proč chcete klasifikovat faktura "opuštěný"? ConfirmClassifyPaidPartially=Jste si jisti, že chcete změnit fakturační %s do stavu placené? ConfirmClassifyPaidPartiallyQuestion=Tato faktura nebyla zaplacena úplně. Jaké jsou důvody pro vás zavřít tuto fakturu? -ConfirmClassifyPaidPartiallyReasonAvoir=Zbytek platit (%s %s) je sleva poskytnuta, protože platba byla provedena před horizontu. I zjednat DPH s dobropisu. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Zbytek platit (%s %s) je sleva poskytnuta, protože platba byla provedena před horizontu. Souhlasím ztratit DPH u této slevy. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Zbytek platit (%s %s) je sleva poskytnuta, protože platba byla provedena před horizontu. Jsem zpět DPH na této slevě bez dobropisu. +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 zákazník ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty částečně vrátil ConfirmClassifyPaidPartiallyReasonOther=Částka opuštěná jiného důvodu @@ -191,9 +189,9 @@ AlreadyPaid=Již zaplacené AlreadyPaidBack=Již vrátí AlreadyPaidNoCreditNotesNoDeposits=Již zaplacena (bez dobropisů a vklady) Abandoned=Opuštěný -RemainderToPay=Zbytek platit -RemainderToTake=Zbývající část, který se -RemainderToPayBack=Zbytek splatit +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Až do AmountExpected=Nárokované částky ExcessReceived=Nadbytek obdržel @@ -219,19 +217,18 @@ NoInvoice=No faktura ClassifyBill=Klasifikovat fakturu SupplierBillsToPay=Dodavatelé faktury platit CustomerBillsUnpaid=Nezaplacené faktury zákazníky -DispenseMontantLettres=Návrhem zákona o mechanografickým jsou osvobozeni od pořadí, v dopisech -DispenseMontantLettres=Návrhem zákona o mechanografickým jsou osvobozeni od pořadí, v dopisech +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Nevratná SetConditions=Nastavit platební podmínky SetMode=Nastavit platební režim Billed=Účtováno -RepeatableInvoice=Přednastavená faktura -RepeatableInvoices=Předdefinované faktury -Repeatable=Předem definované -Repeatables=Předem definované -ChangeIntoRepeatableInvoice=Převod do předem definované -CreateRepeatableInvoice=Vytvořte předdefinovanou fakturu -CreateFromRepeatableInvoice=Vytvořit z předdefinovaných faktuře +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Zákazníků faktury a faktura je vedení CustomersInvoicesAndPayments=Zákazníků faktury a platby ExportDataset_invoice_1=Zákazník faktury a faktura je seznam linek diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang index 4155db3b1be..fe5121d4974 100644 --- a/htdocs/langs/cs_CZ/categories.lang +++ b/htdocs/langs/cs_CZ/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Vazby mezi dodavateli a kategorií CatCusLinks=Vazby mezi zákazníky / vyhlídky a kategorií CatProdLinks=Vazby mezi produktů / služeb a kategorií CatMemberLinks=Vazby mezi členy a kategorií -CatProdLinks=Vazby mezi produktů / služeb a kategorií -CatCusLinks=Vazby mezi zákazníky / vyhlídky a kategorií -CatSupLinks=Vazby mezi dodavateli a kategorií DeleteFromCat=Odebrat z kategorie DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Nastavení kategorií CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang index f2852d94d5c..aa187c9880e 100644 --- a/htdocs/langs/cs_CZ/compta.lang +++ b/htdocs/langs/cs_CZ/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad zákazník účetní kód pro %s SuppliersProductsSellSalesTurnover=Celkový obrat z prodeje výrobků dodavatele. CheckReceipt=Podívejte se vklad CheckReceiptShort=Podívejte se vklad +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Nová sleva NewCheckDeposit=Nová kontrola záloha NewCheckDepositOn=Vytvořte potvrzení o vkladu na účet: %s @@ -196,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 cacd08de41b..792ed511937 100644 --- a/htdocs/langs/cs_CZ/contracts.lang +++ b/htdocs/langs/cs_CZ/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Zakázky oblast ListOfContracts=Přehled smluv -LastContracts=Poslední %s upravené smlouvy +LastModifiedContracts=Last %s modified contracts AllContracts=Všechny smlouvy ContractCard=Smlouva karty ContractStatus=Stav smlouvy @@ -27,7 +27,7 @@ MenuRunningServices=Spuštěné služby MenuExpiredServices=Propadlé služby MenuClosedServices=Uzavřené služby NewContract=Nová smlouva -AddContract=Přidat zakázku +AddContract=Create contract SearchAContract=Hledat smlouvu DeleteAContract=Odstranění smlouvu CloseAContract=Zavřít smlouvu @@ -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=Poslední %s upravené smlouvy +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/cron.lang b/htdocs/langs/cs_CZ/cron.lang index 1d05ba43820..b8b9956668e 100644 --- a/htdocs/langs/cs_CZ/cron.lang +++ b/htdocs/langs/cs_CZ/cron.lang @@ -1,49 +1,32 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = O CronAbout = O Cron CronAboutPage = Cron o stránce - -# # Right -# Permission23101 = Přečtěte si naplánovaná úloha Permission23102 = Vytvořit / aktualizovat naplánovanou úlohu Permission23103 = Odstranit naplánovaná úloha Permission23104 = Provést naplánované úlohy, - -# # Admin -# -CronSetup= Naplánované úlohy správy Nastavení -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job +CronSetup= Nastavení naplánovaných úloh +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job KeyForCronAccess=Bezpečnostní klíč pro URL spustit cron FileToLaunchCronJobs=Příkazový řádek spustit cron CronExplainHowToRunUnix=V oblasti životního prostředí Unix, měli byste použít crontab spustit příkazový řádek pokaždé, minut CronExplainHowToRunWin=Na Microsoft (tm) Windows environement můžete použít naplánovaná úloha nástroje spustit příkazový řádek pokaždé, minut - - -# # Menu -# CronJobs=Naplánované úlohy -CronListActive= Seznam aktivních úloh -CronListInactive= Seznam postižených míst -CronListActive= Seznam aktivních úloh - - -# +CronListActive=List of active/scheduled jobs +CronListInactive=Seznam postižených míst # Page list -# CronDateLastRun=Poslední běh CronLastOutput=Poslední běh výstup CronLastResult=Poslední kód výsledku CronListOfCronJobs=Seznam naplánovaných úloh CronCommand=Příkaz -# CronList=Jobs list +CronList=Jobs list CronDelete= Odstranit cron CronConfirmDelete= Jste si jisti, že chcete smazat tento cron? CronExecute=Zahájení práce @@ -70,10 +53,7 @@ CronLabel=Popis CronNbRun=Nb. zahájit CronEach=Každý JobFinished=Práce zahájena a dokončena - -# #Page card -# CronAdd= Přidat pracovních míst CronHourStart= Začněte hodinu a datum úkolu CronEvery= A úkol provést každý @@ -95,20 +75,12 @@ CronObjectHelp=Název objektu načíst.
    Např načíst metody objektu výro CronMethodHelp=Objekt způsob startu.
    Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, hodnota metody je fecth CronArgsHelp=Metoda argumenty.
    Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, může být hodnota paramters být 0, ProductRef CronCommandHelp=Systém příkazového řádku spustit. - -# # Info -# CronInfoPage=Informace - - -# # Common -# CronType=Typ úlohy CronType_method=Volání metody třídy Dolibarr CronType_command=Shell příkaz CronMenu=Cron CronCannotLoadClass=Nelze načíst třídu nebo objekt %s %s - UseMenuModuleToolsToAddCronJobs=Jděte do menu "Home - Moduly nářadí - Seznam úloh" vidět a upravovat naplánované úlohy. diff --git a/htdocs/langs/cs_CZ/donations.lang b/htdocs/langs/cs_CZ/donations.lang index 98d0c964310..ac953ea4487 100644 --- a/htdocs/langs/cs_CZ/donations.lang +++ b/htdocs/langs/cs_CZ/donations.lang @@ -4,7 +4,7 @@ Donations=Dary DonationRef=Darování čj. Donor=Dárce Donors=Dárci -AddDonation=Přidat dar +AddDonation=Create a donation NewDonation=Nový dárcovství ShowDonation=Zobrazit dar DonationPromise=Dárkové slib @@ -31,3 +31,8 @@ DonationRecipient=Darování příjemce ThankYou=Děkuji IConfirmDonationReception=Příjemce deklarovat příjem, jako dar, následující částky MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/cs_CZ/externalsite.lang index aec6e3b4483..8bb9c5644a2 100644 --- a/htdocs/langs/cs_CZ/externalsite.lang +++ b/htdocs/langs/cs_CZ/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Nastavení odkaz na externí webové stránky ExternalSiteURL=Externí URL stránek ExternalSiteModuleNotComplete=Modul ExternalSite nebyl správně nakonfigurován. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang index 7653b95e044..0c62056dd33 100644 --- a/htdocs/langs/cs_CZ/holiday.lang +++ b/htdocs/langs/cs_CZ/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Aktualizovat CantUpdate=You cannot update this leave request. NoDateDebut=Musíte vybrat počáteční datum. NoDateFin=Musíte vybrat datum ukončení. -ErrorDureeCP=Vaše žádost o dovolenou neobsahuje pracovní den. -TitleValidCP=Žádost odsouhlasí dovolenou +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Datum schválení TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Žádost odmítnout dovolenou +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Musíte si vybrat důvod pro odmítnutí žádosti. -TitleCancelCP=Zrušit požadavek dovolenou +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Důvod odmítnutí DateRefusCP=Datum odmítnutí @@ -78,7 +77,7 @@ ActionByCP=Účinkují UserUpdateCP=Pro uživatele PrevSoldeCP=Předchozí Balance NewSoldeCP=New Balance -alreadyCPexist=Žádost o dovolenou již bylo provedeno na toto období. +alreadyCPexist=A leave request has already been done on this period. UserName=Název Employee=Zaměstnanec FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Ruční aktualizace HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Konfigurace modulu dovolenou +ConfCP=Configuration of leave request module DescOptionCP=Popis možnosti ValueOptionCP=Hodnota -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Ověření konfigurace -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Aktualizováno úspěšně. ErrorUpdateConfCP=Došlo k chybě při aktualizaci, zkuste to prosím znovu. -AddCPforUsers=Prosím, přidejte rovnováhu prázdnin uživatelům kliknutím zde . -DelayForSubmitCP=Uzávěrka žádat o dovolenou -AlertapprobatortorDelayCP=Zabraňte approbator pokud svátek žádost neodpovídá lhůtu +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Potvrdit UpdateEventCP=Aktualizace akce diff --git a/htdocs/langs/cs_CZ/interventions.lang b/htdocs/langs/cs_CZ/interventions.lang index 46be1b48283..0e824e8fcef 100644 --- a/htdocs/langs/cs_CZ/interventions.lang +++ b/htdocs/langs/cs_CZ/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervence Interventions=Intervence InterventionCard=Intervence karty NewIntervention=Nový zásah -AddIntervention=Přidat zásah +AddIntervention=Create intervention ListOfInterventions=Seznam zásahů EditIntervention=Upravit zásah ActionsOnFicheInter=Akce zaměřené na intervenci @@ -30,6 +30,15 @@ StatusInterInvoiced=Účtováno RelatedInterventions=Související zákroky ShowIntervention=Zobrazit zásah SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Zástupce následující-up zásah TypeContact_fichinter_internal_INTERVENING=Zásah diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang index 3926e41a3ab..443430caaea 100644 --- a/htdocs/langs/cs_CZ/mails.lang +++ b/htdocs/langs/cs_CZ/mails.lang @@ -115,7 +115,7 @@ SentBy=Odesílatel: MailingNeedCommand=Z bezpečnostních důvodů, odesílání e-mailem, je lepší, když provádí z příkazového řádku. Máte-li jeden, požádejte správce serveru spustit následující příkaz pro odeslání e-mailem všem příjemcům: MailingNeedCommand2=Však můžete zaslat on-line přidáním parametru MAILING_LIMIT_SENDBYWEB s hodnotou max počet e-mailů, které chcete poslat zasedání. K tomu, přejděte na doma - Nastavení - Ostatní. ConfirmSendingEmailing=Pokud nemůžete nebo raději posílat je s www prohlížeče, prosím, potvrzujete, že jste jisti, že chcete poslat e-mailem teď z vašeho prohlížeče? -LimitSendingEmailing=Poznámka: Na řádek odeslání emailings jsou omezeny na bezpečnost a časový limit důvody k %s příjemce zasláním relace. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Vymazat seznam ToClearAllRecipientsClickHere=Klikněte zde pro vymazání seznamu příjemců tohoto rozesílání ToAddRecipientsChooseHere=Přidejte příjemce výběrem ze seznamu @@ -133,6 +133,9 @@ Notifications=Upozornění NoNotificationsWillBeSent=Žádné oznámení e-mailem jsou plánovány pro tuto událost a společnost ANotificationsWillBeSent=1 bude zaslán e-mailem SomeNotificationsWillBeSent=%s oznámení bude zasláno e-mailem -AddNewNotification=Aktivace nové e-mailové oznámení žádosti -ListOfActiveNotifications=Vypsat všechny aktivní požadavky oznamování e-mailů +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Vypsat všechny e-maily odesílané oznámení +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang index d990ea1a8da..ee2a66242e7 100644 --- a/htdocs/langs/cs_CZ/main.lang +++ b/htdocs/langs/cs_CZ/main.lang @@ -9,7 +9,7 @@ FONTSIZEFORPDF=10 SeparatorDecimal=, SeparatorThousand=Space FormatDateShort=%m/%d/%Y -FormatDateShortInput=%m/%d/%Y +FormatDateShortInput=%m/%d/%Yr FormatDateShortJava=MM/dd/yyyy FormatDateShortJavaInput=MM/dd/yyyy FormatDateShortJQuery=mm/dd/yy @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Nepodařilo se najít uživatele %s ErrorNoVATRateDefinedForSellerCountry=Chyba, pro zemi '%s' nejsou definovány žádné sazby DPH. ErrorNoSocialContributionForSellerCountry=Chyba, žádný typ sociálních příspěvků není definován pro zemi '%s'. ErrorFailedToSaveFile=Chyba, nepodařilo se uložit soubor. -ErrorOnlyPngJpgSupported=Chyba, jsou podporovány pouze obrázkové formáty PNG a JPG. -ErrorImageFormatNotSupported=Vaše PHP nepodporuje funkce pro převod obrázků tohoto formátu. SetDate=Set date SelectDate=Select a date SeeAlso=Viz také %s BackgroundColorByDefault=Výchozí barva pozadí +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=Soubor vybrán pro připojení, ale ještě nebyl nahrán. Klikněte na "Přiložit soubor". NbOfEntries=Počet záznamů GoToWikiHelpPage=Online nápověda (vyžadován přístup k Internetu) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Měsíce ode dne HourShort=H +MinuteShort=mn Rate=Sazba UseLocalTax=Včetně DPH Bytes=Bytů @@ -340,6 +341,7 @@ FullList=Plný seznam Statistics=Statistika OtherStatistics=Další statistiky Status=Postavení +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. dodavatel @@ -365,6 +367,7 @@ ActionsOnCompany=Akce o této třetí osobě ActionsOnMember=Akce o tomto členu NActions=%s události NActionsLate=%s pozdě +RequestAlreadyDone=Request already recorded Filter=Filtr RemoveFilter=Vyjměte filtr ChartGenerated=Graf generovaný @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra nastavení atributů URLPhoto=URL of photo/logo SetLinkToThirdParty=Odkaz na jiné třetí osobě CreateDraft=Vytvořte návrh +SetToDraft=Back to draft ClickToEdit=Klepnutím lze upravit ObjectDeleted=Objekt %s smazán ByCountry=Podle země @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Pondělí Tuesday=Úterý diff --git a/htdocs/langs/cs_CZ/margins.lang b/htdocs/langs/cs_CZ/margins.lang index 04ef754ab00..32b8dc8144e 100644 --- a/htdocs/langs/cs_CZ/margins.lang +++ b/htdocs/langs/cs_CZ/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rychlost DisplayMarginRates=Zobrazení okrajů ceny DisplayMarkRates=Zobrazit ceny značek InputPrice=Vstupní cena - margin=Ziskové marže řízení margesSetup=Ziskové marže Nastavení řízení - MarginDetails=Margin detaily - ProductMargins=Produktové marže CustomerMargins=Zákazníků marže SalesRepresentativeMargins=Sales representative margins - ProductService=Produkt nebo služba AllProducts=Všechny produkty a služby ChooseProduct/Service=Zvolte produkt nebo službu - StartDate=Datum zahájení EndDate=Datum ukončení Launch=Začátek - ForceBuyingPriceIfNull=Force nákupu cena, pokud null ForceBuyingPriceIfNullDetails=pokud je "ON", bude marže rovnat nule na lince (nákupní cena = prodejní cena), v opačném případě ("OFF"), bude Marge se rovná prodejní ceně (nákupní cena = 0) MARGIN_METHODE_FOR_DISCOUNT=Marže metoda pro globální slevy @@ -35,16 +29,16 @@ UseDiscountAsProduct=Jako produkt UseDiscountAsService=Jako služba UseDiscountOnTotal=Na mezisoučet MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definuje, zda globální sleva je považován za výrobek, služba, nebo pouze na mezisoučet pro výpočet marže. - MARGIN_TYPE=Marže typ MargeBrute=Raw marže MargeNette=Čistá marže MARGIN_TYPE_DETAILS=Raw margin: Konečná cena - nákupní cenou
    Čistá marže: Prodejní cena - pořizovací ceny, - CostPrice=Velkoobchodní cena BuyingCost=Velkoobchodní cena UnitCharges=Jednotkové náklady Charges=Poplatky - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/cs_CZ/orders.lang index 2f5a268c70d..308cfa75c8b 100644 --- a/htdocs/langs/cs_CZ/orders.lang +++ b/htdocs/langs/cs_CZ/orders.lang @@ -53,9 +53,9 @@ ShippingExist=Zásilka existuje DraftOrWaitingApproved=Návrh nebo schválena ještě objednat DraftOrWaitingShipped=Návrh nebo ověřeno dosud odesláno MenuOrdersToBill=Objednávky dodáno -MenuOrdersToBill2=Objednávky do účtu +MenuOrdersToBill2=Billable orders SearchOrder=Hledat účelem -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=Loď produkt Discount=Sleva CreateOrder=Vytvořit objednávku @@ -65,7 +65,7 @@ ValidateOrder=Potvrzení objednávky UnvalidateOrder=Unvalidate objednávku DeleteOrder=Smazat objednávku CancelOrder=Zrušení objednávky -AddOrder=Objednané +AddOrder=Create order AddToMyOrders=Přidat do mých objednávek AddToOtherOrders=Přidat do jiných objednávek AddToDraftOrders=Přidat k předloze @@ -101,7 +101,6 @@ RelatedOrders=Související objednávky OnProcessOrders=V procesu objednávky RefOrder=Ref. objednávka RefCustomerOrder=Ref. objednávka zákazníka -CustomerOrder=Zákazníka RefCustomerOrderShort=Ref. zák. objednávka SendOrderByMail=Objednávku zašlete poštou ActionsOnOrder=Akce na objednávku @@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Konstantní COMMANDE_ADDON není definováno Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Nepodařilo se načíst soubor modulu "%s" Error_FailedToLoad_COMMANDE_ADDON_File=Nepodařilo se načíst soubor modulu "%s" Error_OrderNotChecked=Žádné objednávky do faktury vybrané - - # Sources OrderSource0=Komerční návrh OrderSource1=Internet @@ -144,7 +141,6 @@ OrderSource5=Obchodní OrderSource6=Skladujte QtyOrdered=Množství objednat AddDeliveryCostLine=Přidat přepravné čáru označující hmotnost objednávky - # Documents models PDFEinsteinDescription=Kompletní objednávka modelu (logo. ..) PDFEdisonDescription=Jednoduchý model, aby @@ -155,14 +151,12 @@ OrderByFax=Fax OrderByEMail=EMail OrderByWWW=Online OrderByPhone=Telefon - CreateInvoiceForThisCustomer=Bill objednávky NoOrdersToInvoice=Žádné objednávky zúčtovatelné CloseProcessedOrdersAutomatically=Klasifikovat "zpracování" všechny vybrané příkazy. -MenuOrdersToBill2=Objednávky do účtu OrderCreation=Objednat tvorba Ordered=Objednal OrderCreated=Vaše objednávky byly vytvořeny OrderFail=Došlo k chybě během vytváření objednávky CreateOrders=Vytvoření objednávky -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/cs_CZ/oscommerce.lang b/htdocs/langs/cs_CZ/oscommerce.lang deleted file mode 100644 index 76db4065e75..00000000000 --- a/htdocs/langs/cs_CZ/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul nastavení -OSCommerceSetupSaved=OS Commerce nastavení uloží -OSCommerceServer=OS Commerce Server host / ip -OSCommerceDatabaseName=OS Commerce název databáze -OSCommercePrefix=OS Commerce tabulky prefix -OSCommerceUser=OS Commerce databáze login diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang index 6fe68c3ec59..d2b3363bde1 100644 --- a/htdocs/langs/cs_CZ/other.lang +++ b/htdocs/langs/cs_CZ/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Bezpečnostní kód Calendar=Kalendář -AddTrip=Přidat výlet Tools=Nástroje ToolsDesc=Tato oblast je určena pro skupiny různých strojů, které nejsou k dispozici na jiné položky menu.

    Tyto nástroje se dostanete z menu na boku. Birthday=Narozeniny @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Počet připojených souborů / dokumentů TotalSizeOfAttachedFiles=Celková velikost připojených souborů / dokumentů MaxSize=Maximální rozměr @@ -80,6 +80,16 @@ ModifiedBy=Změnil %s ValidatedBy=Ověřena %s CanceledBy=Zrušena %s ClosedBy=Uzavřel %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Soubor %s byl odstraněn DirWasRemoved=Adresář %s byl odstraněn FeatureNotYetAvailableShort=K dispozici v příští verzi @@ -193,25 +203,26 @@ ForgetIfNothing=Pokud jste o tuto změnu, stačí zapomenout na tento e-mail. Va ##### Calendar common ##### AddCalendarEntry=Přidat záznam do kalendáře %s -NewCompanyToDolibarr=Společnost %s přidány do Dolibarr -ContractValidatedInDolibarr=Smlouva %s potvrzené v Dolibarr -ContractCanceledInDolibarr=Smlouva %s zrušených v Dolibarr -ContractClosedInDolibarr=Smlouva %s uzavřena v Dolibarr -PropalClosedSignedInDolibarr=Návrh %s podepsána v Dolibarr -PropalClosedRefusedInDolibarr=Návrh %s odmítl v Dolibarr -PropalValidatedInDolibarr=Návrh %s potvrzené v Dolibarr -InvoiceValidatedInDolibarr=Faktura %s potvrzené v Dolibarr -InvoicePaidInDolibarr=Faktura změněné %s na placenou v Dolibarr -InvoiceCanceledInDolibarr=Faktura %s zrušených v Dolibarr -PaymentDoneInDolibarr=Platební %s provádí v Dolibarr -CustomerPaymentDoneInDolibarr=%s o platební morálce zákazníků provádí v Dolibarr -SupplierPaymentDoneInDolibarr=%s Dodavatel platba provedena v Dolibarr -MemberValidatedInDolibarr=Členské %s potvrzené v Dolibarr -MemberResiliatedInDolibarr=Členské %s resiliated v Dolibarr -MemberDeletedInDolibarr=Členské %s odstraněn z Dolibarr -MemberSubscriptionAddedInDolibarr=Zasílání novinek pro členské %s přidán Dolibarr -ShipmentValidatedInDolibarr=Zásilky %s validované Dolibarr -ShipmentDeletedInDolibarr=Zásilky %s odstraněn z Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Vývoz plocha diff --git a/htdocs/langs/cs_CZ/paybox.lang b/htdocs/langs/cs_CZ/paybox.lang index 97e0a852213..629bf09cbef 100644 --- a/htdocs/langs/cs_CZ/paybox.lang +++ b/htdocs/langs/cs_CZ/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Zpráva o zrušení straně platební návratu NewPayboxPaymentReceived=Nový Paybox přijaté platby NewPayboxPaymentFailed=Nový Paybox platba snažil se ale propadal PAYBOX_PAYONLINE_SENDEMAIL=E-mail upozornit po platbě (úspěch nebo selhání) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/cs_CZ/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang index b6ce531c846..986d8018caf 100644 --- a/htdocs/langs/cs_CZ/sendings.lang +++ b/htdocs/langs/cs_CZ/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Pro tuto chvíli, je vytvoření nové zásilky RelatedShippings=Související shippings ShipmentLine=Zásilka linka CarrierList=Seznam dopravců +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Chytit zákazníka diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang index 6d9a098f4ad..33382804d83 100644 --- a/htdocs/langs/cs_CZ/stocks.lang +++ b/htdocs/langs/cs_CZ/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Sklad štítek je nutné CorrectStock=Upravit skladové zásoby ListOfWarehouses=Seznam skladů ListOfStockMovements=Seznam skladových pohybů -StocksArea=Zásoby oblast +StocksArea=Warehouses area Location=Umístění LocationSummary=Krátký název umístění NumberOfDifferentProducts=Počet různých výrobků diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang index abbe0e69a75..2083fc76f2f 100644 --- a/htdocs/langs/cs_CZ/users.lang +++ b/htdocs/langs/cs_CZ/users.lang @@ -63,7 +63,6 @@ ShowGroup=Zobrazit skupinu ShowUser=Zobrazit uživatele NonAffectedUsers=Nepřiřazení uživatelé UserModified=Uživatel úspěšně změněn -GroupModified=Skupina úspěšně změněna PhotoFile=Soubor s fotografií UserWithDolibarrAccess=Uživatel s přístupem Dolibarr ListOfUsersInGroup=Seznam uživatelů této skupiny @@ -103,7 +102,7 @@ UserDisabled=Uživatel %s zakázán UserEnabled=Uživatel %s aktivován UserDeleted=Uživatel %s odstraněn NewGroupCreated=Skupina %s vytvořena -GroupModified=Skupina úspěšně změněna +GroupModified=Group %s modified GroupDeleted=Skupina %s odstraněna ConfirmCreateContact=Jste si jisti, že chcete vytvořit účet Dolibarr k tomuto kontaktu? ConfirmCreateLogin=Jste si jisti, že chcete vytvořit účet Dolibarr pro tohoto člena? @@ -114,8 +113,10 @@ YourRole=Vaše role YourQuotaOfUsersIsReached=Vaše kvóta aktivních uživatelů je dosažena! NbOfUsers=Počet uživatelů DontDowngradeSuperAdmin=Pouze superadmin může ponížit superadmina -HierarchicalResponsible=Hierarchická odpovědnost +HierarchicalResponsible=Supervisor HierarchicView=Hierarchické zobrazení UseTypeFieldToChange=Použijte pole Typ pro změnu OpenIDURL=OpenID URL LoginUsingOpenID=Použijte OpenID pro přihlášení +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang index 9c89856e0e9..09545ace787 100644 --- a/htdocs/langs/cs_CZ/withdrawals.lang +++ b/htdocs/langs/cs_CZ/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Příjem LastWithdrawalReceipts=Poslední příjmy %s stažení WithdrawedBills=Stažené z faktury WithdrawalsLines=Abstinenční linky -RequestStandingOrderToTreat=Žádost o trvalých příkazů k léčbě -RequestStandingOrderTreated=Žádost o trvalých příkazů léčit +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Objednávky zákazníků stojící CustomerStandingOrder=Zákazník trvalý příkaz NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Odeslat Lines=Řádky StandingOrderReject=Issue a rejection -InvoiceRefused=Faktura odmítl WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Jste si jisti, že chcete zadat stažení odmítnutí pro společnost RefusedData=Datum odmítnutí RefusedReason=Důvod odmítnutí RefusedInvoicing=Fakturace odmítnutí NoInvoiceRefused=Nenabíjejte odmítnutí -InvoiceRefused=Faktura odmítl +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Postavení StatusUnknown=Neznámý StatusWaiting=Čekání @@ -76,13 +76,14 @@ WithBankUsingRIB=U bankovních účtů pomocí RIB WithBankUsingBANBIC=U bankovních účtů pomocí IBAN / BIC / SWIFT BankToReceiveWithdraw=Bankovní účet pro příjem odstoupí CreditDate=Kredit na -WithdrawalFileNotCapable=Nelze vytvářet stažení příjmu soubor pro vaši zemi +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/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang index 337a0eb1773..789f9d8a0ff 100644 --- a/htdocs/langs/da_DK/accountancy.lang +++ b/htdocs/langs/da_DK/accountancy.lang @@ -25,134 +25,134 @@ Selectchartofaccounts=Vælg en kontoplan Validate=Godkend Addanaccount=Tilføj en regnskabsmæssig konto AccountAccounting=Regnskabsmæssig konto -Ventilation=Ventilation +Ventilation=Sammenbrud ToDispatch=Afsend -Dispatched=Dispatched +Dispatched=Afsendt -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers -TradeMargin=Trade margin -Reports=Reports -ByCustomerInvoice=By invoices customers -ByMonth=By Month -NewAccount=New accounting account -Update=Update -List=List -Create=Create -UpdateAccount=Modification of an accounting account -UpdateMvts=Modification of a movement -WriteBookKeeping=Record accounts in general ledger -Bookkeeping=General ledger -AccountBalanceByMonth=Account balance by month +CustomersVentilation=Udspecificer kunder +SuppliersVentilation=Udspecificer leverandører +TradeMargin=Handelsforskel +Reports=Reporter +ByCustomerInvoice=Efter fakturakunder +ByMonth=Efter måned +NewAccount=By regnskabskonto +Update=Opdater +List=Liste +Create=Opret +UpdateAccount=Ændring af en regnskabsmæssig konto +UpdateMvts=Ændring af en bevægelse +WriteBookKeeping=Optage konti i kontoplanen +Bookkeeping=Kontoplan +AccountBalanceByMonth=Kontobalance efter måned -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer -Line=Line +AccountingVentilation=Udspecificer regnskab +AccountingVentilationSupplier=Udspecificer regnskab leverandører +AccountingVentilationCustomer=Udspecificer regnskab kunder +Line=Linje -CAHTF=Total purchase supplier HT -InvoiceLines=Lines of invoice to be ventilated -InvoiceLinesDone=Ventilated lines of invoice -IntoAccount=In the accounting account +CAHTF=Samlet køb leverandør +InvoiceLines=Linjer af faktura, der skal fornyes +InvoiceLinesDone=Fornyede linjer af faktura +IntoAccount=I den regnskabsmæssige konto -Ventilate=Ventilate -VentilationAuto=Automatic ventilation +Ventilate=Forny +VentilationAuto=Udspecificer automatisk -Processing=Processing -EndProcessing=The end of processing -AnyLineVentilate=Any lines to ventilate -SelectedLines=Selected lines -Lineofinvoice=Line of invoice -VentilatedinAccount=Ventilated successfully in the accounting account -NotVentilatedinAccount=Not ventilated in the accounting account +Processing=Forarbejde +EndProcessing=Forarbejdet +AnyLineVentilate=Linjer, der skal fornyes +SelectedLines=Valgte linjer +Lineofinvoice=Fakturalinjer +VentilatedinAccount=Fornyet med succes i den regnskabsmæssige konto +NotVentilatedinAccount=Ikke fornyede i den regnskabsmæssige konto ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements -AccountLength=Length of the accounting accounts shown in Dolibarr -AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts +AccountLength=Længde af regnskabssystemet konti i Dolibarr +AccountLengthDesc=Funktion gør det muligt at foregive en længde på regnskabsmæssig konto ved at erstatte mellemrum med tallet nul. Da denne funktion kun vises på skærmen ændrer det ikke ved de bogføring registreret i Dolibarr konti. For eksport, er det nødvendigt denne funktion til at være kompatibel med bestemt software. +ACCOUNTING_LENGTH_GACCOUNT=Længde af det almindelige regnskab +ACCOUNTING_LENGTH_AACCOUNT=Længde af de tredjeparts-konti -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal -ACCOUNTING_CASH_JOURNAL=Cash journal -ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTING_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Salgskladde +ACCOUNTING_PURCHASE_JOURNAL=Indkøbskladde +ACCOUNTING_BANK_JOURNAL=Bankkladde +ACCOUNTING_CASH_JOURNAL=Kontantkladde +ACCOUNTING_MISCELLANEOUS_JOURNAL=Diversekladde +ACCOUNTING_SOCIAL_JOURNAL=Socialkladde -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto overførsel +ACCOUNTING_ACCOUNT_SUSPENSE=Ventende konto -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskab konto som standard for købte produkter (hvis ikke defineret i produktark) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Regnskab konto som standard for de solgte produkter (hvis ikke defineret i produktark) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Regnskab konto som standard for de indkøbte tjenester (hvis ikke defineret i tjeneste ark) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Regnskab konto som standard for de solgte ydelser (hvis ikke defineret i tjeneste ark) -Doctype=Type of document -Docdate=Date +Doctype=Dokumenttype +Docdate=Dato Docref=Reference -Numerocompte=Account -Code_tiers=Thirdparty -Labelcompte=Label account -Debit=Debit -Credit=Credit -Amount=Amount +Numerocompte=Konto +Code_tiers=Trediepart +Labelcompte=Kontonavn +Debit=Debet +Credit=Kredit +Amount=Beløb Sens=Sens Codejournal=Journal -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Slet posterne i kontoplanen -SellsJournal=Sells journal -PurchasesJournal=Purchases journal -DescSellsJournal=Sells journal -DescPurchasesJournal=Purchases journal -BankJournal=Bank journal -DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Cash journal -DescCashJournal=Cash journal including the type of payment cash +SellsJournal=Salgskladde +PurchasesJournal=Købskladde +DescSellsJournal=Salgskladde +DescPurchasesJournal=Købskladde +BankJournal=Bankjournal +DescBankJournal=Bankkladden herunder alle de typer af andre betalinger end kontanter +CashJournal=Kontantkladde +DescCashJournal=Kontantkladde herunder betalinger med kontanter -CashPayment=Cash Payment +CashPayment=Kontant betaling -SupplierInvoicePayment=Payment of invoice supplier -CustomerInvoicePayment=Payment of invoice customer +SupplierInvoicePayment=Betaling af leverandørfakturaer +CustomerInvoicePayment=Betaling af kundefaktura -ThirdPartyAccount=Thirdparty account +ThirdPartyAccount=Tredjepart konto -NewAccountingMvt=New movement -NumMvts=Number of movement -ListeMvts=List of the movement -ErrorDebitCredit=Debit and Credit cannot have a value at the same time +NewAccountingMvt=Ny bevægelse +NumMvts=Antal bevægelser +ListeMvts=Liste af bevægelser / kontokort +ErrorDebitCredit=Debet og kredit kan ikke have en værdi på samme tid -ReportThirdParty=List thirdparty account -DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts +ReportThirdParty=Tredjeparts konto liste +DescThirdPartyReport=Gå til en liste over de tredjeparts kunder og leverandører og deres regnskabssystemer konti -ListAccounts=List of the accounting accounts +ListAccounts=Liste over de regnskabsmæssige konti -Pcgversion=Version of the plan -Pcgtype=Class of account -Pcgsubtype=Under class of account -Accountparent=Root of the account -Active=Statement +Pcgversion=Version af planen +Pcgtype=Kontoens klasse +Pcgsubtype=Kontoens underklasse +Accountparent=Roden af kontoen +Active=Erklæring -NewFiscalYear=New fiscal year +NewFiscalYear=Nyt finansår -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers -TotalVente=Total turnover HT -TotalMarge=Total sales margin -DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account -DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account -ChangeAccount=Change the accounting account for lines selected by the account: +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers +TotalVente=Samlet omsætning +TotalMarge=Samlet salgsforskel +DescVentilDoneCustomer=Gå til en liste over de linjer af fakturaer kunder og deres regnskabskonto +DescVentilTodoCustomer=Forny dine linjer ag kundefaktura med en regnskabskonto +ChangeAccount=Skift den regnskabsmæssige konto for strækninger, der er udvalgt af hensyn til: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers -DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account -DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers +DescVentilTodoSupplier=Forny dine linier af faktura leverandører med en regnskabskonto +DescVentilDoneSupplier=Gå til en liste over de linjer af fakturaer leverandør og deres regnskabskonto -ValidateHistory=Validate Automatically +ValidateHistory=Forny automatisk -ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used +ErrorAccountancyCodeIsAlreadyUse=Fejl, kan du ikke slette denne regnskabsmæssige konto, fordi den bruges -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index e5fac958742..fc44078647d 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 @@ -360,21 +363,21 @@ SecurityTokenIsUnique=Brug en unik securekey parameter for hver enkelt webadress EnterRefToBuildUrl=Indtast reference for objekter %s GetSecuredUrl=Få beregnet URL ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons -OldVATRates=Old VAT rate -NewVATRates=New VAT rate +OldVATRates=Gammel moms sats +NewVATRates=Ny moms sats PriceBaseTypeToChange=Modify on prices with base reference value defined on MassConvert=Launch mass convert String=String -TextLong=Long text +TextLong=Lang tekst Int=Integer Float=Float -DateAndTime=Date and hour -Unique=Unique +DateAndTime=Dato og tid +Unique=Unik Boolean=Boolean (Checkbox) ExtrafieldPhone = Telefon ExtrafieldPrice = Pris ExtrafieldMail = EMail -ExtrafieldSelect = Select list +ExtrafieldSelect = Vælg liste ExtrafieldSelectList = Select from table ExtrafieldSeparator=Separator ExtrafieldCheckBox=Checkbox @@ -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=Standard link ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) ExternalModule=External module - Installed into directory %s BarcodeInitForThirdparties=Mass barcode init for thirdparties @@ -437,14 +440,14 @@ Module52Name=Lagre Module52Desc=Lagre 'håndtering af produkter Module53Name=Services Module53Desc=Services' ledelse -Module54Name=Kontrakter -Module54Desc=Kontrakter og tjenesteydelserne forvaltning +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Stregkoder 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=Projekter -Module400Desc=Projekter 'håndtering indeni andre moduler +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Adviséringer -Module600Desc=Send meddelelser (via email) på Dolibarr business-arrangementer +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donationer Module700Desc=Gaver 'ledelse Module1200Name=Mantis @@ -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 @@ -514,23 +521,23 @@ Module5000Name=Multi-selskab Module5000Desc=Giver dig mulighed for at administrere flere selskaber Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Helligdage -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Cash desk modul -Module50200Name= Paypal -Module50200Desc= Modul til at tilbyde en online betaling side med kreditkort med Paypal +Module50200Name=Paypal +Module50200Desc=Modul til at tilbyde en online betaling side med kreditkort med 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 +Module59000Name=Margin Module59000Desc=Module to manage margins Module60000Name=Commissions Module60000Desc=Module to manage commissions @@ -606,15 +613,16 @@ Permission151=Læs stående ordrer Permission152=Setup stående ordrer Permission153=Læs stående ordrer kvitteringer Permission154=Credit / afvise stående ordrer kvitteringer -Permission161=Læs kontrakter -Permission162=Opret / ændre kontrakter -Permission163=Aktiver en tjeneste af en kontrakt -Permission164=Deaktivere en tjeneste af en kontrakt -Permission165=Slet kontrakter -Permission171=Læs ture -Permission172=Opret / ændre ture -Permission173=Slet ture -Permission178=Eksporter ture +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Læs leverandører Permission181=Læs leverandør ordrer Permission182=Opret / ændre leverandør ordrer @@ -671,7 +679,7 @@ Permission300=Læs stregkoder Permission301=Opret / ændre stregkoder Permission302=Slet stregkoder Permission311=Læs tjenester -Permission312=Tildel service til kontrakt +Permission312=Assign service/subscription to contract Permission331=Læs bogmærker Permission332=Opret / ændre bogmærker Permission333=Slet bogmærker @@ -701,8 +709,8 @@ Permission701=Læs donationer Permission702=Opret / ændre donationer Permission703=Slet donationer Permission1001=Læs bestande -Permission1002=Opret / ændre bestande -Permission1003=Slet bestande +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Læs bestand bevægelser Permission1005=Opret / ændre status bevægelser Permission1101=Læs levering ordrer @@ -778,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=E-mail skabeloner SetupSaved=Setup gemt BackToModuleList=Tilbage til moduler liste BackToDictionaryList=Back to dictionaries list @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Retur en regnskabspool kode bygget af %s efterfulgt af ModuleCompanyCodePanicum=Retur tom regnskabspool kode. ModuleCompanyCodeDigitaria=Regnskabsmæssig kode afhænger tredjepart kode. Koden er sammensat af tegnet "C" i første position efterfulgt af de første 5 bogstaver af tredjepart kode. UseNotifications=Brug anmeldelser -NotificationsDesc=Adviséringer funktionen giver dig mulighed for at stille sende automatiske mail, for nogle Dolibarr arrangementer, til virksomheder, der er konfigureret til +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Dokumenter skabeloner DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Vandmærke på udkast til et dokument @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Tilføj leveringsdato evne UseOptionLineIfNoQuantity=En linje af produkt / service med et nul beløb anses som en mulighed FreeLegalTextOnProposal=Fri tekst på kommercielle forslag WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Ordrer «forvaltning setup OrdersNumberingModules=Ordrer nummerressourcer moduler @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=At validere den rækkefølge efter forslag tættere sammen, gør det muligt ikke at træde ved den foreløbige kendelse FreeLegalTextOnOrders=Fri tekst om ordrer WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Klik for at ringe modul opsætning ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises
    __PHONETO__ qui sera remplacé par le téléphone de l'appelé
    __PHONEFROM__ qui sera remplacé par le téléphone de l'appelant (le votre)
    __LOGIN__ qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)
    __PASS__ qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention nummerressourcer moduler TemplatePDFInterventions=Intervention kortet dokumenter modeller WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Kontrakter modul opsætning +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Kontrakter nummerering moduler TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Produkter modul opsætning ServiceSetup=Services modul opsætning @@ -1382,9 +1393,10 @@ MailingSetup=Emailing modul opsætning MailingEMailFrom=Afsender E-mail (Fra) for e-mails sendt med e-mail-modulet MailingEMailError=Retur EMail (Fejl-til) for e-mails med fejl ##### Notification ##### -NotificationSetup=Mailing modul opsætning +NotificationSetup=EMail notification module setup NotificationEMailFrom=Afsender E-mail (Fra) for e-mails sendt til anmeldelser -ListOfAvailableNotifications=Liste over tilgængelige meddelelser (Denne liste afhænger af aktiverede moduler) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sender modul opsætning SendingsReceiptModel=Afsendelse modtagelsen model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Forbindelse til server ' %s' på database' %s' med brugeren ' % OSCommerceTestKo1=Forbindelse til server ' %s' lykkes men database' %s' kunne ikke være nået. OSCommerceTestKo2=Forbindelse til server ' %s' med brugeren' %s' mislykkedes. ##### Stock ##### -StockSetup=Konfiguration modul lager -UserWarehouse=Brug brugerens personlige bestande +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu slettet TreeMenu=Træ menuer @@ -1478,11 +1491,14 @@ ClickToDialDesc=Dette modul giver mulighed for at tilføje et ikon efter telefon ##### Point Of Sales (CashDesk) ##### CashDesk=Point of salg CashDeskSetup=Cash desk modul opsætning -CashDeskThirdPartyForSell=Generic tredjepart bruge til sælger +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Cash konto til brug for sælger CashDeskBankAccountForCheque= Konto til at bruge til at modtage betalinger med check CashDeskBankAccountForCB= Konto til at bruge til at modtage kontant betaling ved kreditkort -CashDeskIdWareHouse=Datawarehous til brugeren for sælger +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. ##### Bookmark ##### BookmarkSetup=Bogmærkemodulet setup BookmarkDesc=Dette modul giver dig mulighed for at håndtere bogmærker. Du kan også tilføje genveje til enhver Dolibarr sider eller externale websteder på din venstre menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang index b6fda1fb5ee..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 @@ -41,9 +42,10 @@ AutoActions= Automatisk påfyldning af dagsorden AgendaAutoActionDesc= Definer her begivenheder, som du vil Dolibarr at skabe automatisk en indsats på dagsordenen. Hvis det ikke er kontrolleret (som standard), kun manuel foranstaltninger vil blive inkluderet i dagsordenen. AgendaSetupOtherDesc= Denne side giver mulighed for at konfigurere andre parametre af dagsorden-modulet. AgendaExtSitesDesc=Denne side giver mulighed for at erklære eksterne kalendere til at se deres begivenheder i Dolibarr dagsorden. -ActionsEvents= Begivenheder, for hvilke Dolibarr vil skabe en indsats på dagsordenen automatisk -PropalValidatedInDolibarr= Forslag valideret -InvoiceValidatedInDolibarr= Faktura valideret +ActionsEvents=Begivenheder, for hvilke Dolibarr vil skabe en indsats på dagsordenen automatisk +PropalValidatedInDolibarr=Forslag valideret +InvoiceValidatedInDolibarr=Faktura valideret +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Faktura %s gå tilbage til udkast til status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Bestil valideret @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Bestil %s godkendt OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Bestil %s gå tilbage til udkast til status OrderCanceledInDolibarr=Bestil %s annulleret -InterventionValidatedInDolibarr=Intervention %s valideret ProposalSentByEMail=Kommercielle forslag %s sendt via e-mail OrderSentByEMail=Kunde ordre %s sendt via e-mail InvoiceSentByEMail=Kundefaktura %s sendt via e-mail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Leverandør ordre %s sendt via e-mail SupplierInvoiceSentByEMail=Leverandørfaktura %s sendt via e-mail ShippingSentByEMail=Forsendelse %s sendt via e-mail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sendt via e-mail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Tredjepart skabt DateActionPlannedStart= Planlagt startdato DateActionPlannedEnd= Planlagte slutdato @@ -70,9 +69,9 @@ DateActionStart= Startdato DateActionEnd= Slutdato AgendaUrlOptions1=Du kan også tilføje følgende parametre til at filtrere output: AgendaUrlOptions2=login=login= %s for at begrænse produktionen til aktioner skabt af, påvirkes i eller udføres af brugeren %s. -AgendaUrlOptions3=logina=logina= %s for at begrænse produktionen til aktioner skabt af brugeren %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=logint= %s for at begrænse produktionen til aktioner påvirket til brugeren %s. -AgendaUrlOptions5=logind=logind= %s for at begrænse produktionen til aktioner udført af brugeren %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Vis fødselsdag kontakter AgendaHideBirthdayEvents=Skjul fødselsdag kontakter Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL for at få adgang. ICal fil ExtSiteNoLabel=Ingen beskrivelse WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang index a626c6d6e26..eb55c6333a6 100644 --- a/htdocs/langs/da_DK/bills.lang +++ b/htdocs/langs/da_DK/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit note InvoiceAvoirAsk=Credit note til korrekt faktura InvoiceAvoirDesc=Kreditformidleren note er et negativt faktura anvendes til at løse forhold, at en faktura er et beløb, der adskiller sig end beløbet reelt betales (fordi kunden betalt for meget ved en fejl, eller vil ikke betales helt, da han vendte tilbage nogle varer, for eksempel).

    Bemærk: Original faktura skal allerede være lukket ( »betalt« eller »betales delvist) at tillade oprettelsen af en kreditnota på det. invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Erstat faktura %s ReplacementInvoice=Erstatning faktura ReplacedByInvoice=Erstattes af faktura %s @@ -87,7 +87,7 @@ ClassifyCanceled=Klassificere 'Abandoned " ClassifyClosed=Klassificere "lukket" ClassifyUnBilled=Classify 'Unbilled' CreateBill=Opret Faktura -AddBill=Tilføj faktura eller kreditnota +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Slet faktura SearchACustomerInvoice=Søg en kunde faktura @@ -99,7 +99,7 @@ DoPaymentBack=Må betale tilbage ConvertToReduc=Konverter til fremtidige rabat EnterPaymentReceivedFromCustomer=Indtast betaling er modtaget fra kunden EnterPaymentDueToCustomer=Foretag betaling til kunde -DisabledBecauseRemainderToPayIsZero=Handicappede, fordi resten til at betale er nul +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Mængde PriceBase=Pris base BillStatus=Faktura status @@ -137,8 +137,6 @@ BillFrom=Fra BillTo=Bill til ActionsOnBill=Aktioner på faktura NewBill=Ny faktura -Prélèvements=Stående ordre -Prélèvements=Stående ordre LastBills=Seneste %s fakturaer LastCustomersBills=Seneste %s kunder fakturaer LastSuppliersBills=Seneste %s leverandører fakturaer @@ -156,9 +154,9 @@ ConfirmCancelBill=Er du sikker på du vil annullere faktura %s? ConfirmCancelBillQuestion=hvorfor har du lyst til at klassificere denne faktura 'opgivet'? ConfirmClassifyPaidPartially=Er du sikker på du vil ændre faktura %s til status betales? ConfirmClassifyPaidPartiallyQuestion=Denne faktura er ikke blevet betalt fuldt ud. Hvad er årsagerne til dig for at lukke denne faktura? -ConfirmClassifyPaidPartiallyReasonAvoir=Restbeløb til at betale ( %s %s) er en rabat, der ydes, fordi betalingen var foretaget før sigt. Jeg legalisere moms med en kreditnota. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløb til at betale ( %s %s) er en rabat, der ydes, fordi betalingen var foretaget før sigt. Jeg accepterer at miste momsen på denne rabat. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Restbeløb til at betale ( %s %s) er en rabat, der ydes, fordi betalingen var foretaget før sigt. Jeg inddrive moms på denne rabat uden en kreditnota. +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 kunde ConfirmClassifyPaidPartiallyReasonProductReturned=Produkter delvist tilbage ConfirmClassifyPaidPartiallyReasonOther=Beløb opgives for andre grunde @@ -191,9 +189,9 @@ AlreadyPaid=Allerede betales AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uden kreditter og indlån) Abandoned=Opgives -RemainderToPay=Restbeløb til at betale -RemainderToTake=Restbeløb at tage -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Beløb hævdede ExcessReceived=Trop Peru @@ -219,19 +217,18 @@ NoInvoice=Nr. faktura ClassifyBill=Klassificere faktura SupplierBillsToPay=Leverandører fakturaer til at betale CustomerBillsUnpaid=Vederlagsfri kunder fakturaer -DispenseMontantLettres=Les factures rdiges par procdsmcanographiques sont dispenserer de l'arrt da lettres -DispenseMontantLettres=Les factures rdiges par procdsmcanographiques sont dispenserer de l'arrt da lettres +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Ikke-refunderbar SetConditions=Indstil aflønningsvilkår SetMode=Indstil betaling mode Billed=Billed -RepeatableInvoice=Prædefinerede faktura -RepeatableInvoices=Prædefinerede fakturaer -Repeatable=Forhånd definerede -Repeatables=Forhånd definerede -ChangeIntoRepeatableInvoice=Konverter til på forhånd definerede -CreateRepeatableInvoice=Opret prædefinerede faktura -CreateFromRepeatableInvoice=Opret fra prædefinerede faktura +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Kunden fakturaer og fakturaer 'linjer CustomersInvoicesAndPayments=Kunden fakturaer og betalinger ExportDataset_invoice_1=Kunden fakturaer listen og fakturaer 'linjer diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang index 2fc58208e0b..ec63e24aba0 100644 --- a/htdocs/langs/da_DK/categories.lang +++ b/htdocs/langs/da_DK/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang index 6f13a305bb5..ded8d2c0619 100644 --- a/htdocs/langs/da_DK/compta.lang +++ b/htdocs/langs/da_DK/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad kunde regnskabspool kode for %s SuppliersProductsSellSalesTurnover=Det gav en omsætning fra salg af leverandørernes produkter. CheckReceipt=Check depositum CheckReceiptShort=Check depositum +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Ny rabat NewCheckDeposit=Ny check depositum NewCheckDepositOn=Ny tjekke depositum på konto: %s @@ -196,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 12f369aa227..73a7e126d9e 100644 --- a/htdocs/langs/da_DK/contracts.lang +++ b/htdocs/langs/da_DK/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Kontrakter område ListOfContracts=Liste over kontrakter -LastContracts=Seneste %s modificerede kontrakter +LastModifiedContracts=Last %s modified contracts AllContracts=Alle kontrakter ContractCard=Kontrakt-kortet ContractStatus=Kontrakt status @@ -27,7 +27,7 @@ MenuRunningServices=Kørsel tjenester MenuExpiredServices=Udløbet tjenester MenuClosedServices=Lukket tjenester NewContract=Ny kontrakt -AddContract=Tilføj kontrakt +AddContract=Create contract SearchAContract=Søg en kontrakt DeleteAContract=Slet en kontrakt CloseAContract=Luk en kontrakt @@ -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=Seneste %s modificerede kontrakter +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/cron.lang b/htdocs/langs/da_DK/cron.lang index cad7937a1d9..344ff0127ac 100644 --- a/htdocs/langs/da_DK/cron.lang +++ b/htdocs/langs/da_DK/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = Om -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job CronNone= Ingen CronDtStart=Startdato CronDtEnd=Slutdato -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe CronMethod=Metode CronModule=Modul -# CronAction=Action +CronAction=Action CronStatus=Status CronStatusActive=Aktiveret CronStatusInactive=Deaktiveret -# CronNoJobs=No jobs registered +CronNoJobs=No jobs registered CronPriority=Prioritet CronLabel=Beskrivelse -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create CronArgs=Parametre -# CronSaveSucess=Save succesfully +CronSaveSucess=Save succesfully CronNote=Kommentar -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable CronStatusInactiveBtn=Deaktivere -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/da_DK/donations.lang b/htdocs/langs/da_DK/donations.lang index c56faabf697..64929d78199 100644 --- a/htdocs/langs/da_DK/donations.lang +++ b/htdocs/langs/da_DK/donations.lang @@ -4,7 +4,7 @@ Donations=Donationer DonationRef=Donation ref. Donor=Donor Donors=Donorer -AddDonation=Tilføj en donation +AddDonation=Create a donation NewDonation=Ny donation ShowDonation=Show donation DonationPromise=Gave løfte @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/da_DK/externalsite.lang index 5e2a8deccc6..0df00764d24 100644 --- a/htdocs/langs/da_DK/externalsite.lang +++ b/htdocs/langs/da_DK/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite ExternalSiteSetup=Opsætning link til ekstern hjemmeside ExternalSiteURL=Ekstern webstedwebadresse -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang index c0e60a8f9fa..ad2a6324a0f 100644 --- a/htdocs/langs/da_DK/holiday.lang +++ b/htdocs/langs/da_DK/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Opdatering CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Navn Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Værdi -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang index 7c45fec1cd1..efb080c2be4 100644 --- a/htdocs/langs/da_DK/interventions.lang +++ b/htdocs/langs/da_DK/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Interventioner InterventionCard=Intervention kortet NewIntervention=Ny intervention -AddIntervention=Tilføj intervention +AddIntervention=Create intervention ListOfInterventions=Liste over interventioner EditIntervention=Editer intervention ActionsOnFicheInter=Handlinger om intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Relaterede interventioner ShowIntervention=Vis indgreb SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Repræsentant opfølgning intervention TypeContact_fichinter_internal_INTERVENING=Mellemliggende diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang index ba38add1b39..3a8d4d24d72 100644 --- a/htdocs/langs/da_DK/mails.lang +++ b/htdocs/langs/da_DK/mails.lang @@ -115,7 +115,7 @@ SentBy=Sendt af 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=Du kan dog sende dem online ved at tilføje parameteren MAILING_LIMIT_SENDBYWEB med værdien af max antal e-mails, du vil sende ved session. 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Ryd liste ToClearAllRecipientsClickHere=At rydde modtagernes liste for denne e-mail, skal du klikke på knappen ToAddRecipientsChooseHere=Hvis du vil tilføje modtagere, skal du vælge i disse lister @@ -133,6 +133,9 @@ Notifications=Adviséringer NoNotificationsWillBeSent=Ingen e-mail-meddelelser er planlagt for denne begivenhed, og selskabet ANotificationsWillBeSent=1 anmeldelse vil blive sendt via email SomeNotificationsWillBeSent=%s meddelelser vil blive sendt via email -AddNewNotification=Aktivere en ny anmeldelse anmodning -ListOfActiveNotifications=List alle aktive meddelelser anmodninger +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List alle e-mail meddelelser +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang index fd5b87cdb3d..276eb8d3f3f 100644 --- a/htdocs/langs/da_DK/main.lang +++ b/htdocs/langs/da_DK/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Kunne ikke finde bruger %s i Doliba ErrorNoVATRateDefinedForSellerCountry=Fejl, der ikke momssatser defineret for land ' %s'. ErrorNoSocialContributionForSellerCountry=Fejl, ingen social bidrag type der er defineret for landets %s '. ErrorFailedToSaveFile=Fejl, kunne ikke gemme filen. -ErrorOnlyPngJpgSupported=Fejl, kun. Png og. Jpg billedformat filen understøttes. -ErrorImageFormatNotSupported=Din PHP understøtter ikke funktioner til at konvertere billeder af dette format. SetDate=Set date SelectDate=Select a date SeeAlso=Se også %s BackgroundColorByDefault=Standard baggrundsfarve +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=En fil er valgt for udlæg, men endnu ikke var uploadet. Klik på "Vedhæft fil" for dette. NbOfEntries=Nb af tilmeldinger GoToWikiHelpPage=Læs online hjælp (har brug for Internet-adgang) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Måned fra den dato HourShort=H +MinuteShort=mn Rate=Hyppighed UseLocalTax=Incl. afgift Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Fuldstændig liste Statistics=Statistik OtherStatistics=Andre statistik Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. leverandør @@ -365,6 +367,7 @@ ActionsOnCompany=Aktioner om denne tredjepart ActionsOnMember=Events Om dette medlem NActions=%s aktioner NActionsLate=%s sent +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Fjern filter ChartGenerated=Chart genereret @@ -645,6 +648,7 @@ OptionalFieldsSetup=Ekstra attributter opsætning URLPhoto=Url af foto / logo SetLinkToThirdParty=Link til en anden tredjepart CreateDraft=Opret udkast +SetToDraft=Back to draft ClickToEdit=Klik for at redigere ObjectDeleted=Objekt %s slettet ByCountry=Efter land @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Mandag Tuesday=Tirsdag diff --git a/htdocs/langs/da_DK/margins.lang b/htdocs/langs/da_DK/margins.lang index ca2f9395132..7ced0e4fc68 100644 --- a/htdocs/langs/da_DK/margins.lang +++ b/htdocs/langs/da_DK/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=Produkt eller tjeneste AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=Startdato EndDate=Slutdato Launch=Start - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/da_DK/orders.lang index 462baf963c3..ad1730360a9 100644 --- a/htdocs/langs/da_DK/orders.lang +++ b/htdocs/langs/da_DK/orders.lang @@ -2,7 +2,7 @@ OrdersArea=Kunder ordrer område SuppliersOrdersArea=Leverandører ordrer område OrderCard=Bestil kort -# OrderId=Order Id +OrderId=Order Id Order=Rækkefølge Orders=Ordrer OrderLine=Bestil online @@ -28,7 +28,7 @@ StatusOrderCanceledShort=Annulleret StatusOrderDraftShort=Udkast StatusOrderValidatedShort=Valideret StatusOrderSentShort=I proces -# StatusOrderSent=Shipment in process +StatusOrderSent=Shipment in process StatusOrderOnProcessShort=Den proces StatusOrderProcessedShort=Forarbejdede StatusOrderToBillShort=Til lovforslag @@ -53,9 +53,9 @@ ShippingExist=En forsendelse eksisterer DraftOrWaitingApproved=Udkast til eller godkendt endnu ikke bestilt DraftOrWaitingShipped=Udkast til eller valideres endnu ikke afsendt MenuOrdersToBill=Ordrer til lovforslag -# MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Search for -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=Skib produkt Discount=Discount CreateOrder=Opret Order @@ -65,14 +65,14 @@ ValidateOrder=Valider orden UnvalidateOrder=Unvalidate rækkefølge DeleteOrder=Slet orden CancelOrder=Annuller ordre -AddOrder=Tilføj orden +AddOrder=Create order AddToMyOrders=Føj til mine ordrer AddToOtherOrders=Føj til andre ordrer -# AddToDraftOrders=Add to draft order +AddToDraftOrders=Add to draft order ShowOrder=Vis for NoOpenedOrders=Nr. åbnet ordrer NoOtherOpenedOrders=Ingen andre åbnet ordrer -# NoDraftOrders=No draft orders +NoDraftOrders=No draft orders OtherOrders=Andre kendelser LastOrders=Seneste %s ordrer LastModifiedOrders=Seneste %s modificerede ordrer @@ -82,7 +82,7 @@ NbOfOrders=Antal ordrer OrdersStatistics=Orders »statistik OrdersStatisticsSuppliers=Leverandør ordrer «statistik NumberOfOrdersByMonth=Antallet af ordrer efter måned -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=Liste af ordrer CloseOrder=Luk for ConfirmCloseOrder=Er du sikker på du ønsker at lukke denne ordre? Når en ordre er afsluttet, kan den kun blive faktureret. @@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Er du sikker på du vil genoprette ro og orden %s ConfirmCancelOrder=Er du sikker på du vil annullere denne ordre? ConfirmMakeOrder=Er du sikker på du vil bekræfte, du har foretaget denne ordre på %s? GenerateBill=Generer faktura -# ClassifyShipped=Classify delivered +ClassifyShipped=Classify delivered ClassifyBilled=Klassificere "Billed" ComptaCard=Regnskabsmæssig kortet DraftOrders=Udkast til ordrer @@ -101,7 +101,6 @@ RelatedOrders=Relaterede ordrer OnProcessOrders=Den proces ordrer RefOrder=Ref. rækkefølge RefCustomerOrder=Ref. kunde for -CustomerOrder=Kunden for RefCustomerOrderShort=Ref. kunde. rækkefølge SendOrderByMail=Send ordre ved mail ActionsOnOrder=Aktioner på bestilling @@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstant COMMANDE_SUPPLIER_ADDON ikke d Error_COMMANDE_ADDON_NotDefined=Konstant COMMANDE_ADDON ikke defineret Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Det lykkedes ikke at indlæse modulet fil ' %s' Error_FailedToLoad_COMMANDE_ADDON_File=Det lykkedes ikke at indlæse modulet fil ' %s' -# Error_OrderNotChecked=No orders to invoice selected - - +Error_OrderNotChecked=No orders to invoice selected # Sources OrderSource0=Kommerciel forslag OrderSource1=Internet @@ -144,25 +141,22 @@ OrderSource5=Kommerciel OrderSource6=Opbevare QtyOrdered=Qty bestilt AddDeliveryCostLine=Tilføj en leveringsrapport omkostninger linje angiver vægten af den rækkefølge - # Documents models PDFEinsteinDescription=En fuldstændig orden model (logo. ..) PDFEdisonDescription=En simpel orden model -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes OrderByMail=Mail OrderByFax=Fax OrderByEMail=EMail OrderByWWW=Online OrderByPhone=Telefon - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/da_DK/oscommerce.lang b/htdocs/langs/da_DK/oscommerce.lang deleted file mode 100644 index 7b83c7528c2..00000000000 --- a/htdocs/langs/da_DK/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul opsætning -OSCommerceSetupSaved=OS Commerce opsætning gemmes -OSCommerceServer=OS Commerce Server host / ip -OSCommerceDatabaseName=OS Commerce databasenavn -OSCommercePrefix=OS Commerce tabeller præfiks -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang index 5819f3c5e4e..3195ac89360 100644 --- a/htdocs/langs/da_DK/other.lang +++ b/htdocs/langs/da_DK/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Sikkerhedskode Calendar=Kalender -AddTrip=Tilføj tur Tools=Værktøj ToolsDesc=Dette område er dedikeret til gruppen diverse værktøjer ikke er tilgængelige til andre menupunkter.

    Disse værktøjer kan nås fra menuen på siden. Birthday=Fødselsdag @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Antal vedhæftede filer / dokumenter TotalSizeOfAttachedFiles=Samlede størrelse på vedhæftede filer / dokumenter MaxSize=Maksimumstørrelse @@ -80,6 +80,16 @@ ModifiedBy=Modificeret af %s ValidatedBy=Attesteret af %s CanceledBy=Annulleret af %s ClosedBy=Lukket af %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Fil blev slettet DirWasRemoved=Directory blev fjernet FeatureNotYetAvailableShort=Fås i en kommende version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Tilføj post i kalenderen %s -NewCompanyToDolibarr=Company %s tilføjede i Dolibarr -ContractValidatedInDolibarr=Kontrakt %s valideret i Dolibarr -ContractCanceledInDolibarr=Kontrakt %s annulleret i Dolibarr -ContractClosedInDolibarr=Kontrakt %s lukket i Dolibarr -PropalClosedSignedInDolibarr=Forslag %s undertegnet i Dolibarr -PropalClosedRefusedInDolibarr=Forslag %s nægtet i Dolibarr -PropalValidatedInDolibarr=Forslag %s valideret i Dolibarr -InvoiceValidatedInDolibarr=Faktura %s valideret i Dolibarr -InvoicePaidInDolibarr=Faktura %s ændret til udbetales i Dolibarr -InvoiceCanceledInDolibarr=Faktura %s annulleret i Dolibarr -PaymentDoneInDolibarr=Betaling %s gjort i Dolibarr -CustomerPaymentDoneInDolibarr=Kundens betaling %s gjort i Dolibarr -SupplierPaymentDoneInDolibarr=Leverandør betaling %s gjort i Dolibarr -MemberValidatedInDolibarr=Medlem %s valideret i Dolibarr -MemberResiliatedInDolibarr=Medlem %s resiliated i Dolibarr -MemberDeletedInDolibarr=Medlem %s slettet fra Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for medlem %s indsættes i Dolibarr -ShipmentValidatedInDolibarr=__CONTACTCIVNAME__ \n\n Forsendelse %s valideret i Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Eksport ExportsArea=Eksport område diff --git a/htdocs/langs/da_DK/paybox.lang b/htdocs/langs/da_DK/paybox.lang index fb0bd3f0211..83139d10368 100644 --- a/htdocs/langs/da_DK/paybox.lang +++ b/htdocs/langs/da_DK/paybox.lang @@ -32,6 +32,9 @@ VendorName=Navn på leverandør CSSUrlForPaymentForm=CSS stylesheet url til indbetalingskort MessageOK=Besked på validerede betaling tilbage side MessageKO=Besked om annulleret betaling tilbage side -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/da_DK/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang index 70c765930a2..feec180528b 100644 --- a/htdocs/langs/da_DK/sendings.lang +++ b/htdocs/langs/da_DK/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For øjeblikket er skabelsen af ​​en ny fors RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Fangst af kunden diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang index eb5b50f9859..78b35609b00 100644 --- a/htdocs/langs/da_DK/stocks.lang +++ b/htdocs/langs/da_DK/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse fareseddel kræves CorrectStock=Korrekt lager ListOfWarehouses=Liste over pakhuse ListOfStockMovements=Liste over lagerbevægelserne -StocksArea=Lagre område +StocksArea=Warehouses area Location=Lieu LocationSummary=Kortnavn placering NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang index 01f7e28be79..d18aa0d6e92 100644 --- a/htdocs/langs/da_DK/users.lang +++ b/htdocs/langs/da_DK/users.lang @@ -63,7 +63,6 @@ ShowGroup=Vis gruppe ShowUser=Vis bruger NonAffectedUsers=Ikke berørt brugere UserModified=Bruger modificerede held -GroupModified=Gruppen modificerede held PhotoFile=Fotofilen UserWithDolibarrAccess=Bruger med Dolibarr adgang ListOfUsersInGroup=Liste over brugere i denne gruppe @@ -103,7 +102,7 @@ UserDisabled=Bruger %s handicappede UserEnabled=Bruger %s aktiveret UserDeleted=Bruger %s fjernes NewGroupCreated=Gruppe %s oprettet -GroupModified=Gruppen modificerede held +GroupModified=Group %s modified GroupDeleted=Gruppe %s fjernes ConfirmCreateContact=Er du sikker yu ønsker at skabe et Dolibarr højde for denne kontakt? ConfirmCreateLogin=Er du sikker på at du vil oprette en Dolibarr højde for dette medlem? @@ -114,8 +113,10 @@ YourRole=Din roller YourQuotaOfUsersIsReached=Din kvote af aktive brugere er nået! NbOfUsers=Nb af brugere DontDowngradeSuperAdmin=Kun en superadmin kan nedgradere en superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang index 5e89831ee95..11dda452e35 100644 --- a/htdocs/langs/da_DK/withdrawals.lang +++ b/htdocs/langs/da_DK/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Modtagelse LastWithdrawalReceipts=Seneste %s tilbagetrækning kvitteringer WithdrawedBills=Withdrawed fakturaer WithdrawalsLines=Tilbagekøb linjer -RequestStandingOrderToTreat=Anmodning om stående ordrer til behandling -RequestStandingOrderTreated=Anmodning om stående ordrer behandles +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Kunden stående ordrer CustomerStandingOrder=Kunden stående ordre NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Metode Transmission Send=Send Lines=Lines StandingOrderReject=Udstedelse en forkaste -InvoiceRefused=Oplad afslag til kunden WithdrawalRefused=Udbetalinger Refuseds WithdrawalRefusedConfirm=Er du sikker på du vil indtaste en tilbagetrækning afvisning for samfundet RefusedData=Dato for afvisning RefusedReason=Årsag til afvisning RefusedInvoicing=Fakturering afvisningen NoInvoiceRefused=Oplad ikke afvisning -InvoiceRefused=Oplad afslag til kunden +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Ukendt StatusWaiting=Venter @@ -76,13 +76,14 @@ WithBankUsingRIB=For bankkonti ved hjælp af RIB WithBankUsingBANBIC=For bankkonti ved hjælp af IBAN / BIC / SWIFT BankToReceiveWithdraw=Bankkonto til at modtage trækker sig CreditDate=Kredit på -WithdrawalFileNotCapable=Kan ikke generere tilbagetrækning kvittering fil til dit land +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_AT/oscommerce.lang b/htdocs/langs/de_AT/oscommerce.lang deleted file mode 100644 index dfe6479ee16..00000000000 --- a/htdocs/langs/de_AT/oscommerce.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang index 5bd833c2273..96c7bf1a336 100644 --- a/htdocs/langs/de_DE/accountancy.lang +++ b/htdocs/langs/de_DE/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Kontenplan wählen Validate=Freigeben Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu AccountAccounting=Buchhaltungs Konto -Ventilation=Erörterung +Ventilation=Breakdown ToDispatch=Zu versenden Dispatched=Versandt -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Handelsspanne Reports=Berichte ByCustomerInvoice=Nach Kundenrechnungen @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=Hauptbuch AccountBalanceByMonth=Kontostand pro Monat -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Zeile CAHTF=Total purchase supplier HT @@ -56,32 +56,32 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=erörtern -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown -Processing=Processing -EndProcessing=The end of processing +Processing=Bearbeitung +EndProcessing=Das Ende der Verarbeitung AnyLineVentilate=Any lines to ventilate SelectedLines=Gewählte Zeilen Lineofinvoice=Rechnungszeile VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTING_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=CSV Trennzeichen -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal -ACCOUNTING_CASH_JOURNAL=Cash journal -ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SELL_JOURNAL=Verkaufsjournal +ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal +ACCOUNTING_BANK_JOURNAL=Bankauszug +ACCOUNTING_CASH_JOURNAL=Kassenbeleg +ACCOUNTING_MISCELLANEOUS_JOURNAL=Verschiedenes Journal ACCOUNTING_SOCIAL_JOURNAL=Social journal ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer @@ -110,9 +110,9 @@ SellsJournal=Verkaufsjournal PurchasesJournal=Einkaufsjournal DescSellsJournal=Verkaufsjournal DescPurchasesJournal=Einkaufsjournal -BankJournal=Bank journal +BankJournal=Bankauszug DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Cash journal +CashJournal=Kassenbeleg DescCashJournal=Cash journal including the type of payment cash CashPayment=Barzahlung @@ -120,7 +120,7 @@ CashPayment=Barzahlung SupplierInvoicePayment=Rechnungszahlung (Lieferant) CustomerInvoicePayment=Rechnungszahlung (Kunde) -ThirdPartyAccount=Thirdparty account +ThirdPartyAccount=Partner Konto NewAccountingMvt=Neue Änderung NumMvts=Number of movement @@ -140,14 +140,14 @@ Active=Auszug NewFiscalYear=Neues fiskalisches Jahr -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Gesamt-Spanne DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Automatisch geltend machen ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchaltungskonto nicht löschen, da es benutzt wird. -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 186ef2ef1eb..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 @@ -125,7 +127,7 @@ PHPTZ=Zeitzone der PHP-Version PHPServerOffsetWithGreenwich=PHP-Server Zeit-Offset Greenwich-Breite (Sekunden) ClientOffsetWithGreenwich=Benutzer/Browser Zeit-Offset Greenwich-Breite (Sekunden) DaylingSavingTime=Sommerzeit (Benutzer) -CurrentHour=Aktuelle Stunde +CurrentHour=Aktuelle Systemzeit CompanyTZ=Unternehmenszeitzone (Hauptunternehmen) CompanyHour=Unternehmenszeit (Hauptunternehmen) CurrentSessionTimeOut=Aktuelle Session timeout @@ -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 @@ -394,9 +397,9 @@ KeepEmptyToUseDefault=Leer lassen für Standardwert DefaultLink=Standardlink ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer überschrieben werden (jeder kann seine eigene ClickToDial-URL setzen) ExternalModule=Externes Modul - im Verzeichnis %s installiert -BarcodeInitForThirdparties=Mass barcode init for thirdparties -BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services -CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined. +BarcodeInitForThirdparties=Alle Strichcodes für Drittanbieter initialisieren +BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen +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=Verträge -Module54Desc=Vertragsverwaltung +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=Projekte -Module400Desc=Projektverwaltung in anderen Modulen +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) @@ -484,7 +487,7 @@ Module500Desc=Steuer-, Sozialbeitrags-, Dividenden- und Lohnverwaltung Module510Name=Löhne Module510Desc=Verwaltung der Angestellten-Gehälter und -Zahlungen Module600Name=Benachrichtigungen -Module600Desc=Senden Sie Benachrichtigungen (per E-Mail) zu dolibarr-Events +Module600Desc=Senden Sie Benachrichtigungen zu einigen Dolibarr-Events per E-Mail an Partner (wird pro Partner definiert) Module700Name=Spenden Module700Desc=Spendenverwaltung Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Mandantenfähigkeit Module5000Desc=Ermöglicht Ihnen die Verwaltung mehrerer Firmen Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Ferien -Module20000Desc=Melden und beobachten sie den Urlaub Ihrer Angestellten. +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 Module50100Desc=Kassenmodul -Module50200Name= Paypal -Module50200Desc= Mit diesem Modul können Sie via PayPal Online Kreditkartenzahlungen entgegennehmen +Module50200Name=Paypal +Module50200Desc=Mit diesem Modul können Sie via PayPal Online Kreditkartenzahlungen entgegennehmen 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,15 +613,16 @@ Permission151=Daueraufträge einsehen Permission152=Dauerauftragsanträge erstellen/bearbeiten Permission153=Dauerauftragsbelege übertragen Permission154=Dauerauftragsbelege kreditieren/ablehnen -Permission161=Veträge einsehen -Permission162=Verträge erstellen/bearbeiten -Permission163=Dienstleistungen in Verträgen aktivieren -Permission164=Dienstleistungen in Verträgen deaktivieren -Permission165=Verträge löschen -Permission171=Reisen lesen -Permission172=Reisen erstellen/bearbeiten -Permission173=Reisen löschen -Permission178=Reisen exportieren +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 +Permission174=Alle Reisen und Spesen einsehen +Permission178=Reisen und Spesen exportieren Permission180=Lieferanten einsehen Permission181=Lieferantenbestellungen einsehen Permission182=Lieferantenbestellungen erstellen/bearbeiten @@ -671,7 +679,7 @@ Permission300=Barcodes einsehen Permission301=Barcodes erstellen/bearbeiten Permission302=Barcodes löschen Permission311=Leistungen lesen -Permission312=Leistungen einem Vertrag zuordnen +Permission312=Leistung/Abonnement einem Vertrag zuordnen Permission331=Lesezeichen einsehen Permission332=Lesezeichen erstellen/bearbeiten Permission333=Lesezeichen löschen @@ -701,8 +709,8 @@ Permission701=Spenden einsehen Permission702=Spenden erstellen/bearbeiten Permission703=Spenden löschen Permission1001=Warenbestände einsehen -Permission1002=Warenbestände erstellen/bearbeiten -Permission1003=Warenbestände löschen +Permission1002=Warenlager erstellen/ändern +Permission1003=Warenlager löschen Permission1004=Lagerbewegungen einsehen Permission1005=Lagerbewegungen erstellen/bearbeiten Permission1101=Lieferscheine einsehen @@ -749,22 +757,22 @@ Permission50101=Benutze Kassen Permission50201=Transaktionen einsehen Permission50202=Transaktionen importieren Permission54001=Drucken -Permission55001=Read polls -Permission55002=Create/modify polls -Permission59001=Read commercial margins -Permission59002=Define commercial margins +Permission55001=Abstimmungen einsehen +Permission55002=Abstimmung erstellen/ändern +Permission59001=Margen einsehen +Permission59002=Margen definieren DictionaryCompanyType=Partnertyp -DictionaryCompanyJuridicalType=Juridical kinds of thirdparties +DictionaryCompanyJuridicalType=Gesellschaftsformen von Drittanbietern DictionaryProspectLevel=Geschäftsaussicht DictionaryCanton=Bundesland/Kanton DictionaryRegion=Regionen DictionaryCountry=Länder DictionaryCurrency=Währungen DictionaryCivility=Anredeformen -DictionaryActions=Type of agenda events +DictionaryActions=Maßnahmen DictionarySocialContributions=Sozialbeitragstypen DictionaryVAT=MwSt.-Sätze -DictionaryRevenueStamp=Amount of revenue stamps +DictionaryRevenueStamp=Anzahl der Steuermarken DictionaryPaymentConditions=Zahlungsbedingungen DictionaryPaymentModes=Zahlungsarten DictionaryTypeContact=Kontaktarten @@ -778,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 @@ -887,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 @@ -938,7 +948,7 @@ InfoDatabase=Infos Datenbank InfoPHP=Infos PHP InfoPerf=Leistungs-Informationen BrowserName=Browser Name -BrowserOS=Browser OS +BrowserOS=Betriebssystem des Browsers ListEvents=Liste aller protokollierten Ereignisse ListOfSecurityEvents=Liste der sicherheitsrelevanten Ereignisse SecurityEventsPurged=Security-Ereignisse gelöscht @@ -1038,7 +1048,6 @@ YesInSummer=Ja im Sommer OnlyFollowingModulesAreOpenedToExternalUsers=Bitte beachten: nur die folgenden Module sind für externe Nutzer verfügbar (unabhängig von deren Rechten): SuhosinSessionEncrypt=Sitzungsspeicher durch Suhosin verschlüsselt ConditionIsCurrently=Einstellung ist aktuell %s -TestNotPossibleWithCurrentBrowsers=Automatische Erkennung nicht möglich YouUseBestDriver=Sie verwenden den Treiber %s, dies ist derzeit der beste verfügbare. YouDoNotUseBestDriver=Sie verwenden Treiber %s, aber der Treiber %s wird empfohlen. NbOfProductIsLowerThanNoPb=Sie haben nur %s Produkte/Dienstleistungen in der Datenbank. Daher ist keine bestimmte Optimierung erforderlich. @@ -1049,7 +1058,7 @@ BrowserIsKO=Sie benutzen den Webbrowser %s. Dieser ist bekannt für Sicherheitsp XDebugInstalled=XDebug installiert. XCacheInstalled=XCache installiert. AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink -FieldEdition=Edition of field %s +FieldEdition=Bearbeitung von Feld %s FixTZ=Zeitzonen-Korrektur FillThisOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme mit der Zeitzone haben) GetBarCode=Erhalten Sie einen Barcode @@ -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=E-Mail-Benachrichtigungsfunktionen erlauben Ihnen den stillschweigenden Versand automatischer Benachrichtigungen zu Systemereignissen an dafür eingerichtete Partner (Kunden oder Lieferanten). +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 @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Lieferfähigkeitsdatum hinzufügen UseOptionLineIfNoQuantity=Produkt-/Servicezeilen mit Nullmenge zulässig FreeLegalTextOnProposal=Freier Rechtstext für Angebote WatermarkOnDraftProposal=Wasserzeichen auf Angebotsentwürfen (keins, falls leer) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Bestellverwaltungseinstellungen OrdersNumberingModules=Bestellnumerierungs-Module @@ -1146,6 +1156,7 @@ HideTreadedOrders=Ausblenden von bearbeiteten oder abgebrochenen Angeboten in de ValidOrderAfterPropalClosed=Zur Freigabe der Bestellung nach Schließung des Angebots (überspringt vorläufige Bestellung) FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen WatermarkOnDraftOrders=Wasserzeichen auf Entwürfen von Aufträgen (keins, wenn leer) +ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist ##### Clicktodial ##### ClickToDialSetup=Click-to-Dial Moduleinstellungen ClickToDialUrlDesc=Definieren Sie hier die URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können Sie Tags verwenden
    %%1$s wird durch die Telefonnummer des Angerufenen ersetzt
    %%2$s wird durch die Telefonnummer des Anrufers (Ihre) ersetzt
    %%3$s wird durch Ihren Benutzernamen für Click-to-Dial ersetzt (siehe Benutzerdatenblatt)
    %%4$s wird durch Ihr Click-to-Dial-Passwort ersetzt (siehe Benutzerdatenblatt). @@ -1158,9 +1169,9 @@ FicheinterNumberingModules=Intervention Nummerierung Module TemplatePDFInterventions=Intervention Karte Dokumenten Modelle WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keins, wenn leer) ##### Contracts ##### -ContractsSetup=Verträge Modul Setup +ContractsSetup=Kontrakte/Abonnements-Modul Einstellungen ContractsNumberingModules=Verträge Nummerierung Module -TemplatePDFContracts=Contracts documents models +TemplatePDFContracts=Vertragsvorlagen FreeLegalTextOnContracts=Freier Text auf Verträgen WatermarkOnDraftContractCards=Wasserzeichen auf Entwürfen von Verträgen (keins, wenn leer) ##### Members ##### @@ -1314,7 +1325,7 @@ MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled. OPCodeCache=OPCode cache NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad). -HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript) +HTTPCacheStaticResources=HTTP Cache für statische Ressourcen (CSS, img, Javascript) FilesOfTypeCached=Dateien vom Typ %s werden vom HTTP Server zwischengespeichert FilesOfTypeNotCached=Dateien vom Typ %s werden vom HTTP Server nicht zwischengespeichert FilesOfTypeCompressed=Dateien vom Typ %s werden vom HTTP Server komprimiert @@ -1322,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=Automatische Erkennung nicht möglich +TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich ##### Products ##### ProductSetup=Produktmoduleinstellungen ServiceSetup=Dienstleistungen Modul Setup @@ -1337,7 +1348,7 @@ UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl ve UseEcoTaxeAbility=Umweltabgaben unterstüzten SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Partner -ProductCodeChecker= Module for product code generation and checking (product or service) +ProductCodeChecker= Modul für Produktcode-Erstellung und -Überprüfung (Produkt oder Service) ProductOtherConf= Konfiguration Produkt-/Services ##### Syslog ##### SyslogSetup=Protokollierungsmodul-Einstellungen @@ -1368,7 +1379,7 @@ BarcodeDescISBN=Barcode vom Typ ISBN BarcodeDescC39=Barcode vom Typ C39 BarcodeDescC128=Barcode vom Typ C128 GenbarcodeLocation=Kommandozeilen-Tool zur Barcode-Generierung (von phpbarcode-Engine verwendet) -BarcodeInternalEngine=Internal engine +BarcodeInternalEngine=interne Engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### WithdrawalsSetup=Abbuchungseinstellungen @@ -1382,9 +1393,10 @@ MailingSetup=E-Mail-Kampagnenmodul-Einstellungen MailingEMailFrom=E-Mail-Absender (für ausgehende Mails) des E-Mail-Moduls MailingEMailError=Antwort-E-Mail-Adresse für unzustellbare E-Mails ##### Notification ##### -NotificationSetup=Benachrichtigungsmoduleinstellungen +NotificationSetup=E-Mail Benachrichtigungs-Einstellungen NotificationEMailFrom=E-Mail-Absender (für ausgehende Mails) des Benachrichtigungsmoduls -ListOfAvailableNotifications=Liste der verfügbaren Meldungen (Diese Liste ist abhängig von aktivierten Module) +ListOfAvailableNotifications=Liste der möglichen Benachrichtigungen, entweder pro Partner (in der Partner-Karte einzustellen) oder mit einer festen Mail-Adresse (Inhalt der Liste hängt ab von den aktivierten Modulen) +FixedEmailTarget=Festes E-Mail-Ziel ##### Sendings ##### SendingsSetup=Versandmoduleinstellungen SendingsReceiptModel=Versandbelegsvorlage @@ -1405,15 +1417,16 @@ FCKeditorForProduct=WYSIWIG Erstellung/Bearbeitung von Produkt-/Serviceinformati FCKeditorForProductDetails=WYSIWIG Erstellung/Bearbeitung der Produktdetails für alle Dokumente (Angebote, Bestellungen, Rechnungen, etc. ..)
    Achtung: Diese Option kann bei der Erstellung von PDF-Dokumenten zu Fehlern führen und ist deshalb nicht empfohlen. FCKeditorForMailing= WYSIWIG Erstellung/Bearbeitung von E-Mails FCKeditorForUserSignature=WYSIWIG Erstellung/Bearbeitung von Benutzer-Signaturen -FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing) +FCKeditorForMail=WYSIWYG Erstellung/Bearbeitung für gesamte Mail (außer Werkzeuge->eMailing) ##### OSCommerce 1 ##### OSCommerceErrorConnectOkButWrongDatabase=Datenbank-Verbindung erfolgreich, es scheint sich allerdings nicht um eine OSCommerce-Datenbank zu handeln (Key %s nicht gefunden in der Tabelle %s). OSCommerceTestOk=Verbindung zum Server '%s' für Datenbank '%s' mit Benutzer '%s' erfolgreich. 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=Lagermoduleinstellungen -UserWarehouse=Persönliche Benutzerlagerstände verwenden +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 TreeMenu=Baumansicht @@ -1448,8 +1461,8 @@ ConfirmDeleteLine=Möchten Sie diese Zeile wirklich löschen? ##### Tax ##### TaxSetup=Steuer-, Sozialbeitrags- und Dividendenmodul-Einstellungen OptionVatMode=MwSt. fällig -OptionVATDefault=Cash basis -OptionVATDebitOption=Accrual basis +OptionVATDefault=Barbestandsbasis +OptionVATDebitOption=Rückstellungsbasis OptionVatDefaultDesc=Mehrwertsteuerschuld entsteht:
    - Bei Lieferung/Zahlung für Waren
    - Bei Zahlung für Dienstleistungen OptionVatDebitOptionDesc=Mehrwertsteuerschuld entsteht:
    - Bei Lieferung/Zahlung für Waren
    - Bei Rechnungslegung (Lastschrift) für Dienstleistungen SummaryOfVatExigibilityUsedByDefault=Standardmäßiger Zeitpunkt der MwSt.-Fälligkeit in Abhängigkeit zur derzeit gewählten Option: @@ -1470,19 +1483,22 @@ AgendaSetup=Agenda-Moduleinstellungen PasswordTogetVCalExport=Passwort für den VCal-Export PastDelayVCalExport=Keine Termine exportieren die älter sind als AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) -AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view -AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view +AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignistyp automatisch in den Suchfilter für die Agenda-Ansicht übernehmen +AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen AGENDA_DEFAULT_VIEW=Welchen Reiter möchten Sie beim Öffnen der Agenda automatisch anzeigen ##### ClickToDial ##### ClickToDialDesc=Dieses Modul fügt ein Symbols nach Telefonnummern ein, bei dessen der Server unter der unten definierten URL aufgerufen wird. Diese Funktion können Sie dazu verwenden, ein Callcenter-System innerhalb dolibarrs aufzurufen, das eine Telefonnummer z.B. über ein SIP-System, für Sie wählt. ##### Point Of Sales (CashDesk) ##### CashDesk=Point of Sales CashDeskSetup=Kassenmoduleinstellungen -CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe (erforderlich) +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 -CashDeskIdWareHouse=Standard-Warenlager für Kassenverkauf (optional) +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +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 ##### BookmarkSetup=Lesezeichenmoduleinstellungen BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Lesezeichen. Außerdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen. @@ -1519,14 +1535,14 @@ ProjectsNumberingModules=Projektnumerierungsmodul ProjectsSetup=Projekteinstellungenmodul ProjectsModelModule=Projektvorlagenmodul TasksNumberingModules=Aufgaben-Nummerierungs-Modul -TaskModelModule=Tasks reports document model +TaskModelModule=Vorlage für Arbeitsberichte ##### ECM (GED) ##### ECMSetup = GED Setup ECMAutoTree = Automatic tree folder and document ##### Fiscal Year ##### FiscalYears=Fiskalische Jahre FiscalYear=Fiskalisches Jahr -FiscalYearCard=Fiscal year card +FiscalYearCard=Karte für das Geschäftsjahr NewFiscalYear=Neues fiskalisches Jahr EditFiscalYear=Fiskalisches Jahr bearbeiten OpenFiscalYear=Fiskalisches Jahr öffnen @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Fiskalisches Jahr löschen ConfirmDeleteFiscalYear=Möchten Sie dieses fiskalische Jahr wirklich löschen? Opened=Geöffnet Closed=Geschlossen - +AlwaysEditable=kann immer bearbeitet werden +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Mindestanzahl Großbuchstaben +NbNumMin=Mindestanzahl Ziffern +NbSpeMin=Mindestanzahl Sonderzeichen +NbIteConsecutive=Maximale Anzahl sich wiederholender Zeichen +NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "|", "0", "O") für die automatische Generierung +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 e0a35fc2f40..cdf2c1620ab 100644 --- a/htdocs/langs/de_DE/agenda.lang +++ b/htdocs/langs/de_DE/agenda.lang @@ -7,7 +7,7 @@ Agendas=Tagesordnungen Calendar=Kalender Calendars=Kalender LocalAgenda=Internetkalender -ActionsOwnedBy=Event owned by +ActionsOwnedBy=Maßnahme gehört AffectedTo=Zugewiesen an DoneBy=Erldedigt von Event=Aktion @@ -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 @@ -41,9 +42,10 @@ AutoActions= Automatische Befüllung der Tagesordnung AgendaAutoActionDesc= Definieren Sie hier Termine zur automatischen Übernahme in den Terminkalender. Ist nichts aktviert (Standardmäßig), umfasst der Terminkalender nur manuell eingetragene Termine. AgendaSetupOtherDesc= Diese Seite ermöglicht die Konfiguration anderer Parameter des Tagesordnungsmoduls. AgendaExtSitesDesc=Diese Seite erlaubt Ihnen externe Kalender zu konfigurieren. -ActionsEvents= Veranstaltungen zur automatischen Übernahme in die Agenda -PropalValidatedInDolibarr= Angebot freigegeben -InvoiceValidatedInDolibarr= Rechnung freigegeben +ActionsEvents=Veranstaltungen zur automatischen Übernahme in die Agenda +PropalValidatedInDolibarr=Angebot freigegeben +InvoiceValidatedInDolibarr=Rechnung freigegeben +InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen InvoiceDeleteDolibarr=Rechnung %s gelöscht OrderValidatedInDolibarr= Bestellung %s freigegeben @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Bestellen %s genehmigt OrderRefusedInDolibarr=Bestellung %s abgelehnt OrderBackToDraftInDolibarr=Bestellen %s zurück nach Draft-Status OrderCanceledInDolibarr=Auftrag storniert %s -InterventionValidatedInDolibarr=Service %s freigegeben ProposalSentByEMail=Angebot %s per E-Mail versendet OrderSentByEMail=Kundenbestellung %s per E-Mail versendet InvoiceSentByEMail=Kundenrechnung %s per E-Mail versendet @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Lieferantenbestellung %s per E-Mail versendet SupplierInvoiceSentByEMail=Lieferantenrechnung %s per E-Mail versendet ShippingSentByEMail=Lieferschein %s per E-Mail versendet ShippingValidated= Versand %s freigegeben -InterventionSentByEMail=Service %s per E-Mail versendet -InterventionClassifiedBilled=Eingriff %s als verrechnet eingestuft NewCompanyToDolibarr= Partner erstellt DateActionPlannedStart= Geplantes Startdatum DateActionPlannedEnd= Geplantes Enddatum @@ -72,7 +71,7 @@ AgendaUrlOptions1=Sie können die Ausgabe über folgende Parameter filtern: AgendaUrlOptions2=login=%s begrenzt die Ausgabe auf von Benutzer %s erstellte, betroffene oder erledigte Maßnahmen. AgendaUrlOptions3=logina=%s begrenzt die Ausgabe auf von Benutzer %s erstellte Maßnahmen. AgendaUrlOptions4=logint=%s begrenzt die Ausgabe auf von Benutzer %s betroffene Maßnahmen. -AgendaUrlOptions5=logind=%s begrenzt die Ausgabe auf von Benutzer %s erledigte Maßnahmen. +AgendaUrlOptionsProject=project=PROJECT_ID begrenzt die die Ausgabe auf Maßnahmen im Zusammenhang mit Projekt PROJECT_ID. AgendaShowBirthdayEvents=Zeige Geburtstage AgendaHideBirthdayEvents=Geburtstage ausblenden Busy=Besetzt @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL Adresse um .ical Datei zu erreichen ExtSiteNoLabel=Keine Beschreibung WorkingTimeRange=Arbeitszeit-Bereich WorkingDaysRange=Arbeitstag-Bereich -AddEvent=Add event -MyAvailability=My availability +AddEvent=Maßnahme erstellen +MyAvailability=Meine Verfügbarkeit diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang index 9d3ce721124..c6ff37f86a6 100644 --- a/htdocs/langs/de_DE/bills.lang +++ b/htdocs/langs/de_DE/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Gutschrift InvoiceAvoirAsk=Gutschrift zur Rechnungskorrektur InvoiceAvoirDesc=Eine Gutschrift ist eine negative Rechnung zur Begleichung von Wertdifferenzen zwischen Rechnungssummen und Zahlungseingängen (Zuviel bezahlt oder mangelhafte Lieferung). invoiceAvoirWithLines=Neue Gutschrift mit den Positionen der Ursprungs-Rechnung -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Gutschrift über den Restbetrag der Originalrechnung erstellen +invoiceAvoirLineWithPaymentRestAmount=Gutschrift über den Restbetrag der Originalrechnung ReplaceInvoice=Ersetze Rechnung %s ReplacementInvoice=Ersatzrechnung ReplacedByInvoice=Ersetzt durch Rechnung %s @@ -137,8 +137,6 @@ BillFrom=Von BillTo=An ActionsOnBill=Maßnahmen zu dieser Rechnung NewBill=Neue Rechnung -Prélèvements=Dauerauftrag -Prélèvements=Dauerauftrag LastBills=%s neueste Rechnungen LastCustomersBills=%s neueste Kundenrechnungen LastSuppliersBills=Letzte %s Lieferantenrechnungen @@ -156,9 +154,9 @@ ConfirmCancelBill=Möchten Sie die Rechnung %s wirklich stornieren? ConfirmCancelBillQuestion=Warum wollen Sie klassifizieren diese Rechnung "aufgegeben"? ConfirmClassifyPaidPartially=Möchten Sie die Rechnung %s wirklich als 'teilweise bezahlt' markieren? ConfirmClassifyPaidPartiallyQuestion=Diese Rechnung wurde nicht vollständig bezahlt. Was sind Gründe für das Schließen dieser Rechnung? -ConfirmClassifyPaidPartiallyReasonAvoir=Der offene Zahlbetrag ( %s %s) resultiert aus einem gewährten Skonto. Zur Korrektur der MwSt. lege ich eine Gutschrift an. +ConfirmClassifyPaidPartiallyReasonAvoir=Der offene Zahlbetrag ( %s %s) resultiert aus einem gewährten Skonto. Zur Korrektur der MwSt. wird eine Gutschrift angelegt. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Der offene Zahlbetrag ( %s %s) resultiert aus einem gewährten Skonto. Ich akzeptiere den Verlust der MwSt. aus diesem Rabatt. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Der offene Zahlbetrag ( %s %s) resultiert aus einem gewährten Skonto. Ich stelle die Mehrwertsteuer aus diesem Rabatt über eine Gutschrift wiederher. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Der offene Zahlbetrag ( %s %s) resultiert aus einem gewährten Skonto. Die Mehrwertsteuer aus diesem Rabatt wird ohne Gutschrift wieder hergestellt. ConfirmClassifyPaidPartiallyReasonBadCustomer=Kundenverschulden ConfirmClassifyPaidPartiallyReasonProductReturned=Produkte teilweise retourniert ConfirmClassifyPaidPartiallyReasonOther=Betrag aus anderen Gründen uneinbringlich @@ -191,8 +189,8 @@ AlreadyPaid=Bereits bezahlt AlreadyPaidBack=Bereits zurückbezahlt AlreadyPaidNoCreditNotesNoDeposits=Bereits bezahlte (ohne Gutschriften und Einlagen) Abandoned=Weggefallen -RemainderToPay=Zu zahlender Restbetrag -RemainderToTake=Einzuhebender Restbetrag +RemainderToPay=Offener Zahlbetrag +RemainderToTake=Verbleibender Restbetrag RemainderToPayBack=Zurück zu zahlender Restbetrag Rest=Ausstehend AmountExpected=Höhe der Forderung @@ -219,19 +217,18 @@ NoInvoice=Keine Rechnung ClassifyBill=Rechnung einordnen SupplierBillsToPay=Zu zahlende Lieferantenrechnungen CustomerBillsUnpaid=Offene Kundenrechnungen -DispenseMontantLettres=Automatisch generierte Dokumente unterliegen nicht den Formvorschriften eines Briefs. -DispenseMontantLettres=Automatisch generierte Dokumente unterliegen nicht den Formvorschriften eines Briefs. +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Nicht erstattungsfähig SetConditions=Zahlungskonditionen einstellen SetMode=Definiere Zahlungsart Billed=In Rechnung gestellt -RepeatableInvoice=Rechnungsvorlage -RepeatableInvoices=Rechnungsvorlagen +RepeatableInvoice=Rechnungs-Vorlage +RepeatableInvoices=Rechnungs-Vorlagen Repeatable=Vorlage Repeatables=Vorlagen -ChangeIntoRepeatableInvoice=In Rechnungsvorlage umwandeln -CreateRepeatableInvoice=Erstelle Rechnungsvorlage -CreateFromRepeatableInvoice=Aus Rechnungsvorlage erstellen +ChangeIntoRepeatableInvoice=In Rechnungs-Vorlage umwandeln +CreateRepeatableInvoice=Rechnungs-Vorlage erstellen +CreateFromRepeatableInvoice=Aus Rechnungs-Vorlage erzeugen CustomersInvoicesAndInvoiceLines=Kundenrechnungen und -positionen CustomersInvoicesAndPayments=Kundenrechnungen und -zahlungen ExportDataset_invoice_1=Kundenrechnungen und -positionen diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang index a42f68d2cc6..a558ee04ff6 100644 --- a/htdocs/langs/de_DE/categories.lang +++ b/htdocs/langs/de_DE/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Verbindung zwischen Lieferanten und Kategorien CatCusLinks=Verbindung zwischen Kunden-/Lead und Kategorien CatProdLinks=Verbindungen zwischen Produkten/Services und Kategorien CatMemberLinks=Verbindung zwischen Mitgliedern und Kategorien -CatProdLinks=Verbindungen zwischen Produkten/Services und Kategorien -CatCusLinks=Verbindung zwischen Kunden-/Lead und Kategorien -CatSupLinks=Verbindung zwischen Lieferanten und Kategorien DeleteFromCat=Aus Kategorie entfernen DeletePicture=Bild löschen ConfirmDeletePicture=Bild wirklich löschen? @@ -111,4 +108,5 @@ ExtraFieldsCategories=Ergänzende Attribute CategoriesSetup=Kategorien Setup CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden CategorieRecursivHelp=Wenn aktiviert, wird das Produkt auch zur übergeordneten Kategorie zugewiesen, wenn es einer Unterkategorie zugewiesen wird -AddProductServiceIntoCategory=Add the following product/service +AddProductServiceIntoCategory=Folgendes Produkt/Dienstleistungen hinzufügen +ShowCategory=Zeige Kategorie diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang index 8ec57d4d0d9..13aa22245fc 100644 --- a/htdocs/langs/de_DE/compta.lang +++ b/htdocs/langs/de_DE/compta.lang @@ -79,8 +79,8 @@ ListOfPayments=Liste der Zahlungen ListOfCustomerPayments=Liste der Kundenzahlungen ListOfSupplierPayments=Liste der Lieferantenzahlungen DatePayment=Zahlungsdatum -DateStartPeriod=Date start period -DateEndPeriod=Date end period +DateStartPeriod=Startdatum für Zeitraum +DateEndPeriod=Enddatum für Zeitraum NewVATPayment=Neue MwSt. Zahlung newLT2PaymentES=Neue EKSt. Zahlung newLT1PaymentES=New RE payment @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Kontierungscode ungültig für Kunden %s SuppliersProductsSellSalesTurnover=Umsatz aus dem Verkauf von Waren dieses Lieferanten. CheckReceipt=Scheck erhalten CheckReceiptShort=Scheck erhalten +LastCheckReceiptShort=Letzte %s Scheckeinnahmen NewCheckReceipt=Neuen Scheck erhalten NewCheckDeposit=Neue Check Hinterlegung NewCheckDepositOn=Neue Scheckeinlösung auf Konto: %s @@ -178,7 +179,7 @@ AddRemind=Verfügbare Menge zum Versenden RemainToDivide= Noch zu Versenden : WarningDepositsNotIncluded=Abschlagsrechnungen werden in dieser Version des Rechnungswesens nicht berücksichtigt. DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date. -Pcg_version=Pcg version +Pcg_version=Pcg-Version Pcg_type=Pcg type Pcg_subtype=Pcg subtype InvoiceLinesToDispatch=Invoice lines to dispatch @@ -187,7 +188,7 @@ AccountancyDashboard=Rechnungswesen Zusammenfassung ByProductsAndServices=Nach Produkten und Services RefExt=Externe Referenz ToCreateAPredefinedInvoice=Um eine vordefinierte Rechnung zu erzeugen, erstellen Sie eine Standard-Rechnung und klicken dann ohne Freigabe auf "In vordefinierte Rechnung umwandeln". -LinkedOrder=Link to order +LinkedOrder=Link zur Bestellung ReCalculate=Neuberechnung Mode1=Methode 1 Mode2=Methode 2 @@ -195,15 +196,11 @@ CalculationRuleDesc=Zur Berechnung der Gesamt-MwSt. gibt es zwei Methoden:
    M CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen Ergebnis wie Ihr Lieferant zu kommen. 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=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 +AccountancyJournal=Buchhaltungscode-Journal +ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt einzuziehen +ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties -CloneTax=Clone a social contribution -ConfirmCloneTax=Confirm the clone of a social contribution -CloneTaxForNextMonth=Clone it for next month +CloneTax=Sozialbeitrag duplizieren +ConfirmCloneTax=Bestätigung 'Sozialbeitrag duplizieren' +CloneTaxForNextMonth=Für nächsten Monat duplizieren diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang index 1e4e9eb8888..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 -LastContracts=%s zuletzt geänderte Verträge +LastModifiedContracts=Letzte %s geänderte Kontrakte AllContracts=Alle Verträge ContractCard=Vertragskarte ContractStatus=Vertragsstatus @@ -27,7 +27,7 @@ MenuRunningServices=Aktive Services MenuExpiredServices=Abgelaufene Services MenuClosedServices=Geschlossene Services NewContract=Neuer Vertrag -AddContract=Vertrag hinzufügen +AddContract=Kontrakt erstellen SearchAContract=Suche einen Vertrag DeleteAContract=Löschen eines Vertrages CloseAContract=Schließen eines Vertrages @@ -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=%s zuletzt geänderte Verträge +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 a9dee5725e7..dddf3eb47c6 100644 --- a/htdocs/langs/de_DE/cron.lang +++ b/htdocs/langs/de_DE/cron.lang @@ -1,22 +1,14 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = Über CronAbout = Über Cron CronAboutPage = Über cron Seite - -# # Right -# Permission23101 = Lese geplante Aufgabe Permission23102 = Erstelle/aktualisiere geplante Aufgabe Permission23103 = Lösche geplante Aufgabe Permission23104 = Führe geplante Aufgabe aus - -# # Admin -# CronSetup= Jobverwaltungs-Konfiguration URLToLaunchCronJobs=URL zum Prüfen und Starten von Cronjobs wenn nötig OrToLaunchASpecificJob=Oder zum Prüfen und Starten von speziellen Jobs @@ -24,20 +16,11 @@ KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs FileToLaunchCronJobs=Kommandozeile zum Starten von Cronjobs CronExplainHowToRunUnix=In Unix-Umgebungen sollte man crontab benutzen um die Kommandozeile jede Minute auszuführen CronExplainHowToRunWin=In Microsoft(tm) Windows kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede Minute aufzurufen - - -# # Menu -# CronJobs=Geplante Jobs -CronListActive= Liste der aktiven Jobs -CronListInactive= Liste der deaktivierten Jobs -CronListActive= Liste der aktiven Jobs - - -# +CronListActive=Liste der aktiven/geplanten Jobs +CronListInactive=Liste der deaktivierten Jobs # Page list -# CronDateLastRun=Letzte Ausführung CronLastOutput=Ausgabe der letzten Ausführung CronLastResult=Letzter Resultatcode @@ -70,10 +53,7 @@ CronLabel=Beschreibung CronNbRun=Anzahl Starts CronEach=Jede JobFinished=Job gestarted und beendet - -# #Page card -# CronAdd= Jobs hinzufügen CronHourStart= Startzeit und -datum für Aufgabe CronEvery= Und führe Aufgabe aus jeden @@ -95,20 +75,12 @@ CronObjectHelp=The object name to load.
    For exemple to fetch method of Doli CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef CronCommandHelp=Die auszuführende System-Kommandozeile - -# # Info -# CronInfoPage=Information - - -# # Common -# CronType=Aufgaben-Typ CronType_method=Aufrufmethode einer Dolibarr Class CronType_command=Shell-Befehl CronMenu=Cron CronCannotLoadClass=Kann Klasse %s oder Object %s nicht laden - UseMenuModuleToolsToAddCronJobs=Rufe Menu "Home - Modules tools - Job Liste" auf um geplante Aufgaben zu sehen und zu verändern. diff --git a/htdocs/langs/de_DE/donations.lang b/htdocs/langs/de_DE/donations.lang index bf615dfa70f..7242670c414 100644 --- a/htdocs/langs/de_DE/donations.lang +++ b/htdocs/langs/de_DE/donations.lang @@ -4,7 +4,7 @@ Donations=Spenden DonationRef=Spenden Referenz Donor=Spender Donors=Spender -AddDonation=Spende hinzufügen +AddDonation=Spende erstellen NewDonation=Neue Spende ShowDonation=Spenden anzeigen DonationPromise=Zugesagte Spende @@ -29,5 +29,10 @@ LastModifiedDonations=Letzten %s geänderten Spenden SearchADonation=Spende suchen DonationRecipient=Spenden Empfänger ThankYou=Danke -IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount -MinimumAmount=Minimum amount is %s +IConfirmDonationReception=Der Empfänger bestätigt den Erhalt einer Spende in Höhe von +MinimumAmount=Mindestbetrag ist %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Optionen für Frankreich +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned 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/externalsite.lang b/htdocs/langs/de_DE/externalsite.lang index ec247b9a4f5..e4afde906ac 100644 --- a/htdocs/langs/de_DE/externalsite.lang +++ b/htdocs/langs/de_DE/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Setup-Link zu einer externen URL ExternalSiteURL=URL der externen Seite ExternalSiteModuleNotComplete=Module ExternalSite wurde nicht richtig konfiguriert. +ExampleMyMenuEntry=Mein Menü-Eintrag diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang index 9253560a2af..4850a0a80c7 100644 --- a/htdocs/langs/de_DE/holiday.lang +++ b/htdocs/langs/de_DE/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=Mitarbeiter -Holidays=Leaves -CPTitreMenu=Leaves +Holidays=Urlaub +CPTitreMenu=Urlaub MenuReportMonth=Monatsauszug -MenuAddCP=Make a leave request -NotActiveModCP=You must enable the module Leaves to view this page. -NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . -NoCPforUser=You don't have any available day. -AddCP=Make a leave request +MenuAddCP=Urlaubs-Antrag einreichen +NotActiveModCP=Sie müssen das Urlaubs-Modul aktivieren um diese Seite zu sehen. +NotConfigModCP=Sie müssen das Modul Urlaub konfigurieren, um diese Seite zu sehen. Um dies zu tun, klicken Sie bitte hier. +NoCPforUser=Sie haben keinen Anspruch auf Urlaub. +AddCP=Urlaubs-Antrag einreichen Employe=Mitarbeiter DateDebCP=Urlaubsbeginn DateFinCP=Urlaubsende @@ -18,24 +18,24 @@ ApprovedCP=Genehmigt CancelCP=Zurückgezogen RefuseCP=Abgelehnt ValidatorCP=genehmigt durch -ListeCP=List of leaves +ListeCP=Urlaubsliste ReviewedByCP=Wird geprüft von DescCP=Beschreibung -SendRequestCP=Create leave request -DelayToRequestCP=Leave requests must be made at least %s day(s) before them. -MenuConfCP=Edit balance of leaves -UpdateAllCP=Update the leaves -SoldeCPUser=Leaves balance is %s days. +SendRequestCP=Urlaubs-Antrag erstellen +DelayToRequestCP=Urlaubsanträge müssen mindestens %s Tage im voraus gestellt werden. +MenuConfCP=Urlaubsliste bearbeiten +UpdateAllCP=Urlaube aktualisieren +SoldeCPUser=Feriensaldo ist %s Tage. ErrorEndDateCP=Sie müssen ein End-Datum wählen, dass nach dem Start-Datum liegt. ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Eerstellung von: -ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ErrorIDFicheCP=Fehler aufgetreten: der Urlaubsantrag existiert nicht. ReturnCP=Zurück zur vorherigen Seite -ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request -InfosWorkflowCP=Information Workflow +ErrorUserViewCP=Sie sind nicht berechtigt diesen Urlaubs-Antrag zu lesen. +InfosCP=Hinweis zum Urlaubsantrag +InfosWorkflowCP=Informations-Workflow RequestByCP=Beantragt von -TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed +TitreRequestCP=Urlaubsantrag +NbUseDaysCP=Anzahl genommene Urlaubstage EditCP=Bearbeiten DeleteCP=Lösche Gruppe ActionValidCP=Freigeben @@ -43,70 +43,69 @@ ActionRefuseCP=Ablehnen ActionCancelCP=Abbrechen StatutCP=Status SendToValidationCP=Zur Überprüfung senden -TitleDeleteCP=Delete the leave request -ConfirmDeleteCP=Confirm the deletion of this leave request? -ErrorCantDeleteCP=Error you don't have the right to delete this leave request. -CantCreateCP=You don't have the right to make leave requests. -InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Aktualisieren -CantUpdate=You cannot update this leave request. +TitleDeleteCP=Urlaubsantrag löschen +ConfirmDeleteCP=Wollen Sie diesen Urlaubsantrag wirklich löschen? +ErrorCantDeleteCP=Fehler: Sie haben nicht die Berechtigung, diesen Urlaubsantrag zu löschen. +CantCreateCP=Sie haben nicht die Berechtigung Urlaub zu beantragen. +InvalidValidatorCP=Sie müssen einen Vorgesetzten wählen, der Ihre Urlaubsanfrage genehmigt. +CantUpdate=Sie können diesen Urlaubsantrag nicht aktualisieren NoDateDebut=Sie müssen ein Startdatum wählen. NoDateFin=Sie müssen ein Enddatum wählen. -ErrorDureeCP=Ihr Antrag auf Ferien enthält keine Werktage. +ErrorDureeCP=Ihr Urlaubsantrag enthält keine Werktage. TitleValidCP=Urlaubsantrag genehmigen -ConfirmValidCP=Are you sure you want to approve the leave request? +ConfirmValidCP=Möchten Sie diesen Urlaubsantrag wirklich genehmigen? DateValidCP=Datum genehmigt -TitleToValidCP=Send leave request -ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Ferienantrag ablehnen -ConfirmRefuseCP=Are you sure you want to refuse the leave request? +TitleToValidCP=Urlaubsantrag senden +ConfirmToValidCP=Möchten Sie diesen Urlaubsantrag wirklich senden? +TitleRefuseCP=Urlaubsantrag ablehnen +ConfirmRefuseCP=Möchten Sie diesen Urlaubsantrag wirklich ablehnen? NoMotifRefuseCP=Sie müssen einen Grund für die Ablehnung angeben. -TitleCancelCP=Ferienantrag abbrechen -ConfirmCancelCP=Are you sure you want to cancel the leave request? +TitleCancelCP=Urlaubsantrag stornieren +ConfirmCancelCP=Möchten Sie diesen Urlaubsantrag wirklich stornieren? DetailRefusCP=Ablehnungsgrund DateRefusCP=Datum der Ablehnung DateCancelCP=Datum der Absage -DefineEventUserCP=Assign an exceptional leave for a user -addEventToUserCP=Assign leave +DefineEventUserCP=Sonderurlaub für einen Anwender zuweisen +addEventToUserCP=Urlaub zuweisen MotifCP=Grund UserCP=Benutzer -ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. -AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of leave requests -LogCP=Log of updates of available vacation days +ErrorAddEventToUserCP=Ein Fehler ist aufgetreten beim Hinzufügen des Sonderurlaubs +AddEventToUserOkCP=Das Hinzufügen des Sonderurlaubs wurde abgeschlossen. +MenuLogCP=Zeige Logdaten zu Urlaubsanträgen +LogCP=Log der Aktualisierung von verfügbaren Urlaubstagen ActionByCP=Ausgeführt von UserUpdateCP=Für den Benutzer PrevSoldeCP=Vorherige Übersicht NewSoldeCP=Neue Übersicht -alreadyCPexist=Ein Ferienantrag wurde für diese Periode bereits erstellt. +alreadyCPexist=Ein Urlaubsantrag wurde für diese Periode bereits erstellt. UserName=Nachname Employee=Angestellter -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation +FirstDayOfHoliday=Erster Urlaubstag +LastDayOfHoliday=Letzter Urlaubstag HolidaysMonthlyUpdate=Monatliches Update ManualUpdate=Manuelles Update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Konfiguration des Ferienmoduls +ConfCP=Konfiguration des Urlaubsmoduls DescOptionCP=Beschreibung der Wahlmöglichkeit ValueOptionCP=Warenwert -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Gruppe mit der Berechtigung Urlaub zu bewilligen ConfirmConfigCP=Konfiguration bestätigen -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Letzte automatische Aktualisierung von Urlaubstagen UpdateConfCPOK=Erfolgreich bearbeitet. ErrorUpdateConfCP=Ein Fehler trat beim Bearbeiten auf, bitte nochmals versuchen. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Letzter Termin für Ferienanträge -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Bitte geben Sie die Anzahl Urlaubstage der Benutzer an, indem Sie hier klicken. +DelayForSubmitCP=Letztmöglicher Termin für Urlaubsanträge +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance -nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month -Module27130Name= Management of leave requests -Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +nbUserCP=Anzahl unterstützter Benutzer im Urlaubsmodul +nbHolidayDeductedCP=Anzahl Urlaubstage, die für jeden genommenen Ferientag abgezogen werden +nbHolidayEveryMonthCP=Anzahl hinzugefügter Urlaubstage pro Monat +Module27130Name= Verwaltung von Urlaubsanträgen +Module27130Desc= Verwaltung von Urlaubsanträgen +TitleOptionMainCP=Wichtigste Urlaubs-Einstellungen TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Freigeben UpdateEventCP=Maßnahmen aktualisieren @@ -127,23 +126,23 @@ UpdateEventOptionCP=Aktualisieren ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten: NoCPforMonth=Kein Urlaub diesen Monat nbJours=Anzahl der Tage -TitleAdminCP=Configuration of Leaves +TitleAdminCP=Konfiguration der Urlaube #Messages Hello=Hallo -HolidaysToValidate=Validate leave requests -HolidaysToValidateBody=Below is a leave request to validate -HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. -HolidaysValidated=Validated leave requests -HolidaysValidatedBody=Your leave request for %s to %s has been validated. -HolidaysRefused=Request denied -HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled leaved request -HolidaysCanceledBody=Your leave request for %s to %s has been canceled. -Permission20000=Read you own leave requests -Permission20001=Create/modify your leave requests -Permission20002=Create/modify leave requests for everybody -Permission20003=Delete leave requests -Permission20004=Setup users available vacation days +HolidaysToValidate=Genehmige Urlaubsanträge +HolidaysToValidateBody=Es folgt ein Urlaubsantrag zur Freigabe +HolidaysToValidateDelay=Dieser Urlaub wird in weniger als %s Tagen stattfinden. +HolidaysToValidateAlertSolde=Der Einreicher dieses Urlaubsantrags besitzt nicht mehr genügend verfügbare Tage. +HolidaysValidated=Genehmigte Urlaubsanträge +HolidaysValidatedBody=Ihr Antrag auf Urlaub von %s bis %s wurde bewilligt. +HolidaysRefused=Anfrage abgelehnt +HolidaysRefusedBody=Ihr Antrag auf Urlaub von %s bis %s wurde aus folgendem Grund abgelehnt: +HolidaysCanceled=Urlaubsantrag storniert +HolidaysCanceledBody=Ihr Antrag auf Urlaub von %s bis %s wurde storniert. +Permission20000=Eigene Urlaubsanträge einsehen +Permission20001=Erstellen/Ändern Ihrer Urlaubsanträge +Permission20002=Anlegen/Ändern der Urlaube für alle +Permission20003=Urlaubsanträge löschen +Permission20004=Bestimme die verfügbaren Urlaubstage des Benutzers Permission20005=Review log of modified leave requests -Permission20006=Read leaves monthly report +Permission20006=Monatlichen Urlaubsbericht einsehen diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang index 7229a18531c..e17e1c339db 100644 --- a/htdocs/langs/de_DE/interventions.lang +++ b/htdocs/langs/de_DE/interventions.lang @@ -3,7 +3,7 @@ Intervention=Eingriff Interventions=Eingriffe InterventionCard=Eingriffskarte NewIntervention=Neuer Eingriff -AddIntervention=Eingriffsstelle hinzufügen +AddIntervention=Eingriff erstellen ListOfInterventions=Liste der Eingriffe EditIntervention=Eingriff bearbeiten ActionsOnFicheInter=Aktionen zum Eingriff @@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Name und Unterschrift des internen Kontakts: NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden: DocumentModelStandard=Standard-Dokumentvorlage für Eingriffe InterventionCardsAndInterventionLines=Eingriffe und Eingriffszeilen -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +InterventionClassifyBilled=Eingeordnet "Angekündigt" +InterventionClassifyUnBilled=Als "nicht verrechnet" markieren StatusInterInvoiced=Angekündigt RelatedInterventions=Verbundene Eingriffe ShowIntervention=Zeige Eingriffe SendInterventionRef=Einreichung von Eingriffen %s +SendInterventionByMail=Eingriff per E-Mail versenden +InterventionCreatedInDolibarr=Eingriff %s erstellt +InterventionValidatedInDolibarr=Eingriff %s freigegeben +InterventionModifiedInDolibarr=Eingriff %s geändert +InterventionClassifiedBilledInDolibarr=Eingriff %s als verrechnet eingestuft +InterventionClassifiedUnbilledInDolibarr=Eingriff %s als nicht verrechnet eingestuft +InterventionSentByEMail=Eingriff %s per E-Mail versandt +InterventionDeletedInDolibarr=Eingriff %s gelöscht +SearchAnIntervention=Eingriff suchen ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Eingriffsnachverfolgung durch Vertreter TypeContact_fichinter_internal_INTERVENING=Eingriff läuft diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang index 1364b70c808..8a91a8911c4 100644 --- a/htdocs/langs/de_DE/mails.lang +++ b/htdocs/langs/de_DE/mails.lang @@ -84,7 +84,7 @@ EachInvoiceWillBeAttachedToEmail=Ein Dokument mit der Standard-Vorlage für Rech MailTopicSendRemindUnpaidInvoices=Zahlungserinnerung für Rechnung %s (%s) SendRemind=Zahlungserinnerung per E-Mail senden RemindSent=%s Erinnerung(en) gesendet -AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent) +AllRecipientSelectedForRemind=Alle Partner ausgewählt und wenn eine Email angegeben ist (beachten sie, dass eine Mail pro Rechnung geschickt wird) NoRemindSent=Keine eMail-Erinnerung versandt ResultOfMassSending=Ergebnis der Massen-eMail-Erinnerung @@ -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=Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versand von E-Mails auf %s Empfänger je Sitzung beschränkt. +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 @@ -133,6 +133,9 @@ Notifications=Benachrichtigungen NoNotificationsWillBeSent=Für dieses Ereignis und diesen Partner sind keine Benachrichtigungen geplant ANotificationsWillBeSent=Eine Benachrichtigung wird per E-Mail versandt SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versandt -AddNewNotification=Aktivieren Sie eine neue E-Mail-Benachrichtigungsanfrage -ListOfActiveNotifications=Liste aller aktiven E-Mail Benachrichtigungen +AddNewNotification=Neues E-Mail-Beachrichtigungsziel aktivieren +ListOfActiveNotifications=Liste aller aktiven E-Mail-Beachrichtigungsziele ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen +MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für Massen-Mails verwendet werden. +MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sHome - Einstellungen - EMails%s den Parameter '%s' auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die Masse-E-Mail-Funktion nutzen. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index 3df2b8c5409..ddcf8035551 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Kann Benutzer %s nicht aus der Syst ErrorNoVATRateDefinedForSellerCountry=Keine MwSt.-Sätze für Verkäuferland '%s' definiert. ErrorNoSocialContributionForSellerCountry=Für das Verkäuferland '%s' wurde kein Sozialbetrag definiert. ErrorFailedToSaveFile=Fehler beim Speichern der Datei. -ErrorOnlyPngJpgSupported=Fehler: Es werden nur Dateien im Format .jpg oder .png unterstützt. -ErrorImageFormatNotSupported=Ihre PHP-Konfiguration unterstützt keine Konvertierungsfunktionen für dieses Bildformat. SetDate=Datum SelectDate=Wählen Sie ein Datum SeeAlso=Siehe auch %s BackgroundColorByDefault=Standard-Hintergrundfarbe +FileNotUploaded=Datei wurde nicht hochgeladen +FileUploaded=Datei wurde erfolgreich hochgeladen FileWasNotUploaded=Ein Dateianhang wurde gewählt aber noch nicht hochgeladen. Klicken Sie auf "Datei anhängen" um den Vorgang zu starten. NbOfEntries=Anzahl der Einträge GoToWikiHelpPage=Zur Wiki-Hilfeseite (Internetzugang erforderlich) @@ -266,6 +266,7 @@ Afternoon=Nachmittag Quadri=vierfach MonthOfDay=Tag des Monats HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Mit MwSt. Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Vollständige Liste Statistics=Statistik OtherStatistics=Weitere Statistiken Status=Status +Favorite=Favorit ShortInfo=Info. Ref=Nummer RefSupplier=Lieferanten-Nr. @@ -365,6 +367,7 @@ ActionsOnCompany=Maßnahmen zu diesem Partner ActionsOnMember=Aktionen zu diesem Mitglied NActions=%s Maßnahmen NActionsLate=%s verspätete Maßnahmen +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Filter entfernen ChartGenerated=Diagramm erstellt @@ -508,7 +511,7 @@ NbOfCustomers=Anzahl der Kunden NbOfLines=Anzahl der Positionen NbOfObjects=Anzahl der Objekte NbOfReferers=Anzahl der Verweise -Referers=Refering objects +Referers=Bezugnahmen TotalQuantity=Gesamtmenge DateFromTo=Von %s bis %s DateFrom=Von %s @@ -607,7 +610,7 @@ Notes=Hinweise AddNewLine=Neue Zeile hinzufügen AddFile=Datei hinzufügen ListOfFiles=Liste verfügbarer Dateien -FreeZone=Free entry +FreeZone=Freier Text FreeLineOfType=Free entry of type CloneMainAttributes=Objekt mit Haupteigenschaften duplizieren PDFMerge=PDFs verbinden @@ -645,6 +648,7 @@ OptionalFieldsSetup=Zusätzliche Attributeinstellungen URLPhoto=URL für Foto/Bild SetLinkToThirdParty=Link zu einem Partner CreateDraft=Angebot erstellen +SetToDraft=Auf Entwurf zurücksetzen ClickToEdit=Klicken zum Bearbeiten ObjectDeleted=Objekt %s gelöscht ByCountry=Nach Land @@ -677,8 +681,8 @@ AccountCurrency=Kontowährung ViewPrivateNote=Zeige Notizen XMoreLines=%s Zeile(n) versteckt PublicUrl=Öffentliche URL -AddBox=Add box - +AddBox=Box zufügen +SelectElementAndClickRefresh=Wählen Sie ein Element und clicken Sie Aktualisieren # Week day Monday=Montag Tuesday=Dienstag diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang index 919b9f5202a..33f2f2d402b 100644 --- a/htdocs/langs/de_DE/margins.lang +++ b/htdocs/langs/de_DE/margins.lang @@ -10,7 +10,7 @@ MarkRate=Mark rate DisplayMarginRates=Zeige Gewinnspannen-Raten an DisplayMarkRates=Display mark rates InputPrice=Eingabe Preis -margin=Profit margins management +margin=Gewinnspannen-Verwaltung margesSetup=Profit margins management setup MarginDetails=Details zu Gewinnspannen ProductMargins=Produkt-Gewinnspannen @@ -22,7 +22,7 @@ ChooseProduct/Service=Produkt oder Service wählen StartDate=Vertragsbeginn EndDate=Vertragsende Launch=Start -ForceBuyingPriceIfNull=Force buying price if null +ForceBuyingPriceIfNull=Einkaufspreis erzwingen wenn Null ForceBuyingPriceIfNullDetails=falls "AN", wird die Spanne der Zeile als Null angezeigt (Kaufpreis = Verkaufspreis), andernfalls ("AUS"), ist die Gewinnspanne gleich dem Verkaufspreis (Kaufpreis = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts UseDiscountAsProduct=Als Produkt @@ -38,4 +38,7 @@ BuyingCost=Kosten UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Setzen Sie fest welcher Kontakt-Typ (auf Rechnungen verknüpft) für Gewinnspannenbericht bei Handelsvertretern verwendet wird. +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/de_DE/orders.lang index 8d4ea51c343..0260b5de948 100644 --- a/htdocs/langs/de_DE/orders.lang +++ b/htdocs/langs/de_DE/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Eine Sendung ist vorhanden DraftOrWaitingApproved=Entwurf oder genehmigt, noch nicht bestellt DraftOrWaitingShipped=Entwurf oder bestätigt, noch nicht versandt MenuOrdersToBill=Bestellverrechnung -MenuOrdersToBill2=Zu verrechnende Bestellungen +MenuOrdersToBill2=Billable orders SearchOrder=Suche Bestellung SearchACustomerOrder=Kundenauftrag suchen ShipProduct=Produkt versenden @@ -65,7 +65,7 @@ ValidateOrder=Bestellung freigeben UnvalidateOrder=Unbestätigte Bestellung DeleteOrder=Bestellung löschen CancelOrder=Bestellung verwerfen -AddOrder=Bestellung hinzufügen +AddOrder=Bestellung anlegen AddToMyOrders=Zu meinen Bestellungen hinzufügen AddToOtherOrders=Zu Bestellungen Anderer hinzufügen AddToDraftOrders=Zu Bestellentwurf hinzufügen @@ -151,10 +151,9 @@ OrderByFax=Fax OrderByEMail=E-Mail OrderByWWW=Online OrderByPhone=Telefon -CreateInvoiceForThisCustomer=Bill orders +CreateInvoiceForThisCustomer=Bestellung verrechnen NoOrdersToInvoice=Keine Bestellungen Rechnungsfähig CloseProcessedOrdersAutomatically=Markiere alle ausgewählten Bestellungen als "verarbeitet". -MenuOrdersToBill2=Zu verrechnende Bestellungen OrderCreation=Erstellen einer Bestellung Ordered=Bestellt OrderCreated=Ihre Bestellungen wurden erstellt diff --git a/htdocs/langs/de_DE/oscommerce.lang b/htdocs/langs/de_DE/oscommerce.lang deleted file mode 100644 index 34dd883614a..00000000000 --- a/htdocs/langs/de_DE/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OSCommerce -OSCommerceSetup=OSCommerce-Modul Einstellungen -OSCommerceSetupSaved=OSCommerce-Einstellungen gespeichert -OSCommerceServer=OSCommerce Server Host/IP -OSCommerceDatabaseName=OSCommerce Datenbankname -OSCommercePrefix=OSCommerce Tabellen-Präfix -OSCommerceUser=OSCommerce Datenbank Login diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang index 4748242e9fc..99ba2d2cf4c 100644 --- a/htdocs/langs/de_DE/other.lang +++ b/htdocs/langs/de_DE/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Sicherheitsschlüssel Calendar=Kalender -AddTrip=Reise hinzufügen Tools=Werkzeuge ToolsDesc=Dieser Bereich ist bestimmt für die Gruppe "Verschiedenes" und nicht in andern Menüeinträgen verfügbar.

    Diese Tools können Sie über das Menü auf dieser Seite erreichen. Birthday=Geburtstag @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Projekt-Erstellung Notify_TASK_CREATE=Aufgabe erstellt Notify_TASK_MODIFY=Aufgabe geändert Notify_TASK_DELETE=Aufgabe gelöscht +SeeModuleSetup=See module setup NbOfAttachedFiles=Anzahl der angehängten Dateien/okumente TotalSizeOfAttachedFiles=Gesamtgröße der angehängten Dateien/Dokumente MaxSize=Maximalgröße @@ -57,14 +57,14 @@ Miscellaneous=Verschiedenes NbOfActiveNotifications=Anzahl aktiver Benachrichtigungen PredefinedMailTest=Dies ist ein Test-Mail.\n Die beiden Zeilen sind durch eine Zeilenschaltung getrennt. PredefinedMailTestHtml=Dies ist ein (HTML)-Test Mail (das Wort Test muss in Fettschrift erscheinen).
    Die beiden Zeilen sollteb durch eine Zeilenschaltung getrennt sein. -PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Bedauerlicherweise scheint die Rechnung __FACREF__ bislang unbeglichen. Als Erinnerung übersenden wir Ihnen diese nochmals im Anhang.\n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang unser Angebot __PROPREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendShipping=__CONTACTCIVNAME__ \n\n Als Anlage erhalten Sie unsere Lieferung __ SHIPPINGREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ -PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ \n\n Anbei finden Sie die Intervention __ FICHINTERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ DemoDesc=Bei Dolibarr handelt es sich um ein kompaktes ERP/CRM-System, bestehend aus einzelnen Modulen. Da eine Demo aller Module kaum eine praxisnahe Anwendung darstellt, stehen Ihnen unterschiedliche Demo-Profile zur Verfügung. ChooseYourDemoProfil=Bitte wählen Sie das Demo-Profil das Ihrem Berufsfeld am ehesten entspricht @@ -80,6 +80,16 @@ ModifiedBy=Bearbeitet von %s ValidatedBy=Freigegeben von %s CanceledBy=Storniert von %s ClosedBy=Geschlossen von %s +CreatedById=Erstellt von User-ID +ModifiedById=letzte Änderung von User-ID +ValidatedById=Freigabe durch User-ID +CanceledById=Storno durch User-ID +ClosedById=geschlossen von User-ID +CreatedByLogin=Erstellt von User +ModifiedByLogin=letzte Änderung durch User +ValidatedByLogin=Freigabe durch User +CanceledByLogin=Storno durch User +ClosedByLogin=geschlossen von User FileWasRemoved=Datei wurde entfernt DirWasRemoved=Verzeichnis wurde entfernt FeatureNotYetAvailableShort=Verfügbar ab der nächsten Versionen @@ -122,7 +132,7 @@ VolumeUnitdm3=dm³ VolumeUnitcm3=cm³ VolumeUnitmm3=mm³ VolumeUnitfoot3=ft3 -VolumeUnitinch3=in3 +VolumeUnitinch3=in 3 VolumeUnitounce=Unze VolumeUnitlitre=Liter VolumeUnitgallon=Gallone @@ -133,7 +143,7 @@ SizeUnitcm=cm SizeUnitmm=mm SizeUnitinch=Zoll SizeUnitfoot=Fuß -SizeUnitpoint=point +SizeUnitpoint=Punkt BugTracker=Fehlerverfolgung (Bug-Tracker) SendNewPasswordDesc=Über dieses Formular können Sie sich ein neues Passwort zusenden lassen.
    Die Änderungen an Ihrem Passwort werden erst wirksam, wenn Sie auf den im Mail enthaltenen Bestätigungslink klicken.
    Überprüfen Sie den Posteingang Ihrer E-Mail-Anwendung. BackToLoginPage=Zurück zur Anmeldeseite @@ -193,16 +203,17 @@ ForgetIfNothing=Wenn Sie diese Änderung nicht beantragt haben, löschen Sie ein ##### Calendar common ##### AddCalendarEntry=Neuer Eintrag im Kalender %s -NewCompanyToDolibarr=Partner %s hinzugefügt +NewCompanyToDolibarr=Firma %s zugefügt ContractValidatedInDolibarr=Vertrag %s freigegeben ContractCanceledInDolibarr=Vertrag %s storniert ContractClosedInDolibarr=Vertrag %s geschlossen PropalClosedSignedInDolibarr=Angebot %s unterschrieben PropalClosedRefusedInDolibarr=Angebot %s abgelehnt PropalValidatedInDolibarr=Angebot %s freigegeben +PropalClassifiedBilledInDolibarr=Angebot %s als verrechnet eingestuft InvoiceValidatedInDolibarr=Rechnung %s freigegeben InvoicePaidInDolibarr=Rechnung %s bezahlt -InvoiceCanceledInDolibarr=Rechnung %s storniet +InvoiceCanceledInDolibarr=Rechnung %s storniert PaymentDoneInDolibarr=Zahlung %s erfolgt CustomerPaymentDoneInDolibarr=Kundenzahlung %s erfolgt SupplierPaymentDoneInDolibarr=Lieferantenzahlung %s erfolgt @@ -211,7 +222,7 @@ MemberResiliatedInDolibarr=Mitglied %s aufgehoben MemberDeletedInDolibarr=Mitglied %s gelöscht MemberSubscriptionAddedInDolibarr=Abonnement für Mitglied %s hinzugefügt ShipmentValidatedInDolibarr=Versand %s in Dolibarr geprüft -ShipmentDeletedInDolibarr=Versand %s gelöscht von Dolibarr +ShipmentDeletedInDolibarr=Sendung %s gelöscht ##### Export ##### Export=Export ExportsArea=Exportübersicht diff --git a/htdocs/langs/de_DE/paybox.lang b/htdocs/langs/de_DE/paybox.lang index a1125e0e77c..96ab7031e2b 100644 --- a/htdocs/langs/de_DE/paybox.lang +++ b/htdocs/langs/de_DE/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Nachrichtenseite für abgebrochene Zahlung NewPayboxPaymentReceived=Neue Paybox-Zahlung erhalten NewPayboxPaymentFailed=Neue Paybox-Zahlungen probiert, aber fehlgeschlagen PAYBOX_PAYONLINE_SENDEMAIL=Status-Email nach einer Zahlung (erfolgreich oder nicht) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 f20fbf915e9..107b4eef252 100644 --- a/htdocs/langs/de_DE/projects.lang +++ b/htdocs/langs/de_DE/projects.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - projects -RefProject=Ref. project +RefProject=Projekt-Nr. ProjectId=Projekt-ID Project=Projekt Projects=Projekte @@ -14,7 +14,7 @@ TasksDesc=Diese Ansicht zeigt alle Projekte und Aufgaben (Ihre Benutzerberechtig Myprojects=Meine Projekte ProjectsArea=Projektübersicht NewProject=Neues Projekt -AddProject=Projekt hinzufügen +AddProject=Projekt erstellen DeleteAProject=Löschen eines Projekts DeleteATask=Löschen einer Aufgabe ConfirmDeleteAProject=Möchten Sie dieses Projekt wirklich löschen? @@ -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 @@ -45,7 +47,7 @@ TaskDateStart=Startdatum der Aufgabe TaskDateEnd=Enddatum der Aufgabe TaskDescription=Aufgaben-Beschreibung NewTask=Neue Aufgabe -AddTask=Aufgabe hinzufügen +AddTask=Aufgabe erstellen AddDuration=Dauer hinzufügen Activity=Tätigkeit Activities=Aufgaben/Tätigkeiten @@ -85,13 +87,13 @@ ActionsOnProject=Projektaktionen YouAreNotContactOfProject=Sie sind diesem privaten Projekt nicht als Kontakt zugeordnet. DeleteATimeSpent=Lösche einen Zeitaufwand ConfirmDeleteATimeSpent=Möchten Sie diesen Zeitaufwand wirklich löschen? -DoNotShowMyTasksOnly=See also tasks not assigned to me -ShowMyTasksOnly=View only tasks assigned to me +DoNotShowMyTasksOnly=Zeige auch die Aufgaben der Anderen +ShowMyTasksOnly=Zeige nur meine Aufgaben TaskRessourceLinks=Ressourcen ProjectsDedicatedToThisThirdParty=Mit diesem Partner verknüpfte Projekte NoTasks=Keine Aufgaben für dieses Projekt LinkedToAnotherCompany=Mit Partner verknüpft -TaskIsNotAffectedToYou=Task not assigned to you +TaskIsNotAffectedToYou=Aufgabe nicht Ihnen zugeordnet ErrorTimeSpentIsEmpty=Zeitaufwand ist leer ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt (%s akutelle Aufgaben) und alle Zeitaufwände. IfNeedToUseOhterObjectKeepEmpty=Wenn einige Zuordnungen (Rechnung, Bestellung, ...), einem Dritten gehören, müssen Sie erst alle mit dem Projekt verbinden, damit das Projekt auch Dritten zugänglich ist . @@ -120,13 +122,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Mitwirkender TypeContact_project_task_external_TASKCONTRIBUTOR=Mitwirkender SelectElement=Element wählen AddElement=Mit Element verknüpfen -UnlinkElement=Unlink element +UnlinkElement=Verknüpfung zu Element aufheben # Documents models DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.) PlannedWorkload = Geplante Auslastung WorkloadOccupation= Beeinflussung der Auslastung ProjectReferers=Bezugnahmen SearchAProject=Suchen Sie ein Projekt -ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Draft projects -FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden +ProjectDraft=Projekt-Entwürfe +FirstAddRessourceToAllocateTime=Eine Ressource zuordnen, um Zeit festzulegen diff --git a/htdocs/langs/de_DE/resource.lang b/htdocs/langs/de_DE/resource.lang new file mode 100644 index 00000000000..edcfcf065c8 --- /dev/null +++ b/htdocs/langs/de_DE/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Ressourcen +MenuResourceAdd=Neue Ressource +MenuResourcePlanning=Ressourcen-Planung +DeleteResource=Ressource löschen +ConfirmDeleteResourceElement=Bitte Löschung der Ressource dieses Elements bestätigen +NoResourceInDatabase=Keine Ressource in Datenbank +NoResourceLinked=Keine Ressource verknüpft + +ResourcePageIndex=Liste der Ressourcen +ResourceSingular=Ressource +ResourceCard=Ressourcen-Karte +AddResource=Ressource erstellen +ResourceFormLabel_ref=Ressourcen-Name +ResourceType=Ressourcen-Typ +ResourceFormLabel_description=Ressourcen-Beschreibung + +ResourcesLinkedToElement=mit Element verknüpfte Ressourcen + +ShowResourcePlanning=Ressourcen-Planung zeigen +GotoDate=Gehe zu Datum + +ResourceElementPage=Element-Ressourcen +ResourceCreatedWithSuccess=Ressource erfolgreich erstellt +RessourceLineSuccessfullyDeleted=Ressourcen-Zeile erfolgreich gelöscht +RessourceLineSuccessfullyUpdated=Ressourcen-Zeile erfolgreich aktualisiert +ResourceLinkedWithSuccess=Ressource erfolgreich verknüpft + +TitleResourceCard=Ressourcen-Karte +ConfirmDeleteResource=Ressource wirklich löschen? +RessourceSuccessfullyDeleted=Ressource erfolgreich gelöscht +DictionaryResourceType=Ressourcen-Typ + +SelectResource=Ressource wählen diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang index fea929ad123..294d8e50e77 100644 --- a/htdocs/langs/de_DE/sendings.lang +++ b/htdocs/langs/de_DE/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Aktuell ist die Erstellung der neuen Sendung üb RelatedShippings=Ähnliche Sendungen ShipmentLine=Sendungszeilen CarrierList=Liste der Transporter +SendingRunning=Produkt aus Kundenbestellung bereits versandt +SuppliersReceiptRunning=Produkt aus Lieferantenbestellung bereits erhalten # Sending methods SendingMethodCATCH=Abholung durch Kunden @@ -74,5 +76,5 @@ SumOfProductVolumes=Summe der Produktevolumen SumOfProductWeights=Summe der Produktegewichte # warehouse details -DetailWarehouseNumber= Warehouse details +DetailWarehouseNumber= Warenlager-Details DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang index 2b7376cb62e..e5b37168b3c 100644 --- a/htdocs/langs/de_DE/stocks.lang +++ b/htdocs/langs/de_DE/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warenlager-Label erforderlich CorrectStock=Lagerbestand anpassen ListOfWarehouses=Liste der Warenlager ListOfStockMovements=Liste der Lagerbewegungen -StocksArea=Warenbestandsübersicht +StocksArea=Lagerbereich Location=Standort LocationSummary=Kurzbezeichnung Standort NumberOfDifferentProducts=Anzahl unterschiedlicher Produkte diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang index 94507c0c572..e7f84a4c27f 100644 --- a/htdocs/langs/de_DE/users.lang +++ b/htdocs/langs/de_DE/users.lang @@ -63,7 +63,6 @@ ShowGroup=Zeige Gruppe ShowUser=Zeige Benutzer NonAffectedUsers=Nicht betroffene Benutzer UserModified=Benutzer erfolgreich bearbeitet -GroupModified=Gruppe erfolgreich bearbeitet PhotoFile=Bilddatei UserWithDolibarrAccess=Benutzer mit Zugangsberechtigung ListOfUsersInGroup=Liste der Benutzer in dieser Gruppe @@ -103,7 +102,7 @@ UserDisabled=Benutzer %s deaktiviert UserEnabled=Benutzer %s aktiviert UserDeleted=Benutzer %s entfernt NewGroupCreated=Gruppe %s erstellt -GroupModified=Gruppe erfolgreich bearbeitet +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? @@ -120,3 +119,4 @@ UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum ändern OpenIDURL=OpenID URL LoginUsingOpenID=Verwende OpenID für Anmeldung WeeklyHours=Wochenstunden +ColorUser=Benutzerfarbe diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang index 139f35c1085..2f66393922b 100644 --- a/htdocs/langs/de_DE/withdrawals.lang +++ b/htdocs/langs/de_DE/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Beleg LastWithdrawalReceipts=%s neuste Abbuchungsbelege WithdrawedBills=Abgebuchte Rechnungen WithdrawalsLines=Abbuchungszeilen -RequestStandingOrderToTreat=Antrag auf Dauerauftrag zur Behandlung von -RequestStandingOrderTreated=Antrag auf Dauerauftrag behandelt +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Daueraufträge (Kunden) CustomerStandingOrder=Dauerauftrag (Kunde) NbOfInvoiceToWithdraw=Nr. der abzubuchenden Rechnung @@ -40,14 +41,13 @@ TransMetod=Überweisungsart Send=Senden Lines=Zeilen StandingOrderReject=Ablehnung ausstellen -InvoiceRefused=Rechnung abgelehnt WithdrawalRefused=Abbuchung abgelehnt WithdrawalRefusedConfirm=Möchten Sie wirklich eine Abbuchungsablehnung zu diesem Partner erstellen? RefusedData=Ablehnungsdatum RefusedReason=Ablehnungsgrund RefusedInvoicing=Ablehnung in Rechnung stellen NoInvoiceRefused=Ablehnung nicht in Rechnung stellen -InvoiceRefused=Rechnung abgelehnt +InvoiceRefused=Rechnung abgelehnt (Abweisung dem Kunden berechnen) Status=Status StatusUnknown=Unbekannt StatusWaiting=Wartend @@ -76,13 +76,14 @@ WithBankUsingRIB=Bankkonten mit RIB WithBankUsingBANBIC=Bankkonten mit IBAN/BIC/SWIFT BankToReceiveWithdraw=Bankkonto für Abbuchungen CreditDate=Am -WithdrawalFileNotCapable=Abbuchungsformular für Ihr Land konnte nicht erstellt werden. +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 7716a2e9393..c25a43570df 100644 --- a/htdocs/langs/el_GR/accountancy.lang +++ b/htdocs/langs/el_GR/accountancy.lang @@ -2,7 +2,7 @@ CHARSET=UTF-8 Accounting=Λογιστική -Globalparameters=Global parameters +Globalparameters=Βασικοί Παράμετροι Chartofaccounts=Διάγραμμα των λογαριασμών Fiscalyear=Οικονομικά έτη Menuaccount=Λογαριασμοί Λογιστικής @@ -11,12 +11,12 @@ MenuTools=Εργαλεία ConfigAccountingExpert=Διαμόρφωση της μονάδας λογιστικής expert Journaux=Ημερολόγια -JournalFinancial=Financial journals +JournalFinancial=Οικονιμικά ημερολόγια Exports=Εξαγωγές Modelcsv=Πρότυπο εξαγωγής Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή Modelcsv_normal=Κλασική εξαγωγή -Modelcsv_CEGID=Export towards CEGID Expert +Modelcsv_CEGID=Εξαγωγή προς CEGID εμπειρογνωμόνων BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών Back=Επιστροφή @@ -25,12 +25,12 @@ Selectchartofaccounts=Επιλέξτε ένα διάγραμμα των λογα Validate=Επικύρωση Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό AccountAccounting=Λογιστική λογαριασμού -Ventilation=Ventilation +Ventilation=Ανάλυση ToDispatch=Για την αποστολή Dispatched=Αποστέλλονται -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Ανάλυση πελατών +SuppliersVentilation=Ανάλυση προμηθευτών TradeMargin=Εμπορικό Περιθώριο Reports=Αναφορές ByCustomerInvoice=Με τιμολόγια πελατών @@ -40,57 +40,57 @@ Update=Ενημέρωση List=Λίστα Create=Δημιουργία UpdateAccount=Τροποποίηση του λογιστικού λογαριασμού -UpdateMvts=Modification of a movement -WriteBookKeeping=Record accounts in general ledger +UpdateMvts=Τροποποίηση μιας κίνησης +WriteBookKeeping=Εγγραφή λογαριασμών στο γενικό καθολικό Bookkeeping=Γενικό Καθολικό AccountBalanceByMonth=Το υπόλοιπο του λογαριασμού ανά μήνα -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Ανάλυση των λογαριασμών +AccountingVentilationSupplier=Ανάλυση λογιστικών προμηθευτή +AccountingVentilationCustomer=Ανάλυση λογιστικών των πελατών Line=Γραμμή -CAHTF=Total purchase supplier HT -InvoiceLines=Lines of invoice to be ventilated -InvoiceLinesDone=Ventilated lines of invoice -IntoAccount=In the accounting account +CAHTF=Σύνολο προμηθευτή αγορά ΗΤ +InvoiceLines=Εγγραφές τιμολογίου για ανανέωση +InvoiceLinesDone=Ανανεωμένες εγγραφές τιμολογίου +IntoAccount=Στο λογιστικό λογαριασμό -Ventilate=Ventilate -VentilationAuto=Automatic ventilation +Ventilate=Ανανέωση +VentilationAuto=Αυτόματη ανάλυση Processing=Επεξεργασία EndProcessing=Τέλος της επεξεργασίας -AnyLineVentilate=Any lines to ventilate +AnyLineVentilate=Εγγραφές προς ανανέωση SelectedLines=Επιλεγμένες γραμμές Lineofinvoice=Γραμμή τιμολογίου -VentilatedinAccount=Ventilated successfully in the accounting account -NotVentilatedinAccount=Not ventilated in the accounting account +VentilatedinAccount=Ανανεώθηκε επιτυχώς στον λογιστικό λογαριασμό +NotVentilatedinAccount=Δεν ανανεώθηκε στον λογιστικό λογαριασμό -ACCOUNTING_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Διαχωριστικό CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Αριθμός αντικειμένων για ανάλυση ανά σελίδα (προτείνεται μέγιστο : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε τη διαλογή της κατανομής των σελίδων "Έχει για κατανομή» από τα πιο πρόσφατα στοιχεία +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε τη διαλογή της κατανομής των σελίδων "Ανάλυση" με τα πιο πρόσφατα στοιχεία -AccountLength=Length of the accounting accounts shown in Dolibarr -AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts +AccountLength=Μήκος των λογιστικών λογαριασμών που φαίνονται στο Dolibarr +AccountLengthDesc=Λειτουργία που επιτρέπει να υποκρίνεαι μήκος του λογιστικού λογαριασμού αντικαθιστώντας χώρους από τον αριθμό μηδέν. Η λειτουργία αυτή αγγίζει μόνο την οθόνη, δεν τροποποιούν τους λογιστικούς λογαριασμούς στο Dolibarr. Για την εξαγωγή, αυτή η λειτουργία είναι απαραίτητη για να είναι συμβατή με το συγκεκριμένο λογισμικό. +ACCOUNTING_LENGTH_GACCOUNT=Μήκος γενικών λογαριασμών +ACCOUNTING_LENGTH_AACCOUNT=Μήκος λογαριασμών τρίτων -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal -ACCOUNTING_CASH_JOURNAL=Cash journal -ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTING_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων +ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών +ACCOUNTING_BANK_JOURNAL=Τραπεζικό ημερολόγιο +ACCOUNTING_CASH_JOURNAL=Ημερολόγιο μετρητών +ACCOUNTING_MISCELLANEOUS_JOURNAL=Διάφορα ημερολόγια +ACCOUNTING_SOCIAL_JOURNAL=Κοινωνικό ημερολόγιο -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Λογαριασμός μεταφοράς +ACCOUNTING_ACCOUNT_SUSPENSE=Λογαριασμός σε αναμονή -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προεπιλεγμένος λογιστικός λογαριασμός για αγορά προϊόντων (εάν δεν είναι ορισμένος στην καρτέλα προϊόντος) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προεπιλεγμένος λογιστικός λογαριασμός για πώληση προϊόντων (εάν δεν είναι ορισμένος στην καρτέλα προϊόντος) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Προεπιλεγμένος λογιστικός λογαριασμός για αγορά υπηρεσιών (εάν δεν είναι ορισμένος στην καρτέλα υπηρεσίας) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Προεπιλεγμένος λογιστικός λογαριασμός για πώληση υπηρεσιών (εάν δεν είναι ορισμένος στην καρτέλα υπηρεσίας) Doctype=Τύπος εγγράφου Docdate=Ημερομηνία @@ -101,58 +101,58 @@ Labelcompte=Ετικέτα λογαριασμού Debit=Χρέωση Credit=Πίστωση Amount=Σύνολο -Sens=Sens +Sens=Σημασία Codejournal=Ημερολόγιο -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Διαγράψτε τα αρχεία της γενικής λογιστικής -SellsJournal=Sells journal -PurchasesJournal=Purchases journal -DescSellsJournal=Sells journal -DescPurchasesJournal=Purchases journal -BankJournal=Bank journal -DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Cash journal -DescCashJournal=Cash journal including the type of payment cash +SellsJournal=Ημερολόγιο πωλήσεων +PurchasesJournal=Ημερολόγιο αγορών +DescSellsJournal=Ημερολόγιο πωλήσεων +DescPurchasesJournal=Ημερολόγιο αγορών +BankJournal=Τραπεζικό ημερολόγιο +DescBankJournal=Ημερολόγιο Τράπεζας, συμπεριλαμβανομένων όλων των ειδών πληρωμών εκτός από τα μετρητά +CashJournal=Ημερολόγιο μετρητών +DescCashJournal=Ημερολόγιο μετρητών καθώς και το είδος των ταμειακών πληρωμών -CashPayment=Cash Payment +CashPayment=Καταβολή Μετρητών -SupplierInvoicePayment=Payment of invoice supplier -CustomerInvoicePayment=Payment of invoice customer +SupplierInvoicePayment=Πληρωμή τιμολογίου προμηθευτή +CustomerInvoicePayment=Πληρωμή τιμολογίου προμηθευτή -ThirdPartyAccount=Thirdparty account +ThirdPartyAccount=Λογαριασμός Πελ./Προμ. -NewAccountingMvt=New movement -NumMvts=Number of movement -ListeMvts=List of the movement -ErrorDebitCredit=Debit and Credit cannot have a value at the same time +NewAccountingMvt=Νέα κίνηση +NumMvts=Αριθμός κίνησης +ListeMvts=Λίστα των κινήσεων +ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπορούν να χουν την ίδια αξία ταυτόχρονα -ReportThirdParty=List thirdparty account -DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts +ReportThirdParty=Λίστα λογαριασμού Πελ./Προμ. +DescThirdPartyReport=Συμβουλευτείτε εδώ τη λίστα των πελατών και των προμηθευτών και των λογιστικών τους λογαριασμούς τους -ListAccounts=List of the accounting accounts +ListAccounts=Λίστα των λογιστικών λογαριασμών -Pcgversion=Version of the plan -Pcgtype=Class of account -Pcgsubtype=Under class of account -Accountparent=Root of the account -Active=Statement +Pcgversion=Έκδοση του σχεδίου +Pcgtype=Τύπος λογαριασμού +Pcgsubtype=Δευτερεύουσα κατηγορία λογαριασμού +Accountparent=Ρίζα του λογαριασμού +Active=Δήλωση -NewFiscalYear=New fiscal year +NewFiscalYear=Νέα οικονομική χρονιά -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers -TotalVente=Total turnover HT -TotalMarge=Total sales margin -DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account -DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account -ChangeAccount=Change the accounting account for lines selected by the account: +DescVentilCustomer=Συμβουλευτείτε εδώ την ετήσια κατανομή των λογαριασμών των τιμολογίων των πελατών σας +TotalVente=Σύνολο κύκλου εργασιών ΗΤ +TotalMarge=Συνολικό περιθώριο πωλήσεων +DescVentilDoneCustomer=Συμβουλευτείτε εδώ τη λίστα των γραμμών των τιμολογίων των πελατών και τη λογιστική των λογαριασμών τους +DescVentilTodoCustomer=Ανανεώστε τις εγγραφές ενός τιμολογίου πελάτη με έναν λογιστικό λογαριασμό +ChangeAccount=Αλλαγή λογιστικού λογαριασμού για εγγραφές επιλεγμένες από τον λογαριασμό: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers -DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account -DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account +DescVentilSupplier=Συμβουλευτείτε εδώ την ετήσια κατανομή των λογαριασμών των τιμολογίων των προμηθευτών σας +DescVentilTodoSupplier=Ανανέωσε τις εγγραφές του τιμολογίου προμηθευτή με έναν λογιστικό λογαριασμό +DescVentilDoneSupplier=Συμβουλευτείτε εδώ τη λίστα των γραμμών των τιμολογίων του προμηθευτή και τη λογιστική του λογαριασμού τους -ValidateHistory=Validate Automatically +ValidateHistory=Αυτόματη επικύρωση -ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used +ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να διαγράψετε αυτόν τον λογιστικό λογαριασμό γιατί χρησιμοποιείται -FicheVentilation=Ventilation card +FicheVentilation=Φόρμα ανάλυσης diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index ceddf7f8824..efc83a59004 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=Εμφάνιση πλήρους χρονοδιαγράμματος γεγονότων στο φύλλο ΠΕΛ./ΠΡΟΜ. @@ -76,7 +78,7 @@ Index=Ευρετήριο Mask=Μάσκα NextValue=Επόμενο NextValueForInvoices=Επόμενο (τιμολόγιο) -NextValueForCreditNotes=Επόμενο (πιστωτικά σημειώματα) +NextValueForCreditNotes=Επόμενο (πιστωτικά τιμολόγια) NextValueForDeposit=Επόμενη αξία (κατάθεση) NextValueForReplacements=Επόμενη αξία (αντικατάστασης) MustBeLowerThanPHPLimit=Σημείωση: Η PHP σας περιορίζει το μέγεθος κάθε αρχείου αποστολής σε %s %s, ανεξάρτητα από το ποιά είναι η αξία αυτής της παραμέτρου. @@ -118,8 +120,8 @@ ParameterInDolibarr=Παράμετρος %s LanguageParameter=Παράμετρος γλώσσας %s LanguageBrowserParameter=Παράμετρος %s LocalisationDolibarrParameters=Παράμετροι τοπικών ρυθμίσεων -ClientTZ=Ζώνη Ώρας client (χρήστης) -ClientHour=Ωρα client (χρήστης) +ClientTZ=Ζώνη Ώρας χρήστη (χρήστης) +ClientHour=Ωρα χρήστη (χρήστης) OSTZ=OS Time Zone του διακομιστή PHPTZ=Ζώνη Ώρας PHP server PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds) @@ -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=Διαθέσιμα Πλαίσια @@ -219,7 +222,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled Required=Υποχρεωτικό -UsedOnlyWithTypeOption=Used by some agenda option only +UsedOnlyWithTypeOption=Χρησιμοποιείται μόνο από κάποια επιλογή της ατζέντας Security=Ασφάλεια Passwords=Συνθηματικά DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) @@ -260,11 +263,11 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s) MAIN_MAIL_ERRORS_TO=E-mail αποστολέα που χρησιμοποιούνται για την επιστροφή λάθος μηνύματα που στέλνονται MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to -MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου των προτάσεων που αποστέλλονται μέσω email στο -MAIN_MAIL_AUTOCOPY_ORDER_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου των παραγγελιών που αποστέλλονται μέσω email στο -MAIN_MAIL_AUTOCOPY_INVOICE_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου του τιμολογίου που αποστέλλεται μέσω email στο +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου των προσφορών που αποστέλλονται μέσω email στο +MAIN_MAIL_AUTOCOPY_ORDER_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου των παραγγελιών που αποστέλλονται μέσω email στο +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου τιμολογίου που αποστέλλεται μέσω email στο MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos) -MAIN_MAIL_SENDMODE=Μέθοδος για να χρησιμοποιήσετε για αποστολή EMails +MAIN_MAIL_SENDMODE=Μέθοδος που χρησιμοποιείτε για αποστολή EMails MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt @@ -422,7 +425,7 @@ Module23Desc= Monitoring the consumption of energies Module25Name=Παραγγελίες πελάτη Module25Desc=Customer order management Module30Name=Τιμολόγια -Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers +Module30Desc=Τιμολόγιο και πιστωτικό τιμολόγιο διαχείρισης για τους πελάτες. Τιμολόγιο διαχείρισης για τους προμηθευτές Module40Name=Προμηθευτές Module40Desc=Supplier management and buying (orders and invoices) Module42Name=Logs @@ -437,14 +440,14 @@ Module52Name=Αποθήκες Module52Desc=Stock's management of products Module53Name=Υπηρεσίες Module53Desc=Service management -Module54Name=Συμβόλαια -Module54Desc=Contract's and service's management +Module54Name=Συμβάσεις/Συνδρομές +Module54Desc=Διαχείριση συμβολαίων (υπηρεσιών ή ανανεώσιμων συνδρομών) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Τηλεφωνία Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +Module57Desc=Πάγιες εντολές και διαχείριση απόσυρσης. Επίσης, περιλαμβάνει την παραγωγή του αρχείου SEPA για τις ευρωπαϊκές χώρες. 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=Έργα -Module400Desc=Project management inside other modules +Module400Name=Έργα/Ευκαιρίες/Leads +Module400Desc=Διαχείριση έργων, ευκαιρίες ή leads. Στη συνέχεια μπορείτε να ορίσετε οποιοδήποτε στοιχείο (τιμολόγιο, παραγγελία, προσφορά, παρέμβαση, ...) σε ένα έργο και να πάρετε μια εγκάρσια όψη από την προβολή του έργου. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινωνικής ασφάλισης, μερίσματα) @@ -484,7 +487,7 @@ Module500Desc=Διαχείριση των ειδικών δαπανών, όπω Module510Name=Μισθοί Module510Desc=Διαχείριση υπαλλήλων, μισθών και πληρωμών Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts +Module600Desc=Αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου σχετικά με ορισμένες Dolibarr επαγγελματικές συναντήσεις σε Πελ./Προμ. (η ρύθμιση ορίζεται από κάθε Πελ./Προμ.) Module700Name=Δωρεές Module700Desc=Donation management Module1200Name=Mantis @@ -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=Δυναμικές Τιμές +Module2200Desc=Ενεργοποιήστε τη χρήση των μαθηματικών εκφράσεων για τις τιμές 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=Υπηρεσίες Διαδικτύου (πελάτης) +Module2650Desc=Ενεργοποιήστε το Dolibarr web services client (Μπορεί να χρησιμοποιηθεί για την προώθηση των δεδομένων/αιτήσεις σε εξωτερικούς διακομιστές. Μόνο Παραγγελίες προμηθευτών υποστηρίζονται προς το παρόν) 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 @@ -514,20 +521,20 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Ροή εργασίας Module6000Desc=Διαχείρισης Ροών Εργασιών -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +Module20000Name=Αφήστε τη διαχείριση των ερωτήσεων +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=Paybox Module50000Desc=Ενότητα για να προσφέρει μια σε απευθείας σύνδεση σελίδα πληρωμής με πιστωτική κάρτα με Paybox Module50100Name=Σημείο Πωλήσεων Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Ενότητα για να προσφέρει μια σε απευθείας σύνδεση σελίδα πληρωμής με πιστωτική κάρτα με Paypal +Module50200Name=Paypal +Module50200Desc=Ενότητα για να προσφέρει μια σε απευθείας σύνδεση σελίδα πληρωμής με πιστωτική κάρτα με Paypal Module50400Name=Λογιστική (για προχωρημένους) Module50400Desc=Λογιστική διαχείριση (διπλά μέρη) Module54000Name=PrintIPP -Module54000Desc=Εκτύπωση μέσω Cups IPP εκτυπωτή. +Module54000Desc=Απευθείας εκτύπωση (χωρίς να ανοίξετε τα έγγραφα) χρησιμοποιώντας Cups IPP διασύνδεση (Ο Εκτυπωτής πρέπει να είναι ορατός από τον server, και το CUPS πρέπει να έχει εγκατασταθεί στο server). Module55000Name=Ανοικτή Ψηφοφορία Module55000Desc=Πρόσθετο για την δημιουργία μιας διαδικτυακής έρευνας (όπως Doodle, Studs, Rdvz, ...) Module59000Name=Margins @@ -606,15 +613,16 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Πιστωτικές / αρνηθεί στέκεται εισπράξεις παραγγελιών -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission161=Διαβάστε συμβάσεις/συνδρομές +Permission162=Δημιουργία/τροποποίηση συμβολαίων/συνδρομών +Permission163=Ενεργοποίηση υπηρεσίας/συνδρομής ενός συμβολαίου +Permission164=Απενεργοποίηση υπηρεσίας/συνδρομής ενός συμβολαίου +Permission165=Διαγραφή συμβολαίων/συνδρομών +Permission171=Διαβάστε τα ταξίδια και τα έξοδα (own and his subordinates) +Permission172=Δημιουργία/τροποποίηση ταξίδια και έξοδα +Permission173=Διαγραφή ταξιδιών και εξόδων +Permission174=Διαβάστε όλα τα ταξίδια και τα έξοδα +Permission178=Εξαγωγή ταξιδιών και εξόδων Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Ανάθεση υπηρεσίας/συνδρομής σε συμβόλαιο Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -701,8 +709,8 @@ Permission701=Read donations Permission702=Δημιουργία / τροποποίηση δωρεές Permission703=Διαγραφή δωρεές Permission1001=Διαβάστε τα αποθέματα -Permission1002=Δημιουργία / τροποποίηση των αποθεμάτων -Permission1003=Διαγραφή των αποθεμάτων +Permission1002=Δημιουργία/τροποποίηση αποθηκών +Permission1003=Διαγραφή αποθηκών Permission1004=Διαβάστε τις κινήσεις αποθεμάτων Permission1005=Δημιουργία / τροποποίηση των κινήσεων του αποθέματος Permission1101=Read delivery orders @@ -778,6 +786,7 @@ DictionaryOrderMethods=Μέθοδος Παραγγελίας DictionarySource=Προέλευση των προτάσεων/παραγγελιών DictionaryAccountancyplan=Λογιστικό σχέδιο DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου +DictionaryEMailTemplates=Πρότυπα email SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν BackToModuleList=Πίσω στη λίστα με τα modules BackToDictionaryList=Επιστροφή στη λίστα λεξικών @@ -887,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu DefaultLanguage=Προκαθορισμένη Γλώσσα (κωδ. γλώσσας) EnableMultilangInterface=Ενεργοποίησ πολυγλωσσικού περιβάλλοντος EnableShowLogo=Εμφάνιση λογότυπου στο αριστερό μενού +EnableHtml5=Ενεργοποίηση HTML5 (Ανάπτυξη - Διαθέσιμο μόνο για Eldy πρότυπο) SystemSuccessfulyUpdated=Το σύστημά σας αναβαθμίστηκε επιτυχώς CompanyInfo=Πληροφορίες Εταιρίας/Οργανισμού CompanyIds=Ταυτότητες Εταιρίας/Οργανισμού @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Αυτόματη ανίχνευση δεν είναι δυνατή YouUseBestDriver=Μπορείτε να χρησιμοποιήσετε το πρόγραμμα οδήγησης %s που είναι καλύτερος οδηγός που διατίθεται σήμερα. YouDoNotUseBestDriver=Μπορείτε να χρησιμοποιήσετε τη μονάδα %s αλλά ο οδηγός %s προτείνετε. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=Emails ειδοποιήσεις η λειτουργία αυτή σας επιτρέπει να στείλετε σιωπηλά αυτόματο μήνυμα, για ορισμένες εκδηλώσεις Dolibarr. Οι στόχοι των κοινοποιήσεων μπορούν να οριστούν:
    * ανά Πελ./Προμ. (πελάτες ή προμηθευτές), ανά ένα Πελ./Προμ. την φορά.
    * ή με τον καθορισμό ενός γενικού e-mail στη σελίδα εγκατάστασης του module. ModelModules=Πρότυπα εγγράφων DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1111,12 +1120,12 @@ WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct. ##### Invoices ##### BillsSetup=Invoices module setup BillsDate=Invoices date -BillsNumberingModule=Invoices and credit notes numbering model +BillsNumberingModule=Τιμολόγια και πιστωτικά τιμολόγια μοντέλο αρίθμησης BillsPDFModules=Invoice documents models -CreditNoteSetup=Credit note module setup -CreditNotePDFModules=Credit note document models -CreditNote=Credit note -CreditNotes=Credit notes +CreditNoteSetup=Ρυθμίσεις του module πιστωτικό τιμολόγιο +CreditNotePDFModules=Μοντέλα πιστωτικών τιμολογίων +CreditNote=Πιστωτικό τιμολόγιο +CreditNotes=Πιστωτικά τιμολόγια ForceInvoiceDate=Force invoice date to validation date DisableRepeatable=Disable repeatable invoices SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τραπεζικό λογαριασμό προορισμού της προσφοράς ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Απόκρυψη των επεξεργασμένων ή ακυ ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Προσθήκη εικονιδίου στις Παραγγελίες που δείχνει ότι η παραγγελία μπορεί να αποσταλεί ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Συμβάσεις εγκατάσταση μονάδας +ContractsSetup=Ρύθμιση module Συμβάσεις/Συνδρομές ContractsNumberingModules=Συμβάσεις αρίθμησης ενοτήτων TemplatePDFContracts=Συμβάσεις μοντέλα εγγράφων FreeLegalTextOnContracts=Ελεύθερο κείμενο για τις συμβάσεις @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Αρχεία τύπου %s δεν συμπιέζοντ CacheByServer=Cache από τον server CacheByClient=Cache από τον browser CompressionOfResources=Συμπίεση HTTP απαντήσεων -TestNotPossibleWithCurrentBrowsers=Αυτόματη ανίχνευση δεν είναι δυνατή +TestNotPossibleWithCurrentBrowsers=Μια τέτοια αυτόματη ανίχνευση δεν είναι δυνατόν με τα τρέχουσα προγράμματα περιήγησης ##### Products ##### ProductSetup=Products module setup ServiceSetup=Υπηρεσίες εγκατάστασης μονάδας @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=Ρύθμιση module EMail κοινοποίησης NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=Κατάλογος των διαθέσιμων κοινοποιήσεων (Αυτή η λίστα εξαρτάται από την ενεργοποίηση modules) +ListOfAvailableNotifications=Κατάλογος των εκδηλώσεων μπορείτε να ορίσετε ειδοποίηση, για κάθε Πελ./Προμ. (πηγαίνετε στη κάρτα Πελ./Προμ. για την ρύθμιση) ή με τον καθορισμό ενός σταθερού ηλεκτρονικού ταχυδρομείου (Η Λίστα εξαρτάται από τα ενεργοποιημένα modules) +FixedEmailTarget=Σταθερός email στόχος ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Ρύθμιση module Αποθήκη +UserWarehouse=Χρήση των χρηστών προσωπικών αποθηκών +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Σημείο Πωλήσεων CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Προεπιλογή γενικός Πελ./Προμ. να χρησιμοποιηθεί για Πωλήσεις CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +CashDeskDoNotDecreaseStock=Απενεργοποίηση μείωση των αποθεμάτων όταν η πώληση γίνεται από Point of Sale +CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease +StockDecreaseForPointOfSaleDisabled=Μείωση αποθέματος από Point Of Sale απενεργοποιημένο +CashDeskYouDidNotDisableStockDecease=Δεν έχετε απενεργοποιήσει μείωση των αποθεμάτων κατά την πραγματοποίηση μιας πώλησης από το σημείο πώλησης "POS". Μια αποθήκη είναι απαραίτητη. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Διαγραφή οικονομικού έτους ConfirmDeleteFiscalYear=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το οικονομικό έτος; Opened=Ανοίξτε Closed=Κλείστε - +AlwaysEditable=Μπορεί πάντα να επεξεργαστή +MAIN_APPLICATION_TITLE=Αναγκαστικό ορατό όνομα της εφαρμογής (προειδοποίηση: η ρύθμιση του δικού σας ονόματος μπορεί να δημιουργήσει πρόβλημα στη λειτουργία Αυτόματης συμπλήρωσης σύνδεσης όταν χρησιμοποιείτε το DoliDroid εφαρμογή για κινητά) +NbMajMin=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων +NbNumMin=Ελάχιστος αριθμός αριθμητικών χαρακτήρων +NbSpeMin=Ελάχιστος αριθμός ειδικών χαρακτήρων +NbIteConsecutive=Ελάχιστος αριθμός επανάληψης ίδιων χαρακτήρων +NoAmbiCaracAutoGeneration=Μη χρησιμοποιείται διφορούμενους χαρακτήρες ("1","l","i","|","0","O") για αυτόματη δημιουργία +SalariesSetup=Ρύθμιση module μισθών +SortOrder=Σειρά ταξινόμησης Format=Μορφή TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang index 446b0613cb9..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=Εμφάνιση Λίστας @@ -41,9 +42,10 @@ AutoActions= Αυτόματη συμπλήρωση ημερολογίου AgendaAutoActionDesc= Εδώ ορίζετε γεγονότα για το οποία θέλετε το Dolibarr να δημιουργεί αυτόματα μια ενέργεια στην ατζέντα. Αν τίποτα δεν είναι τσεκαρισμένο (προεπιλογή), τότε, μόνο χειροκίνητες ενέργειες θα συμπεριληφθούν στην ατζέντα. AgendaSetupOtherDesc= Αυτή η σελίδα παρέχει επιλογές για να καταστεί δυνατή η εξαγωγή των δικών σας εκδηλώσεων Dolibarr σε ένα εξωτερικό ημερολόγιο (thunderbird, google calendar, ...) AgendaExtSitesDesc=Αυτή η σελίδα σας επιτρέπει να ρυθμίσετε εξωτερικά ημερολόγια. -ActionsEvents= Γεγονότα για τα οποία θα δημιουργήσουν εγγραφή στο ημερολόγιο, αυτόματα -PropalValidatedInDolibarr= Η πρόταση %s επικυρώθηκε -InvoiceValidatedInDolibarr= Το τιμολόγιο %s επικυρώθηκε +ActionsEvents=Γεγονότα για τα οποία θα δημιουργήσουν εγγραφή στο ημερολόγιο, αυτόματα +PropalValidatedInDolibarr=Η πρόταση %s επικυρώθηκε +InvoiceValidatedInDolibarr=Το τιμολόγιο %s επικυρώθηκε +InvoiceValidatedInDolibarrFromPos=Το τιμολόγιο επικυρώθηκε από το POS InvoiceBackToDraftInDolibarr=Τιμολόγιο %s θα επιστρέψει στην κατάσταση του σχεδίου InvoiceDeleteDolibarr=Τιμολόγιο %s διαγράφεται OrderValidatedInDolibarr= Η παραγγελία %s επικυρώθηκε @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Παραγγελία %s εγκρίθηκε OrderRefusedInDolibarr=Παραγγελία %s απορριφθεί OrderBackToDraftInDolibarr=Παραγγελία %s θα επιστρέψει στην κατάσταση σχέδιο OrderCanceledInDolibarr=Παραγγελία %s ακυρώθηκε -InterventionValidatedInDolibarr=Η παρέμβαση %s επικυρώθηκε ProposalSentByEMail=Η εμπορική πρόταση %s στάλθηκε με e-mail OrderSentByEMail=Η παραγγελία του πελάτη %s εστάλη με EMail InvoiceSentByEMail=Το τιμολόγιο του πελάτη %s εστάλη με EMail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Η παραγγελία προμηθευτή %s στά SupplierInvoiceSentByEMail=Το τιμολόγιο προμηθευτή %s στάλθηκε με e-mail ShippingSentByEMail=Αποστολές %s αποστέλλονται με ηλεκτρονικό ταχυδρομείο ShippingValidated= Αποστολές %s επικυρωθεί -InterventionSentByEMail=Παρέμβαση %s αποστέλλονται με ηλεκτρονικό ταχυδρομείο -InterventionClassifiedBilled=Παρέμβαση %s ταξινόμηση ως τιμολογημένα NewCompanyToDolibarr= Το στοιχείο δημιουργήθηκε DateActionPlannedStart= Προγρ/σμένη ημερομηνία έναρξης DateActionPlannedEnd= Προγρ/σμένη ημερομηνία λήξης @@ -70,9 +69,9 @@ DateActionStart= Ημερομηνία έναρξης DateActionEnd= Ημερομηνία λήξης AgendaUrlOptions1=Μπορείτε ακόμη να προσθέσετε τις ακόλουθες παραμέτρους για να φιλτράρετε τα αποτέλεσμα: AgendaUrlOptions2=login=%s για να περιορίσετε τα αποτελέσματα σε ενέργειες που δημιουργήθηκαν και έγιναν από τον χρήστη %s. -AgendaUrlOptions3=logina=%s για να περιορίσετε τα αποτελέσματα σε ενέργειες που δημιουργήθηκαν από τον χρήστη%s. +AgendaUrlOptions3=logina=%s να περιορίσει την παραγωγή ενεργειών που ανήκουν στον χρήστη %s. AgendaUrlOptions4=logint=%s για να περιορίσετε τα αποτελέσματα σε ενέργειες που αφορούν τον χρήστη%s. -AgendaUrlOptions5=logind=%s για να περιορίσετε τα αποτελέσματα σε ενέργειες που έγιναν από τον χρήστη %s. +AgendaUrlOptionsProject=project=PROJECT_ID να περιορίσει την παραγωγή της σε ενέργειες που σχετίζονται με το έργο PROJECT_ID. AgendaShowBirthdayEvents=Εμφάνιση γενεθλίων των προσώπων επικοινωνίας AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των προσώπων επικοινωνίας Busy=Απασχολ. @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL για να αποκτήσετε πρόσβαση στο .i ExtSiteNoLabel=Χωρίς Περιγραφή WorkingTimeRange=Εύρος χρόνου εργασίας WorkingDaysRange=Εύρος ημερών εργασίας -AddEvent=Προσθήκη ενέργειας +AddEvent=Δημιουργία συμβάντος MyAvailability=Η διαθεσιμότητα μου diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang index aae26d2dd43..cd400fb40ea 100644 --- a/htdocs/langs/el_GR/bills.lang +++ b/htdocs/langs/el_GR/bills.lang @@ -24,12 +24,12 @@ InvoiceProFormaDesc=Το Προτιμολόγιο είναι η εικό InvoiceReplacement=Τιμολόγιο Αντικατάστασης InvoiceReplacementAsk=Αντικατάσταση τιμολογίου με InvoiceReplacementDesc=Τιμολόγιο αντικατάστασης χρησιμοποιείται για να ακυρώσει και να αντικαταστήσει πλήρως ένα απλήρωτο τιμολόγιο.

    Σημείωση: Μόνο τα τιμολόγια χωρίς καμία πληρωμή μπορούν να αντικατασταθούν. Εάν το τιμολόγιο που θα αντικατασταθεί δεν έχει κλείσει, θα κλείσει αυτόματα και θα σημειωθεί «εγκαταλειμμένο». -InvoiceAvoir=Πιστωτικό σημείωμα -InvoiceAvoirAsk=Πιστωτικό σημείωμα για την διόρθωση τιμολογίου -InvoiceAvoirDesc=Το πιστωτικό σημείωμαείναι ένα αρνητικό τιμολόγιο που χρησιμοποιείτε για να λύσει τη κατάσταση κατά την οποία το σύνολο του τιμολογίου διαφέρει από το σύνολο της πραγματικής πληρωμής (ίσως επειδή ο πελάτης πλήρωσε περισσότερα -- από λάθος, ή επειδή πλήρωσε λιγότερα και επέστρεψε κάποια προϊόντα). -invoiceAvoirWithLines=Δημιουργία Πιστωτικού Σημειώματος με γραμμές από το τιμολόγιο προέλευσης. -invoiceAvoirWithPaymentRestAmount=Δημιουργία Πιστωτικού Τιμολογίου με το ποσό των πληρωμών του τιμολογίου προέλευσης -invoiceAvoirLineWithPaymentRestAmount=Πιστωτικό Τιμολόγιο με ποσό των πληρωμών τιμολογίου +InvoiceAvoir=Πιστωτικό τιμολόγιο +InvoiceAvoirAsk=Πιστωτικό τιμολόγιο για την διόρθωση τιμολογίου +InvoiceAvoirDesc=Το πιστωτικό τιμολόγιοείναι ένα αρνητικό τιμολόγιο που χρησιμοποιείτε για να λύσει τη κατάσταση κατά την οποία το σύνολο του τιμολογίου διαφέρει από το σύνολο της πραγματικής πληρωμής (ίσως επειδή ο πελάτης πλήρωσε περισσότερα -- από λάθος, ή επειδή πλήρωσε λιγότερα και επέστρεψε κάποια προϊόντα). +invoiceAvoirWithLines=Δημιουργία Πιστωτικού τιμολογίου με γραμμές από το τιμολόγιο προέλευσης. +invoiceAvoirWithPaymentRestAmount=Δημιουργήστε Πιστωτικό Τιμολόγιο με το υπόλοιπο πριν από την καταβολή του τιμολογίου +invoiceAvoirLineWithPaymentRestAmount=Πιστωτικό τιμολόγιο για το υπολειπόμενο ανεξόφλητο ποσό ReplaceInvoice=Αντικατάσταση Τιμολογίου %s ReplacementInvoice=Τιμολόγιο Αντικατάστασης ReplacedByInvoice=Αντικαταστάθηκε από το τιμολόγιο %s @@ -73,7 +73,7 @@ PaymentsReports=Αναφορές Πληρωμών PaymentsAlreadyDone=Ιστορικό Πληρωμών PaymentsBackAlreadyDone=Payments back already done PaymentRule=Κανόνας Πληρωμής -PaymentMode=Τύπος Πληρωμής +PaymentMode=Τρόπος Πληρωμής PaymentConditions=Συνθήκη Πληρωμής PaymentConditionsShort=Συνθήκες Πληρωμής PaymentAmount=Σύνολο πληρωμής @@ -85,9 +85,9 @@ ClassifyPaid=Χαρακτηρισμός ως 'Πληρωμένο'' ClassifyPaidPartially=Χαρακτηρισμός ως 'Μη Εξοφλημένο' ClassifyCanceled=Χαρακτηρισμός ως 'Εγκαταλελειμμένο' ClassifyClosed=Χαρακτηρισμός ως 'Κλειστό' -ClassifyUnBilled=Classify 'Unbilled' +ClassifyUnBilled=Ταξινομήστε τα «Μη τιμολογημένα» CreateBill=Δημιουργία Τιμολογίου -AddBill=Προσθήκη τιμολ./πιστ. σημ. +AddBill=Δημιουργία τιμολογίου ή δημιουργία σημείωσης AddToDraftInvoices=Προσθήκη στο πρόχειρο τιμολόγιο DeleteBill=Διαγραφή Τιμολογίου SearchACustomerInvoice=Εύρεση τιμολογίου πελάτη @@ -99,7 +99,7 @@ DoPaymentBack=Do payment back ConvertToReduc=Μετατροπή σε μελλοντική έκπτωση EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή -DisabledBecauseRemainderToPayIsZero=Απενεργοποιήθηκε λόγω μηδενικού υπολοίπου +DisabledBecauseRemainderToPayIsZero=Ανενεργό λόγο μηδενικού υπολοίπου πληρωμής Amount=Σύνολο PriceBase=Τιμή βάσης BillStatus=Κατάσταση τιμολογίου @@ -137,8 +137,6 @@ BillFrom=Από BillTo=Στοιχεία Πελάτη ActionsOnBill=Ενέργειες στο τιμολόγιο NewBill=Νέο τιμολόγιο -Prélèvements=Πάγιες Εντολές -Prélèvements=Πάγιες Εντολές LastBills=Τελευταία %s τιμολόγια LastCustomersBills=Τελευταία %s τιμολόγια πελατών LastSuppliersBills=Τελευταία %s τιμολόγια προμηθευτών @@ -156,9 +154,9 @@ ConfirmCancelBill=Είστε σίγουροι ότι θέλετε να ακυρ ConfirmCancelBillQuestion=Γιατί θέλετε να χαρακτηρίσετε το τιμολόγιο ώς "Εγκαταλειμμένο" ConfirmClassifyPaidPartially=Είστε σίγουροι ότι θέλετε να αλλάξετε την κατάσταση τιμολογίου %s σε 'Πληρωμένο'; ConfirmClassifyPaidPartiallyQuestion=Το τιμολόγιο δεν αποπληρώθηκε. Για ποιο λόγο θέλετε να κλείσετε το τιμολόγιο; -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Παραμένουν απλήρωτα (%s %s) έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχει τακτοποιηθεί το ΦΠΑ με πιστωτικό τιμολόγιο. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Παραμένουν απλήρωτα (%s %s) έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Δέχομαι να χάσω το ΦΠΑ για την έκπτωση αυτή. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Παραμένουν απλήρωτα (%s %s) έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχω την επιστροφή του ΦΠΑ για την έκπτωση αυτή χωρίς πιστωτικό τιμολόγιο. ConfirmClassifyPaidPartiallyReasonBadCustomer=Κακός πελάτης ConfirmClassifyPaidPartiallyReasonProductReturned=Τα προϊόντα επιστράφηκαν μερικώς ConfirmClassifyPaidPartiallyReasonOther=Ποσό εγκαταλελειμμένο για άλλους λόγους @@ -183,7 +181,7 @@ ShowSocialContribution=Εμφάνιση κοινωνικής εισφοράς ShowBill=Εμφάνιση τιμολογίου ShowInvoice=Εμφάνιση τιμολογίου ShowInvoiceReplace=Εμφάνιση τιμολογίου αντικατάστασης -ShowInvoiceAvoir=Εμφάνιση πιστωτικού σημειώματος +ShowInvoiceAvoir=Εμφάνιση πιστωτικού τιμολογίου ShowInvoiceDeposit=Εμφάνιση τιμολογίου κατάθεσης ShowPayment=Εμφάνιση πληρωμής File=Αρχείο @@ -191,9 +189,9 @@ AlreadyPaid=Ήδη πληρωμένο AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Ήδη πληρωμένο (χωρίς πιστώσεις ή καταθέσεις) Abandoned=Εγκαταλελειμμένο -RemainderToPay=Υπόλοιπο -RemainderToTake=Υπόλοιπο προς είσπραξη -RemainderToPayBack=Υπόλοιπο για την αποπληρωμή +RemainderToPay=Παραμένουν απλήρωτα +RemainderToTake=Υπόλοιπο ποσό να ληφθεί +RemainderToPayBack=Υπόλοιπο ποσό για αποπληρωμή Rest=Εκκρεμής AmountExpected=Ποσό που ζητήθηκε ExcessReceived=Περίσσεια που λήφθηκε @@ -219,19 +217,18 @@ NoInvoice=Δεν υπάρχει τιμολόγιο ClassifyBill=Κατηγοριοποίηση Τιμολογίου SupplierBillsToPay=Απλήρωτα τιμολόγια προμηθευτών CustomerBillsUnpaid=Απλήρωτα τιμολόγια πελατών -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=Τα γραπτά τιμολόγια μέσω μηχανογραφικής διαδικασίας που διανέμονται από τη σειρά επιστολών NonPercuRecuperable=Non-recoverable SetConditions=Set payment conditions SetMode=Set payment mode Billed=Τιμολογημένο -RepeatableInvoice=Επαναλαμβανόμενο τιμολόγιο -RepeatableInvoices=Επαναλαμβανόμενα τιμολόγια -Repeatable=Επαναλαμβανόμενο -Repeatables=Επαναλαμβανόμενο -ChangeIntoRepeatableInvoice=Μετατροπή σε Επαναλαμβανόμενο -CreateRepeatableInvoice=Δημιουργία Επαναλαμβανόμενου Τιμολογίου -CreateFromRepeatableInvoice=Δημιουργία από προκαθορισμένο τιμολόγιο +RepeatableInvoice=Πρότυπο τιμολογίου +RepeatableInvoices=Πρότυπο τιμολόγιο +Repeatable=Πρώτυπο +Repeatables=Πρώτυπα +ChangeIntoRepeatableInvoice=Μετατροπή σε πρότυπο τιμολόγιο +CreateRepeatableInvoice=Δημιουργία πρότυπο τιμολόγιο +CreateFromRepeatableInvoice=Δημιουργία από πρότυπο τιμολόγιο CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Πληρωμές και τιμολόγια πελατών ExportDataset_invoice_1=Customer invoices list and invoice's lines @@ -248,7 +245,7 @@ AddRelativeDiscount=Δημιουργία σχετική έκπτωση EditRelativeDiscount=Επεξεργασία σχετικής έκπτωσης AddGlobalDiscount=Προσθήκη έκπτωσης EditGlobalDiscounts=Επεξεργασία απόλυτη εκπτώσεις -AddCreditNote=Δημιουργία πιστωτικό σημείωμα +AddCreditNote=Δημιουργία πιστωτικού τιμολογίου ShowDiscount=Εμφάνιση εκπτώσεων ShowReduc=Δείτε την έκπτωση RelativeDiscount=Σχετική έκπτωση @@ -257,7 +254,7 @@ CreditNote=Πίστωση CreditNotes=Πιστώσεις Deposit=Κατάθεση Deposits=Καταθέσεις -DiscountFromCreditNote=Έκπτωση από το πιστωτικό σημείωμα %s +DiscountFromCreditNote=Έκπτωση από το πιστωτικό τιμολόγιο %s DiscountFromDeposit=Πληρωμές από το τιμολόγιο κατάθεσης %s AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation CreditNoteDepositUse=Invoice must be validated to use this king of credits @@ -379,7 +376,7 @@ ChequesReceipts=Αποδείξεις επιταγών ChequesArea=Περιοχή επιταγών κατάθεσης ChequeDeposits=Επιταγές κατάθεσης Cheques=Επιταγές -CreditNoteConvertedIntoDiscount=Αυτό το πιστωτικό σημείωμα ή το τιμολόγιο καταθέσεων έχει μετατραπεί σε %s +CreditNoteConvertedIntoDiscount=Αυτό το πιστωτικό τιμολόγιο ή το τιμολόγιο καταθέσεων έχει μετατραπεί σε %s UsBillingContactAsIncoiveRecipientIfExist=Χρησιμοποιήστε πελάτη διεύθυνση επικοινωνίας χρέωσης αντί των Πελ./Προμ. διεύθυνση για τα τιμολόγια ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων ShowUnpaidLateOnly=Εμφάνιση μόνο των καθυστερημένων απλήρωτων τιμολογίων diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang index 61543f9747e..ee96a994ae7 100644 --- a/htdocs/langs/el_GR/boxes.lang +++ b/htdocs/langs/el_GR/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Τελευταίες τροποποιημένες προοπτ BoxLastCustomers=Τελευταίοι τροποποιημένοι πελάτες BoxLastSuppliers=Τελευταίοι τροποποιημένοι προμηθευτές BoxLastCustomerOrders=Τελευταίες παραγγελίες πελατών +BoxLastValidatedCustomerOrders=Τελευταίες επιβεβαιωμένες παραγγελίες πελατών BoxLastBooks=Τελευταία Βιβλία BoxLastActions=Τελευταίες Ενέργειες BoxLastContracts=Τελευταία συμβόλαια @@ -27,22 +28,25 @@ BoxTitleNbOfCustomers=Πλήθος πελατών BoxTitleLastRssInfos=Τα %s πιο πρόσφατα νέα από %s BoxTitleLastProducts=Τα %s πιο πρόσφατα τροποποιημένα προϊόντα/υπηρεσίες BoxTitleProductsAlertStock=Προειδοποίηση προϊόντων σε απόθεμα -BoxTitleLastCustomerOrders=Οι %s πιο πρόσφατα τροποποιημένες παραγγελίες πελατών +BoxTitleLastCustomerOrders=Τελευταίες %s παραγγελίες των πελατών +BoxTitleLastModifiedCustomerOrders=Τελευταίες %s τροποποιημένες παραγγελίες πελατών BoxTitleLastSuppliers=Οι %s πιο πρόσφατα καταχωρημένοι προμηθευτές BoxTitleLastCustomers=Οι %s πιο πρόσφατα καταχωρημένοι πελάτες BoxTitleLastModifiedSuppliers=Οι %s πιο πρόσφατα τροποποιημένοι προμηθευτές BoxTitleLastModifiedCustomers=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες -BoxTitleLastCustomersOrProspects=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες ή προοπτικές -BoxTitleLastPropals=Οι %s πιο πρόσφατα καταχωρημένες προσφορές +BoxTitleLastCustomersOrProspects=Τελευταίοι %s πελάτες ή προοπτικές +BoxTitleLastPropals=Τελευταίες %s προσφορές +BoxTitleLastModifiedPropals=Τελευταίες %s τροποποιημένες προσφορές BoxTitleLastCustomerBills=Τα %s πιο πρόσφατα τιμολόγια πελατών +BoxTitleLastModifiedCustomerBills=Τελευταίες %s τροποποιημένα τιμολόγια πελατών BoxTitleLastSupplierBills=Τα %s πιο πρόσφατα τιμολόγια προμηθευτών -BoxTitleLastProspects=Οι %s πιο πρόσφατες προσφορές +BoxTitleLastModifiedSupplierBills=Τελευταίες %s τροποποιημένα τιμολόγια προμηθευτών BoxTitleLastModifiedProspects=Οι %s πιο πρόσφατα τροποποιημένες προσφορές BoxTitleLastProductsInContract=Τα %s πιο πρόσφατα συμβόλαια με προϊόντα/υπηρεσίες -BoxTitleLastModifiedMembers=Τελευταία %s τροποποίηση των μελών +BoxTitleLastModifiedMembers=Τελευταία %s Μέλη BoxTitleLastFicheInter=Τελευταία %s ενημέρωση παρέμβασης -BoxTitleOldestUnpaidCustomerBills=Τα %s παλαιότερα απλήρωτα τιμολόγια πελατών -BoxTitleOldestUnpaidSupplierBills=Τα %s παλαιότερα απλήρωτα τιμολόγια προμηθευτών +BoxTitleOldestUnpaidCustomerBills=Παλαιότερα %s ανεξόφλητα τιμολόγια πελατών +BoxTitleOldestUnpaidSupplierBills=Παλαιότερα %s ανεξόφλητα τιμολόγια προμηθευτών BoxTitleCurrentAccounts=Άνοιξε τα υπόλοιπα των λογαριασμών BoxTitleSalesTurnover=Κύκλος εργασιών των πωλήσεων BoxTitleTotalUnpaidCustomerBills=Απλήρωτα τιμολόγια πελατών @@ -76,7 +80,8 @@ NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβό NoRecordedContracts=Δεν υπάρχουν καταχωρημένα συμβόλαια NoRecordedInterventions=Δεν καταγράφονται παρεμβάσεις BoxLatestSupplierOrders=Τελευταίες παραγγελίες προμηθευτών -BoxTitleLatestSupplierOrders=Οι %s τελευταίες παραγγελίες προμηθευτών +BoxTitleLatestSupplierOrders=Τελευταίες %s παραγγελίες Προμηθευτών +BoxTitleLatestModifiedSupplierOrders=Τελευταίες %s τροποποιημένες παραγγελίες προμηθευτών NoSupplierOrder=Δεν υπάρχουν καταχωρημένες παραγγελίες προμηθευτών BoxCustomersInvoicesPerMonth=Τιμολόγια πελατών ανά μήνα BoxSuppliersInvoicesPerMonth=Τιμολόγια προμηθευτών ανά μήνα diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang index d622e8657bf..542fb2cf04f 100644 --- a/htdocs/langs/el_GR/categories.lang +++ b/htdocs/langs/el_GR/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Προμηθευτές CatCusLinks=Πελάτες/Προοπτικές CatProdLinks=Προϊόντα CatMemberLinks=Σχέσεις μεταξύ των μελών και των κατηγοριών -CatProdLinks=Προϊόντα -CatCusLinks=Πελάτες/Προοπτικές -CatSupLinks=Προμηθευτές DeleteFromCat=Κατάργηση από την κατηγορία DeletePicture=Διαγραφή εικόνας ConfirmDeletePicture=Επιβεβαιώστε τη διαγραφή εικόνας @@ -112,3 +109,4 @@ CategoriesSetup=Ρύθμισης κατηγοριών CategorieRecursiv=Συνδέουν με το γονέα της κατηγορίας αυτόματα CategorieRecursivHelp=Εάν είναι ενεργοποιημένο, το προϊόν θα συνδέεται επίσης με γονική κατηγορία κατά την προσθήκη σε μια υποκατηγορία AddProductServiceIntoCategory=Προσθέστε το ακόλουθο προϊόν/υπηρεσία +ShowCategory=Εμφάνιση κατηγορίας 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/companies.lang b/htdocs/langs/el_GR/companies.lang index 420b797c36c..c2e78746d67 100644 --- a/htdocs/langs/el_GR/companies.lang +++ b/htdocs/langs/el_GR/companies.lang @@ -250,7 +250,7 @@ CustomerAbsoluteDiscountShort=Απόλυτη έκπτωση CompanyHasRelativeDiscount=This customer has a discount of %s%% CompanyHasNoRelativeDiscount=This customer has no relative discount by default CompanyHasAbsoluteDiscount=This customer still has discount credits for %s %s -CompanyHasCreditNote=This customer still has credit notes or previous deposits for %s %s +CompanyHasCreditNote=Ο πελάτης εξακολουθεί να έχει πιστωτικά τιμολόγια για %s %s CompanyHasNoAbsoluteDiscount=This customer has no discount credit available CustomerAbsoluteDiscountAllUsers=Απόλυτες εκπτώσεις (Επικυρωμένες απ' όλους τους χρήστες) CustomerAbsoluteDiscountMy=Απόλυτες εκπτώσεις (Επικυρωμένες από εσάς) @@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Απόλυτες εκπτώσεις διαθέσιμε DiscountNone=Καμία Supplier=Προμηθευτής CompanyList=Λίστα εταιριών -AddContact=Προσθήκη επαφής -AddContactAddress=Προσθήκη επαφής/διεύθυνσης +AddContact=Δημιουργία επαφής +AddContactAddress=Δημιουργία επαφής/διεύθυνση EditContact=Επεξεργασία επαφής EditContactAddress=Επεξεργασία επαφής/διεύθυνσης Contact=Υπεύθυνος επικοινωνίας @@ -268,8 +268,8 @@ ContactsAddresses=Επαφές/Διευθύνσεις NoContactDefinedForThirdParty=Δεν έχει ορισθεί πρόσωπο επικοινωνίας για αυτόν τον Πελ/Προμ NoContactDefined=Δεν έχει ορισθεί πρόσωπο επικοινωνίας DefaultContact=Προκαθορισμένος εκπρόσωπος/διεύθυνση -AddCompany=Προσθήκη εταιρίας -AddThirdParty=Προσθήκη Πελ./Προμ. +AddCompany=Δημιουργία εταιρείας +AddThirdParty=Δημιουργήστε Πελ./Προμ. DeleteACompany=Διαγραφή εταιρίας PersonalInformations=Προσωπικά δεδομένα AccountancyCode=Λογιστικός κωδικός @@ -379,8 +379,8 @@ DeliveryAddressLabel=Ετικέτα διεύθυνσης αποστολής DeleteDeliveryAddress=Διαγραφή διεύθυνσης αποστολής ConfirmDeleteDeliveryAddress=Είστε σίγουροι ότι θέλετε να διαγράψετε την διεύθυνση αποστολής; NewDeliveryAddress=Νέα διεύθυνση αποστολής -AddDeliveryAddress=Προσθήκη Διεύθυνσης -AddAddress=Προσθήκη Διεύθυνσης +AddDeliveryAddress=Δημιουργία διεύθυνσης +AddAddress=Δημιουργία διεύθυνσης NoOtherDeliveryAddress=Δεν ορίστηκε εναλλακτική διεύθυνση αποστολής SupplierCategory=Κατηγορία Προμηθευτή JuridicalStatus200=Ανεξάρτητος diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang index a22a8a1d638..cad5180e87e 100644 --- a/htdocs/langs/el_GR/compta.lang +++ b/htdocs/langs/el_GR/compta.lang @@ -25,7 +25,7 @@ BillsForSuppliers=Λογαριασμοί για προμηθευτές Income=Έσοδα Outcome=Έξοδα ReportInOut=Έσοδα / Έξοδα -ReportTurnover=Turnover +ReportTurnover=Κύκλος εργασιών PaymentsNotLinkedToInvoice=Η πληρωμή δεν είναι συνδεδεμένη με κάποιο τιμολόγιο, οπότε δεν συνδέετε με κάποιο στοιχείο/αντιπρόσωπο PaymentsNotLinkedToUser=Η πληρωμή δεν είναι συνδεδεμένη με κάποιον πελάτη Profit=Κέρδος @@ -37,13 +37,13 @@ Withdrawal=Απόσυρση Withdrawals=Αποσύρσεις AmountHTVATRealReceived=Σύνολο καθαρών εισπράξεων AmountHTVATRealPaid=Σύνολο καθαρών πληρωμένων -VATToPay=VAT sells -VATReceived=VAT received -VATToCollect=VAT purchases -VATSummary=VAT Balance +VATToPay=Φ.Π.Α. Πωλήσεων +VATReceived=Φ.Π.Α. που εισπράχθηκε +VATToCollect=Φ.Π.Α. Αγορών +VATSummary=Υπόλοιπο Φ.Π.Α. LT2SummaryES=IRPF Υπόλοιπο LT1SummaryES=RE Υπόλοιπο -VATPaid=VAT paid +VATPaid=Φ.Π.Α. που καταβλήθηκε SalaryPaid=Μισθός που καταβάλλεται LT2PaidES=Αμειβόμενος IRPF LT1PaidES=RE Πληρωμένα @@ -100,14 +100,15 @@ AccountNumberShort=Αριθμός Λογαριασμού AccountNumber=Αριθμός Λογαριασμού NewAccount=Νέος Λογαριασμός SalesTurnover=Κύκλος εργασιών πωλήσεων -SalesTurnoverMinimum=Minimum sales turnover +SalesTurnoverMinimum=Ελάχιστος κύκλος εργασιών των πωλήσεων ByThirdParties=από στοιχεία ByUserAuthorOfInvoice=Ανά συντάκτη τιμολογίου AccountancyExport=Accountancy export ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s -SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. +SuppliersProductsSellSalesTurnover=Ο κύκλος εργασιών από τις πωλήσεις των προϊόντων του προμηθευτή. CheckReceipt=Έλεγχος Πίστωσης CheckReceiptShort=Check deposit +LastCheckReceiptShort=Έλεγχος τελευταίων %s εισπράξεων NewCheckReceipt=Νέα έκπτωση NewCheckDeposit=Νέα κατάθεση επιταγής NewCheckDepositOn=Create receipt for deposit on account: %s @@ -169,9 +170,9 @@ Dispatched=Dispatched ToDispatch=To dispatch ThirdPartyMustBeEditAsCustomer=Το στοιχείο πρέπει να ορισθεί ως πελάτης SellsJournal=Ημερολόγιο πωλήσεων -PurchasesJournal=Αγορές Εφημερίδα +PurchasesJournal=Ημερολόγιο Αγορών DescSellsJournal=Ημερολόγιο πωλήσεων -DescPurchasesJournal=Αγορές Εφημερίδα +DescPurchasesJournal=Ημερολόγιο Αγορών InvoiceRef=Τιμολόγιο ref. CodeNotDef=Δεν προσδιορίζεται AddRemind=Αποστολή διαθέσιμο ποσό @@ -184,7 +185,7 @@ Pcg_subtype=Pcg subtype InvoiceLinesToDispatch=Invoice lines to dispatch InvoiceDispatched=Dispatched invoices AccountancyDashboard=Accountancy summary -ByProductsAndServices=By products and services +ByProductsAndServices=Ανά προϊόντα και υπηρεσίες RefExt=Εξωτερικές αναφορές ToCreateAPredefinedInvoice=Για να δημιουργήσει ένα προκαθορισμένο τιμολόγιο, δημιουργήσετε ένα πρότυπο τιμολόγιο στη συνέχεια, χωρίς επικύρωση, κάντε κλικ στο κουμπί "Μετατροπή σε προκαθορισμένο τιμολόγιο". LinkedOrder=Σύνδεση με παραγγελία @@ -193,17 +194,13 @@ Mode1=Μέθοδος 1 Mode2=Τρόπος 2 CalculationRuleDesc=Για να υπολογιστεί το συνολικό ΦΠΑ, υπάρχουν δύο μέθοδοι:
    Μέθοδος 1 στρογγυλοποίηση ΦΠΑ για κάθε γραμμή, στη συνέχεια, αθροίζοντας τους.
    Μέθοδος 2 αθροίζοντας όλων των ΦΠΑ σε κάθε γραμμή, τότε η στρογγυλοποίηση είναι στο αποτέλεσμα.
    Το τελικό αποτέλεσμα μπορεί να διαφέρει από λίγα λεπτά. Προεπιλεγμένη λειτουργία είναι η λειτουργία %s. CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, επιλέξετε την κατάλληλη μέθοδο για την εφαρμογή του ίδιου κανόνα υπολογισμού και να πάρει ίδιο αποτέλεσμα που αναμένεται από τον προμηθευτή σας. -TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε ταμειακής λογιστικής mode is not relevant. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε λογιστικής δέσμευσης τρόπος (ανατρέξτε στην ενότητα Ρύθμιση της μονάδας λογιστικής). +TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε ταμειακή λογιστική η λειτουργία δεν είναι σχετική. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε λογιστική δέσμευση τρόπος (ανατρέξτε τη Ρύθμιση του module λογιστικής). 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 -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 +ACCOUNTING_VAT_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ +ACCOUNTING_VAT_BUY_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ +ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτες +ACCOUNTING_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για τους προμηθευτές +CloneTax=Κλώνος για μια κοινωνική προσφορά +ConfirmCloneTax=Επιβεβαιώστε τον κλώνο της κοινωνικής προσφοράς +CloneTaxForNextMonth=Κλώνος για τον επόμενο μήνα diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang index 41dd8d76b80..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=Λίστα Συμβολαίων -LastContracts=%s συμβόλαια που τροποποιήθηκαν πρόσφατα +LastModifiedContracts=Τελευταίες τροποποιημένες συμβάσεις %s AllContracts=Όλα τα συμβόλαια ContractCard=Κάρτέλα Συμβολαίου ContractStatus=Κατάσταση συμβολαίου @@ -27,7 +27,7 @@ MenuRunningServices=Ενεργές Υπηρεσίες MenuExpiredServices=Ληγμένες Υπηρεσίες MenuClosedServices=Τερματισμένες Υπηρεσίες NewContract=Νέο Συμβόλαιο -AddContract=Προσθήκη Συμβολαίου +AddContract=Δημιουργία σύμβασης SearchAContract=Εύρεση Συμβολαίου DeleteAContract=Διαγραφή Συμβολαίου CloseAContract=Τερματισμός Συμβολαίου @@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines ListOfRunningServices=Λίστα τρέχουσων υπηρεσιών NotActivatedServices=Inactive services (among validated contracts) BoardNotActivatedServices=Υπηρεσίες προς ενεργοποίηση σε επικυρωμένα συμβόλαια -LastContracts=%s συμβόλαια που τροποποιήθηκαν πρόσφατα +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 93eb1bcf445..4163539e47f 100644 --- a/htdocs/langs/el_GR/cron.lang +++ b/htdocs/langs/el_GR/cron.lang @@ -1,22 +1,14 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = Πληροφορίες CronAbout = Σχετικά με το Cron CronAboutPage = Σχετικά με τη σελίδα Cron - -# # Right -# Permission23101 = Διαβάστε την προγραμματισμένη εργασία Permission23102 = Δημιουργία / ενημέρωση προγραμματισμένης εργασίας Permission23103 = Διαγραφή προγραμματισμένης εργασίας Permission23104 = Εκτέλεση Προγραμματισμένης εργασίας - -# # Admin -# CronSetup= Προγραμματισμένη ρύθμιση διαχείρισης των εργασιών URLToLaunchCronJobs=URL για να ελέγξετε και να ξεκινήσει μια περιοδική εργασία, εφόσον απαιτείται OrToLaunchASpecificJob=Ή να ελέγξετε και να ξεκινήσει μία συγκεκριμένη εργασία @@ -24,20 +16,11 @@ KeyForCronAccess=Κλειδί ασφαλείας για το URL για να ξ FileToLaunchCronJobs=Γραμμής εντολών για να ξεκινήσει τις εργασίες CronExplainHowToRunUnix=Σχετικά με το περιβάλλον Unix θα πρέπει να χρησιμοποιήσετε crontab να τρέχει γραμμή εντολών κάθε λίγα λεπτά CronExplainHowToRunWin=Στο Microsoft (tm) των Windows environement, μπορείτε να χρησιμοποιήσετε τα εργαλεία Προγραμματισμένη εργασία ώστε να εκτελεστεί μια γραμμή εντολών κάθε λιγα λεπτά - - -# # Menu -# CronJobs=Προγραμματισμένες εργασίες -CronListActive= Κατάλογος των ενεργών εργασιών -CronListInactive= Λίστα με τις απενεργοποιημένες εργασίες -CronListActive= Κατάλογος των ενεργών εργασιών - - -# +CronListActive=Λίστα ενεργών/προγραμματισμένων εργασιών +CronListInactive=Λίστα με τις απενεργοποιημένες εργασίες # Page list -# CronDateLastRun=Τελευταία εκτέλεση CronLastOutput=Τελευταία εκτέλεση εξόδου CronLastResult=Τελευταίος κωδικός αποτελέσματος @@ -70,10 +53,7 @@ CronLabel=Περιγραφή CronNbRun=Nb. έναρξης CronEach=Κάθε JobFinished=Ξεκίνησε και τελείωσε - -# #Page card -# CronAdd= Προσθήκη εργασίας CronHourStart= Έναρξη ώρας και ημερομηνία αποστολής CronEvery= Εκτέλεση εργασίας κάθε @@ -95,20 +75,12 @@ CronObjectHelp=The object name to load.
    For exemple to fetch method of Doli CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef CronCommandHelp=Γραμμή εντολών του συστήματος προς εκτέλεση. - -# # Info -# CronInfoPage=Πληροφορίες - - -# # Common -# CronType=Τύπος εργασίας CronType_method=Καλέστε τη μέθοδο της κατηγορίας Dolibarr CronType_command=Εντολή Shell CronMenu=Μενού CronCannotLoadClass=Cannot load class %s or object %s - UseMenuModuleToolsToAddCronJobs=Πηγαίνετε στο μενού "Home - Modules εργαλεία - Λίστα εργασιών" για να δείτε και να επεξεργαστείτε τις προγραμματισμένες εργασίες. 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/donations.lang b/htdocs/langs/el_GR/donations.lang index 112367eb07e..c35ee1cbc55 100644 --- a/htdocs/langs/el_GR/donations.lang +++ b/htdocs/langs/el_GR/donations.lang @@ -4,7 +4,7 @@ Donations=Δωρεές DonationRef=Δωρεά ref. Donor=Δωρεά Donors=Δωρεές -AddDonation=Προσθήκη δωρεάς +AddDonation=Δημιουργία δωρεάς NewDonation=Νέα δωρεά ShowDonation=Εμφάνιση δωρεάς DonationPromise=Υπόσχεση δώρου @@ -31,3 +31,8 @@ DonationRecipient=Δικαιούχος δωρεάς ThankYou=Σας ευχαριστούμε IConfirmDonationReception=Ο δικαιούχος δηλώνει αποδοχή, ως δωρεά, το ακόλουθο ποσό MinimumAmount=Το ελάχιστο ποσό είναι %s +FreeTextOnDonations=Ελεύθερο κείμενο για εμφάνιση στο υποσέλιδο +FrenchOptions=Επιλογές για Γαλλία +DONATION_ART200=Δείτε το άρθρο 200 από το CGI αν ανησυχείτε +DONATION_ART238=Δείτε το άρθρο 238 από το CGI αν ανησυχείτε +DONATION_ART885=Δείτε το άρθρο 885 από το CGI αν ανησυχείτε 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 461eaec865b..d9331df4fa4 100644 --- a/htdocs/langs/el_GR/externalsite.lang +++ b/htdocs/langs/el_GR/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Ρύθμιση συνδέσμου σε εξωτερικό website ExternalSiteURL=Εξωτερικές διεύθυνσης URL ιστοσελίδας ExternalSiteModuleNotComplete=Το Module Εξωτερικά Site δεν έχει ρυθμιστεί σωστά. +ExampleMyMenuEntry=Καταχώρηση του μενού μου diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang index 924863ff589..ec8c78077de 100644 --- a/htdocs/langs/el_GR/holiday.lang +++ b/htdocs/langs/el_GR/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Leaves -CPTitreMenu=Leaves +Holidays=Άδειες +CPTitreMenu=Άδειες MenuReportMonth=Μηνιαία αναφορά -MenuAddCP=Make a leave request -NotActiveModCP=You must enable the module Leaves to view this page. -NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . -NoCPforUser=You don't have any available day. -AddCP=Make a leave request +MenuAddCP=Κάντε αίτηση άδειας +NotActiveModCP=Θα πρέπει να ενεργοποιήσετε τις Άδειες module για να δείτε αυτή τη σελίδα. +NotConfigModCP=Μπορείτε να ρυθμίσετε το module Άδειες για να δείτε αυτή τη σελίδα.Για να το κάνετε αυτό, κάντε κλικ εδώ . +NoCPforUser=Δεν έχετε διαθέσιμες ημέρες. +AddCP=Κάντε αίτηση άδειας Employe=Εργαζόμενος DateDebCP=Ημερ. έναρξης DateFinCP=Ημερ. τέλους @@ -18,24 +18,24 @@ ApprovedCP=Εγκεκριμένο CancelCP=Ακυρώθηκε RefuseCP=Απόρριψη ValidatorCP=Έγκριση -ListeCP=List of leaves +ListeCP=Λίστα των αδειών ReviewedByCP=Θα πρέπει να επανεξεταστεί από DescCP=Περιγραφή -SendRequestCP=Create leave request -DelayToRequestCP=Leave requests must be made at least %s day(s) before them. -MenuConfCP=Edit balance of leaves -UpdateAllCP=Update the leaves -SoldeCPUser=Leaves balance is %s days. +SendRequestCP=Δημιουργήστε το αίτημα άδειας +DelayToRequestCP=Tα αιτήματα πρέπει να γίνονται τουλάχιστον %s ημέρα(ες) πριν από τις. +MenuConfCP=Επεξεργασία ισορροπίας των αδειών +UpdateAllCP=Ενημέρωση των αδειών +SoldeCPUser=Η ισορροπία των αδειών είναι %s ημέρες. ErrorEndDateCP=Πρέπει να επιλέξετε μια ημερομηνία λήξης μεγαλύτερη από την ημερομηνία έναρξης. ErrorSQLCreateCP=Παρουσιάστηκε σφάλμα στην SQL κατά τη διάρκεια της δημιουργίας: -ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ErrorIDFicheCP=Παρουσιάστηκε σφάλμα, η αίτηση άδειας δεν υπάρχει. ReturnCP=Επιστροφή στην προηγούμενη σελίδα -ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request +ErrorUserViewCP=Δεν έχετε άδεια για να διαβάσετε αυτή την αίτηση αδείας. +InfosCP=Πληροφορίες για την αίτησης άδειας InfosWorkflowCP=Πληροφορίες για την ροή εργασιών RequestByCP=Ζητήθηκε από -TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed +TitreRequestCP=Αφήστε το αίτημα +NbUseDaysCP=Αριθμός των ημερών για τις άδειες που καταναλώνεται EditCP=Επεξεργασία DeleteCP=Διαγραφή ActionValidCP=Επικύρωση @@ -43,26 +43,25 @@ ActionRefuseCP=Απορρίφθηκε ActionCancelCP=Άκυρο StatutCP=Κατάσταση SendToValidationCP=Στάλθηκε για επικύρωση -TitleDeleteCP=Delete the leave request -ConfirmDeleteCP=Confirm the deletion of this leave request? -ErrorCantDeleteCP=Error you don't have the right to delete this leave request. -CantCreateCP=You don't have the right to make leave requests. -InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Ανανέωση -CantUpdate=You cannot update this leave request. +TitleDeleteCP=Διαγράψτε την αίτηση άδειας +ConfirmDeleteCP=Επιβεβαιώστε τη διαγραφή αυτήν την αίτηση άδειας; +ErrorCantDeleteCP=Σφάλμα δεν έχετε το δικαίωμα να διαγράψει αυτό το αίτημα αδείας. +CantCreateCP=Δεν έχετε το δικαίωμα να ζητήσετε άδεια. +InvalidValidatorCP=Μπορείτε να επιλέξετε ένα εκπρόσωπο να εγκρίνει την άδειά σας. +CantUpdate=Δεν μπορείτε να ενημερώσετε αυτό το αίτημα άδειας. NoDateDebut=Πρέπει να επιλέξετε μια ημερομηνία έναρξης. NoDateFin=Πρέπει να επιλέξετε μια ημερομηνία λήξης. -ErrorDureeCP=Το αίτημά σας για την άδεια δεν περιέχει εργάσιμη ημέρα. -TitleValidCP=Εγκρίνετε το αίτημα για την άδεια -ConfirmValidCP=Are you sure you want to approve the leave request? +ErrorDureeCP=Η αίτηση άδειας δεν περιέχει εργάσιμες ημέρες +TitleValidCP=Εγκρίνετε την αίτηση άδειας +ConfirmValidCP=Είστε βέβαιοι ότι θέλετε να εγκρίνει την αίτηση άδειας; DateValidCP=Ημερομηνία έγκρισης -TitleToValidCP=Send leave request -ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Απόρριψη αιτήματος αδειών -ConfirmRefuseCP=Are you sure you want to refuse the leave request? +TitleToValidCP=Στείλτε αίτηση άδειας +ConfirmToValidCP=Είστε βέβαιοι ότι θέλετε να στείλετε την αίτηση άδειας; +TitleRefuseCP=Αρνηθείτε την αίτηση άδειας +ConfirmRefuseCP=Είστε βέβαιοι ότι θέλετε να απορρίψει την αίτηση άδειας; NoMotifRefuseCP=Πρέπει να επιλέξετε ένα λόγο απόρριψης της αίτησης. -TitleCancelCP=Ακύρωση του αιτήματος τις άδειας -ConfirmCancelCP=Are you sure you want to cancel the leave request? +TitleCancelCP=Ακυρώστε την αίτηση άδειας +ConfirmCancelCP=Είστε βέβαιοι ότι θέλετε να ακυρώσετε την αίτηση άδειας; DetailRefusCP=Λόγος για την απόρριψη DateRefusCP=Ημερομηνία της άρνησης DateCancelCP=Ημερομηνία της ακύρωσης @@ -72,42 +71,42 @@ MotifCP=Λόγος UserCP=Χρήστης ErrorAddEventToUserCP=Παρουσιάστηκε σφάλμα κατά την προσθήκη τις έκτακτης άδειας. AddEventToUserOkCP=Η προσθήκη της έκτακτης άδειας έχει ολοκληρωθεί. -MenuLogCP=View logs of leave requests -LogCP=Log of updates of available vacation days +MenuLogCP=Δείτε τα αρχεία καταγραφών των αιτήσεων άδειας +LogCP=Αρχείο καταγραφής για ενημέρωση των διαθέσιμων ημερών των αδειών ActionByCP=Διενεργείται από UserUpdateCP=Για το χρήστη PrevSoldeCP=Προηγούμενο Υπόλοιπο NewSoldeCP=Νέο υπόλοιπο -alreadyCPexist=Η αίτηση για την άδεια έχει ήδη γίνει για αυτή την περίοδο. +alreadyCPexist=Υπάρχει ήδη αίτηση άδειας για αυτήν τη περίοδο. UserName=Όνομα Employee=Υπάλληλος -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation +FirstDayOfHoliday=Πρώτη μέρα των αδειών +LastDayOfHoliday=Τελευταία μέρα των αδειών HolidaysMonthlyUpdate=Μηνιαία ενημέρωση ManualUpdate=Χειροκίνητη ενημέρωση -HolidaysCancelation=Leave request cancelation +HolidaysCancelation=Αφήστε το αίτημα ακύρωσης ## Configuration du Module ## -ConfCP=Διαμόρφωση του module αδειών +ConfCP=Διαχείριση της λειτουργίας αιτήσεων αδειών DescOptionCP=Περιγραφή της επιλογής ValueOptionCP=Αξία -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Ομάδα με τη δυνατότητα να εγκρίνει τις αιτήσεις αδειών ConfirmConfigCP=Επικύρωση της διαμόρφωσης -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Τελευταία αυτόματη ενημέρωση της κατανομής των φύλλων UpdateConfCPOK=Ενημερώθηκε με επιτυχία. ErrorUpdateConfCP=Παρουσιάστηκε σφάλμα κατά την ενημέρωση, παρακαλώ προσπαθήστε ξανά. -AddCPforUsers=Παρακαλώ προσθέστε το υπόλοιπο αδειών των χρηστών από κάνοντας κλικ εδώ . -DelayForSubmitCP=Προθεσμία υποβολής αιτήσεων για άδειες -AlertapprobatortorDelayCP=Αποτρέψτε την έγκριση εάν η αίτηση άδειας δεν ταιριάζει με την προθεσμία -AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance -nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month -Module27130Name= Management of leave requests -Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request -TitleOptionEventCP=Settings of leave requets for events +AddCPforUsers=Παρακαλώ προσθέστε το υπόλοιπο των φύλλων κατανομής των χρηστών από κλικ εδώ. +DelayForSubmitCP=Προθεσμία για να κάνει μια αίτηση άδειας +AlertapprobatortorDelayCP=Αποτρέψετε την έγκρισή εάν η αίτηση άδειας δεν ταιριάζει με την προθεσμία +AlertValidatorDelayCP=Εμποδίστε τον εκπρόσωπο εάν η αίτηση άδειας υπερβαίνει καθυστέρηση +AlertValidorSoldeCP=Εμποδίστε τον εκπρόσωπο εάν η αίτηση άδειας υπερβαίνει το υπόλοιπο +nbUserCP=Αριθμός των χρηστών που υποστηρίζονται στο module αδειών +nbHolidayDeductedCP=Αριθμός ημερών αδείας που πρέπει να αφαιρεθεί ανά ημέρες των διακοπών που λαμβάνονται +nbHolidayEveryMonthCP=Αριθμός ημερών αδείας που προστίθενται κάθε μήνα +Module27130Name= Διαχείριση των αιτήσεων αδειών +Module27130Desc= Διαχείριση των αιτήσεων αδειών +TitleOptionMainCP=Κύριες ρυθμίσεις της αίτησης άδειας +TitleOptionEventCP=Ρυθμίσεις των αδειών αίτημα για εκδηλώσεις ValidEventCP=Επικύρωση UpdateEventCP=Ενημέρωση εκδηλώσεων CreateEventCP=Δημιουργία @@ -127,23 +126,23 @@ UpdateEventOptionCP=Ανανέωση ErrorMailNotSend=Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail: NoCPforMonth=Όχι αυτό το μήνα. nbJours=Αριθμός ημερών -TitleAdminCP=Configuration of Leaves +TitleAdminCP=Διαμόρφωση των αδειών #Messages Hello=Γεια σας -HolidaysToValidate=Validate leave requests -HolidaysToValidateBody=Below is a leave request to validate -HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. -HolidaysValidated=Validated leave requests -HolidaysValidatedBody=Your leave request for %s to %s has been validated. -HolidaysRefused=Request denied -HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled leaved request -HolidaysCanceledBody=Your leave request for %s to %s has been canceled. -Permission20000=Read you own leave requests -Permission20001=Create/modify your leave requests -Permission20002=Create/modify leave requests for everybody -Permission20003=Delete leave requests -Permission20004=Setup users available vacation days -Permission20005=Review log of modified leave requests -Permission20006=Read leaves monthly report +HolidaysToValidate=Επικύρωση των αιτήσεων για τις άδειες +HolidaysToValidateBody=Παρακάτω είναι ένα αίτημα άδειας για την επικύρωση +HolidaysToValidateDelay=Αυτή η αίτηση αδείας θα πραγματοποιηθεί εντός προθεσμίας μικρότερης των %s ημερών. +HolidaysToValidateAlertSolde=Ο χρήστης που έκανε αυτό το αίτημα δεν έχει αρκετές διαθέσιμες ημέρες. +HolidaysValidated=Επικυρώθηκαν οι αιτήσεις άδειας +HolidaysValidatedBody=Η αίτηση αδείας %s στο %s έχει επικυρωθεί. +HolidaysRefused=Αίτηση αρνήθηκε +HolidaysRefusedBody=Η αίτηση αδείας σας για %s στο %s έχει απορριφθεί για τον ακόλουθο λόγο: +HolidaysCanceled=Ακυρώθηκε το αίτημα αδείας +HolidaysCanceledBody=Η αίτηση αδείας σας για %s στο %s έχει ακυρωθεί. +Permission20000=Διαβάστε τη δική σας αίτηση άδειας +Permission20001=Δημιουργία/τροποποίηση των αιτήσεων αδειών σας +Permission20002=Δημιουργία/τροποποίηση των αιτήσεων αδειών για όλους +Permission20003=Διαγραφή των αιτήσεων άδειας +Permission20004=Ρύθμιση χρηστών για τις διαθέσιμες ημέρες αδείας +Permission20005=Αναθεώρηση καταγραφής των τροποποιημένων αιτήσεων άδειας +Permission20006=Μηνιαία έκθεση αδειών diff --git a/htdocs/langs/el_GR/interventions.lang b/htdocs/langs/el_GR/interventions.lang index e546e25d855..9bc94532667 100644 --- a/htdocs/langs/el_GR/interventions.lang +++ b/htdocs/langs/el_GR/interventions.lang @@ -3,7 +3,7 @@ Intervention=Παρέμβαση Interventions=Παρεμβάσεις InterventionCard=Καρτέλα παρέμβασης NewIntervention=Νέα παρέμβαση -AddIntervention=Προσθ. παρέμβασης +AddIntervention=Δημιουργία παρέμβασης ListOfInterventions=Λίστα παρεμβάσεων EditIntervention=Τροποποίηση παρέμβασης ActionsOnFicheInter=Δράσεις για την παρέμβαση @@ -30,6 +30,15 @@ StatusInterInvoiced=Τιμολογείται RelatedInterventions=Οι παρεμβάσεις που σχετίζονται ShowIntervention=Εμφάνιση παρέμβασης SendInterventionRef=Υποβολή παρέμβασης %s +SendInterventionByMail=Αποστολή παρέμβασης μέσω e-mail +InterventionCreatedInDolibarr=Παρέμβαση %s δημιουργήθηκε +InterventionValidatedInDolibarr=Παρέμβαση %s επικυρώθηκε +InterventionModifiedInDolibarr=Παρέμβαση %s τροποποιήθηκε +InterventionClassifiedBilledInDolibarr=Σετ Παρέμβασης %s όπως τιμολογείται +InterventionClassifiedUnbilledInDolibarr=Σετ Παρέμβαση %s ως μη τιμολογημένο +InterventionSentByEMail=Παρέμβαση %s αποστέλλετε με ηλεκτρονικό ταχυδρομείο +InterventionDeletedInDolibarr=Παρέμβαση %s διαγράφετε +SearchAnIntervention=Αναζήτηση παρέμβασης ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Αντιπρόσωπος που παρακολουθεί την παρέμβαση TypeContact_fichinter_internal_INTERVENING=Παρεμβαίνων diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang index 92d71df9b11..debe768f46e 100644 --- a/htdocs/langs/el_GR/mails.lang +++ b/htdocs/langs/el_GR/mails.lang @@ -115,7 +115,7 @@ SentBy=Στάλθηκε από MailingNeedCommand=Για λόγους ασφαλείας, αποστολή ηλεκτρονικού ταχυδρομείου είναι καλύτερη όταν γίνεται από την γραμμή εντολών. Εάν έχετε ένα, ζητήστε από το διαχειριστή του διακομιστή σας για να ξεκινήσει την ακόλουθη εντολή για να στείλετε το ηλεκτρονικό ταχυδρομείο σε όλους τους παραλήπτες: MailingNeedCommand2=Μπορείτε, ωστόσο, να τους στείλετε σε απευθείας σύνδεση με την προσθήκη της παραμέτρου MAILING_LIMIT_SENDBYWEB με την αξία του μέγιστου αριθμού των μηνυμάτων ηλεκτρονικού ταχυδρομείου που θέλετε να στείλετε από τη συνεδρία. Για το σκοπό αυτό, πηγαίνετε στο Αρχική - Ρυθμίσεις - Άλλες Ρυθμίσεις. ConfirmSendingEmailing=Εάν δεν μπορείτε ή προτιμάτε την αποστολή τους με το πρόγραμμα περιήγησης σας, παρακαλώ επιβεβαιώστε ότι είστε σίγουροι ότι θέλετε να στείλετε μηνύματα ηλεκτρονικού ταχυδρομείου τώρα από τον browser σας; -LimitSendingEmailing=Σημείωση: On line αποστολή emailings περιορίζονται για την ασφάλεια και τη λήξη χρόνου λόγοι για να %s παραλήπτες με την αποστολή συνεδρίας. +LimitSendingEmailing=Σημείωση: Η αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από διαδικτυακή διεπαφή γίνεται αρκετές φορές για λόγους ασφαλείας και τη λήξη χρόνου, %s παραλήπτες ταυτόχρονα για κάθε συνεδρία αποστολής. TargetsReset=Εκκαθάριση λίστας ToClearAllRecipientsClickHere=Κάντε κλικ εδώ για να καταργήσετε τη λίστα παραληπτών για αυτό το ηλεκτρονικό ταχυδρομείο ToAddRecipientsChooseHere=Προσθέστε παραλήπτες επιλέγοντας από τις λίστες @@ -133,6 +133,9 @@ Notifications=Notifications NoNotificationsWillBeSent=Δεν υπάρχουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου που έχουν προγραμματιστεί για αυτό το συμβάν και την εταιρεία ANotificationsWillBeSent=1 ειδοποίηση θα σταλεί μέσω e-mail SomeNotificationsWillBeSent=%s Θα αποστέλλονται ειδοποιήσεις μέσω e-mail -AddNewNotification=Ενεργοποιήστε μια νέα αίτηση ειδοποίησης με email -ListOfActiveNotifications=Λίστα όλων των ενεργών αιτήσεων ειδοποίησης με email +AddNewNotification=Ενεργοποιήστε ένα νέο στόχο ειδοποίησης μέσω ηλεκτρονικού ταχυδρομείου +ListOfActiveNotifications=Λίστα όλων των ενεργών στόχων ειδοποίησης μέσω ηλεκτρονικού ταχυδρομείου ListOfNotificationsDone=Λίστα όλων των ειδοποιήσεων ηλεκτρονικού ταχυδρομείου που αποστέλλονται +MailSendSetupIs=Διαμόρφωση αποστολή email έχει ρυθμιστεί σε '%s'. Αυτή η λειτουργία δεν μπορεί να χρησιμοποιηθεί για να σταλθούν μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου. +MailSendSetupIs2=Θα πρέπει πρώτα να πάτε, με έναν λογαριασμό διαχειριστή, στο μενού %s Αρχική - Ρύθμιση - Emails %s για να αλλάξετε την παράμετρο '%s' για να χρησιμοποιήσετε τη λειτουργία '%s'. Με αυτόν τον τρόπο, μπορείτε να μεταβείτε στις ρυθμίσεις του διακομιστή SMTP παρέχεται από τον Internet Service Provider και να χρησιμοποιήσετε τη Μαζική αποστολή ηλεκτρονικού ταχυδρομείου. +MailSendSetupIs3=Αν έχετε οποιαδήποτε απορία σχετικά με το πώς να ρυθμίσετε το διακομιστή SMTP σας, μπορείτε να ζητήσετε στο %s. diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang index 923228a3a94..4ca402fa4b9 100644 --- a/htdocs/langs/el_GR/main.lang +++ b/htdocs/langs/el_GR/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Αποτυχία εύρεσης του χ ErrorNoVATRateDefinedForSellerCountry=Σφάλμα, δεν ορίστηκαν ποσοστά φόρων για την χώρα '%s'. ErrorNoSocialContributionForSellerCountry=Σφάλμα, δεν οριστήκε τύπος κοινωνικής εισφοράς για την χώρα '%s'. ErrorFailedToSaveFile=Σφάλμα, αποτυχία αποθήκευσης αρχείου -ErrorOnlyPngJpgSupported=Σφάλμα, υποστηρίζονται μόνο οι τύποι αρχείων .png και .jpg -ErrorImageFormatNotSupported=Η έκδοση (αρθρώματα) της PHP που έχετε, δεν υποστηρίζει μετατροπές εικόνων αυτού του τύπου SetDate=Ορισμός ημερομηνίας SelectDate=Επιλέξτε μια ημερομηνία SeeAlso=Δείτε επίσης %s BackgroundColorByDefault=Προκαθορισμένο χρώμα φόντου +FileNotUploaded=Το αρχείο δεν έχει μεταφορτωθεί +FileUploaded=Το αρχείο ανέβηκε με επιτυχία FileWasNotUploaded=Επιλέχθηκε ένα αρχείο για επισύναψη, αλλά δεν έχει μεταφερθεί ακόμη. Πατήστε στο "Επισύναψη Αρχείου". NbOfEntries=Πλήθος εγγραφών GoToWikiHelpPage=Βοήθεια (απαιτείται Internet) @@ -266,6 +266,7 @@ Afternoon=Απόγευμα Quadri=Τετραπλής MonthOfDay=Μήνας από την ημέρα HourShort=Ω +MinuteShort=εκ Rate=Βαθμός UseLocalTax=με Φ.Π.Α Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Πλήρης Λίστα Statistics=Στατιστικά OtherStatistics=Οι άλλες στατιστικές Status=Κατάσταση +Favorite=Αγαπημένα ShortInfo=Info. Ref=Κωδ. RefSupplier=Αριθ. Τιμολογίου @@ -365,6 +367,7 @@ ActionsOnCompany=Ενέργειες για αυτό το στοιχείο ActionsOnMember=Εκδηλώσεις σχετικά με αυτό το μέλος NActions=%s ενέργειες NActionsLate=%s καθυστερ. +RequestAlreadyDone=Η αίτηση έχει ήδη καταγραφεί Filter=Φίλτρο RemoveFilter=Αφαίρεση φίλτρου ChartGenerated=Το γράφημα δημιουργήθηκε @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra setup χαρακτηριστικά URLPhoto=URL της φωτογραφία / λογότυπο SetLinkToThirdParty=Σύνδεση με άλλο τρίτο μέρος CreateDraft=Δημιουργία σχεδίου +SetToDraft=Επιστροφή στο προσχέδιο ClickToEdit=Κάντε κλικ για να επεξεργαστείτε ObjectDeleted=Αντικείμενο %s διαγράφεται ByCountry=Με τη χώρα @@ -678,7 +682,7 @@ ViewPrivateNote=Προβολή σημειώσεων XMoreLines=%s γραμμή (ές) κρυμμένη PublicUrl=Δημόσια URL AddBox=Προσθήκη πεδίου - +SelectElementAndClickRefresh=Επιλέξτε ένα στοιχείο και κάντε κλικ στο κουμπί Ανανέωση # Week day Monday=Δευτέρα Tuesday=Τρίτη diff --git a/htdocs/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang index 3979cbf3431..c0f9a69deaf 100644 --- a/htdocs/langs/el_GR/margins.lang +++ b/htdocs/langs/el_GR/margins.lang @@ -5,29 +5,23 @@ Margins=Περιθώρια TotalMargin=Συνολικό Περιθώριο MarginOnProducts=Περιθώριο / Προϊόντα MarginOnServices=Περιθώριο / Υπηρεσίες -MarginRate=Τιμή Περιθωρίου -MarkRate=Σημειώστε ποσοστό +MarginRate=Περιθώριο επί της % +MarkRate=Ποσοστό Κέρδους DisplayMarginRates=Εμφάνιση ποσοστό κέρδους -DisplayMarkRates=Εμφάνιση σημειωμένες τιμές +DisplayMarkRates=Εμφάνιση σημειωμένων τιμών InputPrice=Εισαγωγή τιμής - margin=Διαχείριση των ποσοστών κέρδους margesSetup=Ρύθμιση της διαχείρισης ποσοστών κέρδους - MarginDetails=Λεπτομέρειες Περιθωρίων - ProductMargins=Περιθώρια προϊόντος CustomerMargins=Περιθώρια πελατών -SalesRepresentativeMargins=Sales representative margins - +SalesRepresentativeMargins=Περιθώρια αντιπρόσωπου πωλήσεων ProductService=Προϊόν ή Υπηρεσία AllProducts=Όλα τα προϊόντα και οι υπηρεσίες ChooseProduct/Service=Επιλέξτε προϊόν ή υπηρεσία - StartDate=Ημερ. έναρξης EndDate=Ημερ. λήξης Launch=Έναρξη - ForceBuyingPriceIfNull=Υποχρεωτική τιμή αγοράς, αν η τιμή είναι μηδενική ForceBuyingPriceIfNullDetails=Αν είναι "ON", το περιθώριο θα είναι μηδενικό στη γραμμή (τιμή αγοράς = τιμή πώλησης), αν ειναι ("OFF"), θα είναι ίση με την τιμή πώλησης (τιμή αγοράς = 0) MARGIN_METHODE_FOR_DISCOUNT=Μέθοδος ποσοστού για της γενικές εκπτώσεις @@ -35,16 +29,16 @@ UseDiscountAsProduct=Ως προϊόν UseDiscountAsService=Ως υπηρεσία UseDiscountOnTotal=Στο υποσύνολο MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Καθορίζει αν η συνολική έκπτωση που θεωρείται ως ένα προϊόν, μια υπηρεσία, ή μόνον επί του υποσυνόλου για τον υπολογισμό του περιθωρίου κέρδους. - MARGIN_TYPE=Τύπος περιθωρίου MargeBrute=Αρχικό περιθώριο MargeNette=Το καθαρό περιθώριο MARGIN_TYPE_DETAILS=Αρχικό περιθώριο: τιμή πώλησης - τιμή αγοράς
    Το καθαρό περιθώριο: τιμή πώλησης - τιμή κόστους - CostPrice=Τιμή κόστους BuyingCost=Τιμή κόστους UnitCharges=Χρεώσεων Charges=Επιβαρύνσεις - AgentContactType=Εμπορικός αντιπρόσωπος τύπο επαφής -AgentContactTypeDetails=Ορίστε ποιο τύπο επαφής (που συνδέεται στα τιμολόγια) θα χρησιμοποιηθεί για την αναφορά του περιθωρίου των εμπορικών αντιπροσώπων +AgentContactTypeDetails=Ορίστε τι τύπος επαφής (που συνδέεται στα τιμολόγια) θα χρησιμοποιηθεί για την έκθεση περιθώριο κέρδους ανά πώληση εκπρόσωπου +rateMustBeNumeric=Βαθμολογήστε πρέπει να είναι μια αριθμητική τιμή +markRateShouldBeLesserThan100=Το ποσοστό πρέπει να είναι χαμηλότερη από 100 +ShowMarginInfos=Δείτε πληροφορίες για τα περιθώρια 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 1d044e9f821..96495ea8aea 100644 --- a/htdocs/langs/el_GR/orders.lang +++ b/htdocs/langs/el_GR/orders.lang @@ -53,9 +53,9 @@ ShippingExist=Μια αποστολή, υπάρχει DraftOrWaitingApproved=Draft or approved not yet ordered DraftOrWaitingShipped=Draft or validated not yet shipped MenuOrdersToBill=Παραγγελίες προς χρέωση -MenuOrdersToBill2=Παραγγελίες για τιμολόγηση +MenuOrdersToBill2=Χρεώσιμες παραγγελίες SearchOrder=Εύρεση παραγγελίας -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Αναζητήστε μία παραγγελία πελάτη ShipProduct=Ship product Discount=Έκπτωση CreateOrder=Δημιουργία παραγγελίας @@ -65,7 +65,7 @@ ValidateOrder=Επικύρωση παραγγελίας UnvalidateOrder=Για Unvalidate DeleteOrder=Διαγραφή παραγγελίας CancelOrder=Ακύρωση παραγγελίας -AddOrder=Προσθήκη παραγγελίας +AddOrder=Δημιουργία παραγγελίας AddToMyOrders=Προσθήκη στις παραγγελίες μου AddToOtherOrders=Προσθήκη στις άλλες παραγγελίες AddToDraftOrders=Προσθήκη στο σχέδιο παραγγελιας @@ -101,7 +101,6 @@ RelatedOrders=Σχετικές παραγγελίες OnProcessOrders=Παραγγελίες σε εξέλιξη RefOrder=Κωδ. παραγγελίας RefCustomerOrder=Κωδ. πελάτη παραγγελίας -CustomerOrder=Παραγγελία πελάτη RefCustomerOrderShort=Ref. cust. order SendOrderByMail=Αποστολή παραγγελίας με email ActionsOnOrder=Ενέργειες στην παραγγελία @@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' Error_OrderNotChecked=Δεν υπάρχουν παραγγελίες στο επιλεγμένο τιμολόγιο - - # Sources OrderSource0=Εμπορική πρόταση OrderSource1=Internet @@ -144,7 +141,6 @@ OrderSource5=Commercial OrderSource6=Store QtyOrdered=Qty ordered AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order - # Documents models PDFEinsteinDescription=Ολοκληρωμένο πρότυπο παραγγελίας (λογότυπο...) PDFEdisonDescription=Απλό πρότυπο παραγγελίας @@ -155,14 +151,12 @@ OrderByFax=Φαξ OrderByEMail=EMail OrderByWWW=Online OrderByPhone=Τηλέφωνο - CreateInvoiceForThisCustomer=Τιμολογημένες παραγγελίες NoOrdersToInvoice=Δεν υπάρχουν τιμολογημένες παραγγελίες CloseProcessedOrdersAutomatically=Χαρακτηρίστε σε «εξέλιξη» όλες τις επιλεγμένες παραγγελίες. -MenuOrdersToBill2=Παραγγελίες για τιμολόγηση OrderCreation=Δημιουργία Παραγγελίας Ordered=Παραγγελια OrderCreated=Οι παραγγελίες σας έχουν δημιουργηθεί OrderFail=Ένα σφάλμα συνέβη κατά τη διάρκεια την δημιουργία τις παραγγελίες CreateOrders=Δημιουργία παραγγελιών -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +ToBillSeveralOrderSelectCustomer=Για να δημιουργήσετε ένα τιμολόγιο για αρκετές παραγγελίες, κάντε κλικ πρώτα στον πελάτη, στη συνέχεια, επιλέξτε "%s". diff --git a/htdocs/langs/el_GR/oscommerce.lang b/htdocs/langs/el_GR/oscommerce.lang deleted file mode 100644 index 53308cb42c9..00000000000 --- a/htdocs/langs/el_GR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce εγκατάσταση μονάδας -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang index 6f1b6962450..e15f9952453 100644 --- a/htdocs/langs/el_GR/other.lang +++ b/htdocs/langs/el_GR/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Κωδικός ασφαλείας Calendar=Ημερολόγιο -AddTrip=Προσθήκη ταξιδιού Tools=Εργαλεία ToolsDesc=Αυτή η περιοχή είναι αφιερωμένη στην ομάδα διάφορα εργαλεία που είναι διαθέσιμα δεν σε άλλες καταχωρήσεις μενού.

    Αυτά τα εργαλεία είναι προσβάσιμα από το μενού στο πλάι. Birthday=Γενέθλια @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Δημιουργία έργου Notify_TASK_CREATE=Η εργασία δημιουργήθηκε Notify_TASK_MODIFY=Η εργασία τροποποιήθηκε Notify_TASK_DELETE=Η εργασία διαγράφηκε +SeeModuleSetup=Προβολή ρύθμισης του module NbOfAttachedFiles=Πλήθος επισυναπτώμενων αρχείων/εγγράφων TotalSizeOfAttachedFiles=Συνολικό μέγεθος επισυναπτώμενων αρχείων/εγγράφων MaxSize=Μέγιστο μέγεθος @@ -80,6 +80,16 @@ ModifiedBy=Τροποποίηθηκε από %s ValidatedBy=Επικυρώθηκε από %s CanceledBy=Ακυρώθηκε από %s ClosedBy=Έκλεισε από %s +CreatedById=Ταυτότητα χρήστη που δημιούργησε +ModifiedById=Ταυτότητα χρήστη που τελευταία αλλαγή +ValidatedById=Ταυτότητα χρήστη που επικύρωσε +CanceledById=Ταυτότητα χρήστη που ακύρωσε +ClosedById=Ταυτότητα χρήστη που έκλεισε +CreatedByLogin=Χρήστης σύνδεσης που δημιούργησε +ModifiedByLogin=Χρήστης σύνδεσης που έκανε τελευταία αλλαγή +ValidatedByLogin=Χρήστης σύνδεσης που επικύρωσε +CanceledByLogin=Χρήστης σύνδεσης που ακύρωσε +ClosedByLogin=Χρήστης σύνδεσης που έκλεισε FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Διαθέσιμο σε μία επόμενη έκδοση @@ -193,25 +203,26 @@ ForgetIfNothing=Αν δεν ζητήσατε αυτή την αλλαγή, απ ##### Calendar common ##### AddCalendarEntry=Προσθήκη εγγραφής στο ημερολόγιο %s -NewCompanyToDolibarr=Η εταιρία %s προστέθηκε στο Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Αποστολή %s επικυρωθεί Dolibarr -ShipmentDeletedInDolibarr=Αποστολες %s διαγράφονται από Dolibarr +NewCompanyToDolibarr=Εταιρεία %s προστέθηκε +ContractValidatedInDolibarr=Συμβόλαιο %s επικυρώθηκε +ContractCanceledInDolibarr=Συμβόλαιο %s ακυρώθηκε +ContractClosedInDolibarr=Συμβόλαιο %s έκλεισε +PropalClosedSignedInDolibarr=Πρόσφορα %s υπεγράφη +PropalClosedRefusedInDolibarr=Πρόσφορα %s απορρίφθηκε +PropalValidatedInDolibarr=Πρόσφορα %s επικυρώθηκε +PropalClassifiedBilledInDolibarr=Πρόταση %s ταξινομούνται χρεωθεί +InvoiceValidatedInDolibarr=Τιμολόγιο %s επικυρωθεί +InvoicePaidInDolibarr=Τιμολόγιο %s άλλαξε σε καταβληθεί +InvoiceCanceledInDolibarr=Τιμολόγιο %s ακυρώθηκε +PaymentDoneInDolibarr=Πληρωμή %s Ολοκληρώθηκε +CustomerPaymentDoneInDolibarr=Πληρωμή των πελατών %s Ολοκληρώθηκε +SupplierPaymentDoneInDolibarr=Πληρωμή Προμηθευτή %s Ολοκληρώθηκε +MemberValidatedInDolibarr=Μέλος %s επικυρωθεί +MemberResiliatedInDolibarr=Μέλος %s resiliated +MemberDeletedInDolibarr=Μέλος %s διαγράφηκε +MemberSubscriptionAddedInDolibarr=Συνδρομή για το μέλος %s προστέθηκε +ShipmentValidatedInDolibarr=Η αποστολή %s επικυρώθηκε +ShipmentDeletedInDolibarr=Η αποστολή %s διαγράφηκε ##### Export ##### Export=Εξαγωγή ExportsArea=Exports area diff --git a/htdocs/langs/el_GR/paybox.lang b/htdocs/langs/el_GR/paybox.lang index b0479ba849e..54a2746121e 100644 --- a/htdocs/langs/el_GR/paybox.lang +++ b/htdocs/langs/el_GR/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Μήνυμα για την ακύρωση σελίδα επιστρο NewPayboxPaymentReceived=Νέα πληρωμή Paybox που λήφθηκε NewPayboxPaymentFailed=Νέα πληρωμή Paybox προσπάθησαν αλλά απέτυχαν PAYBOX_PAYONLINE_SENDEMAIL=Στείλτε e-mail προειδοποιήσεις μετά από πληρωμή (επιτυχία ή όχι) +PAYBOX_PBX_SITE=Τιμή για PBX SITE +PAYBOX_PBX_RANG=Τιμή για PBX Rang +PAYBOX_PBX_IDENTIFIANT=Τιμή για PBX ID 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..af3f9bba119 --- /dev/null +++ b/htdocs/langs/el_GR/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Διαχειριστείτε παρτίδα/σειριακό +ProductStatusOnBatch=Διαχείριση +ProductStatusNotOnBatch=Χωρίς διαχείριση +ProductStatusOnBatchShort=Διαχείριση +ProductStatusNotOnBatchShort=Χωρίς διαχείριση +Batch=Παρτίδα/Σειριακός +atleast1batchfield=Φάτε την ημερομηνία λήξης ή ημερομηνία πώλησης ή τον αριθμό παρτίδας +batch_number=Παρτίδα/Σειριακός αριθμός +l_eatby=Φάτε ημερομηνία λήξης +l_sellby=Ημερομηνία πώλησης +DetailBatchNumber=Παρτίδα/Λεπτομέρειες σειριακού +DetailBatchFormat=Παρτίδα/Κωδικός: %s - E:%s - s:%s (Ποσότητα: %d) +printBatch=Παρτίδα: %s +printEatby=Eat-by: %s +printSellby=Πώληση ανά: %s +printQty=Ποσότητα: %d +AddDispatchBatchLine=Προσθέστε μια γραμμή για Χρόνο Διάρκειας αποστολής +BatchDefaultNumber=Απροσδιόριστο +WhenProductBatchModuleOnOptionAreForced=Όταν το module παρτίδας/σειριακός είναι ενεργοποιημένο, αύξηση/μείωση \nη κατάσταση των αποθεμάτων αναγκάζει την τελευταία επιλογή και δεν μπορούν να τροποποιηθούν. Άλλες επιλογές μπορούν να οριστούν όπως θέλετε. diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang index 34449987715..98b79945713 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=Εμφάνιση προϊόντων @@ -100,7 +100,7 @@ AddToOtherBills=Προσθήκη στους άλλους λογαριασμού CorrectStock=Σωστό Απόθεμα AddPhoto=Προσθήκη φωτογραφίας ListOfStockMovements=Λίστα κινήσεων αποθέματος -BuyingPrice=Buying price +BuyingPrice=Τιμή Αγοράς SupplierCard=Κάρτα προμηθευτή CommercialCard=Εμπορική Κάρτα AllWays=Μονοπάτι να βρείτε το προϊόν σας σε απόθεμα @@ -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=Αριθμός προϊόντων που συνθέτουν αυτό το εικονικό προϊόν πακέτο +ParentProductsNumber=Αριθμός μητρικής συσκευασίας προϊόντος +IfZeroItIsNotAVirtualProduct=Αν 0, το προϊόν αυτό δεν είναι ένα εικονικό προϊόν πακέτο +IfZeroItIsNotUsedByVirtualProduct=Αν 0, το προϊόν αυτό δεν χρησιμοποιείται από κάθε εικονικό προϊόν πακέτο EditAssociate=Συσχέτιση Translation=Μετάφραση KeywordFilter=Φίλτρο λέξης-κλειδιού @@ -132,7 +132,7 @@ AddDel=Προσθήκη/Διαγραφή Quantity=Ποσότητα NoMatchFound=Δεν βρέθηκε κατάλληλη εγγραφή ProductAssociationList=Κατάλογος των σχετικών προϊόντων / υπηρεσιών: το όνομα του προϊόντος / υπηρεσίας (επηρεάζονται ποσότητα) -ProductParentList=Κατάλογος των προϊόντων / υπηρεσιών με αυτό το προϊόν ως συστατικό +ProductParentList=Λίστα συσκευασίας προϊόντων/υπηρεσιών με αυτό το προϊόν ως συστατικό ErrorAssociationIsFatherOfThis=Ένα από τα προϊόντα που θα επιλεγούν είναι γονέας με την τρέχουσα προϊόν DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας ConfirmDeleteProduct=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το προϊόν / υπηρεσία; @@ -179,7 +179,7 @@ CloneProduct=Κλώνοποίηση προϊόντος ή υπηρεσίας ConfirmCloneProduct=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσει το προϊόν ή την υπηρεσία %s; CloneContentProduct=Κλώνος όλες τις κύριες πληροφορίες του προϊόντος / υπηρεσίας ClonePricesProduct=Κλώνος κύριες πληροφορίες και τιμές -CloneCompositionProduct=Εικονικός κλώνος προϊόντων/υπηρεσιών +CloneCompositionProduct=Κλώνος συσκευασμένου προϊόν/υπηρεσίας 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="τιμή = 2 + 2" or "2 + 2" για τον καθορισμό της τιμής
    ExtraFields \nείναι μεταβλητές, όπως "#options_myextrafieldkey# * 2"
    Υπάρχουν ειδικές μεταβλητές όπως #quantity# και #tva_tx#
    Χρησιμοποιήστε ; για να διαχωρίσει τις εκφράσεις +PriceMode=Λειτουργία Τιμής +PriceNumeric=Αριθμός diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang index 77b4de1917c..6dcccff7a50 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=Εργασίες σχετικές με τα ανοικτά έργα +WorkloadNotDefined=Ο φόρτος εργασίας δεν ορίζεται 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 new file mode 100644 index 00000000000..ea89236eb59 --- /dev/null +++ b/htdocs/langs/el_GR/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Πόροι +MenuResourceAdd=Νέος πόρος +MenuResourcePlanning=Προγραμματισμός των πόρων +DeleteResource=Διαγραφή πόρων +ConfirmDeleteResourceElement=Επιβεβαιώστε τη διαγραφή των πόρων για αυτό το στοιχείο +NoResourceInDatabase=Δεν υπάρχουν πόροι στη βάση δεδομένων. +NoResourceLinked=Ο πόρος δεν συνδέεται + +ResourcePageIndex=Λίστα Πόρων +ResourceSingular=Πόρος +ResourceCard=Κάρτα Πόρων +AddResource=Δημιουργήστε έναν πόρο +ResourceFormLabel_ref=Όνομα Πόρου +ResourceType=Τύπος Πόρου +ResourceFormLabel_description=Η περιγραφή πόρου + +ResourcesLinkedToElement=Πόροι που σχετίζονται με το στοιχείο + +ShowResourcePlanning=Εμφάνιση σχεδιασμού των πόρων +GotoDate=Μετάβαση στην ημερομηνία + +ResourceElementPage=Στοιχείο πόρων +ResourceCreatedWithSuccess=Ο Πόρος δημιουργήθηκε με επιτυχία +RessourceLineSuccessfullyDeleted=Γραμμή πόρου διαγράφηκε με επιτυχία +RessourceLineSuccessfullyUpdated=Γραμμή πόρου ενημερώθηκε με επιτυχία +ResourceLinkedWithSuccess=Ο πόρος συνδέεται με επιτυχία + +TitleResourceCard=Κάρτα πόρων +ConfirmDeleteResource=Επιβεβαιώστε την διαγραφή αυτού του πόρου +RessourceSuccessfullyDeleted=Ο Πόρος διαγράφηκε με επιτυχία +DictionaryResourceType=Το είδος των πόρων + +SelectResource=Επιλέξτε πόρο diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang index fffc1e4a735..2b00a7dfb0b 100644 --- a/htdocs/langs/el_GR/sendings.lang +++ b/htdocs/langs/el_GR/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Προς το παρόν, η δημιουργί RelatedShippings=Σχετικές αποστολές ShipmentLine=Σειρά αποστολής CarrierList=Κατάλογος των μεταφορέων +SendingRunning=Προϊόν από παραγγελία του πελάτη που έχει ήδη αποσταλεί +SuppliersReceiptRunning=Προϊόν από παραγγελία προμηθευτή έχει ληφθεί # Sending methods SendingMethodCATCH=Πιάσε τον πελάτη diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang index 5b63855fea8..8c4c7dfb7e4 100644 --- a/htdocs/langs/el_GR/stocks.lang +++ b/htdocs/langs/el_GR/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Ετικέτα Αποθήκη απαιτείται CorrectStock=Σωστή απόθεμα ListOfWarehouses=Κατάλογος των αποθηκών ListOfStockMovements=Κατάλογος των κινήσεων των αποθεμάτων -StocksArea=Αποθέματα περιοχή +StocksArea=Περιοχή αποθηκών Location=Τοποθεσία LocationSummary=Σύντομη τοποθεσία όνομα NumberOfDifferentProducts=Αριθμός διαφορετικών προϊόντων 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 0ef23155a7e..68794752db8 100644 --- a/htdocs/langs/el_GR/users.lang +++ b/htdocs/langs/el_GR/users.lang @@ -63,7 +63,6 @@ ShowGroup=Εμφάνιση ομάδας ShowUser=Εμφάνιση χρήστη NonAffectedUsers=Non affected users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group modified successfully +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 ? @@ -114,8 +113,10 @@ YourRole=Your roles YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb των χρηστών DontDowngradeSuperAdmin=Μόνο μια superadmin μπορεί να προβεί στην ανακατάταξη ενός superadmin -HierarchicalResponsible=Ιεραρχική ευθύνη +HierarchicalResponsible=Επόπτης HierarchicView=Ιεραρχική προβολή UseTypeFieldToChange=Χρησιμοποιήστε είδος πεδίου για να αλλάξετε OpenIDURL=OpenID URL LoginUsingOpenID=Χρησιμοποιήστε το OpenID για να συνδεθείτε +WeeklyHours=Εβδομαδιαίες ώρες +ColorUser=Χρώμα του χρήστη diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang index 09b6ec0d2e2..7f13ceb6468 100644 --- a/htdocs/langs/el_GR/withdrawals.lang +++ b/htdocs/langs/el_GR/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Παραλαβή LastWithdrawalReceipts=Τελευταία εισπράξεις απόσυρση %s WithdrawedBills=Αποσύρθηκε τιμολόγια WithdrawalsLines=Απόσυρση γραμμές -RequestStandingOrderToTreat=Αίτηση πάγιων εντολών για τη θεραπεία -RequestStandingOrderTreated=Αίτηση για παραγγελίες που έλαβαν στέκεται +RequestStandingOrderToTreat=Αίτηση πάγιων εντολών για επεξεργασία +RequestStandingOrderTreated=Αίτηση πάγιων εντολών επεξεργασίας +NotPossibleForThisStatusOfWithdrawReceiptORLine=Δεν είναι ακόμη δυνατή. Ανακαλούν το καθεστώς πρέπει να ρυθμιστεί ώστε να «πιστωθεί» πριν δηλώσει απόρριψη στις συγκεκριμένες γραμμές. CustomersStandingOrders=Πάγιες εντολές πελατών CustomerStandingOrder=Πελάτης πάγια εντολή NbOfInvoiceToWithdraw=Nb. του τιμολογίου με το αίτημα απόσυρσης @@ -40,14 +41,13 @@ TransMetod=Μέθοδος αποστολής Send=Αποστολή Lines=Γραμμές StandingOrderReject=Εκδώσει απόρριψη -InvoiceRefused=Τιμολόγιο αρνήθηκε WithdrawalRefused=Απόσυρση απορρίφθηκε WithdrawalRefusedConfirm=Είστε σίγουροι ότι θέλετε να εισάγετε μια απόρριψη αναμονής για την κοινωνία RefusedData=Ημερομηνία της απόρριψης RefusedReason=Λόγος απόρριψης RefusedInvoicing=Χρέωσης για την απόρριψη NoInvoiceRefused=Μην φορτίζετε την απόρριψη -InvoiceRefused=Τιμολόγιο αρνήθηκε +InvoiceRefused=Τιμολόγιο απορρίφθηκε (Φορτίστε την απόρριψη στον πελάτη) Status=Κατάσταση StatusUnknown=Άγνωστος StatusWaiting=Αναμονή @@ -76,13 +76,14 @@ WithBankUsingRIB=Για τους τραπεζικούς λογαριασμούς WithBankUsingBANBIC=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν IBAN / BIC / SWIFT BankToReceiveWithdraw=Τραπεζικός λογαριασμός για να λάβετε αποσύρει CreditDate=Πιστωτικές με -WithdrawalFileNotCapable=Δεν είναι δυνατή η δημιουργία αρχείου απόσυρση απόδειξη για τη χώρα σας +WithdrawalFileNotCapable=Αδύνατο να δημιουργηθεί το αρχείο παραλαβή απόσυρση για τη χώρα σας %s (η χώρα σας δεν υποστηρίζεται) ShowWithdraw=Εμφάνιση Ανάληψη IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο δεν έχει τουλάχιστον μία πληρωμή απόσυρσης ακόμη σε επεξεργασία, δεν θα πρέπει να οριστεί ως καταβληθέν θα επιτρέψει εκ των προτέρων την απόσυρση από την διαχείριση. -DoStandingOrdersBeforePayments=Αυτή η καρτέλα σας επιτρέπει να ζητήσετε μια πάγια εντολή. Από τη στιγμή που έχει ολοκληρωθεί, μπορείτε να πληκτρολογήσετε την πληρωμή για να κλείσει το τιμολόγιο. +DoStandingOrdersBeforePayments=Αυτή η καρτέλα σας επιτρέπει να ζητήσετε μια πάγια εντολή. Άπαξ ο δωρεοδόχος, πηγαίνετε στο μενού Τράπεζας-> Απόσυρση για τη διαχείριση της πάγιας εντολής. Όταν η πάγια εντολή είναι κλειστή, η πληρωμή στο τιμολόγιο θα πρέπει να καταγράφεται αυτόματα και το τιμολόγιο θα κλείσει εάν υπόλοιπο που είναι να πληρώσει είναι μηδενικό. WithdrawalFile=Απόσυρση αρχείο SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου" ThisWillAlsoAddPaymentOnInvoice=Αυτό θα ισχύει επίσης για τις πληρωμές προς τα τιμολόγια και θα τα χαρακτηρίσουν ως "Πληρωμένα" +StatisticsByLineStatus=Στατιστικά στοιχεία από την κατάσταση των γραμμών ### Notifications InfoCreditSubject=Η πληρωμή των πάγιων %s ώστε από την τράπεζα diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang index a2be380b7c2..9661763869d 100644 --- a/htdocs/langs/en_AU/main.lang +++ b/htdocs/langs/en_AU/main.lang @@ -1,6 +1,6 @@ # Dolibarr language file - en_AU - main # This file contains only lines that must differs from en_US file -SeparatorDecimal=, +SeparatorDecimal=. SeparatorThousand=Space FormatDateShort=%d/%m/%Y FormatDateShortInput=%d/%m/%Y @@ -37,4 +37,4 @@ IncludedVAT=Included GST HT=excl GST TTC=Incl GST VAT=GST -VATRate=GST Rate \ No newline at end of file +VATRate=GST Rate diff --git a/htdocs/langs/en_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 diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index cfcdec83c2f..e1713acd57c 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card \ No newline at end of file +FicheVentilation=Breakdown card \ No newline at end of file diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang old mode 100644 new mode 100755 index 00f7ae43737..0b328e705a7 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/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 @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Stock management (products) Module53Name=Services Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +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 -Module400Desc=Project management inside other modules +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 @@ -606,11 +613,11 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts +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 @@ -672,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -702,8 +709,8 @@ Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Read stock movements Permission1005=Create/modify stock movements Permission1101=Read delivery orders @@ -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 @@ -887,7 +895,8 @@ 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=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 @@ -1039,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1139,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1148,6 +1157,7 @@ ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes i FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1160,7 +1170,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1415,8 +1425,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1481,11 +1492,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1539,6 +1553,13 @@ ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed AlwaysEditable=Can always be edited - +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 45f5017671f..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 @@ -41,9 +42,10 @@ AutoActions= Automatic filling AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Invoice %s validated +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Order %s validated diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 05156a723ad..10a5f5b3c14 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -8,6 +8,7 @@ FinancialAccount=Account FinancialAccounts=Accounts BankAccount=Bank account BankAccounts=Bank accounts +ShowAccount=Show Account AccountRef=Financial account ref AccountLabel=Financial account label CashAccount=Cash account diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 5c16e18e4cf..12778d6b9ea 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -137,8 +137,6 @@ BillFrom=From BillTo=To ActionsOnBill=Actions on invoice NewBill=New invoice -Prélèvements=Standing order -Prélèvements=Standing orders LastBills=Last %s invoices LastCustomersBills=Last %s customers invoices LastSuppliersBills=Last %s suppliers invoices @@ -219,7 +217,6 @@ NoInvoice=No invoice ClassifyBill=Classify invoice SupplierBillsToPay=Suppliers invoices to pay CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms @@ -351,6 +348,7 @@ ChequeNumber=Check N° ChequeOrTransferNumber=Check/Transfer N° ChequeMaker=Check transmitter ChequeBank=Bank of Check +CheckBank=Check NetToBePaid=Net to be paid PhoneNumber=Tel FullPhoneNumber=Telephone diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index 3ee731f0824..7a3c7f0c288 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Products -CatCusLinks=Customer/Prospects -CatSupLinks=Suppliers DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -111,4 +108,5 @@ ExtraFieldsCategories=Complementary attributes CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory -AddProductServiceIntoCategory=Add the following product/service \ No newline at end of file +AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category \ No newline at end of file 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 diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index e06aadef531..57ba3bb15d8 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastContracts=Last %s modified contracts +LastModifiedContracts=Last %s modified contracts AllContracts=All contracts ContractCard=Contract card ContractStatus=Contract status @@ -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/en_US/cron.lang b/htdocs/langs/en_US/cron.lang index 69cf8e0491c..5432c5b5b52 100644 --- a/htdocs/langs/en_US/cron.lang +++ b/htdocs/langs/en_US/cron.lang @@ -18,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman 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 jobs -CronListInactive= List of disabled jobs -CronListActive= List of scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list CronDateLastRun=Last run CronLastOutput=Last run output diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 85dfdd8ff4d..77d91ad801d 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang old mode 100644 new mode 100755 index 0187c567eb6..35b7da13728 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -138,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/en_US/externalsite.lang b/htdocs/langs/en_US/externalsite.lang index 62da68c045d..afec761f5fe 100644 --- a/htdocs/langs/en_US/externalsite.lang +++ b/htdocs/langs/en_US/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Setup link to external website ExternalSiteURL=External Site URL ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry \ No newline at end of file diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index 698d34eb539..f5b87fefb08 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -48,7 +48,6 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang index 1116e29c21c..d20aab00146 100644 --- a/htdocs/langs/en_US/languages.lang +++ b/htdocs/langs/en_US/languages.lang @@ -13,6 +13,7 @@ Language_de_AT=German (Austria) Language_de_CH=German (Switzerland) Language_el_GR=Greek Language_en_AU=English (Australia) +Language_en_CA=English (Canada) Language_en_GB=English (United Kingdom) Language_en_IN=English (India) Language_en_NZ=English (New Zealand) diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 44027b4cc20..6fffc35bb08 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -115,7 +115,7 @@ SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -136,3 +136,6 @@ SomeNotificationsWillBeSent=%s notifications will be sent by email AddNewNotification=Activate a new email notification target ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index cbc4deb40d7..bfded6f40e2 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -61,6 +61,7 @@ ErrorFailedToSaveFile=Error, failed to save file. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s +SeeHere=See here BackgroundColorByDefault=Default background color FileNotUploaded=The file was not uploaded FileUploaded=The file was successfully uploaded @@ -169,6 +170,7 @@ User=User Users=Users Group=Group Groups=Groups +NoUserGroupDefined=No user group defined Password=Password PasswordRetype=Retype your password NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration. diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index b789f2f8423..3593e4c879f 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -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 \ No newline at end of file diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 76986b67621..3eab6893735 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -53,7 +53,7 @@ ShippingExist=A shipment exists DraftOrWaitingApproved=Draft or approved not yet ordered DraftOrWaitingShipped=Draft or validated not yet shipped MenuOrdersToBill=Orders delivered -MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order ShipProduct=Ship product @@ -154,7 +154,6 @@ OrderByPhone=Phone CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=No orders billable CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -MenuOrdersToBill2=Billables orders OrderCreation=Order creation Ordered=Ordered OrderCreated=Your orders have been created diff --git a/htdocs/langs/en_US/oscommerce.lang b/htdocs/langs/en_US/oscommerce.lang deleted file mode 100644 index 3ff9108ead4..00000000000 --- a/htdocs/langs/en_US/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang index aa0040afdc8..4e6798a21b6 100644 --- a/htdocs/langs/en_US/paybox.lang +++ b/htdocs/langs/en_US/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page NewPayboxPaymentReceived=New Paybox payment received NewPayboxPaymentFailed=New Paybox payment tried but failed PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID \ No newline at end of file diff --git a/htdocs/langs/en_US/printipp.lang b/htdocs/langs/en_US/printipp.lang index cc719fddded..835e6827f12 100644 --- a/htdocs/langs/en_US/printipp.lang +++ b/htdocs/langs/en_US/printipp.lang @@ -7,3 +7,8 @@ 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/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang index 07fb45985d5..ca3e49749ab 100644 --- a/htdocs/langs/en_US/productbatch.lang +++ b/htdocs/langs/en_US/productbatch.lang @@ -1,19 +1,20 @@ # ProductBATCH language file - en_US - ProductBATCH -CHARSET= UTF-8 -ProductStatusOnBatch= Managed -ProductStatusNotOnBatch= Not Managed -ProductStatusOnBatchShort= Managed -ProductStatusNotOnBatchShort= Not Managed -Batch=Batch -atleast1batchfield= Eat-by date or Sell-by date or Batch number -batch_number= Batch number -l_eatby= Eat-by date -l_sellby= Sell-by date -DetailBatchNumber= Batch details -DetailBatchFormat= E:%s S: %s BATCH: %s (Qty : %d) -printBatch= Batch: %s -printEatby= Eat-by: %s -printSellby= Sell-by: %s -printQty= Qty: %d +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 \ No newline at end of file +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/en_US/products.lang b/htdocs/langs/en_US/products.lang old mode 100644 new mode 100755 index b38bcd150a9..a5dfb52d40c --- 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 @@ -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,11 +234,16 @@ 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 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/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 32b7d57e9b0..84624b219f9 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). @@ -11,7 +12,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 @@ -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 @@ -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 \ No newline at end of file +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang old mode 100755 new mode 100644 index e0a767cc58a..32bdd92f884 --- a/htdocs/langs/en_US/resource.lang +++ b/htdocs/langs/en_US/resource.lang @@ -16,11 +16,8 @@ ResourceType=Resource type ResourceFormLabel_description=Resource description ResourcesLinkedToElement=Resources linked to element -RessourceLineSuccessfullyUpdated=Resource successfully updated -RessourceLineSuccessfullyDeleted=Resource successfully deleted ShowResourcePlanning=Show resource planning -NoResourceInDatabase=No resource in database GotoDate=Go to date ResourceElementPage=Element resources diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 7a08148c9ce..492cbbd7464 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=Location LocationSummary=Short name location NumberOfDifferentProducts=Number of different products @@ -59,7 +59,7 @@ ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving ReStockOnDeleteInvoice=Increase real stocks on invoice deletion OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses. -StockDiffPhysicTeoric=Reason for difference stock physical and theoretical +StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required. DispatchVerb=Dispatch StockLimitShort=Limit for alert diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index c13e3e767bb..9670d002be6 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -63,7 +63,6 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 35cfa23d9e2..7894351c01f 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -41,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Charge the rejection to customer +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Unknown StatusWaiting=Waiting @@ -80,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 done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines ### Notifications InfoCreditSubject=Payment of standing order %s by the bank 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 diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang index 20ebb652882..d26e84d7a36 100644 --- a/htdocs/langs/es_ES/accountancy.lang +++ b/htdocs/langs/es_ES/accountancy.lang @@ -29,8 +29,8 @@ Ventilation=Contabilizar ToDispatch=A realizar Dispatched=Realizadas -CustomersVentilation=Contabilización ventas -SuppliersVentilation=Contabilización compras +CustomersVentilation=Contabilizar clientes +SuppliersVentilation=Contabilizar proveedores TradeMargin=Margen de beneficio Reports=Informes ByCustomerInvoice=Por facturas a clientes @@ -45,8 +45,8 @@ WriteBookKeeping=Registrar los asientos en el libro mayor Bookkeeping=Libro Mayor AccountBalanceByMonth=Saldo mensual -AccountingVentilation=Contabilización -AccountingVentilationSupplier=Contabilización compras +AccountingVentilation=Descuadre contabilidad +AccountingVentilationSupplier=Contablilización compras AccountingVentilationCustomer=Contabilización ventas Line=Línea diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 79935d143ca..e2c2f124b2e 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -56,6 +56,8 @@ UseSearchToSelectCompany=Utilice los campos de autocompletar para elegir tercer ActivityStateToSelectCompany= Agregar un filtro en la búsqueda para mostrar/ocultar los terceros en activo o que hayan dejado de ejercer UseSearchToSelectContactTooltip=También si usted tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento CONTACT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena. UseSearchToSelectContact=Utilice los campos de autocompletar para seleccionar contactos (en lugar de utilizar un cuadro de lista). +DelaiedFullListToSelectCompany=Esperar a que presione una tecla antes de cargar el contenido de los terceros en el combo (Esto puede incrementar el rendimiento si tiene un gran número de terceros) +DelaiedFullListToSelectContact=Esperar a que presione una tecla antes de cargar el contenido de los contactos en el combo (Esto puede incrementar el rendimiento si tiene un gran número de contactos) SearchFilter=Opciones filtros de búsqueda NumberOfKeyToSearch=Nº de caracteres para desencadenar la búsqueda: %s ViewFullDateActions=Ver las fechas de las acciones en su totalidad en la ficha de tercero @@ -208,6 +210,7 @@ ModulesJobDesc=Los módulos específicos permiten una preconfiguración simplifi ModulesMarketPlaceDesc=Hay disponibles para su descarga en sitios externos otros módulos/extensiones... ModulesMarketPlaces=Más módulos... DoliStoreDesc=DoliStore, el sitio oficial de módulos complementarios y para Dolibarr ERP/CRM +DoliPartnersDesc=Listado con algunas empresas que pueden proporcionar desarrollar a medida módulos o funcionalidades (Nota: cualquier empresa Open Source con conocimientos de lenguaje PHP puede proporcionarle desarrollo específico) WebSiteDesc=Sitios proveedores a consultar para encontrar más módulos URL=Enlace BoxesAvailable=Paneles disponibles @@ -437,14 +440,14 @@ Module52Name=Stocks de productos Module52Desc=Gestión de stocks de productos Module53Name=Servicios Module53Desc=Gestión de servicios -Module54Name=Contratos -Module54Desc=Gestión de contratos +Module54Name=Contratos/Suscripciones +Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes) Module55Name=Códigos de barras Module55Desc=Gestión de los códigos de barras Module56Name=Telefonía Module56Desc=Gestión de la telefonía Module57Name=Domiciliaciones -Module57Desc=Gestión de domiciliaciones y reintegros bancarios +Module57Desc=Gestión de domiciliaciones. También incluye generación de archivo SEPA para los países europeos. Module58Name=ClickToDial Module58Desc=Integración con ClickToDial Module59Name=Bookmark4u @@ -475,8 +478,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 -Module400Desc=Gestión de los proyectos en los otros módulos +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) @@ -495,6 +498,8 @@ Module1780Name=Categorías Module1780Desc=Gestión de categorías (productos, proveedores y clientes) Module2000Name=Editor WYSIWYG Module2000Desc=Permite la edición de ciertas zonas de texto mediante un editor avanzado +Module2200Name=Precios dinámicos +Module2200Desc=Activar el uso de expresiones matemáticas para precios Module2300Name=Programador Module2300Desc=Tareas programadas Module2400Name=Agenda @@ -503,6 +508,8 @@ Module2500Name=Gestión Electrónica de Documentos Module2500Desc=Permite administrar una base de documentos Module2600Name=WebServices Module2600Desc=Activa los servicios de servidor web services de Dolibarr +Module2650Name=WebServices (cliente) +Module2650Desc=Habilitar los servicios web cliente de Dolibarr (puede ser utilizado para grabar datos/solicitudes de servidores externos. De momento solo se soporta pedidos a proveedor) Module2700Name=Gravatar Module2700Desc=Utiliza el servicio en línea de Gravatar (www.gravatar.com) para mostrar fotos de los usuarios/miembros (que se encuentran en sus mensajes de correo electrónico). Necesita un acceso a Internet Module2800Desc=Cliente FTP @@ -517,7 +524,7 @@ Module6000Desc=Gestión del flujo de trabajo Module20000Name=Gestión de días libres retribuidos Module20000Desc=Gestión de los días libres retribuidos de los empleados Module39000Name=Lotes de productos -Module39000Desc=Gestión de lotes y fechas de caducidad y venta de los productos +Module39000Desc=Gestión de lotes o series, fechas de caducidad y venta de los productos Module50000Name=PayBox Module50000Desc=Módulo para proporcionar un pago en línea con tarjeta de crédito mediante Paybox Module50100Name=TPV @@ -527,7 +534,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 @@ -606,11 +613,11 @@ Permission151=Consultar domiciliaciones Permission152=Crear/modificar domiciliaciones Permission153=Enviar domiciliaciones Permission154=Abonar/devolver domiciliaciones -Permission161=Consultar contratos de servicio -Permission162=Crear/modificar contratos de servicio -Permission163=Activar los servicios de un contrato -Permission164=Desactivar los servicios de un contrato -Permission165=Eliminar contratos +Permission161=Consultar contratos/suscripciones +Permission162=Crear/modificar contratos/suscripciones +Permission163=Activar un servicio/suscripción de un contrato +Permission164=Desactivar un servicio/suscripcion de un contrato +Permission165=Eliminar contratos/suscripciones Permission171=Leer honorarios (propios y de sus subordinados) Permission172=Crear/modificar honorarios Permission173=Eliminar honorarios @@ -672,7 +679,7 @@ Permission300=Consultar códigos de barras Permission301=Crear/modificar códigos de barras Permission302=Eliminar código de barras Permission311=Consultar servicios -Permission312=Asignar servicios a un contrato +Permission312=Asignar servicios/suscripciones a un contrato Permission331=Consultar marcadores Permission332=Crear/modificar marcadores Permission333=Eliminar marcadores @@ -702,8 +709,8 @@ Permission701=Consultar donaciones Permission702=Crear/modificar donaciones Permission703=Eliminar donaciones Permission1001=Consultar stocks -Permission1002=Crear/modificar stocks -Permission1003=Eliminar stocks +Permission1002=Crear/modificar almacenes +Permission1003=Eliminar almacenes Permission1004=Consultar movimientos de stock Permission1005=Crear/modificar movimientos de stock Permission1101=Consultar ordenes de envío @@ -779,6 +786,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 @@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zona de búsqueda permanente del menú izquierdo DefaultLanguage=Idioma por defecto a utilizar (código idioma) EnableMultilangInterface=Activar interfaz multi-idioma EnableShowLogo=Mostrar el logotipo en el menú de la izquierda +EnableHtml5=Activar Html5 (En desarrollo - Solo disponible en el tema Eldy) SystemSuccessfulyUpdated=Su sistema está actualizado CompanyInfo=Información de la empresa/institución CompanyIds=Identificación reglamentaria @@ -1039,7 +1048,6 @@ YesInSummer=Sí en verano OnlyFollowingModulesAreOpenedToExternalUsers=Tenga en cuenta que sólo los módulos siguientes están abiertos a usuarios externos (sean cuales sean los permisos de los usuarios): SuhosinSessionEncrypt=Almacenamiento de sesiones cifradas por Suhosin ConditionIsCurrently=Actualmente la condición es %s -TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual YouUseBestDriver=Está usando el driver %s, actualmente es el mejor driver disponible. YouDoNotUseBestDriver=Usa el driver %s aunque se recomienda usar el driver %s. NbOfProductIsLowerThanNoPb=Tiene %s productos/servicios en su base de datos. No es necesaria ninguna optimización en particular. @@ -1139,6 +1147,7 @@ AddDeliveryAddressAbility=Posibilidad de seleccionar una dirección de envío UseOptionLineIfNoQuantity=Una línea de producto/servicio que tiene una cantidad nula se considera como una opción FreeLegalTextOnProposal=Texto libre en presupuestos WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto ##### Orders ##### OrdersSetup=Configuración del módulo pedidos OrdersNumberingModules=Módulos de numeración de los pedidos @@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Módulos de numeración de las fichas de intervenció TemplatePDFInterventions=Modelo de documentos de las fichas de intervención WatermarkOnDraftInterventionCards=Marca de agua en fichas de intervención (en caso de estar vacío) ##### Contracts ##### -ContractsSetup=Configuración del módulo contratos +ContractsSetup=Configuración del módulo Contratos/suscripciones ContractsNumberingModules=Módulos de numeración de los contratos TemplatePDFContracts=Modelos de documento de contratos FreeLegalTextOnContracts=Texto libre en contratos @@ -1415,8 +1424,9 @@ OSCommerceTestOk=La conexión al servidor '%s' sobre la base '%s' por el usuario OSCommerceTestKo1=La conexión al servidor '%s' sobre la base '%s' por el usuario '%s' no se pudo efectuar. OSCommerceTestKo2=La conexión al servidor '%s' por el usuario '%s' ha fallado. ##### Stock ##### -StockSetup=Configuración del módulo Stocks -UserWarehouse=Utilizar los stocks personales de usuarios +StockSetup=Configuración del módulo Almacenes +UserWarehouse=Utilizar almacenes personales de usuarios +IfYouUsePointOfSaleCheckModule=Si utiliza un módulo de Punto de Venta (módulo TPV por defecto u otro módulo externo), esta configuración puede ser ignorada por su módulo de Punto de Venta. La mayor parte de módulos TPV están diseñados para crear inmediatamente una factura y decrementar stocks cualquiera que sean estas opciones. Por lo tanto, si usted necesita o no decrementar stocks en el registro de una venta de su punto de venta, controle también la configuración de su módulo TPV. ##### Menu ##### MenuDeleted=Menú eliminado TreeMenu=Estructura de los menús @@ -1481,11 +1491,14 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te ##### Point Of Sales (CashDesk) ##### CashDesk=TPV CashDeskSetup=Configuración del módulo Terminal Punto de Venta -CashDeskThirdPartyForSell=Tercero genérico a usar para la venta +CashDeskThirdPartyForSell=Tercero genérico a usar para las ventas CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja) CashDeskBankAccountForCheque= Cuenta por defecto a utilizar para los cobros con cheques CashDeskBankAccountForCB= Cuenta por defecto a utilizar para los cobros con tarjeta de crédito -CashDeskIdWareHouse=Almacén a utilizar para las ventas +CashDeskDoNotDecreaseStock=Desactivar decrementos de stock si una venta se realiza desde TPV +CashDeskIdWareHouse=Forzar y restringir almacén a usar para decremento de stock +StockDecreaseForPointOfSaleDisabled=Decremento de stock desde TPV desactivado +CashDeskYouDidNotDisableStockDecease=Usted no ha desactivado el decremento de stock al hacer una venta desde TPV. Así que se requiere un almacén. ##### Bookmark ##### BookmarkSetup=Configuración del módulo Marcadores BookmarkDesc=Este módulo le permite gestionar los enlaces y accesos directos. También permite añadir cualquier página de Dolibarr o enlace web en el menú de acceso rápido de la izquierda. @@ -1539,6 +1552,13 @@ ConfirmDeleteFiscalYear=¿Está seguro de querer eliminar este año fiscal? Opened=Abierto Closed=Cerrado AlwaysEditable=Puede editarse siempre - +MAIN_APPLICATION_TITLE=Forzar visibilidad del nombre de aplicación (advertencia: indicar su propio nombre aquí puede romper la característica de relleno automático de inicio de sesión al utilizar la aplicación móvil DoliDroid) +NbMajMin=Número mínimo de caracteres en mayúsculas +NbNumMin=Número mínimo de caracteres numéricos +NbSpeMin=Número mínimo de caracteres especiales +NbIteConsecutive=Número máximo de repeticiones de los mismos caracteres +NoAmbiCaracAutoGeneration=No usar caracteres ambiguos ("1","l","i","|","0","O") para la generación automática +SalariesSetup=Configuración del módulo salarios +SortOrder=Ordenación Format=Formatear TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang index c357756f95a..078045f4c14 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=Evento asignado a AllMyActions= Todos mis eventos/tareas AllActions= Todos los eventos/tareas ViewList=Vista listado @@ -41,9 +42,10 @@ AutoActions= Inclusión automática en la agenda AgendaAutoActionDesc= Indique en esta pestaña los eventos para los que desea que Dolibarr cree automáticamente un evento en la agenda. Si no se marca nada (por defecto), solamente las acciones manuales se incluirán en la agenda. AgendaSetupOtherDesc= Esta página le permite configurar algunas opciones que permiten exportar una vista de su agenda Dolibar a un calendario externo (thunderbird, google calendar, ...) AgendaExtSitesDesc=Esta página le permite configurar calendarios externos para su visualización en la agenda de Dolibarr. -ActionsEvents= Eventos para que Dolibarr cree un evento en la agenda de forma automática -PropalValidatedInDolibarr= Presupuesto %s validado -InvoiceValidatedInDolibarr= Factura %s validada +ActionsEvents=Eventos para que Dolibarr cree un evento en la agenda de forma automática +PropalValidatedInDolibarr=Presupuesto %s validado +InvoiceValidatedInDolibarr=Factura %s validada +InvoiceValidatedInDolibarrFromPos=Factura %s validada desde TPV InvoiceBackToDraftInDolibarr=Factura %s devuelta a borrador InvoiceDeleteDolibarr=Factura %s eliminada OrderValidatedInDolibarr= Pedido %s validado @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Pedido %s aprobado OrderRefusedInDolibarr=Pedido %s rechazado OrderBackToDraftInDolibarr=Pedido %s devuelto a borrador OrderCanceledInDolibarr=Pedido %s anulado -InterventionValidatedInDolibarr=Intervención %s validada ProposalSentByEMail=Presupuesto %s enviado por e-mail OrderSentByEMail=Pedido de cliente %s enviado por e-mail InvoiceSentByEMail=Factura a cliente %s enviada por e-mail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Pedido a proveedor %s enviada por e-mail SupplierInvoiceSentByEMail=Factura de proveedor %s enviada por e-mail ShippingSentByEMail=Expedición %s enviada por e-mail ShippingValidated= Envío %s validado -InterventionSentByEMail=Intervención %s enviada por e-mail -InterventionClassifiedBilled=Intervención %s clasificada como Facturada NewCompanyToDolibarr= Tercero creado DateActionPlannedStart= Fecha de inicio prevista DateActionPlannedEnd= Fecha de fin prevista diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang index e5f939a753f..7e4a1e1376d 100644 --- a/htdocs/langs/es_ES/bills.lang +++ b/htdocs/langs/es_ES/bills.lang @@ -137,8 +137,6 @@ BillFrom=Emisor BillTo=Enviar a ActionsOnBill=Eventos sobre la factura NewBill=Nueva factura -Prélèvements=Domiciliaciones -Prélèvements=Domiciliaciones LastBills=Las %s últimas facturas LastCustomersBills=Las %s últimas facturas a clientes LastSuppliersBills=Las %s últimas facturas de proveedores @@ -219,8 +217,7 @@ NoInvoice=Ninguna factura ClassifyBill=Clasificar la factura SupplierBillsToPay=Facturas de proveedores a pagar CustomerBillsUnpaid=Facturas a clientes pendientes de cobro -DispenseMontantLettres=Las facturas redactadas por procesos mecánicos están exentas del orden en letras -DispenseMontantLettres=Las facturas redactadas por procesos mecánicos están exentas del orden en letras +DispenseMontantLettres=Las facturas escritas a través de procedimientos mecanograficos son dispensadas por la orden en letras NonPercuRecuperable=No percibido recuperable SetConditions=Definir condiciones de pago SetMode=Definir modo de pago diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang index 289c20e07dc..e4d86be11bd 100644 --- a/htdocs/langs/es_ES/categories.lang +++ b/htdocs/langs/es_ES/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Proveedores CatCusLinks=Clientes/Clientes potenciales CatProdLinks=Productos CatMemberLinks=Miembros -CatProdLinks=Productos -CatCusLinks=Clientes/Clientes potenciales -CatSupLinks=Proveedores DeleteFromCat=Eliminar de la categoría DeletePicture=Eliminar imagen ConfirmDeletePicture=¿Confirma la eliminación de la imagen? @@ -112,3 +109,4 @@ CategoriesSetup=Configuración de categorías CategorieRecursiv=Enlazar con la categoría padre automáticamente CategorieRecursivHelp=Si está activado, el producto se enlazará a la categoría padre si lo añadimos a una subcategoría AddProductServiceIntoCategory=Añadir el siguiente producto/servicio +ShowCategory=Mostrar categoría diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index fb9abbabdd9..f6eaf40f12b 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Código contable incorrecto para %s SuppliersProductsSellSalesTurnover=Volumen de ventas generado por la venta de los productos de los proveedores CheckReceipt=Lista de remesas CheckReceiptShort=Remesas +LastCheckReceiptShort=%s Últimas remesas NewCheckReceipt=Nueva remesa NewCheckDeposit=Nuevo ingreso NewCheckDepositOn=Crear nueva remesa en la cuenta: %s @@ -196,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 9ccf62cfcb4..76dd3e925de 100644 --- a/htdocs/langs/es_ES/contracts.lang +++ b/htdocs/langs/es_ES/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Área contratos ListOfContracts=Listado de contratos -LastContracts=Los % últimos contratos +LastModifiedContracts=%s Últimos contratos modificados AllContracts=Todos los contratos ContractCard=Ficha contrato ContractStatus=Estado del contrato @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listado de líneas de contratos en servicio ListOfRunningServices=Listado de servicios activos NotActivatedServices=Servicios no activados (con los contratos validados) BoardNotActivatedServices=Servicios a activar con los contratos validados -LastContracts=Los % últimos contratos +LastContracts=%s Últimos contratos LastActivatedServices=Los %s últimos servicios activados LastModifiedServices=Los %s últimos servicios modificados EditServiceLine=Edición línea del servicio @@ -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=Solo serán clonadas las líneas del tipo "Servicio" ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Comercial firmante del contrato diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang index 2b83df7d11b..883b32aefa9 100644 --- a/htdocs/langs/es_ES/cron.lang +++ b/htdocs/langs/es_ES/cron.lang @@ -18,9 +18,8 @@ CronExplainHowToRunUnix=En entorno Unix debes usar crontab para ejecutar el coma CronExplainHowToRunWin=En un entorno de Microsoft(tm) Windows puedes usar el programador de tareas para ejecutar el comando cada varios minutos # Menu CronJobs=Tareas programadas -CronListActive= Tareas Activas -CronListInactive= Tareas Inactivas -CronListActive= Tareas Activas +CronListActive=Listado de tareas activas/programadas +CronListInactive=Tareas Inactivas # Page list CronDateLastRun=Últ. ejec. CronLastOutput=Res. ult. ejec. diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang index 064e6587789..dda4508af8a 100644 --- a/htdocs/langs/es_ES/donations.lang +++ b/htdocs/langs/es_ES/donations.lang @@ -31,3 +31,8 @@ DonationRecipient=Beneficiario ThankYou=Muchas gracias IConfirmDonationReception=El beneficiario confirma la recepción, como donación, de la siguiente cantidad MinimumAmount=El importe mínimo es %s +FreeTextOnDonations=Texto libre a mostrar a pié de página +FrenchOptions=Opciones para Francia +DONATION_ART200=Mostrar artículo 200 del CGI si se está interesado +DONATION_ART238=Mostrar artículo 238 del CGI si se está interesado +DONATION_ART885=Mostrar artículo 885 del CGI si se está interesado diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang index 7ac24f97c46..71715c703db 100644 --- a/htdocs/langs/es_ES/errors.lang +++ b/htdocs/langs/es_ES/errors.lang @@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no es ErrorThereIsSomeDeliveries=Error, hay entregas vinculadas a este envío. No se puede eliminar. ErrorCantDeletePaymentReconciliated=No se puede eliminar un pago que ha generado una transacción bancaria que se encuentra conciliada ErrorCantDeletePaymentSharedWithPayedInvoice=No se puede eliminar un pago de varias factura con alguna factura con estado Pagada +ErrorPriceExpression1=No se puede asignar a la constante '%s' +ErrorPriceExpression2=No se puede redefinir la función incorporada '%s' +ErrorPriceExpression3=Variable '%s' no definida en la definición de la función +ErrorPriceExpression4=Carácter '%s' ilegal +ErrorPriceExpression5=No se esperaba '%s' +ErrorPriceExpression6=Número de argumentos inadecuados (%s dados, %s esperados) +ErrorPriceExpression8=Operador '%s' no esperado +ErrorPriceExpression9=Ha ocurrido un error no esperado +ErrorPriceExpression10=Operador '%s' carece de operando +ErrorPriceExpression11=Se esperaba '%s' +ErrorPriceExpression14=División por cero +ErrorPriceExpression17=Variable '%s' indefinida +ErrorPriceExpression19=Expresión no encontrada +ErrorPriceExpression20=Expresión vacía +ErrorPriceExpression21=Resultado '%s' vacío +ErrorPriceExpression22=Resultado '%s' negativo +ErrorPriceExpressionInternal=Error interno '%s' +ErrorPriceExpressionUnknown=Error desconocido '%s' # Warnings WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos diff --git a/htdocs/langs/es_ES/externalsite.lang b/htdocs/langs/es_ES/externalsite.lang index 65203ecbe52..973ff6db361 100644 --- a/htdocs/langs/es_ES/externalsite.lang +++ b/htdocs/langs/es_ES/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Configuración del enlace al sitio web externo ExternalSiteURL=URL del sitio externo ExternalSiteModuleNotComplete=El módulo Sitio web externo no ha sido configurado correctamente. +ExampleMyMenuEntry=Mi entrada de menú diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 99c55188b5a..c0fc36fcada 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -48,7 +48,6 @@ ConfirmDeleteCP=¿Está seguro de querer eliminar esta petición de días libres ErrorCantDeleteCP=Error, no tiene permisos para eliminar esta petición de días libres. CantCreateCP=No tiene permisos para realizar peticiones de días libres. InvalidValidatorCP=Debe indicar un validador para su petición de días libres. -UpdateButtonCP=Actualizar CantUpdate=No puede actualizar esta petición de días libres. NoDateDebut=Debe indicar una fecha de inicio. NoDateFin=Debe indicar una fecha de fin. diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang index f973ac56e78..d674f45fc5d 100644 --- a/htdocs/langs/es_ES/interventions.lang +++ b/htdocs/langs/es_ES/interventions.lang @@ -31,6 +31,14 @@ RelatedInterventions=Intervenciones adjuntas ShowIntervention=Mostrar intervención SendInterventionRef=Envío de la intervención %s SendInterventionByMail=Enviar intervención por e-mail +InterventionCreatedInDolibarr=Intervención %s creada +InterventionValidatedInDolibarr=Intervención %s validada +InterventionModifiedInDolibarr=Intervención %s modificada +InterventionClassifiedBilledInDolibarr=Intervención %s clasificada como facturada +InterventionClassifiedUnbilledInDolibarr=Intervención %s clasificada como no facturada +InterventionSentByEMail=Intervención %s enviada por E-Mail +InterventionDeletedInDolibarr=Intervención %s eliminada +SearchAnIntervention=Buscar una intervención ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguimiento de la intervención TypeContact_fichinter_internal_INTERVENING=Interventor diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang index 531f4ce42d5..6c154537764 100644 --- a/htdocs/langs/es_ES/mails.lang +++ b/htdocs/langs/es_ES/mails.lang @@ -115,7 +115,7 @@ SentBy=Enviado por MailingNeedCommand=Por razones de seguridad, el envío de un E-Mailing en masa debe realizarse en línea de comandos. Pida a su administrador que lance el comando siguiente para para enviar la correspondencia a a todos los destinatarios: MailingNeedCommand2=Puede enviar en línea añadiendo el parámetro MAILING_LIMIT_SENDBYWEB con un valor numérico que indica el máximo nº de e-mails a enviar por sesión. Para ello vaya a Inicio - Configuración - Varios. ConfirmSendingEmailing=¿Confirma el envío del e-mailing? -LimitSendingEmailing=El envío de un e-mailing desde las pantallas está limitado por razones de seguridad y de timeout a %s destinatarios por sesión de envío. +LimitSendingEmailing=Nota: El envío de e-mailings desde la interfaz web se realiza en tandas por razones de seguridad y timeouts, se enviarán a %s destinatarios por tanda. TargetsReset=Vaciar lista ToClearAllRecipientsClickHere=Para vaciar la lista de los destinatarios de este E-Mailing, haga click en el botón ToAddRecipientsChooseHere=Para añadir destinatarios, escoja los que figuran en las listas a continuación @@ -136,3 +136,6 @@ SomeNotificationsWillBeSent=%s notificaciones van a ser enviadas por e-mail AddNewNotification=Activar un nuevo destinatario de notificaciones ListOfActiveNotifications=Listado de todos los destinatarios de notificaciones ListOfNotificationsDone=Listado de notificaciones enviadas +MailSendSetupIs=La configuración de e-mailings está a '%s'. Este modo no puede ser usado para enviar e-mails masivos. +MailSendSetupIs2=Antes debe, con una cuenta de administrador, en el menú %sInicio - Configuración - E-Mails%s, cambiar el parámetro '%s' para usar el modo '%s'. Con este modo puede configurar un servidor SMTP de su proveedor de servicios de internet. +MailSendSetupIs3=Si tiene preguntas de como configurar su servidor SMTP, puede contactar con %s. diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 862ed1a9495..0f13a2540a2 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -367,6 +367,7 @@ ActionsOnCompany=Eventos respecto a este tercero ActionsOnMember=Eventos respecto a este miembro NActions=%s eventos NActionsLate=%s en retraso +RequestAlreadyDone=Solicitud ya registrada Filter=Filtro RemoveFilter=Eliminar filtro ChartGenerated=Gráficos generados diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang index f1c356ab871..2094ff8761a 100644 --- a/htdocs/langs/es_ES/margins.lang +++ b/htdocs/langs/es_ES/margins.lang @@ -41,3 +41,4 @@ AgentContactType=Tipo de contacto comisionado AgentContactTypeDetails=Indique qué tipo de contacto (enlazado a las facturas) será el utilizado para el informe de márgenes de agentes comerciales rateMustBeNumeric=El margen debe ser un valor numérico markRateShouldBeLesserThan100=El margen tiene que ser menor que 100 +ShowMarginInfos=Mostrar info de márgenes diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang index dd1989dbb48..afff6708e0d 100644 --- a/htdocs/langs/es_ES/members.lang +++ b/htdocs/langs/es_ES/members.lang @@ -203,3 +203,4 @@ MembersByNature=Miembros por naturaleza VATToUseForSubscriptions=Tasa de IVA para las afiliaciones NoVatOnSubscription=Sin IVA para en las afiliaciones MEMBER_PAYONLINE_SENDEMAIL=E-Mail para advertir en caso de recepción de confirmación de un pago validado de una afiliación +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto usado para las suscripciones en línea en facturas: %s diff --git a/htdocs/langs/es_ES/opensurvey.lang b/htdocs/langs/es_ES/opensurvey.lang index 799274ccf14..8955af9c9fc 100644 --- a/htdocs/langs/es_ES/opensurvey.lang +++ b/htdocs/langs/es_ES/opensurvey.lang @@ -27,7 +27,7 @@ RemovePoll=Eliminar encuesta UrlForSurvey=URL para indicar el acceso directo a la encuesta PollOnChoice=Está creando una encuesta con multi-opciones. Primero introduzca todas las opciones posibles para esta encuesta: CreateSurveyDate=Crear una encuesta de fecha -CreateSurveyStandard=Crear una encuesta estandard +CreateSurveyStandard=Crear una encuesta estándar CheckBox=Checkbox simple YesNoList=Lista (vacío/sí/no) PourContreList=Lista (vacío/a favor/en contra) diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang index e725bd3af1d..67002f7d105 100644 --- a/htdocs/langs/es_ES/orders.lang +++ b/htdocs/langs/es_ES/orders.lang @@ -154,7 +154,6 @@ OrderByPhone=Teléfono CreateInvoiceForThisCustomer=Facturar pedidos NoOrdersToInvoice=Sin pedidos facturables CloseProcessedOrdersAutomatically=Clasificar automáticamente como "Procesados" los pedidos seleccionados. -MenuOrdersToBill2=Pedidos facturables OrderCreation=Creación pedido Ordered=Pedido OrderCreated=Sus pedidos han sido creados diff --git a/htdocs/langs/es_ES/oscommerce.lang b/htdocs/langs/es_ES/oscommerce.lang deleted file mode 100644 index 5c2065a0cac..00000000000 --- a/htdocs/langs/es_ES/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Configuración del módulo OS Commerce -OSCommerceSetupSaved=Configuración OS Commerce guardada -OSCommerceServer=Nombre/IP servidor de la base de datos OS commerce -OSCommerceDatabaseName=Nombre de la base de datos OS Commerce -OSCommercePrefix=Prefijo tablas OS Commerce -OSCommerceUser=Usuario de la base de datos OS Commerce diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang index 9de70d01f95..fe430c2878c 100644 --- a/htdocs/langs/es_ES/other.lang +++ b/htdocs/langs/es_ES/other.lang @@ -203,25 +203,26 @@ ForgetIfNothing=Si usted no ha solicitado este cambio, simplemente ignore este e ##### Calendar common ##### AddCalendarEntry=Añadir entrada en el calendario -NewCompanyToDolibarr=Empresa %s insertada en Dolibarr -ContractValidatedInDolibarr=Contrato %s validado en Dolibarr -ContractCanceledInDolibarr=Contrato %s anulado en Dolibarr -ContractClosedInDolibarr=Contrato %s cerrado en Dolibarr -PropalClosedSignedInDolibarr=Presupuesto %s firmado en Dolibarr -PropalClosedRefusedInDolibarr=Presupuesto %s rechazado en Dolibarr -PropalValidatedInDolibarr=Presupuesto %s validado en Dolibarr -InvoiceValidatedInDolibarr=Factura %s validada en Dolibarr -InvoicePaidInDolibarr=Factura %s pasada a pagada en Dolibarr -InvoiceCanceledInDolibarr=Factura %s anulada en Dolibarr -PaymentDoneInDolibarr=Pago %s realizado en Dolibarr -CustomerPaymentDoneInDolibarr=Pago de cliente %s en Dolibarr -SupplierPaymentDoneInDolibarr=Pago a proveedor %s en Dolibarr -MemberValidatedInDolibarr=Miembro %s validado en Dolibarr -MemberResiliatedInDolibarr=Miembro %s dado de baja en Dolibarr -MemberDeletedInDolibarr=Miembro %s eliminado de Dolibarr -MemberSubscriptionAddedInDolibarr=Subscripción del miembro % añadida en Dolibarr -ShipmentValidatedInDolibarr=Expedición %s validada en Dolibarr -ShipmentDeletedInDolibarr=Expedición %s eliminada de Dolibarr +NewCompanyToDolibarr=Empresa %s añadida +ContractValidatedInDolibarr=Contrato %s validado +ContractCanceledInDolibarr=Contrato %s cancelado +ContractClosedInDolibarr=Contrato %s cerrado +PropalClosedSignedInDolibarr=Presupuesto %s firmado +PropalClosedRefusedInDolibarr=Presupuesto %s rechazado +PropalValidatedInDolibarr=Presupuesto %s validado +PropalClassifiedBilledInDolibarr=Presupuesto %s clasificado facturado +InvoiceValidatedInDolibarr=Factura %s validada +InvoicePaidInDolibarr=Factura %s pasada a pagada +InvoiceCanceledInDolibarr=Factura %s cancelada +PaymentDoneInDolibarr=Pago %s realizado +CustomerPaymentDoneInDolibarr=Pago de cliente %s realizado +SupplierPaymentDoneInDolibarr=Pago a proveedor %s realizado +MemberValidatedInDolibarr=Miembro %s validado +MemberResiliatedInDolibarr=Miembro %s dado de baja +MemberDeletedInDolibarr=Miembro %s eliminado +MemberSubscriptionAddedInDolibarr=Subscripción del miembro %s añadida +ShipmentValidatedInDolibarr=Expedición %s validada +ShipmentDeletedInDolibarr=Expedición %s eliminada ##### Export ##### Export=Exportación ExportsArea=Área de exportaciones diff --git a/htdocs/langs/es_ES/paybox.lang b/htdocs/langs/es_ES/paybox.lang index 830ff405ba3..0ebdba0ae8b 100644 --- a/htdocs/langs/es_ES/paybox.lang +++ b/htdocs/langs/es_ES/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Mensaje en la página de retorno de pago cancelado NewPayboxPaymentReceived=Nuevo pago Paybox recibido NewPayboxPaymentFailed=Nuevo intento de pago Paybox sin éxito PAYBOX_PAYONLINE_SENDEMAIL=E-Mail a avisar en caso de pago (con éxito o no) +PAYBOX_PBX_SITE=Valor para PBX SITE +PAYBOX_PBX_RANG=valor para PBX Rang +PAYBOX_PBX_IDENTIFIANT=Valor para PBX ID diff --git a/htdocs/langs/es_ES/printipp.lang b/htdocs/langs/es_ES/printipp.lang index 241272d262e..e97bd15c596 100644 --- a/htdocs/langs/es_ES/printipp.lang +++ b/htdocs/langs/es_ES/printipp.lang @@ -1,9 +1,14 @@ # Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Configuración del módulo Impresión directa IPP -PrintIPPDesc=Este módulo permite añadir un botón de impresión directa de sus documentos hacia su impresora. Se requiere un sistema Linux equipado con Cups. -PRINTIPP_ENABLED=Muestra el logo "Impresión directa" en los listados de documentos +PrintIPPSetup=Configuración del módulo Impresión Directa +PrintIPPDesc=Este módulo añade un botón para enviar documentos directamente a una impresora. Es necesario un SO Linux con CUPS instalado. +PRINTIPP_ENABLED=Mostrar icono "Impresión directa" en los listados de documentos PRINTIPP_HOST=Servidor de impresión PRINTIPP_PORT=Puerto -PRINTIPP_USER=Login +PRINTIPP_USER=Usuario PRINTIPP_PASSWORD=Contraseña -NoPrinterFound=No se ha encontrado ninguna impresora (compruebe su configuración Cups) \ No newline at end of file +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 new file mode 100644 index 00000000000..ceb6bd361e3 --- /dev/null +++ b/htdocs/langs/es_ES/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Gestionar lotes/series +ProductStatusOnBatch=Gestionado +ProductStatusNotOnBatch=No gestionado +ProductStatusOnBatchShort=Gestionado +ProductStatusNotOnBatchShort=No gestionado +Batch=Lote/Serie +atleast1batchfield=Fecha de caducidad o Fecha de venta o Lote +batch_number=Número Lote/Serie +l_eatby=Fecha de caducidad +l_sellby=Fecha límite de venta +DetailBatchNumber=Detalles del lote/serie +DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d) +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/products.lang b/htdocs/langs/es_ES/products.lang index 1a4726afcc2..693cdfdd193 100644 --- a/htdocs/langs/es_ES/products.lang +++ b/htdocs/langs/es_ES/products.lang @@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clien PriceByCustomerLog=Log de precios por clientes MinimumPriceLimit=El precio mínimo no puede ser menor de %s MinimumRecommendedPrice=El precio mínimo recomendado es: %s +PriceExpressionEditor=Editor de expresión de precios +PriceExpressionSelected=Expresión de precios seleccionada +PriceExpressionEditorHelp="price = 2 + 2" o "2 + 2" para indicar el precio
    ExtraFields son variables como "#options_myextrafieldkey# * 2"
    Existen variables especiales como #quantity# y #tva_tx#
    Use ; para separar expresiones +PriceMode=Modo precio +PriceNumeric=Número diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index da5a65ceb96..3a6ed7f8784 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). @@ -36,6 +37,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 new file mode 100644 index 00000000000..21c3311d29a --- /dev/null +++ b/htdocs/langs/es_ES/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Recursos +MenuResourceAdd=Nuevo recurso +MenuResourcePlanning=Planificación de recursos +DeleteResource=Eliminar recurso +ConfirmDeleteResourceElement=¿Está seguro de querer eliminar el recurso de este elemento? +NoResourceInDatabase=Sin recursos en la base de datos. +NoResourceLinked=Sin recursos enlazados + +ResourcePageIndex=Listado de recursos +ResourceSingular=Recurso +ResourceCard=Ficha recurso +AddResource=Crear un recurso +ResourceFormLabel_ref=Nombre recurso +ResourceType=Tipo de recurso +ResourceFormLabel_description=Descripción recurso + +ResourcesLinkedToElement=Recursos enlazados a elemento + +ShowResourcePlanning=Ver planificación de recursos +GotoDate=Ir a fecha + +ResourceElementPage=Elementos de recursos +ResourceCreatedWithSuccess=Recurso creado correctamente +RessourceLineSuccessfullyDeleted=Línea de recurso eliminada correctamente +RessourceLineSuccessfullyUpdated=Línea de recurso actualizada correctamente +ResourceLinkedWithSuccess=Recurso enlazado correctamente + +TitleResourceCard=Ficha recurso +ConfirmDeleteResource=¿Está seguro de querer eliminar este recurso? +RessourceSuccessfullyDeleted=Recurso eliminado correctamente +DictionaryResourceType=Tipo de recursos + +SelectResource=Seleccionar recurso diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang index 928dcdf2f8c..4335c234d11 100644 --- a/htdocs/langs/es_ES/sendings.lang +++ b/htdocs/langs/es_ES/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=De momento, la creación de una nueva expedició RelatedShippings=Expedición(es) asociada(s) ShipmentLine=Línea de expedición CarrierList=Listado de transportistas +SendingRunning=Ya ha sido enviado el producto del pedido de cliente +SuppliersReceiptRunning=Ya ha sido recibido el producto del pedido a proveedor # Sending methods SendingMethodCATCH=Recogido por el cliente diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang index b9dca4b9cb8..04f2c864f9d 100644 --- a/htdocs/langs/es_ES/stocks.lang +++ b/htdocs/langs/es_ES/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=La etiqueta del almacén es obligatoria CorrectStock=Corregir stock ListOfWarehouses=Listado de almacenes ListOfStockMovements=Listado de movimientos de stock -StocksArea=Área stocks +StocksArea=Área almacenes Location=Lugar LocationSummary=Nombre corto del lugar NumberOfDifferentProducts=Número de productos diferentes diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang index e27f8b111e5..0440f777da0 100644 --- a/htdocs/langs/es_ES/users.lang +++ b/htdocs/langs/es_ES/users.lang @@ -63,7 +63,6 @@ ShowGroup=Ver grupo ShowUser=Ver usuario NonAffectedUsers=Usuarios no destinados al grupo UserModified=Usuario correctamente modificado -GroupModified=Grupo %s modificado PhotoFile=Archivo foto UserWithDolibarrAccess=Usuario con acceso a Dolibarr ListOfUsersInGroup=Listado de usuarios de este grupo diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang index 5c241d76553..de91cb28d0a 100644 --- a/htdocs/langs/es_ES/withdrawals.lang +++ b/htdocs/langs/es_ES/withdrawals.lang @@ -16,6 +16,7 @@ WithdrawedBills=Facturas domiciliadas WithdrawalsLines=Lineas de domiciliación RequestStandingOrderToTreat=Peticiones de domiciliaciones a procesar RequestStandingOrderTreated=Peticiones de domiciliaciones procesadas +NotPossibleForThisStatusOfWithdrawReceiptORLine=Todavía no es posible. El estado de la domiciliación debe ser 'abonada' antes de poder realizar devoluciones a sus líneas CustomersStandingOrders=Domiciliaciones de clientes CustomerStandingOrder=Domiciliación cliente NbOfInvoiceToWithdraw=Nº de facturas pendientes de domiciliación @@ -40,14 +41,13 @@ TransMetod=Método envío Send=Enviar Lines=Líneas StandingOrderReject=Emitir una devolución -InvoiceRefused=Factura devuelta WithdrawalRefused=Devolución de domiciliación WithdrawalRefusedConfirm=¿Está seguro de querer crear una devolución de domiciliación para la empresa RefusedData=Fecha de devolución RefusedReason=Motivo de devolución RefusedInvoicing=Facturación de la devolución NoInvoiceRefused=No facturar la devolución -InvoiceRefused=Factura devuelta +InvoiceRefused=Factura rechazada (Cargar los gastos al cliente) Status=Estado StatusUnknown=Desconocido StatusWaiting=En espera @@ -76,13 +76,14 @@ WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT BankToReceiveWithdraw=Cuenta bancaria receptora de las domiciliaciones CreditDate=Abonada el -WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para su país. +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=Esta pestaña le permite realizar una petición de domiciliación. Una vez realizada, vaya al menú de Bancos->Domiciliaciones para gestionar las domiciliaciones. Cuando una domiciliación se marca como abonada, el pago en la factura se grabará automáticamente, y la factura será cerrada si resto a pagar es cero. 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=Estadísticas por estados de líneas ### Notifications InfoCreditSubject=Abono de domiciliación %s por el banco diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/et_EE/accountancy.lang +++ b/htdocs/langs/et_EE/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 830ae1158c0..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 @@ -437,14 +440,14 @@ Module52Name=Ladu Module52Desc=Ladude haldamine (tooted) Module53Name=Teenused Module53Desc=Teenuste haldamine -Module54Name=Lepingud -Module54Desc=Lepingute ja teenuste haldamine +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Vöötkoodid 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=Projektid -Module400Desc=Projektide haldamine teiste moodulite sees +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) @@ -484,7 +487,7 @@ Module500Desc=Erikulude: nt maksude, sotsiaalmaksude, dividendide ja palkade hal Module510Name=Palgad Module510Desc=Töötajate palkade ja palkade maksmise haldamine Module600Name=Teated -Module600Desc=Saada mõnede Dolibarri äritegevusega seotud sündmuste puhul teade kolmandate isikute kontaktidele +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Annetused Module700Desc=Annetuste haldamine Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-ettevõte Module5000Desc=Võimaldab hallata mitut ettevõtet Module6000Name=Töövoog Module6000Desc=Töövoo haldamine -Module20000Name=Puhkused -Module20000Desc=Kinnita ja järgi töötajate puhkusi +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 Module50100Desc=Kassamoodul -Module50200Name= Paypal -Module50200Desc= Moodul, mis pakub online-makse võimalust krediitkaardiga Paypali abil +Module50200Name=Paypal +Module50200Desc=Moodul, mis pakub online-makse võimalust krediitkaardiga Paypali abil 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 @@ -606,15 +613,16 @@ Permission151=Püsikorralduste vaatamine Permission152=Püsikorralduste nõuete loomine/muutmine Permission153=Püsikorralduste kviitungite saatmine Permission154=Püsikorralduste kviitungite krediteerimine/keeldumine -Permission161=Lepingute vaatamine -Permission162=Lepingute loomine/muutmine -Permission163=Lepingu teenuse aktiveerimine -Permission164=Lepingu teenuse keelamine -Permission165=Lepingu kustutamine -Permission171=Lähetuste vaatamine -Permission172=Lähetuste loomine/muutmine -Permission173=Lähetuste kustutamine -Permission178=Lähetuste eksport +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Hankijate vaatamine Permission181=Ostutellimuste vaatamine Permission182=Ostutellimuste loomine/muutmine @@ -671,7 +679,7 @@ Permission300=Vöötkoodide vaatamine Permission301=Vöötkoodide loomine/muutmine Permission302=Vöötkoodide kustutamine Permission311=Teenuste vaatamine -Permission312=Teenuste lisamine lepingutele +Permission312=Assign service/subscription to contract Permission331=Järjehoidjate vaatamine Permission332=Järjehoidjate loomine/muutmine Permission333=Järjehoidjate kustutamine @@ -701,8 +709,8 @@ Permission701=Annetuste vaatamine Permission702=Annetuste loomine/muutmine Permission703=Annetuste kustutamine Permission1001=Laojääkide vaatamine -Permission1002=Laojääkide loomine/muutmine -Permission1003=Laojääkide kustutamine +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Lao liikumiste vaatamine Permission1005=Lao liikumiste loomine/muutmine Permission1101=Tarnekorralduste vaatamine @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Suviti 'jah' OnlyFollowingModulesAreOpenedToExternalUsers=Märkus: välised kasutajad saavad kasutada vaid neid mooduleid (hoolimata nende kasutaja õigustest): SuhosinSessionEncrypt=Sessiooni andmehoidla krüpteeritud Suhosini poolt ConditionIsCurrently=Olek on hetkel %s -TestNotPossibleWithCurrentBrowsers=Automaatne tuvastamine ei ole võimalik YouUseBestDriver=Kasutad draiverit %s, mis on hetkel saadaolevatest parim. YouDoNotUseBestDriver=Kasutad draiverit %s, kuid soovitatav on kasutada draiverit %s. NbOfProductIsLowerThanNoPb=Andmebaasis on vaid %s toodet/teenust. See ei nõua mingit erilist optimeerimist. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Tagasta raamatupidamise kood kujul:
    %s millele jär ModuleCompanyCodePanicum=Tagasta tühi raamatupidamise kood. ModuleCompanyCodeDigitaria=Raamatupidamine kood sõltub kolmanda isiku koodist. Kood algab tähega "C", millele järgnevad kolmanda isiku koodi esimesed 5 tähte. UseNotifications=Kasuta teateid -NotificationsDesc=E-kirjade abil saadetavad teated võimaldavad mõningate Dolibarri sündmuste puhul automaatselt teatud kolmandatele isikutele (klientidele või hankijatele) e-kirju saata. Teadete saatmise aktiveerimine ja kontaktid, kellele kiri saadetakse lisatakse ühe isiku kaupa. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Dokumendimallid DocumentModelOdt=Loo dokumendid OpenDocument mallidest (.ODT või .ODS failid OpenOffices, KOffices, TextEditis jne) WatermarkOnDraft=Mustandi vesimärk @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Lisa kohale jõudmise kuupäeva võimekus UseOptionLineIfNoQuantity=Toote/teenuse rida, mille koguseks on märgitud 0, peetakse lisavõimaluseks FreeLegalTextOnProposal=Vaba tekst pakkumistel WatermarkOnDraftProposal=Vesimärk pakkumiste mustanditel (puudub, kui tühi) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Tellimuste haldamise seadistamine OrdersNumberingModules=Tellimuste numeratsiooni mudelid @@ -1146,6 +1156,7 @@ HideTreadedOrders=Peida nimekirjas täidetud või tühistatud tellimused ValidOrderAfterPropalClosed=Tellimuse kinnitamine pärast pakkumise sulgemist võimaldab vältida tellimuse sammu vahele jätmist FreeLegalTextOnOrders=Vaba tekst tellimustel WatermarkOnDraftOrders=Vesimärk tellimuste mustanditel (puudub, kui tühi) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial mooduli seadistamine ClickToDialUrlDesc=Url, mida kasutatakse telefoni pildi klõpsamisel. URLi sees saab kasutada järgmisi silte:
    __PHONETO__ asendatakse helistatava inimese telefoninumbriga
    __PHONEFROM__ asendatakse helistaja (Sinu) telefoninumbriga
    __LOGIN__ asendatakse clicktodial kasutajanimega (määratletud Sinu kasutajakaardil)
    __PASS__ asendatakse clicktodial parooliga (määratletud Sinu kasutajakaardil). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Sekkumiste numeratsiooni mudelid TemplatePDFInterventions=Sekkumiste kaartide dokumentide mudelid WatermarkOnDraftInterventionCards=Vesimärk sekkumiste kaartidel (puudub, kui tühi) ##### Contracts ##### -ContractsSetup=Lepingute mooduli seadistamine +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Lepingute numeratsiooni moodulid TemplatePDFContracts=Lepingute dokumentide mudelid FreeLegalTextOnContracts=Vaba tekst lepingutes @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=%s tüüpi faile ei paki HTTP server kokk CacheByServer=Serveri vahemäl CacheByClient=Brauseri vahemälu CompressionOfResources=HTTP vastuste kokku pakkimine -TestNotPossibleWithCurrentBrowsers=Automaatne tuvastamine ei ole võimalik +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Toodete mooduli seadistamine ServiceSetup=Teenuste mooduli seadistamine @@ -1382,9 +1393,10 @@ MailingSetup=E-posti mooduli sedistamine MailingEMailFrom=Saatja aadress (Kellelt/From) e-posti mooduli poolt saadetud kirjadel MailingEMailError=Tagastusaadress (Errors-to) vigadega e-kirjade jaoks ##### Notification ##### -NotificationSetup=E-posti abil teadete saatmise mooduli seadistamine +NotificationSetup=EMail notification module setup NotificationEMailFrom=Saatja e-post (Kellelt/From) teadete saatmisel e-kirjaga -ListOfAvailableNotifications=Teadete nimekiri (see nimekiri sõltub aktiveeritud moodulitest) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Saatmiste mooduli seadistamine SendingsReceiptModel=Saatekviitungi mudel @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Ühendumine serveri '%s' andmebaasiga '%s' kasutajga '%s' õnne OSCommerceTestKo1=Ühendumine serveriga '%s' õnnestus, kuid andmebaasi '%s' ei õnnestunud kätte saada. OSCommerceTestKo2=Ühendumine serveriga '%s' kasutajaga '%s' ebaõnnestus. ##### Stock ##### -StockSetup=Laojääkide mooduli seadistamine -UserWarehouse=Kasuta kasutaja isiklikke varusid +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menüü kustutatud TreeMenu=Menüüpuud @@ -1478,11 +1491,14 @@ ClickToDialDesc=See moodul võimaldab lisada ikooni pärast telefoninumbreid. Kl ##### Point Of Sales (CashDesk) ##### CashDesk=Müügikoht CashDeskSetup=Müügikoha mooduli seadistamine -CashDeskThirdPartyForSell=Üldine kolmas isik müümiseks +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Sularahamaksete vastu võtmiseks kasutatav konto CashDeskBankAccountForCheque= Tšekimaksete vastu võtmiseks kasutatav konto CashDeskBankAccountForCB= Krediitkaardimaksete vastu võtmiseks kasutatav konto -CashDeskIdWareHouse=Müümiseks kasutatav ladu +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. ##### Bookmark ##### BookmarkSetup=Järjehoidjate mooduli seadistamine BookmarkDesc=See moodul võimaldab Sul hallata järjehoidjaid. Samuti võib vasakusse menüüsse lisada lühiteid suvalistele Dolibarri lehtedele või välistele lehtedele. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Kustuta majandusaasta ConfirmDeleteFiscalYear=Kas oled kindel, et soovid selle majandusaasta kustutada? Opened=Avatud Closed=Suletud - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Formaat TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang index 1c20d11fe65..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 @@ -41,9 +42,10 @@ AutoActions= Automaatne täitmine AgendaAutoActionDesc= Määratle siin need tegevused, mille kohta loob Dolibarr automaatselt päevakavasse tegevuse. Kui midagi pole märgistatud (vaikimisi), siis lisatakse päevakavasse ainult käsitsi lisatud tegevused. AgendaSetupOtherDesc= Selle lehe abil saab seadistada tegevuste eksportimise Dolibarrist mõnda välisesse kalendrisse (Thunderbird, Google Calendar jne) AgendaExtSitesDesc=See leht võimaldab määratleda väliseid kalendreid, mis saavad oma tegevusi lisada Dolibarri päevakavasse. -ActionsEvents= Tegevused, mille kohta lisab Dolibarr automaatselt päevakavasse sündmuse. -PropalValidatedInDolibarr= Pakkumine %s on kinnitatud -InvoiceValidatedInDolibarr= Arve %s on kinnitatud +ActionsEvents=Tegevused, mille kohta lisab Dolibarr automaatselt päevakavasse sündmuse. +PropalValidatedInDolibarr=Pakkumine %s on kinnitatud +InvoiceValidatedInDolibarr=Arve %s on kinnitatud +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Arve %s on tagasi mustandi staatuses InvoiceDeleteDolibarr=Arve %s on kustutatud OrderValidatedInDolibarr= Tellimus %s on kinnitatud @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Tellimus %s on heaks kiidetud OrderRefusedInDolibarr=Tellimus %s on tagasi lükatud OrderBackToDraftInDolibarr=Tellimus %s on muudetud mustandiks OrderCanceledInDolibarr=Tellimus %s on tühistatud -InterventionValidatedInDolibarr=Sekkumine %s on kinnitatud ProposalSentByEMail=Pakkumine %s on saadetud e-postiga OrderSentByEMail=Tellimus %s on saadetud e-postiga InvoiceSentByEMail=Arve %s on saadetud e-postiga @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Ostutellimus %s on saadetud e-postiga SupplierInvoiceSentByEMail=Ostuarve %s on saadetud e-postiga ShippingSentByEMail=Saadetis %s on saadetud e-postiga ShippingValidated= Kohaletoomine %s on kinnitatud -InterventionSentByEMail=Sekkumine %s on saadetud e-postiga -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Kolmas isik loodud DateActionPlannedStart= Plaanitav alguskuupäev DateActionPlannedEnd= Plaanitav lõppkuupäev @@ -70,9 +69,9 @@ DateActionStart= Alguskuupäev DateActionEnd= Lõppkuupäev AgendaUrlOptions1=Otsingutulemuste piiramiseks võib kasutada ka järgmisi parameetreid: AgendaUrlOptions2=login=%s tagastab vastusena kasutaja poolt algatatud, talle määratud ja lõpetatud sündmused%s. -AgendaUrlOptions3=logina=%s tagastab vastusena ainult kasutaja poolt algatatud sündmused%s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s tagastab vastusena ainult kasutajale määratud tegevused %s. -AgendaUrlOptions5=logind=%s tagastab vastusena ainult kasutaja poolt lõpetatud tegevused %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Näita kontaktide sünnipäevi AgendaHideBirthdayEvents=Peida kontaktide sünnipäevad Busy=Hõivatud @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL .ical failile ligi pääsemiseks ExtSiteNoLabel=Kirjeldus puudub WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang index eb9804dffc7..621b928f35b 100644 --- a/htdocs/langs/et_EE/bills.lang +++ b/htdocs/langs/et_EE/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Kreeditarve InvoiceAvoirAsk=Kreeditarve parandab arve InvoiceAvoirDesc=Kreeditarve on negatiivne arve, mida kasutatakse sellise probleemi lahendamiseks, kus arve summa ja reaalselt tasutud summa erinevad (kuna klient maksis ekslikult liiga palju või ei maksnud kõike ära, kuna ta tagastas mõned tooted). invoiceAvoirWithLines=Loo kreeditarve algse arve ridade põhjal -invoiceAvoirWithPaymentRestAmount=Loo kreeditarve algse arve summa põhjal -invoiceAvoirLineWithPaymentRestAmount=Kreeditarve summa algse arve summa põhjal +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Asendusarve arve %s ReplacementInvoice=Asendusarve ReplacedByInvoice=Asendatud arvega %s @@ -87,7 +87,7 @@ ClassifyCanceled=Liigita 'Hüljatud' ClassifyClosed=Liigita 'Suletud' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Loo arve -AddBill=Lisa arve või kreeditarve +AddBill=Create invoice or credit note AddToDraftInvoices=Lisa arve mustandile DeleteBill=Kustuta arve SearchACustomerInvoice=Otsi müügiarvet @@ -99,7 +99,7 @@ DoPaymentBack=Soorita tagasimakse ConvertToReduc=Teisenda tuleviku allahindluseks EnterPaymentReceivedFromCustomer=Sisesta kliendilt saadud makse EnterPaymentDueToCustomer=Soorita kliendile makse -DisabledBecauseRemainderToPayIsZero=Blokeeritud, sest maksmata summa on 0 +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Summa PriceBase=Baashind BillStatus=Arve staatus @@ -137,8 +137,6 @@ BillFrom=Kellelt BillTo=Kellele ActionsOnBill=Tegevused arvel NewBill=Uus arve -Prélèvements=Püsikorraldus -Prélèvements=Püsikorraldus LastBills=Viimased %s arvet LastCustomersBills=Viimased %s müügiarvet LastSuppliersBills=Viimased %s ostuarvet @@ -156,9 +154,9 @@ ConfirmCancelBill=Kas oled täesti kindel, et soovid tühistada arve %s? ConfirmCancelBillQuestion=Miks Sa tahad selle arve liigitada hüljatuks? ConfirmClassifyPaidPartially=Kas oled täiesti kindel, et soovid arve %s märkida makstuks? ConfirmClassifyPaidPartiallyQuestion=See arve ei ole täielikult tasutud. Mis on selle arve sulgemise põhjus? -ConfirmClassifyPaidPartiallyReasonAvoir=Makstava summa jääk (%s %s) on allahindlus, sest makse on tehtud enne tähtaega. Ma reguleerin käibemaksu kreeditarvega. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Makstava summa jääk (%s %s) on allahindlus, sest makse on tehtud enne tähtaega. Nõustun sellelt allahindluselt käibemaksu kaotusega. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Makstava summa jääk (%s %s) on allahindlus, sest makse on tehtud enne tähtaega. Ma saan sellelt allahindluselt käibemaksu tagasi kreeditarveta. +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=Halb klient ConfirmClassifyPaidPartiallyReasonProductReturned=Tooted osaliselt tagastatud ConfirmClassifyPaidPartiallyReasonOther=Summa hüljatud muul põhjusel @@ -191,9 +189,9 @@ AlreadyPaid=Juba makstud AlreadyPaidBack=Juba tagasi makstud AlreadyPaidNoCreditNotesNoDeposits=Juba makstud (kreeditarvete ja deposiitideta) Abandoned=Hüljatud -RemainderToPay=Makstava summa jääk -RemainderToTake=Võetava summa jääk -RemainderToPayBack=Tagasimakstava summa jääk +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Ootel AmountExpected=Väidetav väärtus ExcessReceived=Liigne saadud @@ -219,19 +217,18 @@ NoInvoice=Ühtki arvet ei ole ClassifyBill=Liigita arve SupplierBillsToPay=Maksmata ostuarveid CustomerBillsUnpaid=Maksmata müügiarveid -DispenseMontantLettres=Tabuleerimise teel koostatud arvetele ei rakendata tähtede järjekorda -DispenseMontantLettres=Tabuleerimise teel koostatud arvetele ei rakendata tähtede järjekorda +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Tagastamatu SetConditions=Määra maksetingimusi SetMode=Määra makseviis Billed=Arve esitatud -RepeatableInvoice=Ettemääratud arve -RepeatableInvoices=Ettemääratud arved -Repeatable=Ettemääratud -Repeatables=Ettemääratud -ChangeIntoRepeatableInvoice=Teisenda ettemääratuks -CreateRepeatableInvoice=Loo ettemääratud arve -CreateFromRepeatableInvoice=Loo ettemääratud arvest +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Müügiarved ja arvete read CustomersInvoicesAndPayments=Müügiarved ja maksed ExportDataset_invoice_1=Müügiarvete nimekiri ja arvete read diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang index 3524f0ed0ed..58d9ff2eabe 100644 --- a/htdocs/langs/et_EE/boxes.lang +++ b/htdocs/langs/et_EE/boxes.lang @@ -12,13 +12,14 @@ BoxLastProspects=Viimati muudetud huvilised BoxLastCustomers=Viimati muudetud kliendid BoxLastSuppliers=Viimati muudetud hankijad BoxLastCustomerOrders=Viimased tellimused +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Viimased raamatud BoxLastActions=Viimased sündmused BoxLastContracts=Viimased lepingud BoxLastContacts=Viimased kontaktid/aadressid BoxLastMembers=Viimased liikmed BoxFicheInter=Viimased sekkumised -# BoxCurrentAccounts=Opened accounts balance +BoxCurrentAccounts=Avatud kontode saldo BoxSalesTurnover=Müügikäive BoxTotalUnpaidCustomerBills=Kokku tasumata müügiarveid BoxTotalUnpaidSuppliersBills=Kokku maksmata ostuarveid @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Kliente BoxTitleLastRssInfos=Viimased %s uudised allikast %s BoxTitleLastProducts=Viimased %s muudetud toodet/teenust BoxTitleProductsAlertStock=Laojäägi häirega tooted -BoxTitleLastCustomerOrders=Viimased %s muudetud müügitellimust +BoxTitleLastCustomerOrders=Viimased %s kliendi tellimust +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Viimased %s registreeritud hankijat BoxTitleLastCustomers=Viimased %s registreeritud klienti BoxTitleLastModifiedSuppliers=Viimased %s muudetud hankijat BoxTitleLastModifiedCustomers=Viimased %s muudetud klienti -BoxTitleLastCustomersOrProspects=Viimased %s muudetud klienti või huvilist -BoxTitleLastPropals=Viimased %s salvestatud pakkumist +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Viimased %s pakkumist +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Viimased %s müügiarvet +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Viimased %s ostuarvet -BoxTitleLastProspects=Viimased %s salvestatud huvilist +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Viimased %s muudetud huvilist BoxTitleLastProductsInContract=Viimased %s lepingulist toodet/teenust -BoxTitleLastModifiedMembers=Viimased %s muudetud liiget +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Viimased %s muudetud sekkumist -BoxTitleOldestUnpaidCustomerBills=Vanimad %s tasumata müügiarvet -BoxTitleOldestUnpaidSupplierBills=Vanimad %s maksmata ostuarvet -# BoxTitleCurrentAccounts=Opened account's balances +BoxTitleOldestUnpaidCustomerBills=Vanemad %s maksmata klientide arved +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices +BoxTitleCurrentAccounts=Avatud kontode saldod BoxTitleSalesTurnover=Müügikäive -BoxTitleTotalUnpaidCustomerBills=Tasumata müügiarved -BoxTitleTotalUnpaidSuppliersBills=Maksmata ostuarved +BoxTitleTotalUnpaidCustomerBills=Maksmata klientide arved +BoxTitleTotalUnpaidSuppliersBills=Maksmata tarnijate arved BoxTitleLastModifiedContacts=Viimased %s muudetud kontakti/aadressi BoxMyLastBookmarks=Minu viimased %s järjehoidjat BoxOldestExpiredServices=Vanimad aktiivsed aegunud teenused @@ -76,7 +80,8 @@ NoContractedProducts=Lepingulisi tooteid/teenuseid ei ole NoRecordedContracts=Lepinguid pole salvestatud NoRecordedInterventions=Sekkumisi pole salvestatud BoxLatestSupplierOrders=Viimased ostutellimused -BoxTitleLatestSupplierOrders=Viimased %s ostutellimust +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=Ostutellimusi pole salvestatud BoxCustomersInvoicesPerMonth=Müügiarveid kuus BoxSuppliersInvoicesPerMonth=Ostuarveid kuus diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang index 27a785e02d2..328c06c3a03 100644 --- a/htdocs/langs/et_EE/categories.lang +++ b/htdocs/langs/et_EE/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Hankijate ja kategooriate vahelised seosed CatCusLinks=Klientide/huviliste ja kategooriate vahelised sosed CatProdLinks=Toodete/teenuste ja kategooriate vahelised seosed CatMemberLinks=Liikmete ja kategooriate vahelised seosed -CatProdLinks=Toodete/teenuste ja kategooriate vahelised seosed -CatCusLinks=Klientide/huviliste ja kategooriate vahelised sosed -CatSupLinks=Hankijate ja kategooriate vahelised seosed DeleteFromCat=Eemalda kategooriast DeletePicture=Pildi kustutamine ConfirmDeletePicture=Kinnitada pildi kustutamine? @@ -112,3 +109,4 @@ CategoriesSetup=Kategooriate seadistamine CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang index 9bf7a32486f..4dba49aa2f3 100644 --- a/htdocs/langs/et_EE/compta.lang +++ b/htdocs/langs/et_EE/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Ebaõige kliendi raamatupidamise kood: %s SuppliersProductsSellSalesTurnover=Hankija toodete müümisega tekkinud käive. CheckReceipt=Tšeki deponeerimine CheckReceiptShort=Tšeki deponeerimine +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Uus allahindlus NewCheckDeposit=Uus tšeki deponeerimine NewCheckDepositOn=Loo kviitung kontole deponeerimise eest: %s @@ -187,7 +188,7 @@ AccountancyDashboard=Raamatupidamise kokkuvõte ByProductsAndServices=Toodete ja teenuste kaupa RefExt=Väline viide ToCreateAPredefinedInvoice=Ettemääratud arve loomiseks loo tavaline arve ja vahepeal arvet kinnitamata klõpsa nupul "Teisenda ettemääratud arveks" -LinkedOrder=Link to order +LinkedOrder=Viide tellimusele ReCalculate=Arvuta uuesti Mode1=Meetod 1 Mode2=Meetod 2 @@ -196,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 9b3d08292cf..cdf9a5c2b82 100644 --- a/htdocs/langs/et_EE/contracts.lang +++ b/htdocs/langs/et_EE/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Lepingute ala ListOfContracts=Lepingute nimekiri -LastContracts=Viimased %s muudetud lepingut +LastModifiedContracts=Last %s modified contracts AllContracts=Kõik lepingud ContractCard=Lepingu kaart ContractStatus=Lepingu olek @@ -27,7 +27,7 @@ MenuRunningServices=Aktiivsed teenused MenuExpiredServices=Aegunud teenused MenuClosedServices=Suletud teenused NewContract=Uus leping -AddContract=Lisa leping +AddContract=Create contract SearchAContract=Otsi lepingut DeleteAContract=Kustuta leping CloseAContract=Sulge leping @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Aktiivsete lepinguridade nimekiri ListOfRunningServices=Aktiivsete teenuste nimekiri NotActivatedServices=Mitteaktiivsed teenused (kinnitatud lepingutel) BoardNotActivatedServices=Teenused, mida aktiveerida kinnitatud lepingutel -LastContracts=Viimased %s muudetud lepingut +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/cron.lang b/htdocs/langs/et_EE/cron.lang index 5267ee8765e..72240998cac 100644 --- a/htdocs/langs/et_EE/cron.lang +++ b/htdocs/langs/et_EE/cron.lang @@ -1,22 +1,14 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = Mooduli kohta CronAbout = Cron mooduli kohta CronAboutPage = Croni info kohta - -# # Right -# Permission23101 = Loe plaanitud tegevus Permission23102 = Loo/uuenda plaanitud tegevust Permission23103 = Kustuta plaanitud tegevus Permission23104 = Käivita plaanitud tegevus - -# # Admin -# CronSetup= Plaanitavata programmide haldamise seadistamine URLToLaunchCronJobs=Croni poolt kontrollitavate ja käivitatavate programmide jaoks vajalik URL OrToLaunchASpecificJob=Või mõne kindla programmi kontrollimiseks ja käivitamiseks @@ -24,20 +16,11 @@ KeyForCronAccess=Croni käivitatavate programmide URLile ligipääsu turvavõti FileToLaunchCronJobs=Käsurea käsk cron programmide käivitamiseks CronExplainHowToRunUnix=Unix keskonnas on soovitatav kasutada crontabi käsurealt käivitatavate käskude jooksutamiseks CronExplainHowToRunWin=Microsoft(tm) Windows keskkonnas võib kasutada Toiminguajasti tööriista kindlate intervallide tagant käivitavate tegevuste plaanimiseks. - - -# # Menu -# CronJobs=Plaanitud käivitused -CronListActive= Sisse lülitatud tööde nimekiri -CronListInactive= Välja lülitatud tööde nimekiri -CronListActive= Sisse lülitatud tööde nimekiri - - -# +CronListActive=List of active/scheduled jobs +CronListInactive=Välja lülitatud tööde nimekiri # Page list -# CronDateLastRun=Viimane käivitus CronLastOutput=Viimase käivituse väljund CronLastResult=Viimane vastuse kood @@ -70,10 +53,7 @@ CronLabel=Kirjeldus CronNbRun=Käivituste arv CronEach=Iga JobFinished=Tegevus käivitatud ja lõpetatud - -# #Page card -# CronAdd= Lisa programme CronHourStart= Tegevuse algusaeg ja -kuupäev CronEvery= Ja käivita iga tegevus @@ -95,20 +75,12 @@ CronObjectHelp=Laetava objekti nimi.
    Näiteks Dolibarri Product objekti /ht CronMethodHelp=Kasutatava objekti korral käivitatav meetod.
    Näiteks Dolibarr Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel on meetodi väärtuseks fetch CronArgsHelp=Meetodile antavad argumendid.
    Näiteks Dolibarri Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel võivad parameetrite väärtusteks olla 0, ProductRef. CronCommandHelp=Käivitatav süsteemi käsk. - -# # Info -# CronInfoPage=Informatsioon - - -# # Common -# CronType=Tegevuse tüüp CronType_method=Dolibarri klassi väljakutsutav meetod CronType_command=Käsurea käsk CronMenu=Cro CronCannotLoadClass=Klassi %s või objekti %s laadimine ebaõnnestus - UseMenuModuleToolsToAddCronJobs=Mine menüüsse "Kodu - Moodulite tööriistad - Tegevuste nimekiri" planeeritud tegevuste vaatamiseks ja muutmiseks. diff --git a/htdocs/langs/et_EE/donations.lang b/htdocs/langs/et_EE/donations.lang index c48ea815122..ed140f372d8 100644 --- a/htdocs/langs/et_EE/donations.lang +++ b/htdocs/langs/et_EE/donations.lang @@ -4,7 +4,7 @@ Donations=Annetused DonationRef=Annetuse viide Donor=Annetaja Donors=Annetajad -AddDonation=Lisa annetus +AddDonation=Create a donation NewDonation=Uus annetus ShowDonation=Kuva annetus DonationPromise=Annetuse lubadus @@ -31,3 +31,8 @@ DonationRecipient=Annetuse saaja ThankYou=Täname Teid IConfirmDonationReception=Saaja kinnitab saadava summa vastu võtmist annetusena summas MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/et_EE/externalsite.lang index cdbec0bece4..d4a0b2c3ee1 100644 --- a/htdocs/langs/et_EE/externalsite.lang +++ b/htdocs/langs/et_EE/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Seadista link välisele lehele ExternalSiteURL=Välise lehe URL ExternalSiteModuleNotComplete=ExternalSite moodul ei ole õigesti seadistatud. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang index f553c68d103..c1b981dc57d 100644 --- a/htdocs/langs/et_EE/holiday.lang +++ b/htdocs/langs/et_EE/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Uuenda CantUpdate=You cannot update this leave request. NoDateDebut=Pead valima alguskuupäeva. NoDateFin=Pead valima lõppkuupäeva. -ErrorDureeCP=Puhkusetaotlus ei sisalda ühtki tööpäeva. -TitleValidCP=Kiida puhkusetaotlus heaks +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Kuupäev heaks kiidetud TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Keeldu puhkusetaotlusest +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Keeldumiseks peab valima põhjuse. -TitleCancelCP=Tühista puhkusetaotlus +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Keeldumise põhjus DateRefusCP=Keeldumise kuupäev @@ -78,7 +77,7 @@ ActionByCP=Sooritas UserUpdateCP=Kasutajale PrevSoldeCP=Eelmine saldo NewSoldeCP=Uus saldo -alreadyCPexist=Antud perioodi jaoks on juba puhkusetaotlus esitatud. +alreadyCPexist=A leave request has already been done on this period. UserName=Nimi Employee=Töötaja FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Käsitsi uuendus HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Puhkuste mooduli seadistamine +ConfCP=Configuration of leave request module DescOptionCP=Valiku kirjeldus ValueOptionCP=Väärtus -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Valideeri seadistus -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Edukalt uuendatud. ErrorUpdateConfCP=Uuendamise ajal tekkis viga, palun proovi uuesti. -AddCPforUsers=Palun lisa kasutajate puhkuste saldo siia klõpsates. -DelayForSubmitCP=Puhkusetaotluste esitamise tähtaeg -AlertapprobatortorDelayCP=Peata heakskiit, kui puhkusetaotlus ei vasta tähtajale +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Kinnita UpdateEventCP=Uuenda tegevused diff --git a/htdocs/langs/et_EE/interventions.lang b/htdocs/langs/et_EE/interventions.lang index 1d89a7a0bee..fc1c006e81e 100644 --- a/htdocs/langs/et_EE/interventions.lang +++ b/htdocs/langs/et_EE/interventions.lang @@ -3,7 +3,7 @@ Intervention=Sekkumine Interventions=Sekkumised InterventionCard=Sekkumise kaart NewIntervention=Uus sekkumine -AddIntervention=Lisa sekkumine +AddIntervention=Create intervention ListOfInterventions=Sekkumiste nimekiri EditIntervention=Muuda sekkumist ActionsOnFicheInter=Sekkumise tegevused @@ -30,6 +30,15 @@ StatusInterInvoiced=Arve esitatud RelatedInterventions=Seotud sekkumised ShowIntervention=Näita sekkumist SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Sekkumise järelkontrolliga tegelev müügiesindaja TypeContact_fichinter_internal_INTERVENING=Sekkuv diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang index 40d75731c49..ec69991524d 100644 --- a/htdocs/langs/et_EE/mails.lang +++ b/htdocs/langs/et_EE/mails.lang @@ -115,7 +115,7 @@ SentBy=Saatis MailingNeedCommand=Turvalisuse põhjustel on parem, kui e-postitused saadetakse käsurealt. Võimalusel palu serveri administraatoril käivitada järgmine käsk kõigile saajatele e-postituse saatmiseks: MailingNeedCommand2=Siiski saab neid saata online-režiimis, kui lisate parameetri MAILING_LIMIT_SENDBYWEB maksimaalse kirjade arvuga, mida sessiooni kohta saata. Selleks mine menüüsse Kodu->Seadistamine->Muu. ConfirmSendingEmailing=Kui see ei ole võimalik või eelistad nende saatmist läbi veebibrauseri, siis kinnita, et oled nõus e-postituse saatmisega kohe praegu läbi brauseri? -LimitSendingEmailing=Märkus: on-line e-postituste saatmine on turvalisuse ja aegumise põhjustel piiratud %s saajale sessiooni kohta. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Tühjenda nimekir ToClearAllRecipientsClickHere=Klõpsa siia antud e-postituse saajate nimekirja tühjendamiseks ToAddRecipientsChooseHere=Lisa saajaid, valides nad nimekirjadest @@ -133,6 +133,9 @@ Notifications=Teated NoNotificationsWillBeSent=Selle tegevuse ja ettevõttega ei ole plaanis saata ühtki e-kirja teadet ANotificationsWillBeSent=E-posti teel saadetakse 1 teade SomeNotificationsWillBeSent=E-posti teel saadetakse %s teadet -AddNewNotification=Aktiveeri uus e-kirja teate taotlus -ListOfActiveNotifications=Loetle kõik aktiivsed e-posti teate taotlused +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Loetle kõik saadetud e-posti teated +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang index 5a4cf43522f..d1d99f01b74 100644 --- a/htdocs/langs/et_EE/main.lang +++ b/htdocs/langs/et_EE/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Kasutajat %s ei leitud Dolibarri an ErrorNoVATRateDefinedForSellerCountry=Viga: riigi '%s' jaoks ei ole käibemaksumäärasid määratletud. ErrorNoSocialContributionForSellerCountry=Viga: riigi '%s' jaoks ei ole määratletud sotsiaalmaksu määrasid. ErrorFailedToSaveFile=Viga: faili salvestamine ebaõnnestus. -ErrorOnlyPngJpgSupported=Viga: toetatud on vaid .png ja .jpg formaadis pildifailid. -ErrorImageFormatNotSupported=Sinu PHP ei toeta antud formaadis piltide teisendamiseks tarvilikke funktsioone. SetDate=Sea kuupäev SelectDate=Vali kuupäev SeeAlso=Vaata lisaks %s BackgroundColorByDefault=Vaikimisi taustavärv +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=Fail on valitud manustamiseks, kuid on veel üles laadimata. Klõpsa "Lisa fail" nupul selle lisamiseks. NbOfEntries=Kannete arv GoToWikiHelpPage=Loe online abi (vajab võrguühendust) @@ -266,6 +266,7 @@ Afternoon=Pärastlõuna Quadri=Kvartal MonthOfDay=Kuu päev HourShort=H +MinuteShort=mn Rate=Määr UseLocalTax=Maks sisse arvestatud Bytes=Baiti @@ -340,6 +341,7 @@ FullList=Täielik nimekiri Statistics=Statistika OtherStatistics=Muu statistika Status=Staatus +Favorite=Favorite ShortInfo=Inform Ref=Viide RefSupplier=Hankija viide @@ -356,7 +358,7 @@ ActionNotApplicable=Ei ole kohaldatav ActionRunningNotStarted=Alustada ActionRunningShort=Alustatud ActionDoneShort=Lõpetatud -ActionUncomplete=Uncomplete +ActionUncomplete=Lõpuni viimata CompanyFoundation=Ettevõte/ühendus ContactsForCompany=Selle kolmanda isikuga seotud kontaktid ContactsAddressesForCompany=Selle kolmanda isikuga seotud kontaktid/aadressid @@ -365,6 +367,7 @@ ActionsOnCompany=Selle kolmanda isikuga seotud tegevused ActionsOnMember=Selle liikmega seotud tegevused NActions=%s tegevust NActionsLate=%s hiljaks jäänud +RequestAlreadyDone=Request already recorded Filter=Filtreeri RemoveFilter=Eemalda filter ChartGenerated=Graafik loodud @@ -508,7 +511,7 @@ NbOfCustomers=Klientide arv NbOfLines=Ridade arv NbOfObjects=Objektide arv NbOfReferers=Viitajate arv -Referers=Refering objects +Referers=Viitavad objektid TotalQuantity=Üldkogus DateFromTo=Alates %s kuni %s DateFrom=Alates %s @@ -645,6 +648,7 @@ OptionalFieldsSetup=Lisaatribuutide seadistamine URLPhoto=Foto/logo URL SetLinkToThirdParty=Seosta muu kolmanda isikuga CreateDraft=Loo mustand +SetToDraft=Back to draft ClickToEdit=Klõpsa muutmiseks ObjectDeleted=Objekt %s kustutatud ByCountry=Riigi järgi @@ -672,13 +676,13 @@ HelpCopyToClipboard=Lõikelauale kopeerimiseks kasuta Ctrl+C klahvikombinatsioon SaveUploadedFileWithMask=Salvesta fail serverisse nimega "%s" (muul juhul "%s") OriginFileName=Faili algne nimi SetDemandReason=Määratle allikas -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency +SetBankAccount=Määratle pangakonto +AccountCurrency=Konto valuuta ViewPrivateNote=Vaata märkmeid XMoreLines=%s joon(t) varjatud PublicUrl=Avalik link -AddBox=Add box - +AddBox=Lisa kast +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Esmaspäev Tuesday=Teisipäev diff --git a/htdocs/langs/et_EE/margins.lang b/htdocs/langs/et_EE/margins.lang index 17570d1a9de..1042f5c96cb 100644 --- a/htdocs/langs/et_EE/margins.lang +++ b/htdocs/langs/et_EE/margins.lang @@ -38,4 +38,7 @@ BuyingCost=Tootmishind UnitCharges=Ühiku kulud Charges=Kulud AgentContactType=Müügiagendi kontakti liik -AgentContactTypeDetails=Määratle, millist kontakti tüüpi (arvetel lingitud) kasutatakse müügiagentide marginaalide aruande tarbeks +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/et_EE/orders.lang index 28ba86947e7..55b48bf91f0 100644 --- a/htdocs/langs/et_EE/orders.lang +++ b/htdocs/langs/et_EE/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Saadetis on olemas DraftOrWaitingApproved=Mustand või heaks kiidetud pole veel tellitud DraftOrWaitingShipped=Mustand või kinnitatud pole veel saadetud MenuOrdersToBill=Saadetud tellimused -MenuOrdersToBill2=Arve koostamist vajavad tellimused +MenuOrdersToBill2=Billable orders SearchOrder=Otsi tellimust SearchACustomerOrder=Otsi müügitellimust ShipProduct=Saada toode @@ -65,7 +65,7 @@ ValidateOrder=Kinnita tellimus UnvalidateOrder=Ava tellimus DeleteOrder=Kustuta tellimus CancelOrder=Tühista tellimus -AddOrder=Lisa tellimus +AddOrder=Create order AddToMyOrders=Lisa minu tellimustele AddToOtherOrders=Lisa muudele tellimustele AddToDraftOrders=Lisa tellimuse mustandile @@ -154,7 +154,6 @@ OrderByPhone=Telefon CreateInvoiceForThisCustomer=Koosta tellimuste kohta arved NoOrdersToInvoice=Pole ühtki tellimust, mille kohta arve esitada CloseProcessedOrdersAutomatically=Liigita kõik valitud tellimused "Töödeldud". -MenuOrdersToBill2=Arve koostamist vajavad tellimused OrderCreation=Tellimuse loomine Ordered=Tellitud OrderCreated=Sinu tellimused on loodud diff --git a/htdocs/langs/et_EE/oscommerce.lang b/htdocs/langs/et_EE/oscommerce.lang deleted file mode 100644 index 4804395c119..00000000000 --- a/htdocs/langs/et_EE/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OSCommerce -OSCommerceSetup=OSCommerce mooduli seadistamine -OSCommerceSetupSaved=OSCommercei seadistus salvestatud -OSCommerceServer=OSCommerce serveri host/IP -OSCommerceDatabaseName=OSCommercei andmebaasi nimi -OSCommercePrefix=OSCommercei tabelite prefiks -OSCommerceUser=OSCommercei andmebaasi kasutajanimi diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang index 8f73ab088a0..6a0f355dfa7 100644 --- a/htdocs/langs/et_EE/other.lang +++ b/htdocs/langs/et_EE/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Turvakood Calendar=Kalender -AddTrip=Lisa reis Tools=Tööriistad ToolsDesc=Siia alla on grupeeritud erinevad tööriistad, mis ei ole muudest menüükannetest kättesaadavad.

    Tööriistadele saab ligi küljel asuvast menüüst. Birthday=Sünnipäev @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Manusena lisatud faile/dokumente TotalSizeOfAttachedFiles=Manusena lisatud failide/dokumentide kogusuurus MaxSize=Maksimaalne suurus @@ -80,6 +80,16 @@ ModifiedBy=Muutis %s ValidatedBy=Kinnitas %s CanceledBy=Tühistas %s ClosedBy=Sulges %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Fail %s oli eemaldatud DirWasRemoved=Kaust %s oli eemaldatud FeatureNotYetAvailableShort=Saadaval järgmises versioonis @@ -193,25 +203,26 @@ ForgetIfNothing=Kui Sina ei palunud seda muudatust, siis ignoreeri antud kirja j ##### Calendar common ##### AddCalendarEntry=Lisa kirje kalendrisse %s -NewCompanyToDolibarr=Ettevõte %s lisatud Dolibarri -ContractValidatedInDolibarr=Leping %s Dolibarris kinnitatud -ContractCanceledInDolibarr=Leping %s Dolibarris tühistatud -ContractClosedInDolibarr=Leping %s Dolibarris suletud -PropalClosedSignedInDolibarr=Pakkumine %s Dolibarris allkirjastatud -PropalClosedRefusedInDolibarr=Pakkumine %s Dolibarris tagasi lükatud -PropalValidatedInDolibarr=Pakkumine %s Dolibarris kinnitatud -InvoiceValidatedInDolibarr=Arve %s Dolibarris kinnitatud -InvoicePaidInDolibarr=Arve %s märgitud makstuks Dolibarris -InvoiceCanceledInDolibarr=Arve %s Dolibarris tühistatud -PaymentDoneInDolibarr=Makse %s Dolibarris sooritatud -CustomerPaymentDoneInDolibarr=Kliendi makse %s Dolibarris sooritatud -SupplierPaymentDoneInDolibarr=Hankija makse %s Dolibarris sooritatud -MemberValidatedInDolibarr=Liige %s Dolibarris kinnitatud -MemberResiliatedInDolibarr=Liige %s Dolibarris tühistatud -MemberDeletedInDolibarr=Liige %s Dolibarris kustutatud -MemberSubscriptionAddedInDolibarr=Liikme %s liikmemaks Dolibarris lisatud -ShipmentValidatedInDolibarr=Saatmine %s Dolibarris kinnitatud -ShipmentDeletedInDolibarr=Saatmine %s Dolibarrist kustutatud +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Eksport ExportsArea=Ekspordi ala diff --git a/htdocs/langs/et_EE/paybox.lang b/htdocs/langs/et_EE/paybox.lang index ec7bb38492b..0791b838381 100644 --- a/htdocs/langs/et_EE/paybox.lang +++ b/htdocs/langs/et_EE/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Tühistatud makse lehel olev sõnum NewPayboxPaymentReceived=Uus Payboxi makse vastu võetud NewPayboxPaymentFailed=Uut Payboxi makset prooviti sooritada, kuid see ebaõnnestus PAYBOX_PAYONLINE_SENDEMAIL=E-posti aadress, kuhu saadetakse sõnum pärast makset (õnnestus või mitte) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/et_EE/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang index 0b787d804e3..4d441895359 100644 --- a/htdocs/langs/et_EE/sendings.lang +++ b/htdocs/langs/et_EE/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Praegu luuakse saadetised tellimuse kaardilt. RelatedShippings=Seotud saatmised ShipmentLine=Saadetise rida CarrierList=Vedajate nimekiri +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Kliendi saak diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang index 965a1679d0f..064f62cc803 100644 --- a/htdocs/langs/et_EE/stocks.lang +++ b/htdocs/langs/et_EE/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Lao nimi on nõutud CorrectStock=Paranda laojääk ListOfWarehouses=Ladude nimekiri ListOfStockMovements=Laojääkide nimekiri -StocksArea=Laojääkide ala +StocksArea=Warehouses area Location=Asukoht LocationSummary=Asukoha lühike nimi NumberOfDifferentProducts=Erinevate toodete arv diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang index 9fd06806376..bae0b660b1f 100644 --- a/htdocs/langs/et_EE/users.lang +++ b/htdocs/langs/et_EE/users.lang @@ -63,7 +63,6 @@ ShowGroup=Näita gruppi ShowUser=Näita kasutajat NonAffectedUsers=Sidumata kasutajad UserModified=Kasutaja edukalt muudetud -GroupModified=Grupp edukalt muudetud PhotoFile=Foto fai UserWithDolibarrAccess=Dolibarri juurdepääsuga kasutaja ListOfUsersInGroup=Selles grupis olevate kasutajate nimekiri @@ -103,7 +102,7 @@ UserDisabled=Keelati kasutaja %s UserEnabled=Aktiveeriti kasutaja %s UserDeleted=Kustutati kasutaja %s NewGroupCreated=Loodi grupp %s -GroupModified=Grupp edukalt muudetud +GroupModified=Group %s modified GroupDeleted=Kustutati grupp %s ConfirmCreateContact=Kas oled täiesti kindel, et soovid sellele kontaktile luua Dolibarri konto? ConfirmCreateLogin=Kas oled täesti kindel, et soovid sellele liikmele luua Dolibarri konto? @@ -114,8 +113,10 @@ YourRole=Sinu rollid YourQuotaOfUsersIsReached=Sinu aktiivsete kasutajate kvoot on täis! NbOfUsers=Kasutajaid DontDowngradeSuperAdmin=Ainult superadministraator saab ära võtta superadministraatori õigusi -HierarchicalResponsible=Vahetu vastutav struktuuris +HierarchicalResponsible=Supervisor HierarchicView=Struktuuri vaade UseTypeFieldToChange=Kasuta muutmiseks 'Liik' välja OpenIDURL=OpenID URL LoginUsingOpenID=Kasuta sisselogimiseks OpenIDd +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang index 877cbb7face..be438a477ad 100644 --- a/htdocs/langs/et_EE/withdrawals.lang +++ b/htdocs/langs/et_EE/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kviitung LastWithdrawalReceipts=Viimased %s väljamaksete kviitungit WithdrawedBills=Väljamakstud arved WithdrawalsLines=Väljamaksete read -RequestStandingOrderToTreat=Näita täitmata püsikorraldusi -RequestStandingOrderTreated=Näita täidetud püsikorraldused +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Klientide püsikorraldused CustomerStandingOrder=Kliendi püsikorraldus NbOfInvoiceToWithdraw=Väljamakse taotlusega seotud arveid @@ -40,14 +41,13 @@ TransMetod=Saatmise meetod Send=Saada Lines=Read StandingOrderReject=Väljasta keeldumine -InvoiceRefused=Arve tagasi lükatud WithdrawalRefused=Väljamaksest keeldutud WithdrawalRefusedConfirm=Kas oled kindel, et soovid sisestada väljamakse tagasilükkamise üksusele RefusedData=Keeldumise kuupäev RefusedReason=Keeldumise põhjus RefusedInvoicing=Keeldumise eest arve esitamine NoInvoiceRefused=Ära esita arvet keeldumise eest -InvoiceRefused=Arve tagasi lükatud +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Staatus StatusUnknown=Teadmata StatusWaiting=Ootel @@ -76,13 +76,14 @@ WithBankUsingRIB=Pankadele, mis kasutavad RIB WithBankUsingBANBIC=Pankadele, mis kasutavad IBAN/BIC/SWIFT BankToReceiveWithdraw=Pangakonto, kuhu väljamakse teha CreditDate=Krediteeri -WithdrawalFileNotCapable=Ei suutnud luua antud riigis kehtivat väljamakse kviitungi faili +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/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/eu_ES/accountancy.lang +++ b/htdocs/langs/eu_ES/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang index 0ff71f9e2c2..cbdb7bc6d98 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -1,123 +1,125 @@ # Dolibarr language file - Source file is en_US - admin Foundation=Fundazioa Version=Bertsioa -VersionProgram=programa bertsioa +VersionProgram=Programa bertsioa VersionLastInstall=Bertsioaren lehenengo instalazioa -VersionLastUpgrade=Bertsioaren askenengo eguneraketa -VersionExperimental=esperimentala -VersionDevelopment=garapena -VersionUnknown=ezezaguna -VersionRecommanded=gomendatua +VersionLastUpgrade=Bertsioaren azkeneko eguneraketa +VersionExperimental=Esperimentala +VersionDevelopment=Garapena +VersionUnknown=Ezezaguna +VersionRecommanded=Gomendatua SessionId=Sesioaren ID SessionSaveHandler=Kudeatzailea sesioak gordetzeko -SessionSavePath=sesio biltegiaren lokalizazioa -PurgeSessions=sesio garbiketa -ConfirmPurgeSessions=benetan garbitu nahi dituzu sesio guztiak? hauxe erabiltzaile guztiak (zu izan ezik) kaleratuko ditu. +SessionSavePath=Sesio biltegiaren kokapena +PurgeSessions=Sesio garbiketa +ConfirmPurgeSessions=Benetan garbitu nahi dituzu sesio guztiak? Honek erabiltzaile guztiak (zu izan ezik) kaleratuko ditu. NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions. -LockNewSessions=blokeatu konexio berriak -ConfirmLockNewSessions=Ziur zaude, blokeatu nahi dituzula zure dolibarr-eko konexio berriak. Bakarrik %s erabiltzailea, konexioa burutu ahal izango du honen ondorioz. -UnlockNewSessions=Kendu konexioaren blokeoa -YourSession=zure sesioa -Sessions=erabiltzaileen sesioa -WebUserGroup=Web server user/group +LockNewSessions=Konexio berriak blokeatu +ConfirmLockNewSessions=Ziur zaude, blokeatu nahi dituzula zure dolibarr-eko konexio berriak. Bakarrik %s erabiltzaileak, konexioa burutu ahal izango du honen ondorioz. +UnlockNewSessions=Konexioaren blokeoa kendu +YourSession=Zure sesioa +Sessions=Erabiltzaileen sesioa +WebUserGroup=Web-zerbitzariaren erabiltzailea/taldea NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (%s) might be protected (For example, by OS permissions or by PHP directive open_basedir). HTMLCharset=Charset for generated HTML pages DBStoringCharset=Database charset to store data DBSortingCharset=Database charset to sort data -WarningModuleNotActive=Module %s must be enabled +WarningModuleNotActive=%s moduluak gaituta egon behar du WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page. -DolibarrSetup=Dolibarr install or upgrade -DolibarrUser=Dolibarr user -InternalUser=Internal user -ExternalUser=External user -InternalUsers=Internal users -ExternalUsers=External users -GlobalSetup=Global setup -GUISetup=Display +DolibarrSetup=Dolibarr instalatu edo eguneratu +DolibarrUser=Dolibarr erabiltzailea +InternalUser=Barneko erabiltzailea +ExternalUser=Kanpoko erabiltzailea +InternalUsers=Barneko erabiltzaileak +ExternalUsers=Kanpoko erabiltzaileak +GlobalSetup=Konfigurazio orokorra +GUISetup=Itxura SetupArea=Setup area FormToTestFileUploadForm=Form to test file upload (according to setup) IfModuleEnabled=Note: yes is effective only if module %s is enabled RemoveLock=Remove file %s if it exists to allow usage of the update tool. RestoreLock=Restore file %s, with read permission only, to disable any usage of update tool. -SecuritySetup=Security setup -ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher -ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher +SecuritySetup=Segurtasunaren konfigurazioa +ErrorModuleRequirePHPVersion=Errorea, modulu honek PHP-ren %s bertsioa -edo handiagoa- behar du +ErrorModuleRequireDolibarrVersion=Errorea, modulu honek Dolibarr-en %s bertsioa -edo handiagoa- behar du ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. DictionarySetup=Dictionary setup Dictionary=Dictionaries Chartofaccounts=Chart of accounts Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record -ErrorCodeCantContainZero=Code can't contain value 0 +ErrorCodeCantContainZero=Kodeak ezin du 0 balioa izan DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) -ConfirmAjax=Use Ajax confirmation popups +ConfirmAjax=Ajax berrespen pop-up-ak erabili UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). -SearchFilter=Search filters options +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 -NotAvailableWhenAjaxDisabled=Not available when Ajax disabled -JavascriptDisabled=JavaScript disabled -UsePopupCalendar=Use popup for dates input -UsePreviewTabs=Use preview tabs -ShowPreview=Show preview -PreviewNotAvailable=Preview not available -ThemeCurrentlyActive=Theme currently active -CurrentTimeZone=TimeZone PHP (server) +NotAvailableWhenAjaxDisabled=Ajax ezgaituta dagoenean ez dago erabilgarri +JavascriptDisabled=JavaScript ezgaituta +UsePopupCalendar=Datak sartzeko popup-a erabili +UsePreviewTabs=Aurreikuspen fitxak erabili +ShowPreview=Aurreikuspena aurkeztu +PreviewNotAvailable=Aurreikuspena ez dago eskuragarri +ThemeCurrentlyActive=Aktibatuta dagoen gaia +CurrentTimeZone=TimeZone PHP (zerbitzaria) MySQLTimeZone=TimeZone MySql (database) TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). Space=Space -Table=Table -Fields=Fields -Index=Index -Mask=Mask -NextValue=Next value +Table=Taula +Fields=Eremuak +Index=Aurkibidea +Mask=Maskara +NextValue=Hurrengo balioa NextValueForInvoices=Next value (invoices) NextValueForCreditNotes=Next value (credit notes) NextValueForDeposit=Next value (deposit) NextValueForReplacements=Next value (replacements) MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to %s %s, whatever this parameter's value is -NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration -MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload) -UseCaptchaCode=Use graphical code (CAPTCHA) on login page -UseAvToScanUploadedFiles=Use anti-virus to scan uploaded files -AntiVirusCommand= Full path to antivirus command +NoMaxSizeByPHPLimit=Oharra: zure PHP konfigurazioan ez da limiterik ezarri +MaxSizeForUploadedFiles=Igotako fitxategien tamaina maximoa (0 fitxategiak igotzea ezgaitzeko) +UseCaptchaCode=Sarrera orrian kode grafikoa (CAPTCHA) erabili +UseAvToScanUploadedFiles=Igotako fitxategiak aztertzeko anti-birusa erabili +AntiVirusCommand= Biruskontrako komandoaren kokapen osoa AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
    Example for ClamAv: /usr/bin/clamscan AntiVirusParam= More parameters on command line AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" -ComptaSetup=Accounting module setup -UserSetup=User management setup -MenuSetup=Menu management setup -MenuLimits=Limits and accuracy +ComptaSetup=Kontabilitate moduluaren konfigurazia +UserSetup=Erabiltzaileen kudeaketaren konfigurazioa +MenuSetup=Menuen kudeaketaren konfigurazioa +MenuLimits=Limiteak eta bereizmena MenuIdParent=Parent menu ID DetailMenuIdParent=ID of parent menu (empty for a top menu) DetailPosition=Sort number to define menu position PersonalizedMenusNotSupported=Personalized menus not supported -AllMenus=All -NotConfigured=Module not configured -Setup=Setup -Activation=Activation -Active=Active -SetupShort=Setup -OtherOptions=Other options -OtherSetup=Other setup -CurrentValueSeparatorDecimal=Decimal separator -CurrentValueSeparatorThousand=Thousand separator +AllMenus=Guztiak +NotConfigured=Konfiguratu gabeko modulua +Setup=Konfigurazioa +Activation=Aktibazioa +Active=Aktibo +SetupShort=Konfigurazioa +OtherOptions=Beste aukerak +OtherSetup=Beste konfigurazioa +CurrentValueSeparatorDecimal=Bereizle hamartarra +CurrentValueSeparatorThousand=Milakoen bereizlea Destination=Destination IdModule=Module ID IdPermissions=Permissions ID -Modules=Modules -ModulesCommon=Main modules -ModulesOther=Other modules -ModulesInterfaces=Interfaces modules +Modules=Moduluak +ModulesCommon=Modulu nagusiak +ModulesOther=Beste moduluak +ModulesInterfaces=Interfaze moduluak ModulesSpecial=Modules very specific -ParameterInDolibarr=Parameter %s -LanguageParameter=Language parameter %s -LanguageBrowserParameter=Parameter %s -LocalisationDolibarrParameters=Localisation parameters +ParameterInDolibarr=%s parametroa +LanguageParameter=%s hizkuntza parametroa +LanguageBrowserParameter=%s parametroa +LocalisationDolibarrParameters=Lokalizazio parametroak ClientTZ=Client Time Zone (user) ClientHour=Client time (user) OSTZ=Server OS Time Zone @@ -125,68 +127,68 @@ PHPTZ=PHP server Time Zone PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds) ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds) DaylingSavingTime=Daylight saving time -CurrentHour=PHP Time (server) +CurrentHour=PHP Denbora (zerbitzaria) CompanyTZ=Company Time Zone (main company) CompanyHour=Company Time (main company) CurrentSessionTimeOut=Current session timeout YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris" OSEnv=OS Environment -Box=Box -Boxes=Boxes +Box=Kutxa +Boxes=Kutxak MaxNbOfLinesForBoxes=Max number of lines for boxes -PositionByDefault=Default order -Position=Position +PositionByDefault=Lehenetsitako ordena +Position=Posizioa MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar). MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.
    Some modules add entries in the menus (in menu All in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module. -MenuForUsers=Menu for users -LangFile=.lang file -System=System -SystemInfo=System information -SystemTools=System tools -SystemToolsArea=System tools area -SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for. -Purge=Purge +MenuForUsers=Erabiltzaileentzat menua +LangFile=.lang fitxategia +System=Sistema +SystemInfo=Sistemaren informazioa +SystemTools=Sistemaren tresnak +SystemToolsArea=Sistemaren tresnen gunea +SystemToolsAreaDesc=Gune honek kudeaketarako aukerak eskaintzen ditu. Bilatzen ari zarena aukeratzeko menua erabili. +Purge=Garbitu PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in %s directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server. PurgeDeleteLogFile=Delete log file %s defined for Syslog module (no risk to loose data) PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data) PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory %s. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted. -PurgeRunNow=Purge now -PurgeNothingToDelete=No directory or file to delete. -PurgeNDirectoriesDeleted=%s files or directories deleted. -PurgeAuditEvents=Purge all security events +PurgeRunNow=Orain garbitu +PurgeNothingToDelete=Ez dago ezabatzeko karpeta edo fitxategirik +PurgeNDirectoriesDeleted=%s fitxategi edo karpetak ezabatu dira. +PurgeAuditEvents=Garbitu segurtasuneko gertaera guztiak ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed. -NewBackup=New backup -GenerateBackup=Generate backup -Backup=Backup -Restore=Restore +NewBackup=Segurtasun-kopia berria +GenerateBackup=Segurtasun-kopia egin +Backup=Segurtasun-kopia +Restore=Berrezarri 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 +BackupResult=Segurtasun-kopiaren emaitza +BackupFileSuccessfullyCreated=Segurtasun-kopia ondo egin da +YouCanDownloadBackupFile=Sortutako fitxategiak orain jaitsi ditzakezu +NoBackupFileAvailable=Ez dago segurtasun-kopiarik eskuragarri +ExportMethod=Esportatzeko metodoa +ImportMethod=Inportatzeko metodoa ToBuildBackupFileClickHere=To build a backup file, click here. ImportMySqlDesc=To import a backup file, you must use mysql command from command line: ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line: ImportMySqlCommand=%s %s < mybackupfile.sql ImportPostgreSqlCommand=%s %s mybackupfile.sql FileNameToGenerate=File name to generate -Compression=Compression +Compression=Konpresioa 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 +MySqlExportParameters=MySQL esportatzeko parametroak +PostgreSqlExportParameters= PostgreSQL esportatzeko parametroak UseTransactionnalMode=Use transactional mode FullPathToMysqldumpCommand=Full path to mysqldump command FullPathToPostgreSQLdumpCommand=Full path to pg_dump command -ExportOptions=Export Options +ExportOptions=Esportatzeko aukerak AddDropDatabase=Add DROP DATABASE command AddDropTable=Add DROP TABLE command -ExportStructure=Structure +ExportStructure=Egitura 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 -AutoDetectLang=Autodetect (browser language) -FeatureDisabledInDemo=Feature disabled in demo -Rights=Permissions +Yes=Bai +No=Ez +AutoDetectLang=Berez antzeman (nabigatzailean hizkuntza) +FeatureDisabledInDemo=Demo-an ezgaitutako aukera +Rights=Baimenak 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. @@ -206,36 +208,37 @@ ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features d ModulesSpecialDesc=Special modules are very specific or seldom used modules. ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business. ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... -ModulesMarketPlaces=More modules... +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=Link -BoxesAvailable=Boxes available -BoxesActivated=Boxes activated -ActivateOn=Activate on -ActiveOn=Activated on -SourceFile=Source file -AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled -AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled -AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled -Required=Required +URL=Esteka +BoxesAvailable=Eskuragarri dauden kutxak +BoxesActivated=Aktibatutako kutxak +ActivateOn=Aktibatu on +ActiveOn=Aktibatuta on +SourceFile=Iturri-fitxategia +AutomaticIfJavascriptDisabled=Automatikoa JavaScript ezgaituta badago +AvailableOnlyIfJavascriptNotDisabled=Eskuragarri soilik JavaScript ezgaituta ez badago +AvailableOnlyIfJavascriptAndAjaxNotDisabled=Eskuragarri soilik JavaScript ezgaituta ez badago +Required=Beharrezkoa UsedOnlyWithTypeOption=Used by some agenda option only -Security=Security -Passwords=Passwords +Security=Segurtasuna +Passwords=Pasahitzak DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended) InstrucToEncodePass=To have password encoded into the conf.php file, replace the line
    $dolibarr_main_db_pass="..."
    by
    $dolibarr_main_db_pass="crypted:%s" InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line
    $dolibarr_main_db_pass="crypted:..."
    by
    $dolibarr_main_db_pass="%s" ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation) ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices). -Feature=Feature -DolibarrLicense=License -DolibarrProjectLeader=Project leader -Developpers=Developers/contributors -OtherDeveloppers=Other developers/contributors +Feature=Aukera +DolibarrLicense=Lizentzia +DolibarrProjectLeader=Proiektuaren burua +Developpers=Garatzaileak/laguntzaileak +OtherDeveloppers=Beste garatzaileak/languntzaileak OfficialWebSite=Dolibarr international official web site OfficialWebSiteFr=French official web site -OfficialWiki=Dolibarr documentation on Wiki +OfficialWiki=Dolibarr-en dokumentazioa Wiki-an OfficialDemo=Dolibarr online demo OfficialMarketPlace=Official market place for external modules/addons OfficialWebHostingService=Referenced web hosting services (Cloud hosting) @@ -249,12 +252,12 @@ 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=Neurri-unitatea +Emails=E-postak +EMailsSetup=E-posten konfigurazioa EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. -MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: %s) -MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s) +MAIN_MAIL_SMTP_PORT=SMTP/SMTPS ataka (berez php.ini fitxategian adierazita: %s) +MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS zerbitzaria (berez php.ini fitxategian adierazita: %s) MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems) MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems) MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s) @@ -265,42 +268,42 @@ MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos) MAIN_MAIL_SENDMODE=Method to use to send EMails -MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required -MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required -MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt +MAIN_MAIL_SMTPS_ID=SMTP ID-a autentifikazio behar bada +MAIN_MAIL_SMTPS_PW=SMTP parahitza autentifikazioa behar bada +MAIN_MAIL_EMAIL_TLS= TLS (SSL) enkriptazioa erabili 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=SMS-ak bidaltzeko erabiliko den modua 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=Moduluaren konfigurazioa +ModulesSetup=Moduluen konfigurazioa +ModuleFamilyBase=Sistema ModuleFamilyCrm=Customer Relation Management (CRM) -ModuleFamilyProducts=Products Management -ModuleFamilyHr=Human Resource Management -ModuleFamilyProjects=Projects/Collaborative work -ModuleFamilyOther=Other -ModuleFamilyTechnic=Multi-modules tools -ModuleFamilyExperimental=Experimental modules +ModuleFamilyProducts=Produktuak Kudeatzea +ModuleFamilyHr=Pertsonak Kudeatzea +ModuleFamilyProjects=Proiektuak/Lan-taldeak +ModuleFamilyOther=Besteak +ModuleFamilyTechnic=Modulu-anitzen tresnak +ModuleFamilyExperimental=Modulu esperimentalak ModuleFamilyFinancial=Financial Modules (Accounting/Treasury) ModuleFamilyECM=Electronic Content Management (ECM) -MenuHandlers=Menu handlers -MenuAdmin=Menu editor +MenuHandlers=Menu maneiatzailea +MenuAdmin=Menu editorea DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=This is setup to process: -StepNb=Step %s +StepNb=%s pausua FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). -DownloadPackageFromWebSite=Download package. +DownloadPackageFromWebSite=Paketea jaitsi 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=Modulua aukeratu: +CurrentVersion=Dolibarr-en uneko bertsioa CallUpdatePage=Go to the page that updates the database structure and datas: %s. -LastStableVersion=Last stable version +LastStableVersion=Azkeneko bertsio egonkorra 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.
    @@ -312,8 +315,8 @@ GenericNumRefModelDesc=Returns a customizable number according to a defined mask ServerAvailableOnIPOrPort=Server is available at address %s on port %s ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s DoTestServerAvailability=Test server connectivity -DoTestSend=Test sending -DoTestSendHTML=Test sending HTML +DoTestSend=Bidalketa frogatu +DoTestSendHTML=HTML bidalketa frogatu 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. @@ -323,11 +326,11 @@ UseACacheDelay= Delay for caching export response in seconds (0 or empty for no DisableLinkToHelpCenter=Hide link "Need help or support" on login page DisableLinkToHelp=Hide link "%s Online help" on left menu AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea. -ModuleDisabled=Module disabled -ModuleDisabledSoNoEvent=Module disabled so event never created +ModuleDisabled=Ezgaitutako modulua +ModuleDisabledSoNoEvent=Modulua ezgaituta dagoenez ez da inoiz gertaerarik sortu ConfirmPurge=Are you sure you want to execute this purge ?
    This will delete definitely all your data files with no way to restore them (ECM files, attached files...). -MinLength=Minimum length -LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory +MinLength=Gutxieneko luzeera +LanguageFilesCachedIntoShmopSharedMemory=.lang fitxategiak memoria partekatuan kargatu dira ExamplesWithCurrentSetup=Examples with current running setup ListOfDirectories=List of OpenDocument templates directories ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

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

    Files in those directories must end with .odt. @@ -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=Izena/Abizena-ren kokapena 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 +ThemeDir=Gaien kokapena ConnectionTimeout=Connexion timeout -ResponseTimeout=Response timeout +ResponseTimeout=Erantzuteko denbora-muga SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__ ModuleMustBeEnabledFirst=Module %s must be enabled first before using this feature. SecurityToken=Key to secure URLs @@ -354,41 +357,41 @@ 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=Liburutegia UrlGenerationParameters=Parameters to secure URLs SecurityTokenIsUnique=Use a unique securekey parameter for each URL -EnterRefToBuildUrl=Enter reference for object %s -GetSecuredUrl=Get calculated URL +EnterRefToBuildUrl=%s objektuen erreferentzia sartu +GetSecuredUrl=Kalkulatutako URL-a hartu ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons OldVATRates=Old VAT rate NewVATRates=New VAT rate PriceBaseTypeToChange=Modify on prices with base reference value defined on MassConvert=Launch mass convert -String=String -TextLong=Long text -Int=Integer -Float=Float -DateAndTime=Date and hour +String=Katea +TextLong=Testu luzea +Int=Zenbaki osoa +Float=Zenbaki hamartarra +DateAndTime=Data eta ordua Unique=Unique -Boolean=Boolean (Checkbox) -ExtrafieldPhone = Phone -ExtrafieldPrice = Price -ExtrafieldMail = Email -ExtrafieldSelect = Select list -ExtrafieldSelectList = Select from table -ExtrafieldSeparator=Separator +Boolean=Boolearra (Checkbox) +ExtrafieldPhone = Telefonoa +ExtrafieldPrice = Prezioa +ExtrafieldMail = E-posta +ExtrafieldSelect = Aukeren zerrenda +ExtrafieldSelectList = Taulatik aukeratu +ExtrafieldSeparator=Bereizlea ExtrafieldCheckBox=Checkbox -ExtrafieldRadio=Radio button +ExtrafieldRadio=Radio botoia ExtrafieldParamHelpselect=Parameters list have to be like key,value

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

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

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

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

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

    In order to have the list depending on another :
    c_typent:libelle:id:parent_list_code|parent_column:filter -LibraryToBuildPDF=Library used to build PDF +LibraryToBuildPDF=PDF-ak sortzeko erabilitako liburutegia WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
    To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
    1 : local tax apply on products and services without vat (vat is not applied on local tax)
    2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
    3 : local tax apply on products without vat (vat is not applied on local tax)
    4 : local tax apply on products before vat (vat is calculated on amount + localtax)
    5 : local tax apply on services without vat (vat is not applied on local tax)
    6 : local tax apply on services before vat (vat is calculated on amount + localtax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s -RefreshPhoneLink=Refresh link +RefreshPhoneLink=Esteka freskatu LinkToTest=Clickable link generated for user %s (click phone number to test) KeepEmptyToUseDefault=Keep empty to use default value DefaultLink=Default link @@ -405,46 +408,46 @@ NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into bar NoRecordWithoutBarcodeDefined=No record with no barcode value defined. # Modules -Module0Name=Users & groups -Module0Desc=Users and groups management +Module0Name=Erabiltzaileak & Taldeak +Module0Desc=Erabiltzaile eta taldeen kudeaketa Module1Name=Third parties Module1Desc=Companies and contact management (customers, prospects...) -Module2Name=Commercial -Module2Desc=Commercial management -Module10Name=Accounting +Module2Name=Komertziala +Module2Desc=Kudeaketa komertziala +Module10Name=Kontabilitatea Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching. -Module20Name=Proposals -Module20Desc=Commercial proposal management +Module20Name=Proposamenak +Module20Desc=Proposamen komertzialak kudeatzea Module22Name=Mass E-mailings Module22Desc=Mass E-mailing management -Module23Name= Energy +Module23Name= Energia Module23Desc= Monitoring the consumption of energies -Module25Name=Customer Orders -Module25Desc=Customer order management -Module30Name=Invoices +Module25Name=Bezeroen Eskaerak +Module25Desc=Bezeroen eskaerak kudeatzea +Module30Name=Fakturak Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers -Module40Name=Suppliers +Module40Name=Hornitzaileak Module40Desc=Supplier management and buying (orders and invoices) -Module42Name=Logs +Module42Name=Log Module42Desc=Logging facilities (file, syslog, ...) -Module49Name=Editors -Module49Desc=Editor management -Module50Name=Products -Module50Desc=Product management +Module49Name=Editoreak +Module49Desc=Editoreak kudeatzea +Module50Name=Produktuak +Module50Desc=Produktuak kudeatzea Module51Name=Mass mailings Module51Desc=Mass paper mailing management -Module52Name=Stocks -Module52Desc=Stock management (products) -Module53Name=Services -Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management -Module55Name=Barcodes -Module55Desc=Barcode management +Module52Name=Stock-ak +Module52Desc=Stock-ak kudeatzea (produktuak) +Module53Name=Zerbitzuak +Module53Desc=Zerbitzuak kudeatzea +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) +Module55Name=Barra-kodeak +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 @@ -453,59 +456,63 @@ Module70Name=Interventions Module70Desc=Intervention management Module75Name=Expense and trip notes Module75Desc=Expense and trip notes management -Module80Name=Shipments -Module80Desc=Shipments and delivery order management -Module85Name=Banks and cash -Module85Desc=Management of bank or cash accounts -Module100Name=External site +Module80Name=Bidalketak +Module80Desc=Bidalketa eta banaketa eskerak kudeatzea +Module85Name=Bankuak eta eskudirua +Module85Desc=Banku edo eskudiru kontuak kudeatzea +Module100Name=Kanpoko tokia Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame -Module105Name=Mailman and SPIP +Module105Name=Mailman eta SPIP Module105Desc=Mailman or SPIP interface for member module Module200Name=LDAP -Module200Desc=LDAP directory synchronisation +Module200Desc=LDAP direktorioa sinkronizatzea Module210Name=PostNuke -Module210Desc=PostNuke integration -Module240Name=Data exports +Module210Desc=PostNuke integrazioa +Module240Name=Daten esportazioa Module240Desc=Tool to export Dolibarr datas (with assistants) -Module250Name=Data imports +Module250Name=Daten inportazioa Module250Desc=Tool to import datas in Dolibarr (with assistants) -Module310Name=Members +Module310Name=Kideak Module310Desc=Foundation members management -Module320Name=RSS Feed +Module320Name=RSS kanala Module320Desc=Add RSS feed inside Dolibarr screen pages -Module330Name=Bookmarks -Module330Desc=Bookmark management -Module400Name=Projects -Module400Desc=Project management inside other modules -Module410Name=Webcalendar -Module410Desc=Webcalendar integration +Module330Name=Laster-markak +Module330Desc=Laster-markak kudeatzea +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) Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries Module510Name=Salaries Module510Desc=Management of employees salaries and payments -Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts -Module700Name=Donations -Module700Desc=Donation management +Module600Name=Jakinarazpenak +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) +Module700Name=Diru-emateak +Module700Desc=Diru-emateak kudeatzea Module1200Name=Mantis Module1200Desc=Mantis integration -Module1400Name=Accounting +Module1400Name=Kontabilitatea Module1400Desc=Accounting management (double parties) -Module1780Name=Categories -Module1780Desc=Category management (products, suppliers and customers) -Module2000Name=WYSIWYG editor +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 -Module2400Desc=Events/tasks and agenda management +Module2400Desc=Gertaera/Atazak eta agenda kudeatzea Module2500Name=Electronic Content Management -Module2500Desc=Save and share documents -Module2600Name=WebServices +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 Client +Module2800Desc=FTP Bezeroa Module2900Name=GeoIPMaxmind Module2900Desc=GeoIP Maxmind conversions capabilities Module3100Name=Skype @@ -514,35 +521,35 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=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 -Module59000Desc=Module to manage margins +Module59000Name=Marjinak +Module59000Desc=Marjinak kudeatzeko modulua Module60000Name=Commissions Module60000Desc=Module to manage commissions Module150010Name=Batch number, eat-by date and sell-by date Module150010Desc=batch number, eat-by date and sell-by date management for product -Permission11=Read customer invoices -Permission12=Create/modify customer invoices -Permission13=Unvalidate customer invoices -Permission14=Validate customer invoices -Permission15=Send customer invoices by email +Permission11=Bezeroen fakturak ikusi +Permission12=Bezeroen fakturak sortu/aldatu +Permission13=Bezeroaren fakturak baliogabetu +Permission14=Bezeroaren fakturak balioztatu +Permission15=Bezeroaren faktura e-postaz bidali Permission16=Create payments for customer invoices -Permission19=Delete customer invoices +Permission19=Bezeroaren fakturak ezabatu Permission21=Read commercial proposals Permission22=Create/modify commercial proposals Permission24=Validate commercial proposals @@ -550,11 +557,11 @@ Permission25=Send commercial proposals Permission26=Close commercial proposals Permission27=Delete commercial proposals Permission28=Export commercial proposals -Permission31=Read products +Permission31=Produktuak ikusi Permission32=Create/modify products -Permission34=Delete products +Permission34=Produktuak ezabatu Permission36=See/manage hidden products -Permission38=Export products +Permission38=Produktuak esportatu Permission41=Read projects (shared project and projects i'm contact for) Permission42=Create/modify projects (shared project and projects i'm contact for) Permission44=Delete projects (shared project and projects i'm contact for) @@ -606,15 +613,16 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -701,8 +709,8 @@ Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Read stock movements Permission1005=Create/modify stock movements Permission1101=Read delivery orders @@ -739,10 +747,10 @@ Permission2403=Delete actions (events or tasks) linked to his account Permission2411=Read actions (events or tasks) of others Permission2412=Create/modify actions (events or tasks) of others Permission2413=Delete actions (events or tasks) of others -Permission2501=Read/Download documents -Permission2502=Download documents -Permission2503=Submit or delete documents -Permission2515=Setup documents directories +Permission2501=Dokumentuak ikusi/jaitsi +Permission2502=Dokumentuak jaitsi +Permission2503=Dokumentuak bidali edo ezabatzea +Permission2515=Dokumentuen karpetak konfiguratzea 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 @@ -778,11 +786,12 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list VATReceivedOnly=Special rate not charged -VATManagement=VAT Management +VATManagement=BEZ-a kudeatzea VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:
    If the seller is not subjected to VAT, then VAT by default=0. End of rule.
    If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule.
    If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.
    If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold. End of rule.
    If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.
    Else the proposed default VAT=0. End of rule. VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies. VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,25 +1169,25 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts module setup -ContractsNumberingModules=Contracts numbering modules +ContractsSetup=Contracts/Subscriptions module setup +ContractsNumberingModules=Kontratuak zenbakitzeko moduluak TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) ##### Members ##### -MembersSetup=Members module setup -MemberMainOptions=Main options +MembersSetup=Kideak moduluaren konfigurazioa +MemberMainOptions=Aukera nagusiak AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in bank module, when adding a new payed subscription -AdherentLoginRequired= Manage a Login for each member -AdherentMailRequired=EMail required to create a new member +AdherentLoginRequired= Kide bakoitzarentzat Sarrera bat kudeatu +AdherentMailRequired=Kide berria sortzeko e-posta beharrezkoa da MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default ##### LDAP setup ##### -LDAPSetup=LDAP Setup -LDAPGlobalParameters=Global parameters -LDAPUsersSynchro=Users -LDAPGroupsSynchro=Groups -LDAPContactsSynchro=Contacts -LDAPMembersSynchro=Members +LDAPSetup=LDAP konfigurazioa +LDAPGlobalParameters=Parametro orokorrak +LDAPUsersSynchro=Erabiltzaileak +LDAPGroupsSynchro=Taldeak +LDAPContactsSynchro=Kontratuak +LDAPMembersSynchro=Kideak LDAPSynchronization=LDAP synchronisation LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP LDAPToDolibarr=LDAP -> Dolibarr @@ -1283,13 +1294,13 @@ LDAPFieldTown=Town LDAPFieldTownExample=Example : l LDAPFieldCountry=Country LDAPFieldCountryExample=Example : c -LDAPFieldDescription=Description -LDAPFieldDescriptionExample=Example : description +LDAPFieldDescription=Deskribapena +LDAPFieldDescriptionExample=Adibidea : deskribapena LDAPFieldGroupMembers= Group members LDAPFieldGroupMembersExample= Example : uniqueMember -LDAPFieldBirthdate=Birthdate -LDAPFieldBirthdateExample=Example : -LDAPFieldCompany=Company +LDAPFieldBirthdate=Jaiotze-data +LDAPFieldBirthdateExample=Adibidea : +LDAPFieldCompany=Erakundea LDAPFieldCompanyExample=Example : o LDAPFieldSid=SID LDAPFieldSidExample=Example : objectsid @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Products module setup ServiceSetup=Services module setup @@ -1344,12 +1355,12 @@ SyslogSetup=Logs module setup SyslogOutput=Logs outputs SyslogSyslog=Syslog SyslogFacility=Facility -SyslogLevel=Level -SyslogSimpleFile=File -SyslogFilename=File name and path +SyslogLevel=Maila +SyslogSimpleFile=Fitxategia +SyslogFilename=Fitxategiaren izena eta kokapena YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file. -ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant -OnlyWindowsLOG_USER=Windows only supports LOG_USER +ErrorUnknownSyslogConstant=%s konstantea ez da Syslog-eko konstante ezaguna +OnlyWindowsLOG_USER=Windows-ek LOG_USER soilik jasaten du ##### Donations ##### DonationsSetup=Donation module setup DonationsReceiptModel=Template of donation receipt @@ -1361,30 +1372,31 @@ UseBarcodeInProductModule=Use bar codes for products CodeBarGenerator=Barcode generator ChooseABarCode=No generator defined FormatNotSupportedByGenerator=Format not supported by this generator -BarcodeDescEAN8=Barcode of type EAN8 -BarcodeDescEAN13=Barcode of type EAN13 -BarcodeDescUPC=Barcode of type UPC -BarcodeDescISBN=Barcode of type ISBN -BarcodeDescC39=Barcode of type C39 -BarcodeDescC128=Barcode of type C128 +BarcodeDescEAN8=EAN8 motako barra-kodea +BarcodeDescEAN13=EAN13 motako barra-kodea +BarcodeDescUPC=UPC motako barra-kodea +BarcodeDescISBN=ISBN motako barra-kodea +BarcodeDescC39=C39 motako barra-kodea +BarcodeDescC128=C128 motako barra-kodea GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) -BarcodeInternalEngine=Internal engine +BarcodeInternalEngine=Barne-eragilea BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### WithdrawalsSetup=Withdrawal module setup ##### ExternalRSS ##### ExternalRSSSetup=External RSS imports setup -NewRSS=New RSS Feed +NewRSS=RSS kanal berria RSSUrl=RSS URL -RSSUrlExample=An interesting RSS feed +RSSUrlExample=RSS kanal interesgarri bat ##### Mailing ##### -MailingSetup=EMailing module setup +MailingSetup=EMailing moduluaren konfigurazioa MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang index 9b3efc07dab..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 @@ -41,9 +42,10 @@ AutoActions= Automatic filling AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Invoice %s validated +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Order %s validated @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status OrderCanceledInDolibarr=Order %s canceled -InterventionValidatedInDolibarr=Intervention %s validated ProposalSentByEMail=Commercial proposal %s sent by EMail OrderSentByEMail=Customer order %s sent by EMail InvoiceSentByEMail=Customer invoice %s sent by EMail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail ShippingSentByEMail=Shipping %s sent by EMail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sent by EMail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date DateActionPlannedEnd= Planned end date @@ -70,9 +69,9 @@ DateActionStart= Start date DateActionEnd= End date AgendaUrlOptions1=You can also add following parameters to filter output: AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. -AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Show birthday's contacts AgendaHideBirthdayEvents=Hide birthday's contacts Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang index 1edd7213076..d20b6762937 100644 --- a/htdocs/langs/eu_ES/bills.lang +++ b/htdocs/langs/eu_ES/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit note InvoiceAvoirAsk=Credit note to correct invoice InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Replace invoice %s ReplacementInvoice=Replacement invoice ReplacedByInvoice=Replaced by invoice %s @@ -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. @@ -87,19 +87,19 @@ ClassifyCanceled=Classify 'Abandoned' ClassifyClosed=Classify 'Closed' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Create Invoice -AddBill=Add invoice or credit note +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice SearchASupplierInvoice=Search for a supplier invoice CancelBill=Cancel an invoice -SendRemindByMail=Send reminder by EMail -DoPayment=Do payment +SendRemindByMail=Oroigarria e-postaz bidali +DoPayment=Ordainketa egin DoPaymentBack=Do payment back ConvertToReduc=Convert into future discount EnterPaymentReceivedFromCustomer=Enter payment received from customer EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Amount PriceBase=Price base BillStatus=Invoice status @@ -137,18 +137,16 @@ BillFrom=From BillTo=To ActionsOnBill=Actions on invoice NewBill=New invoice -Prélèvements=Standing order -Prélèvements=Standing order 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 ? @@ -156,10 +154,10 @@ ConfirmCancelBill=Are you sure you want to cancel invoice %s ? ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%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 +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=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») @@ -173,27 +171,27 @@ 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 -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received @@ -219,19 +217,18 @@ NoInvoice=No invoice ClassifyBill=Classify invoice SupplierBillsToPay=Suppliers invoices to pay CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms SetMode=Set payment mode Billed=Billed -RepeatableInvoice=Pre-defined invoice -RepeatableInvoices=Pre-defined invoices -Repeatable=Pre-defined -Repeatables=Pre-defined -ChangeIntoRepeatableInvoice=Convert into pre-defined -CreateRepeatableInvoice=Create pre-defined invoice -CreateFromRepeatableInvoice=Create from pre-defined invoice +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Customer invoices and payments ExportDataset_invoice_1=Customer invoices list and invoice's lines 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/categories.lang b/htdocs/langs/eu_ES/categories.lang index ed61bfc08a6..22914931db1 100644 --- a/htdocs/langs/eu_ES/categories.lang +++ b/htdocs/langs/eu_ES/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/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 3929cfde036..878eb49b3c9 100644 --- a/htdocs/langs/eu_ES/compta.lang +++ b/htdocs/langs/eu_ES/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 e5ad112b222..57ba3bb15d8 100644 --- a/htdocs/langs/eu_ES/contracts.lang +++ b/htdocs/langs/eu_ES/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastContracts=Last %s modified contracts +LastModifiedContracts=Last %s modified contracts AllContracts=All contracts ContractCard=Contract card ContractStatus=Contract status @@ -27,7 +27,7 @@ MenuRunningServices=Running services MenuExpiredServices=Expired services MenuClosedServices=Closed services NewContract=New contract -AddContract=Add contract +AddContract=Create contract SearchAContract=Search a contract DeleteAContract=Delete a contract CloseAContract=Close a contract @@ -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 %s modified 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 1be23d72ca3..85438821b7b 100644 --- a/htdocs/langs/eu_ES/cron.lang +++ b/htdocs/langs/eu_ES/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# -# About = About -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +About = About +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job -# CronNone= None -# CronDtStart=Start date -# CronDtEnd=End date -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe -# CronMethod=Method -# CronModule=Module -# CronAction=Action -# CronStatus=Status -# CronStatusActive=Enabled -# CronStatusInactive=Disabled -# CronNoJobs=No jobs registered -# CronPriority=Priority -# CronLabel=Description -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job +CronNone= None +CronDtStart=Start date +CronDtEnd=End date +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe +CronMethod=Method +CronModule=Module +CronAction=Action +CronStatus=Status +CronStatusActive=Enabled +CronStatusInactive=Disabled +CronNoJobs=No jobs registered +CronPriority=Priority +CronLabel=Description +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create -# CronArgs=Parameters -# CronSaveSucess=Save succesfully -# CronNote=Comment -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable -# CronStatusInactiveBtn=Disable -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create +CronArgs=Parameters +CronSaveSucess=Save succesfully +CronNote=Comment +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable +CronStatusInactiveBtn=Disable +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Informazioa # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. 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/donations.lang b/htdocs/langs/eu_ES/donations.lang index 66ddea95a5c..f7aed91cf81 100644 --- a/htdocs/langs/eu_ES/donations.lang +++ b/htdocs/langs/eu_ES/donations.lang @@ -4,7 +4,7 @@ Donations=Donations DonationRef=Donation ref. Donor=Donor Donors=Donors -AddDonation=Add a donation +AddDonation=Create a donation NewDonation=New donation ShowDonation=Show donation DonationPromise=Gift promise @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/eu_ES/externalsite.lang index b915c37a5ab..da4853df0df 100644 --- a/htdocs/langs/eu_ES/externalsite.lang +++ b/htdocs/langs/eu_ES/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite -# ExternalSiteSetup=Setup link to external website -# ExternalSiteURL=External Site URL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteSetup=Setup link to external website +ExternalSiteURL=External Site URL +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/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/holiday.lang b/htdocs/langs/eu_ES/holiday.lang index c25abf6449c..f5b87fefb08 100644 --- a/htdocs/langs/eu_ES/holiday.lang +++ b/htdocs/langs/eu_ES/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Name Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/eu_ES/interventions.lang b/htdocs/langs/eu_ES/interventions.lang index 17641a0ab3e..c79da05364e 100644 --- a/htdocs/langs/eu_ES/interventions.lang +++ b/htdocs/langs/eu_ES/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Interventions InterventionCard=Intervention card NewIntervention=New intervention -AddIntervention=Add intervention +AddIntervention=Create intervention ListOfInterventions=List of interventions EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening 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 98e6dc335ee..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,12 +110,12 @@ 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. 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -133,6 +133,9 @@ Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang index fb9c953174b..103789691ef 100644 --- a/htdocs/langs/eu_ES/main.lang +++ b/htdocs/langs/eu_ES/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries GoToWikiHelpPage=Read online help (need Internet access) @@ -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 @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier @@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events NActionsLate=%s late +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Remove filter ChartGenerated=Chart generated @@ -415,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 @@ -426,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 @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToThirdParty=Link to another third party CreateDraft=Create draft +SetToDraft=Back to draft ClickToEdit=Click to edit ObjectDeleted=Object %s deleted ByCountry=By country @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/eu_ES/margins.lang b/htdocs/langs/eu_ES/margins.lang index e8d5fed1af9..606d5e5053a 100644 --- a/htdocs/langs/eu_ES/margins.lang +++ b/htdocs/langs/eu_ES/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=Product or Service AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=Start date EndDate=End date Launch=Start - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/eu_ES/orders.lang index 42444f0ec1c..6ee9c19fa95 100644 --- a/htdocs/langs/eu_ES/orders.lang +++ b/htdocs/langs/eu_ES/orders.lang @@ -1,168 +1,162 @@ # Dolibarr language file - Source file is en_US - orders -# OrdersArea=Customers orders area -# SuppliersOrdersArea=Suppliers orders area -# OrderCard=Order card -# OrderId=Order Id -# Order=Order -# Orders=Orders -# OrderLine=Order line -# OrderFollow=Follow up -# OrderDate=Order date -# OrderToProcess=Order to process -# NewOrder=New order -# ToOrder=Make order -# MakeOrder=Make order -# SupplierOrder=Supplier order -# SuppliersOrders=Suppliers orders -# SuppliersOrdersRunning=Current suppliers orders -# CustomerOrder=Customer order -# CustomersOrders=Customer's orders -# CustomersOrdersRunning=Current customer's orders -# CustomersOrdersAndOrdersLines=Customer orders and order's lines -# OrdersToValid=Customer's orders to validate -# OrdersToBill=Customer's orders delivered -# OrdersInProcess=Customer's orders in process -# OrdersToProcess=Customer's orders to process -# SuppliersOrdersToProcess=Supplier's orders to process -# StatusOrderCanceledShort=Canceled -# StatusOrderDraftShort=Draft -# StatusOrderValidatedShort=Validated -# StatusOrderSentShort=In process -# StatusOrderSent=Shipment in process -# StatusOrderOnProcessShort=Reception -# StatusOrderProcessedShort=Processed -# StatusOrderToBillShort=Delivered -# StatusOrderToBill2Short=To bill -# StatusOrderApprovedShort=Approved -# StatusOrderRefusedShort=Refused -# StatusOrderToProcessShort=To process -# StatusOrderReceivedPartiallyShort=Partially received -# StatusOrderReceivedAllShort=Everything received -# StatusOrderCanceled=Canceled -# StatusOrderDraft=Draft (needs to be validated) -# StatusOrderValidated=Validated -# StatusOrderOnProcess=Waiting to receive -# StatusOrderProcessed=Processed -# StatusOrderToBill=Delivered -# StatusOrderToBill2=To bill -# StatusOrderApproved=Approved -# StatusOrderRefused=Refused -# StatusOrderReceivedPartially=Partially received -# StatusOrderReceivedAll=Everything received -# ShippingExist=A shipment exists -# DraftOrWaitingApproved=Draft or approved not yet ordered -# DraftOrWaitingShipped=Draft or validated not yet shipped -# MenuOrdersToBill=Orders delivered -# MenuOrdersToBill2=Orders to bill -# SearchOrder=Search order -# SearchACustomerOrder=Search a customer order -# ShipProduct=Ship product -# Discount=Discount -# CreateOrder=Create Order -# RefuseOrder=Refuse order -# ApproveOrder=Accept order -# ValidateOrder=Validate order -# UnvalidateOrder=Unvalidate order -# DeleteOrder=Delete order -# CancelOrder=Cancel order -# AddOrder=Add order -# AddToMyOrders=Add to my orders -# AddToOtherOrders=Add to other orders -# AddToDraftOrders=Add to draft order -# ShowOrder=Show order -# NoOpenedOrders=No opened orders -# NoOtherOpenedOrders=No other opened orders -# NoDraftOrders=No draft orders -# OtherOrders=Other orders -# LastOrders=Last %s orders -# LastModifiedOrders=Last %s modified orders -# LastClosedOrders=Last %s closed orders -# AllOrders=All orders -# NbOfOrders=Number of orders -# OrdersStatistics=Order's statistics -# OrdersStatisticsSuppliers=Supplier order's statistics -# NumberOfOrdersByMonth=Number of orders by month -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) -# ListOfOrders=List of orders -# CloseOrder=Close order -# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. -# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. -# ConfirmDeleteOrder=Are you sure you want to delete this order ? -# ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? -# ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? -# ConfirmCancelOrder=Are you sure you want to cancel this order ? -# ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? -# GenerateBill=Generate invoice -# ClassifyShipped=Classify delivered -# ClassifyBilled=Classify billed -# ComptaCard=Accountancy card -# DraftOrders=Draft orders -# RelatedOrders=Related orders -# OnProcessOrders=In process orders -# RefOrder=Ref. order -# RefCustomerOrder=Ref. customer order -# CustomerOrder=Customer order -# RefCustomerOrderShort=Ref. cust. order -# SendOrderByMail=Send order by mail -# ActionsOnOrder=Events on order -# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order -# OrderMode=Order method -# AuthorRequest=Request author -# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address -# RunningOrders=Orders on process -# UserWithApproveOrderGrant=Users granted with "approve orders" permission. -# PaymentOrderRef=Payment of order %s -# CloneOrder=Clone order -# ConfirmCloneOrder=Are you sure you want to clone this order %s ? -# DispatchSupplierOrder=Receiving supplier order %s +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id +Order=Order +Orders=Orders +OrderLine=Order line +OrderFollow=Follow up +OrderDate=Order date +OrderToProcess=Order to process +NewOrder=New order +ToOrder=Make order +MakeOrder=Make order +SupplierOrder=Supplier order +SuppliersOrders=Suppliers orders +SuppliersOrdersRunning=Current suppliers orders +CustomerOrder=Customer order +CustomersOrders=Customer's orders +CustomersOrdersRunning=Current customer's orders +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customer's orders to validate +OrdersToBill=Customer's orders delivered +OrdersInProcess=Customer's orders in process +OrdersToProcess=Customer's orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderSentShort=In process +StatusOrderSent=Shipment in process +StatusOrderOnProcessShort=Reception +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=Delivered +StatusOrderToBill2Short=To bill +StatusOrderApprovedShort=Approved +StatusOrderRefusedShort=Refused +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received +StatusOrderCanceled=Canceled +StatusOrderDraft=Draft (needs to be validated) +StatusOrderValidated=Validated +StatusOrderOnProcess=Waiting to receive +StatusOrderProcessed=Processed +StatusOrderToBill=Delivered +StatusOrderToBill2=To bill +StatusOrderApproved=Approved +StatusOrderRefused=Refused +StatusOrderReceivedPartially=Partially received +StatusOrderReceivedAll=Everything received +ShippingExist=A shipment exists +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders +SearchOrder=Search order +SearchACustomerOrder=Search a customer order +ShipProduct=Ship product +Discount=Discount +CreateOrder=Create Order +RefuseOrder=Refuse order +ApproveOrder=Accept order +ValidateOrder=Validate order +UnvalidateOrder=Unvalidate order +DeleteOrder=Delete order +CancelOrder=Cancel order +AddOrder=Create order +AddToMyOrders=Add to my orders +AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order +ShowOrder=Show order +NoOpenedOrders=No opened orders +NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders +AllOrders=All orders +NbOfOrders=Number of orders +OrdersStatistics=Order's statistics +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +ListOfOrders=List of orders +CloseOrder=Close order +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +GenerateBill=Generate invoice +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s ##### Types de contacts ##### -# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order -# TypeContact_commande_internal_SHIPPING=Representative following-up shipping -# TypeContact_commande_external_BILLING=Customer invoice contact -# TypeContact_commande_external_SHIPPING=Customer shipping contact -# TypeContact_commande_external_CUSTOMER=Customer contact following-up order -# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order -# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping -# TypeContact_order_supplier_external_BILLING=Supplier invoice contact -# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact -# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order - -# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined -# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined -# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' -# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' -# Error_OrderNotChecked=No orders to invoice selected - +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected # Sources -# OrderSource0=Commercial proposal -# OrderSource1=Internet -# OrderSource2=Mail campaign -# OrderSource3=Phone compaign -# OrderSource4=Fax campaign -# OrderSource5=Commercial -# OrderSource6=Store -# QtyOrdered=Qty ordered -# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order - +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign +OrderSource5=Commercial +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order # Documents models -# PDFEinsteinDescription=A complete order model (logo...) -# PDFEdisonDescription=A simple order model -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes -# OrderByMail=Mail -# OrderByFax=Fax -# OrderByEMail=EMail -# OrderByWWW=Online -# OrderByPhone=Phone - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/eu_ES/oscommerce.lang b/htdocs/langs/eu_ES/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/eu_ES/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang index b56ef294495..88991888183 100644 --- a/htdocs/langs/eu_ES/other.lang +++ b/htdocs/langs/eu_ES/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/eu_ES/paybox.lang b/htdocs/langs/eu_ES/paybox.lang index b689bb6cebf..aced32a4944 100644 --- a/htdocs/langs/eu_ES/paybox.lang +++ b/htdocs/langs/eu_ES/paybox.lang @@ -1,37 +1,40 @@ # Dolibarr language file - Source file is en_US - paybox -# PayBoxSetup=PayBox module setup -# PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) -# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects -# PaymentForm=Payment form -# WelcomeOnPaymentPage=Welcome on our online payment service -# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. -# ThisIsInformationOnPayment=This is information on payment to do -# ToComplete=To complete -# YourEMail=Email to receive payment confirmation -# Creditor=Creditor -# PaymentCode=Payment code -# PayBoxDoPayment=Go on payment -# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information -# PleaseBePatient=Please, be patient -# Continue=Next -# ToOfferALinkForOnlinePayment=URL for %s payment -# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order -# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice -# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line -# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount -# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription -# YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. -# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. -# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. -# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. -# AccountParameter=Account parameters -# UsageParameter=Usage parameters -# InformationToFindParameters=Help to find your %s account information -# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment -# VendorName=Name of vendor -# CSSUrlForPaymentForm=CSS style sheet url for payment form -# MessageOK=Message on validated payment return page -# MessageKO=Message on canceled payment return page -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/eu_ES/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/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/sendings.lang b/htdocs/langs/eu_ES/sendings.lang index 2ae43f39766..f6111bac684 100644 --- a/htdocs/langs/eu_ES/sendings.lang +++ b/htdocs/langs/eu_ES/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang index 5d11b0fd7a0..06c502504e9 100644 --- a/htdocs/langs/eu_ES/stocks.lang +++ b/htdocs/langs/eu_ES/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=Location LocationSummary=Short name location NumberOfDifferentProducts=Number of different products 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/users.lang b/htdocs/langs/eu_ES/users.lang index 0afaab6ad7f..baf209f9d1c 100644 --- a/htdocs/langs/eu_ES/users.lang +++ b/htdocs/langs/eu_ES/users.lang @@ -63,7 +63,6 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group modified successfully +GroupModified=Group %s modified GroupDeleted=Group %s removed ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? @@ -114,8 +113,10 @@ YourRole=Your roles YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb of users DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang index 58ac3e252ec..ea32511fefb 100644 --- a/htdocs/langs/eu_ES/withdrawals.lang +++ b/htdocs/langs/eu_ES/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Unknown StatusWaiting=Waiting @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/fa_IR/accountancy.lang +++ b/htdocs/langs/fa_IR/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index 5d9b3c02c64..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=جعبه دسترس @@ -437,14 +440,14 @@ Module52Name=سهام Module52Desc=مدیریت انبار (محصول) Module53Name=خدمات Module53Desc=مدیریت خدمات -Module54Name=قراردادها -Module54Desc=قرارداد و خدمات مدیریت +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=بارکد 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=پروژه ها -Module400Desc=مدیریت پروژه در داخل ماژول های دیگر +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=هزینه های ویژه (مالیاتی، کمک های اجتماعی، سود سهام) @@ -484,7 +487,7 @@ Module500Desc=مدیریت هزینه های خاص مانند مالیات، م Module510Name=حقوق Module510Desc=مدیریت کارکنان حقوق و پرداخت Module600Name=اطلاعیه ها -Module600Desc=ارسال اطلاعیه ها از طریق ایمیل در برخی از وقایع کسب و کار Dolibarr به تماس با شخص ثالث +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=کمک های مالی Module700Desc=مدیریت کمک مالی Module1200Name=اخوندک @@ -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 کارفرما @@ -514,20 +521,20 @@ Module5000Name=چند شرکت Module5000Desc=اجازه می دهد تا به شما برای مدیریت شرکت های متعدد Module6000Name=گردش کار Module6000Desc=مدیریت گردش کار -Module20000Name=تعطیلات -Module20000Desc=اعلام و کارکنان تعطیلات را دنبال +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=نقطه ای از فروش Module50100Desc=نقطه ای از ماژول فروش -Module50200Name= پی پال -Module50200Desc= ماژول برای ارائه یک صفحه پرداخت آنلاین از طریق کارت اعتباری با پی پال +Module50200Name=پی پال +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=حاشیه @@ -606,15 +613,16 @@ Permission151=خوانده شده سفارشات ایستاده Permission152=ایجاد / تغییر درخواست سفارشات ایستاده Permission153=سفارشات ایستاده انتقال رسید Permission154=اعتبار / امتناع ایستاده سفارشات رسید -Permission161=خوانده شده قرارداد -Permission162=ایجاد / اصلاح قرارداد -Permission163=فعال کردن یک سرویس از یک قرارداد -Permission164=غیر فعال کردن یک سرویس از یک قرارداد -Permission165=حذف قرارداد -Permission171=خوانده شده سفر -Permission172=ایجاد / اصلاح سفر -Permission173=حذف سفر -Permission178=سفرهای صادرات +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=دفعات بازدید: تامین کنندگان Permission181=خوانده شده سفارشات کالا Permission182=ایجاد / تغییر سفارشات کالا @@ -671,7 +679,7 @@ Permission300=دفعات بازدید: بارکد Permission301=ایجاد / تغییر کدهای نوار Permission302=حذف کدهای نوار Permission311=خوانده شده خدمات -Permission312=اختصاص خدمات به قرارداد +Permission312=Assign service/subscription to contract Permission331=خوانده شده بوک مارک ها Permission332=ایجاد / تغییر بوک مارک ها Permission333=حذف بوک مارک ها @@ -701,8 +709,8 @@ Permission701=خوانده شده Permission702=ایجاد / تغییر کمک های مالی Permission703=حذف کمک های مالی Permission1001=خوانده شده سهام -Permission1002=ایجاد / تغییر سهام -Permission1003=حذف سهام +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=خوانده شده جنبش های سهام Permission1005=ایجاد / تغییر جنبش های سهام Permission1101=خوانده شده تحویل سفارشات @@ -778,6 +786,7 @@ DictionaryOrderMethods=مرتب سازی بر روش DictionarySource=منبع از پیشنهادات / سفارشات DictionaryAccountancyplan=نمودار حساب DictionaryAccountancysystem=مدل برای نمودار حساب +DictionaryEMailTemplates=Emails templates SetupSaved=راه اندازی نجات داد BackToModuleList=بازگشت به لیست ماژول ها BackToDictionaryList=برگشت به فهرست واژه نامه ها @@ -887,6 +896,7 @@ PermanentLeftSearchForm=فرم جستجو دائمی در منوی سمت چپ DefaultLanguage=زبان پیش فرض برای استفاده از (زبان) EnableMultilangInterface=فعال کردن رابط کاربری چند زبانه EnableShowLogo=نمایش لوگو را در منوی سمت چپ +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=سیستم شما با موفقیت به روز رسانی شده است CompanyInfo=شرکت / اطلاعات پایه CompanyIds=هویت شرکت / بنیاد @@ -1038,7 +1048,6 @@ YesInSummer=بله در فصل تابستان OnlyFollowingModulesAreOpenedToExternalUsers=توجه داشته باشید، فقط ماژول های زیر را به کاربران خارجی (هر چه باشد اجازه چنین کاربران) باز: SuhosinSessionEncrypt=ذخیره سازی جلسه رمز شده توسط Suhosin ConditionIsCurrently=وضعیت در حال حاضر از٪ s -TestNotPossibleWithCurrentBrowsers=تشخیص خودکار امکان پذیر نمی باشد YouUseBestDriver=شما با استفاده از راننده٪ است که بهترین راننده های موجود در حال حاضر. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=شما فقط٪ محصولات / خدمات را به پایگاه داده باشد. این به این مورد نیاز هر بهینه سازی خاص است. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=بازگشت یک کد حسابداری ساخته ش ModuleCompanyCodePanicum=بازگشت یک کد حسابداری خالی است. ModuleCompanyCodeDigitaria=کد حسابداری بستگی به کد های شخص ثالث. کد از شخصیت "C" در مقام اول و پس از آن 5 حرف اول کد های شخص ثالث تشکیل شده است. UseNotifications=استفاده از اطلاعیه -NotificationsDesc=ایمیل های اطلاعیه قابلیت اجازه می دهد تا شما را به سکوت، ارسال ایمیل به صورت خودکار، برای برخی از حوادث Dolibarr، به اشخاص ثالث (مشتریان یا تامین کنندگان) است که به پیکربندی شده است. انتخاب اطلاع رسانی و اهداف تماس با فعال یک حزب سوم در زمان ساخته شده است. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=اسناد قالب DocumentModelOdt=تولید اسناد از OpenDocuments قالب (. ODT و یا فایل های ODS برای آفیس اپن سورس کنند، KOffice، TextEdit، ...) WatermarkOnDraft=تعیین میزان مد آب در پیش نویس سند @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=توانایی اضافه کردن تاریخ تحوی UseOptionLineIfNoQuantity=یک خط از محصول / خدمات با مقدار صفر به عنوان یک گزینه در نظر گرفته FreeLegalTextOnProposal=متن رایگان در طرح های تجاری WatermarkOnDraftProposal=تعیین میزان مد آب در پیش نویس طرح تجاری (هیچ اگر خالی) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=راه اندازی مدیریت سفارش OrdersNumberingModules=سفارشات شماره مدل @@ -1146,6 +1156,7 @@ HideTreadedOrders=مخفی کردن سفارشات درمان و یا لغو د ValidOrderAfterPropalClosed=به اعتبار منظور پس از پیشنهاد نزدیک تر است، امکان به گام نیست به دستور موقت FreeLegalTextOnOrders=متن رایگان در سفارشات WatermarkOnDraftOrders=تعیین میزان مد آب به دستور پیش نویس (هیچ اگر خالی) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=کلیک کنید تا شماره گیری راه اندازی ماژول ClickToDialUrlDesc=آدرس نامیده می شود که با کلیک بر روی picto تلفن انجام می شود. در URL، شما می توانید برچسب ها
    __PHONETO__ خواهد شد که با شماره تلفن از فرد جایگزین را به تماس
    __PHONEFROM__ خواهد شد که با شماره تلفن تماس شخص (شما) به جای
    __LOGIN__ خواهد شد که با ورود clicktodial خود را جایگزین (تعریف شده در کارت کاربر شما)
    __PASS__ خواهد شد که با رمز عبور clicktodial شما (تعریف شده در کارت کاربر خود را) جایگزین شده است. @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=مداخله شماره مدل TemplatePDFInterventions=اسناد کارت مداخله مدل WatermarkOnDraftInterventionCards=تعیین میزان مد آب در اسناد کارت مداخله (هیچ اگر خالی) ##### Contracts ##### -ContractsSetup=راه اندازی ماژول قراردادها +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=قرارداد شماره ماژول ها TemplatePDFContracts=اسناد قرارداد مدل FreeLegalTextOnContracts=متن رایگان در قرارداد @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=فایل های از نوع٪ s را با HTTP سرور CacheByServer=کش سرور CacheByClient=کش شده توسط مرورگر CompressionOfResources=فشرده سازی از پاسخهای HTTP -TestNotPossibleWithCurrentBrowsers=تشخیص خودکار امکان پذیر نمی باشد +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=راه اندازی ماژول محصولات ServiceSetup=راه اندازی خدمات ماژول @@ -1382,9 +1393,10 @@ MailingSetup=ایمیل راه اندازی ماژول MailingEMailFrom=پست الکترونیکی فرستنده (از) برای ایمیل های فرستاده شده توسط ایمیل ماژول MailingEMailError=ایمیل بازگشت (خطاها به) برای ایمیل با اشتباهات ##### Notification ##### -NotificationSetup=بو هشدار از طریق راه اندازی ماژول ایمیل +NotificationSetup=EMail notification module setup NotificationEMailFrom=پست الکترونیکی فرستنده (از) برای ایمیل های ارسال شده اطلاعیه -ListOfAvailableNotifications=فهرست اطلاعیه در دسترس است (این لیست بستگی به ماژول های فعال) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=در حال ارسال راه اندازی ماژول SendingsReceiptModel=ارسال مدل رسید @@ -1412,8 +1424,9 @@ OSCommerceTestOk=اتصال به سرور '٪ s' را در پایگاه داده OSCommerceTestKo1=اتصال به کارگزار «٪ s 'موفق اما پایگاه داده'٪ s 'را نمی تواند رسید. OSCommerceTestKo2=اتصال به کارگزار «٪ s 'با کاربر'٪ s 'شکست خورده است. ##### Stock ##### -StockSetup=سهام ماژول تنظیمات -UserWarehouse=استفاده از سهام شخصی کاربر +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=منوی حذف TreeMenu=منوها درخت @@ -1478,11 +1491,14 @@ ClickToDialDesc=این ماژول اجازه می دهد تا پس از شمار ##### Point Of Sales (CashDesk) ##### CashDesk=نقطه ای از فروش CashDeskSetup=نقطه ای از راه اندازی ماژول فروش -CashDeskThirdPartyForSell=شخص ثالث عمومی به استفاده از برای فروش +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=پیش فرض حساب استفاده برای دریافت پرداخت های نقدی CashDeskBankAccountForCheque= پیش فرض حساب استفاده برای دریافت پرداخت توسط چک CashDeskBankAccountForCB= پیش فرض حساب استفاده برای دریافت پرداخت توسط کارت های اعتباری -CashDeskIdWareHouse=انبار استفاده برای فروش +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. ##### Bookmark ##### BookmarkSetup=راه اندازی ماژول چوب الف BookmarkDesc=این ماژول به شما اجازه مدیریت بوک مارک ها. شما همچنین می توانید کلید های میانبر برای هر صفحه Dolibarr و یا وب سایت های externale در منوی سمت چپ خود را اضافه کنید. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=حذف سال مالی ConfirmDeleteFiscalYear=آیا مطمئن هستید این سال مالی را حذف کنید؟ 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 +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=قالب TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang index 38229070eaa..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=مشاهده لیست @@ -41,9 +42,10 @@ AutoActions= پر کردن خودکار AgendaAutoActionDesc= تعریف اینجا رویدادی که می خواهید Dolibarr برای ایجاد به طور خودکار یک رویداد در دستور کار. اگر چیزی (به طور پیش فرض) انتخاب شود، فقط اقدامات تجاری خواهد شد در دستور کار گنجانده شده است. AgendaSetupOtherDesc= این صفحه فراهم می کند گزینه اجازه می دهد تا صادرات رویدادی Dolibarr خود را در تقویم های خارجی (تاندربرد، تقویم گوگل، ...) AgendaExtSitesDesc=این صفحه اجازه می دهد تا به اعلام منابع خارجی از تقویم برای دیدن رویدادی خود را در دستور کار Dolibarr. -ActionsEvents= رویدادهای که Dolibarr یک اقدام در دستور کار به طور خودکار ایجاد -PropalValidatedInDolibarr= پیشنهاد از٪ s معتبر -InvoiceValidatedInDolibarr= فاکتور٪ بازدید کنندگان اعتبار +ActionsEvents=رویدادهای که Dolibarr یک اقدام در دستور کار به طور خودکار ایجاد +PropalValidatedInDolibarr=پیشنهاد از٪ s معتبر +InvoiceValidatedInDolibarr=فاکتور٪ بازدید کنندگان اعتبار +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=فاکتور٪ s را به بازگشت به پیش نویس وضعیت InvoiceDeleteDolibarr=فاکتور٪ s را حذف OrderValidatedInDolibarr= منظور از٪ s معتبر @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=منظور از٪ s را تایید OrderRefusedInDolibarr=منظور از٪ s را رد کرد OrderBackToDraftInDolibarr=منظور از٪ s به بازگشت به پیش نویس وضعیت OrderCanceledInDolibarr=منظور از٪ s را لغو -InterventionValidatedInDolibarr=مداخله٪ بازدید کنندگان اعتبار ProposalSentByEMail=پیشنهاد تجاری٪ s ارسال با ایمیل OrderSentByEMail=سفارش مشتری٪ s ارسال با ایمیل InvoiceSentByEMail=صورت حساب به مشتری٪ s ارسال با ایمیل @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=تامین کننده نظم٪ s ارسال با ایم SupplierInvoiceSentByEMail=تامین کننده فاکتور٪ s ارسال با ایمیل ShippingSentByEMail=حمل و نقل٪ s ارسال با ایمیل ShippingValidated= حمل و نقل از٪ s معتبر -InterventionSentByEMail=مداخله٪ s ارسال با ایمیل -InterventionClassifiedBilled=مداخله٪ s در طبقه بندی گونه که اعلام شده NewCompanyToDolibarr= شخص ثالث ایجاد شده DateActionPlannedStart= تاریخ شروع برنامه ریزی شده DateActionPlannedEnd= تاریخ پایان برنامه ریزی شده @@ -70,9 +69,9 @@ DateActionStart= تاریخ شروع DateActionEnd= تاریخ پایان AgendaUrlOptions1=شما همچنین می توانید پارامترهای زیر برای فیلتر کردن خروجی اضافه: AgendaUrlOptions2=ورود =٪ s را برای محدود کردن خروجی به اقدامات ایجاد شده توسط، اختصاص یافته به و یا انجام شده توسط کاربر٪ s را. -AgendaUrlOptions3=logina =٪ s را برای محدود کردن خروجی به اقدامات ایجاد شده توسط کاربر٪ s را. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint =٪ s را برای محدود کردن خروجی به اقدامات داده شده به کاربر از٪ s. -AgendaUrlOptions5=logind =٪ s را برای محدود کردن خروجی به اقدامات انجام شده توسط کاربر٪ s را. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=نمایش تماس های تولد را AgendaHideBirthdayEvents=مخفی کردن تماس های تولد را Busy=مشغول @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=فایل مقرون URL برای دسترسی به. ExtSiteNoLabel=بدون شرح WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang index f99aff40d1f..7b7d6b27fd8 100644 --- a/htdocs/langs/fa_IR/bills.lang +++ b/htdocs/langs/fa_IR/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=توجه داشته باشید اعتباری InvoiceAvoirAsk=توجه داشته باشید اعتباری برای اصلاح صورت حساب InvoiceAvoirDesc=توجه داشته باشید اعتباری فاکتور منفی استفاده می شود برای حل این واقعیت است که فاکتور دارای مقدار است که از مقدار واقعا پرداخت می شود، متفاوت است (به دلیل مشتری های خطا بیش از حد پرداخت می شود، و یا به طور کامل پرداخت می شود چرا که او بازگشت برخی از محصولات به عنوان مثال) است. invoiceAvoirWithLines=ایجاد اعتبار توجه با خطوط از فاکتور مبدا -invoiceAvoirWithPaymentRestAmount=ایجاد اعتبار توجه با مقدار دریاچه منشاء فاکتور پرداخت در -invoiceAvoirLineWithPaymentRestAmount=مقدار اعتبار توجه از دریاچه پرداخت صورتحساب در +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=به جای صورتحساب از٪ s ReplacementInvoice=فاکتور تعویض ReplacedByInvoice=به جای صورتحساب از٪ s @@ -87,7 +87,7 @@ ClassifyCanceled=طبقه بندی 'رها' ClassifyClosed=طبقه بندی »بسته ' ClassifyUnBilled=Classify 'Unbilled' CreateBill=ایجاد فاکتور -AddBill=اضافه کردن فاکتور و یا اعتباری توجه داشته باشید +AddBill=Create invoice or credit note AddToDraftInvoices=اضافه کردن به پیش نویس فاکتور DeleteBill=حذف فاکتور SearchACustomerInvoice=جستجو برای یک صورتحساب مشتری @@ -99,7 +99,7 @@ DoPaymentBack=آیا پرداخت به عقب ConvertToReduc=تبدیل به تخفیف آینده EnterPaymentReceivedFromCustomer=پرداخت های دریافت شده از مشتری را وارد کنید EnterPaymentDueToCustomer=پرداخت با توجه به مشتری -DisabledBecauseRemainderToPayIsZero=غیر فعال به دلیل باقی مانده به پرداخت صفر است +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=مقدار PriceBase=پایه قیمت BillStatus=وضعیت فاکتور @@ -137,8 +137,6 @@ BillFrom=از BillTo=به ActionsOnBill=عملیات در فاکتور NewBill=صورت حساب جدید -Prélèvements=نظام نامه -Prélèvements=نظام نامه LastBills=تاریخ و زمان آخرین٪ s را فاکتورها LastCustomersBills=تاریخ و زمان آخرین٪ مشتریان فاکتورها LastSuppliersBills=تاریخ و زمان آخرین٪ بازدید کنندگان تامین کنندگان فاکتورها @@ -156,9 +154,9 @@ ConfirmCancelBill=آیا مطمئن هستید که می خواهید برای ConfirmCancelBillQuestion=چرا شما می خواهید برای طبقه بندی این فاکتور "رها"؟ ConfirmClassifyPaidPartially=آیا مطمئن هستید که می خواهید به تغییر صورت حساب٪ s به وضعیت پرداخت می شود؟ ConfirmClassifyPaidPartiallyQuestion=این فاکتور به طور کامل پرداخت نشده است. دلایل شما برای بستن این فاکتور ها چه هستند؟ -ConfirmClassifyPaidPartiallyReasonAvoir=باقی مانده به پرداخت (٪ S٪ بازدید کنندگان) تخفیف داده است به دلیل پرداخت قبل از واژه ساخته شده است. I تنظیم مالیات بر ارزش افزوده با توجه داشته باشید اعتباری. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=باقی مانده به پرداخت (٪ S٪ بازدید کنندگان) تخفیف داده است به دلیل پرداخت قبل از واژه ساخته شده است. من قبول می کنم به از دست دادن مالیات بر ارزش افزوده در این تخفیف. -ConfirmClassifyPaidPartiallyReasonDiscountVat=باقی مانده به پرداخت (٪ S٪ بازدید کنندگان) تخفیف داده است به دلیل پرداخت قبل از واژه ساخته شده است. I مالیات بر ارزش افزوده در این تخفیف بهبود می یابند بدون توجه داشته باشید اعتباری. +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=مشتری بد ConfirmClassifyPaidPartiallyReasonProductReturned=محصولات نیمه بازگشت ConfirmClassifyPaidPartiallyReasonOther=میزان دلیل دیگر رها @@ -191,9 +189,9 @@ AlreadyPaid=در حال حاضر پرداخت می شود AlreadyPaidBack=در حال حاضر باز پرداخت AlreadyPaidNoCreditNotesNoDeposits=در حال حاضر (بدون یادداشت های اعتباری و سپرده) پرداخت می شود Abandoned=متروک -RemainderToPay=باقی مانده به پرداخت -RemainderToTake=باقی مانده را به -RemainderToPayBack=باقی مانده به پرداخت +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=در انتظار AmountExpected=مقدار ادعا ExcessReceived=اضافی دریافت @@ -219,19 +217,18 @@ NoInvoice=بدون فاکتور ClassifyBill=طبقه بندی صورت حساب SupplierBillsToPay=تولید کنندگان فاکتورها به پرداخت CustomerBillsUnpaid=صورت حساب مشتریان پرداخت نشده -DispenseMontantLettres=این لایحه پیش نویس توسط mechanographical از نظم در نامه معاف هستند -DispenseMontantLettres=این لایحه پیش نویس توسط mechanographical از نظم در نامه معاف هستند +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=غیر قابل بازیابی SetConditions=تنظیم شرایط پرداخت SetMode=تنظیم حالت پرداخت Billed=ثبت شده در صورتحساب یا لیست -RepeatableInvoice=فاکتور از پیش تعریف شده -RepeatableInvoices=فاکتورها از پیش تعریف شده -Repeatable=از پیش تعریف شده -Repeatables=از پیش تعریف شده -ChangeIntoRepeatableInvoice=تبدیل به از پیش تعریف شده -CreateRepeatableInvoice=فاکتور ایجاد از پیش تعریف شده -CreateFromRepeatableInvoice=ایجاد از فاکتور از پیش تعریف شده +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=صورت حساب مشتری و خطوط صورت حساب را CustomersInvoicesAndPayments=صورت حساب مشتری و پرداخت ExportDataset_invoice_1=فهرست فاکتورها مشتری و خطوط صورت حساب را diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang index ac356400750..427073d5f48 100644 --- a/htdocs/langs/fa_IR/categories.lang +++ b/htdocs/langs/fa_IR/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=ارتباط بین تامین کنندگان و گروهها CatCusLinks=ارتباط بین مشتریان / چشم انداز ها و دسته ها CatProdLinks=لینک بین محصولات / خدمات و دسته ها CatMemberLinks=ارتباط بین اعضا و گروهها -CatProdLinks=لینک بین محصولات / خدمات و دسته ها -CatCusLinks=ارتباط بین مشتریان / چشم انداز ها و دسته ها -CatSupLinks=ارتباط بین تامین کنندگان و گروهها DeleteFromCat=حذف از گروه DeletePicture=تصویر حذف کنید ConfirmDeletePicture=تأیید حذف تصویر؟ @@ -112,3 +109,4 @@ CategoriesSetup=شاخه ها راه اندازی CategorieRecursiv=پیوند با گروه پدر و مادر به طور خودکار CategorieRecursivHelp=اگر فعال شود، محصول نیز به دسته پدر و مادر مرتبط است که با اضافه کردن به زیرشاخه AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang index a022470e51a..ecc5cfbf660 100644 --- a/htdocs/langs/fa_IR/compta.lang +++ b/htdocs/langs/fa_IR/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=بد کد حسابداری مشتری برا SuppliersProductsSellSalesTurnover=گردش مالی تولید شده توسط فروش محصولات تولید کننده است. CheckReceipt=چک سپرده CheckReceiptShort=چک سپرده +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=تخفیف های جدید NewCheckDeposit=واریز چک های جدید NewCheckDepositOn=ایجاد رسید سپرده در حساب:٪ s را @@ -196,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 2e9740faffc..66101dfbec6 100644 --- a/htdocs/langs/fa_IR/contracts.lang +++ b/htdocs/langs/fa_IR/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=منطقه قرارداد ListOfContracts=فهرست قرارداد -LastContracts=تاریخ و زمان آخرین٪ s در قرارداد اصلاح شده +LastModifiedContracts=Last %s modified contracts AllContracts=همه قراردادها ContractCard=کارت قرارداد ContractStatus=وضعیت قرارداد @@ -27,7 +27,7 @@ MenuRunningServices=در حال اجرا خدمات MenuExpiredServices=خدمات منقضی شده MenuClosedServices=خدمات بسته شده NewContract=قرارداد جدید -AddContract=اضافه کردن قرارداد +AddContract=Create contract SearchAContract=جستجوی یک قرارداد DeleteAContract=حذف یک قرارداد CloseAContract=بستن یک قرارداد @@ -53,7 +53,7 @@ ListOfRunningContractsLines=فهرست در حال اجرا خطوط قرارد ListOfRunningServices=لیست خدمات در حال اجرا NotActivatedServices=خدمات غیر فعال (در قرارداد اعتبار) BoardNotActivatedServices=خدمات برای فعال سازی در قرارداد اعتبار -LastContracts=تاریخ و زمان آخرین٪ s در قرارداد اصلاح شده +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/cron.lang b/htdocs/langs/fa_IR/cron.lang index d05a3a71902..ef96c9ca620 100644 --- a/htdocs/langs/fa_IR/cron.lang +++ b/htdocs/langs/fa_IR/cron.lang @@ -18,9 +18,8 @@ CronExplainHowToRunUnix=در محیط یونیکس شما باید crontab کا CronExplainHowToRunWin=در مایکروسافت، محصول محیط ویندوز شما می توانید ابزار کار برنامه ریزی شده برای اجرای خط فرمان در هر دقیقه استفاده # Menu CronJobs=شغل برنامه ریزی -CronListActive= لیست شغل ها فعال -CronListInactive= لیست شغل ها غیر فعال -CronListActive= لیست شغل ها فعال +CronListActive=List of active/scheduled jobs +CronListInactive=لیست شغل ها غیر فعال # Page list CronDateLastRun=تاریخ و زمان آخرین اجرا CronLastOutput=تاریخ و زمان آخرین خروجی اجرا @@ -62,7 +61,7 @@ CronObject= به عنوان مثال / شی برای ایجاد CronArgs=پارامترها CronSaveSucess=صرفه جویی در موفقیت CronNote=توضیح -CronFieldMandatory=زمینه های از%s الزامی است +CronFieldMandatory=زمینه های از٪ s الزامی است CronErrEndDateStartDt=تاریخ پایان نمی تواند قبل از تاریخ شروع می شود CronStatusActiveBtn=قادر ساختن CronStatusInactiveBtn=از کار انداختن @@ -83,5 +82,5 @@ CronType=نوع کار CronType_method=روش تماس از یک کلاس Dolibarr CronType_command=فرمان شل CronMenu=cron را -CronCannotLoadClass=آیا می توانم کلاس%s ​​را بار نیست و یا شی از%s +CronCannotLoadClass=آیا می توانم کلاس٪ s ​​را بار نیست و یا شی از٪ s UseMenuModuleToolsToAddCronJobs=برو به منوی "صفحه اصلی - ماژول ابزار - فهرست فرصت های شغلی" برای دیدن و ویرایش کار برنامه ریزی شده. diff --git a/htdocs/langs/fa_IR/donations.lang b/htdocs/langs/fa_IR/donations.lang index 784735cf920..27a5ed5f685 100644 --- a/htdocs/langs/fa_IR/donations.lang +++ b/htdocs/langs/fa_IR/donations.lang @@ -4,7 +4,7 @@ Donations=کمک های مالی DonationRef=کد عکس کمک مالی. Donor=دهنده Donors=اهدا کنندگان -AddDonation=اضافه کردن یک کمک مالی +AddDonation=Create a donation NewDonation=کمک مالی جدید ShowDonation=نمایش کمک مالی DonationPromise=وعده هدیه @@ -31,3 +31,8 @@ DonationRecipient=دریافت کننده کمک مالی ThankYou=با تشکر از شما IConfirmDonationReception=گیرنده اعلام پذیرش، به عنوان یک کمک مالی، از مقدار زیر MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/fa_IR/externalsite.lang index d2359ac5bb7..cf0df700d6e 100644 --- a/htdocs/langs/fa_IR/externalsite.lang +++ b/htdocs/langs/fa_IR/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=راه اندازی لينک به وب سايت های خارجی ExternalSiteURL=URL سايت خارجی ExternalSiteModuleNotComplete=ماژول سايت خارجی به درستی پيکربندی نشده است. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/fa_IR/holiday.lang b/htdocs/langs/fa_IR/holiday.lang index 691872b0e82..238eb5a9f12 100644 --- a/htdocs/langs/fa_IR/holiday.lang +++ b/htdocs/langs/fa_IR/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=به روز رسانی CantUpdate=You cannot update this leave request. NoDateDebut=شما باید یک تاریخ شروع انتخاب کنید. NoDateFin=شما باید تاریخ پایان را انتخاب کنید. -ErrorDureeCP=درخواست شما برای تعطیلات حاوی روز کار نمی کند. -TitleValidCP=تصویب تعطیلات درخواست +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=تاریخ تصویب TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=امتناع تعطیلات درخواست +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=شما باید دلیلی برای امتناع از درخواست را انتخاب کنید. -TitleCancelCP=لغو تعطیلات درخواست +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=دلیل امتناع DateRefusCP=تاریخ امتناع @@ -78,7 +77,7 @@ ActionByCP=انجام شده توسط UserUpdateCP=برای کاربر PrevSoldeCP=موجودی قبلی NewSoldeCP=موجودی جدید -alreadyCPexist=درخواست برای تعطیلات در حال حاضر در این دوره انجام می شود. +alreadyCPexist=A leave request has already been done on this period. UserName=نام Employee=کارمند FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=دستی به روز رسانی HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=تنظیمات ماژول تعطیلات +ConfCP=Configuration of leave request module DescOptionCP=شرح گزینه ValueOptionCP=ارزش -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=اعتبارسنجی پیکربندی -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=به روز رسانی با موفقیت. ErrorUpdateConfCP=خطا در به روز رسانی رخ داد، لطفا دوباره سعی کنید. -AddCPforUsers=لطفا تعادل از تعطیلات از کاربران با استفاده از Add اینجا را کلیک کنید . -DelayForSubmitCP=آخرین مهلت برای تعطیلات اعمال می شود -AlertapprobatortorDelayCP=جلوگیری از approbator اگر درخواست تعطیلات می کند مهلت مطابقت ندارد +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=معتبر ساختن UpdateEventCP=رویدادی به روز رسانی diff --git a/htdocs/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang index ab199ca3e6b..2b495fe60aa 100644 --- a/htdocs/langs/fa_IR/interventions.lang +++ b/htdocs/langs/fa_IR/interventions.lang @@ -3,7 +3,7 @@ Intervention=مداخله Interventions=مداخلات InterventionCard=کارت مداخله NewIntervention=مداخله های جدید -AddIntervention=اضافه کردن مداخله +AddIntervention=Create intervention ListOfInterventions=فهرست مداخلات EditIntervention=ویرایش مداخله ActionsOnFicheInter=عملیات مداخله @@ -30,6 +30,15 @@ StatusInterInvoiced=ثبت شده در صورتحساب یا لیست RelatedInterventions=مداخلات مرتبط ShowIntervention=نمایش مداخله SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=نماینده زیر تا مداخله TypeContact_fichinter_internal_INTERVENING=مداخله diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang index 16ad7ea3af3..e4bc57e2d42 100644 --- a/htdocs/langs/fa_IR/mails.lang +++ b/htdocs/langs/fa_IR/mails.lang @@ -1,8 +1,8 @@ # Dolibarr language file - Source file is en_US - mails Mailing=ارسال ایمیل EMailing=ارسال ایمیل -Mailings=EMailings -EMailings=EMailings +Mailings=ارسال ایمیل ها +EMailings=ارسال ایمیل ها AllEMailings=همه eMailings MailCard=ایمیل کارت MailTargets=اهداف @@ -14,13 +14,13 @@ MailErrorsTo=خطاها به MailReply=پاسخ به MailTo=گیرنده (ها) MailCC=کپی کنید به -MailCCC=نسخه های cache شده به +MailCCC=نسخه های کش شده به MailTopic=موضوع ایمیل MailText=پیام MailFile=فایل های پیوست شده MailMessage=متن ایمیل ShowEMailing=نمایش ایمیل -ListOfEMailings=فهرست emailings +ListOfEMailings=فهرست ارسال ایمیل ها NewMailing=ایمیل جدید EditMailing=ویرایش ایمیل ResetMailing=ارسال دوباره ایمیل @@ -29,7 +29,7 @@ DeleteAMailing=حذف ایمیل PreviewMailing=ایمیل پیش PrepareMailing=آماده ایمیل CreateMailing=ایجاد ایمیل -MailingDesc=این صفحه به شما اجازه ارسال emailings به یک گروه از مردم. +MailingDesc=این صفحه به شما اجازه ارسال ایمیل ها به یک گروه از مردم. MailingResult=ایمیل ارسال شود TestMailing=ایمیل تست ValidMailing=معتبر ایمیل @@ -103,8 +103,8 @@ MailingModuleDescContactsByFunction=تماس / آدرس اشخاص ثالث (م LineInFile=خط٪ در فایل RecipientSelectionModules=درخواست تعریف شده برای انتخاب گیرنده MailSelectedRecipients=دریافت کنندگان برگزیده -MailingArea=منطقه EMailings -LastMailings=تاریخ و زمان آخرین٪ s را emailings +MailingArea=منطقه ارسال ایمیل ها +LastMailings=تاریخ و زمان آخرین٪ s را ارسال ایمیل ها TargetsStatistics=آمار اهداف NbOfCompaniesContacts=تماس با ما منحصر به فرد / آدرس MailNoChangePossible=دریافت کنندگان برای ایمیل معتبر نمی تواند تغییر کند @@ -115,7 +115,7 @@ SentBy=ارسال شده توسط MailingNeedCommand=برای دلیل امنیت، با ارسال یک ایمیل بهتر است زمانی که از خط فرمان انجام می شود. اگر شما یکی، مدیر سرور خود بخواهید برای راه اندازی از دستور زیر برای ارسال ایمیل به همه گیرندگان: MailingNeedCommand2=با این حال شما می توانید آنها را به صورت آنلاین ارسال شده توسط اضافه کردن MAILING_LIMIT_SENDBYWEB پارامتر با مقدار حداکثر تعداد ایمیل های شما می خواهید به جلسه ارسال کنید. برای این کار، در خانه به - راه اندازی - سایر. ConfirmSendingEmailing=اگر نمی توانید و یا ترجیح می دهند از ارسال آنها را با مرورگر وب خود، لطفا تایید شما مطمئن هستید که می خواهید برای ارسال ایمیل با شرکت از مرورگر خود هستند؟ -LimitSendingEmailing=توجه داشته باشید: در خط ارسال از emailings برای امنیت و فاصله دلایل به٪ s دریافت کنندگان با ارسال وارد نمایید محدود شده است. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=لیست پاک کردن ToClearAllRecipientsClickHere=برای پاک کردن لیست دریافت کننده این ایمیل اینجا را کلیک کنید ToAddRecipientsChooseHere=اضافه کردن گیرندگان با انتخاب از لیست @@ -133,6 +133,9 @@ Notifications=اطلاعیه ها NoNotificationsWillBeSent=بدون اطلاعیه ها ایمیل ها برای این رویداد و شرکت برنامه ریزی ANotificationsWillBeSent=1 اطلاع رسانی خواهد شد از طریق ایمیل ارسال می شود SomeNotificationsWillBeSent=اطلاعیه٪ خواهد شد از طریق ایمیل ارسال می شود -AddNewNotification=فعال کردن یک درخواست ارسال ایمیل جدید -ListOfActiveNotifications=لیست همه درخواست ها ارسال ایمیل فعال +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=لیست همه اطلاعیه ها ایمیل فرستاده شده +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang index 5f81a10f1a0..a4a4471ebeb 100644 --- a/htdocs/langs/fa_IR/main.lang +++ b/htdocs/langs/fa_IR/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=برای پیدا کردن کاربر٪ ErrorNoVATRateDefinedForSellerCountry=خطا، هیچ نرخ مالیات بر ارزش افزوده تعریف شده برای این کشور شد '٪ s'. ErrorNoSocialContributionForSellerCountry=خطا، هیچ نوع کمک اجتماعی تعریف شده برای این کشور شد '٪ s'. ErrorFailedToSaveFile=خطا، موفق به صرفه جویی در فایل. -ErrorOnlyPngJpgSupported=خطا، تنها. PNG و. تصویر jpg فرمت فایل پشتیبانی می شوند. -ErrorImageFormatNotSupported=PHP شما توابع برای تبدیل تصاویر از این فرمت پشتیبانی نمی کند. SetDate=تاریخ تنظیم SelectDate=یک تاریخ را انتخاب کنید SeeAlso=همچنین نگاه کنید به٪ s را BackgroundColorByDefault=رنگ به طور پیش فرض پس زمینه +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=فایل برای پیوست انتخاب شده، اما هنوز ارسال نشده. بر روی "فایل ضمیمه" برای این کلیک کنید. NbOfEntries=Nb و از نوشته GoToWikiHelpPage=خوانده شده کمک آنلاین (نیاز به دسترسی به اینترنت) @@ -266,6 +266,7 @@ Afternoon=بعد از ظهر Quadri=چهارتایی MonthOfDay=ماه از روز HourShort=H +MinuteShort=mn Rate=نرخ UseLocalTax=شامل مالیات Bytes=بایت @@ -340,6 +341,7 @@ FullList=لیست کامل Statistics=ارقام OtherStatistics=آمار دیگر Status=وضعیت +Favorite=Favorite ShortInfo=اطلاعات. Ref=کد عکس. RefSupplier=کد عکس. تهیه کننده @@ -365,6 +367,7 @@ ActionsOnCompany=رویدادها در مورد این شخص ثالث ActionsOnMember=رویدادها در مورد این عضو NActions=٪ حوادث NActionsLate=٪ s در اواخر +RequestAlreadyDone=Request already recorded Filter=صافی RemoveFilter=حذف فیلتر ChartGenerated=نمودار تولید @@ -645,6 +648,7 @@ OptionalFieldsSetup=راه اندازی ویژگی های اضافی URLPhoto=URL عکس / آرم SetLinkToThirdParty=لینک به شخص ثالث دیگری CreateDraft=ایجاد پیش نویس +SetToDraft=Back to draft ClickToEdit=برای ویرایش کلیک کنید ObjectDeleted=شیء٪ s را حذف ByCountry=براساس کشور @@ -678,7 +682,7 @@ ViewPrivateNote=مشاهده یادداشت XMoreLines=٪ خط (بازدید کنندگان) پنهان PublicUrl=URL عمومی AddBox=اضافه کردن جعبه - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=دوشنبه Tuesday=سهشنبه diff --git a/htdocs/langs/fa_IR/margins.lang b/htdocs/langs/fa_IR/margins.lang index b5de2f43621..3bf987e19bf 100644 --- a/htdocs/langs/fa_IR/margins.lang +++ b/htdocs/langs/fa_IR/margins.lang @@ -38,4 +38,7 @@ BuyingCost=قیمت تمام شده UnitCharges=اتهامات واحد Charges=عوارض AgentContactType=عامل تجاری و نوع تماس -AgentContactTypeDetails=تعریف نوع آنچه در تماس با (مرتبط در فاکتورها) برای گزارش حاشیه های عامل تجاری استفاده می شود +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/fa_IR/orders.lang index d41523555b8..d99bc976c66 100644 --- a/htdocs/langs/fa_IR/orders.lang +++ b/htdocs/langs/fa_IR/orders.lang @@ -53,7 +53,7 @@ ShippingExist=حمل و نقل وجود دارد DraftOrWaitingApproved=پیش نویس و یا مورد تایید در عین حال دستور داده DraftOrWaitingShipped=پیش نویس و یا اعتبار هنوز حمل نشده است MenuOrdersToBill=سفارشات تحویل -MenuOrdersToBill2=سفارشات به لایحه +MenuOrdersToBill2=Billable orders SearchOrder=نتایج جستجو SearchACustomerOrder=جستجوی یک سفارش مشتری ShipProduct=محصول کشتی @@ -65,7 +65,7 @@ ValidateOrder=منظور اعتبارسنجی UnvalidateOrder=منظور Unvalidate DeleteOrder=به منظور حذف CancelOrder=جهت لغو -AddOrder=اضافه کردن منظور +AddOrder=Create order AddToMyOrders=اضافه کردن به سفارشات من AddToOtherOrders=اضافه کردن به دیگر سفارشات AddToDraftOrders=اضافه کردن به پیش نویس منظور @@ -75,8 +75,8 @@ NoOtherOpenedOrders=بدون دیگر سفارشات باز NoDraftOrders=بدون پیش نویس سفارشات OtherOrders=دیگر سفارشات LastOrders=تاریخ و زمان آخرین٪ بازدید کنندگان سفارشات -LastModifiedOrders=تاریخ و زمان آخرین%s در دستور تغییر -LastClosedOrders=تاریخ و زمان آخرین%s در دستور بسته +LastModifiedOrders=تاریخ و زمان آخرین٪ s در دستور تغییر +LastClosedOrders=تاریخ و زمان آخرین٪ s در دستور بسته AllOrders=تمام سفارشات NbOfOrders=تعداد سفارشات OrdersStatistics=آمار سفارش @@ -88,10 +88,10 @@ CloseOrder=نزدیک منظور ConfirmCloseOrder=آیا مطمئن هستید که میخواهید این منظور deliverd؟ پس از سفارش تحویل داده شده است، می توان آن را به صورتحساب تنظیم شده است. ConfirmCloseOrderIfSending=آیا مطمئن هستید که می خواهید برای بستن این دستور؟ شما باید منظور تنها زمانی که تمام حمل و نقل انجام می شود نزدیک است. ConfirmDeleteOrder=آیا مطمئن هستید که می خواهید این دستور را حذف کنید؟ -ConfirmValidateOrder=آیا مطمئن هستید که می خواهید به اعتبار این منظور با نام%s را؟ -ConfirmUnvalidateOrder=آیا مطمئن هستید که می خواهید برای بازگرداندن نظم به%s به پیش نویس وضعیت؟ +ConfirmValidateOrder=آیا مطمئن هستید که می خواهید به اعتبار این منظور با نام٪ s را؟ +ConfirmUnvalidateOrder=آیا مطمئن هستید که می خواهید برای بازگرداندن نظم به٪ s به پیش نویس وضعیت؟ ConfirmCancelOrder=آیا مطمئن هستید که می خواهید به لغو این منظور؟ -ConfirmMakeOrder=آیا مطمئن هستید که می خواهید برای تایید شما به این منظور در%s ساخته شده است؟ +ConfirmMakeOrder=آیا مطمئن هستید که می خواهید برای تایید شما به این منظور در٪ s ساخته شده است؟ GenerateBill=تولید صورت حساب ClassifyShipped=طبقه بندی تحویل ClassifyBilled=طبقه بندی صورتحساب @@ -110,10 +110,10 @@ AuthorRequest=درخواست نویسنده UseCustomerContactAsOrderRecipientIfExist=اگر به جای آدرس شخص ثالث به عنوان آدرس دریافت کننده منظور تعریف شده استفاده از آدرس ارتباط با مشتری RunningOrders=سفارشات در فرآیند UserWithApproveOrderGrant=کاربران داده با "سفارشات تایید" اجازه. -PaymentOrderRef=پرداخت منظور از%s +PaymentOrderRef=پرداخت منظور از٪ s CloneOrder=منظور کلون -ConfirmCloneOrder=آیا مطمئن هستید که می خواهید به کلون کردن این منظور از%s؟ -DispatchSupplierOrder=دریافت کننده کالا منظور از%s +ConfirmCloneOrder=آیا مطمئن هستید که می خواهید به کلون کردن این منظور از٪ s؟ +DispatchSupplierOrder=دریافت کننده کالا منظور از٪ s ##### Types de contacts ##### TypeContact_commande_internal_SALESREPFOLL=نماینده سفارش مشتری زیر به بالا TypeContact_commande_internal_SHIPPING=نماینده زیر را به بالا حمل و نقل @@ -128,8 +128,8 @@ TypeContact_order_supplier_external_CUSTOMER=منبع تماس با منبع ز Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON ثابت تعریف نشده Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON ثابت تعریف نشده -Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=برای بارگذاری ماژول پرونده «%s» شکست خورد -Error_FailedToLoad_COMMANDE_ADDON_File=برای بارگذاری ماژول پرونده «%s» شکست خورد +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=برای بارگذاری ماژول پرونده «٪ s» شکست خورد +Error_FailedToLoad_COMMANDE_ADDON_File=برای بارگذاری ماژول پرونده «٪ s» شکست خورد Error_OrderNotChecked=بدون سفارشات به فاکتور انتخاب شده # Sources OrderSource0=پیشنهاد تجاری @@ -154,10 +154,9 @@ OrderByPhone=تلفن CreateInvoiceForThisCustomer=سفارشات بیل NoOrdersToInvoice=بدون سفارشات قابل پرداخت CloseProcessedOrdersAutomatically=طبقه بندی "پردازش" سفارشات همه انتخاب شده است. -MenuOrdersToBill2=سفارشات به لایحه OrderCreation=خلقت Ordered=سفارش داده شده OrderCreated=سفارشات شما ساخته شده است OrderFail=خطا در هنگام ایجاد سفارشات شما اتفاق افتاده است CreateOrders=ایجاد سفارشات -ToBillSeveralOrderSelectCustomer=برای ایجاد یک فاکتور برای چند دستور، برای اولین بار بر روی مشتری را کلیک کنید، و سپس "%s" را انتخاب کنید. +ToBillSeveralOrderSelectCustomer=برای ایجاد یک فاکتور برای چند دستور، برای اولین بار بر روی مشتری را کلیک کنید، و سپس "٪ s" را انتخاب کنید. diff --git a/htdocs/langs/fa_IR/oscommerce.lang b/htdocs/langs/fa_IR/oscommerce.lang deleted file mode 100644 index a6668b2519f..00000000000 --- a/htdocs/langs/fa_IR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=نظام التشغيل والتجارة -OSCommerceSetup=نظام تشغيل وحدة التجارة الإعداد -OSCommerceSetupSaved=التجارة إعداد نظام التشغيل الموفرة -OSCommerceServer=نظام تشغيل الخادم المضيف التجارة / الملكية الفكرية -OSCommerceDatabaseName=اسم قاعدة بيانات نظام التشغيل والتجارة -OSCommercePrefix=نظام التشغيل التجاري بادئة الجداول -OSCommerceUser=قاعدة بيانات التجارة ادخل نظام التشغيل diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang index 7b74f9b840a..a510a002ae4 100644 --- a/htdocs/langs/fa_IR/other.lang +++ b/htdocs/langs/fa_IR/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=کد امنیتی Calendar=تقویم -AddTrip=اضافه کردن سفر Tools=ابزار ToolsDesc=این منطقه به گروه ابزار دیگر در دسترس را به دیگر نوشته های منو نمی اختصاص یافته است.

    این ابزار را می توانید از منوی سمت رسیده است. Birthday=جشن تولد @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=ایجاد پروژه Notify_TASK_CREATE=وظیفه ایجاد Notify_TASK_MODIFY=وظیفه اصلاح شده Notify_TASK_DELETE=وظیفه حذف +SeeModuleSetup=See module setup NbOfAttachedFiles=تعداد فایل های پیوست / اسناد TotalSizeOfAttachedFiles=اندازه کل فایل های پیوست / اسناد MaxSize=حداکثر اندازه @@ -75,13 +75,23 @@ DemoCompanyShopWithCashDesk=مدیریت یک فروشگاه با یک میز ن DemoCompanyProductAndStocks=مدیریت یک شرکت کوچک یا متوسط ​​فروش محصولات DemoCompanyAll=مدیریت یک شرکت کوچک یا متوسط ​​با فعالیت های متعدد (تمام ماژول های اصلی) GoToDemo=برو به نسخه ی نمایشی -CreatedBy=ایجاد شده توسط%s -ModifiedBy=اصلاح شده توسط%s -ValidatedBy=تایید شده توسط%s -CanceledBy=لغو شده توسط%s -ClosedBy=بسته شده توسط%s -FileWasRemoved=فایل%s حذف شد -DirWasRemoved=شاخه%s حذف شد +CreatedBy=ایجاد شده توسط٪ s +ModifiedBy=اصلاح شده توسط٪ s +ValidatedBy=تایید شده توسط٪ s +CanceledBy=لغو شده توسط٪ s +ClosedBy=بسته شده توسط٪ s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed +FileWasRemoved=فایل٪ s حذف شد +DirWasRemoved=شاخه٪ s حذف شد FeatureNotYetAvailableShort=موجود در نسخه های بعدی FeatureNotYetAvailable=ویژگی هنوز در این نسخه در دسترس نیست FeatureExperimental=از ویژگی های تجربی. در این نسخه پایدار نیست @@ -137,10 +147,10 @@ SizeUnitpoint=نقطه BugTracker=اشکالات SendNewPasswordDesc=این فرم به شما اجازه درخواست رمز عبور جدید. از آن خواهد شد به آدرس الکترونیک شما ارسال می کند.
    تغییر تنها پس از کلیک کردن بر روی لینک تایید در داخل این ایمیل موثر خواهد بود.
    نرم افزار ایمیل خوان خود را چک کنید. BackToLoginPage=بازگشت به صفحه ورود -AuthenticationDoesNotAllowSendNewPassword=نحوه تایید%s است.
    در این حالت، Dolibarr نمی توانند بفهمند و نه رمز عبور خود را تغییر دهید.
    تماس با مدیر سیستم شما اگر می خواهید رمز عبور خود را تغییر دهید. +AuthenticationDoesNotAllowSendNewPassword=نحوه تایید٪ s است.
    در این حالت، Dolibarr نمی توانند بفهمند و نه رمز عبور خود را تغییر دهید.
    تماس با مدیر سیستم شما اگر می خواهید رمز عبور خود را تغییر دهید. EnableGDLibraryDesc=نصب و یا فعال کتابخانه GD با PHP خود را برای استفاده از این گزینه. EnablePhpAVModuleDesc=شما نیاز به نصب یک ماژول سازگار با آنتی ویروس خود را. (ClamAV درحال: PHP4-clamavlib OU PHP5-clamavlib) -ProfIdShortDesc=پروفسور کد از%s اطلاعات بسته به کشور های شخص ثالث است.
    به عنوان مثال، برای کشور٪، این کد٪ بازدید کنندگان است. +ProfIdShortDesc=پروفسور کد از٪ s اطلاعات بسته به کشور های شخص ثالث است.
    به عنوان مثال، برای کشور٪، این کد٪ بازدید کنندگان است. DolibarrDemo=Dolibarr ERP / CRM نسخه ی نمایشی StatsByNumberOfUnits=آمار در تعدادی از محصولات / خدمات واحد StatsByNumberOfEntities=آمار در تعداد اشخاص مراجعه کننده @@ -154,15 +164,15 @@ NumberOfUnitsCustomerOrders=تعداد واحد در سفارش مشتری در NumberOfUnitsCustomerInvoices=تعداد واحد در صورت حساب مشتری در گذشته 12 ماه NumberOfUnitsSupplierOrders=تعداد واحد در سفارشات کالا در گذشته 12 ماه NumberOfUnitsSupplierInvoices=تعداد واحد در فاکتورها منبع در گذشته 12 ماه -EMailTextInterventionValidated=مداخله%s را دارای اعتبار بوده است. -EMailTextInvoiceValidated=صورتحساب%s را دارای اعتبار بوده است. -EMailTextProposalValidated=این پیشنهاد از%s دارای اعتبار بوده است. -EMailTextOrderValidated=منظور از%s دارای اعتبار بوده است. -EMailTextOrderApproved=منظور از%s تایید شده است. -EMailTextOrderApprovedBy=منظور از%s شده توسط%s تایید شده است. -EMailTextOrderRefused=منظور از%s رد شده است. -EMailTextOrderRefusedBy=منظور از%s شده توسط%s خودداری کرد. -EMailTextExpeditionValidated=حمل و نقل از%s دارای اعتبار بوده است. +EMailTextInterventionValidated=مداخله٪ s را دارای اعتبار بوده است. +EMailTextInvoiceValidated=صورتحساب٪ s را دارای اعتبار بوده است. +EMailTextProposalValidated=این پیشنهاد از٪ s دارای اعتبار بوده است. +EMailTextOrderValidated=منظور از٪ s دارای اعتبار بوده است. +EMailTextOrderApproved=منظور از٪ s تایید شده است. +EMailTextOrderApprovedBy=منظور از٪ s شده توسط٪ s تایید شده است. +EMailTextOrderRefused=منظور از٪ s رد شده است. +EMailTextOrderRefusedBy=منظور از٪ s شده توسط٪ s خودداری کرد. +EMailTextExpeditionValidated=حمل و نقل از٪ s دارای اعتبار بوده است. ImportedWithSet=واردات مجموعه داده DolibarrNotification=اطلاع رسانی به صورت خودکار ResizeDesc=عرض جدید OR ارتفاع جدید را وارد کنید. نسبت در طول تغییر اندازه نگه داشته ... @@ -172,7 +182,7 @@ NewSizeAfterCropping=اندازه های جدید پس از برداشت DefineNewAreaToPick=تعریف منطقه جدید روی تصویر انتخاب کنید (کلیک چپ بر روی تصویر بکشید تا زمانی که شما رسیدن به گوشه مقابل) CurrentInformationOnImage=این ابزار برای کمک به شما برای تغییر اندازه و یا برش یک تصویر طراحی شده است. این اطلاعات بر روی تصویر ویرایش شده در حال حاضر است ImageEditor=ویرایشگر تصویر -YouReceiveMailBecauseOfNotification=شما این پیام را دریافت خواهید کرد چرا که ایمیل شما به لیست از اهداف به حوادث خاص به٪ نرم افزار از%s را مطلع اضافه شده است. +YouReceiveMailBecauseOfNotification=شما این پیام را دریافت خواهید کرد چرا که ایمیل شما به لیست از اهداف به حوادث خاص به٪ نرم افزار از٪ s را مطلع اضافه شده است. YouReceiveMailBecauseOfNotification2=این رویداد به شرح زیر است: ThisIsListOfModules=این یک لیست از ماژول های از پیش انتخاب شده توسط این مشخصات نسخه ی نمایشی (فقط ماژول های متداول در این نسخه ی نمایشی قابل مشاهده هستند) است. ویرایش این را به یک نسخه ی نمایشی شخصی تر و با کلیک بر روی "شروع". ClickHere=اینجا را کلیک کنید @@ -187,31 +197,32 @@ PleaseBePatient=لطفا صبور باشید ... RequestToResetPasswordReceived=درخواست رمز عبور Dolibarr خود را تغییر دریافت شده است NewKeyIs=این کلید جدید خود را برای ورود به سایت است NewKeyWillBe=کلید جدید را برای ورود به نرم افزار خواهد بود -ClickHereToGoTo=برای رفتن به%s اینجا را کلیک کنید +ClickHereToGoTo=برای رفتن به٪ s اینجا را کلیک کنید YouMustClickToChange=با این حال شما باید اول بر روی لینک زیر کلیک کنید تا اعتبار این تغییر رمز عبور ForgetIfNothing=اگر شما این تغییر را درخواست نکرده، فقط این ایمیل را فراموش کرده ام. اعتبار نامه های شما امن نگهداری می شود. ##### Calendar common ##### -AddCalendarEntry=اضافه کردن ورودی در تقویم از%s -NewCompanyToDolibarr=شرکت%s را اضافه در Dolibarr -ContractValidatedInDolibarr=قرارداد٪ بازدید کنندگان معتبر در Dolibarr -ContractCanceledInDolibarr=قرارداد%s را لغو در Dolibarr -ContractClosedInDolibarr=قرارداد٪ در Dolibarr بسته -PropalClosedSignedInDolibarr=پیشنهاد از%s امضا در Dolibarr -PropalClosedRefusedInDolibarr=پیشنهاد٪ در Dolibarr رد کرد -PropalValidatedInDolibarr=پیشنهاد از%s معتبر در Dolibarr -InvoiceValidatedInDolibarr=فاکتور٪ بازدید کنندگان معتبر در Dolibarr -InvoicePaidInDolibarr=فاکتور%s به پرداخت در Dolibarr تغییر -InvoiceCanceledInDolibarr=فاکتور%s را لغو در Dolibarr -PaymentDoneInDolibarr=پرداخت٪ انجام در Dolibarr -CustomerPaymentDoneInDolibarr=پرداخت مشتری٪ انجام در Dolibarr -SupplierPaymentDoneInDolibarr=پرداخت کننده٪ انجام در Dolibarr -MemberValidatedInDolibarr=کاربران از%s معتبر در Dolibarr -MemberResiliatedInDolibarr=کاربران از%s resiliated در Dolibarr -MemberDeletedInDolibarr=اعضا%s را حذف شده از Dolibarr -MemberSubscriptionAddedInDolibarr=اشتراک برای عضو از%s اضافه شده در Dolibarr -ShipmentValidatedInDolibarr=حمل و نقل از%s معتبر در Dolibarr -ShipmentDeletedInDolibarr=حمل و نقل از%s حذف شده از Dolibarr +AddCalendarEntry=اضافه کردن ورودی در تقویم از٪ s +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=صادرات ExportsArea=منطقه صادرات diff --git a/htdocs/langs/fa_IR/paybox.lang b/htdocs/langs/fa_IR/paybox.lang index 9bfcecfda66..68289a6810d 100644 --- a/htdocs/langs/fa_IR/paybox.lang +++ b/htdocs/langs/fa_IR/paybox.lang @@ -4,7 +4,7 @@ PayBoxDesc=این ماژول صفحات پیشنهاد به اجازه پردا FollowingUrlAreAvailableToMakePayments=از آدرس های زیر در دسترس است به ارائه یک صفحه به مشتریان به پرداخت در اشیاء Dolibarr است PaymentForm=فرم پرداخت WelcomeOnPaymentPage=در سرویس پرداخت آنلاین ما خوش آمدید -ThisScreenAllowsYouToPay=این صفحه نمایش به شما اجازه ایجاد پرداخت آنلاین به%s. +ThisScreenAllowsYouToPay=این صفحه نمایش به شما اجازه ایجاد پرداخت آنلاین به٪ s. ThisIsInformationOnPayment=این اطلاعات در پرداخت به انجام است ToComplete=برای تکمیل YourEMail=ایمیل برای دریافت تاییدیه پرداخت @@ -14,14 +14,14 @@ PayBoxDoPayment=برو در پرداخت YouWillBeRedirectedOnPayBox=شما می توانید در صفحه خزانه امن برای ورودی هدایت می شوید اطلاعات کارت اعتباری شما PleaseBePatient=لطفا صبور باشید Continue=بعد -ToOfferALinkForOnlinePayment=URL برای%s پرداخت +ToOfferALinkForOnlinePayment=URL برای٪ s پرداخت ToOfferALinkForOnlinePaymentOnOrder=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای سفارش مشتری ToOfferALinkForOnlinePaymentOnInvoice=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای صورتحساب مشتری ToOfferALinkForOnlinePaymentOnContractLine=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای قرارداد خط ToOfferALinkForOnlinePaymentOnFreeAmount=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای مقدار رایگان ToOfferALinkForOnlinePaymentOnMemberSubscription=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای به اشتراک عضو YouCanAddTagOnUrl=شما همچنین می توانید پارامتر URL و برچسب = مقدار را به هر یک از این URL (فقط برای پرداخت رایگان مورد نیاز) برای اضافه کردن خود برچسب توضیحات پرداخت خود اضافه کنید. -SetupPayBoxToHavePaymentCreatedAutomatically=راه اندازی خزانه خود را با آدرس%s را به پرداخت زمانی که توسط خزانه اعتبار به طور خودکار ساخته. +SetupPayBoxToHavePaymentCreatedAutomatically=راه اندازی خزانه خود را با آدرس٪ s را به پرداخت زمانی که توسط خزانه اعتبار به طور خودکار ساخته. YourPaymentHasBeenRecorded=این صفحه تایید می کند که پرداخت شما ثبت شده است. متشکرم. YourPaymentHasNotBeenRecorded=شما پرداخت ثبت شده است نیست و معامله لغو شده است. متشکرم. AccountParameter=پارامترهای حساب @@ -35,3 +35,6 @@ MessageKO=پیام در لغو صفحه بازگشت پرداخت NewPayboxPaymentReceived=پرداخت خزانه های جدید را دریافت کرد NewPayboxPaymentFailed=پرداخت خزانه جدید تلاش کردند اما موفق PAYBOX_PAYONLINE_SENDEMAIL=ایمیل پس از پرداخت برای هشدار دادن به (موفقیت یا شکست خورده) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/fa_IR/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang index ad9ad62b6d1..0ecdd9a541a 100644 --- a/htdocs/langs/fa_IR/sendings.lang +++ b/htdocs/langs/fa_IR/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=برای لحظه ای، ایجاد یک محم RelatedShippings=shippings های مرتبط ShipmentLine=خط حمل و نقل CarrierList=فهرست از حمل و نقل +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=گرفتن توسط مشتری diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang index 059e4d06e2d..dff23d21bfa 100644 --- a/htdocs/langs/fa_IR/stocks.lang +++ b/htdocs/langs/fa_IR/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=برچسب انبار مورد نیاز است CorrectStock=سهام صحیح ListOfWarehouses=لیست انبار ListOfStockMovements=فهرست جنبش های سهام -StocksArea=منطقه سهام +StocksArea=Warehouses area Location=محل LocationSummary=محل نام کوتاه NumberOfDifferentProducts=تعداد محصولات مختلف diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang index 45f1d1cd7ae..b33a2ba9e1e 100644 --- a/htdocs/langs/fa_IR/users.lang +++ b/htdocs/langs/fa_IR/users.lang @@ -38,7 +38,7 @@ NewUser=کاربر تازه CreateUser=ساخت کاربر SearchAGroup=جستجوی یک گروه SearchAUser=جستجوی یک کاربر -LoginNotDefined=ادخل ليست محددة. +LoginNotDefined=ورود به تعریف نیست. NameNotDefined=اسم غير محدد. ListOfUsers=لیست کاربران Administrator=Administrator @@ -63,7 +63,6 @@ ShowGroup=نمایش گروه ShowUser=نمایش کاربر NonAffectedUsers=کاربران غیر اختصاص داده UserModified=کاربر با موفقیت به اصلاح -GroupModified=گروه با موفقیت اصلاح شده PhotoFile=فایل نگاره UserWithDolibarrAccess=کاربر با دسترسی Dolibarr ListOfUsersInGroup=لیست کاربران در این گروه @@ -103,7 +102,7 @@ UserDisabled=کاربر %s ناپویا شد UserEnabled=کاربر %s پویا شد. UserDeleted=کاربر %s پاک کشد NewGroupCreated=گروه %s ساخته شد -GroupModified=گروه با موفقیت اصلاح شده +GroupModified=Group %s modified GroupDeleted=گروه٪ s را حذف ConfirmCreateContact=آیا مطمئن هستید که می خواهید برای ایجاد یک حساب Dolibarr برای این مخاطب؟ ConfirmCreateLogin=آیا مطمئن هستید که می خواهید برای ایجاد یک حساب Dolibarr برای این عضو؟ @@ -114,8 +113,10 @@ YourRole=roleهای شما YourQuotaOfUsersIsReached=سهمیه شما از کاربران فعال رسیده است! NbOfUsers=NB از کاربران DontDowngradeSuperAdmin=فقط قسمت مدیریت می توانید یک قسمت مدیریت جمع و جور کردن -HierarchicalResponsible=سلسله مراتبی مسئول +HierarchicalResponsible=Supervisor HierarchicView=دیدگاه سلسله مراتبی UseTypeFieldToChange=استفاده از نوع رشته به تغییر OpenIDURL=URL OpenID LoginUsingOpenID=استفاده از حساب کاربری برای ورود به سایت +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang index e7d54cdb466..5262a10dba1 100644 --- a/htdocs/langs/fa_IR/withdrawals.lang +++ b/htdocs/langs/fa_IR/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=دریافت LastWithdrawalReceipts=تاریخ و زمان آخرین٪ بازدید کنندگان رسید خروج WithdrawedBills=فاکتورها خارج WithdrawalsLines=خطوط برداشت -RequestStandingOrderToTreat=درخواست دستورات برای درمان ایستاده -RequestStandingOrderTreated=درخواست دستورات ایستاده درمان +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=سفارشات ایستاده با مشتری CustomerStandingOrder=مشتری منظور ایستاده NbOfInvoiceToWithdraw=نیوبیوم. از فاکتور با برداشت درخواست @@ -40,14 +41,13 @@ TransMetod=طريقة البث Send=فرستادن Lines=خطوط StandingOrderReject=شماره رد -InvoiceRefused=فاکتور خودداری کرد WithdrawalRefused=برداشت خودداری کرد WithdrawalRefusedConfirm=آیا مطمئن هستید که می خواهید را وارد کنید رد عقب نشینی برای جامعه RefusedData=تاریخ رد RefusedReason=دلیلی برای رد RefusedInvoicing=حسابداری رد NoInvoiceRefused=آیا رد اتهام نیست -InvoiceRefused=فاکتور خودداری کرد +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=وضعیت StatusUnknown=ناشناخته StatusWaiting=انتظار @@ -76,21 +76,22 @@ WithBankUsingRIB=برای حساب های بانکی با استفاده از RI WithBankUsingBANBIC=برای حساب های بانکی با استفاده از IBAN / BIC / SWIFT BankToReceiveWithdraw=حساب بانکی برای دریافت خارج CreditDate=در اعتباری -WithdrawalFileNotCapable=قادر به تولید خروج فایل رسید برای کشور شما +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=پرداخت سفارش ثابت٪ توسط بانک -InfoCreditMessage=منظور ایستاده٪ بازدید کنندگان شده است توسط بانک پرداخت می شود
    اطلاعات پرداخت:%s را +InfoCreditMessage=منظور ایستاده٪ بازدید کنندگان شده است توسط بانک پرداخت می شود
    اطلاعات پرداخت:٪ s را InfoTransSubject=انتقال ایستاده منظور٪ به بانک -InfoTransMessage=منظور ایستاده%s بر به بانک توسط%s%s ارسال شد.

    -InfoTransData=مقدار:%s را
    روش: از%s
    تاریخ:%s را +InfoTransMessage=منظور ایستاده٪ s بر به بانک توسط٪ s٪ s ارسال شد.

    +InfoTransData=مقدار:٪ s را
    روش: از٪ s
    تاریخ:٪ s را InfoFoot=این یک پیام خودکار ارسال شده توسط Dolibarr است InfoRejectSubject=منظور ایستاده خودداری کرد -InfoRejectMessage=سلام،

    به ترتیب ایستاده از فاکتور%s را مربوط به شرکت٪، با میزان٪ بازدید کنندگان شده است توسط بانک خودداری کرد.

    -
    از%s +InfoRejectMessage=سلام،

    به ترتیب ایستاده از فاکتور٪ s را مربوط به شرکت٪، با میزان٪ بازدید کنندگان شده است توسط بانک خودداری کرد.

    -
    از٪ s ModeWarning=انتخاب برای حالت واقعی تنظیم نشده بود، ما بعد از این شبیه سازی را متوقف کند diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/fi_FI/accountancy.lang +++ b/htdocs/langs/fi_FI/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index fd74d1ebe1b..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 @@ -437,14 +440,14 @@ Module52Name=Varastot Module52Desc=Varastojen hallinnan tuotteet Module53Name=Palvelut Module53Desc=Palvelut hallinto -Module54Name=Sopimukset -Module54Desc=Sopimukset "ja palvelujen hallinta +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Viivakoodi 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=Projektit -Module400Desc=Hankkeiden hallinnointia sisällä muiden moduulien +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Ilmoitukset -Module600Desc=Lähetä ilmoitukset (sähköposti) on Dolibarr liiketoiminnan tapahtumat +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Lahjoitukset Module700Desc=Lahjoitukset hallinto Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-yhtiö Module5000Desc=Avulla voit hallita useita yrityksiä Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Kassa-moduuli -Module50200Name= Paypal -Module50200Desc= Moduuli tarjoaa online-maksu-sivulla luottokortilla PayPal +Module50200Name=Paypal +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 @@ -606,15 +613,16 @@ Permission151=Lue pysyvän tilaukset Permission152=Setup pysyvän tilaukset Permission153=Lue pysyvän tilaukset kuitit Permission154=Luotto / kieltäytyä toistuvaissuoritukset kuitit -Permission161=Lue sopimukset -Permission162=Luoda / muuttaa sopimuksia -Permission163=Ota palvelua koskeva sopimus -Permission164=Poista palvelua koskeva sopimus -Permission165=Poista sopimukset -Permission171=Lue matkat -Permission172=Luoda / muuttaa matkat -Permission173=Poista matkoja -Permission178=Vienti matkat +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Lue toimittajat Permission181=Lue toimittaja tilaukset Permission182=Luoda / muuttaa toimittajan tilaukset @@ -671,7 +679,7 @@ Permission300=Lue viivakoodin Permission301=Luoda / muuttaa viivakoodin Permission302=Poista viivakoodin Permission311=Lue palvelut -Permission312=Määritä palvelun sopimus +Permission312=Assign service/subscription to contract Permission331=Lue kirjanmerkit Permission332=Luoda / muuttaa kirjanmerkkejä Permission333=Poista kirjanmerkkien @@ -701,8 +709,8 @@ Permission701=Lue lahjoitukset Permission702=Luoda / muuttaa lahjoitusten Permission703=Poista lahjoitukset Permission1001=Lue varastot -Permission1002=Luoda / muuttaa varastot -Permission1003=Poista varastot +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Lue varastossa liikkeitä Permission1005=Luoda / muuttaa varastossa liikkeitä Permission1101=Lue lähetysluetteloihin @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Paluu kirjanpitoyrityksen koodi rakentanut %s, jota se ModuleCompanyCodePanicum=Palata tyhjään kirjanpitotietojen koodi. ModuleCompanyCodeDigitaria=Kirjanpito-koodi riippuu kolmannen osapuolen koodi. Koodi koostuu merkin "C" ensimmäisessä kanta seurasi ensimmäisen 5 merkkiä kolmannen osapuolen koodi. UseNotifications=Käytä ilmoitukset -NotificationsDesc=Ilmoitusten avulla voit hiljaa lähettää automaattisia sähköposti, joidenkin Dolibarr tapahtumat, yrityksille, jotka on määritetty +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Asiakirjat mallit DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Vesileima asiakirjaluonnos @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Lisää toimituspäivää kyky UseOptionLineIfNoQuantity=Rivi tuotteen / palvelun nolla määrä pidetään vaihtoehto FreeLegalTextOnProposal=Vapaa tekstihaku kaupallisiin ehdotuksia WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Tilaukset hallinto-setup OrdersNumberingModules=Tilaukset numerointiin modules @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Validoimiseksi tilauksen jälkeen ehdotus lähempänä, on mahdollista olla askel väliaikaisen jotta FreeLegalTextOnOrders=Vapaa tekstihaku tilauksissa WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Napsauttamalla Dial-moduulin asetukset ClickToDialUrlDesc=Url kutsutaan kun napsautat puhelimen picto on tehty. Dans l'url, vous pouvez käytä les baliiseja
    %% 1 $ s qui seerumien remplac par le tlphone de l'appelbr>%% 2 $ s qui seerumien remplac par le tlphone de l'appelant (le votre)
    %% 3 $ s qui seerumien remplac par votre sisäänkirjoittautumissivuksesi clicktodial (dfini sur votre fiche utilisateur)
    %% 4 $ s qui seerumien remplac par votre mot de elähtänyt clicktodial (dfini sur votre fiche utilisateur). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Väliintulo numerointiin modules TemplatePDFInterventions=Väliintulo kortin asiakirjojen malleja WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Sopimukset moduuli setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Sopimukset numerointi moduulit TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Tuotteet Moduuli setup ServiceSetup=Services-moduuli asennus @@ -1382,9 +1393,10 @@ MailingSetup=Sähköpostituksen moduulin asetukset MailingEMailFrom=Sender EMail (From) sähköpostiviestit lähetetään sähköpostitse moduuli MailingEMailError=Return Sähköpostiosoite (Virheet-to) koskevat sähköpostit virheistä ##### Notification ##### -NotificationSetup=Mailing moduulin asetukset +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) sähköpostiviestit lähetetään ilmoitukset -ListOfAvailableNotifications=Luettelo käytettävissä olevista ilmoituksista (Tämä luettelo riippuu aktivoitujen moduulit) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Lähetysvalinnat-moduulin asetukset SendingsReceiptModel=Lähettävä vastaanottanut malli @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Yhteys palvelimeen ' %s' on tietokanta' %s' kanssa käyttäjä OSCommerceTestKo1=Yhteys palvelimeen ' %s' onnistua mutta tietokanta' %s' ei tavoitettu. OSCommerceTestKo2=Yhteys palvelimeen ' %s' kanssa käyttäjä' %s' failed. ##### Stock ##### -StockSetup=Kokoonpano moduuli varastossa -UserWarehouse=Käytä käyttäjän henkilökohtaisia varastot +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Valikko poistettu TreeMenu=Tree valikot @@ -1478,11 +1491,14 @@ ClickToDialDesc=Tämän moduulin avulla voidaan lisätä kuvake jälkeen puhelin ##### Point Of Sales (CashDesk) ##### CashDesk=Point of myynti CashDeskSetup=Kassa-moduulin asetukset -CashDeskThirdPartyForSell=Generic kolmas osapuoli käyttää myy +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Rahat tilille käyttää myy CashDeskBankAccountForCheque= Tilin käyttö vastaanottaa maksuja sekillä CashDeskBankAccountForCB= Tilin käyttö voidaan saada käteismaksujen luottokorttia -CashDeskIdWareHouse=Datawarehous käyttäjän ja myy +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. ##### Bookmark ##### BookmarkSetup=Kirjanmerkin moduulin asetukset BookmarkDesc=Tämän moduulin avulla voit hallita kirjanmerkkejä. Voit myös lisätä linkkejä mihin tahansa Dolibarr sivuja tai externale webbisivuilta vasemmalla valikossa. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang index 552a7ccfae1..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 @@ -41,9 +42,10 @@ AutoActions= Automaattinen täyttö Esityslistan AgendaAutoActionDesc= Määritä tässä tapahtumia joihin haluat Dolibarr luoda automaattisesti toimia asialistalla. Jos mitään ei tarkastettu (oletuksena), vain ruumiillisen toimien on oltava mukana esityslistalla. AgendaSetupOtherDesc= Tämän sivun avulla määrittää muita muuttujia Esityslistan moduuli. AgendaExtSitesDesc=Tällä sivulla voit ilmoittaa ulkoisten kalenterien näkemään tapahtumiin otetaan Dolibarr asialistalle. -ActionsEvents= Tapahtumat, joista Dolibarr luo toimia esityslistan automaattisesti -PropalValidatedInDolibarr= Ehdotus validoitava -InvoiceValidatedInDolibarr= Laskun validoitava +ActionsEvents=Tapahtumat, joista Dolibarr luo toimia esityslistan automaattisesti +PropalValidatedInDolibarr=Ehdotus validoitava +InvoiceValidatedInDolibarr=Laskun validoitava +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Laskun %s palata luonnos tila InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Tilaa validoitava @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Tilaa %s hyväksytty OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Tilaa %s palata luonnos tila OrderCanceledInDolibarr=Tilaus %s peruutettu -InterventionValidatedInDolibarr=Intervention %s validoitu ProposalSentByEMail=Liiketoimintaehdotukset %s lähetetään sähköpostilla OrderSentByEMail=Asiakas tilaa %s lähetetään sähköpostilla InvoiceSentByEMail=Asiakas lasku %s lähetetään sähköpostilla @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Toimittaja järjestys %s lähetetään sähköpostilla SupplierInvoiceSentByEMail=Toimittaja lasku %s lähetetään sähköpostilla ShippingSentByEMail=Toimitus %s lähetetään sähköpostilla ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s lähetetään sähköpostilla -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Kolmannen osapuolen luonut DateActionPlannedStart= SUUNNITELTU ALKAMISPÄIVÄ DateActionPlannedEnd= Suunniteltu lopetuspäivämäärää @@ -70,9 +69,9 @@ DateActionStart= Aloituspäivämäärä DateActionEnd= Lopetuspäivä AgendaUrlOptions1=Voit myös lisätä seuraavat parametrit suodattaa output: AgendaUrlOptions2=login=login= %s rajoittaa tuotannon toimiin luotu, vaikuttaa tavalla tai tehdä käyttäjä %s. -AgendaUrlOptions3=logina=logina= %s rajoittaa tuotannon toimiin luotu käyttäjän %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=logint= %s rajoittaa tuotannon toimet vaikuttavat käyttäjän %s. -AgendaUrlOptions5=logind=sisäänkirj= %s rajoittaa tuotannon toimet tehdään käyttäjän %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Näytä syntymäpäivä yhteyksiä AgendaHideBirthdayEvents=Piilota syntymäpäivä yhteyksiä Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL päästä. ICal-tiedostona ExtSiteNoLabel=Ei kuvausta WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang index 1c3b5c7abb9..8bcaee8c4c9 100644 --- a/htdocs/langs/fi_FI/bills.lang +++ b/htdocs/langs/fi_FI/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Menoilmoitus InvoiceAvoirAsk=Menoilmoitus korjata laskun InvoiceAvoirDesc=Luoton merkintä on negatiivinen lasku käytetään ratkaista se, että lasku on määrä, joka on erilainen kuin määrä todella maksetaan (koska asiakas maksanut liikaa virheitä, tai ei maksanut kokonaan, koska hän palasi joitakin tuotteita esimerkiksi).

    Huomautus: Alkuperäinen lasku on jo päättynyt ( "maksetaan" tai "maksetaan osittain"), jonka avulla luodaan menoilmoitus sitä. invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Korvaa laskun %s ReplacementInvoice=Korvaus lasku ReplacedByInvoice=Korvaaminen laskun %s @@ -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=Lisää laskun tai menoilmoitus +AddBill=Luo lasku / hyvityslasku AddToDraftInvoices=Add to draft invoice DeleteBill=Poista lasku SearchACustomerInvoice=Haku asiakkaan laskussa @@ -99,7 +99,7 @@ DoPaymentBack=Onko maksaminen takaisin ConvertToReduc=Muunna tulevaisuudessa edullisista EnterPaymentReceivedFromCustomer=Kirjoita maksun saanut asiakas EnterPaymentDueToCustomer=Tee maksun asiakkaan -DisabledBecauseRemainderToPayIsZero=Disabled koska jäävä palkka on nolla +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Määrä PriceBase=Hinta base BillStatus=Laskun tila @@ -137,8 +137,6 @@ BillFrom=Mistä BillTo=Billistä ActionsOnBill=Toimet lasku NewBill=Uusi lasku -Prélèvements=Kestotilaus -Prélèvements=Kestotilaus LastBills=Viimeisin %s laskut LastCustomersBills=Viimeisin %s asiakkaiden laskut LastSuppliersBills=Viimeisin %s tavarantoimittajien laskut @@ -156,9 +154,9 @@ ConfirmCancelBill=Oletko varma, että haluat peruuttaa laskun %s? ConfirmCancelBillQuestion=Miksi haluat luokitella tämän kauppalaskuilmoituksen "hylätty"? ConfirmClassifyPaidPartially=Oletko varma, että haluat muuttaa laskun %s tila maksetaan? ConfirmClassifyPaidPartiallyQuestion=Tämä lasku ei ole maksanut kokonaan. Mitkä ovat syyt voit sulkea tämän laskun? -ConfirmClassifyPaidPartiallyReasonAvoir=Jäävä palkka ( %s %s) on alennus myönnettiin, koska maksu suoritettiin ennen aikavälillä. I säännönmukaistaa alv luotto-merkintä. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Jäävä palkka ( %s %s) on alennus myönnettiin, koska maksu suoritettiin ennen aikavälillä. Hyväksyn menettää alv-alennusta. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Jäävä palkka ( %s %s) on alennus myönnettiin, koska maksu suoritettiin ennen aikavälillä. I perittävä alv-alennus ilman luotto-merkintä. +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=Huono asiakas ConfirmClassifyPaidPartiallyReasonProductReturned=Tuotteet osittain palautettu ConfirmClassifyPaidPartiallyReasonOther=Määrä luovuttamiseen muu syy @@ -191,9 +189,9 @@ AlreadyPaid=Jo maksanut AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=On jo maksettu (ilman hyvityslasku ja talletukset) Abandoned=Hylätyt -RemainderToPay=Jäävä palkka -RemainderToTake=Jäävä ottaa -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Määrä väitti ExcessReceived=Trop Peru @@ -219,19 +217,18 @@ NoInvoice=N: o lasku ClassifyBill=Luokittele lasku SupplierBillsToPay=Tavarantoimittajat laskut maksaa CustomerBillsUnpaid=Maksamattomat asiakkaiden laskut -DispenseMontantLettres=Les valmistaa rdiges par procdsmcanographiques sont vapauttaa de l'arrt en lettres -DispenseMontantLettres=Les valmistaa rdiges par procdsmcanographiques sont vapauttaa de l'arrt en lettres +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Ei-korvattaviksi SetConditions=Aseta maksuehdot SetMode=Aseta maksun tila Billed=Laskutetun -RepeatableInvoice=Ennalta määriteltyjen lasku -RepeatableInvoices=Ennalta määriteltyjen laskut -Repeatable=Ennalta määriteltyjen -Repeatables=Ennalta määriteltyjen -ChangeIntoRepeatableInvoice=Muuntavat ennalta määriteltyjen -CreateRepeatableInvoice=Luo ennalta määriteltyjen lasku -CreateFromRepeatableInvoice=Luo ennalta määriteltyjen lasku +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Asiakas laskut ja laskujen "linjat CustomersInvoicesAndPayments=Asiakas laskut ja maksut ExportDataset_invoice_1=Asiakas laskujen luettelo ja laskut "linjat @@ -297,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 @@ -396,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/categories.lang b/htdocs/langs/fi_FI/categories.lang index 2ecd727bd47..7fcb659df3b 100644 --- a/htdocs/langs/fi_FI/categories.lang +++ b/htdocs/langs/fi_FI/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang index 24aeaa3bf4d..2d006ade127 100644 --- a/htdocs/langs/fi_FI/compta.lang +++ b/htdocs/langs/fi_FI/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad asiakas kirjanpitotietojen koodi %s SuppliersProductsSellSalesTurnover=Luotu liikevaihto myynti toimittajien tuotteita. CheckReceipt=Tarkista tallettaa CheckReceiptShort=Tarkista tallettaa +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Uusi edullisista NewCheckDeposit=Uusi tarkistaa talletus NewCheckDepositOn=Uusi tarkistaa talletuksen huomioon: %s @@ -196,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 34a4b588692..8d44a9b256e 100644 --- a/htdocs/langs/fi_FI/contracts.lang +++ b/htdocs/langs/fi_FI/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Sopimukset alueella ListOfContracts=Luetteloa sopimuksista -LastContracts=Viimeisin %s muunnettu sopimukset +LastModifiedContracts=Last %s modified contracts AllContracts=Kaikki sopimukset ContractCard=Sopimus-kortti ContractStatus=Sopimus asema @@ -27,7 +27,7 @@ MenuRunningServices=Käynnissä olevat palvelut MenuExpiredServices=Lakkaa palvelut MenuClosedServices=Suljettu palvelut NewContract=Uusi sopimus -AddContract=Lisää sopimuksen +AddContract=Create contract SearchAContract=Haku sopimuksen DeleteAContract=Poista sopimuksen CloseAContract=Sulje sopimuksen @@ -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=Viimeisin %s muunnettu sopimukset +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/cron.lang b/htdocs/langs/fi_FI/cron.lang index ba1942578e4..597852e41b8 100644 --- a/htdocs/langs/fi_FI/cron.lang +++ b/htdocs/langs/fi_FI/cron.lang @@ -18,9 +18,8 @@ CronExplainHowToRunUnix=Unix ympäristössä sinun tulee käyttää crontabia aj CronExplainHowToRunWin=Microsoft(tm) Windows ympäristössä voit käyttää ajastetut tehtävät -työkalua ajaaksesi komentorivin minuuteittain # Menu CronJobs=Scheduled jobs -CronListActive= Aktiivisten tehtävien lista -CronListInactive= Hylättyjen tehtävien lista -CronListActive= Aktiivisten tehtävien lista +CronListActive=List of active/scheduled jobs +CronListInactive=Hylättyjen tehtävien lista # Page list CronDateLastRun=Viimeinen ajo CronLastOutput=Viimeisen ajon tulostus 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/donations.lang b/htdocs/langs/fi_FI/donations.lang index 81e404b0520..85d041a84cf 100644 --- a/htdocs/langs/fi_FI/donations.lang +++ b/htdocs/langs/fi_FI/donations.lang @@ -4,7 +4,7 @@ Donations=Lahjoitukset DonationRef=Donation ref. Donor=Rahoittajien Donors=Luovuttajat -AddDonation=Lisää lahjoitus +AddDonation=Create a donation NewDonation=Uusi lahjoitus ShowDonation=Show donation DonationPromise=Gift lupaus @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/fi_FI/externalsite.lang index 2f417fb2da9..565918db18f 100644 --- a/htdocs/langs/fi_FI/externalsite.lang +++ b/htdocs/langs/fi_FI/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Setup linkki ulkoiseen sivustoon ExternalSiteURL=Ulkoisen sivuston osoite (URL) ExternalSiteModuleNotComplete=Ulkoisen sivuston Moduuli ei ole oikein konfiguroitu. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang index e65cdff6f76..67fd6390553 100644 --- a/htdocs/langs/fi_FI/holiday.lang +++ b/htdocs/langs/fi_FI/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Päivittää CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Nimi Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/fi_FI/interventions.lang b/htdocs/langs/fi_FI/interventions.lang index e2d0c226b5b..672722c112a 100644 --- a/htdocs/langs/fi_FI/interventions.lang +++ b/htdocs/langs/fi_FI/interventions.lang @@ -3,7 +3,7 @@ Intervention=Väliintulo Interventions=Interventions InterventionCard=Interventio-kortti NewIntervention=Uusi -AddIntervention=Lisää interventioelimen +AddIntervention=Create intervention ListOfInterventions=Luettelo interventioiden EditIntervention=Editer interventioelimen ActionsOnFicheInter=Toimia interventio @@ -30,6 +30,15 @@ StatusInterInvoiced=Laskutetaan RelatedInterventions=Liittyvissä toimissa ShowIntervention=Näytä interventio SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Edustajan seuraamaan interventioelimen TypeContact_fichinter_internal_INTERVENING=Sääntely diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang index cbaac35666d..59a4f74abc8 100644 --- a/htdocs/langs/fi_FI/mails.lang +++ b/htdocs/langs/fi_FI/mails.lang @@ -115,7 +115,7 @@ SentBy=Lähettänyt 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=Voit kuitenkin lähettää ne online lisäämällä parametri MAILING_LIMIT_SENDBYWEB kanssa arvo max määrä sähköpostit haluat lähettää istunnossa. 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Tyhjennä lista ToClearAllRecipientsClickHere=Voit tyhjentää vastaanottajien luetteloon tässä sähköpostitse napsauttamalla painiketta ToAddRecipientsChooseHere=Jos haluat lisätä vastaanottajia, valitse niissä luetellaan @@ -133,6 +133,9 @@ Notifications=Ilmoitukset NoNotificationsWillBeSent=Ei sähköposti-ilmoituksia on suunniteltu tähän tapahtumaan ja yritys ANotificationsWillBeSent=1 ilmoituksesta lähetetään sähköpostitse SomeNotificationsWillBeSent=%s ilmoitukset lähetetään sähköpostitse -AddNewNotification=Ota uusi ilmoitus pyynnöstä -ListOfActiveNotifications=Listaa kaikki aktiiviset ilmoitukset pyynnöt +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Listaa kaikki sähköposti-ilmoitukset lähetetään +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang index ca7f338003c..6a9d1d51cda 100644 --- a/htdocs/langs/fi_FI/main.lang +++ b/htdocs/langs/fi_FI/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Ei onnistunut löytämään käyttäjä ErrorNoVATRateDefinedForSellerCountry=Virhe ei alv määritellään maa ' %s'. ErrorNoSocialContributionForSellerCountry=Virhe, ei sosiaaliturvamaksujen tyyppi määritellään maan %s ". ErrorFailedToSaveFile=Virhe, ei tallenna tiedosto. -ErrorOnlyPngJpgSupported=Virhe vain. Png-ja. Jpg-kuvien muoto tiedosto ovat tuettuja. -ErrorImageFormatNotSupported=Sinun PHP ei tue toimintoja muuntaa kuvia tätä muotoa. SetDate=Aseta päivä SelectDate=Valitse päivä SeeAlso=See also %s BackgroundColorByDefault=Default taustaväri +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=Tiedosto on valittu liite mutta ei ollut vielä ladattu. Klikkaa "Liitä tiedosto" tätä. NbOfEntries=Huom Merkintöjen GoToWikiHelpPage=Lue online-ohjeesta (tarvitaan Internet-yhteys) @@ -266,6 +266,7 @@ Afternoon=Iltapäivä Quadri=Quadri MonthOfDay=Kuukaudenpäivä HourShort=H +MinuteShort=mn Rate=Kurssi UseLocalTax=Sisältää veron Bytes=Tavua @@ -340,6 +341,7 @@ FullList=Täydellinen luettelo Statistics=Tilastot OtherStatistics=Muut tilastot Status=Tila +Favorite=Favorite ShortInfo=Info. Ref=Viite RefSupplier=Toimittajan viite @@ -365,6 +367,7 @@ ActionsOnCompany=Sidosryhmien tapahtumat ActionsOnMember=Jäsenen tapahtumat NActions=%s tapahtumat NActionsLate=%s myöhässä +RequestAlreadyDone=Request already recorded Filter=Suodata RemoveFilter=Poista suodatin ChartGenerated=Luo kuvio @@ -645,6 +648,7 @@ OptionalFieldsSetup=Lisäominaisuuksien asetukset URLPhoto=Kuvan tai logon url SetLinkToThirdParty=Linkki toiseen sidosryhmään CreateDraft=Luo luonnos +SetToDraft=Back to draft ClickToEdit=Klikkaa muokataksesi ObjectDeleted=Kohde %s poistettu ByCountry=Maittain @@ -678,7 +682,7 @@ ViewPrivateNote=Katso huomiot XMoreLines=%s rivi(ä) piilossa PublicUrl=Julkinen URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Maanantai Tuesday=Tiistai diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang index 57744280f23..157c88b9941 100644 --- a/htdocs/langs/fi_FI/margins.lang +++ b/htdocs/langs/fi_FI/margins.lang @@ -1,33 +1,27 @@ # 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 DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - 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 - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/fi_FI/orders.lang index ac475213a74..e0ccee7ebb4 100644 --- a/htdocs/langs/fi_FI/orders.lang +++ b/htdocs/langs/fi_FI/orders.lang @@ -2,7 +2,7 @@ OrdersArea=Asiakkaiden tilausten alueella SuppliersOrdersArea=Toimittajien tilaukset alueella OrderCard=Tilaa kortti -# OrderId=Order Id +OrderId=Order Id Order=Tilata Orders=Tilaukset OrderLine=Tilaa linja @@ -28,7 +28,7 @@ StatusOrderCanceledShort=Peruutettu StatusOrderDraftShort=Vedos StatusOrderValidatedShort=Validoidut StatusOrderSentShort=Meneillään -# StatusOrderSent=Shipment in process +StatusOrderSent=Shipment in process StatusOrderOnProcessShort=Prosessissa StatusOrderProcessedShort=Jalostettu StatusOrderToBillShort=Bill @@ -53,9 +53,9 @@ ShippingExist=Lähetys olemassa DraftOrWaitingApproved=Esitys tai hyväksytty ei vielä määrännyt DraftOrWaitingShipped=Esitys tai validoitua ole vielä lähetetty MenuOrdersToBill=Tilaukset laskuttaa -# MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Haku jotta -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=Laiva tuote Discount=Discount CreateOrder=Luo Tilaa @@ -65,14 +65,14 @@ ValidateOrder=Validate jotta UnvalidateOrder=Unvalidate järjestys DeleteOrder=Poista jotta CancelOrder=Peruuta tilaus -AddOrder=Lisää jotta +AddOrder=Create order AddToMyOrders=Add to my tilaukset AddToOtherOrders=Lisää muut tilaukset -# AddToDraftOrders=Add to draft order +AddToDraftOrders=Add to draft order ShowOrder=Näytä jotta NoOpenedOrders=N: o avataan tilaukset NoOtherOpenedOrders=Mikään muu avataan tilaukset -# NoDraftOrders=No draft orders +NoDraftOrders=No draft orders OtherOrders=Muut tilaukset LastOrders=Viimeisin %s tilaukset LastModifiedOrders=Viimeisin %s muunnettu tilaukset @@ -82,7 +82,7 @@ NbOfOrders=Määrä tilauksia OrdersStatistics=Tilaukset tilastot OrdersStatisticsSuppliers=Toimittaja tilaukset tilastot NumberOfOrdersByMonth=Määrä tilauksia kuukausittain -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=Luettelo tilaukset CloseOrder=Sulje jotta ConfirmCloseOrder=Oletko varma, että haluat sulkea tämän tilauksen? Kun tilaus on päättynyt, se voidaan laskuttaa. @@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Oletko varma että haluat palauttaa järjestyksen %stilauksen %s? GenerateBill=Luo lasku -# ClassifyShipped=Classify delivered +ClassifyShipped=Classify delivered ClassifyBilled=Luokittele "Laskutetun" ComptaCard=Kirjanpito-kortti DraftOrders=Luonnos tilaukset @@ -101,7 +101,6 @@ RelatedOrders=Aiheeseen liittyvät tilaukset OnProcessOrders=Prosessissa tilaukset RefOrder=Ref. tilata RefCustomerOrder=Ref. asiakas jotta -CustomerOrder=Asiakas jotta RefCustomerOrderShort=Ref. asiakasnumero. tilata SendOrderByMail=Lähetä tilata postitse ActionsOnOrder=Toimia, jotta @@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON ole m Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON ole määritelty Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file ' %s' Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file ' %s' -# Error_OrderNotChecked=No orders to invoice selected - - +Error_OrderNotChecked=No orders to invoice selected # Sources OrderSource0=Kaupalliset ehdotus OrderSource1=Internet @@ -144,25 +141,22 @@ OrderSource5=Kaupalliset OrderSource6=Varastoida QtyOrdered=Kpl velvoitti AddDeliveryCostLine=Lisää toimitus kustannukset linja ilmoitetaan paino, jotta - # Documents models PDFEinsteinDescription=Täydellinen jotta malli (logo. ..) PDFEdisonDescription=Yksinkertainen, jotta malli -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes OrderByMail=Posti OrderByFax=Faksin OrderByEMail=Sähköposti OrderByWWW=Online OrderByPhone=Puhelin - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/fi_FI/oscommerce.lang b/htdocs/langs/fi_FI/oscommerce.lang deleted file mode 100644 index 6bc36861b5a..00000000000 --- a/htdocs/langs/fi_FI/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce moduulin asetukset -OSCommerceSetupSaved=OS Commerce asetukset tallennetaan -OSCommerceServer=OS Commerce Server isännän / ip -OSCommerceDatabaseName=OS Commerce tietokannan nimi -OSCommercePrefix=OS Commerce taulukot etuliite -OSCommerceUser=OS Commerce tietokanta sisäänkirjoittautumissivuksesi diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang index d3464542dae..155ef697744 100644 --- a/htdocs/langs/fi_FI/other.lang +++ b/htdocs/langs/fi_FI/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Suojakoodi Calendar=Kalenteri -AddTrip=Lisää matka Tools=Työkalut ToolsDesc=Tämä alue on omistettu ryhmä sekalaisia ​​työkaluja ole saatavilla muihin valikot.

    Näitä työkaluja pääsee valikosta puolella. Birthday=Syntymäpäivä @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Numero liitettyjen tiedostojen / asiakirjat TotalSizeOfAttachedFiles=Kokonaiskoosta liitettyjen tiedostojen / asiakirjat MaxSize=Enimmäiskoko @@ -80,6 +80,16 @@ ModifiedBy=Muuttanut %s ValidatedBy=Vahvistaja %s CanceledBy=Peruuttama %s ClosedBy=Suljettu %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Tiedosto on poistettu DirWasRemoved=Directory poistettiin FeatureNotYetAvailableShort=Saatavana on seuraava versio @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Lisää merkintä kalenteri %s -NewCompanyToDolibarr=Yritys %s lisätään Dolibarr -ContractValidatedInDolibarr=Sopimus %s validoitava Dolibarr -ContractCanceledInDolibarr=Sopimus %s peruutettu Dolibarr -ContractClosedInDolibarr=Sopimus %s suljettu Dolibarr -PropalClosedSignedInDolibarr=Ehdotus %s allekirjoitettu Dolibarr -PropalClosedRefusedInDolibarr=Ehdotus %s evätty Dolibarr -PropalValidatedInDolibarr=Ehdotus %s validoitava Dolibarr -InvoiceValidatedInDolibarr=Lasku %s validoitava Dolibarr -InvoicePaidInDolibarr=Lasku %s muutettu maksetaan vuonna Dolibarr -InvoiceCanceledInDolibarr=Lasku %s peruutettu Dolibarr -PaymentDoneInDolibarr=Maksu %s tehdään Dolibarr -CustomerPaymentDoneInDolibarr=Asiakas maksu %s tehdään Dolibarr -SupplierPaymentDoneInDolibarr=Toimittaja maksu %s tehdään Dolibarr -MemberValidatedInDolibarr=Jäsen %s validoitava Dolibarr -MemberResiliatedInDolibarr=Jäsen %s resiliated vuonna Dolibarr -MemberDeletedInDolibarr=Jäsen %s poistettu Dolibarr -MemberSubscriptionAddedInDolibarr=Tilaus jäsenen %s Lisätään Dolibarr -ShipmentValidatedInDolibarr=Toimitus %s validoitu Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Vienti ExportsArea=Vienti alueen diff --git a/htdocs/langs/fi_FI/paybox.lang b/htdocs/langs/fi_FI/paybox.lang index 845aa13662f..4c856a59e42 100644 --- a/htdocs/langs/fi_FI/paybox.lang +++ b/htdocs/langs/fi_FI/paybox.lang @@ -32,6 +32,9 @@ VendorName=Nimi myyjä CSSUrlForPaymentForm=CSS-tyylisivu url maksun muodossa MessageOK=Viesti on validoitu maksun tuotto sivu MessageKO=Viesti on peruutettu maksun tuotto sivu -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/fi_FI/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang index 954d63ad5eb..01f15eedb3b 100644 --- a/htdocs/langs/fi_FI/sendings.lang +++ b/htdocs/langs/fi_FI/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Tällä hetkellä uuden lähetys tehdään tilau RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Saalis asiakas diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang index 6e418f50932..10d541d3d1b 100644 --- a/htdocs/langs/fi_FI/stocks.lang +++ b/htdocs/langs/fi_FI/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse etiketissä on CorrectStock=Oikea varastossa ListOfWarehouses=Luettelo varastoissa ListOfStockMovements=Luettelo varastojen muutokset -StocksArea=Varastot alueella +StocksArea=Warehouses area Location=Lieu LocationSummary=Lyhyt nimi sijainti NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang index a33af911cb3..21b0e410dd3 100644 --- a/htdocs/langs/fi_FI/users.lang +++ b/htdocs/langs/fi_FI/users.lang @@ -63,7 +63,6 @@ ShowGroup=Näytä ryhmä ShowUser=Näytä käyttäjän NonAffectedUsers=Ei vaikuttaa käyttäjien UserModified=Käyttäjä muutettu onnistuneesti -GroupModified=Ryhmän muunnettu onnistuneesti PhotoFile=Photo tiedosto UserWithDolibarrAccess=Käyttäjälle Dolibarr pääsy ListOfUsersInGroup=Luettelo käyttäjien tässä ryhmässä @@ -103,7 +102,7 @@ UserDisabled=Käyttäjän %s pois päältä UserEnabled=Käyttäjän %s aktivoitu UserDeleted=Käyttäjän %s poistettu NewGroupCreated=Ryhmän %s on luotu -GroupModified=Ryhmän muunnettu onnistuneesti +GroupModified=Group %s modified GroupDeleted=Ryhmän %s poistettu ConfirmCreateContact=Oletko varma yu haluamme luoda Dolibarr huomioon tässä yhteydessä? ConfirmCreateLogin=Oletko varma, että haluat luoda Dolibarr huomioon tämän jäsen? @@ -114,8 +113,10 @@ YourRole=Omat roolit YourQuotaOfUsersIsReached=Tilakiintiösi aktiivisia käyttäjiä on saavutettu! NbOfUsers=Nb käyttäjien DontDowngradeSuperAdmin=Vain superadmin voi downgrade superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang index 093e40adeb2..9b24ab1f9d3 100644 --- a/htdocs/langs/fi_FI/withdrawals.lang +++ b/htdocs/langs/fi_FI/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kuitti LastWithdrawalReceipts=Viimeisin %s vetäytymis kuitit WithdrawedBills=Withdrawed laskut WithdrawalsLines=Nostot linjat -RequestStandingOrderToTreat=Pyyntö seisoville tilausten hoitoon -RequestStandingOrderTreated=Pyyntö seisoville tilaukset käsitellään +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Asiakas pysyvän tilaukset CustomerStandingOrder=Asiakas kestotilaus NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Menetelmä Lähetetty Send=Lähettää Lines=Linjat StandingOrderReject=Issue hylätä -InvoiceRefused=Lataa hylkäämisen asiakkaan WithdrawalRefused=Nostot Refuseds WithdrawalRefusedConfirm=Oletko varma että haluat kirjoittaa peruuttamisesta hylkäämisen yhteiskunnan RefusedData=Päivä hylkäämisestä RefusedReason=Hylkäämisen syy RefusedInvoicing=Laskutus hylkääminen NoInvoiceRefused=Älä lataa hylkäämisestä -InvoiceRefused=Lataa hylkäämisen asiakkaan +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Tila StatusUnknown=Tuntematon StatusWaiting=Odotus @@ -76,13 +76,14 @@ WithBankUsingRIB=Jos pankkitilit käyttäen RIB WithBankUsingBANBIC=Jos pankkitilit käyttäen IBAN / BIC / SWIFT BankToReceiveWithdraw=Pankkitili saada vetäytyy CreditDate=Luottoa -WithdrawalFileNotCapable=Ei voitu luoda peruuttamiseen kuitti tiedosto maasi +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/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index f538e713b81..4ba112f6ba7 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -41,8 +41,8 @@ List=Liste Create=Créer UpdateAccount=Modification de compte comptable UpdateMvts=Modification de mouvements -WriteBookKeeping=Record accounts in general ledger -Bookkeeping=General ledger +WriteBookKeeping=Enregistrer les écritures dans le grand livre +Bookkeeping=Grand livre AccountBalanceByMonth=Solde par mois AccountingVentilation=Ventilation comptable @@ -53,106 +53,106 @@ Line=Ligne CAHTF=Total achats fournisseur HT InvoiceLines=Lignes de factures à ventiler InvoiceLinesDone=Lignes de factures ventilées -IntoAccount=In the accounting account +IntoAccount=Dans le compte comptable -Ventilate=Ventilate -VentilationAuto=Automatic ventilation +Ventilate=Ventiler +VentilationAuto=Ventilation automatique -Processing=Processing -EndProcessing=The end of processing -AnyLineVentilate=Any lines to ventilate +Processing=Traitement en cours +EndProcessing=Fin du traitement +AnyLineVentilate=Aucune ligne à ventiler SelectedLines=Lignes sélectionnées -Lineofinvoice=Line of invoice -VentilatedinAccount=Ventilated successfully in the accounting account -NotVentilatedinAccount=Not ventilated in the accounting account +Lineofinvoice=Ligne de la facture +VentilatedinAccount=Ventilé avec succès dans le compte comptable +NotVentilatedinAccount=Non ventilé dans le compte comptable -ACCOUNTING_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Séparateur CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à ventiler affichés par page (maximum conseillé : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencer le tri des pages de ventilation "A ventiler" par les éléments les plus récents +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencer le tri des pages de ventilation "Ventilées" par les éléments les plus récents -AccountLength=Length of the accounting accounts shown in Dolibarr -AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts +AccountLength=Longueur des comptes comptables affichés dans Dolibarr +AccountLengthDesc=Fonction permettant de simuler une longueur de compte comptable en remplaçant les espaces par le chiffre zéro. Cette fonction touche uniquement à l'affichage, elle ne modifie pas les comptes comptables enregistrés dans Dolibarr. Pour l'export, cette fonction est nécessaire pour être compatible avec certains logiciels. +ACCOUNTING_LENGTH_GACCOUNT=Longueur des comptes généraux +ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes tiers -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal -ACCOUNTING_CASH_JOURNAL=Cash journal -ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTING_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Journal des ventes +ACCOUNTING_PURCHASE_JOURNAL=Journal des achats +ACCOUNTING_BANK_JOURNAL=Journal de banque +ACCOUNTING_CASH_JOURNAL=Journal de caisse +ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des opérations diverses +ACCOUNTING_SOCIAL_JOURNAL=Journal de paie -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable de tranfert +ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'attente -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (si non défini dans la fiche produit) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (si non défini dans la fiche produit) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (si non défini dans la fiche service) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (si non défini dans la fiche service) Doctype=Type de documents Docdate=Date -Docref=Reference +Docref=Référence Numerocompte=Compte Code_tiers=Tiers -Labelcompte=Label account +Labelcompte=Libellé du compte Debit=Débit Credit=Crédit Amount=Montant Sens=Sens Codejournal=Journal -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Supprimer les écritures du grand livre SellsJournal=Journal des ventes PurchasesJournal=Journal des achats DescSellsJournal=Journal des ventes DescPurchasesJournal=Journal des achats -BankJournal=Bank journal -DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Cash journal -DescCashJournal=Cash journal including the type of payment cash +BankJournal=Journal de banque +DescBankJournal=Journal de banque comprenant tous les types de règlements autres que espèce\t +CashJournal=Journal de caisse +DescCashJournal=Journal de caisse comprenant le type de règlement "espèce" -CashPayment=Cash Payment +CashPayment=Règlement espèce -SupplierInvoicePayment=Payment of invoice supplier -CustomerInvoicePayment=Payment of invoice customer +SupplierInvoicePayment=Paiement de facture fournisseur +CustomerInvoicePayment=Paiement de facture client -ThirdPartyAccount=Thirdparty account +ThirdPartyAccount=Comptes de tiers -NewAccountingMvt=New movement -NumMvts=Number of movement +NewAccountingMvt=Nouveau mouvement +NumMvts=Nombre de mouvement ListeMvts=Liste des mouvements -ErrorDebitCredit=Debit and Credit cannot have a value at the same time +ErrorDebitCredit=Débit et crédit ne peuvent pas avoir la même valeur en même temps. -ReportThirdParty=List thirdparty account -DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts +ReportThirdParty=Liste compte tiers +DescThirdPartyReport=Consultez ici la liste des tiers clients et fournisseurs et leurs codes comptables -ListAccounts=List of the accounting accounts +ListAccounts=Liste des comptes comptables Pcgversion=Version du plan Pcgtype=Classe de compte -Pcgsubtype=Under class of account +Pcgsubtype=Sous classe de compte Accountparent=Racine des comptes Active=Relevé NewFiscalYear=Nouvelle année fiscale -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers -TotalVente=Total turnover HT -TotalMarge=Total sales margin -DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account -DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account -ChangeAccount=Change the accounting account for lines selected by the account: +DescVentilCustomer=Consultez ici la ventilation comptable annuelle de vos factures clients +TotalVente=Chiffre d'affaires HT +TotalMarge=Total marge +DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable +DescVentilTodoCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable +ChangeAccount=Changer le compte comptable pour les lignes sélectionnées par le compte : Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers -DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account -DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account +DescVentilSupplier=Consultez ici la ventilation comptable annuelle de vos factures fournisseurs +DescVentilTodoSupplier=Ventilez vos lignes de facture fournisseur avec un compte comptable +DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseur et leur compte comptable -ValidateHistory=Validate Automatically +ValidateHistory=Valider Automatiquement ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé -FicheVentilation=Ventilation card +FicheVentilation=Fiche ventilation diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index c3bf53a2f16..4397bb313fa 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 @@ -67,7 +69,7 @@ ShowPreview=Afficher aperçu PreviewNotAvailable=Aperçu non disponible ThemeCurrentlyActive=Thème actif actuellement CurrentTimeZone=Fuseau horaire PHP (serveur) -MySQLTimeZone=Fuseau horaire MySql (serveur) +MySQLTimeZone=Fuseau horaire MySQL (serveur) TZHasNoEffect=Les dates sont stockées et retournées par le serveur de base de données comme si elles étaient conservées sous forme de chaîne. Le fuseau horaire n'a d'effet que lorsque vous utilisez la fonction UNIX_TIMESTAMP (qui ne devrait pas être utilisé par Dolibarr, aussi le TZ de la base de données ne devrait avoir aucun effet, même si changé après que les données aient été saisies). Space=Espace Table=Table @@ -136,7 +138,7 @@ Boxes=Boîtes MaxNbOfLinesForBoxes=Nombre max de lignes pour les boîtes PositionByDefault=Position par défaut Position=Position -MenusDesc=Les gestionnaires de menu définissent le contenu des 2 barres de menus (la barre horizontale et la barre verticale). Il est possible de mettre un gestionnaire différent selon que l'utilisateur est interne ou externe. +MenusDesc=Les gestionnaires de menu définissent le contenu des deux barres de menus (la barre horizontale et la barre verticale). Il est possible de mettre un gestionnaire différent selon que l'utilisateur est interne ou externe. MenusEditorDesc=L'éditeur de menu permet de définir des entrées personnalisées dans les menus. Il doit être utilisé avec prudence sous peine de mettre Dolibarr en situation instable nécessitant une réinstallation pour retrouver un menu cohérent.
    Certains modules ajoutent des entrées personnalisées aux menus (dans le menu Tous en général). Si vous détruisez ces entrées par erreur, vous pourrez les récupérer en désactivant puis réactivant le module. MenuForUsers=Menu pour les utilisateurs LangFile=Fichier .lang @@ -169,7 +171,7 @@ NoBackupFileAvailable=Aucun fichier de sauvegarde disponible. ExportMethod=Méthode d'exportation ImportMethod=Méthode d'importation ToBuildBackupFileClickHere=Pour générer un fichier de sauvegarde, cliquez ici. -ImportMySqlDesc=Pour importer une sauvegarde, il faut utiliser la commande mysql en ligne suivante: +ImportMySqlDesc=Pour importer une sauvegarde, il faut utiliser la commande mysql suivante en ligne de commande: ImportPostgreSqlDesc=Pour importer une sauvegarde, il faut utiliser la commande pg_restore en ligne suivante: ImportMySqlCommand=%s %s < monfichiersauvegarde.sql ImportPostgreSqlCommand=%s %s monfichiersauvegarde.sql @@ -178,7 +180,7 @@ Compression=Compression CommandsToDisableForeignKeysForImport=Commande pour désactiver les clés étrangères à l'importation CommandsToDisableForeignKeysForImportWarning=Requis si vous voulez être en mesure de restaurer votre « dump » SQL plus tard ExportCompatibility=Compatibilité du fichier d'exportation généré -MySqlExportParameters=Paramètres de l'exportation MySql +MySqlExportParameters=Paramètres de l'exportation MySQL PostgreSqlExportParameters= Paramètres de l'exportation PostgreSQL UseTransactionnalMode=Utiliser le mode transactionnel FullPathToMysqldumpCommand=Chemin complet vers la commande mysqldump @@ -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 @@ -252,7 +255,7 @@ CurrentSmartphoneMenuHandler=Gestionnaire menu smartphone courant MeasuringUnit=Unité de mesure Emails=Emails EMailsSetup=Configuration Emails -EMailsDesc=Cette page permet de remplacer les paramètres PHP en rapport avec l'envoi de mails. Dans la plupart des cas, sur des OS comme Unix/Linux, les paramètres PHP sont déjà corrects et cette page est inutile. +EMailsDesc=Cette page permet de remplacer les paramètres PHP en rapport avec l'envoi d'emails. Dans la plupart des cas, sur des OS comme Unix/Linux, les paramètres PHP sont déjà corrects et cette page est inutile. MAIN_MAIL_SMTP_PORT=Port du serveur SMTP/SMTPS (Par défaut dans php.ini: %s) MAIN_MAIL_SMTP_SERVER=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défaut dans php.ini: %s) MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix) @@ -320,7 +323,7 @@ UMask=Masque des nouveaux fichiers sous Unix/Linux/BSD/Mac. UMaskExplanation=Ce paramètre permet de définir les droits des fichiers créés sur le serveur par Dolibarr (lors d'envois par exemple).
    Ce doit être la valeur octale (par exemple 0666 signifie lecture/écriture pour tous).
    Ce paramètre n'a aucun effet sur un serveur Windows. SeeWikiForAllTeam=Voir le wiki pour le détail de tous les acteurs et leur organisation UseACacheDelay= Délai de mise en cache de l'export en secondes (0 ou vide pour aucun cache) -DisableLinkToHelpCenter=Cacher le lien "Besoin d'un support ou aide" sur la page de connexion +DisableLinkToHelpCenter=Cacher le lien «Besoin d'aide ou d'assistance» sur la page de connexion DisableLinkToHelp=Cacher le lien "%s Aide en ligne" du menu gauche AddCRIfTooLong=Il n'y a pas de coupure de ligne automatique, aussi si votre texte est trop long sur les documents, il faudra ajouter vous même des retours chariot dans la zone de saisie du texte ModuleDisabled=Module désactivé @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Gestion des stocks de produits Module53Name=Services Module53Desc=Gestion des services -Module54Name=Contrats -Module54Desc=Gestion des contrats de services +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=Projets -Module400Desc=Gestion des projets au sein des autres modules +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,8 +508,10 @@ 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 e-mail). Besoin d'un accès Internet +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 Module2900Name=GeoIPMaxmind Module2900Desc=Capacités de conversion GeoIP Maxmind @@ -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 @@ -540,7 +547,7 @@ Permission11=Consulter les factures clients Permission12=Créer/modifier les factures clients Permission13=Dé-valider les factures clients Permission14=Valider les factures clients -Permission15=Envoyer les factures clients par mail +Permission15=Envoyer les factures clients par email Permission16=Émettre des paiements sur les factures clients Permission19=Supprimer les factures clients Permission21=Consulter les propositions commerciales @@ -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=Consulter les contrats de services -Permission162=Créer/modifier les contrats de services -Permission163=Activer les services d'un contrat -Permission164=Désactiver les services d'un contrat -Permission165=Supprimer les contrats +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 @@ -638,13 +645,13 @@ Permission212=Commander les lignes Permission213=Activer une ligne Permission214=Configurer la téléphonie Permission215=Configurer les fournisseurs -Permission221=Consulter les mailings -Permission222=Créer/modifier les mailings (sujet, destinataires, etc.) -Permission223=Valider les mailings (permet leur envoi) -Permission229=Supprimer les mailings +Permission221=Consulter les emailings +Permission222=Créer/modifier les emailings (sujet, destinataires, etc.) +Permission223=Valider les emailings (permet leur envoi) +Permission229=Supprimer les emailings Permission237=Visualiser les destinataires et les infos -Permission238=Envoyer les mailings manuellement -Permission239=Supprimer les mailings après leur validation ou leur envoi +Permission238=Envoyer les emailings manuellement +Permission239=Supprimer les emailings après leur validation ou leur envoi Permission241=Consulter les catégories Permission242=Créer/modifier les catégories Permission243=Supprimer les catégories @@ -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=Affecter des services à un contrat +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=Créer/modifier les stocks -Permission1003=Supprimer les stocks +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 @@ -724,7 +731,7 @@ Permission1231=Consulter les factures fournisseur Permission1232=Créer des factures fournisseur Permission1233=Valider les factures fournisseur Permission1234=Supprimer les factures fournisseur -Permission1235=Envoyer les factures fournisseur par mail +Permission1235=Envoyer les factures fournisseur par email Permission1236=Exporter les factures fournisseurs, attributs et règlements Permission1237=Exporter les commande fournisseurs, attributs Permission1251=Lancer des importations en masse dans la base (chargement de données) @@ -779,12 +786,13 @@ 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 VATReceivedOnly=Taux spécial non facturé VATManagement=Gestion TVA -VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de proposition commerciale, facture, commande, etc... répond à la règle standard suivante :
    Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.
    Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.
    Si vendeur et acheteur dans Communauté européenne et bien vendu= moyen de transport neuf (auto, bateau, avion), TVA par défaut=0 (La TVA doit être payée par acheteur au centre d'impôts de son pays et non au vendeur). Fin de règle.
    Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu. Fin de règle.
    Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.
    Sinon TVA proposée par défaut=0. Fin de règle.
    +VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de proposition commerciale, facture, commande, etc... répond à la règle standard suivante :
    Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.
    Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.
    Si vendeur et acheteur dans Communauté européenne et bien vendu= moyen de transport neuf (auto, bateau, avion), TVA par défaut=0 (La TVA doit être payée par acheteur au centre d'impôts de son pays et non au vendeur). Fin de règle.
    Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu (TVA pays vendeur si < seuil du pays et si avant 01/01/2015, TVA pays acheteur après le 01/01/2015). Fin de règle.
    Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.
    Sinon TVA proposée par défaut=0. Fin de règle.
    VATIsNotUsedDesc=Le taux de TVA proposé par défaut est 0. C'est le cas d'associations, particuliers ou certaines petites sociétés. VATIsUsedExampleFR=En France, il s'agit des sociétés ou organismes ayant choisi un régime fiscale réel (Réel simplifié ou Réel normal), régime dans lequel la TVA est déclarée. VATIsNotUsedExampleFR=En France, il s'agit des associations ne déclarant pas de TVA ou sociétés, organismes ou professions libérales ayant choisi le régime fiscal micro entreprise (TVA en franchise) et payant une TVA en franchise sans faire de déclaration de TVA. Ce choix fait de plus apparaître la mention "TVA non applicable - art-293B du CGI" sur les factures. @@ -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 @@ -1029,7 +1038,7 @@ SendingMailSetup=Configuration de l'envoi par email SendmailOptionNotComplete=Attention, sur certains systèmes Linux, avec cette méthode d'envoi, pour pouvoir envoyer des emails en votre nom, la configuration d'exécution de sendmail doit contenir l'option -ba (paramètre mail.force_extra_parameters dans le fichier php.ini). Si certains de vos destinataires ne reçoivent pas de message, essayer de modifier ce paramètre PHP avec mail.force_extra_parameters = -ba. PathToDocuments=Chemin d'accès aux documents PathDirectory=Répertoire -SendmailOptionMayHurtBuggedMTA=La fonction d'envoi d' emails par la méthode "PHP mail directe" génère une requête email qui peut être mal interprété par certains serveurs de réception de mail présentant un défaut. Cela se traduit par des mails non lisibles chez les personnes hébergés par ces plateformes défectueuses. C'est le cas des clients de certains fournisseurs d'accès internet (Ex : Orange). Ce n'est un problème ni dans Dolibarr ni dans PHP mais sur le serveur de réception. Vous pouvez toutefois ajouter l'option MAIN_FIX_FOR_BUGGED_MTA à 1 dans configuration - divers pour modifier Dolibarr afin de compenser ce défaut. Toutefois ce sont les serveurs respectueux du standard d'envoi d'email qui pourront avoir des problèmes. L'autre solution (recommandée) est d'utiliser la méthode d'envoi SMTP socket library qui n'a aucun de ces inconvénients. +SendmailOptionMayHurtBuggedMTA=La fonction d'envoi d'emails par la méthode « email PHP directe » génère une requête email qui peut être mal interprété par certains serveurs de réception de mail présentant un défaut. Cela se traduit par des mails non lisibles chez les personnes hébergés par ces plateformes défectueuses. C'est le cas des clients de certains fournisseurs d'accès internet (Ex : Orange). Ce n'est un problème ni dans Dolibarr ni dans PHP mais sur le serveur de réception. Vous pouvez toutefois ajouter l'option MAIN_FIX_FOR_BUGGED_MTA à 1 dans configuration - divers pour modifier Dolibarr afin de compenser ce défaut. Toutefois ce sont les serveurs respectueux du standard d'envoi d'email qui pourront avoir des problèmes. L'autre solution (recommandée) est d'utiliser la méthode d'envoi SMTP socket library qui n'a aucun de ces inconvénients. TranslationSetup=Configuration de la traduction TranslationDesc=Le choix de la langue affichée à l'écran se modifie:
    * Soit de manière globale depuis le menu Accueil - Configuration - Affichage
    * Soit de manière spécifique à l'utilisateur depuis l'onglet Interface utilisateur de sa fiche utilisateur (cliquer sur l'identifiant en haut de l'écran). TotalNumberOfActivatedModules=Nombre total de modules fonctionnels activés: %s @@ -1039,7 +1048,6 @@ YesInSummer=Oui en été OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelles que soient les permissions de ces utilisateurs) : SuhosinSessionEncrypt=Stockage des sessions chiffrées par Suhosin ConditionIsCurrently=La condition est actuellement %s -TestNotPossibleWithCurrentBrowsers=Détection automatique non possible YouUseBestDriver=Vous utilisez le driver %s qui est le driver recommandé actuellement. YouDoNotUseBestDriver=Vous utilisez le driver %s mais le driver %s est recommandé. NbOfProductIsLowerThanNoPb=Vous n'avez que %s produits/services en base. Ceci ne requiert pas d'optimisation particulière. @@ -1139,6 +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=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=Configuration du module contrats +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 @@ -1268,7 +1277,7 @@ LDAPFieldNameExample=Exemple : sn LDAPFieldFirstName=Prénom LDAPFieldFirstNameExample=Exemple : givenName LDAPFieldMail=Email -LDAPFieldMailExample=Exemple : mail +LDAPFieldMailExample=Exemple : email LDAPFieldPhone=Téléphone professionnel LDAPFieldPhoneExample=Exemple : telephonenumber LDAPFieldHomePhone=Téléphone perso @@ -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=Détection automatique non possible +TestNotPossibleWithCurrentBrowsers=Une détection automatique n'est pas possible avec le navigateur courant ##### Products ##### ProductSetup=Configuration du module Produits ServiceSetup=Configuration du module Services @@ -1384,10 +1393,10 @@ MailingSetup=Configuration du module Emailing MailingEMailFrom=Email émetteur (From) des emails envoyés par Emailing MailingEMailError=Email retour (Errors-to) pour les réponses lors des envois par Emailing en erreur ##### Notification ##### -NotificationSetup=Configuration du module Notification EMail -NotificationEMailFrom=Email émetteur (From) des mails envoyés lors des notifications +NotificationSetup=Configuration du module notification par email +NotificationEMailFrom=Adresse émettrice (From) des emails envoyés lors des notifications ListOfAvailableNotifications=Liste des événements sur lesquels vous pouvez configurer une notification, pour chaque tiers (aller dans la fiche tiers pour cela) ou en réglant un email fixe (Liste dépendant de modules activés) -FixedEmailTarget=EMail fixe cible destinataires +FixedEmailTarget=Email fixe cible destinataires ##### Sendings ##### SendingsSetup=Configuration du module Expédition/Livraison SendingsReceiptModel=Modèles de bordereau d'expédition @@ -1415,8 +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=Configuration module stock -UserWarehouse=Utiliser des stocks personnels aux utilisateurs +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 @@ -1481,11 +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=Tiers générique à utiliser pour les ventes +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 -CashDeskIdWareHouse=Entrepôt à utiliser pour les ventes +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. @@ -1539,6 +1552,13 @@ ConfirmDeleteFiscalYear=Êtes-vous sûr de vouloir supprimer cette année fiscal Opened=Ouverte Closed=Clôturé AlwaysEditable=Peut toujours être édité - +MAIN_APPLICATION_TITLE=Forcer la valeur visible du nom de l'application (attention : positionner ici son propre nom rendra inopérante la fonction de remplissage automatique de l'identifiant lorsque vous utilisez l'application mobile DoliDroid) +NbMajMin=Nombre minimal de caractères majuscules +NbNumMin=Nombre minimal de caractères numériques +NbSpeMin=Nombre minimal de caractères spéciaux +NbIteConsecutive=Nombre maximal de répétition des mêmes caractères +NoAmbiCaracAutoGeneration=Ne pas utiliser des caractères ambigus ("1","l","i","|","0","O") pour la génération automatique +SalariesSetup=Configuration du module salariés +SortOrder=Ordre de tri Format=Format TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Paiement de type client et fournisseur diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index 71ea27767b8..bd3c25da359 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=Evénement assigné à AllMyActions= Tous mes événements AllActions= Tous les événements ViewList=Vue liste @@ -41,9 +42,10 @@ AutoActions= Alimentation automatique AgendaAutoActionDesc= Définissez dans cet onglet les événements pour lesquels Dolibarr créera automatiquement une action dans l'agenda. Si aucune case n'est cochée (par défaut), seules les actions manuelles seront incluses dans l'agenda. AgendaSetupOtherDesc= Cette page permet de configurer quelques options permettant d'exporter une vue de votre agenda Dolibarr vers un calendrier externe (Thunderbird, Google calendar, …) AgendaExtSitesDesc=Cette page permet d'ajouter des sources de calendriers externes pour les visualiser au sein de l'agenda Dolibarr. -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 +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=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 @@ -51,16 +53,13 @@ OrderApprovedInDolibarr=Commande %s approuvée OrderRefusedInDolibarr=Commande %s refusée OrderBackToDraftInDolibarr=Commande %s repassée en brouillon OrderCanceledInDolibarr=Commande %s annulée -InterventionValidatedInDolibarr=Intervention %s validée -ProposalSentByEMail=Proposition commerciale %s envoyée par EMail -OrderSentByEMail=Commande client %s envoyée par Email -InvoiceSentByEMail=Facture client %s envoyée par EMail -SupplierOrderSentByEMail=Commande fournisseur %s envoyée par EMail -SupplierInvoiceSentByEMail=Facture fournisseur %s envoyée par Email -ShippingSentByEMail=Bon d'expédition %s envoyé par Email +ProposalSentByEMail=Proposition commerciale %s envoyée par email +OrderSentByEMail=Commande client %s envoyée par email +InvoiceSentByEMail=Facture client %s envoyée par eMail +SupplierOrderSentByEMail=Commande fournisseur %s envoyée par email +SupplierInvoiceSentByEMail=Facture fournisseur %s envoyée par email +ShippingSentByEMail=Bon d'expédition %s envoyé par email ShippingValidated= Expédition %s validée -InterventionSentByEMail=Intervention %s envoyée par Email -InterventionClassifiedBilled=Fiche intervention %s classé Payée NewCompanyToDolibarr= Tiers créé DateActionPlannedStart= Date de début de réalisation prévue DateActionPlannedEnd= Date de fin de réalisation prévue @@ -77,7 +76,7 @@ AgendaShowBirthdayEvents=Afficher l'anniversaire des contacts AgendaHideBirthdayEvents=Cacher l'anniversaire des contacts Busy=Occupé ExportDataset_event1=Liste évênements de l'agenda -DefaultWorkingDays=jours ouvrables par défaut varient en semaine (Exemple: 1-5, 1-6) +DefaultWorkingDays=Jours ouvrables par défaut de la semaine (Exemple: 1-5, 1-6) DefaultWorkingHours=Heures de travail par défaut d'une journée (Exemple: 9-18) # External Sites ical ExportCal=Export calendrier diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index d45a9a3b025..24ebe5ff923 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -137,8 +137,6 @@ BillFrom=Émetteur BillTo=Adressé à ActionsOnBill=Événements sur la facture NewBill=Nouvelle facture -Prélèvements=Prélèvements -Prélèvements=Prélèvements LastBills=Les %s dernières factures LastCustomersBills=Les %s dernières factures clients LastSuppliersBills=Les %s dernières factures fournisseurs @@ -208,8 +206,8 @@ NoDraftInvoices=Pas de factures brouillons RefBill=Réf facture ToBill=À facturer RemainderToBill=Reste à facturer -SendBillByMail=Envoyer la facture par mail -SendReminderBillByMail=Envoyer une relance par mail +SendBillByMail=Envoyer la facture par email +SendReminderBillByMail=Envoyer une relance par email RelatedCommercialProposals=Propositions commerciales associées MenuToValid=A valider DateMaxPayment=Date limite règlement @@ -219,8 +217,7 @@ NoInvoice=Aucune facture ClassifyBill=Classer la facture SupplierBillsToPay=Factures fournisseurs à payer CustomerBillsUnpaid=Factures clients impayées -DispenseMontantLettres=Les factures rédigées par procédés mécanographiques sont dispensées de l'arrêté en lettres -DispenseMontantLettres=Les factures rédigées par procédés mécanographiques sont dispensées de l'arrêté en lettres +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 @@ -300,8 +297,8 @@ LatestRelatedBill=Dernière facture en rapport WarningBillExist=Attention, une ou plusieurs factures existent déjà # PaymentConditions -PaymentConditionShortRECEP=A réception -PaymentConditionRECEP=A réception de facture +PaymentConditionShortRECEP=À réception +PaymentConditionRECEP=À réception de facture PaymentConditionShort30D=30 jours PaymentCondition30D=Règlement à 30 jours PaymentConditionShort30DENDMONTH=30 jours fin de mois @@ -313,7 +310,7 @@ PaymentCondition60DENDMONTH=Règlement à 60 jours fin de mois PaymentConditionShortPT_DELIVERY=A livraison PaymentConditionPT_DELIVERY=Règlement à la livraison PaymentConditionShortPT_ORDER=A commande -PaymentConditionPT_ORDER=A réception de commande +PaymentConditionPT_ORDER=À réception de commande PaymentConditionShortPT_5050=50/50 PaymentConditionPT_5050=Règlement 50%% d'avance, 50%% à la livraison FixAmount=Montant Fixe @@ -338,7 +335,7 @@ PaymentTypeShortTRA=Traite BankDetails=Coordonnées bancaires BankCode=Code banque DeskCode=Code guichet -BankAccountNumber=Numéro compte +BankAccountNumber=Numéro de compte BankAccountNumberKey=Clé RIB Residence=Domiciliation IBANNumber=Code IBAN diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index a00d97ea191..1c29dfc7772 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Liens entre les fournisseurs et les catégories CatCusLinks=Liens entre les clients/prospects et les catégories CatProdLinks=Liens entre les produits/services et les catégories CatMemberLinks=Liens entre les adhérents et les catégories -CatProdLinks=Liens entre les produits/services et les catégories -CatCusLinks=Liens entre les clients/prospects et les catégories -CatSupLinks=Liens entre les fournisseurs et les catégories DeleteFromCat=Supprimer de la catégorie DeletePicture=Supprimer image ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ? @@ -112,3 +109,4 @@ CategoriesSetup=Configuration du module catégories CategorieRecursiv=Lier avec les catégories parentes CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une catégorie, l'ajouter aussi dans toutes les catégories parentes AddProductServiceIntoCategory=Ajouter le produit/service suivant +ShowCategory=Afficher catégorie diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 1f58970d1fd..e20b6efae12 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Compte comptable client incorrect pour %s SuppliersProductsSellSalesTurnover=Chiffre d'affaires généré par la vente des produits des fournisseurs CheckReceipt=Bordereau de remise de chèques CheckReceiptShort=Bordereau +LastCheckReceiptShort=Les %s derniers chèques reçus NewCheckReceipt=Nouvelle remise NewCheckDeposit=Nouveau dépôt NewCheckDepositOn=Créer bordereau de dépôt sur compte: %s @@ -196,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 @@ -207,3 +204,11 @@ ACCOUNTING_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs CloneTax=Cloner une charge sociale ConfirmCloneTax=Confirmer le clonage de la charge sociale CloneTaxForNextMonth=Cloner pour le mois suivant +COMPTA_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits +COMPTA_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits +COMPTA_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services +COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de services +COMPTA_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA +COMPTA_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA +COMPTA_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients +COMPTA_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang index 391da0f6968..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 -LastContracts=Les %s derniers contrats modifiés +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=Les %s derniers contrats modifiés +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 85cfb747a5c..92deeb11c20 100644 --- a/htdocs/langs/fr_FR/cron.lang +++ b/htdocs/langs/fr_FR/cron.lang @@ -18,9 +18,8 @@ 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= Liste des travaux actifs -CronListInactive= Liste des travaux inactifs -CronListActive= Liste des travaux actifs +CronListActive=Liste des travaux actifs/programmés +CronListInactive=Liste des travaux inactifs # Page list CronDateLastRun=Dernier lancement CronLastOutput=Sortie du dernier lancement diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index e4348ab6ffa..84081b64576 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -31,3 +31,8 @@ DonationRecipient=Bénéficiaire des versements ThankYou=Merci IConfirmDonationReception=Le bénéficiaire reconnait avoir reçu au titre des versements ouvrant droit à réduction d'impôt, la somme de MinimumAmount=Don minimum de %s +FreeTextOnDonations=Mention complémentaire sur les dons +FrenchOptions=Options propre à la france +DONATION_ART200=Afficher article 200 du CGI si vous êtes concernés +DONATION_ART238=Afficher article 238 du CGI si vous êtes concernés +DONATION_ART885=Afficher article 885 du CGI si vous êtes concernés diff --git a/htdocs/langs/fr_FR/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/externalsite.lang b/htdocs/langs/fr_FR/externalsite.lang index 7d821b00052..63194e8b836 100644 --- a/htdocs/langs/fr_FR/externalsite.lang +++ b/htdocs/langs/fr_FR/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Configuration du lien vers le site externe ExternalSiteURL=URL du site externe ExternalSiteModuleNotComplete=La configuration du module "Site externe" est incomplète. +ExampleMyMenuEntry=Mon entrée de menu diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index 43e43277b3e..30595470a20 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=GRH -Holidays=Congès -CPTitreMenu=Congès -MenuReportMonth=Etat mensuel -MenuAddCP=Pose un congès +Holidays=Congés +CPTitreMenu=Congés +MenuReportMonth=État mensuel +MenuAddCP=Créer demande de congés NotActiveModCP=Vous devez activer le module Congés pour afficher cette page. NotConfigModCP=Vous devez configurer le module Congés pour afficher cette page. Pour effectuer cette opération, cliquer ici. NoCPforUser=Vous n'avez plus de jours disponibles -AddCP=Poser une demande de congès +AddCP=Créer une demande de congés Employe=Employé DateDebCP=Date Début DateFinCP=Date Fin @@ -18,12 +18,12 @@ ApprovedCP=Approuvé CancelCP=Annulée RefuseCP=Refusée ValidatorCP=Approbateur -ListeCP=Liste des demandes de congès +ListeCP=Liste des demandes de congés ReviewedByCP=Sera approuvé par DescCP=Description -SendRequestCP=Créer une demande de congès +SendRequestCP=Créer une demande de congés DelayToRequestCP=Les demandes de congés doivent être faites au moins %s jour(s) avant la date de ceux-ci. -MenuConfCP=Editer solde de congès +MenuConfCP=Éditer le solde de congés UpdateAllCP=Mettre à jour les congés SoldeCPUser=Solde de congés: %s jours. ErrorEndDateCP=Vous devez choisir une date de fin supérieur à la date de début. @@ -31,11 +31,11 @@ ErrorSQLCreateCP=Une erreur SQL est survenue durant la création : ErrorIDFicheCP=Une erreur est survenue, cette demande de congés n'existe pas. ReturnCP=Retour à la page précédente ErrorUserViewCP=Vous n'êtes pas autorisé à lire cette demande de congés. -InfosCP=Information sur la demande de congès +InfosCP=Information sur la demande de congés InfosWorkflowCP=Informations du workflow RequestByCP=Demandée par -TitreRequestCP=Demande de congès -NbUseDaysCP=Nombre de jours de congès consommés +TitreRequestCP=Demande de congés +NbUseDaysCP=Nombre de jours de congés consommés EditCP=Modifier DeleteCP=Supprimer ActionValidCP=Valider @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirmer la suppression de cette demande de congés ? ErrorCantDeleteCP=Erreur, vous n'avez pas le droit de supprimer cette demande de congés. CantCreateCP=Erreur, vous n'avez pas le droit de supprimer cette demande de congés. InvalidValidatorCP=Vous devez choisir un approbateur pour votre demande de congés. -UpdateButtonCP=Mettre à jour CantUpdate=Vous ne pouvez pas mettre à jour cette demande de congés. NoDateDebut=Vous devez choisir une date de début. NoDateFin=Vous devez choisir une date de fin. ErrorDureeCP=Votre demande de congés payés ne contient aucun jour ouvré. -TitleValidCP=Approuver la demande de congès +TitleValidCP=Approuver la demande de congés ConfirmValidCP=Êtes-vous sûr de vouloir approuver la demande de congés ? DateValidCP=Date d'approbation -TitleToValidCP=Send leave request +TitleToValidCP=Envoyer la demande de congés ConfirmToValidCP=Êtes-vous sûr de vouloir valider la demande de congés ? -TitleRefuseCP=Refuser la demande de congès +TitleRefuseCP=Refuser la demande de congés ConfirmRefuseCP=Êtes-vous sûr de vouloir valider la demande de congés ? NoMotifRefuseCP=Vous devez choisir un motif pour refuser cette demande. -TitleCancelCP=Annuler la demande de dongès +TitleCancelCP=Annuler la demande de congés ConfirmCancelCP=Êtes-vous sûr de vouloir annuler la demande de congés ? DetailRefusCP=Motif du refus DateRefusCP=Date du refus @@ -72,8 +71,8 @@ MotifCP=Motif UserCP=Utilisateur ErrorAddEventToUserCP=Une erreur est survenue durant l'ajout du congé exceptionnel. AddEventToUserOkCP=L'ajout du congé exceptionnel à bien été effectué. -MenuLogCP=Voir les logs des demandes de congés -LogCP=Historique de la mise à jours de jours de congès disponibles +MenuLogCP=Voir journal des demandes +LogCP=Historique de la mise à jours de jours de congés disponibles ActionByCP=Réalisée par UserUpdateCP=Pour l'utilisateur PrevSoldeCP=Précédent Solde @@ -81,19 +80,19 @@ NewSoldeCP=Nouveau Solde alreadyCPexist=Une demande de congés a déjà été faite sur cette période. UserName=Nom Prénom Employee=Salarié -FirstDayOfHoliday=Premier jour de congès -LastDayOfHoliday=Dernier jours de congès +FirstDayOfHoliday=Premier jour de congés +LastDayOfHoliday=Dernier jours de congés HolidaysMonthlyUpdate=Mise à jour mensuelle ManualUpdate=Mise à jour manuelle -HolidaysCancelation=Annulation de la demande de congès +HolidaysCancelation=Annulation de la demande de congés ## Configuration du Module ## -ConfCP=Configuration du module congès +ConfCP=Configuration du module congés DescOptionCP=Description de l'option ValueOptionCP=Valeur GroupToValidateCP=Groupe ayant la possibilité d'approuver les congés ConfirmConfigCP=Valider la configuration -LastUpdateCP=Dernière mise à jour automatique de l'allocation des congès +LastUpdateCP=Dernière mise à jour automatique de l'allocation des congés UpdateConfCPOK=Mise à jour effectuée avec succès. ErrorUpdateConfCP=Une erreur à eu lieu durant la mise à jour, merci de réessayer. AddCPforUsers=Veuillez ajouter le solde des congés des utilisateurs en cliquant ici. @@ -104,9 +103,9 @@ AlertValidorSoldeCP=Prévenir le valideur si l'utilisateur demande des congés d nbUserCP=Nombre d'utilisateur pris en charge dans le module congés nbHolidayDeductedCP=Nombre de congés payés à déduire par jour de congé pris nbHolidayEveryMonthCP=Nombre de congés ajoutés chaque mois -Module27130Name= Gestion des demandes de congès -Module27130Desc= Ce module permet de gérer les demandes, approbations de congès. -TitleOptionMainCP=Réglages principaux des demandes de congès +Module27130Name= Gestion des demandes de congés +Module27130Desc= Ce module permet de gérer les demandes, approbations de congés. +TitleOptionMainCP=Réglages principaux des demandes de congés TitleOptionEventCP=Réglages des congés liés à des évènements ValidEventCP=Valider UpdateEventCP=Mettre à jour les évènements @@ -117,32 +116,32 @@ ErrorCreateEventCP=Erreur lors de la création de l'évènement. UpdateEventOkCP=La mise à jour de l'évènement s'est bien déroulé. ErrorUpdateEventCP=Erreur lors de la mise à jour de l'évènement. DeleteEventCP=Supprimer l'évènement -DeleteEventOkCP=L'évènement à bien été supprimé. +DeleteEventOkCP=L'évènement a bien été supprimé. ErrorDeleteEventCP=Erreur lors de la suppression de l'évènement. TitleDeleteEventCP=Supprimer un congé exceptionnel TitleCreateEventCP=Créer un congé exceptionnel TitleUpdateEventCP=Modifier ou supprimer un congé exceptionnel DeleteEventOptionCP=Supprimer UpdateEventOptionCP=Mettre à jour -ErrorMailNotSend=Une erreur est survenue lors de l'envoi du mail : +ErrorMailNotSend=Une erreur est survenue lors de l'envoi de l'email : NoCPforMonth=Aucun congé ce mois-ci. nbJours=Nombre jours -TitleAdminCP=Configuration du module congès +TitleAdminCP=Configuration du module congés #Messages Hello=Bonjour -HolidaysToValidate=Valider les demandes de congès +HolidaysToValidate=Valider les demandes de congés HolidaysToValidateBody=Veuillez trouver ci-dessous une demande de congés à valider. -HolidaysToValidateDelay=Cette demande de congés à été effectué dans un délai de moins de %s jours avant ceux-ci. +HolidaysToValidateDelay=Cette demande de congés a été effectuée dans un délai de moins de %s jours avant ceux-ci. HolidaysToValidateAlertSolde=L'utilisateur ayant fait cette demande de congés payés n'a pas le solde requis. -HolidaysValidated=Valider demande de congès +HolidaysValidated=Valider demande de congés HolidaysValidatedBody=Votre demande de congés du %s au %s vient d'être approuvée. HolidaysRefused=Accès refusé HolidaysRefusedBody=Votre demande de congés payés %s à %s vient d'être refusée pour le motif suivant : -HolidaysCanceled=Abandonner la demande de congès +HolidaysCanceled=Abandonner la demande de congés HolidaysCanceledBody=Votre demande de congés du %s au %s a été annulée. -Permission20000=Lire ses propres demandes de congès -Permission20001=Créer/modifier une demande de congès -Permission20002=Créer/modifier les congès pour tout le monde +Permission20000=Lire ses propres demandes de congés +Permission20001=Créer/modifier une demande de congés +Permission20002=Créer/modifier les congés pour tout le monde Permission20003=Supprimer la demande de Congés Permission20004=Configuration des jours disponibles Permission20005=Voir l'historique des demandes de congés diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang index aa0db5b2355..3f15a153823 100644 --- a/htdocs/langs/fr_FR/interventions.lang +++ b/htdocs/langs/fr_FR/interventions.lang @@ -31,6 +31,14 @@ RelatedInterventions=Interventions rattachées ShowIntervention=Afficher intervention SendInterventionRef=Envoi de la fiche intervention %s SendInterventionByMail=Envoyer l'intervention par email +InterventionCreatedInDolibarr=Intervention %s créée +InterventionValidatedInDolibarr=Intervention %s validée +InterventionModifiedInDolibarr=Intervention %s modifiée +InterventionClassifiedBilledInDolibarr=Intervention %s positionné à facturé +InterventionClassifiedUnbilledInDolibarr=Intervention %s positionné à non facturé +InterventionSentByEMail=Intervention %s envoyé par EMail +InterventionDeletedInDolibarr=Intervention %s effacée +SearchAnIntervention=Chercher une intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsable suivi de l'intervention TypeContact_fichinter_internal_INTERVENING=Intervenant diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang index 425a4504a6e..8cb4cdcecd1 100644 --- a/htdocs/langs/fr_FR/mails.lang +++ b/htdocs/langs/fr_FR/mails.lang @@ -75,18 +75,18 @@ SentTo=Envoyés à %s MailingStatusRead=Lu CheckRead=Accusé de réception YourMailUnsubcribeOK=L'adresse email %s est bien désinscrite de la liste. -MailtoEMail=Écrire un e-mail (lien) +MailtoEMail=Écrire un email (lien) ActivateCheckRead=Permettre l'utilisation du lien de désinscription ActivateCheckReadKey=Clé de sécurité permettant le chiffrement des URL utilisées dans les fonctions d'accusé de lecture et de désinscription EMailSentToNRecipients=Email envoyé à %s destinataires. XTargetsAdded=%s destinataires ajoutés dans la liste cible EachInvoiceWillBeAttachedToEmail=Un document utilisant le modèle par défaut de facture sera généré et attaché à l'email. MailTopicSendRemindUnpaidInvoices=Rappel de la facture %s (%s) -SendRemind=Envoyer relance par EMail +SendRemind=Envoyer relance par email RemindSent=%s relance(s) envoyée(s) AllRecipientSelectedForRemind=Tous les tiers sélectionnés et qui ont un email défini (notez qu'un email par facture sera envoyé) -NoRemindSent=Aucun EMail de relance envoyé -ResultOfMassSending=Résultat de l'envoi de la relance en masse par EMail +NoRemindSent=Aucun email de relance envoyé +ResultOfMassSending=Résultat de l'envoi de la relance en masse par email # Libelle des modules de liste de destinataires mailing MailingModuleDescContactCompanies=Contacts de tiers (prospects, clients, fournisseurs…) @@ -112,15 +112,15 @@ SearchAMailing=Rechercher un emailing SendMailing=Envoi emailing SendMail=Envoyer email SentBy=Envoyé par -MailingNeedCommand=Pour des raisons de sécurité, il est recommandé de faire les envois d'un mailing de masse depuis la ligne de commande. Si en avez, demandez à votre administrateur de serveurs de lancer la commande suivante pour envoyer le mailing à 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 max de mails envoyés par session d'envoi. Pour cela, aller dans Accueil - Configuration - Divers. +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=Rem: L'envoi d'un emailing depuis les écrans est limité pour raisons de sécurité et de timeout à %s destinataires par session d'envoi. +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 NbOfEMailingsReceived=Emailings de masse reçus -NbOfEMailingsSend=EMailings de masse envoyés +NbOfEMailingsSend=Emailings de masse envoyés IdRecord=ID enregistrement DeliveryReceipt=Accusé de réception YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le caractère de séparation virgule pour spécifier plusieurs destinataires. @@ -136,3 +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=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/main.lang b/htdocs/langs/fr_FR/main.lang index c665de8ffec..a9571b9ac15 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -39,7 +39,7 @@ ErrorSQL=Erreur SQL ErrorLogoFileNotFound=Le fichier logo '%s' n'a pas été trouvé ErrorGoToGlobalSetup=Allez dans la Configuration 'Société/Institution' pour corriger ErrorGoToModuleSetup=Allez dans la Configuration du module pour corriger -ErrorFailedToSendMail=Échec de l'envoi du mail (émetteur=%s, destinataire=%s) +ErrorFailedToSendMail=Échec de l'envoi de l'email (émetteur=%s, destinataire=%s) ErrorAttachedFilesDisabled=La gestion des fichiers associés est désactivée sur ce serveur ErrorFileNotUploaded=Le fichier n'a pas été transféré. Vérifiez que sa taille ne dépasse pas le maxium autorisé, que l'espace disque est disponible et qu'un fichier du même nom n'existe pas déjà. ErrorInternalErrorDetected=Erreur détectée @@ -131,7 +131,7 @@ AddActionDone=Ajouter action faite Close=Clôturer Close2=Fermer Confirm=Confirmer -ConfirmSendCardByMail=Voulez vous envoyer le contenu de cette fiche par mail à l'adresse %s ? +ConfirmSendCardByMail=Voulez vous envoyer le contenu de cette fiche par email à l'adresse %s ? Delete=Supprimer Remove=Enlever Resiliate=Résilier @@ -367,6 +367,7 @@ ActionsOnCompany=Événements vis à vis de ce tiers ActionsOnMember=Événements vis à vis de cet adhérent NActions=%s événements NActionsLate=%s en retard +RequestAlreadyDone=Requête déjà enregistrée Filter=Filtre RemoveFilter=Supprimer filtre ChartGenerated=Graphiques générés @@ -431,8 +432,8 @@ Late=Retard Photo=Photo Photos=Photos AddPhoto=Ajouter photo -Login=Login -CurrentLogin=Login courant +Login=Identifiant +CurrentLogin=Identifiant courant January=janvier February=février March=mars @@ -544,15 +545,15 @@ Redo=Refaire ExpandAll=Tout dérouler UndoExpandAll=Annuler déroulement Reason=Raison -FeatureNotYetSupported=Fonctionnalité pas encore supportée +FeatureNotYetSupported=Fonctionnalité pas encore prise en charge CloseWindow=Fermer fenêtre Question=Question Response=Réponse Priority=Priorité -SendByMail=Envoyer par mail +SendByMail=Envoyer par email MailSentBy=Mail envoyé par -TextUsedInTheMessageBody=Corps du mail -SendAcknowledgementByMail=Envoi A.R. par mail +TextUsedInTheMessageBody=Corps du message +SendAcknowledgementByMail=Envoi A.R. par email NoEMail=Pas d'email NoMobilePhone=Pas de téléphone portable Owner=Propriétaire @@ -617,7 +618,7 @@ Merge=Fusion PrintContentArea=Afficher page d'impression de la zone centrale MenuManager=Gestionnaire de menu NoMenu=Aucun sous-menu -WarningYouAreInMaintenanceMode=Attention, vous êtes en mode maintenance, aussi seul le login %s est autorisé à utiliser l'application en ce moment. +WarningYouAreInMaintenanceMode=Attention, vous êtes en mode maintenance, aussi seul l'utilisateur identifié par %s est autorisé à utiliser l'application en ce moment. CoreErrorTitle=Erreur système CoreErrorMessage=Désolé, une erreur s'est produite. Vérifier les logs ou contacter l'administrateur du système. CreditCard=Carte de crédit @@ -625,7 +626,7 @@ FieldsWithAreMandatory=Les champs marqués par un %s sont obligatoires FieldsWithIsForPublic=Les champs marqués par %s seront affichés sur la liste publique des membres. Si vous ne le souhaitez pas, décochez la case "public". AccordingToGeoIPDatabase=(obtenu par conversion GeoIP) Line=Ligne -NotSupported=Non supporté +NotSupported=Non pris en charge RequiredField=Champ obligatoire Result=Résultat ToTest=Tester diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang index 6244b0b14ae..94ffd5e48a6 100644 --- a/htdocs/langs/fr_FR/margins.lang +++ b/htdocs/langs/fr_FR/margins.lang @@ -41,3 +41,4 @@ AgentContactType=Type de contact agent commercial AgentContactTypeDetails=Définissez quel type de contact (lié aux factures) sera utiliser pour le reporting des marges par commercial rateMustBeNumeric=Le taux doit être une valeure numérique markRateShouldBeLesserThan100=Le taux de marque doit être inférieur à 100 +ShowMarginInfos=Afficher les infos de marges 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 a94bd8fff72..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=Commandes à facturer +MenuOrdersToBill2=Commandes facturables SearchOrder=Rechercher une commande SearchACustomerOrder=Rechercher une commande client ShipProduct=Expédier produit @@ -102,7 +102,7 @@ OnProcessOrders=Commandes en cours de traitement RefOrder=Réf. commande RefCustomerOrder=Réf. commande client RefCustomerOrderShort=Réf. com. client -SendOrderByMail=Envoyer commande par mail +SendOrderByMail=Envoyer commande par email ActionsOnOrder=Événements sur la commande NoArticleOfTypeProduct=Pas d'article de type 'produit' et donc expédiable dans cette commande OrderMode=Méthode de commande @@ -154,7 +154,6 @@ OrderByPhone=Téléphone CreateInvoiceForThisCustomer=Facturer commandes NoOrdersToInvoice=Pas de commandes facturables CloseProcessedOrdersAutomatically=Classer automatiquement à "Traitées" les commandes sélectionnées. -MenuOrdersToBill2=Commandes à facturer OrderCreation=Date de création Ordered=Commandé OrderCreated=Vos commandes ont été générées diff --git a/htdocs/langs/fr_FR/oscommerce.lang b/htdocs/langs/fr_FR/oscommerce.lang deleted file mode 100644 index 635a43cdddf..00000000000 --- a/htdocs/langs/fr_FR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Configuration du module OS Commerce -OSCommerceSetupSaved=Configuration OS Commerce sauvegardée -OSCommerceServer=Nom d'hôte / adresse IP serveur base de données OS Commerce -OSCommerceDatabaseName=Nom base de données OS Commerce -OSCommercePrefix=Préfixe tables base de données OS Commerce -OSCommerceUser=Identifiant d'accès base de données OS Commerce diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index 2156b451102..1c23cce68cb 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -23,7 +23,7 @@ Notify_WITHDRAW_CREDIT=Crédit prélèvement Notify_WITHDRAW_EMIT=Émission prélèvement Notify_ORDER_SENTBYMAIL=Envoi commande client par email Notify_COMPANY_CREATE=Tiers créé -Notify_COMPANY_SENTBYMAIL=Mail envoyé depuis la fiche Tiers +Notify_COMPANY_SENTBYMAIL=Email envoyé depuis la fiche Tiers Notify_PROPAL_SENTBYMAIL=Envoi proposition commerciale par email Notify_BILL_PAYED=Recouvrement facture client Notify_BILL_CANCEL=Annulation facture client @@ -85,11 +85,11 @@ ModifiedById=Id utilisateur du dernier changement ValidatedById=ID utilisateur qui a validé CanceledById=Id utilisateur qui a annulé ClosedById=Id utilisateur qui a fermé -CreatedByLogin=Login utilisateur créateur -ModifiedByLogin=Login utilisateur du dernier changement -ValidatedByLogin=Login utilisateur qui a validé -CanceledByLogin=Login utilisateur qui a annulé -ClosedByLogin=Login utilisateur qui a fermé +CreatedByLogin=Identifiant utilisateur créateur +ModifiedByLogin=Identifiant utilisateur du dernier changement +ValidatedByLogin=Identifiant utilisateur qui a validé +CanceledByLogin=Identifiant utilisateur qui a annulé +ClosedByLogin=Identifiant utilisateur qui a fermé FileWasRemoved=Le fichier %s a été supprimé DirWasRemoved=Le répertoire %s a été supprimé FeatureNotYetAvailableShort=Disponible dans une prochaine version @@ -145,7 +145,7 @@ SizeUnitinch=pouce SizeUnitfoot=pied SizeUnitpoint=point BugTracker=Suivi de tickets -SendNewPasswordDesc=Ce formulaire permet d'envoyer un nouveau mot de passe. Il sera envoyé à l'adresse email de votre utilisateur.
    La modification du mot de passe ne sera effective qu'après validation par le destinataire en suivant le lien de confirmation inclut dans ce mail.
    Surveillez votre messagerie. +SendNewPasswordDesc=Ce formulaire permet d'envoyer un nouveau mot de passe. Il sera envoyé à l'adresse email de votre utilisateur.
    La modification du mot de passe ne sera effective qu'après validation par le destinataire en suivant le lien de confirmation inclut dans cet email.
    Surveillez votre messagerie. BackToLoginPage=Retour page de connexion AuthenticationDoesNotAllowSendNewPassword=Le mode d'authentification de Dolibarr est configuré à "%s".
    Dans ce mode, Dolibarr n'a pas la possibilité de connaître ni de modifier votre mot de passe.
    Contactez votre administrateur pour connaitre les modalités de changement. EnableGDLibraryDesc=Vous devez activer ou installer la librairie GD avec votre PHP pour pouvoir activer cette option. @@ -199,29 +199,30 @@ NewKeyIs=Voici vos nouveaux identifiants pour vous connecter NewKeyWillBe=Vos nouveaux identifiants pour vous connecter à l'application seront ClickHereToGoTo=Cliquez ici pour aller sur %s YouMustClickToChange=Vous devez toutefois auparavant cliquer sur le lien suivant, afin de valider ce changement de mot de passe -ForgetIfNothing=Si vous n'êtes pas à l'origine de la demande, ignorez simplement ce mail. Votre accès reste sécurisé. +ForgetIfNothing=Si vous n'êtes pas à l'origine de cette demande, ignorez simplement ce message. Vos identifiants restent sécurisés. ##### Calendar common ##### AddCalendarEntry=Ajouter entrée dans le calendrier %s -NewCompanyToDolibarr=Société %s ajoutée dans Dolibarr -ContractValidatedInDolibarr=Contrat %s validé dans Dolibarr -ContractCanceledInDolibarr=Contrat %s annulé dans Dolibarr -ContractClosedInDolibarr=Contrat %s fermé dans Dolibarr -PropalClosedSignedInDolibarr=Proposition %s signée dans Dolibarr -PropalClosedRefusedInDolibarr=Proposition %s refusée dans Dolibarr -PropalValidatedInDolibarr=Proposition %s validée dans Dolibarr -InvoiceValidatedInDolibarr=Facture %s validée dans Dolibarr -InvoicePaidInDolibarr=Facture %s passée à payée dans Dolibarr -InvoiceCanceledInDolibarr=Facture %s annulée dans Dolibarr -PaymentDoneInDolibarr=Paiement %s réalisé dans Dolibarr -CustomerPaymentDoneInDolibarr=Paiement client %s dans Dolibarr -SupplierPaymentDoneInDolibarr=Paiement fournisseur %s dans Dolibarr -MemberValidatedInDolibarr=Adhérent %s validé dans Dolibarr -MemberResiliatedInDolibarr=Adhérent %s résilié dans Dolibarr -MemberDeletedInDolibarr=Adhérent %s supprimé de Dolibarr -MemberSubscriptionAddedInDolibarr=Souscription adhérent %s ajoutée dans Dolibarr -ShipmentValidatedInDolibarr=Expédition %s validée dans Dolibarr -ShipmentDeletedInDolibarr=Expédition %s supprimé de Dolibarr +NewCompanyToDolibarr=Société %s ajoutée +ContractValidatedInDolibarr=Contrat %s validé +ContractCanceledInDolibarr=Contrat %s annulé +ContractClosedInDolibarr=Contrat %s fermé +PropalClosedSignedInDolibarr=Proposition %s signée +PropalClosedRefusedInDolibarr=Proposition %s refusée +PropalValidatedInDolibarr=Proposition %s validée +PropalClassifiedBilledInDolibarr=Proposition %s classée payée +InvoiceValidatedInDolibarr=Facture %s validée +InvoicePaidInDolibarr=Facture %s passée à payée +InvoiceCanceledInDolibarr=Facture %s annulée +PaymentDoneInDolibarr=Paiement %s réalisé +CustomerPaymentDoneInDolibarr=Paiement client %s +SupplierPaymentDoneInDolibarr=Paiement fournisseur %s +MemberValidatedInDolibarr=Adhérent %s validé +MemberResiliatedInDolibarr=Adhérent %s résilié +MemberDeletedInDolibarr=Adhérent %s supprimé +MemberSubscriptionAddedInDolibarr=Souscription adhérent %s +ShipmentValidatedInDolibarr=Expédition %s validée +ShipmentDeletedInDolibarr=Expédition %s supprimée ##### Export ##### Export=Export ExportsArea=Espace exports diff --git a/htdocs/langs/fr_FR/paybox.lang b/htdocs/langs/fr_FR/paybox.lang index 3b1f63dac2e..89074fa87f3 100644 --- a/htdocs/langs/fr_FR/paybox.lang +++ b/htdocs/langs/fr_FR/paybox.lang @@ -34,4 +34,7 @@ MessageOK=Message sur page de retour de paiement validé MessageKO=Message sur page de retour de paiement annulé NewPayboxPaymentReceived=Nouveau paiement Paybox reçu NewPayboxPaymentFailed=Nouveau paiement Paybox tenté mais en échec -PAYBOX_PAYONLINE_SENDEMAIL=EMail à prévenir en cas de paiement (succès ou non) +PAYBOX_PAYONLINE_SENDEMAIL=Email à prévenir en cas de paiement (succès ou non) +PAYBOX_PBX_SITE=Site +PAYBOX_PBX_RANG=Rang +PAYBOX_PBX_IDENTIFIANT=Identifiant 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 68e76dca46b..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= C:%s UO: %s LOT: %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 old mode 100755 new mode 100644 index 5059d628092..3ae29d4d0b6 --- a/htdocs/langs/fr_FR/resource.lang +++ b/htdocs/langs/fr_FR/resource.lang @@ -1,37 +1,34 @@ MenuResourceIndex=Ressources MenuResourceAdd=Nouvelle ressource -MenuResourcePlanning=Planning des Ressources +MenuResourcePlanning=Resources DeleteResource=Effacer ressource -ConfirmDeleteResourceElement=Confirmer la suppression de la ressource pour cet élément -NoResourceInDatabase=Aucune ressource en base de données. +ConfirmDeleteResourceElement=Confirmer la suppression de cette ressource ? +NoResourceInDatabase=Pas de ressource en base NoResourceLinked=Aucune ressource liée -ResourcePageIndex=Liste des Ressources -ResourceSingular=Ressource -ResourceCard=Fiche ressource -AddResource=Ajouter une ressource +ResourcePageIndex=Liste des ressources +ResourceSingular=Resource +ResourceCard=Fiche +AddResource=Créer une ressource ResourceFormLabel_ref=Nom de la ressource -ResourceType=Type de la ressource +ResourceType=Type de ressource ResourceFormLabel_description=Description de la ressource -ResourcesLinkedToElement=Ressources liées à l'élément -RessourceLineSuccessfullyUpdated=Ressource mise à jour -RessourceLineSuccessfullyDeleted=Ressource supprimée +ResourcesLinkedToElement=Ressource lié au document -ShowResourcePlanning=Montrer le planning des ressources -PlanningOfAffectedResources=Planning des ressources affectées aux évènements -GotoDate=Afficher la date +ShowResourcePlanning=Afficher ressource +GotoDate=Aller à un date -ResourceElementPage=Ressources de l'élément -ResourceCreatedWithSuccess=Ressource créee avec succès -RessourceLineSuccessfullyDeleted=Ressource supprimée avec succès -RessourceLineSuccessfullyUpdated=Ressource mise à jour +ResourceElementPage=Ressources +ResourceCreatedWithSuccess=Ressource créée avec succès +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 -ConfirmDeleteResource=Confirmer la suppression de cette ressource? -RessourceSuccessfullyDeleted=Ressource effacée avec succès -DictionaryResourceType=Type de ressources +ConfirmDeleteResource=Confirmer la suppression de cette ressource ? +RessourceSuccessfullyDeleted=Ressource supprimée avec succès +DictionaryResourceType=Type de ressource -SelectResource=Sélectionner la ressource +SelectResource=Sélectionner ressource diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index 3f839ba9416..4e7528f2db7 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle exp RelatedShippings=Expédition(s) associée(s) ShipmentLine=Ligne d'expédition CarrierList=Liste des transporteurs -SendingRunning=Produits de commandes clients déjà expédiés -SuppliersReceiptRunning=Produits de commandes fournisseurs déjà réceptionnés +SendingRunning=Les produits de la commandes clients ont déjà été envoyés +SuppliersReceiptRunning=Les produits de la commandes fournisseurs ont déjà été reçus # Sending methods SendingMethodCATCH=Enlèvement par le client diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index 7e83ee744ed..8749207cd83 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -10,7 +10,7 @@ WarehouseClosed=Entrepôt fermé WarehouseSource=Entrepôt source WarehouseSourceNotDefined=Aucun entrepôt défini, AddOne=En ajouter un -WarehouseTarget=Entrepôt cible +WarehouseTarget=Entrepôt destination ValidateSending=Valider expédition CancelSending=Annuler expédition DeleteSending=Supprimer expédition @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Le libellé de l'entrepôt est obligatoire CorrectStock=Corriger le stock ListOfWarehouses=Liste des entrepôts ListOfStockMovements=Liste des mouvements de stock -StocksArea=Espace stocks +StocksArea=Espace entrepôts Location=Lieu LocationSummary=Nom court du lieu NumberOfDifferentProducts=Nombre de produits différents @@ -115,7 +115,7 @@ NbOfProductAfterPeriod=Quantité du produit %s en stock après la périod MassMovement=Mouvement en masse MassStockMovement=Mouvement de stock en masse SelectProductInAndOutWareHouse=Sélectionner un produit, une quantité à transférer, un entrepôt source et destination et cliquer sur "%s". Une fois tous les mouvements choisis, cliquer sur "%s". -RecordMovement=Enregistrer transferts +RecordMovement=Enregistrer transfert ReceivingForSameOrder=Réceptions pour cette commande StockMovementRecorded=Mouvement de stocks enregistré RuleForStockAvailability=Règles d'exigence sur les stocks diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index a41a33da48d..6215622af74 100644 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -63,7 +63,6 @@ ShowGroup=Afficher groupe ShowUser=Afficher utilisateur NonAffectedUsers=Utilisateurs non affectés au groupe UserModified=Utilisateur correctement modifié -GroupModified=Groupe correctement modifié PhotoFile=Fichier image UserWithDolibarrAccess=Utilisateur avec accès Dolibarr ListOfUsersInGroup=Liste des utilisateurs dans ce groupe @@ -88,7 +87,7 @@ ExportDataset_user_1=Utilisateurs Dolibarr et attributs DomainUser=Utilisateur du domaine %s Reactivate=Réactiver CreateInternalUserDesc=Cet écran permet de créer un utilisateur interne à votre société/institution. Pour créer un utilisateur externe (client, fournisseur, ...), utilisez le bouton 'Créer utilisateur Dolibarr' qui se trouve sur la fiche du contact du tiers. -InternalExternalDesc=Un utilisateur interne est un utilisateur appartenant à votre société/institution.
    Un utilisateur externe est un utilisateur client, fournisseur ou autre.

    Dans les 2 cas, les permissions utilisateurs définissent les droits d'accès mais l'utilisateur externe peut en plus avoir un gestionnaire de menu différent de l'utilisateur interne (Voir Accueil - Configuration - Affichage) +InternalExternalDesc=Un utilisateur interne est un utilisateur appartenant à votre société/institution.
    Un utilisateur externe est un utilisateur client, fournisseur ou autre.

    Dans les deux cas, les permissions utilisateurs définissent les droits d'accès mais l'utilisateur externe peut en plus avoir un gestionnaire de menu différent de l'utilisateur interne (Voir Accueil - Configuration - Affichage) PermissionInheritedFromAGroup=La permission est accordée car héritée d'un groupe auquel appartient l'utilisateur. Inherited=Hérité UserWillBeInternalUser=L'utilisateur créé sera un utilisateur interne (car non lié à un tiers en particulier) @@ -103,7 +102,7 @@ UserDisabled=Désactivation utilisateur %s UserEnabled=Activation utilisateur %s UserDeleted=Suppression utilisateur %s NewGroupCreated=Création groupe %s -GroupModified=Groupe correctement modifié +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 d39b2dcea91..d19c4909b4e 100644 --- a/htdocs/langs/fr_FR/withdrawals.lang +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -11,11 +11,12 @@ 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 RequestStandingOrderTreated=Demandes de prélèvements traitées +NotPossibleForThisStatusOfWithdrawReceiptORLine=Fonction non disponible. Le statut du bon de prélèvement doit être mis 'à créditer' avant d'effectuer un rejet sur des lignes spécifiques. CustomersStandingOrders=Prélèvements clients CustomerStandingOrder=Prélèvement client NbOfInvoiceToWithdraw=Nombre de factures en attente de prélèvement @@ -40,14 +41,13 @@ TransMetod=Méthode de transmission Send=Envoyer Lines=Lignes StandingOrderReject=Émettre un rejet -InvoiceRefused=Facture rejetée WithdrawalRefused=Rejet de prélèvement WithdrawalRefusedConfirm=Êtes-vous sûr de vouloir saisir un rejet de prélèvement pour la société RefusedData=Date du rejet RefusedReason=Motif du rejet RefusedInvoicing=Facturation du rejet NoInvoiceRefused=Ne pas facturer le rejet -InvoiceRefused=Facture rejetée +InvoiceRefused=Facture refusée (Charges de rejet imputable au client) Status=État StatusUnknown=Inconnu StatusWaiting=En attente @@ -76,13 +76,14 @@ WithBankUsingRIB=Pour les comptes bancaires utilisant le RIB WithBankUsingBANBIC=Pour les comptes bancaires utilisant le code BAN/BIC/SWIFT BankToReceiveWithdraw=Compte bancaire recevant les prélèvements CreditDate=Crédité le -WithdrawalFileNotCapable=Impossible de générer un fichier de bons de prélèvements pour votre pays +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/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/he_IL/accountancy.lang +++ b/htdocs/langs/he_IL/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index a00efa4fd6d..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=הזמינות תיבות @@ -437,14 +440,14 @@ Module52Name=מניות Module52Desc=המניה של וניהול של מוצרים Module53Name=שירותים Module53Desc=שירות של ניהול -Module54Name=חוזים -Module54Desc=חוזה של וניהול של שירות +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=ברקודים 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=פרוייקטים -Module400Desc=פרויקט של ניהול בתוך מודולים אחרים +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=הודעות -Module600Desc=שלח דיווחים בדואר אלקטרוני על כמה אירועים עסקיים Dolibarr לאנשי הקשר הצד השלישי +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=תרומות Module700Desc=התרומה של ההנהלה Module1200Name=גמל שלמה @@ -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 @@ -514,20 +521,20 @@ Module5000Name=רב החברה Module5000Desc=מאפשר לך לנהל מספר רב של חברות Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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=נקודת מכירות Module50100Desc=נקודת מודול מכירות -Module50200Name= Paypal -Module50200Desc= מודול להציע בדף התשלום באינטרנט באמצעות כרטיס אשראי עם Paypal +Module50200Name=Paypal +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 @@ -606,15 +613,16 @@ Permission151=לקרוא הוראות קבע Permission152=צור / לשנות בקשה הוראות הקבע Permission153=עומדים שידור הזמנות קבלות Permission154=כרטיס אשראי / לסרב עומדים קבלות הזמנות -Permission161=לקרוא חוזים -Permission162=צור / לשנות חוזים -Permission163=להפעיל שירות של החוזה -Permission164=השבתת שירות של החוזה -Permission165=מחק את החוזים -Permission171=קרא טיולים -Permission172=צור / לשנות טיולים -Permission173=מחק טיולים -Permission178=ייצוא טיולים +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=קרא ספקים Permission181=לקרוא הזמנות ספקים Permission182=ליצור / לשנות הספק הזמנות @@ -671,7 +679,7 @@ Permission300=לקרוא ברקודים Permission301=צור / לשנות הברקודים Permission302=מחק את הברקודים Permission311=לקרוא שירותים -Permission312=הקצאת שירות לחוזה +Permission312=Assign service/subscription to contract Permission331=קרא את הסימניות Permission332=צור / לשנות הסימניות Permission333=מחק סימניות @@ -701,8 +709,8 @@ Permission701=לקרוא תרומות Permission702=צור / לשנות תרומות Permission703=מחק תרומות Permission1001=לקרוא מניות -Permission1002=יצירה / שינוי במניות -Permission1003=מחיקת מניות +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=לקרוא תנועות של מניות Permission1005=צור / לשנות תנועות של מניות Permission1101=לקרוא הזמנות משלוחים @@ -778,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 @@ -887,6 +896,7 @@ PermanentLeftSearchForm=חפש בצורה קבועה בתפריט השמאלי DefaultLanguage=ברירת המחדל של השפה להשתמש (קוד שפה) EnableMultilangInterface=אפשר ממשק רב לשוני EnableShowLogo=הצג את הלוגו בתפריט השמאלי +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=המערכת עודכנה בהצלחה CompanyInfo=החברה / בסיס מידע CompanyIds=החברה / קרן זהויות @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=חזור קוד חשבון נבנה על ידי:
    ModuleCompanyCodePanicum=חזור קוד חשבון ריק. ModuleCompanyCodeDigitaria=קוד חשבונאות תלוי קוד של צד שלישי. הקוד מורכב בעל אופי "C" בעמדה 1 ואחריו את 5 התווים הראשונים של קוד של צד שלישי. UseNotifications=השתמש הודעות -NotificationsDesc=הודעות דוא"ל והודעות התכונה מאפשרת לך בשקט לשלוח דואר אוטומטי, על כמה אירועים Dolibarr, לצדדים שלישיים (לקוחות או ספקים) אשר מוגדרים. הבחירה של ההודעה פעיל במגעים מטרות עשוי צד אחד 3 בזמן. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=תבניות מסמכים DocumentModelOdt=צור מסמכים מתבניות OpenDocuments (. ODT קבצים של אופן אופיס, KOffice, TextEdit, ...) WatermarkOnDraft=סימן מים על מסמך טיוטה @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=הוסף תאריך יכולת המסירה UseOptionLineIfNoQuantity=קו של המוצר / שירות עם כמות אפס נחשבת כאופציה FreeLegalTextOnProposal=טקסט חופשי על הצעות מסחריות WatermarkOnDraftProposal=סימן מים על הצעות טיוטה מסחריים (כל אם ריק) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=התקנה וניהול של סדר OrdersNumberingModules=הזמנות מספור מודולים @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=כדי לאמת את הסדר אחרי קרוב ההצעה, מאפשרת לא לדרוך על פי צו זמני FreeLegalTextOnOrders=טקסט חינם על הזמנות WatermarkOnDraftOrders=סימן מים על צווי הגיוס (כל אם ריק) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול ClickToDialUrlDesc=כתובת האתר נקרא כאשר לחיצה על הטלפון picto נעשה. ב-URL, ניתן להשתמש בתגיות
    __PHONETO__ כי יוחלף מספר הטלפון של אדם לקרוא
    __PHONEFROM__ כי יוחלף מספר הטלפון של אדם קורא (שלך)
    __LOGIN__ כי יוחלפו התחברות clicktodial שלך (המוגדר בכרטיס המשתמש שלך)
    __PASS__ כי יוחלף עם הסיסמה clicktodial שלך (המוגדר בכרטיס המשתמש שלך). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=התערבות מודולים מספור TemplatePDFInterventions=כרטיס התערבות מסמכים דגמים WatermarkOnDraftInterventionCards=סימן מים על מסמכים כרטיס התערבות (כל אם ריק) ##### Contracts ##### -ContractsSetup=חוזים מודול ההתקנה +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=חוזים מספור מודולים TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=מוצרים מודול ההתקנה ServiceSetup=מודול שירותי התקנה @@ -1382,9 +1393,10 @@ MailingSetup=שליחת הדוא"ל ההתקנה מודול MailingEMailFrom=כתובת אימייל של השולח (מ) על הודעות דוא"ל שנשלחו על ידי דואר אלקטרוני מודול MailingEMailError=חזור דואר אלקטרוני (שגיאות ל) עבור הודעות דוא"ל עם שגיאות ##### Notification ##### -NotificationSetup=הודעה על מודול bu דוא"ל ההתקנה +NotificationSetup=EMail notification module setup NotificationEMailFrom=כתובת אימייל של השולח (מ) על הודעות דוא"ל שנשלחו עבור הודעות -ListOfAvailableNotifications=רשימת הודעות הזמינות (רשימה זו תלויה מודולים הופעל) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=שליחת ההתקנה מודול SendingsReceiptModel=שליחת מודל קבלת @@ -1412,8 +1424,9 @@ OSCommerceTestOk=חיבור "%s של שרת" %s "מסד נתונ OSCommerceTestKo1=חיבור "%s" שרת להצליח אבל "%s" מסד נתונים לא ניתן היה להשיג. OSCommerceTestKo2=חיבור "%s של שרת עם" %s "המשתמש נכשל. ##### Stock ##### -StockSetup=מודול תצורת המניות -UserWarehouse=השתמש מניות משתמש אישיים +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=תפריט נמחק TreeMenu=עץ תפריטים @@ -1478,11 +1491,14 @@ ClickToDialDesc=מודול זה מאפשר להוסיף סמל אחרי מספר ##### Point Of Sales (CashDesk) ##### CashDesk=נקודת מכירות CashDeskSetup=נקודת ההתקנה מודול מכירות -CashDeskThirdPartyForSell=צד שלישי Generic להשתמש עבור מוכר +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=חשבון ברירת מחדל להשתמש כדי לקבל תשלומים במזומן CashDeskBankAccountForCheque= חשבון ברירת מחדל להשתמש כדי לקבל תשלומים על ידי סימון CashDeskBankAccountForCB= חשבון ברירת מחדל להשתמש כדי לקבל תשלומים במזומן באמצעות כרטיסי אשראי -CashDeskIdWareHouse=מחסן לשימוש עבור מוכר +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. ##### Bookmark ##### BookmarkSetup=הפוך ההתקנה מודול BookmarkDesc=מודול זה מאפשר לך לנהל את הסימניות. ניתן גם להוסיף קיצורי דרך לכל הדפים Dolibarr או אתרי אינטרנט externale בתפריט השמאלי. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang index cbfb9f7c49b..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 @@ -41,9 +42,10 @@ AutoActions= Automatic filling AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Invoice %s validated +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Order %s validated @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status OrderCanceledInDolibarr=Order %s canceled -InterventionValidatedInDolibarr=Intervention %s validated ProposalSentByEMail=Commercial proposal %s sent by EMail OrderSentByEMail=Customer order %s sent by EMail InvoiceSentByEMail=Customer invoice %s sent by EMail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail ShippingSentByEMail=Shipping %s sent by EMail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sent by EMail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date DateActionPlannedEnd= Planned end date @@ -70,9 +69,9 @@ DateActionStart= Start date DateActionEnd= End date AgendaUrlOptions1=You can also add following parameters to filter output: AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. -AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Show birthday's contacts AgendaHideBirthdayEvents=Hide birthday's contacts Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang index 1e2d936607f..1c56451ffdc 100644 --- a/htdocs/langs/he_IL/bills.lang +++ b/htdocs/langs/he_IL/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=כתב זכויות InvoiceAvoirAsk=Credit note to correct invoice InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Replace invoice %s ReplacementInvoice=Replacement invoice ReplacedByInvoice=Replaced by invoice %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned' ClassifyClosed=Classify 'Closed' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Create Invoice -AddBill=Add invoice or credit note +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice @@ -99,7 +99,7 @@ DoPaymentBack=Do payment back ConvertToReduc=Convert into future discount EnterPaymentReceivedFromCustomer=Enter payment received from customer EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Amount PriceBase=Price base BillStatus=Invoice status @@ -137,8 +137,6 @@ BillFrom=From BillTo=To ActionsOnBill=Actions on invoice NewBill=New invoice -Prélèvements=Standing order -Prélèvements=Standing order LastBills=Last %s invoices LastCustomersBills=Last %s customers invoices LastSuppliersBills=Last %s suppliers invoices @@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice %s ? ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason @@ -191,9 +189,9 @@ AlreadyPaid=Already paid AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Abandoned -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received @@ -219,19 +217,18 @@ NoInvoice=No invoice ClassifyBill=Classify invoice SupplierBillsToPay=Suppliers invoices to pay CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms SetMode=Set payment mode Billed=Billed -RepeatableInvoice=Pre-defined invoice -RepeatableInvoices=Pre-defined invoices -Repeatable=Pre-defined -Repeatables=Pre-defined -ChangeIntoRepeatableInvoice=Convert into pre-defined -CreateRepeatableInvoice=Create pre-defined invoice -CreateFromRepeatableInvoice=Create from pre-defined invoice +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Customer invoices and payments ExportDataset_invoice_1=Customer invoices list and invoice's lines diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang index ae0b9d441af..244341b4fba 100644 --- a/htdocs/langs/he_IL/categories.lang +++ b/htdocs/langs/he_IL/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang index b172c139c4e..e962d4de7ce 100644 --- a/htdocs/langs/he_IL/compta.lang +++ b/htdocs/langs/he_IL/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 245466d70e1..52c05d495ad 100644 --- a/htdocs/langs/he_IL/contracts.lang +++ b/htdocs/langs/he_IL/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastContracts=Last %s modified contracts +LastModifiedContracts=Last %s modified contracts AllContracts=All contracts ContractCard=Contract card ContractStatus=Contract status @@ -27,7 +27,7 @@ MenuRunningServices=Running services MenuExpiredServices=Expired services MenuClosedServices=Closed services NewContract=New contract -AddContract=Add contract +AddContract=Create contract SearchAContract=Search a contract DeleteAContract=Delete a contract CloseAContract=Close a contract @@ -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 %s modified 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/cron.lang b/htdocs/langs/he_IL/cron.lang index c17606bb6eb..492e92c956f 100644 --- a/htdocs/langs/he_IL/cron.lang +++ b/htdocs/langs/he_IL/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# -# About = About -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +About = About +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job CronNone= None -# CronDtStart=Start date -# CronDtEnd=End date -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe -# CronMethod=Method -# CronModule=Module -# CronAction=Action -# CronStatus=Status -# CronStatusActive=Enabled -# CronStatusInactive=Disabled -# CronNoJobs=No jobs registered -# CronPriority=Priority +CronDtStart=Start date +CronDtEnd=End date +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe +CronMethod=Method +CronModule=Module +CronAction=Action +CronStatus=Status +CronStatusActive=Enabled +CronStatusInactive=Disabled +CronNoJobs=No jobs registered +CronPriority=Priority CronLabel=תאור -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create -# CronArgs=Parameters -# CronSaveSucess=Save succesfully -# CronNote=Comment -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable -# CronStatusInactiveBtn=Disable -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create +CronArgs=Parameters +CronSaveSucess=Save succesfully +CronNote=Comment +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable +CronStatusInactiveBtn=Disable +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/he_IL/donations.lang b/htdocs/langs/he_IL/donations.lang index 66ed9f4c8ab..8f009f4a115 100644 --- a/htdocs/langs/he_IL/donations.lang +++ b/htdocs/langs/he_IL/donations.lang @@ -4,7 +4,7 @@ Donations=תרומות DonationRef=Donation ref. Donor=Donor Donors=Donors -AddDonation=Add a donation +AddDonation=Create a donation NewDonation=New donation ShowDonation=Show donation DonationPromise=Gift promise @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/he_IL/externalsite.lang index b915c37a5ab..da4853df0df 100644 --- a/htdocs/langs/he_IL/externalsite.lang +++ b/htdocs/langs/he_IL/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite -# ExternalSiteSetup=Setup link to external website -# ExternalSiteURL=External Site URL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteSetup=Setup link to external website +ExternalSiteURL=External Site URL +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/he_IL/holiday.lang b/htdocs/langs/he_IL/holiday.lang index afb0df633c2..0b2eb810e67 100644 --- a/htdocs/langs/he_IL/holiday.lang +++ b/htdocs/langs/he_IL/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=שם Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/he_IL/interventions.lang b/htdocs/langs/he_IL/interventions.lang index f60e9f6b19c..b472c41f7a6 100644 --- a/htdocs/langs/he_IL/interventions.lang +++ b/htdocs/langs/he_IL/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=התערבויות InterventionCard=Intervention card NewIntervention=New intervention -AddIntervention=Add intervention +AddIntervention=Create intervention ListOfInterventions=List of interventions EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang index 49a8bbc543b..d7a601e8382 100644 --- a/htdocs/langs/he_IL/mails.lang +++ b/htdocs/langs/he_IL/mails.lang @@ -115,7 +115,7 @@ SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -133,6 +133,9 @@ Notifications=הודעות NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang index 3ce5da9ebe4..5136c7c528d 100644 --- a/htdocs/langs/he_IL/main.lang +++ b/htdocs/langs/he_IL/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries GoToWikiHelpPage=Read online help (need Internet access) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier @@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events NActionsLate=%s late +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Remove filter ChartGenerated=Chart generated @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToThirdParty=Link to another third party CreateDraft=Create draft +SetToDraft=Back to draft ClickToEdit=Click to edit ObjectDeleted=Object %s deleted ByCountry=By country @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/he_IL/margins.lang b/htdocs/langs/he_IL/margins.lang index e8d5fed1af9..606d5e5053a 100644 --- a/htdocs/langs/he_IL/margins.lang +++ b/htdocs/langs/he_IL/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=Product or Service AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=Start date EndDate=End date Launch=Start - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/he_IL/orders.lang index 54926464c14..7fe2fcc7348 100644 --- a/htdocs/langs/he_IL/orders.lang +++ b/htdocs/langs/he_IL/orders.lang @@ -1,168 +1,162 @@ # Dolibarr language file - Source file is en_US - orders -# OrdersArea=Customers orders area -# SuppliersOrdersArea=Suppliers orders area -# OrderCard=Order card -# OrderId=Order Id +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id Order=סדר -# Orders=Orders -# OrderLine=Order line -# OrderFollow=Follow up -# OrderDate=Order date -# OrderToProcess=Order to process -# NewOrder=New order -# ToOrder=Make order -# MakeOrder=Make order -# SupplierOrder=Supplier order -# SuppliersOrders=Suppliers orders -# SuppliersOrdersRunning=Current suppliers orders -# CustomerOrder=Customer order -# CustomersOrders=Customer's orders -# CustomersOrdersRunning=Current customer's orders -# CustomersOrdersAndOrdersLines=Customer orders and order's lines -# OrdersToValid=Customer's orders to validate -# OrdersToBill=Customer's orders delivered -# OrdersInProcess=Customer's orders in process -# OrdersToProcess=Customer's orders to process -# SuppliersOrdersToProcess=Supplier's orders to process -# StatusOrderCanceledShort=Canceled -# StatusOrderDraftShort=Draft -# StatusOrderValidatedShort=Validated -# StatusOrderSentShort=In process -# StatusOrderSent=Shipment in process -# StatusOrderOnProcessShort=Reception -# StatusOrderProcessedShort=Processed -# StatusOrderToBillShort=Delivered -# StatusOrderToBill2Short=To bill -# StatusOrderApprovedShort=Approved -# StatusOrderRefusedShort=Refused -# StatusOrderToProcessShort=To process -# StatusOrderReceivedPartiallyShort=Partially received -# StatusOrderReceivedAllShort=Everything received -# StatusOrderCanceled=Canceled -# StatusOrderDraft=Draft (needs to be validated) -# StatusOrderValidated=Validated -# StatusOrderOnProcess=Waiting to receive -# StatusOrderProcessed=Processed -# StatusOrderToBill=Delivered -# StatusOrderToBill2=To bill -# StatusOrderApproved=Approved -# StatusOrderRefused=Refused -# StatusOrderReceivedPartially=Partially received -# StatusOrderReceivedAll=Everything received -# ShippingExist=A shipment exists -# DraftOrWaitingApproved=Draft or approved not yet ordered -# DraftOrWaitingShipped=Draft or validated not yet shipped -# MenuOrdersToBill=Orders delivered -# MenuOrdersToBill2=Orders to bill -# SearchOrder=Search order -# SearchACustomerOrder=Search a customer order -# ShipProduct=Ship product -# Discount=Discount -# CreateOrder=Create Order -# RefuseOrder=Refuse order -# ApproveOrder=Accept order -# ValidateOrder=Validate order -# UnvalidateOrder=Unvalidate order -# DeleteOrder=Delete order -# CancelOrder=Cancel order -# AddOrder=Add order -# AddToMyOrders=Add to my orders -# AddToOtherOrders=Add to other orders -# AddToDraftOrders=Add to draft order -# ShowOrder=Show order -# NoOpenedOrders=No opened orders -# NoOtherOpenedOrders=No other opened orders -# NoDraftOrders=No draft orders -# OtherOrders=Other orders -# LastOrders=Last %s orders -# LastModifiedOrders=Last %s modified orders -# LastClosedOrders=Last %s closed orders -# AllOrders=All orders -# NbOfOrders=Number of orders -# OrdersStatistics=Order's statistics -# OrdersStatisticsSuppliers=Supplier order's statistics -# NumberOfOrdersByMonth=Number of orders by month -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) -# ListOfOrders=List of orders -# CloseOrder=Close order -# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. -# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. -# ConfirmDeleteOrder=Are you sure you want to delete this order ? -# ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? -# ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? -# ConfirmCancelOrder=Are you sure you want to cancel this order ? -# ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? -# GenerateBill=Generate invoice -# ClassifyShipped=Classify delivered -# ClassifyBilled=Classify billed -# ComptaCard=Accountancy card -# DraftOrders=Draft orders -# RelatedOrders=Related orders -# OnProcessOrders=In process orders -# RefOrder=Ref. order -# RefCustomerOrder=Ref. customer order -# CustomerOrder=Customer order -# RefCustomerOrderShort=Ref. cust. order -# SendOrderByMail=Send order by mail -# ActionsOnOrder=Events on order -# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order -# OrderMode=Order method -# AuthorRequest=Request author -# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address -# RunningOrders=Orders on process -# UserWithApproveOrderGrant=Users granted with "approve orders" permission. -# PaymentOrderRef=Payment of order %s -# CloneOrder=Clone order -# ConfirmCloneOrder=Are you sure you want to clone this order %s ? -# DispatchSupplierOrder=Receiving supplier order %s +Orders=Orders +OrderLine=Order line +OrderFollow=Follow up +OrderDate=Order date +OrderToProcess=Order to process +NewOrder=New order +ToOrder=Make order +MakeOrder=Make order +SupplierOrder=Supplier order +SuppliersOrders=Suppliers orders +SuppliersOrdersRunning=Current suppliers orders +CustomerOrder=Customer order +CustomersOrders=Customer's orders +CustomersOrdersRunning=Current customer's orders +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customer's orders to validate +OrdersToBill=Customer's orders delivered +OrdersInProcess=Customer's orders in process +OrdersToProcess=Customer's orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderSentShort=In process +StatusOrderSent=Shipment in process +StatusOrderOnProcessShort=Reception +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=Delivered +StatusOrderToBill2Short=To bill +StatusOrderApprovedShort=Approved +StatusOrderRefusedShort=Refused +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received +StatusOrderCanceled=Canceled +StatusOrderDraft=Draft (needs to be validated) +StatusOrderValidated=Validated +StatusOrderOnProcess=Waiting to receive +StatusOrderProcessed=Processed +StatusOrderToBill=Delivered +StatusOrderToBill2=To bill +StatusOrderApproved=Approved +StatusOrderRefused=Refused +StatusOrderReceivedPartially=Partially received +StatusOrderReceivedAll=Everything received +ShippingExist=A shipment exists +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders +SearchOrder=Search order +SearchACustomerOrder=Search a customer order +ShipProduct=Ship product +Discount=Discount +CreateOrder=Create Order +RefuseOrder=Refuse order +ApproveOrder=Accept order +ValidateOrder=Validate order +UnvalidateOrder=Unvalidate order +DeleteOrder=Delete order +CancelOrder=Cancel order +AddOrder=Create order +AddToMyOrders=Add to my orders +AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order +ShowOrder=Show order +NoOpenedOrders=No opened orders +NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders +AllOrders=All orders +NbOfOrders=Number of orders +OrdersStatistics=Order's statistics +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +ListOfOrders=List of orders +CloseOrder=Close order +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +GenerateBill=Generate invoice +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s ##### Types de contacts ##### -# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order -# TypeContact_commande_internal_SHIPPING=Representative following-up shipping -# TypeContact_commande_external_BILLING=Customer invoice contact -# TypeContact_commande_external_SHIPPING=Customer shipping contact -# TypeContact_commande_external_CUSTOMER=Customer contact following-up order -# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order -# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping -# TypeContact_order_supplier_external_BILLING=Supplier invoice contact -# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact -# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order - -# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined -# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined -# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' -# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' -# Error_OrderNotChecked=No orders to invoice selected - +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected # Sources -# OrderSource0=Commercial proposal -# OrderSource1=Internet -# OrderSource2=Mail campaign -# OrderSource3=Phone compaign -# OrderSource4=Fax campaign +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign OrderSource5=מסחרי -# OrderSource6=Store -# QtyOrdered=Qty ordered -# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order - +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order # Documents models -# PDFEinsteinDescription=A complete order model (logo...) -# PDFEdisonDescription=A simple order model -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes -# OrderByMail=Mail -# OrderByFax=Fax -# OrderByEMail=EMail -# OrderByWWW=Online -# OrderByPhone=Phone - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/he_IL/oscommerce.lang b/htdocs/langs/he_IL/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/he_IL/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang index 03da57d1494..b9e26e405c8 100644 --- a/htdocs/langs/he_IL/other.lang +++ b/htdocs/langs/he_IL/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/he_IL/paybox.lang b/htdocs/langs/he_IL/paybox.lang index b689bb6cebf..aced32a4944 100644 --- a/htdocs/langs/he_IL/paybox.lang +++ b/htdocs/langs/he_IL/paybox.lang @@ -1,37 +1,40 @@ # Dolibarr language file - Source file is en_US - paybox -# PayBoxSetup=PayBox module setup -# PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) -# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects -# PaymentForm=Payment form -# WelcomeOnPaymentPage=Welcome on our online payment service -# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. -# ThisIsInformationOnPayment=This is information on payment to do -# ToComplete=To complete -# YourEMail=Email to receive payment confirmation -# Creditor=Creditor -# PaymentCode=Payment code -# PayBoxDoPayment=Go on payment -# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information -# PleaseBePatient=Please, be patient -# Continue=Next -# ToOfferALinkForOnlinePayment=URL for %s payment -# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order -# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice -# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line -# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount -# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription -# YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. -# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. -# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. -# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. -# AccountParameter=Account parameters -# UsageParameter=Usage parameters -# InformationToFindParameters=Help to find your %s account information -# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment -# VendorName=Name of vendor -# CSSUrlForPaymentForm=CSS style sheet url for payment form -# MessageOK=Message on validated payment return page -# MessageKO=Message on canceled payment return page -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/he_IL/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang index 0789ed233ee..a3398b27c8b 100644 --- a/htdocs/langs/he_IL/sendings.lang +++ b/htdocs/langs/he_IL/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang index 5b785952730..8d96d6ad9b7 100644 --- a/htdocs/langs/he_IL/stocks.lang +++ b/htdocs/langs/he_IL/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=Location LocationSummary=Short name location NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang index 893d359a5b8..b6011056fc8 100644 --- a/htdocs/langs/he_IL/users.lang +++ b/htdocs/langs/he_IL/users.lang @@ -63,7 +63,6 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group modified successfully +GroupModified=Group %s modified GroupDeleted=Group %s removed ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? @@ -114,8 +113,10 @@ YourRole=Your roles YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb of users DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang index d6a01597c97..42b6ed1e19c 100644 --- a/htdocs/langs/he_IL/withdrawals.lang +++ b/htdocs/langs/he_IL/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=לא ידוע StatusWaiting=Waiting @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/hr_HR/accountancy.lang +++ b/htdocs/langs/hr_HR/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang index 0b0b69620f9..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 @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Stock management (products) Module53Name=Services Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +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 -Module400Desc=Project management inside other modules +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=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 @@ -606,15 +613,16 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -701,8 +709,8 @@ Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Read stock movements Permission1005=Create/modify stock movements Permission1101=Read delivery orders @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Products module setup ServiceSetup=Services module setup @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang index eb3b6a174f4..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 @@ -41,9 +42,10 @@ AutoActions= Automasko filtriranje AgendaAutoActionDesc= Ovdje definirajte događaje za koje želite da Dolibarr automatski kreira događaj u podsjetnike. Ukoliko se ništa ne provjerava( po defaultu), samo manualne akcije će biti uključene u dnevni red. AgendaSetupOtherDesc= Ova stranica omogućava opcije za izvoz događaja u vanjski kalendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=Ova stranica omogućuje postavu vanjskih izvora kalendara kako bi se mogli viditi svoje događaje u Dolibarr podsjetnicima -ActionsEvents= Događaji za koje Dolibarr će kreirat akcije u podsjetnicima automatski -PropalValidatedInDolibarr= Ponuda %s ovjerena -InvoiceValidatedInDolibarr= Račun %s ovjeren +ActionsEvents=Događaji za koje Dolibarr će kreirat akcije u podsjetnicima automatski +PropalValidatedInDolibarr=Ponuda %s ovjerena +InvoiceValidatedInDolibarr=Račun %s ovjeren +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Račun %s vraćen u status skice InvoiceDeleteDolibarr=Račun %s obrisan OrderValidatedInDolibarr= Narudžba %s ovjerena @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Narudžba %s odobrena OrderRefusedInDolibarr=Narudžba %s je odbijena OrderBackToDraftInDolibarr=Narudžba %s vraćena u status skice OrderCanceledInDolibarr=Narudžba %s otkazana -InterventionValidatedInDolibarr=Intervencija %s ovjerena ProposalSentByEMail=Komercijalni prijedlog %s poslan putem Emaila OrderSentByEMail=Narudžba kupca %s poslana putem Emaila InvoiceSentByEMail=Račun kupca %s poslan Emailom @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Narudžba dobavljača %s poslana Emailom SupplierInvoiceSentByEMail=Račun dobavljača %s poslan Emailom ShippingSentByEMail=Dostava %s poslana putem Emaila ShippingValidated= Pošiljka %s je ovjerena -InterventionSentByEMail=Intervencija %s poslana putem Emaila -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Treća stranka stvorena DateActionPlannedStart= Planirani početni datum DateActionPlannedEnd= Planirani završni datum @@ -70,9 +69,9 @@ DateActionStart= Datum početka DateActionEnd= Datum završetka AgendaUrlOptions1=Možete isto dodati sljedeće paramete za filtriranje prikazanog: AgendaUrlOptions2=Prijava=%s za ograničavanje prikaza akcije kreiranja , dodijeljene ili završene od strane korisnika%s. -AgendaUrlOptions3=Prijava=%s da se ograniči prikaz akcija kreiranih od korisnika%s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=Prijava=%sda se ograniči prikaz na akcije dodijeljene korisniku %s. -AgendaUrlOptions5=Prijava=%s da se ograniči prikaz na akcije završene od strane korisnika %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Prikaži rođendan kontakata AgendaHideBirthdayEvents=Sakrij rođendane kontakata Busy=Zauzet @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL za pristup .ical datoteki ExtSiteNoLabel=Bez opisa WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang index 521638dc632..f7ccb1a234f 100644 --- a/htdocs/langs/hr_HR/bills.lang +++ b/htdocs/langs/hr_HR/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Bonifikacija InvoiceAvoirAsk=Bonifikacija za ispravan račun InvoiceAvoirDesc=kredit je negativan račun koji se koristi prilikom riješavanja problema koji nastaje kada je na računu drugačiji iznos od plaćenog (npr. kada je kupac uplatio više greškom ili neće platiti sve jer je jedan dio proizvoda vratio). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Zamjeni račun %s ReplacementInvoice=Zamjenski račun ReplacedByInvoice=Zamijenjen s računom %s @@ -87,7 +87,7 @@ ClassifyCanceled=Označi kao napušteno ClassifyClosed=Označi kao zatvoreno ClassifyUnBilled=Klasificirati 'nefakturirano' CreateBill=Izradi račun -AddBill=Dodaj račun ili bonifikaciju +AddBill=Create invoice or credit note AddToDraftInvoices=Dodati u skice računa DeleteBill=Izbriši račun SearchACustomerInvoice=Traži račun za kupca @@ -99,7 +99,7 @@ DoPaymentBack=Izvrši povrat plaćanja ConvertToReduc=Pretvori u budući popust EnterPaymentReceivedFromCustomer=Upiši zaprimljeno plaćanje kupca EnterPaymentDueToCustomer=Napravi -DisabledBecauseRemainderToPayIsZero=Onemogući jer je opomena manja od nule +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Iznos PriceBase=Osnovica BillStatus=Stanje računa @@ -137,8 +137,6 @@ BillFrom=Od BillTo=Za ActionsOnBill=Radnje na računu NewBill=Novi račun -Prélèvements=Otvorena narudžba -Prélèvements=Otvorena narudžba LastBills=Zadnjih %s računa LastCustomersBills=Zadnjih %s računa kupaca LastSuppliersBills=Zadnjih %s računa dobavljača @@ -156,9 +154,9 @@ ConfirmCancelBill=Jeste li sigurni da poništiti račun %s? ConfirmCancelBillQuestion=Zašto želite ovaj račun označiti kao napušten? ConfirmClassifyPaidPartially=Jeste li sigurni da želite račun %s označiti kao plaćen? ConfirmClassifyPaidPartiallyQuestion=Ovaj račun nije plaćen u cijelosti. Iz kojeg razloga ga želite zatvortiti? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +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=Loš kupac ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvod djelomično vraćen ConfirmClassifyPaidPartiallyReasonOther=Iznos otpisan iz drugih razloga @@ -191,9 +189,9 @@ AlreadyPaid=Plaćeno do sada AlreadyPaidBack=Povrati do sada AlreadyPaidNoCreditNotesNoDeposits=Već plaćeno(bez bonifikacije i depozita) Abandoned=Napušteno -RemainderToPay=Podsjetnik za plaćanje -RemainderToTake=Podsjetnik za uzimanje -RemainderToPayBack=Podsjetnik za povrat +RemainderToPay=Preostali neplaćeni iznos +RemainderToTake=Preostali iznos za primiti +RemainderToPayBack=Preostali iznos za vratiti Rest=U toku AmountExpected=Utvrđen iznos ExcessReceived=Previše primljeno @@ -219,8 +217,7 @@ NoInvoice=Nema računa ClassifyBill=Svrstavanje računa SupplierBillsToPay=Računi dobavljača za plaćanje CustomerBillsUnpaid=Neplaćeni računi za kupce -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Nepovratno SetConditions=Odredi rok plaćanja SetMode=Odredi oblik plaćanja @@ -228,8 +225,8 @@ Billed=Nplaćeno RepeatableInvoice=Predložak računa RepeatableInvoices=Predlošci računa Repeatable=Predložak -Repeatables=Predložak -ChangeIntoRepeatableInvoice=Pretvori u predložak +Repeatables=Predlošci +ChangeIntoRepeatableInvoice=Pretvori u predložak računa CreateRepeatableInvoice=Izradi predložak računa CreateFromRepeatableInvoice=Izradi iz predloška računa CustomersInvoicesAndInvoiceLines=Računi klijenata i redovi računa diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang index ed61bfc08a6..22914931db1 100644 --- a/htdocs/langs/hr_HR/categories.lang +++ b/htdocs/langs/hr_HR/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang index 3929cfde036..878eb49b3c9 100644 --- a/htdocs/langs/hr_HR/compta.lang +++ b/htdocs/langs/hr_HR/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 b5241ddd7f0..26ec3f1e5a4 100644 --- a/htdocs/langs/hr_HR/contracts.lang +++ b/htdocs/langs/hr_HR/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Područje ugovora ListOfContracts=Popis ugovora -LastContracts=Posljednji %s modificirani ugovori +LastModifiedContracts=Last %s modified contracts AllContracts=Svi ugovori ContractCard=Kartice ugovora ContractStatus=Status ugovora @@ -27,7 +27,7 @@ MenuRunningServices=Pokrenute usluge MenuExpiredServices=Usluge koje su istekle MenuClosedServices=Završene usluge NewContract=Novi ugovor -AddContract=Dodaj ugovor +AddContract=Izradi ugovor SearchAContract=Pretraži ugovor DeleteAContract=Izbriši ugovor CloseAContract=Zatvori ugovor @@ -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=Posljednji %s modificirani ugovori +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/cron.lang b/htdocs/langs/hr_HR/cron.lang index 1be23d72ca3..195ad43c87c 100644 --- a/htdocs/langs/hr_HR/cron.lang +++ b/htdocs/langs/hr_HR/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# -# About = About -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +About = About +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job -# CronNone= None -# CronDtStart=Start date -# CronDtEnd=End date -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe -# CronMethod=Method -# CronModule=Module -# CronAction=Action -# CronStatus=Status -# CronStatusActive=Enabled -# CronStatusInactive=Disabled -# CronNoJobs=No jobs registered -# CronPriority=Priority -# CronLabel=Description -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job +CronNone= None +CronDtStart=Start date +CronDtEnd=End date +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe +CronMethod=Method +CronModule=Module +CronAction=Action +CronStatus=Status +CronStatusActive=Enabled +CronStatusInactive=Disabled +CronNoJobs=No jobs registered +CronPriority=Priority +CronLabel=Description +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create -# CronArgs=Parameters -# CronSaveSucess=Save succesfully -# CronNote=Comment -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable -# CronStatusInactiveBtn=Disable -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create +CronArgs=Parameters +CronSaveSucess=Save succesfully +CronNote=Comment +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable +CronStatusInactiveBtn=Disable +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/hr_HR/deliveries.lang b/htdocs/langs/hr_HR/deliveries.lang index 89a43f02189..a740554d049 100644 --- a/htdocs/langs/hr_HR/deliveries.lang +++ b/htdocs/langs/hr_HR/deliveries.lang @@ -24,3 +24,5 @@ Deliverer=Dostavljač: Sender=Pošiljatelj Recipient=Primatelj ErrorStockIsNotEnough=Nema dovoljno robe na skladištu +Shippable=Dostava je moguća +NonShippable=Dostava nije moguća diff --git a/htdocs/langs/hr_HR/dict.lang b/htdocs/langs/hr_HR/dict.lang index a662b0f7573..07cb4dcc4e3 100644 --- a/htdocs/langs/hr_HR/dict.lang +++ b/htdocs/langs/hr_HR/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=Francuska +CountryBE=Belgija +CountryIT=Italija +CountryES=Španjolska +CountryDE=Njemačka +CountryCH=Švicarska +CountryGB=Velika Britanija +CountryUK=United Kingdom +CountryIE=Irska +CountryCN=Kina +CountryTN=Tunis +CountryUS=Sjedinjene Američke Države +CountryMA=Maroko +CountryDZ=Alžir +CountryCA=Kanada +CountryTG=Togo +CountryGA=Gabon +CountryNL=Nizozemska +CountryHU=Mađarska +CountryRU=Rusija +CountrySE=Švedska +CountryCI=Obala Bjelokosti +CountrySN=Senegal +CountryAR=Argentina +CountryCM=Kamerun +CountryPT=Portugal +CountrySA=Saudijska Arabija +CountryMC=Monako +CountryAU=Australija +CountrySG=Singapur +CountryAF=Afganistan +CountryAX=Åland Islands +CountryAL=Albanija +CountryAS=Američka Samoa +CountryAD=Andora +CountryAO=Angola +CountryAI=Anguilla +CountryAQ=Antartik +CountryAG=Antigua and Barbuda +CountryAM=Armenija +CountryAW=Aruba +CountryAT=Austrija +CountryAZ=Azerbedžan +CountryBS=Bahami +CountryBH=Bahrein +CountryBD=Bangladeš +CountryBB=Barbados +CountryBY=Bjelorusija +CountryBZ=Belize +CountryBJ=Benin +CountryBM=Bermude +CountryBT=Butan +CountryBO=Bolivija +CountryBA=Bosna i Hercegovina +CountryBW=Botsvana +CountryBV=Bouvet Island +CountryBR=Brazil +CountryIO=Britansko Indijsko otočje +CountryBN=Brunei Darussalam +CountryBG=Bugarska +CountryBF=Burkina Faso +CountryBI=Burundi +CountryKH=Kabodža +CountryCV=Cape Verde +CountryKY=Kajmanski otoci +CountryCF=Centralna Afrička Republika +CountryTD=Čad +CountryCL=Čile +CountryCX=Božićni otoci +CountryCC=Cocos (Keeling) Islands +CountryCO=Kolumbija +CountryKM=Comoros +CountryCG=Kongo +CountryCD=Kongo, demokratska republika +CountryCK=Cook Islands +CountryCR=Kostarika +CountryHR=Hrvatska! +CountryCU=Kuba +CountryCY=Cipar +CountryCZ=Češka +CountryDK=Danska +CountryDJ=Djibouti +CountryDM=Dominica +CountryDO=Dominikanska republika +CountryEC=Ekvador +CountryEG=Egipat +CountrySV=Salvador +CountryGQ=Equatorial Guinea +CountryER=Eritrea +CountryEE=Estonija +CountryET=Etiopija +CountryFK=Falkland Islands +CountryFO=Faroski otoci +CountryFJ=Fiđi +CountryFI=Finska +CountryGF=Francuska Gvajana +CountryPF=Francuska Polinezija +CountryTF=Francuski Južni teritorij +CountryGM=Gambija +CountryGE=Gruzija +CountryGH=Gana +CountryGI=Gibraltar +CountryGR=Grčka +CountryGL=Grenland +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=Island +CountryIN=Indija +CountryID=Indonezija +CountryIR=Iran +CountryIQ=Irak +CountryIL=Izrael +CountryJM=Jamajka +CountryJP=Japan +CountryJO=Jordan +CountryKZ=Kazahstan +CountryKE=Kenija +CountryKI=Kiribati +CountryKP=Sjeverna Korea +CountryKR=Južna Korea +CountryKW=Kuvajt +CountryKG=Kirgistan +CountryLA=Lao +CountryLV=Latvija +CountryLB=Libanon +CountryLS=Lesoto +CountryLR=Liberija +CountryLY=Libija +CountryLI=Liechtenstein +CountryLT=Litva +CountryLU=Luksemburg +CountryMO=Makao +CountryMK=Makedonija +CountryMG=Madagaskar +CountryMW=Malawi +CountryMY=Malezija +CountryMV=Maldivi +CountryML=Mali +CountryMT=Malta +CountryMH=Marshall Islands +CountryMQ=Martinique +CountryMR=Mauritania +CountryMU=Mauritius +CountryYT=Mayotte +CountryMX=Meksiko +CountryFM=Micronesia +CountryMD=Moldavija +CountryMN=Mongolia +CountryMS=Monserrat +CountryMZ=Mozambik +CountryMM=Birmania (Myanmar) +CountryNA=Nambija +CountryNR=Nauru +CountryNP=Nepal +CountryAN=Nizozemski Antila +CountryNC=New Caledonia +CountryNZ=Novi Zeland +CountryNI=Nikaragva +CountryNE=Niger +CountryNG=Nigerija +CountryNU=Niue +CountryNF=Norfolk Island +CountryMP=Northern Mariana Islands +CountryNO=Norveška +CountryOM=Oman +CountryPK=Pakistan +CountryPW=Palau +CountryPS=Palestina +CountryPA=Panama +CountryPG=Papa Nova Gvineja +CountryPY=Paragvaj +CountryPE=Peru +CountryPH=Filipini +CountryPN=Pitcairn Islands +CountryPL=Poljska +CountryPR=Portoriko +CountryQA=Katar +CountryRE=Reunion +CountryRO=Rumunjska +CountryRW=Ruanda +CountrySH=Sveta Helena +CountryKN=Saint Kitts and Nevis +CountryLC=Sveta Lucija +CountryPM=Saint Pierre and Miquelon +CountryVC=Saint Vincent and Grenadines +CountryWS=Samoa +CountrySM=Sam Marino +CountryST=Sao Tome and Principe +CountryRS=Srbija +CountrySC=Sejšeli +CountrySL=Sierra Leone +CountrySK=Slovačka +CountrySI=Slovenija +CountrySB=Solomon Islands +CountrySO=Somalija +CountryZA=Južna Afrika +CountryGS=South Georgia and the South Sandwich Islands +CountryLK=Šri LAnka +CountrySD=udan +CountrySR=Suriname +CountrySJ=Svalbard and Jan Mayen +CountrySZ=Swaziland +CountrySY=Sirija +CountryTW=Tajvan +CountryTJ=Tajikistan +CountryTZ=Tanzanija +CountryTH=Tajland +CountryTL=Timor-Leste +CountryTK=Tokelau +CountryTO=Tonga +CountryTT=Trinidad i Tobago +CountryTR=Turska +CountryTM=Turkmenistan +CountryTC=Turks and Cailos Islands +CountryTV=Tuvalu +CountryUG=Uganda +CountryUA=Ukrajina +CountryAE=Ujedinjeni Arapski Emirati +CountryUM=United States Minor Outlying Islands +CountryUY=Urugvaj +CountryUZ=Uzbekistan +CountryVU=Vanuatu +CountryVE=Venezuela +CountryVN=Vijetnam +CountryVG=Djevičanski otoci, Britanski +CountryVI=Djevičanski otoci, SAD +CountryWF=Wallis and Futuna +CountryEH=Zapadna Sahara +CountryYE=Jemen +CountryZM=Zambija +CountryZW=Zimbabve +CountryGG=Guernsey +CountryIM=Isle of Man +CountryJE=Jersey +CountryME=Crna Gora +CountryBL=Saint Barthelemy +CountryMF=Saint Martin ##### Civilities ##### -# CivilityMME=Mrs. -# CivilityMR=Mr. -# CivilityMLE=Ms. -# CivilityMTRE=Master -# CivilityDR=Doctor - +CivilityMME=Gđa. +CivilityMR=G. +CivilityMLE=Gđica. +CivilityMTRE=Master +CivilityDR=Doktor ##### 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=Eura +CurrencyAUD=AU Dolara +CurrencySingAUD=AU Dolar +CurrencyCAD=CAN Dolara +CurrencySingCAD=CAN dolar +CurrencyCHF=Švic. franaka +CurrencySingCHF=Švic. Franaka +CurrencyEUR=Eura +CurrencySingEUR=Euro +CurrencyFRF=Fran. Franaka +CurrencySingFRF=Fran. Franaka +CurrencyGBP=VB Funti +CurrencySingGBP=VB Funta +CurrencyINR=Ind. rupija +CurrencySingINR=Ind. Rupi +CurrencyMAD=Dirham +CurrencySingMAD=Dirham +CurrencyMGA=Ariary +CurrencySingMGA=Ariary +CurrencyMUR=Mauritius rupees +CurrencySingMUR=Mauritius rupee +CurrencyNOK=Norveških Kruna +CurrencySingNOK=Norveška Kruna +CurrencyTND=Tuniških Dinara +CurrencySingTND=Tuniški Dinar +CurrencyUSD=SAD Dolara +CurrencySingUSD=SAD Dolar +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=tisućuti #### 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=Suradnik +DemandReasonTypeSRC_EMPLOYEE=Zaposlenik +DemandReasonTypeSRC_SPONSORING=Sponzorstvo #### Paper formats #### -# PaperFormatEU4A0=Format 4A0 -# PaperFormatEU2A0=Format 2A0 -# PaperFormatEUA0=Format A0 -# PaperFormatEUA1=Format A1 -# PaperFormatEUA2=Format A2 -# PaperFormatEUA3=Format A3 -# PaperFormatEUA4=Format A4 -# PaperFormatEUA5=Format A5 -# PaperFormatEUA6=Format A6 -# PaperFormatUSLETTER=Format Letter US -# PaperFormatUSLEGAL=Format Legal US -# PaperFormatUSEXECUTIVE=Format Executive US -# PaperFormatUSLEDGER=Format Ledger/Tabloid -# PaperFormatCAP1=Format P1 Canada -# PaperFormatCAP2=Format P2 Canada -# PaperFormatCAP3=Format P3 Canada -# PaperFormatCAP4=Format P4 Canada -# PaperFormatCAP5=Format P5 Canada -# PaperFormatCAP6=Format P6 Canada +PaperFormatEU4A0=4A0 format +PaperFormatEU2A0=2A0 format +PaperFormatEUA0=A0 format +PaperFormatEUA1=A1 format +PaperFormatEUA2=A2 format +PaperFormatEUA3=A3 format +PaperFormatEUA4=A4 format +PaperFormatEUA5=A5 format +PaperFormatEUA6=A6 format +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/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang index 66ddea95a5c..f7aed91cf81 100644 --- a/htdocs/langs/hr_HR/donations.lang +++ b/htdocs/langs/hr_HR/donations.lang @@ -4,7 +4,7 @@ Donations=Donations DonationRef=Donation ref. Donor=Donor Donors=Donors -AddDonation=Add a donation +AddDonation=Create a donation NewDonation=New donation ShowDonation=Show donation DonationPromise=Gift promise @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/hr_HR/externalsite.lang index 679e87587e8..facf3bbea2f 100644 --- a/htdocs/langs/hr_HR/externalsite.lang +++ b/htdocs/langs/hr_HR/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Postavljanje linkova na vanjske web stranice ExternalSiteURL=URL vanjske stranice ExternalSiteModuleNotComplete=Modul ExternalSite nije ispravno podešen. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang index c25abf6449c..f5b87fefb08 100644 --- a/htdocs/langs/hr_HR/holiday.lang +++ b/htdocs/langs/hr_HR/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Name Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/hr_HR/interventions.lang b/htdocs/langs/hr_HR/interventions.lang index 17641a0ab3e..c79da05364e 100644 --- a/htdocs/langs/hr_HR/interventions.lang +++ b/htdocs/langs/hr_HR/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Interventions InterventionCard=Intervention card NewIntervention=New intervention -AddIntervention=Add intervention +AddIntervention=Create intervention ListOfInterventions=List of interventions EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang index 98e6dc335ee..7a211198822 100644 --- a/htdocs/langs/hr_HR/mails.lang +++ b/htdocs/langs/hr_HR/mails.lang @@ -115,7 +115,7 @@ SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -133,6 +133,9 @@ Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang index 18add5c8e59..85422178c4e 100644 --- a/htdocs/langs/hr_HR/main.lang +++ b/htdocs/langs/hr_HR/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries GoToWikiHelpPage=Read online help (need Internet access) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier @@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events NActionsLate=%s late +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Remove filter ChartGenerated=Chart generated @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToThirdParty=Link to another third party CreateDraft=Create draft +SetToDraft=Back to draft ClickToEdit=Click to edit ObjectDeleted=Object %s deleted ByCountry=By country @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/hr_HR/margins.lang b/htdocs/langs/hr_HR/margins.lang index e8d5fed1af9..606d5e5053a 100644 --- a/htdocs/langs/hr_HR/margins.lang +++ b/htdocs/langs/hr_HR/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=Product or Service AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=Start date EndDate=End date Launch=Start - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/hr_HR/orders.lang index 8ed57ad3521..fed56574d89 100644 --- a/htdocs/langs/hr_HR/orders.lang +++ b/htdocs/langs/hr_HR/orders.lang @@ -1,14 +1,14 @@ # Dolibarr language file - Source file is en_US - orders -# OrdersArea=Customers orders area -# SuppliersOrdersArea=Suppliers orders area -# OrderCard=Order card -# OrderId=Order Id +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id Order=Narudžba Orders=Narudžbe -# OrderLine=Order line -# OrderFollow=Follow up +OrderLine=Order line +OrderFollow=Follow up OrderDate=Datum narudžbe -# OrderToProcess=Order to process +OrderToProcess=Order to process NewOrder=Nova narudžba ToOrder=Napravi narudžbu MakeOrder=Napravi narudžbu @@ -18,28 +18,28 @@ SuppliersOrdersRunning=Trenutne narudžbe dobavljaču CustomerOrder=Narudžbe kupaca CustomersOrders=Narudžba kupaca CustomersOrdersRunning=Trenutne narudžba kupaca -# CustomersOrdersAndOrdersLines=Customer orders and order's lines -# OrdersToValid=Customer's orders to validate -# OrdersToBill=Customer's orders delivered -# OrdersInProcess=Customer's orders in process -# OrdersToProcess=Customer's orders to process -# SuppliersOrdersToProcess=Supplier's orders to process -# StatusOrderCanceledShort=Canceled +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customer's orders to validate +OrdersToBill=Customer's orders delivered +OrdersInProcess=Customer's orders in process +OrdersToProcess=Customer's orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled StatusOrderDraftShort=Skica StatusOrderValidatedShort=Ovjereno StatusOrderSentShort=U obradi StatusOrderSent=Dostava u tijeku -# StatusOrderOnProcessShort=Reception -# StatusOrderProcessedShort=Processed +StatusOrderOnProcessShort=Reception +StatusOrderProcessedShort=Processed StatusOrderToBillShort=Dostavljeno StatusOrderToBill2Short=Za poslat račun StatusOrderApprovedShort=Odobreno StatusOrderRefusedShort=Odbijeno -# StatusOrderToProcessShort=To process -# StatusOrderReceivedPartiallyShort=Partially received -# StatusOrderReceivedAllShort=Everything received +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received StatusOrderCanceled=Poništeno -# StatusOrderDraft=Draft (needs to be validated) +StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Ovjereno StatusOrderOnProcess=Čekanje primitka StatusOrderProcessed=Obrađeno @@ -50,119 +50,113 @@ StatusOrderRefused=Odbijeno StatusOrderReceivedPartially=Djelomično primljeno StatusOrderReceivedAll=Primljena cijela pošiljka ShippingExist=Dostava postoji -# DraftOrWaitingApproved=Draft or approved not yet ordered -# DraftOrWaitingShipped=Draft or validated not yet shipped -# MenuOrdersToBill=Orders delivered -MenuOrdersToBill2=Narudžbe za naplatu +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders SearchOrder=Pretraži narudžbe -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=Pošalji proizvod Discount=Popust CreateOrder=Kreiraj narudžbu RefuseOrder=Odbij narudžbu ApproveOrder=Prihvati narudžbu ValidateOrder=Ovjeri narudžbu -# UnvalidateOrder=Unvalidate order +UnvalidateOrder=Unvalidate order DeleteOrder=Obriši narudžbu CancelOrder=Poništi narudžbu -AddOrder=Dodaj narudžbu +AddOrder=Create order AddToMyOrders=Dodaj u moje narudžbe AddToOtherOrders=Dodaj u ostale narudžbe -# AddToDraftOrders=Add to draft order +AddToDraftOrders=Add to draft order ShowOrder=Prikaži narudžbu NoOpenedOrders=Nema otvorenih narudžbi NoOtherOpenedOrders=Nema ostalih otvorenih narudžbi -# NoDraftOrders=No draft orders -# OtherOrders=Other orders -# LastOrders=Last %s orders -# LastModifiedOrders=Last %s modified orders -# LastClosedOrders=Last %s closed orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders AllOrders=Sve narudžbe NbOfOrders=Broj narudžbe OrdersStatistics=Statistike narudžbe -# OrdersStatisticsSuppliers=Supplier order's statistics -# NumberOfOrdersByMonth=Number of orders by month -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=Lista narudžbi CloseOrder=Zatvori narudžbu -# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. -# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. -# ConfirmDeleteOrder=Are you sure you want to delete this order ? -# ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? -# ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? -# ConfirmCancelOrder=Are you sure you want to cancel this order ? -# ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? GenerateBill=Kreiraj račun -# ClassifyShipped=Classify delivered -# ClassifyBilled=Classify billed -# ComptaCard=Accountancy card -# DraftOrders=Draft orders -# RelatedOrders=Related orders -# OnProcessOrders=In process orders -# RefOrder=Ref. order -# RefCustomerOrder=Ref. customer order -CustomerOrder=Narudžbe kupaca -# RefCustomerOrderShort=Ref. cust. order -# SendOrderByMail=Send order by mail -# ActionsOnOrder=Events on order -# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order -# OrderMode=Order method -# AuthorRequest=Request author -# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address -# RunningOrders=Orders on process -# UserWithApproveOrderGrant=Users granted with "approve orders" permission. -# PaymentOrderRef=Payment of order %s -# CloneOrder=Clone order -# ConfirmCloneOrder=Are you sure you want to clone this order %s ? -# DispatchSupplierOrder=Receiving supplier order %s +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s ##### Types de contacts ##### -# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order -# TypeContact_commande_internal_SHIPPING=Representative following-up shipping -# TypeContact_commande_external_BILLING=Customer invoice contact -# TypeContact_commande_external_SHIPPING=Customer shipping contact -# TypeContact_commande_external_CUSTOMER=Customer contact following-up order -# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order -# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping -# TypeContact_order_supplier_external_BILLING=Supplier invoice contact -# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact -# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order - -# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined -# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined -# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' -# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' -# Error_OrderNotChecked=No orders to invoice selected - +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected # Sources -# OrderSource0=Commercial proposal -# OrderSource1=Internet -# OrderSource2=Mail campaign -# OrderSource3=Phone compaign -# OrderSource4=Fax campaign -# OrderSource5=Commercial -# OrderSource6=Store -# QtyOrdered=Qty ordered -# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order - +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign +OrderSource5=Commercial +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order # Documents models -# PDFEinsteinDescription=A complete order model (logo...) -# PDFEdisonDescription=A simple order model -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes -# OrderByMail=Mail -# OrderByFax=Fax -# OrderByEMail=EMail -# OrderByWWW=Online -# OrderByPhone=Phone - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -MenuOrdersToBill2=Narudžbe za naplatu -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/hr_HR/oscommerce.lang b/htdocs/langs/hr_HR/oscommerce.lang deleted file mode 100644 index 99710730443..00000000000 --- a/htdocs/langs/hr_HR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce postaljanje modula -OSCommerceSetupSaved=OS Commerce postavljanje spremljeno -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce ime baze podataka -OSCommercePrefix=OS Commerce prefix tablice -OSCommerceUser=OS Commerce prijava u bazu podataka diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang index b56ef294495..88991888183 100644 --- a/htdocs/langs/hr_HR/other.lang +++ b/htdocs/langs/hr_HR/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/hr_HR/paybox.lang b/htdocs/langs/hr_HR/paybox.lang index b689bb6cebf..aced32a4944 100644 --- a/htdocs/langs/hr_HR/paybox.lang +++ b/htdocs/langs/hr_HR/paybox.lang @@ -1,37 +1,40 @@ # Dolibarr language file - Source file is en_US - paybox -# PayBoxSetup=PayBox module setup -# PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) -# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects -# PaymentForm=Payment form -# WelcomeOnPaymentPage=Welcome on our online payment service -# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. -# ThisIsInformationOnPayment=This is information on payment to do -# ToComplete=To complete -# YourEMail=Email to receive payment confirmation -# Creditor=Creditor -# PaymentCode=Payment code -# PayBoxDoPayment=Go on payment -# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information -# PleaseBePatient=Please, be patient -# Continue=Next -# ToOfferALinkForOnlinePayment=URL for %s payment -# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order -# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice -# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line -# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount -# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription -# YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. -# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. -# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. -# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. -# AccountParameter=Account parameters -# UsageParameter=Usage parameters -# InformationToFindParameters=Help to find your %s account information -# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment -# VendorName=Name of vendor -# CSSUrlForPaymentForm=CSS style sheet url for payment form -# MessageOK=Message on validated payment return page -# MessageKO=Message on canceled payment return page -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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/propal.lang b/htdocs/langs/hr_HR/propal.lang index 0a0f8a55ea4..802f4040feb 100644 --- a/htdocs/langs/hr_HR/propal.lang +++ b/htdocs/langs/hr_HR/propal.lang @@ -16,7 +16,7 @@ Prospect=Mogući kupac ProspectList=Popis mogućih kupaca DeleteProp=Izbriši trgovačku ponudu ValidateProp=Ovjeri trgovačku ponudu -AddProp=Napravi ponudu +AddProp=Izradi ponudu ConfirmDeleteProp=Jeste li sigurni da želite izbrisati ovu trgovačku ponudu? ConfirmValidateProp=Jesti li sigurni da želite ovjeriti ovu trgovačku ponudu pod imenom %s? LastPropals=Zadnjih %s proposals @@ -55,8 +55,6 @@ NoOpenedPropals=Nema otvorenih trgovačkih ponuda NoOtherOpenedPropals=nema drugih otvorenih trgovačkih ponuda RefProposal=Broj trgovačke ponude SendPropalByMail=Pošalji trgovačku ponudu e-poštom -FileNotUploaded=Datoteka nije učitana -FileUploaded=Datoteka je uspješno učitana AssociatedDocuments=Dokumenti povezani s ovom ponudom: ErrorCantOpenDir=Mapa se ne može otvoriti DatePropal=Datum ponude diff --git a/htdocs/langs/hr_HR/resource.lang b/htdocs/langs/hr_HR/resource.lang new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/hr_HR/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang index 0716aebfc79..6e769ef91e7 100644 --- a/htdocs/langs/hr_HR/sendings.lang +++ b/htdocs/langs/hr_HR/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Povezane pošiljke ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang index 5d11b0fd7a0..06c502504e9 100644 --- a/htdocs/langs/hr_HR/stocks.lang +++ b/htdocs/langs/hr_HR/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=Location LocationSummary=Short name location NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang index 45cc3c865a0..922a3e316df 100644 --- a/htdocs/langs/hr_HR/users.lang +++ b/htdocs/langs/hr_HR/users.lang @@ -63,7 +63,6 @@ ShowGroup=Prikaži grupu ShowUser=Prikaži korisnika NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=Korisnik %s onemogućen UserEnabled=Korisnik %s aktiviran UserDeleted=Korisnik %s uklonjen NewGroupCreated=Grupa %s kreirana -GroupModified=Group modified successfully +GroupModified=Group %s modified GroupDeleted=Grupa %s uklonjena 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 ? @@ -114,8 +113,10 @@ YourRole=Vaše uloge YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Broj korisnika DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang index 58ac3e252ec..ea32511fefb 100644 --- a/htdocs/langs/hr_HR/withdrawals.lang +++ b/htdocs/langs/hr_HR/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Unknown StatusWaiting=Waiting @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/hu_HU/accountancy.lang +++ b/htdocs/langs/hu_HU/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 9a80f571345..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ő @@ -437,14 +440,14 @@ Module52Name=Készletek Module52Desc=Stock irányítása termékek Module53Name=Szolgáltatások Module53Desc=Szolgáltatás menedzsment -Module54Name=Szerződések -Module54Desc=Szerződés és a szolgáltatás menedzsment +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Vonalkódok 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=Projektek -Module400Desc=Projekt menedzsment belül más modulok +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Értesítések -Module600Desc=Küldés e-mailben értesítést néhány Dolibarr üzleti rendezvények, harmadik fél kapcsolatok +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Adományok Module700Desc=Adomány vezetése Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-cég Module5000Desc=Lehetővé teszi, hogy több vállalat kezelése Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of Sales Modul -Module50200Name= Paypal -Module50200Desc= Modult kínál online fizetési oldalra hitelkártya Paypal +Module50200Name=Paypal +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 @@ -606,15 +613,16 @@ Permission151=Olvassa házszabályok Permission152=Hozzon létre / módosítható állandó megbízások kérés Permission153=Átviteli állandó megbízások bevételek Permission154=Hitel / elutasítása házszabály bevételek -Permission161=Olvassa el szerződéseket -Permission162=Létrehozza / módosítja szerződések -Permission163=Szolgáltatás aktiválása a szerződés -Permission164=Letiltása szolgáltatási szerződés -Permission165=Törlés szerződések -Permission171=Olvassa utak -Permission172=Létrehozza / módosítja utak -Permission173=Törlés utak -Permission178=Export utak +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Olvassa beszállítók Permission181=Olvassa szállító megrendelések Permission182=Létrehozza / módosítja szállító megrendelések @@ -671,7 +679,7 @@ Permission300=Olvassa vonalkódok Permission301=Létrehozza / módosítja vonalkódok Permission302=Törlés vonalkódok Permission311=Olvassa szolgáltatások -Permission312=Rendeljen szolgáltatást szerződés +Permission312=Assign service/subscription to contract Permission331=Olvassa könyvjelzők Permission332=Létrehozza / módosítja könyvjelzők Permission333=Törlés könyvjelzők @@ -701,8 +709,8 @@ Permission701=Olvassa el adományokat Permission702=Létrehozza / módosítja adományok Permission703=Törlés adományok Permission1001=Olvassa készletek -Permission1002=Létrehozza / módosítja készletek -Permission1003=Állományok törlése +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Olvassa állomány mozgását Permission1005=Létrehozza / módosítja állomány mozgását Permission1101=Olvassa el szállítási megrendelések @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Vissza 1 számviteli kódot építette:
    %s követ ModuleCompanyCodePanicum=Vissza az üres számviteli kódot. ModuleCompanyCodeDigitaria=Számviteli kód attól függ, hogy harmadik fél kódot. A kód áll a karakter "C"-ben az első helyen, majd az első 5 karakter a harmadik fél kódot. UseNotifications=Használja értesítések -NotificationsDesc=E-mailek értesítések funkció lehetővé teszi, hogy csendben küld automatikus mail, néhány Dolibarr események, harmadik felek (ügyfelek vagy beszállítók), hogy vannak beállítva. Választható aktív értesítési és célok kapcsolatok készítéséhez harmadik fél időpontban. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Dokumentumok sablonok DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Vízjel dokumentum tervezetét @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add szállítási határidő képessége UseOptionLineIfNoQuantity=Egy sor termék / szolgáltatás nulla összeg szóba, FreeLegalTextOnProposal=Szabad szöveg a kereskedelmi javaslatok WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order Management Setup OrdersNumberingModules=Megrendelés számozási modulok @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Ahhoz, hogy érvényesítse a megbízást, miután javaslat közelebb, lehetővé teszi, hogy ne lépjen az ideiglenes sorrendben FreeLegalTextOnOrders=Szabad szöveg rendelés WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Kattintson a Tárcsázás modul beállítása ClickToDialUrlDesc=Url meghívásra, ha egy kattintás a telefonon Picto történik. Az URL, akkor a tag
    __PHONETO__ Hogy fogja helyettesíteni a telefonszámot hívott személynek
    __PHONEFROM__ Hogy váltják fel a hívó telefonszámát személy (a tiéd)
    __LOGIN__ Hogy váltják fel clicktodial login (azaz a felhasználói kártya)
    __PASS__ Hogy váltják a clicktodial jelszót (amelyeket a felhasználói kártya). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Beavatkozás számozási modulok TemplatePDFInterventions=Beavatkozás kártya dokumentumok modellek WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Szerződések modul beállítása +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Szerződések számozási modulok TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Termékek modul beállítása ServiceSetup=Szolgáltatások modul beállítása @@ -1382,9 +1393,10 @@ MailingSetup=Küldése e-mailben modul beállítása MailingEMailFrom=Feladó e-mail (-tól) az e-mailek által küldött e-mailezés modul MailingEMailError=Vissza E-Mail (Hibák-ig) e-mailek hibákkal ##### Notification ##### -NotificationSetup=Értesítés bu-mail beállítási modul +NotificationSetup=EMail notification module setup NotificationEMailFrom=Feladó e-mail (-tól) az e-maileket küldött értesítések -ListOfAvailableNotifications=A rendelkezésre álló bejelentések (Ez a lista függ aktivált modulok) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Küldő modul beállítása SendingsReceiptModel=Küldése modell átvételét @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Csatlakozás a szerverhez "%s" az adatbázis "%s OSCommerceTestKo1=Csatlakozás a szerverhez "%s" sikerül, de adatbázis "%s" nem lehet elérni. OSCommerceTestKo2=Csatlakozás a szerverhez "%s" felhasználói "%s" sikerült. ##### Stock ##### -StockSetup=Konfigurációs modul készlet -UserWarehouse=Használja a felhasználó személyi állomány +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menü törölve TreeMenu=Fa menük @@ -1478,11 +1491,14 @@ ClickToDialDesc=Ez a modul lehetővé teszi, hogy egészítsék ki egy ikont tel ##### Point Of Sales (CashDesk) ##### CashDesk=Értékesítési CashDeskSetup=Point of Sales Modul telepítés -CashDeskThirdPartyForSell=Általános harmadik fél használni elad +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Alapértelmezett fiók kezelhető készpénz kifizetések CashDeskBankAccountForCheque= Alapértelmezett fiók használata fizetések fogadására csekkel CashDeskBankAccountForCB= Alapértelmezett fiók kezelhető készpénz kifizetések hitelkártyák -CashDeskIdWareHouse=Raktár használni elad +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. ##### Bookmark ##### BookmarkSetup=Könyvjelző beállítása modul BookmarkDesc=Ez a modul lehetővé teszi a könyvjelzők kezelése. Azt is hozzá parancsikonokat bármely Dolibarr oldalakra vagy externale webhelyeket a bal oldali menüben. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang index fea301f7b24..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 @@ -41,9 +42,10 @@ AutoActions= Napirend automatikus kitöltése AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an action in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= Ez az oldal lehetővé teszi a napirend modul konfigurálását. AgendaExtSitesDesc=Ez az oldal lehetővé teszi, hogy nyilvánítsa külső forrásokat naptárak látják eseményeket Dolibarr napirenden. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= %s ajánlat érvényesítve -InvoiceValidatedInDolibarr= %s számla érvényesítve +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=%s ajánlat érvényesítve +InvoiceValidatedInDolibarr=%s számla érvényesítve +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Számla %s menj vissza a tervezett jogállását InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= %s megrendelés érvényesítve @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Rendelés %s jóváhagyott OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Rendelés %s menj vissza vázlat OrderCanceledInDolibarr=Rendelés %s törölt -InterventionValidatedInDolibarr=%s közbenjárás érvényesítve ProposalSentByEMail=Üzleti ajánlat %s postáztuk OrderSentByEMail=Ügyfél érdekében %s postáztuk InvoiceSentByEMail=Az ügyfél számlát postáztuk %s @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Szállító érdekében %s postáztuk SupplierInvoiceSentByEMail=Szállító számlát postáztuk %s ShippingSentByEMail=Szállítás %s postáztuk ShippingValidated= Shipping %s validated -InterventionSentByEMail=Beavatkozás %s postáztuk -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Harmadik fél létrehozva DateActionPlannedStart= Tervezett indulási dátum DateActionPlannedEnd= Tervezett befejezési dátum @@ -70,9 +69,9 @@ DateActionStart= Indulási dátum DateActionEnd= Befejezési dátum AgendaUrlOptions1=Az alábbi paramétereket hozzá lehet adni a kimenet szűréséhez: AgendaUrlOptions2=login=%s kimenet szükítése a %s felhasználó által létrehozott cselekvésekre, érintő cselekvésekre,által végzett cselekvésekre. -AgendaUrlOptions3=logina=%s kimenet szükítése a %s felhasználó által létrehozott cselekvésekre. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s kimenet szükítése a %s felhasználó érintő cselekvésekre. -AgendaUrlOptions5=logind=%s kimenet szükítése a %s felhasználó által végzett cselekvésekre. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Kapcsolatok születésnapjának mutatása AgendaHideBirthdayEvents=Kapcsolatok születésnapjának elrejtése Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL eléréséhez. ICal fájl ExtSiteNoLabel=Nincs leírás WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang index ea40c0bec45..e030bdc8ba0 100644 --- a/htdocs/langs/hu_HU/bills.lang +++ b/htdocs/langs/hu_HU/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Jóváírást InvoiceAvoirAsk=Jóváírást kijavítani számla InvoiceAvoirDesc=A jóváírást negatív számla megoldására használják arra, hogy egy számla van egy összeget, ami különbözik, mint a kifizetett összeg valóban (mert ügyfél fizetett túl sok a hiba, vagy nem fizetik vissza, mivel ő teljesen bizonyos termékek, például). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Cserélje ki számlát %s ReplacementInvoice=Csere számla ReplacedByInvoice=Helyébe számla %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classify "elhagyott" ClassifyClosed=Classify "zárt" ClassifyUnBilled=Classify 'Unbilled' CreateBill=Számla létrehozása -AddBill=Add számla vagy jóváírás +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Törlés számla SearchACustomerInvoice=Keressen, ha az ügyfél számla @@ -99,7 +99,7 @@ DoPaymentBack=Do fizetési vissza ConvertToReduc=Átalakulhat jövő kedvezmény EnterPaymentReceivedFromCustomer=Adja meg a fizetési kapott ügyfél EnterPaymentDueToCustomer=Legyen esedékes kifizetést az ügyfél -DisabledBecauseRemainderToPayIsZero=Tiltva, mert maradékot kell fizetnie nulla +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Összeg PriceBase=Ár bázis BillStatus=Számla állapota @@ -137,8 +137,6 @@ BillFrom=-Tól BillTo=Bill a ActionsOnBill=Műveletek a számlán NewBill=Új számla -Prélèvements=Állandó érvényű parancs -Prélèvements=Állandó érvényű parancs LastBills=Utolsó %s számlák LastCustomersBills=Utolsó %s ügyfelek számláit LastSuppliersBills=Utolsó %s beszállítói számlák @@ -156,9 +154,9 @@ ConfirmCancelBill=Biztosan meg akarja szakítani %s számlát? ConfirmCancelBillQuestion=Miért akar minősíteni ezt a számlát "elhagyott"? ConfirmClassifyPaidPartially=Biztosan meg szeretné változtatni a status %s számlát fizetni? ConfirmClassifyPaidPartiallyQuestion=Ezt a számlát nem fizették ki teljesen. Mik az okai, hogy zárja be a számlát? -ConfirmClassifyPaidPartiallyReasonAvoir=Fennmaradó fizetni (%s %s) egy engedmény, mert a fizetés előtt távon. Azt szabályozza az ÁFA-jóváírást. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Fennmaradó fizetni (%s %s) egy engedmény, mert a fizetés előtt távon. Elfogadom, hogy elveszíti a HÉA-e kedvezmény. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Fennmaradó fizetni (%s %s) egy engedmény, mert a fizetés előtt távon. Én vissza az ÁFA ezen kedvezmény nélkül jóváírást. +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=Rossz ügyfél ConfirmClassifyPaidPartiallyReasonProductReturned=Termékek részben visszatért ConfirmClassifyPaidPartiallyReasonOther=Összeg elhagyott más okból @@ -191,9 +189,9 @@ AlreadyPaid=Már kifizetett AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Már kifizetett (hitel nélkül jegyzetek és betétek) Abandoned=Elhagyatott -RemainderToPay=Fennmaradó fizetni -RemainderToTake=Fennmaradó részt venni -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Követelt összeget ExcessReceived=A felesleges kapott @@ -219,19 +217,18 @@ NoInvoice=Nincs számla ClassifyBill=Osztályozza számla SupplierBillsToPay=Beszállítók számlákat fizetni CustomerBillsUnpaid=Kifizetetlen számlák ügyfeleknek -DispenseMontantLettres=A törvényjavaslat által kidolgozott mechanográfiai mentesek a betűk sorrendjét -DispenseMontantLettres=A törvényjavaslat által kidolgozott mechanográfiai mentesek a betűk sorrendjét +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Nem javítható SetConditions=Állítsa fizetési feltételek SetMode=Állítsa fizetési mód Billed=Kiszámlázott -RepeatableInvoice=Előre meghatározott számla -RepeatableInvoices=Előre definiált számlák -Repeatable=Előre definiált -Repeatables=Előre definiált -ChangeIntoRepeatableInvoice=Átalakulhat az előre meghatározott -CreateRepeatableInvoice=Létrehozása előre meghatározott számla -CreateFromRepeatableInvoice=Hozzon létre az előre meghatározott számla +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Vevői számlák és a számla sorai CustomersInvoicesAndPayments=Vevői számlák és kifizetések ExportDataset_invoice_1=Vevői számlák listája és számlát vonalak diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang index 3591ea58e6b..348f309e7f2 100644 --- a/htdocs/langs/hu_HU/categories.lang +++ b/htdocs/langs/hu_HU/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang index 8a7e484f3f0..91d9d5fe9b7 100644 --- a/htdocs/langs/hu_HU/compta.lang +++ b/htdocs/langs/hu_HU/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Rossz ügyfél számviteli kódot %s SuppliersProductsSellSalesTurnover=A forgalmat az eladások a beszállító termékeit. CheckReceipt=Ellenőrizze a betéti CheckReceiptShort=Ellenőrizze a betéti +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Új kedvezmény NewCheckDeposit=Új ellenőrizze betéti NewCheckDepositOn=Készítsen nyugtát letét számla: %s @@ -196,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 b0d80e83dae..df24822ebb1 100644 --- a/htdocs/langs/hu_HU/contracts.lang +++ b/htdocs/langs/hu_HU/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Szerzősdések terólet ListOfContracts=Szerződések listája -LastContracts=Utolsó %s módosított szerződés +LastModifiedContracts=Last %s modified contracts AllContracts=Minden szerződés ContractCard=Szerződés kártya ContractStatus=Szerződés állpaot @@ -27,7 +27,7 @@ MenuRunningServices=Futó szolgáltatások MenuExpiredServices=Lejárt szolgáltatások MenuClosedServices=Lezárt szolgáltatások NewContract=Új szerződés -AddContract=Szerződés hozzáadása +AddContract=Create contract SearchAContract=Szerződés keresése DeleteAContract=Szerződés törlése CloseAContract=Szerződés lezárása @@ -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=Utolsó %s módosított szerződés +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/cron.lang b/htdocs/langs/hu_HU/cron.lang index c5c5db999c5..896df7fa6a0 100644 --- a/htdocs/langs/hu_HU/cron.lang +++ b/htdocs/langs/hu_HU/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = Róla -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job CronNone= Nincs CronDtStart=Kezdési dátum CronDtEnd=Befejezési dátum -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe CronMethod=Módszer CronModule=Modul -# CronAction=Action +CronAction=Action CronStatus=Állapot CronStatusActive=Enabled CronStatusInactive=Kikapcsolva -# CronNoJobs=No jobs registered +CronNoJobs=No jobs registered CronPriority=Prioritás CronLabel=Leírás -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create CronArgs=Paraméterek -# CronSaveSucess=Save succesfully +CronSaveSucess=Save succesfully CronNote=Megjegyzés -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable CronStatusInactiveBtn=Letiltás -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/hu_HU/donations.lang b/htdocs/langs/hu_HU/donations.lang index 7e62d1b8e7c..78108dcd9dc 100644 --- a/htdocs/langs/hu_HU/donations.lang +++ b/htdocs/langs/hu_HU/donations.lang @@ -4,7 +4,7 @@ Donations=Adományok DonationRef=Donation ref. Donor=Donor Donors=Donorok -AddDonation=Új adomány hozzáadása +AddDonation=Create a donation NewDonation=Új adomány ShowDonation=Show donation DonationPromise=Ajándék ígéret @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/hu_HU/externalsite.lang index 71e55ef41fe..5905f248a2f 100644 --- a/htdocs/langs/hu_HU/externalsite.lang +++ b/htdocs/langs/hu_HU/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite ExternalSiteSetup=Beállítás linket külső weboldal ExternalSiteURL=Külső oldal URL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang index cb4e1241079..6b94d93f203 100644 --- a/htdocs/langs/hu_HU/holiday.lang +++ b/htdocs/langs/hu_HU/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Frissítés CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Vezetéknév Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Érték -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Hitelesítés UpdateEventCP=Update events diff --git a/htdocs/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang index 59578b47fe2..45ba17c149f 100644 --- a/htdocs/langs/hu_HU/interventions.lang +++ b/htdocs/langs/hu_HU/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervenció Interventions=Intervenciók InterventionCard=Intervenció kártya NewIntervention=Új intervenció -AddIntervention=Intervenció hozzáadása +AddIntervention=Create intervention ListOfInterventions=Intervenciók liskáta EditIntervention=Intervenció szerkesztése ActionsOnFicheInter=Műveletek az intervenciós @@ -30,6 +30,15 @@ StatusInterInvoiced=Számlázott RelatedInterventions=Kapcsolódó beavatkozások ShowIntervention=Mutasd beavatkozás SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Reprezentatív követési intervenció TypeContact_fichinter_internal_INTERVENING=Beavatkozás diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang index 12d18648519..60741482144 100644 --- a/htdocs/langs/hu_HU/mails.lang +++ b/htdocs/langs/hu_HU/mails.lang @@ -115,7 +115,7 @@ SentBy=Által küldött 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=Ön azonban elküldheti őket az interneten hozzáadásával paraméter MAILING_LIMIT_SENDBYWEB az értéke max e-mailek száma szeretne küldeni a session. Ehhez menj a Home - telepítés - Más. 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Lista törlése ToClearAllRecipientsClickHere=Kattintson ide, hogy törölje a címzettek listáját erre a levelezés ToAddRecipientsChooseHere=Add címzettek közül választhatja ki a listák @@ -133,6 +133,9 @@ Notifications=Értesítések NoNotificationsWillBeSent=Nincs e-mail értesítést terveznek erre az eseményre és vállalati ANotificationsWillBeSent=1 értesítést küldünk e-mailben SomeNotificationsWillBeSent=%s értesítést küldünk e-mailben -AddNewNotification=Aktiválása egy új e-mail értesítést kérésére -ListOfActiveNotifications=Lista az összes aktív e-mail értesítést kér +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Lista minden e-mail értesítést küldeni +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang index efa3cd0c653..4303848fc81 100644 --- a/htdocs/langs/hu_HU/main.lang +++ b/htdocs/langs/hu_HU/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=%s felhasználó nem található a ErrorNoVATRateDefinedForSellerCountry=Hiba '%s' számára nincs Áfa meghatározva. ErrorNoSocialContributionForSellerCountry=Hiba, nincs szociális hozzájárulás meghatározva '%s' számára. ErrorFailedToSaveFile=Hiba, nem sikerült a fájl mentése. -ErrorOnlyPngJpgSupported=Hiba, csak .jpg és .png képfájlok vannak támogatva. -ErrorImageFormatNotSupported=A PHP-ja nem támogatja a kép konvertálási funkciókat erre a formátumra. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Alapértelmezett háttérszin +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=Egy fájl ki lett választva csatolásra, de még nincs feltöltve. Kattintson a "Fájl Csatolása" gombra. NbOfEntries=Bejegyzések száma GoToWikiHelpPage=Online segítésg olvasása (Internet hozzáférés kell) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Nap hónapja HourShort=Ó +MinuteShort=mn Rate=Arány UseLocalTax=Include tax Bytes=Byte-ok @@ -340,6 +341,7 @@ FullList=Teljes lista Statistics=Statisztika OtherStatistics=Egyéb statisztikák Status=Állapot +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Beszállító Ref. @@ -365,6 +367,7 @@ ActionsOnCompany=Ezzel a harmadikféllel kapcsolatos cselekvések ActionsOnMember=Események ebben a NActions=%s cselekvések NActionsLate=%s késés +RequestAlreadyDone=Request already recorded Filter=Szűrő RemoveFilter=Szűrő eltávolítása ChartGenerated=Grafikon generálva @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra tulajdonságok beállítása URLPhoto=Url fotó / logo SetLinkToThirdParty=Link egy másik harmadik fél CreateDraft=Tervezet készítése +SetToDraft=Back to draft ClickToEdit=Kattintson a szerkeszteni ObjectDeleted=Az objektum törölve %s ByCountry=Ország szerint @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Hétfő Tuesday=Kedd diff --git a/htdocs/langs/hu_HU/margins.lang b/htdocs/langs/hu_HU/margins.lang index 8ad7a7190f5..fc988c12ac8 100644 --- a/htdocs/langs/hu_HU/margins.lang +++ b/htdocs/langs/hu_HU/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=Termék vagy Szolgáltatás AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=Kezdési dátum EndDate=Befejezési dátum Launch=START - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/hu_HU/orders.lang index b4d47948996..40f05505df7 100644 --- a/htdocs/langs/hu_HU/orders.lang +++ b/htdocs/langs/hu_HU/orders.lang @@ -2,7 +2,7 @@ OrdersArea=Az ügyfelek megrendelések területén SuppliersOrdersArea=Beszállítók megrendelések területén OrderCard=Megrendelőlap -# OrderId=Order Id +OrderId=Order Id Order=Megrendelés Orders=Megrendelés OrderLine=Rendelés vonal @@ -28,7 +28,7 @@ StatusOrderCanceledShort=Törölve StatusOrderDraftShort=Tervezet StatusOrderValidatedShort=Hitelesítette StatusOrderSentShort=A folyamat -# StatusOrderSent=Shipment in process +StatusOrderSent=Shipment in process StatusOrderOnProcessShort=Recepció StatusOrderProcessedShort=Feldolgozott StatusOrderToBillShort=Bill @@ -53,9 +53,9 @@ ShippingExist=A szállítmány létezik DraftOrWaitingApproved=Vagy jóváhagyott tervezet még nem rendelhető DraftOrWaitingShipped=Tervezet még nem hitelesített vagy szállított MenuOrdersToBill=Megrendelés Bill -# MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Keresés érdekében -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=Hajó termék Discount=Kedvezmény CreateOrder=Rendet @@ -65,14 +65,14 @@ ValidateOrder=Érvényesítése érdekében UnvalidateOrder=Unvalidate érdekében DeleteOrder=Törlése érdekében CancelOrder=Mégsem érdekében -AddOrder=Add érdekében +AddOrder=Create order AddToMyOrders=Hozzáadás a megrendelések AddToOtherOrders=Add az egyéb megrendelések -# AddToDraftOrders=Add to draft order +AddToDraftOrders=Add to draft order ShowOrder=Megjelenítése érdekében NoOpenedOrders=Nem nyitott megrendelések NoOtherOpenedOrders=Nincs más nyitott megrendelések -# NoDraftOrders=No draft orders +NoDraftOrders=No draft orders OtherOrders=Egyéb megrendelések LastOrders=Utolsó %s megrendelések LastModifiedOrders=Utolsó módosítás %s megrendelések @@ -82,7 +82,7 @@ NbOfOrders=Megrendelések száma OrdersStatistics=Rend statisztikák OrdersStatisticsSuppliers=Szállító rend statisztikák NumberOfOrdersByMonth=Megrendelések száma a hónap -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=Megrendelések listája CloseOrder=Bezárása érdekében ConfirmCloseOrder=Biztosan be akarja zárni ezt a sorrendet? Ha a megrendelés zárva van, csak akkor lehet számlázni. @@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Biztos vagy benne, hogy helyreállítsa a rendet %s%s?     GenerateBill=Számla generálása -# ClassifyShipped=Classify delivered +ClassifyShipped=Classify delivered ClassifyBilled=Classify "számlázott" ComptaCard=Számviteli kártya DraftOrders=Tervezet megrendelések @@ -101,7 +101,6 @@ RelatedOrders=Kapcsolódó megrendelések OnProcessOrders=A folyamat sorrendek RefOrder=Ref. érdekében RefCustomerOrder=Ref. az ügyfelek érdekében -CustomerOrder=Az ügyfelek érdekében RefCustomerOrderShort=Ref. Cust. érdekében SendOrderByMail=A megrendelés elküldése levélben ActionsOnOrder=Események megrendelésre @@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Állandó COMMANDE_SUPPLIER_ADDON nincs Error_COMMANDE_ADDON_NotDefined=Állandó COMMANDE_ADDON nincs definiálva Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Nem sikerült betölteni a modul fájlt "%s" Error_FailedToLoad_COMMANDE_ADDON_File=Nem sikerült betölteni a modul fájlt "%s" -# Error_OrderNotChecked=No orders to invoice selected - - +Error_OrderNotChecked=No orders to invoice selected # Sources OrderSource0=Üzleti ajánlat OrderSource1=Internet @@ -144,25 +141,22 @@ OrderSource5=Kereskedelmi OrderSource6=Tárolja QtyOrdered=Mennyiség megrendelt AddDeliveryCostLine=Add a szállítási költség vonal jelzi a súlya a sorrendben - # Documents models PDFEinsteinDescription=A teljes order (logo. ..) PDFEdisonDescription=Egy egyszerű modell érdekében -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes OrderByMail=Mail OrderByFax=Fax OrderByEMail=E-mail OrderByWWW=Online OrderByPhone=Telefon - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/hu_HU/oscommerce.lang b/htdocs/langs/hu_HU/oscommerce.lang deleted file mode 100644 index 3cb5760422c..00000000000 --- a/htdocs/langs/hu_HU/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul beállítása -OSCommerceSetupSaved=OS Commerce beállítás mentése -OSCommerceServer=OS Commerce Server host / ip -OSCommerceDatabaseName=OS Commerce adatbázis neve -OSCommercePrefix=OS Commerce táblázatok előtag -OSCommerceUser=OS Commerce adatbázis bejelentkezés diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang index 104fcc8a357..e9ddc4edf81 100644 --- a/htdocs/langs/hu_HU/other.lang +++ b/htdocs/langs/hu_HU/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Biztonsági kód Calendar=Naptár -AddTrip=Add utazás Tools=Eszközök ToolsDesc=Ez a terület elkötelezett csoportja különféle eszközök nem állnak rendelkezésre más menüpontok.

    Ezek az eszközök lehet elérni a menüből az oldalon. Birthday=Születésnap @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Száma csatolt fájlok / dokumentumok TotalSizeOfAttachedFiles=Teljes méretű csatolt fájlok / dokumentumok MaxSize=Maximális méret @@ -80,6 +80,16 @@ ModifiedBy=Módosította %s ValidatedBy=Érvényesíti %s CanceledBy=Megszakította %s ClosedBy=Lezárta %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Fájl %s eltávolították DirWasRemoved=Directory %s eltávolították FeatureNotYetAvailableShort=Elérhető a következő verziója @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add bejegyzés a naptárban %s -NewCompanyToDolibarr=Cég %s beilleszthető Dolibarr -ContractValidatedInDolibarr=A szerződés %s hitelesítettek Dolibarr -ContractCanceledInDolibarr=A szerződés %s törölték Dolibarr -ContractClosedInDolibarr=%s szerződés lezárva Dolibarr -PropalClosedSignedInDolibarr=Javaslat: %s aláírt Dolibarr -PropalClosedRefusedInDolibarr=Javaslat: %s visszautasította Dolibarr -PropalValidatedInDolibarr=Javaslat: %s érvényesíteni Dolibarr -InvoiceValidatedInDolibarr=Számla %s érvényesíteni Dolibarr -InvoicePaidInDolibarr=Számla %s változott fizetett Dolibarr -InvoiceCanceledInDolibarr=Számla %s törölni Dolibarr -PaymentDoneInDolibarr=Fizetés %s történt Dolibarr -CustomerPaymentDoneInDolibarr=Az ügyfél fizetési %s történt Dolibarr -SupplierPaymentDoneInDolibarr=Szállító fizetési %s történt Dolibarr -MemberValidatedInDolibarr=Tagja %s érvényesíteni Dolibarr -MemberResiliatedInDolibarr=Tagja %s resiliated a Dolibarr -MemberDeletedInDolibarr=Tag %s törölni Dolibarr -MemberSubscriptionAddedInDolibarr=Előfizetés a tag %s hozzáadott Dolibarr -ShipmentValidatedInDolibarr=Szállítás %s hitelesítettek Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Az export területén diff --git a/htdocs/langs/hu_HU/paybox.lang b/htdocs/langs/hu_HU/paybox.lang index 894206d19d5..b5449933c37 100644 --- a/htdocs/langs/hu_HU/paybox.lang +++ b/htdocs/langs/hu_HU/paybox.lang @@ -32,6 +32,9 @@ VendorName=Neve eladó CSSUrlForPaymentForm=CSS stíluslapot url fizetési forma MessageOK=Üzenet érvényesített fizetési vissza oldal MessageKO=Üzenet a törölt kifizetési visszatérés oldal -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/hu_HU/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang index 78863047b5e..dc143062fc8 100644 --- a/htdocs/langs/hu_HU/sendings.lang +++ b/htdocs/langs/hu_HU/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Ebben a pillanatban, létrejön egy új szállí RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Ügyfél fogád diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang index 181fd1e9bff..78645940e23 100644 --- a/htdocs/langs/hu_HU/stocks.lang +++ b/htdocs/langs/hu_HU/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Raktár címke név szükséges CorrectStock=Jelenlegi készlet ListOfWarehouses=Raktárak listája ListOfStockMovements=Készlet mozgatások listája -StocksArea=Készletek területe +StocksArea=Warehouses area Location=Hely LocationSummary=Hely rövid neve NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang index 3166ffd0a97..0a315b86711 100644 --- a/htdocs/langs/hu_HU/users.lang +++ b/htdocs/langs/hu_HU/users.lang @@ -63,7 +63,6 @@ ShowGroup=Csoport mutatása ShowUser=Felhasználó mutatása NonAffectedUsers=Nem érintett felhasználók UserModified=Felhasználó sikeresen módosítva -GroupModified=Csoport sikeresen módosítva PhotoFile=Fénykép UserWithDolibarrAccess=Felhasználó Dolibarr hozzáféréssel ListOfUsersInGroup=Csoporthoz tartozó felhasználók listája @@ -103,7 +102,7 @@ UserDisabled=Felhasználó %s kikapcsolva UserEnabled=Felhasználó %s aktiválva UserDeleted=Felhasználó %s eltávolítva NewGroupCreated=Csoport %s létrehozva -GroupModified=Csoport sikeresen módosítva +GroupModified=Group %s modified GroupDeleted=Csoport %s eltávolítva ConfirmCreateContact=Biztos szeretne Dolibarr fiókot létrehozni ehhez a kapcsolathoz? ConfirmCreateLogin=Biztos szeretne Dolibarr fiókot létrehozni ennek a tagnak? @@ -114,8 +113,10 @@ YourRole=Szerepkörei YourQuotaOfUsersIsReached=Aktív felhasználói kvóta elérve! NbOfUsers=Nb felhasználók DontDowngradeSuperAdmin=Csak egy superadmin lehet downgrade 1 superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang index 5d01a243e28..48ef1688bc0 100644 --- a/htdocs/langs/hu_HU/withdrawals.lang +++ b/htdocs/langs/hu_HU/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Bizonylat LastWithdrawalReceipts=%s utolsó visszavonási bizonylatok WithdrawedBills=Visszavont bizonylatok WithdrawalsLines=Visszavonási sorok -RequestStandingOrderToTreat=Kérelem házszabályok kezelésére -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Vásárlói házszabályok CustomerStandingOrder=Vásárlói házszabály NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Átviteli módszer Send=Küld Lines=Vonalak StandingOrderReject=Add ki egy visszautasító -InvoiceRefused=Számla visszautasította WithdrawalRefused=Megtagadta visszavonása WithdrawalRefusedConfirm=Biztosan meg szeretné adni a visszavonás elutasító a társadalom RefusedData=Elutasításának napjától RefusedReason=Az elutasítás indoka RefusedInvoicing=Billing elutasítása NoInvoiceRefused=Ne töltse az elutasítás -InvoiceRefused=Számla visszautasította +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Állapot StatusUnknown=Ismeretlen StatusWaiting=Várakozás @@ -76,13 +76,14 @@ WithBankUsingRIB=A bankszámlák segítségével RIB WithBankUsingBANBIC=A bankszámlák segítségével IBAN / BIC / SWIFT BankToReceiveWithdraw=Bankszámla kapni kilép CreditDate=Hitelt -WithdrawalFileNotCapable=Nem sikerült létrehozni visszavonása kézhezvétele fájlt az Ön országában +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 8cab9d2b651..dd797a93449 100644 --- a/htdocs/langs/id_ID/accountancy.lang +++ b/htdocs/langs/id_ID/accountancy.lang @@ -1,54 +1,54 @@ # Dolibarr language file - en_US - Accounting Expert CHARSET=UTF-8 -Accounting=Accounting -Globalparameters=Global parameters -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years -Menuaccount=Accounting accounts -Menuthirdpartyaccount=Thirdparty accounts -MenuTools=Tools +Accounting=Akuntansi +Globalparameters=Parameter Global +Chartofaccounts=Tabel Akun +Fiscalyear=Tahun Pajak +Menuaccount=Akun akuntansi +Menuthirdpartyaccount=Akun Pihak Ketiga +MenuTools=Alat -ConfigAccountingExpert=Configuration of the module accounting expert -Journaux=Journals -JournalFinancial=Financial journals -Exports=Exports -Modelcsv=Model of export -Selectmodelcsv=Select a model of export -Modelcsv_normal=Classic export +ConfigAccountingExpert=Konfigurasi modul ahli akuntansi +Journaux=Jurnal +JournalFinancial=Jurnal Keuangan +Exports=Ekspor +Modelcsv=Model Ekspor +Selectmodelcsv=Pilih satu model Ekspor +Modelcsv_normal=Ekspor Klasik Modelcsv_CEGID=Export towards CEGID Expert -BackToChartofaccounts=Return chart of accounts -Back=Return +BackToChartofaccounts=Akun pembalik +Back=Kembali -Definechartofaccounts=Define a chart of accounts -Selectchartofaccounts=Select a chart of accounts -Validate=Validate -Addanaccount=Add an accounting account -AccountAccounting=Accounting account -Ventilation=Ventilation -ToDispatch=To dispatch -Dispatched=Dispatched +Definechartofaccounts=Menetapkan bagan akun +Selectchartofaccounts=Pilih bagan akun +Validate=Validasi +Addanaccount=Tambahkan sebuah akun akuntansi +AccountAccounting=Akun akuntansi +Ventilation=Perincian +ToDispatch=Untuk Pengiriman +Dispatched=Dikirim -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers -TradeMargin=Trade margin -Reports=Reports -ByCustomerInvoice=By invoices customers -ByMonth=By Month -NewAccount=New accounting account -Update=Update -List=List -Create=Create -UpdateAccount=Modification of an accounting account +CustomersVentilation=Perincian pelanggan +SuppliersVentilation=Perincian pemasok +TradeMargin=Margin Perdagangan +Reports=Laporan +ByCustomerInvoice=Berdasarkan invoice langganan +ByMonth=Bulanan +NewAccount=Akun akuntansi baru +Update=Membarui +List=Daftar +Create=Buat +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=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation 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,35 +56,35 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +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 ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Panjang akun umum +ACCOUNTING_LENGTH_AACCOUNT=Panjang akun pihak ketiga -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal -ACCOUNTING_CASH_JOURNAL=Cash journal -ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTING_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan +ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian +ACCOUNTING_BANK_JOURNAL=Jurnal Bank +ACCOUNTING_CASH_JOURNAL=Jurnal Kas +ACCOUNTING_MISCELLANEOUS_JOURNAL=Jurnal lain-lain +ACCOUNTING_SOCIAL_JOURNAL=Jurnal Sosial -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Akun transfer ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) @@ -92,45 +92,45 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) -Doctype=Type of document -Docdate=Date -Docref=Reference -Numerocompte=Account -Code_tiers=Thirdparty -Labelcompte=Label account -Debit=Debit -Credit=Credit -Amount=Amount -Sens=Sens -Codejournal=Journal +Doctype=Tipe Dokumen +Docdate=Tanggal +Docref=Referensi +Numerocompte=Akun +Code_tiers=Pihak ketiga +Labelcompte=Label Akun +Debit=Debet +Credit=Kredit +Amount=Jumlah +Sens=Sen +Codejournal=Jurnal -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Hapus catatan buku besar -SellsJournal=Sells journal -PurchasesJournal=Purchases journal -DescSellsJournal=Sells journal -DescPurchasesJournal=Purchases journal -BankJournal=Bank journal -DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Cash journal -DescCashJournal=Cash journal including the type of payment cash +SellsJournal=Jurnal Penjualan +PurchasesJournal=Jurnal Pembelian +DescSellsJournal=Jurnal Penjualan +DescPurchasesJournal=Jurnal Pembelian +BankJournal=Jurnal Bank +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=Thirdparty account +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 @@ -138,21 +138,21 @@ Pcgsubtype=Under class of account Accountparent=Root of the account Active=Statement -NewFiscalYear=New fiscal year +NewFiscalYear=Tahun Pajak Baru -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT -TotalMarge=Total sales margin +TotalMarge=Total margin penjualan DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account -ValidateHistory=Validate Automatically +ValidateHistory=Validasi Otomatis ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang index 37b7fd37335..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,46 +408,46 @@ 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 -Module54Desc=Contract and service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +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 -Module400Desc=Project management inside other modules +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses (tax, social contributions, dividends) Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries Module510Name=Salaries Module510Desc=Management of employees salaries and payments -Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts -Module700Name=Donations +Module600Name=Notifikasi +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) +Module700Name=Sumbangan Module700Desc=Donation management 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 @@ -514,45 +521,45 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=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 @@ -606,16 +613,17 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips -Permission180=Read suppliers +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses +Permission180=Membaca Data Pemasok Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders @@ -648,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 @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -679,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 @@ -692,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 stocks -Permission1003=Delete stocks -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 @@ -719,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) @@ -746,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 @@ -778,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 @@ -823,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 @@ -836,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 @@ -863,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 @@ -881,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 @@ -905,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Products module setup ServiceSetup=Services module setup @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang index 1dd21b4c14e..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 @@ -41,9 +42,10 @@ AutoActions= Otomatis mengisi AgendaAutoActionDesc= Tentukan sini peristiwa yang Anda ingin Dolibarr untuk membuat secara otomatis sebuah acara di agenda. Jika tidak dicentang (secara default), hanya tindakan manual akan dimasukkan dalam agenda. AgendaSetupOtherDesc= Halaman ini menyediakan opsi untuk memungkinkan ekspor peristiwa Dolibarr Anda menjadi kalender eksternal (thunderbird, google calendar, ...) AgendaExtSitesDesc=Halaman ini memungkinkan untuk menyatakan sumber eksternal dari kalender untuk melihat acara mereka ke dalam agenda Dolibarr. -ActionsEvents= Acara yang Dolibarr akan membuat tindakan dalam agenda otomatis -PropalValidatedInDolibarr= Proposal% s divalidasi -InvoiceValidatedInDolibarr= Invoice %s validated +ActionsEvents=Acara yang Dolibarr akan membuat tindakan dalam agenda otomatis +PropalValidatedInDolibarr=Proposal% s divalidasi +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Order %s validated @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status OrderCanceledInDolibarr=Order %s canceled -InterventionValidatedInDolibarr=Intervention %s validated ProposalSentByEMail=Commercial proposal %s sent by EMail OrderSentByEMail=Customer order %s sent by EMail InvoiceSentByEMail=Customer invoice %s sent by EMail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail ShippingSentByEMail=Shipping %s sent by EMail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sent by EMail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date DateActionPlannedEnd= Planned end date @@ -70,9 +69,9 @@ DateActionStart= Start date DateActionEnd= End date AgendaUrlOptions1=You can also add following parameters to filter output: AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. -AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Show birthday's contacts AgendaHideBirthdayEvents=Hide birthday's contacts Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang index cd66586326b..adf1a89cd63 100644 --- a/htdocs/langs/id_ID/bills.lang +++ b/htdocs/langs/id_ID/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Catatan kredit InvoiceAvoirAsk=Catatan kredit untuk tagihan yang cocok atau yang sudah benar InvoiceAvoirDesc=Catatan kredit adalah catatan untuk tagihan negatif yang biasanya digunakan sebagai bukti fakta terhadap tagihan yang jumlah tagihannya berbeda dari jumlah yang seharusnya dibayar (contoh kasus: pelanggan yang pembayarannya lebih karena kesalahan pelanggan, atau tidak akan dibayarkan sejak beberapa produk atau barang dikembalikan). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Ganti tagihan %s ReplacementInvoice=Penggantian tagihan ReplacedByInvoice=Digantikan dengan tagihan %s @@ -87,7 +87,7 @@ ClassifyCanceled=Menggolongkan 'Ditinggalkan' ClassifyClosed=Menggolongkan 'Ditutup' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Buat tagihan -AddBill=Tambah tagihan atau nota kredit +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Hapus tagihan SearchACustomerInvoice=Cari tagihan pelanggan @@ -99,7 +99,7 @@ DoPaymentBack=Lakukan pembayaran kembali ConvertToReduc=Ubah kedalam diskon untuk selanjutnya EnterPaymentReceivedFromCustomer=Masukkan pembayaran yang diterima dari pelanggan EnterPaymentDueToCustomer=Buat tempo pembayaran ke pelanggan -DisabledBecauseRemainderToPayIsZero=Matikan karena pengingat pembayaran bernilai nol. +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Jumlah PriceBase=Harga dasar BillStatus=Status tagihan @@ -137,8 +137,6 @@ BillFrom=Dari BillTo=Kepada ActionsOnBill=Tindak lanjut tagihan NewBill=Tagihan baru -Prélèvements=Pesanan tetap -Prélèvements=Pesanan tetap LastBills=Tagihan %s terakhir LastCustomersBills=Tagihan - tagihan %s terakhir para pelanggan LastSuppliersBills=Tagihan - tagihan %s terakhir para pemasok / suplier @@ -156,9 +154,9 @@ ConfirmCancelBill=Anda yakin untuk membatalkan tagihan %s ? ConfirmCancelBillQuestion=Kenapa Anda ingin memasukan tagihan ini kedalam klasifikasi 'diabaikan' ? ConfirmClassifyPaidPartially=Anda yakin untuk merubah tagihan %s ke status sudah dibayar ? ConfirmClassifyPaidPartiallyQuestion=Tagihan ini belum dibayar sepenuhnya. Apa alasan Anda untuk menutup tagihan ini ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason @@ -191,9 +189,9 @@ AlreadyPaid=Already paid AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Abandoned -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received @@ -219,19 +217,18 @@ NoInvoice=No invoice ClassifyBill=Classify invoice SupplierBillsToPay=Suppliers invoices to pay CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms SetMode=Set payment mode Billed=Billed -RepeatableInvoice=Pre-defined invoice -RepeatableInvoices=Pre-defined invoices -Repeatable=Pre-defined -Repeatables=Pre-defined -ChangeIntoRepeatableInvoice=Convert into pre-defined -CreateRepeatableInvoice=Create pre-defined invoice -CreateFromRepeatableInvoice=Create from pre-defined invoice +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Customer invoices and payments ExportDataset_invoice_1=Customer invoices list and invoice's lines diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang index ed61bfc08a6..22914931db1 100644 --- a/htdocs/langs/id_ID/categories.lang +++ b/htdocs/langs/id_ID/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/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 3929cfde036..878eb49b3c9 100644 --- a/htdocs/langs/id_ID/compta.lang +++ b/htdocs/langs/id_ID/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 e5ad112b222..57ba3bb15d8 100644 --- a/htdocs/langs/id_ID/contracts.lang +++ b/htdocs/langs/id_ID/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastContracts=Last %s modified contracts +LastModifiedContracts=Last %s modified contracts AllContracts=All contracts ContractCard=Contract card ContractStatus=Contract status @@ -27,7 +27,7 @@ MenuRunningServices=Running services MenuExpiredServices=Expired services MenuClosedServices=Closed services NewContract=New contract -AddContract=Add contract +AddContract=Create contract SearchAContract=Search a contract DeleteAContract=Delete a contract CloseAContract=Close a contract @@ -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 %s modified 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/cron.lang b/htdocs/langs/id_ID/cron.lang index 1be23d72ca3..195ad43c87c 100644 --- a/htdocs/langs/id_ID/cron.lang +++ b/htdocs/langs/id_ID/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# -# About = About -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +About = About +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job -# CronNone= None -# CronDtStart=Start date -# CronDtEnd=End date -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe -# CronMethod=Method -# CronModule=Module -# CronAction=Action -# CronStatus=Status -# CronStatusActive=Enabled -# CronStatusInactive=Disabled -# CronNoJobs=No jobs registered -# CronPriority=Priority -# CronLabel=Description -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job +CronNone= None +CronDtStart=Start date +CronDtEnd=End date +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe +CronMethod=Method +CronModule=Module +CronAction=Action +CronStatus=Status +CronStatusActive=Enabled +CronStatusInactive=Disabled +CronNoJobs=No jobs registered +CronPriority=Priority +CronLabel=Description +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create -# CronArgs=Parameters -# CronSaveSucess=Save succesfully -# CronNote=Comment -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable -# CronStatusInactiveBtn=Disable -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create +CronArgs=Parameters +CronSaveSucess=Save succesfully +CronNote=Comment +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable +CronStatusInactiveBtn=Disable +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/id_ID/donations.lang b/htdocs/langs/id_ID/donations.lang index 66ddea95a5c..f7aed91cf81 100644 --- a/htdocs/langs/id_ID/donations.lang +++ b/htdocs/langs/id_ID/donations.lang @@ -4,7 +4,7 @@ Donations=Donations DonationRef=Donation ref. Donor=Donor Donors=Donors -AddDonation=Add a donation +AddDonation=Create a donation NewDonation=New donation ShowDonation=Show donation DonationPromise=Gift promise @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/id_ID/externalsite.lang index b915c37a5ab..da4853df0df 100644 --- a/htdocs/langs/id_ID/externalsite.lang +++ b/htdocs/langs/id_ID/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite -# ExternalSiteSetup=Setup link to external website -# ExternalSiteURL=External Site URL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteSetup=Setup link to external website +ExternalSiteURL=External Site URL +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang index c25abf6449c..f5b87fefb08 100644 --- a/htdocs/langs/id_ID/holiday.lang +++ b/htdocs/langs/id_ID/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Name Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events 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/interventions.lang b/htdocs/langs/id_ID/interventions.lang index 17641a0ab3e..c79da05364e 100644 --- a/htdocs/langs/id_ID/interventions.lang +++ b/htdocs/langs/id_ID/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Interventions InterventionCard=Intervention card NewIntervention=New intervention -AddIntervention=Add intervention +AddIntervention=Create intervention ListOfInterventions=List of interventions EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang index 98e6dc335ee..7a211198822 100644 --- a/htdocs/langs/id_ID/mails.lang +++ b/htdocs/langs/id_ID/mails.lang @@ -115,7 +115,7 @@ SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -133,6 +133,9 @@ Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang index 82e609d8ae6..0c3a3ca751c 100644 --- a/htdocs/langs/id_ID/main.lang +++ b/htdocs/langs/id_ID/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries GoToWikiHelpPage=Read online help (need Internet access) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier @@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events NActionsLate=%s late +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Remove filter ChartGenerated=Chart generated @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToThirdParty=Link to another third party CreateDraft=Create draft +SetToDraft=Back to draft ClickToEdit=Click to edit ObjectDeleted=Object %s deleted ByCountry=By country @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/id_ID/margins.lang b/htdocs/langs/id_ID/margins.lang index e8d5fed1af9..606d5e5053a 100644 --- a/htdocs/langs/id_ID/margins.lang +++ b/htdocs/langs/id_ID/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=Product or Service AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=Start date EndDate=End date Launch=Start - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/id_ID/orders.lang index 42444f0ec1c..6ee9c19fa95 100644 --- a/htdocs/langs/id_ID/orders.lang +++ b/htdocs/langs/id_ID/orders.lang @@ -1,168 +1,162 @@ # Dolibarr language file - Source file is en_US - orders -# OrdersArea=Customers orders area -# SuppliersOrdersArea=Suppliers orders area -# OrderCard=Order card -# OrderId=Order Id -# Order=Order -# Orders=Orders -# OrderLine=Order line -# OrderFollow=Follow up -# OrderDate=Order date -# OrderToProcess=Order to process -# NewOrder=New order -# ToOrder=Make order -# MakeOrder=Make order -# SupplierOrder=Supplier order -# SuppliersOrders=Suppliers orders -# SuppliersOrdersRunning=Current suppliers orders -# CustomerOrder=Customer order -# CustomersOrders=Customer's orders -# CustomersOrdersRunning=Current customer's orders -# CustomersOrdersAndOrdersLines=Customer orders and order's lines -# OrdersToValid=Customer's orders to validate -# OrdersToBill=Customer's orders delivered -# OrdersInProcess=Customer's orders in process -# OrdersToProcess=Customer's orders to process -# SuppliersOrdersToProcess=Supplier's orders to process -# StatusOrderCanceledShort=Canceled -# StatusOrderDraftShort=Draft -# StatusOrderValidatedShort=Validated -# StatusOrderSentShort=In process -# StatusOrderSent=Shipment in process -# StatusOrderOnProcessShort=Reception -# StatusOrderProcessedShort=Processed -# StatusOrderToBillShort=Delivered -# StatusOrderToBill2Short=To bill -# StatusOrderApprovedShort=Approved -# StatusOrderRefusedShort=Refused -# StatusOrderToProcessShort=To process -# StatusOrderReceivedPartiallyShort=Partially received -# StatusOrderReceivedAllShort=Everything received -# StatusOrderCanceled=Canceled -# StatusOrderDraft=Draft (needs to be validated) -# StatusOrderValidated=Validated -# StatusOrderOnProcess=Waiting to receive -# StatusOrderProcessed=Processed -# StatusOrderToBill=Delivered -# StatusOrderToBill2=To bill -# StatusOrderApproved=Approved -# StatusOrderRefused=Refused -# StatusOrderReceivedPartially=Partially received -# StatusOrderReceivedAll=Everything received -# ShippingExist=A shipment exists -# DraftOrWaitingApproved=Draft or approved not yet ordered -# DraftOrWaitingShipped=Draft or validated not yet shipped -# MenuOrdersToBill=Orders delivered -# MenuOrdersToBill2=Orders to bill -# SearchOrder=Search order -# SearchACustomerOrder=Search a customer order -# ShipProduct=Ship product -# Discount=Discount -# CreateOrder=Create Order -# RefuseOrder=Refuse order -# ApproveOrder=Accept order -# ValidateOrder=Validate order -# UnvalidateOrder=Unvalidate order -# DeleteOrder=Delete order -# CancelOrder=Cancel order -# AddOrder=Add order -# AddToMyOrders=Add to my orders -# AddToOtherOrders=Add to other orders -# AddToDraftOrders=Add to draft order -# ShowOrder=Show order -# NoOpenedOrders=No opened orders -# NoOtherOpenedOrders=No other opened orders -# NoDraftOrders=No draft orders -# OtherOrders=Other orders -# LastOrders=Last %s orders -# LastModifiedOrders=Last %s modified orders -# LastClosedOrders=Last %s closed orders -# AllOrders=All orders -# NbOfOrders=Number of orders -# OrdersStatistics=Order's statistics -# OrdersStatisticsSuppliers=Supplier order's statistics -# NumberOfOrdersByMonth=Number of orders by month -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) -# ListOfOrders=List of orders -# CloseOrder=Close order -# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. -# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. -# ConfirmDeleteOrder=Are you sure you want to delete this order ? -# ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? -# ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? -# ConfirmCancelOrder=Are you sure you want to cancel this order ? -# ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? -# GenerateBill=Generate invoice -# ClassifyShipped=Classify delivered -# ClassifyBilled=Classify billed -# ComptaCard=Accountancy card -# DraftOrders=Draft orders -# RelatedOrders=Related orders -# OnProcessOrders=In process orders -# RefOrder=Ref. order -# RefCustomerOrder=Ref. customer order -# CustomerOrder=Customer order -# RefCustomerOrderShort=Ref. cust. order -# SendOrderByMail=Send order by mail -# ActionsOnOrder=Events on order -# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order -# OrderMode=Order method -# AuthorRequest=Request author -# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address -# RunningOrders=Orders on process -# UserWithApproveOrderGrant=Users granted with "approve orders" permission. -# PaymentOrderRef=Payment of order %s -# CloneOrder=Clone order -# ConfirmCloneOrder=Are you sure you want to clone this order %s ? -# DispatchSupplierOrder=Receiving supplier order %s +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id +Order=Order +Orders=Orders +OrderLine=Order line +OrderFollow=Follow up +OrderDate=Order date +OrderToProcess=Order to process +NewOrder=New order +ToOrder=Make order +MakeOrder=Make order +SupplierOrder=Supplier order +SuppliersOrders=Suppliers orders +SuppliersOrdersRunning=Current suppliers orders +CustomerOrder=Customer order +CustomersOrders=Customer's orders +CustomersOrdersRunning=Current customer's orders +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customer's orders to validate +OrdersToBill=Customer's orders delivered +OrdersInProcess=Customer's orders in process +OrdersToProcess=Customer's orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderSentShort=In process +StatusOrderSent=Shipment in process +StatusOrderOnProcessShort=Reception +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=Delivered +StatusOrderToBill2Short=To bill +StatusOrderApprovedShort=Approved +StatusOrderRefusedShort=Refused +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received +StatusOrderCanceled=Canceled +StatusOrderDraft=Draft (needs to be validated) +StatusOrderValidated=Validated +StatusOrderOnProcess=Waiting to receive +StatusOrderProcessed=Processed +StatusOrderToBill=Delivered +StatusOrderToBill2=To bill +StatusOrderApproved=Approved +StatusOrderRefused=Refused +StatusOrderReceivedPartially=Partially received +StatusOrderReceivedAll=Everything received +ShippingExist=A shipment exists +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders +SearchOrder=Search order +SearchACustomerOrder=Search a customer order +ShipProduct=Ship product +Discount=Discount +CreateOrder=Create Order +RefuseOrder=Refuse order +ApproveOrder=Accept order +ValidateOrder=Validate order +UnvalidateOrder=Unvalidate order +DeleteOrder=Delete order +CancelOrder=Cancel order +AddOrder=Create order +AddToMyOrders=Add to my orders +AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order +ShowOrder=Show order +NoOpenedOrders=No opened orders +NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders +AllOrders=All orders +NbOfOrders=Number of orders +OrdersStatistics=Order's statistics +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +ListOfOrders=List of orders +CloseOrder=Close order +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +GenerateBill=Generate invoice +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s ##### Types de contacts ##### -# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order -# TypeContact_commande_internal_SHIPPING=Representative following-up shipping -# TypeContact_commande_external_BILLING=Customer invoice contact -# TypeContact_commande_external_SHIPPING=Customer shipping contact -# TypeContact_commande_external_CUSTOMER=Customer contact following-up order -# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order -# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping -# TypeContact_order_supplier_external_BILLING=Supplier invoice contact -# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact -# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order - -# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined -# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined -# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' -# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' -# Error_OrderNotChecked=No orders to invoice selected - +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected # Sources -# OrderSource0=Commercial proposal -# OrderSource1=Internet -# OrderSource2=Mail campaign -# OrderSource3=Phone compaign -# OrderSource4=Fax campaign -# OrderSource5=Commercial -# OrderSource6=Store -# QtyOrdered=Qty ordered -# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order - +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign +OrderSource5=Commercial +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order # Documents models -# PDFEinsteinDescription=A complete order model (logo...) -# PDFEdisonDescription=A simple order model -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes -# OrderByMail=Mail -# OrderByFax=Fax -# OrderByEMail=EMail -# OrderByWWW=Online -# OrderByPhone=Phone - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/id_ID/oscommerce.lang b/htdocs/langs/id_ID/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/id_ID/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang index 27bfb7041d0..25d3aa806d0 100644 --- a/htdocs/langs/id_ID/other.lang +++ b/htdocs/langs/id_ID/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/id_ID/paybox.lang b/htdocs/langs/id_ID/paybox.lang index b689bb6cebf..aced32a4944 100644 --- a/htdocs/langs/id_ID/paybox.lang +++ b/htdocs/langs/id_ID/paybox.lang @@ -1,37 +1,40 @@ # Dolibarr language file - Source file is en_US - paybox -# PayBoxSetup=PayBox module setup -# PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) -# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects -# PaymentForm=Payment form -# WelcomeOnPaymentPage=Welcome on our online payment service -# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. -# ThisIsInformationOnPayment=This is information on payment to do -# ToComplete=To complete -# YourEMail=Email to receive payment confirmation -# Creditor=Creditor -# PaymentCode=Payment code -# PayBoxDoPayment=Go on payment -# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information -# PleaseBePatient=Please, be patient -# Continue=Next -# ToOfferALinkForOnlinePayment=URL for %s payment -# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order -# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice -# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line -# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount -# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription -# YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. -# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. -# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. -# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. -# AccountParameter=Account parameters -# UsageParameter=Usage parameters -# InformationToFindParameters=Help to find your %s account information -# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment -# VendorName=Name of vendor -# CSSUrlForPaymentForm=CSS style sheet url for payment form -# MessageOK=Message on validated payment return page -# MessageKO=Message on canceled payment return page -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/id_ID/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang index 2ae43f39766..f6111bac684 100644 --- a/htdocs/langs/id_ID/sendings.lang +++ b/htdocs/langs/id_ID/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang index 5d11b0fd7a0..06c502504e9 100644 --- a/htdocs/langs/id_ID/stocks.lang +++ b/htdocs/langs/id_ID/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=Location LocationSummary=Short name location NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang index 0afaab6ad7f..baf209f9d1c 100644 --- a/htdocs/langs/id_ID/users.lang +++ b/htdocs/langs/id_ID/users.lang @@ -63,7 +63,6 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group modified successfully +GroupModified=Group %s modified GroupDeleted=Group %s removed ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? @@ -114,8 +113,10 @@ YourRole=Your roles YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb of users DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang index 58ac3e252ec..ea32511fefb 100644 --- a/htdocs/langs/id_ID/withdrawals.lang +++ b/htdocs/langs/id_ID/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Unknown StatusWaiting=Waiting @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/is_IS/accountancy.lang +++ b/htdocs/langs/is_IS/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index 35d97475337..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 @@ -437,14 +440,14 @@ Module52Name=Verðbréf Module52Desc=Kauphöll er stjórnun afurða Module53Name=Þjónusta Module53Desc=Þjónusta's stjórnun -Module54Name=Samningar -Module54Desc=Samningur og stjórnun þjónustu í +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes 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=Verkefni -Module400Desc=Verkefnisins stjórnun innan annarra eininga +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Tilkynningar -Module600Desc=tengiliðir Senda tilkynningar í tölvupósti um sum Dolibarr viðskipti viðburðir til þriðja aðila +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Fjárframlög Module700Desc=Framlög í stjórnun Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-fyrirtæki Module5000Desc=Leyfir þér að stjórna mörgum fyrirtækjum Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of velta mát -Module50200Name= Paypal -Module50200Desc= Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með Paypal +Module50200Name=Paypal +Module50200Desc=Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með 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 @@ -606,15 +613,16 @@ Permission151=Lesa standa pantanir Permission152=Búa til / breyta standandi fyrirmæli ósk Permission153=Lesa standandi fyrirmæli kvittunum Permission154=Útlán / neita standa pantanir kvittanir -Permission161=Lesa samninga -Permission162=Búa til / breyta samningar -Permission163=Virkja þjónustu samnings -Permission164=Óvirka þjónustu samning -Permission165=Eyða samninga -Permission171=Lesa ferðir -Permission172=Búa til / breyta ferðir -Permission173=Eyða ferðir -Permission178=Útflutningur ferðir +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Lesa birgja Permission181=Lesa birgir pantanir Permission182=Búa til / breyta birgi pantanir @@ -671,7 +679,7 @@ Permission300=Lesa Bar númerin Permission301=Búa til / breyta barnum kóðar Permission302=Eyða númerin barnum Permission311=Lesa þjónusta -Permission312=Velja þjónustu við samning +Permission312=Assign service/subscription to contract Permission331=Lesa bókamerki Permission332=Búa til / breyta bókamerki Permission333=Eyða bókamerki @@ -701,8 +709,8 @@ Permission701=Lesa Fjárframlög Permission702=Búa til / breyta framlög Permission703=Eyða Fjárframlög Permission1001=Lesa fiskistofna -Permission1002=Búa til / breyta birgðum -Permission1003=Eyða fiskistofna +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=hreyfing Lesa lager's Permission1005=Búa til / breyta hreyfingum lager's Permission1101=Lesa afhendingu pantana @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Fara aftur á bókhalds kóða byggt af %s á eftir þ ModuleCompanyCodePanicum=Return tómt bókhalds-númer. ModuleCompanyCodeDigitaria=Bókhalds kóða ráðast á þriðja aðila kóða. Kóðinn er samsett af eðli "C" í efstu stöðu eftir fyrstu 5 stafina þriðja aðila kóðann. UseNotifications=Notaðu tilkynningar -NotificationsDesc=Tölvupóst tilkynningar leyfir þér að hljóður senda sjálfvirkar póstur, fyrir sumir Dolibarr viðburðir, til þriðja aðila (viðskiptavini eða birgja) sem er stillt á. Val á virkum tilkynningu og markmið tengiliði er einn þriðja aðila á sama tíma. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Skjöl sniðmát DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Vatnsmerki á drögum að skjali @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Bæta við fæðingardag getu UseOptionLineIfNoQuantity=A lína af vöru / þjónustu með núll upphæð er talin sem valkost FreeLegalTextOnProposal=Frjáls texti um viðskiptabanka tillögur WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Stjórn Order's skipulag OrdersNumberingModules=Pantanir tala mát @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Til að sannreyna röð eftir tillögu nær, gerir það mögulegt að stíga við til bráðabirgða til FreeLegalTextOnOrders=Frjáls texti á pantanir WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Smelltu til að hringja mát skipulag ClickToDialUrlDesc=Url kallað þegar smellur á picto síminn er lokið. Dans l'url, énumérés pouvez utiliser les balises
    %% 1 $ s Qui Sera remplacé jöfnuður æ Sími de l'appelé
    %% 2 $ s Qui Sera remplacé jöfnuður æ Sími de l'appelant (æ votre)
    %% 3 $ s Qui Sera remplacé jöfnuður votre innskráningu clicktodial (skilgreining sur votre fiche utilisateur)
    %% 4 $ s Qui Sera remplacé jöfnuður votre mot de passe clicktodial (skilgreining sur votre fiche utilisateur). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention tala mát TemplatePDFInterventions=Intervention kort skjöl módel WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Samningar mát skipulag +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Samningar númera einingar TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Vörur mát skipulag ServiceSetup=Þjónusta mát skipulag @@ -1382,9 +1393,10 @@ MailingSetup=Emailing mát skipulag MailingEMailFrom=Sendandi Email (From) fyrir tölvupóst sent póst mát MailingEMailError=Return Email (Villa-til) fyrir tölvupóst með villa ##### Notification ##### -NotificationSetup=Tilkynning Bu email mát skipulag +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sendandi Email (From) fyrir tölvupóst sendi tilkynningar -ListOfAvailableNotifications=Listi yfir tiltækar tilkynningar (Þessi listi byggist á virkjuðum einingar) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sendi mát skipulag SendingsReceiptModel=Sending kvittun líkan @@ -1412,8 +1424,9 @@ OSCommerceTestOk=árangursrík Tenging við miðlara ' %s ' á gagnagrunni ' %s OSCommerceTestKo1=Tenging við miðlara ' %s ' ná árangri en% gagnagrunni 's' ekki næst. OSCommerceTestKo2=Tenging við miðlara ' %s ' sem notanda ' %s ' mistókst. ##### Stock ##### -StockSetup=Stillingareining lager -UserWarehouse=Nota notanda persónulega hlutabréf +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Valmynd eytt TreeMenu=Tree valmyndir @@ -1478,11 +1491,14 @@ ClickToDialDesc=Þessi eining leyfir þér að bæta við tákn eftir símanúme ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sölu CashDeskSetup=Point of velta mát skipulag -CashDeskThirdPartyForSell=Generic þriðja aðila til að nota fyrir selur +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Reikning til að nota til að taka á móti peningum greiðslur CashDeskBankAccountForCheque= Reikning til að nota til að taka á móti greiðslum með því að stöðva CashDeskBankAccountForCB= Reikning til að nota til að taka á móti peningum greiðslur með kreditkortum -CashDeskIdWareHouse=Lager til nota fyrir selur +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. ##### Bookmark ##### BookmarkSetup=Bókamerki mát skipulag BookmarkDesc=Þessi eining leyfir þér að stjórna bókamerki. Þú getur einnig bætt flýtileiðir einhverju Dolibarr síðum eða externale vefsíðum á vinstri valmyndinni. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang index f5e5d9c96f7..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 @@ -41,9 +42,10 @@ AutoActions= Sjálfvirk fyllingu dagskrá AgendaAutoActionDesc= Veldu hér viðburðir sem þú vilt Dolibarr að búa sjálfvirkt til aðgerða á dagskrá. Ef ekkert er valið (sjálfgefið), verður eingöngu handvirk aðgerð að koma fram í dagskrá. AgendaSetupOtherDesc= Þessi síða leyfir að stilla aðrar breytur græju dagskrá. AgendaExtSitesDesc=Þessi síða leyfir þér að lýsa ytri uppsprettur dagatal til að sjá atburði í Dolibarr dagskrá. -ActionsEvents= Viðburðir sem Dolibarr vilja búa til aðgerða á dagskrá sjálfkrafa -PropalValidatedInDolibarr= Tillaga %s staðfestar -InvoiceValidatedInDolibarr= Invoice %s staðfestar +ActionsEvents=Viðburðir sem Dolibarr vilja búa til aðgerða á dagskrá sjálfkrafa +PropalValidatedInDolibarr=Tillaga %s staðfestar +InvoiceValidatedInDolibarr=Invoice %s staðfestar +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Vörureikningi %s fara aftur til drög að stöðu InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Panta %s staðfestar @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Panta %s samþykkt OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Panta %s fara aftur til drög að stöðu OrderCanceledInDolibarr=Panta %s niður -InterventionValidatedInDolibarr=Intervention %s staðfestar ProposalSentByEMail=Verslunarhúsnæði %s tillaga send með tölvupósti OrderSentByEMail=Viðskiptavinur röð %s send með tölvupósti InvoiceSentByEMail=Viðskiptavinur vörureikningi %s send með tölvupósti @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Birgir röð %s send með tölvupósti SupplierInvoiceSentByEMail=Birgir vörureikningi %s send með tölvupósti ShippingSentByEMail=Sendingarmáti %s send með tölvupósti ShippingValidated= Shipping %s validated -InterventionSentByEMail=Inngrip %s send með tölvupósti -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Í þriðja aðila til DateActionPlannedStart= Fyrirhugaður upphafsdagur DateActionPlannedEnd= Áætlaðir lokadagur @@ -70,9 +69,9 @@ DateActionStart= Upphafsdagur DateActionEnd= Lokadagur AgendaUrlOptions1=Þú getur einnig bætt við eftirfarandi breytur til að sía framleiðsla: AgendaUrlOptions2=login = %s til að takmarka framleiðsla til aðgerða stofnuðum af áhrifum eða gert með notandann %s . -AgendaUrlOptions3=logina = %s til að takmarka framleiðsla til aðgerða skapa við notandann %s . +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint = %s til að takmarka framleiðsla til aðgerða áhrif til notandi %s . -AgendaUrlOptions5=logind = %s til að takmarka framleiðsla til aðgerða gert með notandann %s . +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=tengiliði Sýna afmæli's AgendaHideBirthdayEvents=tengiliðir Fela afmæli's Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=Slóð til að opna. Kvæmd skrá ExtSiteNoLabel=Engin lýsing WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang index bc6d602d10e..d286633e8c8 100644 --- a/htdocs/langs/is_IS/bills.lang +++ b/htdocs/langs/is_IS/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit athugið InvoiceAvoirAsk=Credit athugið að leiðrétta reikning InvoiceAvoirDesc=Kredit huga er neikvæð Reikningar notuð til að leysa þá staðreynd að reikningur hefur sú upphæð sem er mismunandi en upphæð raunverulega greitt (vegna þess að viðskiptavinur greiða of mikið við villa, eða er ekki greidd að fullu síðan hann kom aftur sum vara til dæmis). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Skipta um reikning %s ReplacementInvoice=Skipti Reikningar ReplacedByInvoice=Komi% Reikningar s @@ -87,7 +87,7 @@ ClassifyCanceled=Flokka 'Yfirgefinn' ClassifyClosed=Lokað Flokka ' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Búa til reikning -AddBill=Bæta við reikning eða inneign athugið +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Eyða reikningi SearchACustomerInvoice=Leita að viðskiptavinur reikning @@ -99,7 +99,7 @@ DoPaymentBack=Ekki greiðslu baka ConvertToReduc=Umbreyta inn í framtíðina afsláttur EnterPaymentReceivedFromCustomer=Sláðu inn greiðslu frá viðskiptavini EnterPaymentDueToCustomer=Greiða vegna viðskiptavina -DisabledBecauseRemainderToPayIsZero=Fatlaðir því eftir að greiða er núll +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Upphæð PriceBase=Verð stöð BillStatus=Invoice stöðu @@ -137,8 +137,6 @@ BillFrom=Frá BillTo=Senda á ActionsOnBill=Actions reikning NewBill=Nýr reikningur -Prélèvements=Standandi pöntun -Prélèvements=Standandi pöntun LastBills=Last %s reikningum LastCustomersBills=Last %s viðskiptavinum reikninga LastSuppliersBills=Last %s birgjum reikninga @@ -156,9 +154,9 @@ ConfirmCancelBill=Ertu viss um að þú viljir hætta við Reikningar %s ?reikningi %s     stöðu borgað? ConfirmClassifyPaidPartiallyQuestion=Þessi reikningur hefur ekki verið greiddur að fullu. Hverjar eru ástæðurnar fyrir þig að loka þessum reikningi? -ConfirmClassifyPaidPartiallyReasonAvoir=Afganginn til að greiða ( %s %s ) er afsláttur veittur vegna greiðslu var áður litið. Ég regularize VSK með kredit nóta. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Afganginn til að greiða ( %s %s ) er afsláttur veittur vegna greiðslu var áður litið. Ég samþykki að missa VSK á þessum afslætti. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Afganginn til að greiða ( %s %s ) er afsláttur veittur vegna greiðslu var áður litið. Ég endurheimta virðisaukaskatt á þessum afslætti án þess að inneign Ath. +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 viðskiptavina ConfirmClassifyPaidPartiallyReasonProductReturned=Vörur aftur að hluta ConfirmClassifyPaidPartiallyReasonOther=Upphæð yfirgefin fyrir annarri ástæðu @@ -191,9 +189,9 @@ AlreadyPaid=Þegar greitt AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Þegar greitt (án seðla lána og innstæðna) Abandoned=Yfirgefin -RemainderToPay=Afganginn til að greiða -RemainderToTake=Afganginn til að taka -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Upphæð krafa ExcessReceived=Umfram borist @@ -219,19 +217,18 @@ NoInvoice=Nei Reikningar ClassifyBill=Flokka Reikningar SupplierBillsToPay=Birgjar reikninga til að greiða CustomerBillsUnpaid=Ógreiddum viðskiptavinum reikninga -DispenseMontantLettres=Frumvarpið samin af mechanographical eru undanþegin þeirri röð bréf -DispenseMontantLettres=Frumvarpið samin af mechanographical eru undanþegin þeirri röð bréf +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-endurheimtanlegur SetConditions=Setja greiðslu skilyrði SetMode=Setja greiðslu ham Billed=Billed -RepeatableInvoice=Pre-útskýra reikning -RepeatableInvoices=Pre-útskýra reikningum -Repeatable=Pre-skilgreint -Repeatables=Pre-skilgreint -ChangeIntoRepeatableInvoice=Umbreyta inn í fyrirfram skilgreind -CreateRepeatableInvoice=Búa til fyrirfram skilgreind Reikningar -CreateFromRepeatableInvoice=Create fyrirfram skilgreind Reikningar +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Viðskiptavinur reikninga og línur reiknings er CustomersInvoicesAndPayments=Viðskiptavinur reikninga og greiðslur ExportDataset_invoice_1=Viðskiptavinur reikningum lista og línur reiknings er diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang index 7b94e5fa730..4308d85801f 100644 --- a/htdocs/langs/is_IS/categories.lang +++ b/htdocs/langs/is_IS/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang index d04635fb00f..e793677dee7 100644 --- a/htdocs/langs/is_IS/compta.lang +++ b/htdocs/langs/is_IS/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad viðskiptavina bókhalds kóðann fyrir SuppliersProductsSellSalesTurnover=The mynda veltu af sölu á vörum birgis. CheckReceipt=Athugaðu innborgun CheckReceiptShort=Athugaðu innborgun +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New afsláttur NewCheckDeposit=New stöðva afhendingu NewCheckDepositOn=Búa til kvittun fyrir innborgun á reikning: %s @@ -196,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 ea2f0fb2108..8faf347b95c 100644 --- a/htdocs/langs/is_IS/contracts.lang +++ b/htdocs/langs/is_IS/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Samningar area ListOfContracts=Listi yfir samninga -LastContracts=Last %s breytt samninga +LastModifiedContracts=Last %s modified contracts AllContracts=Allir samningar ContractCard=Samningur kort ContractStatus=Samningur stöðu @@ -27,7 +27,7 @@ MenuRunningServices=Running þjónusta MenuExpiredServices=Útrunninn þjónusta MenuClosedServices=Lokað þjónusta NewContract=Nýr samningur -AddContract=Bæta við samning +AddContract=Create contract SearchAContract=Leita samning DeleteAContract=Eyða samning CloseAContract=Loka samning @@ -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 %s breytt samninga +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/cron.lang b/htdocs/langs/is_IS/cron.lang index f0318c12f85..ebae6d67c08 100644 --- a/htdocs/langs/is_IS/cron.lang +++ b/htdocs/langs/is_IS/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = Um -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job CronNone= None CronDtStart=Upphafsdagur CronDtEnd=Lokadagur -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe CronMethod=Aðferð CronModule=Module -# CronAction=Action +CronAction=Action CronStatus=Status CronStatusActive=Virkt CronStatusInactive=Fatlaðir -# CronNoJobs=No jobs registered +CronNoJobs=No jobs registered CronPriority=Forgangur CronLabel=Lýsing -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create CronArgs=Breytur -# CronSaveSucess=Save succesfully +CronSaveSucess=Save succesfully CronNote=Athugasemd -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable CronStatusInactiveBtn=Slökkva -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/is_IS/donations.lang b/htdocs/langs/is_IS/donations.lang index 0a14a8eb626..12fc71b3b9e 100644 --- a/htdocs/langs/is_IS/donations.lang +++ b/htdocs/langs/is_IS/donations.lang @@ -4,7 +4,7 @@ Donations=Fjárframlög DonationRef=Donation ref. Donor=Gjafa Donors=Styrktaraðila -AddDonation=Bæta við framlag +AddDonation=Create a donation NewDonation=New málefnið ShowDonation=Show donation DonationPromise=Gjöf loforð @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/is_IS/externalsite.lang index 5ced010884c..117b42da288 100644 --- a/htdocs/langs/is_IS/externalsite.lang +++ b/htdocs/langs/is_IS/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite ExternalSiteSetup=Skipulag tengjast ytri vef ExternalSiteURL=Ytri Site URL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/is_IS/holiday.lang b/htdocs/langs/is_IS/holiday.lang index 011397244f0..a29a400f47d 100644 --- a/htdocs/langs/is_IS/holiday.lang +++ b/htdocs/langs/is_IS/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Uppfæra CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Nafn Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Gildi -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Staðfesta UpdateEventCP=Update events diff --git a/htdocs/langs/is_IS/interventions.lang b/htdocs/langs/is_IS/interventions.lang index 12b2d4ee681..35009d0e1e1 100644 --- a/htdocs/langs/is_IS/interventions.lang +++ b/htdocs/langs/is_IS/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Íhlutun InterventionCard=Intervention kort NewIntervention=Nýrri aðferð -AddIntervention=Bæta við íhlutun +AddIntervention=Create intervention ListOfInterventions=Listi yfir inngrip EditIntervention=Breyta afskipti ActionsOnFicheInter=Aðgerðir á íhlutun @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Tengdar inngrip ShowIntervention=Sýna afskipti SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Fulltrúi eftirfarandi upp afskipti TypeContact_fichinter_internal_INTERVENING=Íhlutun diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang index bb9e2f48bea..6f5f9108e3a 100644 --- a/htdocs/langs/is_IS/mails.lang +++ b/htdocs/langs/is_IS/mails.lang @@ -115,7 +115,7 @@ SentBy=Sendur 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=Þú getur hins vegar sent þær á netinu með því að bæta breytu MAILING_LIMIT_SENDBYWEB við gildi frá fjölda max tölvupóst þú vilt senda við setu. 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Hreinsa lista ToClearAllRecipientsClickHere=Smelltu hér til að hreinsa viðtakanda lista fyrir þennan póst ToAddRecipientsChooseHere=Bæta við viðtakendur með því að velja úr listanum @@ -133,6 +133,9 @@ Notifications=Tilkynningar NoNotificationsWillBeSent=Engar tilkynningar í tölvupósti er mjög spennandi fyrir þennan atburð og fyrirtæki ANotificationsWillBeSent=1 tilkynning verður send með tölvupósti SomeNotificationsWillBeSent=%s tilkynningar verða sendar í tölvupósti -AddNewNotification=Virkja nýja tilkynningu í tölvupósti beiðni -ListOfActiveNotifications=Listi alla virka tilkynningu í tölvupósti beiðnir +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Sýna allar tilkynningar í tölvupósti sendi +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang index de07096f6b3..beba885d13d 100644 --- a/htdocs/langs/is_IS/main.lang +++ b/htdocs/langs/is_IS/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Gat ekki fundið notandann %s í D ErrorNoVATRateDefinedForSellerCountry=Villa, enginn VSK hlutfall er skilgreind fyrir% landsins. ErrorNoSocialContributionForSellerCountry=Villa, engin félagsleg framlag tegund er skilgreind fyrir% landsins. ErrorFailedToSaveFile=Villa tókst að vista skrána. -ErrorOnlyPngJpgSupported=Villa, eini. PNG og. Jpg mynd snið skrá eru studd. -ErrorImageFormatNotSupported=Your PHP styður ekki virka til að breyta myndum af þessu sniði. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default bakgrunnslit +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A-skrá er valin fyrir viðhengi en var ekki enn upp. Smelltu á "Hengja skrá" fyrir þessu. NbOfEntries=ATH færslna GoToWikiHelpPage=Lesa hjálp á netinu (þörf Internet aðgangur) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Mánuður dagsins HourShort=H +MinuteShort=mn Rate=Verð UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Sjá lista Statistics=Tölfræði OtherStatistics=Önnur tölfræði Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Tilv. RefSupplier=Tilv. birgir @@ -365,6 +367,7 @@ ActionsOnCompany=Actions um þessa þriðja aðila ActionsOnMember=Viðburðir um þennan notanda NActions=%s aðgerðir NActionsLate=%s seint +RequestAlreadyDone=Request already recorded Filter=Sía RemoveFilter=Fjarlægja síu ChartGenerated=Mynd mynda @@ -645,6 +648,7 @@ OptionalFieldsSetup=Auka eiginleikar skipulag URLPhoto=Url á mynd / lógó SetLinkToThirdParty=Tengill á öðrum þriðja aðila CreateDraft=Búa til drög +SetToDraft=Back to draft ClickToEdit=Smelltu til að breyta ObjectDeleted=Object %s eytt ByCountry=Eftir löndum @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Mánudagur Tuesday=Þriðjudagur diff --git a/htdocs/langs/is_IS/margins.lang b/htdocs/langs/is_IS/margins.lang index 7319585cfdb..5ab8b70e472 100644 --- a/htdocs/langs/is_IS/margins.lang +++ b/htdocs/langs/is_IS/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=Vara eða þjónusta AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=Upphafsdagur EndDate=Lokadagur Launch=Byrja - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/is_IS/orders.lang index 48c220c4d9b..f4106749b55 100644 --- a/htdocs/langs/is_IS/orders.lang +++ b/htdocs/langs/is_IS/orders.lang @@ -2,7 +2,7 @@ OrdersArea=Viðskiptavinir pantanir area SuppliersOrdersArea=Birgjar pantanir area OrderCard=Panta kort -# OrderId=Order Id +OrderId=Order Id Order=Panta Orders=Pantanir OrderLine=Pöntunarlína @@ -28,7 +28,7 @@ StatusOrderCanceledShort=Hætt við StatusOrderDraftShort=Víxill StatusOrderValidatedShort=Staðfestar StatusOrderSentShort=Í ferli -# StatusOrderSent=Shipment in process +StatusOrderSent=Shipment in process StatusOrderOnProcessShort=Á ferli StatusOrderProcessedShort=Afgreitt StatusOrderToBillShort=Við reikning @@ -53,9 +53,9 @@ ShippingExist=A sendingunni til DraftOrWaitingApproved=Víxill eða samþykkt ekki enn pantað DraftOrWaitingShipped=Drög eða viðurkennd ekki enn flutt MenuOrdersToBill=Pantanir við reikning -# MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Leita röð -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=Skip vöru Discount=Afsláttur CreateOrder=Búa Order @@ -65,14 +65,14 @@ ValidateOrder=Staðfesta röð UnvalidateOrder=Unvalidate röð DeleteOrder=Eyða röð CancelOrder=Hætta við röð -AddOrder=Bæta við röð +AddOrder=Create order AddToMyOrders=Bæta við pöntunum minn AddToOtherOrders=Bæta við aðrar skipanir -# AddToDraftOrders=Add to draft order +AddToDraftOrders=Add to draft order ShowOrder=Sýna röð NoOpenedOrders=Nei opnaði pantanir NoOtherOpenedOrders=Engin önnur opnaði pantanir -# NoDraftOrders=No draft orders +NoDraftOrders=No draft orders OtherOrders=Aðrar skipanir LastOrders=Last %s pantanir LastModifiedOrders=Last %s breytt pantanir @@ -82,7 +82,7 @@ NbOfOrders=Fjöldi fyrirmæla OrdersStatistics=tölfræði Order's OrdersStatisticsSuppliers=tölfræði Birgir röð's NumberOfOrdersByMonth=Fjöldi fyrirmæla eftir mánuði -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=Listi yfir pantanir CloseOrder=Loka röð ConfirmCloseOrder=Ertu viss um að þú viljir loka þessari röð? Einu sinni í röð er lokað, það geta aðeins verið rukkaður. @@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Ertu viss um að þú viljir endurheimta röð %s ConfirmCancelOrder=Ertu viss um að þú viljir hætta í þessari röð? ConfirmMakeOrder=Ertu viss um að þú viljir að staðfesta sem þú gerðir í þessari röð á %s ? GenerateBill=Búa til reikning -# ClassifyShipped=Classify delivered +ClassifyShipped=Classify delivered ClassifyBilled=Flokka "borgað" ComptaCard=Bókhalds-kort DraftOrders=Drög að fyrirmælum @@ -101,7 +101,6 @@ RelatedOrders=Svipaðir pantanir OnProcessOrders=Í pantanir ferli RefOrder=Tilv. röð RefCustomerOrder=Tilv. viðskiptavina þess -CustomerOrder=Viðskiptavinur röð RefCustomerOrderShort=Tilv. cust. röð SendOrderByMail=Senda til með pósti ActionsOnOrder=Aðgerðir á röð @@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON skilgr Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON skilgreind ekki Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Ekki tókst að hlaða module skrána ' %s ' Error_FailedToLoad_COMMANDE_ADDON_File=Ekki tókst að hlaða module skrána ' %s ' -# Error_OrderNotChecked=No orders to invoice selected - - +Error_OrderNotChecked=No orders to invoice selected # Sources OrderSource0=Auglýsing tillögu OrderSource1=Internet @@ -144,25 +141,22 @@ OrderSource5=Auglýsing OrderSource6=Store QtyOrdered=Magn röð AddDeliveryCostLine=Bæta við kostnað sending línu sem gefur til kynna að þyngd þess - # Documents models PDFEinsteinDescription=A heill til líkan (logo. ..) PDFEdisonDescription=Einföld röð líkan -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes OrderByMail=Póstur OrderByFax=Fax OrderByEMail=Tölvupóstur OrderByWWW=Online OrderByPhone=Sími - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/is_IS/oscommerce.lang b/htdocs/langs/is_IS/oscommerce.lang deleted file mode 100644 index f88df6b090c..00000000000 --- a/htdocs/langs/is_IS/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce mát skipulag -OSCommerceSetupSaved=OS Commerce skipulag vistuð -OSCommerceServer=OS Commerce miðlara gestgjafi / ip -OSCommerceDatabaseName=OS Commerce gagnasafn nafn -OSCommercePrefix=OS Commerce matskeið forskeyti -OSCommerceUser=OS Commerce gagnasafn Innskráning diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang index d321767dba5..b9f670340db 100644 --- a/htdocs/langs/is_IS/other.lang +++ b/htdocs/langs/is_IS/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Öryggisnúmer Calendar=Calendar -AddTrip=Bæta ferð Tools=Verkfæri ToolsDesc=Þetta svæði er tileinkað hópi ýmissa verkfærum er ekki í boði í öðrum færslum valmyndinni.

    Þeir verkfæri geta verið náð úr valmyndinni til hliðar. Birthday=Afmæli @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Fjöldi meðfylgjandi skrá / gögn TotalSizeOfAttachedFiles=Heildarstærð meðfylgjandi skrá / gögn MaxSize=Hámarks stærð @@ -80,6 +80,16 @@ ModifiedBy=Breytt af %s ValidatedBy=Staðfestar af %s CanceledBy=Hætt við %s ClosedBy=Lokað eftir %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s var eytt DirWasRemoved=Listinn %s hefur verið fjarlægt FeatureNotYetAvailableShort=Laus í næsta útgáfa @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Bæta við færslu í dagbók %s -NewCompanyToDolibarr=Fyrirtæki %s bætt inn Dolibarr -ContractValidatedInDolibarr=Samningur %s staðfestar í Dolibarr -ContractCanceledInDolibarr=Samningur %s niður í Dolibarr -ContractClosedInDolibarr=Samningur %s lokað Dolibarr -PropalClosedSignedInDolibarr=Tillaga %s undirritaður í Dolibarr -PropalClosedRefusedInDolibarr=Tillaga %s neitaði í Dolibarr -PropalValidatedInDolibarr=Tillaga %s staðfestar í Dolibarr -InvoiceValidatedInDolibarr=Invoice %s staðfestar í Dolibarr -InvoicePaidInDolibarr=Invoice %s breytt í greiddur í Dolibarr -InvoiceCanceledInDolibarr=Invoice %s niður í Dolibarr -PaymentDoneInDolibarr=Greiðsla %s búinn Dolibarr -CustomerPaymentDoneInDolibarr=Viðskiptavinur greiðslu %s búinn Dolibarr -SupplierPaymentDoneInDolibarr=Birgir greiðslu %s búinn Dolibarr -MemberValidatedInDolibarr=Aðildarríkin %s staðfestar í Dolibarr -MemberResiliatedInDolibarr=Aðildarríkin %s resiliated í Dolibarr -MemberDeletedInDolibarr=Aðildarríkin %s eytt úr Dolibarr -MemberSubscriptionAddedInDolibarr=Áskrift fyrir aðild %s bætt í Dolibarr -ShipmentValidatedInDolibarr=Sendingu %s staðfest í Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Útflutningur ExportsArea=Útflutningur area diff --git a/htdocs/langs/is_IS/paybox.lang b/htdocs/langs/is_IS/paybox.lang index de2829f99db..eafa8c0424d 100644 --- a/htdocs/langs/is_IS/paybox.lang +++ b/htdocs/langs/is_IS/paybox.lang @@ -32,6 +32,9 @@ VendorName=Nafn seljanda CSSUrlForPaymentForm=CSS stíll lak url fyrir formi greiðslu MessageOK=Skilaboð á staðfest greiðslu aftur síðu MessageKO=Skilaboð á niður greiðslu aftur síðu -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/is_IS/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang index e53d724a0fe..cafdc4253af 100644 --- a/htdocs/langs/is_IS/sendings.lang +++ b/htdocs/langs/is_IS/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Í augnablikinu er sköpun af a nýr sendingunni RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Afli eftir viðskiptavina diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang index c8c0ad0eec3..d90b9eb1d1f 100644 --- a/htdocs/langs/is_IS/stocks.lang +++ b/htdocs/langs/is_IS/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Lager merki er krafist CorrectStock=Rétt lager ListOfWarehouses=Listi yfir vöruhús ListOfStockMovements=Listi yfir hreyfingar lager -StocksArea=Stocks area +StocksArea=Warehouses area Location=Staðsetning LocationSummary=Stutt nafn staðsetning NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang index 458a417ea3f..a21dab91a6c 100644 --- a/htdocs/langs/is_IS/users.lang +++ b/htdocs/langs/is_IS/users.lang @@ -63,7 +63,6 @@ ShowGroup=Sýna hópur ShowUser=Sýna notanda NonAffectedUsers=Non áhrif notendur UserModified=Notandi breytt hefur verið -GroupModified=Group breytt hefur verið PhotoFile=Photo skrá UserWithDolibarrAccess=Notandi með Dolibarr aðgang ListOfUsersInGroup=Notendalisti í þessum hópi @@ -103,7 +102,7 @@ UserDisabled=User %s fatlaðra UserEnabled=User %s virkjaður UserDeleted=User %s eytt NewGroupCreated=Group %s búinn til -GroupModified=Group breytt hefur verið +GroupModified=Group %s modified GroupDeleted=Group %s eytt ConfirmCreateContact=Ertu viss um að þú viljir búa til Dolibarr reikning fyrir þennan tengilið? ConfirmCreateLogin=Ertu viss um að þú viljir búa til Dolibarr reikning fyrir þennan notanda? @@ -114,8 +113,10 @@ YourRole=hlutverk þín YourQuotaOfUsersIsReached=kvóta þinn af virkum notendum er náð! NbOfUsers=Nb notendur DontDowngradeSuperAdmin=Aðeins superadmin getur lækkunar a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang index 8e6200e525a..d73332b8408 100644 --- a/htdocs/langs/is_IS/withdrawals.lang +++ b/htdocs/langs/is_IS/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kvittun LastWithdrawalReceipts=Last %s afturköllun kvittunum WithdrawedBills=Afturkallað reikningum WithdrawalsLines=Uppsögn línur -RequestStandingOrderToTreat=Beiðni fyrir standandi fyrirmæli til meðferðar -RequestStandingOrderTreated=Beiðni um stöðu pantana sem fengu +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Viðskiptavinur standa pantanir CustomerStandingOrder=Viðskiptavinur standandi röð NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Aðferð Sending Send=Senda Lines=Línur StandingOrderReject=Útgáfudagur a hafna -InvoiceRefused=Hleðsla höfnun til viðskiptavina WithdrawalRefused=Útborganir Refuseds WithdrawalRefusedConfirm=Ertu viss um að þú viljir að slá inn uppsögn höfnun fyrir samfélagið RefusedData=Dagsetning synjunar RefusedReason=Ástæða fyrir höfnun RefusedInvoicing=Innheimta höfnun NoInvoiceRefused=Ekki hlaða höfnun -InvoiceRefused=Hleðsla höfnun til viðskiptavina +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Óþekkt StatusWaiting=Bíð @@ -76,13 +76,14 @@ WithBankUsingRIB=Fyrir bankareikninga með RIB WithBankUsingBANBIC=Fyrir bankareikninga með IBAN / BIC / Swift BankToReceiveWithdraw=Bankareikning til að fá hættir CreditDate=Útlán á -WithdrawalFileNotCapable=Ekki er hægt að búa til fráhvarfs kvittunar skrá fyrir þínu landi +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/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang index a28f87e3343..c581fbcf534 100644 --- a/htdocs/langs/it_IT/accountancy.lang +++ b/htdocs/langs/it_IT/accountancy.lang @@ -25,13 +25,13 @@ Selectchartofaccounts=Seleziona una lista degli account Validate=Convalida Addanaccount=Aggiungi un account di contabilità AccountAccounting=Account di contabilità -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers -TradeMargin=Trade margin +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers +TradeMargin=Margine commerciale Reports=Report ByCustomerInvoice=Per fatture clienti ByMonth=Per mese @@ -42,13 +42,13 @@ Create=Crea UpdateAccount=Modifica di un account di contabilità UpdateMvts=Modifica di un movimento WriteBookKeeping=Record accounts in general ledger -Bookkeeping=General ledger +Bookkeeping=Contabilità generale AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer -Line=Line +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer +Line=Riga CAHTF=Total purchase supplier HT InvoiceLines=Lines of invoice to be ventilated @@ -56,21 +56,21 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing AnyLineVentilate=Any lines to ventilate -SelectedLines=Selected lines -Lineofinvoice=Line of invoice +SelectedLines=Righe selezionate +Lineofinvoice=Riga fattura VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTING_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separatore CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -92,7 +92,7 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) -Doctype=Type of document +Doctype=Tipo documento Docdate=Data Docref=Riferimento Numerocompte=Account @@ -122,10 +122,10 @@ CustomerInvoicePayment=Payment of invoice customer ThirdPartyAccount=Thirdparty account -NewAccountingMvt=New movement -NumMvts=Number of movement -ListeMvts=List of the movement -ErrorDebitCredit=Debit and Credit cannot have a value at the same time +NewAccountingMvt=Nuovo movimento +NumMvts=Numero movimento +ListeMvts=Elenco movimenti +ErrorDebitCredit=Debito e Credito non possono avere un valore contemporaneamente ReportThirdParty=List thirdparty account DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts @@ -138,21 +138,21 @@ Pcgsubtype=Under class of account Accountparent=Root of the account Active=Statement -NewFiscalYear=New fiscal year +NewFiscalYear=Nuovo anno fiscale -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT -TotalMarge=Total sales margin +TotalMarge=Margine totale sulle vendite DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account -ValidateHistory=Validate Automatically +ValidateHistory=Convalida automaticamente ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index ec85bedbf4c..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 @@ -437,14 +440,14 @@ Module52Name=Magazzino Module52Desc=Gestione magazzino prodotti Module53Name=Servizi Module53Desc=Gestione servizi -Module54Name=Contratti -Module54Desc=Gestione contratti e servizi +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Codici a barre 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=Progetti -Module400Desc=Gestione progetti all'interno di altri moduli +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) @@ -484,7 +487,7 @@ Module500Desc=Amministrazione delle spese speciali quali tasse, contributi socia Module510Name=Stipendi Module510Desc=Management of employees salaries and payments Module600Name=Notifiche -Module600Desc=Inviare notifiche (via email), per eventi aziendali Dolibarr +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donazioni Module700Desc=Gestione donazioni Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multiazienda Module5000Desc=Permette la gestione di diverse aziende Module6000Name=Flusso di lavoro Module6000Desc=Gestione flussi di lavoro -Module20000Name=Ferie -Module20000Desc=Dichiara e segui le ferie dei dipendenti +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 Module50100Desc=Modulo per i punti vendita -Module50200Name= Paypal -Module50200Desc= Modulo per offrire il pagamento online con Paypal +Module50200Name=Paypal +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 @@ -606,15 +613,16 @@ Permission151=Vedere ordini permanenti Permission152=Creare/modificare richieste di ordini permanenti Permission153=Trasmettere fatture ordini permanenti Permission154=Pagare/rifiutare fatture ordini permanenti -Permission161=Vedere contratti -Permission162=Creare/modificare contratti -Permission163=Attivare un servizio di un contratto -Permission164=Disattivare un servizio di un contratto -Permission165=Eliminare i contratti -Permission171=Vedere viaggi -Permission172=Creare/modificare viaggi -Permission173=Eliminare viaggi -Permission178=Esportare viaggi +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Vedere fornitori Permission181=Vedere ordini fornitore Permission182=Creare / modificare ordini fornitore @@ -671,7 +679,7 @@ Permission300=Vedere codici a barre Permission301=Creare/modificare codici a barre Permission302=Eliminare codici a barre Permission311=Vedere servizi -Permission312=Assegnare servizio a contratto +Permission312=Assign service/subscription to contract Permission331=Vedere segnalibri Permission332=Creare/modificare segnalibri Permission333=Eliminare segnalibri @@ -701,8 +709,8 @@ Permission701=Vedere donazioni Permission702=Creare/modificare donazioni Permission703=Eliminare donazioni Permission1001=Vedere magazzino -Permission1002=Creare/modificare magazzino -Permission1003=Eliminare scorte a magazzino +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Vedere movimenti magazzino Permission1005=Creare/modificare movimenti magazzino Permission1101=Vedere documenti di consegna @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Si in estate OnlyFollowingModulesAreOpenedToExternalUsers=Nota, solo i seguenti moduli sono aperti agli utenti esterni (qualunque siano i permessi per questi utenti) SuhosinSessionEncrypt=Sessioni salvate con criptazione tramite Suhosin ConditionIsCurrently=La condizione corrente è %s -TestNotPossibleWithCurrentBrowsers=Rilevamento automatico non è possibile YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Restituisce una stringa composta da %s seguito dal cod ModuleCompanyCodePanicum=Restituisce un codice contabile vuoto. ModuleCompanyCodeDigitaria=Codice contabile dipendente dal codice di terze parti. Il codice è composto dal carattere "C" nella prima posizione seguito da i primi 5 caratteri del codice cliente/fornitore. UseNotifications=Attiva le notifiche -NotificationsDesc=La funzione di notifica consente di inviare email automaticamente alle imprese che sono configurati per riceverle quando si verificano eventi predefiniti. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Modelli per i documenti DocumentModelOdt=Generare documenti da modelli OpenDocuments (file .ODT o .ODS per OpenOffice, KOffice, TextEdit, ecc...) WatermarkOnDraft=Filigrana sulle bozze @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Aggiungi la possibilità di inserire la data di conseg UseOptionLineIfNoQuantity=Una linea di prodotto/servizio con un importo pari a 0 è considerata come opzione FreeLegalTextOnProposal=Testo libero sulle proposte commerciali WatermarkOnDraftProposal=Bozze dei preventivi filigranate (nessuna filigrana se vuoto) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Configurazione della gestione ordini OrdersNumberingModules=Modelli di numerazione degli ordini @@ -1146,6 +1156,7 @@ HideTreadedOrders=Nascondi ordini trattati o annullati nella lista ValidOrderAfterPropalClosed=Rendi possibile non passare per l'ordine provvisorio per la convalida dopo la chiusura della proposta commerciale FreeLegalTextOnOrders=Testo libero sugli ordini WatermarkOnDraftOrders=Bozze degli ordini filigranate (nessuna filigrana se vuoto) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic) ClickToDialUrlDesc=Indirizzo da raggiungere quando si clicca sull'icona del telefono. L'indirizzo può contenere i codici
    __PHONETO__ che verrà sostituito con il numero telefonico a cui collegarsi,
    __PHONEFROM__ che verrà sostituito con il numero chiamante (il vostro),
    __LOGIN__ che verrà sostituito con il nome utente usato per il servizio e
    __PASS__ che verrà sostituito con la password del servizio ClickToDial. @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Numerazione dei moduli di intervento TemplatePDFInterventions=Modelli per moduli di intervento in pdf WatermarkOnDraftInterventionCards=Bozze delle schede di intervento filigranate (nessuna filigrana se vuoto) ##### Contracts ##### -ContractsSetup=Configurazione modulo contratti +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Moduli per la numerazione dei contratti TemplatePDFContracts=Modelli per documenti e contratti FreeLegalTextOnContracts=Testo libero sui contratti @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=I file di tipo %s non vengono compressi dal server HTTP CacheByServer=Cache per server CacheByClient=Cache per browser CompressionOfResources=Compressione delle risposte HTTP -TestNotPossibleWithCurrentBrowsers=Rilevamento automatico non è possibile +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Impostazioni modulo prodotti ServiceSetup=Impostazioni modulo servizi @@ -1382,9 +1393,10 @@ MailingSetup=Impostazioni modulo mailing MailingEMailFrom=Mittente email (Da) per le email inviate dal modulo mailing MailingEMailError=Indirizzo email per le mail di errore (Errors-to) ##### Notification ##### -NotificationSetup=Impostazioni modulo notifiche email +NotificationSetup=EMail notification module setup NotificationEMailFrom=Mittente email (Da) per le email di notifica inviate -ListOfAvailableNotifications=Elenco delle notifiche disponibili (La lista dipende dai moduli attivati) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Impostazione del modulo di consegna SendingsReceiptModel=Modello di ricevuta consegna (D.D.T.) @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connessione al server ' %s' sul database' %s' con l'utente ' %s OSCommerceTestKo1=Connessione al server ' %s' riuscita, ma il database' %s' non è raggiungibile. OSCommerceTestKo2=Connessione al server ' %s' con l'utente' %s' fallita. ##### Stock ##### -StockSetup=Impostazioni del modulo magazzino -UserWarehouse=Attiva magazzino personale per utente +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu soppresso TreeMenu=Albero dei menu @@ -1478,11 +1491,14 @@ ClickToDialDesc=Questo modulo aggiunge una icona accanto ai numeri telefonici de ##### Point Of Sales (CashDesk) ##### CashDesk=Punto vendita CashDeskSetup=Impostazioni modulo punto vendita -CashDeskThirdPartyForSell=Terzo generico da utilizzare per le vendite +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Conto bancario da utilizzare per pagamenti in contanti CashDeskBankAccountForCheque= Conto bancario da utilizzare per pagamenti con assegno CashDeskBankAccountForCB= Conto bancario da utilizzare per pagamenti con carta di credito -CashDeskIdWareHouse=Magazzino da utilizzare per le vendite +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. ##### Bookmark ##### BookmarkSetup=Impostazioni modulo segnalibri BookmarkDesc=Questo modulo consente di gestire i segnalibri web. È possibile aggiungere collegamenti a pagine Dolibarr o a qualsiasi altro sito web esterno al menu di sinistra. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Elimina anno fiscale ConfirmDeleteFiscalYear=Vuoi davvero cancellare questo anno fiscale? Opened=Aperto Closed=Chiuso - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Formato TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang index 02d38701175..7a63495c2c1 100644 --- a/htdocs/langs/it_IT/agenda.lang +++ b/htdocs/langs/it_IT/agenda.lang @@ -2,12 +2,12 @@ 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 -ActionsOwnedBy=Event owned by +ActionsOwnedBy=Evento amministrato da AffectedTo=Azione assegnata a DoneBy=Fatto da Event=Evento @@ -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,11 +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. -ActionsEvents= Eventi per i quali creare un'azione -PropalValidatedInDolibarr= Proposta convalidata -InvoiceValidatedInDolibarr= Fattura convalidata +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=Ricevute %s validate dal POS InvoiceBackToDraftInDolibarr=Fattura %s riportata allo stato di bozza InvoiceDeleteDolibarr=La fattura %s è stata cancellata OrderValidatedInDolibarr= Ordine convalidato @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Ordine %s approvato OrderRefusedInDolibarr=Ordine %s rifiutato OrderBackToDraftInDolibarr=Ordine %s riportato allo stato di bozza OrderCanceledInDolibarr=ordine %s annullato -InterventionValidatedInDolibarr=Intervento %s convalidato ProposalSentByEMail=Proposta commerciale %s inviata per email OrderSentByEMail=Ordine cliente %s inviato per email InvoiceSentByEMail=Fattura attiva %s inviata per email @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Ordine fornitore %s inviato per email SupplierInvoiceSentByEMail=Fornitore %s fattura inviata per email ShippingSentByEMail=%s spedizione inviata per email ShippingValidated= Spedizione %s confermata -InterventionSentByEMail=Intervento %s inviato via email -InterventionClassifiedBilled=Interventi %s classificati come Fatturati NewCompanyToDolibarr= Soggetto terzo creato DateActionPlannedStart= Data di inizio prevista DateActionPlannedEnd= Data di fine prevista @@ -70,9 +69,9 @@ DateActionStart= Data di inizio DateActionEnd= Data di fine AgendaUrlOptions1=È inoltre possibile aggiungere i seguenti parametri ai filtri di output: AgendaUrlOptions2=login = %s per visualizzare solo le azioni create da, o che coinvolgono l'utente %s. -AgendaUrlOptions3=logina = %s per limitare l'output alle azioni create dall'utente %s. +AgendaUrlOptions3=logina = %s per limitare l'output alle azioni amministrate dall'utente%s AgendaUrlOptions4=logint = %s per limitare l'output alle azioni modificate dall'utente %s. -AgendaUrlOptions5=logind = %s per limitare l'output alle azioni fatte dall'utente %s. +AgendaUrlOptionsProject=project=PROJECT_ID per limitare l'output alle azioni associate al progetto PROJECT_ID. AgendaShowBirthdayEvents=Visualizza i compleanni dei contatti AgendaHideBirthdayEvents=Nascondi i compleanni dei contatti Busy=Occupato @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL per accedere al file ICal ExtSiteNoLabel=Nessuna descrizione WorkingTimeRange=Intervallo di tempo di lavoro WorkingDaysRange=Intervallo di giorni di lavoro -AddEvent=Add event -MyAvailability=My availability +AddEvent=Crea evento +MyAvailability=Mie disponibilità 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 2627bdafb52..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 una Nota Credito con l'importo rimanente del pagamento della fattura di origine. -invoiceAvoirLineWithPaymentRestAmount=Importo Nota Credito della differenza del pagamento della fattura +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 @@ -85,21 +85,21 @@ ClassifyPaid=Classifica come "pagata" ClassifyPaidPartially=Classifica come "parzialmente pagata" ClassifyCanceled=Classifica come "abbandonata" ClassifyClosed=Classifica come "chiusa" -ClassifyUnBilled=Classify 'Unbilled' +ClassifyUnBilled=Classifica come 'Non fatturato' CreateBill=Crea fattura -AddBill=Aggiungi fattura o nota di credito +AddBill=Crea fattura o nota di credito AddToDraftInvoices=Aggiungi alle fattture in bozza DeleteBill=Elimina fattura 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 EnterPaymentDueToCustomer=Emettere il pagamento dovuto al cliente -DisabledBecauseRemainderToPayIsZero=Disabilitata perché il restante da pagare è zero +DisabledBecauseRemainderToPayIsZero=Disabilitato perché il restante da pagare vale zero Amount=Importo PriceBase=Prezzo base BillStatus=Stato fattura @@ -137,8 +137,6 @@ BillFrom=Da BillTo=Fattura a ActionsOnBill=Azioni su fattura NewBill=Nuova fattura -Prélèvements=Ordine permanente -Prélèvements=Ordine permanente LastBills=Ultime %s fatture LastCustomersBills=Ultime %s fatture attive LastSuppliersBills=Ultime %s fatture fornitori @@ -150,15 +148,15 @@ 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" ? ConfirmClassifyPaidPartially=Vuoi davvero cambiare lo stato della fattura %s in "parzialmente pagata"? ConfirmClassifyPaidPartiallyQuestion=La fattura non è stata pagata completamente. Quali sono i motivi per chiudere questa fattura? -ConfirmClassifyPaidPartiallyReasonAvoir=La rimanenza da pagare ( %s %s) viene concessa come sconto perché il pagamento è stato effettuato prima del termine. L'IVA verrà recuperata con una nota di credito. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La rimanenza da pagare ( %s %s) viene concessa come sconto perché il pagamento è stato effettuato prima del termine. Accetto di perdere l'IVA su questo sconto. -ConfirmClassifyPaidPartiallyReasonDiscountVat=La rimanenza da pagare ( %s %s) viene concessa come sconto perché il pagamento è stato effettuato prima del termine. L'IVA verrà recuperata senza una nota di credito. +ConfirmClassifyPaidPartiallyReasonAvoir=Il restante da pagare (%s %s) viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sarà regolarizzata mediante nota di credito. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Il restante da pagare (%s %s) viene scontato perché il pagamento è stato eseguito entro il termine. Accetto di perdere l'IVA sullo sconto. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Il restante da pagare (%s %s) viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sullo sconto sarà recuperata senza nota di credito. ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente moroso ConfirmClassifyPaidPartiallyReasonProductReturned=Parziale restituzione di prodotti ConfirmClassifyPaidPartiallyReasonOther=Altri motivi @@ -169,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. @@ -184,22 +182,22 @@ 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 AlreadyPaidBack=Già rimborsato AlreadyPaidNoCreditNotesNoDeposits=Già pagato (senza note di credito o depositi) Abandoned=Abbandonata -RemainderToPay=Resto da pagare +RemainderToPay=Restante da pagare RemainderToTake=Restante da incassare -RemainderToPayBack=Resto (rimanenza*) da rimborsare +RemainderToPayBack=Restante da rimborsare Rest=In attesa AmountExpected=Importo atteso ExcessReceived=Ricevuto in eccesso EscompteOffered=Sconto offerto (pagamento prima del termine) -SendBillRef=Submission of invoice %s -SendReminderBillRef=Submission of invoice %s (reminder) +SendBillRef=Invio della fattura %s +SendReminderBillRef=Invio della fattura %s (promemoria) StandingOrders=Mandati di pagamento StandingOrder=Mandato di pagamento NoDraftBills=Nessuna bozza di fatture @@ -219,19 +217,18 @@ NoInvoice=Nessuna fattura ClassifyBill=Classificazione fattura SupplierBillsToPay=Fatture fornitori da pagare CustomerBillsUnpaid=Fatture attive non pagate -DispenseMontantLettres=Le fatture redatte attraverso un processo meccanografico sono escluse dall'ordine per lettera -DispenseMontantLettres=Le fatture redatte attraverso un processo meccanografico sono escluse dall'ordine per lettera +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non recuperabile SetConditions=Imposta le condizioni di pagamento SetMode=Imposta la modalità di pagamento Billed=Fatturati -RepeatableInvoice=Fattura ripetibile -RepeatableInvoices=Fatture ripetibili -Repeatable=Ripetibile -Repeatables=Ripetibili -ChangeIntoRepeatableInvoice=Cambia in ripetibile -CreateRepeatableInvoice=Crea fattura ripetibile -CreateFromRepeatableInvoice=Crea da fattura ripetibile +RepeatableInvoice=Modello fattura +RepeatableInvoices=Modello fatture +Repeatable=Modello +Repeatables=Modelli +ChangeIntoRepeatableInvoice=Converti in modello di fattura +CreateRepeatableInvoice=Crea modello di fattura +CreateFromRepeatableInvoice=Crea da modello di fattura CustomersInvoicesAndInvoiceLines=Fatture attive e righe di fattura CustomersInvoicesAndPayments=Fatture attive e pagamenti ExportDataset_invoice_1=Elenco delle fatture attive e righe di fattura @@ -255,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 @@ -296,8 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Il totale di due nuovi sconti deve essere p ConfirmRemoveDiscount=Vuoi davvero eliminare questo sconto? RelatedBill=Fattura correlata RelatedBills=Fatture correlate -LatestRelatedBill=Latest related invoice -WarningBillExist=Warning, one or more invoice already exist +LatestRelatedBill=Ultima fattura correlata +WarningBillExist=Attenzione, una o più fatture già esistenti # PaymentConditions PaymentConditionShortRECEP=Immediato @@ -349,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 @@ -374,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/categories.lang b/htdocs/langs/it_IT/categories.lang index 64247e0aa73..0514f048fa6 100644 --- a/htdocs/langs/it_IT/categories.lang +++ b/htdocs/langs/it_IT/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Collegamenti tra fornitori e categorie CatCusLinks=Collegamenti tra clienti/clienti potenziali e categorie CatProdLinks=Collegamenti tra prodotti/servizi e categorie CatMemberLinks=Collegamenti tra membri e categorie -CatProdLinks=Collegamenti tra prodotti/servizi e categorie -CatCusLinks=Collegamenti tra clienti/clienti potenziali e categorie -CatSupLinks=Collegamenti tra fornitori e categorie DeleteFromCat=Elimina dalla categoria DeletePicture=Foto cancellata ConfirmDeletePicture=Confermi l'eliminazione della foto? @@ -111,4 +108,5 @@ ExtraFieldsCategories=Campi extra CategoriesSetup=Impostazioni categorie CategorieRecursiv=Collega automaticamente con la categoria padre CategorieRecursivHelp=Se attivata, il prodotto sarà inserito anche nella categoria padre quando lo aggiungi ad una sottocategoria -AddProductServiceIntoCategory=Add the following product/service +AddProductServiceIntoCategory=Aggiungi il seguente prodotto/servizio +ShowCategory=Show category diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang index bfb2dcd2152..d32a581c27b 100644 --- a/htdocs/langs/it_IT/compta.lang +++ b/htdocs/langs/it_IT/compta.lang @@ -108,7 +108,8 @@ ErrorWrongAccountancyCodeForCompany=Codice contabile errato per %s SuppliersProductsSellSalesTurnover=Fatturato generato dalle vendite di prodotti dei fornitori. CheckReceipt=Ricevuta di versamento assegno CheckReceiptShort=Ricevuta assegno -NewCheckReceipt=Nuovo assegno +LastCheckReceiptShort=Last %s check receipts +NewCheckReceipt=Nuovo sconto NewCheckDeposit=Nuovo deposito NewCheckDepositOn=Nuovo deposito sul conto: %s NoWaitingChecks=Nessun assegno in attesa di deposito. @@ -140,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 @@ -176,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 @@ -187,7 +188,7 @@ AccountancyDashboard=Riassunto contabilità ByProductsAndServices=Per prodotti e servizi RefExt=Referente esterno ToCreateAPredefinedInvoice=Per creare una fattura predefinita, creare una fattura standard e poi, senza convalidarla, cliccare sul pulsante "Trasforma in fattura predefinita". -LinkedOrder=Link to order +LinkedOrder=Collega a ordine ReCalculate=Ricalcola Mode1=Metodo 1 Mode2=Metodo 2 @@ -196,14 +197,10 @@ 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 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties -CloneTax=Clone a social contribution -ConfirmCloneTax=Confirm the clone of a social contribution -CloneTaxForNextMonth=Clone it for next month +CloneTax=Clona contributo sociale +ConfirmCloneTax=Conferma la clonazione del contributo sociale +CloneTaxForNextMonth=Clona nel mese successivo diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang index 53cfa41e133..30637765163 100644 --- a/htdocs/langs/it_IT/contracts.lang +++ b/htdocs/langs/it_IT/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Area contratti ListOfContracts=Elenco dei contratti -LastContracts=Ultimi % contratti +LastModifiedContracts=Last %s modified contracts AllContracts=Tutti i contratti ContractCard=Scheda contratto ContractStatus=Stato contratto @@ -27,7 +27,7 @@ MenuRunningServices=Servizi in esecuzione MenuExpiredServices=Servizi scaduti MenuClosedServices=Servizi chiusi NewContract=Nuovo contratto -AddContract=Aggiungi contratto +AddContract=Crea contratto SearchAContract=Ricerca di un contratto DeleteAContract=Eliminazione di un contratto CloseAContract=Chiudere un contratto @@ -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=Ultimi % contratti +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/cron.lang b/htdocs/langs/it_IT/cron.lang index 23216ac8525..ec7f4e2cba5 100644 --- a/htdocs/langs/it_IT/cron.lang +++ b/htdocs/langs/it_IT/cron.lang @@ -1,22 +1,14 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = Info CronAbout = Info su Cron CronAboutPage = Pagina informativa su Cron - -# # Right -# Permission23101 = Leggi compito programmato Permission23102 = Crea/aggiorna compito programmato Permission23103 = Cancella compito programmato Permission23104 = Esegui compito programmato - -# # Admin -# CronSetup= Impostazione delle azioni pianificate URLToLaunchCronJobs=URL che lancia i job di cron OrToLaunchASpecificJob=O per lanciare un job specifico @@ -24,20 +16,11 @@ KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i job di cron FileToLaunchCronJobs=Comando per lanciare i job di cron CronExplainHowToRunUnix=In ambienti Unix dovresti usare crontab per lanciare il comando ogni minuto CronExplainHowToRunWin=In ambienti Microsoft(tm) Windows dovresti usare Operazioni Pianificate per lanciare il comando ogni minuto - - -# # Menu -# CronJobs=Azioni pianificate -CronListActive= Lista dei job attivi -CronListInactive= Lista dei job disabilitati -CronListActive= Lista dei job attivi - - -# +CronListActive=List of active/scheduled jobs +CronListInactive=Lista dei job disabilitati # Page list -# CronDateLastRun=Ultimo avvio CronLastOutput=Output dell'ultimo avvio CronLastResult=Codice del risultato dell'ultima esecuzione @@ -70,10 +53,7 @@ CronLabel=Descrizione CronNbRun=Num. lancio CronEach=Ogni JobFinished=Azione eseguita e completata - -# #Page card -# CronAdd= Aggiungi job CronHourStart= Ora e data di inizio del compito CronEvery= Ed esegui il compito ogni @@ -95,20 +75,12 @@ CronObjectHelp=Nome dell'oggetto da caricare.
    Per esempio per ottenere il me CronMethodHelp=Nome del metodo dell'oggetto da eseguire.
    Per esempio per ottenere il metodo dell'oggetto /htdocs/product/class/product.class.php, il valore da inserire è fetch CronArgsHelp=Argomenti del metodo.
    Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/product.class.php, il valore dei parametri può essere 0, ProductRef CronCommandHelp=Il comando da eseguire sul sistema - -# # Info -# CronInfoPage=Informazioni - - -# # Common -# CronType=Tipo di compito CronType_method=Metodo di chiamata di una classe Dolibarr CronType_command=Comando da shell CronMenu=Cron CronCannotLoadClass=Non posso caricare la classe %s o l'oggetto %s - UseMenuModuleToolsToAddCronJobs=Andare nel menu "Home - Modules tools - Job list" per vedere e modificare le azioni pianificate. diff --git a/htdocs/langs/it_IT/donations.lang b/htdocs/langs/it_IT/donations.lang index ded531e8257..6ee8837eeeb 100644 --- a/htdocs/langs/it_IT/donations.lang +++ b/htdocs/langs/it_IT/donations.lang @@ -4,7 +4,7 @@ Donations=Donazioni DonationRef=Riferimento donazione Donor=Donatore Donors=Donatori -AddDonation=Aggiungi una donazione +AddDonation=Crea donazione NewDonation=Nuova donazione ShowDonation=Visualizza donazione DonationPromise=Donazione promessa @@ -30,4 +30,9 @@ SearchADonation=Cerca una donazione DonationRecipient=Ricevente della donazione ThankYou=Grazie IConfirmDonationReception=Si dichiara di aver ricevuto la seguente cifra a titolo di donazione -MinimumAmount=Minimum amount is %s +MinimumAmount=L'importo minimo è %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/it_IT/externalsite.lang index 97b50d4d88f..415726fc9d1 100644 --- a/htdocs/langs/it_IT/externalsite.lang +++ b/htdocs/langs/it_IT/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Imposta collegamento a sito esterno ExternalSiteURL=Indirizzo del sito esterno ExternalSiteModuleNotComplete=Il modulo ExternalSite non è configurato correttamente. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang index 4b9e159118a..b1ffbd72fb4 100644 --- a/htdocs/langs/it_IT/holiday.lang +++ b/htdocs/langs/it_IT/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Aggiorna CantUpdate=You cannot update this leave request. NoDateDebut=Bisogna selezionare una data di inizio. NoDateFin=Bisogna selezionare una data di fine. -ErrorDureeCP=La tua richiesta di ferie non comprende giorni lavorativi. -TitleValidCP=Approva la richiesta di ferie +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Data approvazione TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Rifiuta la richiesta +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Devi indicare un motivo per il rifiuto. -TitleCancelCP=Annulla la richiesta +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Motivo del rifiuto DateRefusCP=Data del rifiuto @@ -78,7 +77,7 @@ ActionByCP=Eseguito da UserUpdateCP=Per l'utente PrevSoldeCP=Saldo precedente NewSoldeCP=Nuovo saldo -alreadyCPexist=C'è già una richiesta per lo stesso periodo. +alreadyCPexist=A leave request has already been done on this period. UserName=Nome Employee=Dipendente FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Aggiornamento manuale HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configurazione del modulo ferie +ConfCP=Configuration of leave request module DescOptionCP=Descrizione dell'opzione ValueOptionCP=Valore -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Convalida la configurazione -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Aggiornato con successo ErrorUpdateConfCP=Si è verificato un errore nell'aggiornamento, riprovare. -AddCPforUsers=Aggiornare le ferie residue dell'utente facendo click qui. -DelayForSubmitCP=Scadenza per l'inoltro di richieste ferie -AlertapprobatortorDelayCP=Impedisci l'approvazione delle ferie se la richiesta non corrisponde alla deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Convalida UpdateEventCP=Aggiorna eventi diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang index 0ac023215ce..3257a4c01cd 100644 --- a/htdocs/langs/it_IT/interventions.lang +++ b/htdocs/langs/it_IT/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervento Interventions=Interventi InterventionCard=Scheda intervento NewIntervention=Nuovo intervento -AddIntervention=Aggiungi intervento +AddIntervention=Crea intervento ListOfInterventions=Elenco degli interventi EditIntervention=Modifica intervento ActionsOnFicheInter=Azioni di intervento @@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Nome e firma del partecipante: NameAndSignatureOfExternalContact=Nome e firma del cliente: DocumentModelStandard=Modello documento standard per gli interventi InterventionCardsAndInterventionLines=Interventi e righe degli interventi -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +InterventionClassifyBilled=Classifica come "Fatturato" +InterventionClassifyUnBilled=Classifica come "Non fatturato" StatusInterInvoiced=Fatturato RelatedInterventions=Interventi correlati ShowIntervention=Mostra intervento SendInterventionRef=Invio di intervento %s +SendInterventionByMail=Invia intervento via email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsabile follow-up per l'intervento TypeContact_fichinter_internal_INTERVENING=Intervento effettuato da diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang index 2d67e314cbb..9e5b6c21480 100644 --- a/htdocs/langs/it_IT/mails.lang +++ b/htdocs/langs/it_IT/mails.lang @@ -115,7 +115,7 @@ SentBy=Inviato da MailingNeedCommand=Per motivi di sicurezza è preveribile inviare mail di massa da linea di comando. Se possibile chiedi all amministratore del server di eseguire il seguente comando per inivare le mail a tutti i destinatari: MailingNeedCommand2=Puoi inviare comunque online aggiungendo il parametro MAILING_LIMIT_SENDBYWEB impostato al valore massimo corrispondente al numero di email che si desidera inviare durante una sessione. ConfirmSendingEmailing=Se non puoi o preferisci inviarle dal tuo browser web, perfavore confermi che sei sicuro che vuoi inviare adesso le mail dal tuo browser? -LimitSendingEmailing=Nota: L'invio di email è soggetto a limitazioni per ragioni di sicurezza e di timeout a %s destinatari per ogni sessione di invio +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Cancella elenco ToClearAllRecipientsClickHere=Per cancellare l'elenco destinatari per questa email, cliccare sul pulsante ToAddRecipientsChooseHere=Per aggiungere i destinatari, scegliere da questi elenchi @@ -133,6 +133,9 @@ Notifications=Notifiche NoNotificationsWillBeSent=Non sono previste notifiche per questo evento o società ANotificationsWillBeSent=Verrà inviata una notifica via email SomeNotificationsWillBeSent=%s notifiche saranno inviate via email -AddNewNotification=Attivare una nuova richiesta di notifica -ListOfActiveNotifications=Elenco delle notifiche attive +AddNewNotification=Attiva una nuova richiesta di notifica via email +ListOfActiveNotifications=Mostra tutte le richieste di notifica via email attive ListOfNotificationsDone=Elenco delle notifiche spedite per email +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index 2ec03c3a1e3..233e0712249 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossibile trovare l'utente %s nel ErrorNoVATRateDefinedForSellerCountry=Errore, non sono state definite le aliquote IVA per: %s. ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi di contributi per: %s. ErrorFailedToSaveFile=Errore, file non salvato. -ErrorOnlyPngJpgSupported=Errore, sono supportati solo i formati png e jpg. -ErrorImageFormatNotSupported=PHP non supporta funzioni per convertire immagini in questo formato. SetDate=Imposta data SelectDate=Seleziona una data SeeAlso=Vedi anche %s BackgroundColorByDefault=Colore di sfondo predefinito +FileNotUploaded=Il file non è stato caricato +FileUploaded=Il file è stato caricato con successo FileWasNotUploaded=Il file selezionato per l'upload non è stato ancora caricato. Clicca su Allega file per farlo NbOfEntries=Numero di voci GoToWikiHelpPage=Leggi la guida in linea (Su internet) @@ -188,8 +188,8 @@ MultiLanguage=Multilingua Note=Nota CurrentNote=Nota corrente Title=Titolo -Label=Etichetta -RefOrLabel=Rif. o etichetta +Label=Titolo +RefOrLabel=Rif. o titolo Info=Info Family=Famiglia Description=Descrizione @@ -266,6 +266,7 @@ Afternoon=Pomeriggio Quadri=Trimestre MonthOfDay=Mese del giorno HourShort=Ora +MinuteShort=min Rate=Tariffa UseLocalTax=Tasse incluse Bytes=Byte @@ -340,6 +341,7 @@ FullList=Elenco completo Statistics=Statistiche OtherStatistics=Altre statistiche Status=Stato +Favorite=Preferito ShortInfo=Info. Ref=Rif. RefSupplier=Rif. fornitore @@ -365,6 +367,7 @@ ActionsOnCompany=Azioni sul soggetto terzo ActionsOnMember=Azioni su questo membro NActions=%s azioni NActionsLate=%s azioni in ritardo +RequestAlreadyDone=Request already recorded Filter=Filtro RemoveFilter=Rimuovi filtro ChartGenerated=Grafico generato @@ -645,6 +648,7 @@ OptionalFieldsSetup=Impostazione attributi extra URLPhoto=URL foto/logo SetLinkToThirdParty=Collega ad altro soggetto terzo CreateDraft=Crea bozza +SetToDraft=Ritorna a bozza ClickToEdit=Clicca per modificare ObjectDeleted=Oggetto %s eliminato ByCountry=Per paese @@ -678,7 +682,7 @@ ViewPrivateNote=Vedi note XMoreLines=%s linea(e) nascoste PublicUrl=URL pubblico AddBox=Aggiungi box - +SelectElementAndClickRefresh=Seleziona un elemento e clicca Aggiorna # Week day Monday=Lunedì Tuesday=Martedì diff --git a/htdocs/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang index 34437cd4d58..aa4a9f6ab55 100644 --- a/htdocs/langs/it_IT/margins.lang +++ b/htdocs/langs/it_IT/margins.lang @@ -38,4 +38,7 @@ BuyingCost=Prezzo di costo UnitCharges=Carico unitario Charges=Carichi AgentContactType=Tipo di contatto per i mandati di vendita -AgentContactTypeDetails=Definisci che tipo di contatto (connesso alle fatture) associare agli agenti commerciali +AgentContactTypeDetails=Definisci quali tipi di contatto (collegati alle fatture) saranno utilizzati per i report per ciascun rappresentante di vendita +rateMustBeNumeric=Il rapporto deve essere un numero +markRateShouldBeLesserThan100=Il rapporto deve essere inferiore a 100 +ShowMarginInfos=Show margin infos 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 449d6c6d070..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=Ordini da fatturare +MenuOrdersToBill2=Ordini fatturabili SearchOrder=Ricerca ordine SearchACustomerOrder=Cerca un ordine cliente ShipProduct=Spedisci prodotto @@ -65,7 +65,7 @@ ValidateOrder=Convalida ordine UnvalidateOrder=Invalida ordine DeleteOrder=Elimina ordine CancelOrder=Annulla ordine -AddOrder=Aggiungi ordine +AddOrder=Crea ordine AddToMyOrders=Aggiungi ai miei ordini AddToOtherOrders=Aggiungi ad altri ordini AddToDraftOrders=Aggiungi ad una bozza d'ordine @@ -154,7 +154,6 @@ OrderByPhone=Telefono CreateInvoiceForThisCustomer=Ordini da fatturare NoOrdersToInvoice=Nessun ordine fatturabile CloseProcessedOrdersAutomatically=Classifica come "Lavorati" tutti gli ordini selezionati -MenuOrdersToBill2=Ordini da fatturare OrderCreation=Creazione di ordine Ordered=Ordinato OrderCreated=I tuoi ordini sono stati creati diff --git a/htdocs/langs/it_IT/oscommerce.lang b/htdocs/langs/it_IT/oscommerce.lang deleted file mode 100644 index 7d95f16abd9..00000000000 --- a/htdocs/langs/it_IT/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Impostazioni modulo OS Commerce -OSCommerceSetupSaved=Impostazioni OS Commerce salvate -OSCommerceServer=Host/IP del server OS Commerce -OSCommerceDatabaseName=Nome database OS Commerce -OSCommercePrefix=Prefisso tabelle database OS Commerce -OSCommerceUser=Nome utente per il database di OS Commerce diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang index fa0495ebc9c..156441b3cd8 100644 --- a/htdocs/langs/it_IT/other.lang +++ b/htdocs/langs/it_IT/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Codice di sicurezza Calendar=Calendario -AddTrip=Aggiungi viaggio Tools=Strumenti ToolsDesc=Quest'area è dedicata agli strumenti di gruppo non disponibili in varie voci di menu.

    Questi strumenti sono raggiungibili dal menu laterale. Birthday=Compleanno @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Creazione del progetto Notify_TASK_CREATE=Attività creata Notify_TASK_MODIFY=Attività modificata Notify_TASK_DELETE=Attività cancellata +SeeModuleSetup=See module setup NbOfAttachedFiles=Numero di file/documenti allegati TotalSizeOfAttachedFiles=Dimensione totale dei file/documenti allegati MaxSize=La dimensione massima è @@ -57,12 +57,12 @@ Miscellaneous=Varie NbOfActiveNotifications=Numero di notifiche attive PredefinedMailTest=Questa è una mail di prova. \\NLe due linee sono separate da un a capo. PredefinedMailTestHtml=Questa è una mail di test (la parola test deve risultare in grassetto).
    Le due linee sono separate da un a capo. -PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nAlleghiamo la fattura __FACREF__\n\n__PERSONALIZED__Cordiali saluti\n\n__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura numero __FACREF__\n\n__PERSONALIZED__Cordiali saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \nVorremmo portare alla Vostra attenzione che la fattura __FACREF__ sembra non essere stata saldata. La fattura è allegata alla presente, come promemoria.\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nAlleghiamo la proposta commerciale __PROPREF__ \n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nAlleghiamo l'ordine __ORDERREF__\n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nAlleghiamo il nostro ordine __ORDERREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nAlleghiamo la fattura __FACREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura __FACREF__\n\n__PERSONALIZED__Cordiali Saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n__SIGNATURE__ PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nAlleghiamo il documento di trasporto __SHIPPINGREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nAlleghiamo l'intervento __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ @@ -80,6 +80,16 @@ ModifiedBy=Modificato da %s ValidatedBy=Convalidato da %s CanceledBy=Annullato da %s ClosedBy=Chiuso da %s +CreatedById=Id utente che ha creato +ModifiedById=Id utente che ha effettuato l'ultima modifica +ValidatedById=Id utente che ha validato +CanceledById=Id utente che ha cancellato +ClosedById=Id utente che ha chiuso +CreatedByLogin=Id utente che ha creato +ModifiedByLogin=Login utente che ha effettuato l'ultima modifica +ValidatedByLogin=Login utente che ha validato +CanceledByLogin=Login utente che ha cancellato +ClosedByLogin=Login utente che ha chiuso FileWasRemoved=Il file è stato eliminato DirWasRemoved=La directory è stata rimossa FeatureNotYetAvailableShort=Disponibile in una versione successiva @@ -193,25 +203,26 @@ ForgetIfNothing=Se non hai richiesto questo cambio, lascia perdere questa mail. ##### Calendar common ##### AddCalendarEntry=Aggiungi evento al calendario %s -NewCompanyToDolibarr=Azienda %s aggiunta su Dolibarr -ContractValidatedInDolibarr=Contratto %s convalidato su Dolibarr -ContractCanceledInDolibarr=Contratto %s annullato su Dolibarr -ContractClosedInDolibarr=Contratto %s chiuso su Dolibarr -PropalClosedSignedInDolibarr=%s proposte firmate in Dolibarr -PropalClosedRefusedInDolibarr=%s proposte rifiutate in Dolibarr -PropalValidatedInDolibarr=%s proposte convalidate in Dolibarr -InvoiceValidatedInDolibarr=Fattura %s convalidata su Dolibarr -InvoicePaidInDolibarr=Fattura %s pagata su Dolibarr -InvoiceCanceledInDolibarr=Fattura %s annullata su Dolibarr -PaymentDoneInDolibarr=Pagamenti %s fatto su Dolibarr -CustomerPaymentDoneInDolibarr=Pagamento cliente %s fatto su Dolibarr -SupplierPaymentDoneInDolibarr=%s pagamenti ai fornitori in Dolibarr -MemberValidatedInDolibarr=Membro %s convalidato su Dolibarr -MemberResiliatedInDolibarr=Membro %s revocato su Dolibarr -MemberDeletedInDolibarr=Membro eliminato da Dolibarr -MemberSubscriptionAddedInDolibarr=Adesione membro %s aggiunta a Dolibarr -ShipmentValidatedInDolibarr=%s spedizioni convalidate in Dolibarr -ShipmentDeletedInDolibarr=Spedizione %s cancellate +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Esportazione ExportsArea=Area esportazioni diff --git a/htdocs/langs/it_IT/paybox.lang b/htdocs/langs/it_IT/paybox.lang index d52755de120..29db612c9be 100644 --- a/htdocs/langs/it_IT/paybox.lang +++ b/htdocs/langs/it_IT/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Messaggio sulla pagina di pagamento annullato NewPayboxPaymentReceived=Nuovo pagamento Paybox ricevuto NewPayboxPaymentFailed=Nuovo tentativo di pagamento Paybox ma fallito PAYBOX_PAYONLINE_SENDEMAIL=Email di avviso dopo il pagamento (a buon fine o no) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID 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/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 new file mode 100644 index 00000000000..ec76b191873 --- /dev/null +++ b/htdocs/langs/it_IT/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Risorse +MenuResourceAdd=Nuova risorsa +MenuResourcePlanning=Resource planning +DeleteResource=Elimina risorsa +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=Nessuna risorsa nel database +NoResourceLinked=Nessuna risorsa collegata + +ResourcePageIndex=Elenco delle risorse +ResourceSingular=Risorsa +ResourceCard=Resource card +AddResource=Crea una risorsa +ResourceFormLabel_ref=Nome della risorsa +ResourceType=Tipo di risorsa +ResourceFormLabel_description=Descrizione della risorsa + +ResourcesLinkedToElement=Risorse collegate all'elemento + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +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=Conferma l'eliminazione di questa risorsa +RessourceSuccessfullyDeleted=Risorsa eliminata con successo +DictionaryResourceType=Tipo di risorse + +SelectResource=Seleziona risorse diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang index cb2335390d6..96c7036a771 100644 --- a/htdocs/langs/it_IT/sendings.lang +++ b/htdocs/langs/it_IT/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Per il momento, la creazione di una nuova spediz RelatedShippings=Spedizioni collegate ShipmentLine=Filiera di spedizione CarrierList=Elenco dei trasportatori +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Ritiro da parte del Cliente @@ -74,5 +76,5 @@ SumOfProductVolumes=Totale volume prodotti SumOfProductWeights=Totale peso prodotti # warehouse details -DetailWarehouseNumber= Warehouse details -DetailWarehouseFormat= W:%s (Qty : %d) +DetailWarehouseNumber= Dettagli magazzino +DetailWarehouseFormat= Peso:%s (Qtà : %d) diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang index d5dab356e12..657ddbc4eb8 100644 --- a/htdocs/langs/it_IT/stocks.lang +++ b/htdocs/langs/it_IT/stocks.lang @@ -14,16 +14,16 @@ WarehouseTarget=Magazzino di destinazione ValidateSending=Convalida spedizione CancelSending=Annulla spedizione DeleteSending=Elimina spedizione -Stock=Scorta +Stock=Scorte Stocks=Scorte Movement=Movimento Movements=Movimenti ErrorWarehouseRefRequired=Riferimento magazzino mancante ErrorWarehouseLabelRequired=Etichetta del magazzino mancante -CorrectStock=Scorte di magazzino corrette +CorrectStock=Variazione manuale scorte ListOfWarehouses=Elenco magazzini ListOfStockMovements=Elenco movimenti delle scorte -StocksArea=Area scorte di magazzino +StocksArea=Warehouses area Location=Ubicazione LocationSummary=Ubicazione abbreviata NumberOfDifferentProducts=Numero di differenti prodotti @@ -32,9 +32,9 @@ LastMovement=Ultimo movimento LastMovements=Ultimi movimenti Units=Unità Unit=Unità -StockCorrection=Correzione scorte +StockCorrection=Variazione manuale scorte StockTransfer=Movimento scorte -StockMovement=Movimento scorta +StockMovement=Movimento scorte StockMovements=Movimenti scorte LabelMovement=Etichetta del movimento NumberOfUnit=Numero di unità @@ -59,18 +59,18 @@ ReStockOnValidateOrder=Aumenta scorte effettive alla convalida dell'ordine ReStockOnDispatchOrder=Incrementa scorte effettive alla consegna manuale in magazzino, dopo il ricevimento dell'ordine fornitore ReStockOnDeleteInvoice=Aumenta scorte effettive alla cancellazione della fattura OrderStatusNotReadyToDispatch=Lo stato dell'ordine non ne consente la spedizione dei prodotti a magazzino. -StockDiffPhysicTeoric=Motivo della differenza tra scorta effettiva e teorica -NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti impostati. Quindi non è necessario alterare la scorta. +StockDiffPhysicTeoric=Motivo della differenza tra scorte effettive e teoriche +NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti impostati. Quindi non è necessario alterare le scorte. DispatchVerb=Spedizione StockLimitShort=Limite per segnalazioni -StockLimit=Limite minimo scorta per segnalazioni -PhysicalStock=Scorta fisica -RealStock=Scorta reale -VirtualStock=Scorta virtuale -MininumStock=Scorta minima -StockUp=Scorta massima -MininumStockShort=Scorta min -StockUpShort=Scorta max +StockLimit=Limite minimo scorte per avvertimenti +PhysicalStock=Scorte fisiche +RealStock=Scorte reali +VirtualStock=Scorte virtuali +MininumStock=Scorte minime +StockUp=Scorte massime +MininumStockShort=Scorte min +StockUpShort=Scorte max IdWarehouse=Id magazzino DescWareHouse=Descrizione magazzino LieuWareHouse=Ubicazione magazzino @@ -84,19 +84,19 @@ EstimatedStockValueShort=Valore stimato scorte EstimatedStockValue=Valore stimato delle scorte DeleteAWarehouse=Elimina un magazzino ConfirmDeleteWarehouse=Sei sicuro di voler eliminare il magazzino %s? -PersonalStock=Scorta personale %s +PersonalStock=Scorte personali %s ThisWarehouseIsPersonalStock=Questo magazzino rappresenta la riserva personale di %s %s SelectWarehouseForStockDecrease=Scegli magazzino da utilizzare per la riduzione delle scorte SelectWarehouseForStockIncrease=Scegli magazzino da utilizzare per l'aumento delle scorte -NoStockAction=Nessuna azione su questa scorta +NoStockAction=Nessuna azione su queste scorte LastWaitingSupplierOrders=Ordini in attesa di ricezione -DesiredStock=Scorta desiderata +DesiredStock=Scorte desiderate StockToBuy=Da ordinare Replenishment=Rifornimento ReplenishmentOrders=Ordini di rifornimento VirtualDiffersFromPhysical=In accordo con le opzioni di giacenza incrementa/decrementa, le scorte fisiche e quelle virtuali (fisiche + ordini in corso) possono variare UseVirtualStockByDefault=Utilizza scorte virtuali come default, invece delle scorte fisiche, per la funzione di rifornimento -UseVirtualStock=Usa scorta virtuale +UseVirtualStock=Usa scorte virtuale UsePhysicalStock=Usa giacenza fisica CurentSelectionMode=Modalità di selezione corrente CurentlyUsingVirtualStock=Giacenza virtuale diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang index 9a4c183cfca..2f75b5f6094 100644 --- a/htdocs/langs/it_IT/users.lang +++ b/htdocs/langs/it_IT/users.lang @@ -63,7 +63,6 @@ ShowGroup=Visualizza gruppo ShowUser=Visualizza utente NonAffectedUsers=Utenti non interessati UserModified=Utente modificato con successo -GroupModified=Gruppo modificato con successo PhotoFile=File Immagine UserWithDolibarrAccess=Utente con accesso Dolibarr ListOfUsersInGroup=Elenco utenti in questo gruppo @@ -103,7 +102,7 @@ UserDisabled=Utente %s disattivato UserEnabled=Utente %s attivato UserDeleted=Utente %s rimosso NewGroupCreated=Gruppo %s creato -GroupModified=Gruppo modificato con successo +GroupModified=Group %s modified GroupDeleted=Gruppo %s rimosso ConfirmCreateContact=Vuoi davvero creare un account Dolibarr per questo contatto? ConfirmCreateLogin=Vuoi davvero creare l'account? @@ -114,8 +113,10 @@ YourRole=Il tuo ruolo YourQuotaOfUsersIsReached=Hai raggiunto la tua quota di utenti attivi! NbOfUsers=Numero di utenti DontDowngradeSuperAdmin=Solo un superadmin può declassare un superadmin -HierarchicalResponsible=Responsabile gerarchico +HierarchicalResponsible=Supervisore HierarchicView=Vista gerarchica UseTypeFieldToChange=cambia usando il campo Tipo OpenIDURL=URL OpenID LoginUsingOpenID=URL OpenID per il login +WeeklyHours=Ore settimanali +ColorUser=Colore dell'utente diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang index fd19170c5f4..ae26dee0a4c 100644 --- a/htdocs/langs/it_IT/withdrawals.lang +++ b/htdocs/langs/it_IT/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Ricevuta LastWithdrawalReceipts=Ultime %s ricevute di domiciliazione WithdrawedBills=Fatture delle domiciliazioni WithdrawalsLines=Righe dei domiciliazioni -RequestStandingOrderToTreat=Richiesta ordini permanenti da trattare -RequestStandingOrderTreated=Richiesta ordini permanenti trattati +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Ordini permanenti clienti CustomerStandingOrder=Ordine permanente cliente NbOfInvoiceToWithdraw=Numero di fattura con richiesta di prelievo @@ -40,14 +41,13 @@ TransMetod=Metodo di trasmissione Send=Invia Lines=Righe StandingOrderReject=Invia rifiuto -InvoiceRefused=Fattura rifiutata WithdrawalRefused=Bonifici rifiutati WithdrawalRefusedConfirm=Vuoi davvero inserire un rifiuto per la società? RefusedData=Data del rifiuto RefusedReason=Motivo del rifiuto RefusedInvoicing=Fatturazione rifiutata NoInvoiceRefused=Non ricaricare il rifiuto -InvoiceRefused=Fattura rifiutata +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Stato StatusUnknown=Sconosciuto StatusWaiting=In attesa @@ -76,13 +76,14 @@ WithBankUsingRIB=Per i conti correnti bancari che utilizzano RIB WithBankUsingBANBIC=Per conti bancari che utilizzano IBAN/BIC/SWIFT BankToReceiveWithdraw=Conto corrente bancario per il domiciliazione CreditDate=Data di accredito -WithdrawalFileNotCapable=Impossibile generare file di ricevuta per il vostro paese +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/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/ja_JP/accountancy.lang +++ b/htdocs/langs/ja_JP/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index afa19d9eb9c..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=利用可能なボックス @@ -437,14 +440,14 @@ Module52Name=ストック Module52Desc=製品の在庫の管理 Module53Name=サービス Module53Desc=サービスの管理 -Module54Name=契約 -Module54Desc=契約のサービスの管理 +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=バーコード 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=プロジェクト -Module400Desc=他のモジュール内のプロジェクトの管理 +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=通知 -Module600Desc=サードパーティの連絡先にいくつかのDolibarrのビジネスイベントを電子メールで通知を送信 +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=寄付 Module700Desc=寄付金の管理 Module1200Name=カマキリ @@ -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 @@ -514,20 +521,20 @@ Module5000Name=マルチ会社 Module5000Desc=あなたが複数の企業を管理することができます Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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=売上高のポイント Module50100Desc=販売モジュールのポイント -Module50200Name= ペイパル -Module50200Desc= Paypalとクレジットカードによるオンライン決済のページを提供するモジュール +Module50200Name=ペイパル +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 @@ -606,15 +613,16 @@ Permission151=立って注文を読み取る Permission152=立っている注文要求を作成する/変更 Permission153=伝送に立って注文の領収書 Permission154=クレジット/拒否立って注文の領収書 -Permission161=契約をお読みください -Permission162=契約書を作成/変更 -Permission163=契約のサービスをアクティブにする -Permission164=契約のサービスを無効にします。 -Permission165=契約を削除する -Permission171=出張を読む -Permission172=ツアーを作成/変更 -Permission173=ツアーを削除します。 -Permission178=輸出旅行 +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=仕入先を読む Permission181=サプライヤーの受注を読む Permission182=作成/変更サプライヤーの受注 @@ -671,7 +679,7 @@ Permission300=バーコードを読み取る Permission301=バーコードを作成/変更 Permission302=バーコードを削除します。 Permission311=サービスを読む -Permission312=契約にサービスを割り当てる +Permission312=Assign service/subscription to contract Permission331=ブックマークを読み込む Permission332=ブックマークを作成/変更 Permission333=ブックマークを削除 @@ -701,8 +709,8 @@ Permission701=寄付を読む Permission702=寄付を作成/変更 Permission703=寄付を削除します。 Permission1001=株式を読む -Permission1002=株を作成/変更 -Permission1003=銘柄を削除します。 +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=株式の動きを読む Permission1005=株式の動きを作成/変更 Permission1101=配信の注文をお読みください @@ -778,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 @@ -887,6 +896,7 @@ PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム DefaultLanguage=使用する既定の言語（言語コード） EnableMultilangInterface=多言語のインターフェイスをイネーブルにします。 EnableShowLogo=左メニューのロゴを表示する +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=お使いのシステムは正常に更新されました CompanyInfo=会社概要/基礎情報 CompanyIds=会社概要/基礎アイデンティティ @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=によって建てられた会計コードを返しま ModuleCompanyCodePanicum=空の会計コードを返します。 ModuleCompanyCodeDigitaria=会計コードがサードパーティのコードに依存しています。コー​​ドは、文字サードパーティのコードの最初の5文字が続く最初の位置に "C"で構成されています。 UseNotifications=通知を使用する -NotificationsDesc=電子メール通知機能を使用すると、静かにするように構成されている第三者（顧客またはサプライヤー）に、いくつかのDolibarrイベントを、自動メールを送信することができます。アクティブな通知とターゲットの連絡先の選択は、一度に1つのサードパーティ製されています。 +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=ドキュメントテンプレート DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=ドラフト文書に透かし @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=配達日の能力を追加します。 UseOptionLineIfNoQuantity=ゼロ量と製品/サービスのラインは、オプションとして考えられている FreeLegalTextOnProposal=商業的な提案でフリーテキスト WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=注文の管理セットアップ OrdersNumberingModules=モジュールの番号受注 @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=、近くに提案した後に順序を検証するために、それは暫定的な順序でステップ実行しないように可能になります FreeLegalTextOnOrders=受注上のフリーテキスト WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=モジュールのセットアップをダイヤルする]をクリックします ClickToDialUrlDesc=電話ピクトをクリックしが行われるときに、URLと呼ばれる。 URLでは、タグを使用することができます
    呼び出すために人の電話番号に置き換えられます__PHONETO__
    呼び出し人の電話番号（あなた）に置き換えられます__PHONEFROM__
    あなたのclicktodialログイン（ユーザーカードに定義されています）に置き換えられます__LOGIN__
    あなたのclicktodialパスワード（ユーザーカードに定義されています）に置き換えられます__PASS__。 @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=介入番号モジュール TemplatePDFInterventions=介入カードのドキュメントモデル WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=契約のモジュールのセットアップ +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=モジュールの番号付けの契約 TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=製品モジュールのセットアップ ServiceSetup=サービスモジュールのセットアップ @@ -1382,9 +1393,10 @@ MailingSetup=モジュールのセットアップをメールで送信 MailingEMailFrom=モジュールをメールで送信された電子メールの送信者メールアドレス（から） MailingEMailError=エラーが発生した電子メールの電子メールを（エラー·ツー）を返します。 ##### Notification ##### -NotificationSetup=通知BUメールモジュールのセットアップ +NotificationSetup=EMail notification module setup NotificationEMailFrom=通知の送信メールの送信者の電子メール（から） -ListOfAvailableNotifications=利用可能な通知のリスト（このリストには、アクティブモジュールに依存します） +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=送信モジュールのセットアップ SendingsReceiptModel=領収書のモデルを送信する @@ -1412,8 +1424,9 @@ OSCommerceTestOk=ユーザー '%s'成功したデータベース "%s" OSCommerceTestKo1=サーバー '%s'への接続が成功しますが、データベース '%s'は到達できませんでした。 OSCommerceTestKo2=ユーザー '%s'でサーバー '%s'への接続に失敗しました。 ##### Stock ##### -StockSetup=コンフィギュレーションモジュールの株式 -UserWarehouse=ユーザー個人の株式を使用 +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=メニューを削除 TreeMenu=ツリーメニュー @@ -1478,11 +1491,14 @@ ClickToDialDesc=このモジュールは、電話番号の後にアイコンを ##### Point Of Sales (CashDesk) ##### CashDesk=売上高のポイント CashDeskSetup=販売モジュールのセットアップのポイント -CashDeskThirdPartyForSell=販売して使用する一般的なサードパーティ +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=現金支払いを受け取るために使用するデフォルトのアカウント CashDeskBankAccountForCheque= 小切手による支払いを受け取るために使用するデフォルトのアカウント CashDeskBankAccountForCB= クレジットカードでの現金支払いを受け取るために使用するデフォルトのアカウント -CashDeskIdWareHouse=販売して使用する倉庫 +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. ##### Bookmark ##### BookmarkSetup=モジュールのセットアップをブックマーク BookmarkDesc=このモジュールは、ブックマークを管理することができます。また、あなたの左のメニュー上の任意のDolibarrページまたはexternale Webサイトへのショートカットを追加することができます。 @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang index 22464bdc31a..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=リストビュー @@ -41,9 +42,10 @@ AutoActions= 議題の自動充填 AgendaAutoActionDesc= ここではDolibarrが自動的に議題でイベントを作成するイベントを定義します。何も（デフォルトで）チェックされていない場合のみ、手動アクションが議題に含まれています。 AgendaSetupOtherDesc= このページでは、外部のカレンダーにあなたのDolibarrイベントのエクスポートを許可するオプションが用意されています（サンダーバード、Googleカレンダー、...） AgendaExtSitesDesc=このページでは、Dolibarrの議題にそれらのイベントを表示するにはカレンダーの外部ソースを宣言することができます。 -ActionsEvents= Dolibarrが自動的に議題でアクションを作成する対象のイベント -PropalValidatedInDolibarr= 提案%sは、検証 -InvoiceValidatedInDolibarr= 請求書%sは、検証 +ActionsEvents=Dolibarrが自動的に議題でアクションを作成する対象のイベント +PropalValidatedInDolibarr=提案%sは、検証 +InvoiceValidatedInDolibarr=請求書%sは、検証 +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=請求書%sはドラフトの状態に戻って InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= 注文%sは、検証 @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=注文%sは、承認された OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=注文%sは、ドラフトの状態に戻って OrderCanceledInDolibarr=ご注文はキャンセル%s -InterventionValidatedInDolibarr=介入%sは、検証 ProposalSentByEMail=電子メールで送信商業提案%s OrderSentByEMail=電子メールで送信、顧客の注文%s InvoiceSentByEMail=電子メールで送信顧客の請求書%s @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=電子メールで送信サプライヤの注文%s SupplierInvoiceSentByEMail=電子メールで送信サプライヤの請求書%s ShippingSentByEMail=電子メールで送信出荷%s ShippingValidated= Shipping %s validated -InterventionSentByEMail=電子メールで送信介入%s -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= 第三者が作成した DateActionPlannedStart= 計画開始日 DateActionPlannedEnd= 計画終了日 @@ -70,9 +69,9 @@ DateActionStart= 開始日 DateActionEnd= 終了日 AgendaUrlOptions1=また、出力をフィルタリングするには、次のパラメータを追加することができます。 AgendaUrlOptions2=ログインは= %sに影響を受けた、またはユーザー%sによって行われ、作成されたアクションに出力を制限する。 -AgendaUrlOptions3=ユーザー%sによって作成されたアクションに出力を制限loginA に= %s。 +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=ユーザー%sに影響を受けたアクションに出力を制限するlogint = %s。 -AgendaUrlOptions5=ユーザー%sによって行われたアクションへの出力を制限するlogind = %s。 +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=誕生日の連絡先を表示する AgendaHideBirthdayEvents=誕生日の接点を隠す Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=。iCalファイルにアクセスするためのURL ExtSiteNoLabel=全く説明がありません WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang index d73b54103b9..cf608e4a380 100644 --- a/htdocs/langs/ja_JP/bills.lang +++ b/htdocs/langs/ja_JP/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=クレジットメモ InvoiceAvoirAsk=請求書を訂正するためにクレジットノート InvoiceAvoirDesc=クレジット·ノートでは、請求書が実際に支払った量よりも異なります（顧客がエラーによってあまりにも多くを支払った、または彼が例えば、いくつかの製品が返されましたので、完全に支払われないため）量を持っているという事実を解決するために使用される負の請求書です。 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=請求書%sを交換してください ReplacementInvoice=交換用の請求書 ReplacedByInvoice=請求書%sによって置き換えられ @@ -87,7 +87,7 @@ ClassifyCanceled="放棄"を分類する ClassifyClosed="クローズ"を分類する ClassifyUnBilled=Classify 'Unbilled' CreateBill=請求書を作成します。 -AddBill=請求書やクレジットメモを追加 +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=請求書を削除します。 SearchACustomerInvoice=顧客の請求書の検索 @@ -99,7 +99,7 @@ DoPaymentBack=戻って支払いを行う ConvertToReduc=将来の割引に変換 EnterPaymentReceivedFromCustomer=顧客から受け取った支払を入力します。 EnterPaymentDueToCustomer=顧客のために支払いをする -DisabledBecauseRemainderToPayIsZero=支払うために剰余がゼロになるので、無効に +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=量 PriceBase=価格ベース BillStatus=請求書の状況 @@ -137,8 +137,6 @@ BillFrom=から BillTo=請求する ActionsOnBill=請求書上のアクション NewBill=新しい請求書 -Prélèvements=立っているため、 -Prélèvements=立っているため、 LastBills=最後%sの請求書 LastCustomersBills=最後%sのお客様の請求書 LastSuppliersBills=最後%sサプライヤーの請求書 @@ -156,9 +154,9 @@ ConfirmCancelBill=あなたが請求書%sをキャンセルしてもよ ConfirmCancelBillQuestion=なぜあなたは、この請求書 "放棄"を分類したいですか？ ConfirmClassifyPaidPartially=あなたが支払った状態に送り状%sを変更してもよろしいですか？ ConfirmClassifyPaidPartiallyQuestion=この請求書は完全に支払われていません。この請求書を閉じるには、あなたのための理由は何ですか？ -ConfirmClassifyPaidPartiallyReasonAvoir=支払うために残りの（%s %s）は、支払いが期間前になされたために付与された割引です。私はクレジットノートとVATを定例化する。 -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=支払うために残りの（%s %s）は、支払いが期間前になされたために付与された割引です。私は、この割引に付加価値を失うことを受け入れる。 -ConfirmClassifyPaidPartiallyReasonDiscountVat=支払うために残りの（%s %s）は、支払いが期間前になされたために付与された割引です。 Iは、信用メモせずに、この割引にVATを回復します。 +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=悪い顧客 ConfirmClassifyPaidPartiallyReasonProductReturned=製品は、部分的に返される ConfirmClassifyPaidPartiallyReasonOther=その他の理由で放棄された金額 @@ -191,9 +189,9 @@ AlreadyPaid=既に支払わ AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=すでに支払った（クレジットメモ、預金なし） Abandoned=放棄された -RemainderToPay=支払うために、残り -RemainderToTake=取るために、残り -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=量が主張 ExcessReceived=過剰は、受信した @@ -219,19 +217,18 @@ NoInvoice=送り状なし ClassifyBill=請求書の分類 SupplierBillsToPay=支払うために仕入先の請求書 CustomerBillsUnpaid=未払いの顧客の請求書 -DispenseMontantLettres=mechanographicalによって起草案は、文字の順序から除外されます -DispenseMontantLettres=mechanographicalによって起草案は、文字の順序から除外されます +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=回復不可能 SetConditions=支払条件を設定します。 SetMode=支払いモードを設定する Billed=請求 -RepeatableInvoice=事前に定義された請求書 -RepeatableInvoices=事前に定義された請求書 -Repeatable=事前に定義され -Repeatables=事前に定義され -ChangeIntoRepeatableInvoice=事前に定義されたに変換 -CreateRepeatableInvoice=事前定義された請求書を作成します。 -CreateFromRepeatableInvoice=事前に定義された請求書から作成 +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=顧客の請求書と請求書の行 CustomersInvoicesAndPayments=顧客の請求書と支払い ExportDataset_invoice_1=顧客の請求書のリストと請求書の行 diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang index 901fa5f5068..697c8c985dc 100644 --- a/htdocs/langs/ja_JP/categories.lang +++ b/htdocs/langs/ja_JP/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang index 156864f7beb..7e09ff1ecfa 100644 --- a/htdocs/langs/ja_JP/compta.lang +++ b/htdocs/langs/ja_JP/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=%sの悪い顧客の会計コード SuppliersProductsSellSalesTurnover=サプライヤーの製品の販売によって生成された売上高。 CheckReceipt=入金を確認してください CheckReceiptShort=入金を確認してください +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=新しい割引 NewCheckDeposit=新しいチェック預金 NewCheckDepositOn=%s：アカウント上で預金の領収書を作成する @@ -196,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 f056617c84f..3f44104d7fb 100644 --- a/htdocs/langs/ja_JP/contracts.lang +++ b/htdocs/langs/ja_JP/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=契約面積 ListOfContracts=契約のリスト -LastContracts=最後%sは、契約を変更 +LastModifiedContracts=Last %s modified contracts AllContracts=すべての契約 ContractCard=契約のカード ContractStatus=契約の状況 @@ -27,7 +27,7 @@ MenuRunningServices=実行中のサービス MenuExpiredServices=期限切れのサービス MenuClosedServices=閉じたサービス NewContract=新規契約 -AddContract=契約を追加します。 +AddContract=Create contract SearchAContract=契約を検索 DeleteAContract=契約を削除する CloseAContract=契約を閉じます @@ -53,7 +53,7 @@ ListOfRunningContractsLines=実行中の契約品目のリスト ListOfRunningServices=実行中のサービスのリスト NotActivatedServices=非アクティブなサービス（検証済みの契約の中で） BoardNotActivatedServices=検証済みの契約の中でアクティブにするサービス -LastContracts=最後%sは、契約を変更 +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/cron.lang b/htdocs/langs/ja_JP/cron.lang index b3dd334e16a..98455e018cc 100644 --- a/htdocs/langs/ja_JP/cron.lang +++ b/htdocs/langs/ja_JP/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = 約 -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job CronNone= なし CronDtStart=開始日 CronDtEnd=終了日 -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe CronMethod=方法 CronModule=モジュール -# CronAction=Action +CronAction=Action CronStatus=ステータス CronStatusActive=使用可能 CronStatusInactive=無効にする -# CronNoJobs=No jobs registered +CronNoJobs=No jobs registered CronPriority=優先順位 CronLabel=説明 -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create CronArgs=パラメータ -# CronSaveSucess=Save succesfully +CronSaveSucess=Save succesfully CronNote=コメント -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable CronStatusInactiveBtn=無効にする -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang index 73c5868c8e6..10ce21a04c4 100644 --- a/htdocs/langs/ja_JP/donations.lang +++ b/htdocs/langs/ja_JP/donations.lang @@ -4,7 +4,7 @@ Donations=寄付 DonationRef=Donation ref. Donor=ドナー Donors=ドナー -AddDonation=寄付を追加します。 +AddDonation=Create a donation NewDonation=新しい寄付 ShowDonation=Show donation DonationPromise=ギフト約束 @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/ja_JP/externalsite.lang index 97f6eeda98e..55413c5e256 100644 --- a/htdocs/langs/ja_JP/externalsite.lang +++ b/htdocs/langs/ja_JP/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite ExternalSiteSetup=外部ウェブサイトへのリンクを設定 ExternalSiteURL=外部サイトのURL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang index 6012a6b9631..53fdbe451e8 100644 --- a/htdocs/langs/ja_JP/holiday.lang +++ b/htdocs/langs/ja_JP/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=更新 CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=の名前 Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=値 -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=検証 UpdateEventCP=Update events diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang index df13f2bf3b6..2f5656a644a 100644 --- a/htdocs/langs/ja_JP/interventions.lang +++ b/htdocs/langs/ja_JP/interventions.lang @@ -3,7 +3,7 @@ Intervention=介入 Interventions=介入 InterventionCard=介入のカード NewIntervention=新しい介入 -AddIntervention=介入を追加 +AddIntervention=Create intervention ListOfInterventions=介入のリスト EditIntervention=介入を編集します。 ActionsOnFicheInter=介入のアクション @@ -30,6 +30,15 @@ StatusInterInvoiced=請求 RelatedInterventions=関連する介入 ShowIntervention=介入を示す SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=代表的なフォローアップ介入 TypeContact_fichinter_internal_INTERVENING=間にある diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang index 9df270c9d72..f5138fd4a12 100644 --- a/htdocs/langs/ja_JP/mails.lang +++ b/htdocs/langs/ja_JP/mails.lang @@ -115,7 +115,7 @@ SentBy=によって送信され、 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=ただし、セッションで送信するメールの最大数の値を持つパラメータのMAILING_LIMIT_SENDBYWEBを追加することによってそれらをオンラインで送信することができます。このため、ホームに行く - セットアップ - その他を。 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=一覧をクリアする ToClearAllRecipientsClickHere=このメール送信の受信者リストをクリアするにはここをクリック ToAddRecipientsChooseHere=リストから選択して受信者を追加する @@ -133,6 +133,9 @@ Notifications=通知 NoNotificationsWillBeSent=いいえ電子メール通知は、このイベントや会社のために計画されていません ANotificationsWillBeSent=1通知は電子メールで送信されます。 SomeNotificationsWillBeSent=%s通知は電子メールで送信されます。 -AddNewNotification=新しい電子メール通知の要求をアクティブにする -ListOfActiveNotifications=すべてのアクティブな電子メール通知の要求を一覧表示します。 +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=送信されたすべての電子メール通知を一覧表示します。 +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang index 80f8b5e4434..f9ec777cbd1 100644 --- a/htdocs/langs/ja_JP/main.lang +++ b/htdocs/langs/ja_JP/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Dolibarrデータベース内のユーザ ErrorNoVATRateDefinedForSellerCountry=エラー、国%s 'に対して定義されていないのVAT率。 ErrorNoSocialContributionForSellerCountry=エラー、国%s 'に対して定義されていない社会貢献型。 ErrorFailedToSaveFile=エラーは、ファイルを保存に失敗しました。 -ErrorOnlyPngJpgSupported=エラーのみ。pngおよび。jpgイメージ形式のファイルがサポートされています。 -ErrorImageFormatNotSupported=あなたのPHPは、この形式の画像を変換する関数をサポートしていません。 SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=デフォルトの背景色 +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=ファイルが添付ファイルが選択されているが、まだアップロードされませんでした。このために "添付ファイル"をクリックしてください。 NbOfEntries=エントリのNb GoToWikiHelpPage=（インターネットアクセスが必要です）オンラインヘルプを参照してください @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=までに4 MonthOfDay=その日の月 HourShort=H +MinuteShort=mn Rate=率 UseLocalTax=Include tax Bytes=バイト @@ -340,6 +341,7 @@ FullList=全リスト Statistics=統計 OtherStatistics=他の統計 Status=ステータス +Favorite=Favorite ShortInfo=Info. Ref=REF。 RefSupplier=REF。サプライヤー @@ -365,6 +367,7 @@ ActionsOnCompany=このサードパーティに関するイベント ActionsOnMember=このメンバーに関するイベント NActions=%sイベント NActionsLate=%s後半 +RequestAlreadyDone=Request already recorded Filter=フィルタ RemoveFilter=フィルタを削除 ChartGenerated=チャート生成された @@ -645,6 +648,7 @@ OptionalFieldsSetup=余分な属性の設定 URLPhoto=写真/ロゴのURL SetLinkToThirdParty=別の第三者へのリンク CreateDraft=ドラフトを作成します。 +SetToDraft=Back to draft ClickToEdit=クリックして編集 ObjectDeleted=オブジェクト%sは、削除された ByCountry=国別 @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=月曜日 Tuesday=火曜日 diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang index 89f1c46ee2e..03050a30577 100644 --- a/htdocs/langs/ja_JP/margins.lang +++ b/htdocs/langs/ja_JP/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=製品やサービス AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=開始日 EndDate=終了日 Launch=開始 - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/ja_JP/orders.lang index ab1a62198ed..925337c661d 100644 --- a/htdocs/langs/ja_JP/orders.lang +++ b/htdocs/langs/ja_JP/orders.lang @@ -2,7 +2,7 @@ OrdersArea=お客様の注文エリア SuppliersOrdersArea=仕入先の受注エリア OrderCard=注文カード -# OrderId=Order Id +OrderId=Order Id Order=オーダー Orders=受注 OrderLine=注文明細行 @@ -28,7 +28,7 @@ StatusOrderCanceledShort=キャンセル StatusOrderDraftShort=ドラフト StatusOrderValidatedShort=検証 StatusOrderSentShort=プロセスの -# StatusOrderSent=Shipment in process +StatusOrderSent=Shipment in process StatusOrderOnProcessShort=レセプション StatusOrderProcessedShort=処理 StatusOrderToBillShort=請求する @@ -53,9 +53,9 @@ ShippingExist=出荷が存在する DraftOrWaitingApproved=下書きまたは承認まだ順序付けられていません DraftOrWaitingShipped=ドラフトまたは検証まだ出荷されていない MenuOrdersToBill=法案に注文 -# MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=検索順序 -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=船積 Discount=割引 CreateOrder=順序を作成します。 @@ -65,14 +65,14 @@ ValidateOrder=順序を検証する UnvalidateOrder=順序をUnvalidate DeleteOrder=順序を削除する CancelOrder=注文を取り消す -AddOrder=注文を追加 +AddOrder=Create order AddToMyOrders=私の注文に追加 AddToOtherOrders=他の注文に追加 -# AddToDraftOrders=Add to draft order +AddToDraftOrders=Add to draft order ShowOrder=順序を示す NoOpenedOrders=いいえ開かれたオーダーがない NoOtherOpenedOrders=他の注文を開かれていません -# NoDraftOrders=No draft orders +NoDraftOrders=No draft orders OtherOrders=他の注文 LastOrders=最後%s受注 LastModifiedOrders=最後%s注文を変更 @@ -82,7 +82,7 @@ NbOfOrders=注文数 OrdersStatistics=注文の統計 OrdersStatisticsSuppliers=サプライヤーのための統計情報 NumberOfOrdersByMonth=月別受注数 -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=注文の一覧 CloseOrder=密集隊形 ConfirmCloseOrder=あなたはこの順序を閉じてもよろしいですか？注文がクローズされると、それだけ請求することができます。 @@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=下書きのステータスに注文%sを復元し ConfirmCancelOrder=あなたがこの注文をキャンセルしてもよろしいですか？ ConfirmMakeOrder=あなたは%sにこの順序を作ったことを確認してもよろしいですか？ GenerateBill=請求書を生成します。 -# ClassifyShipped=Classify delivered +ClassifyShipped=Classify delivered ClassifyBilled="銘打たれた"分類 ComptaCard=会計カード DraftOrders=ドラフト注文 @@ -101,7 +101,6 @@ RelatedOrders=関連受注 OnProcessOrders=プロセス受注 RefOrder=REF。オーダー RefCustomerOrder=REF。顧客注文 -CustomerOrder=顧客注文 RefCustomerOrderShort=REF。カスト。オーダー SendOrderByMail=メールで注文を送る ActionsOnOrder=ためのイベント @@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=定数COMMANDE_SUPPLIER_ADDONが定義 Error_COMMANDE_ADDON_NotDefined=定数COMMANDE_ADDONが定義されていません Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=モジュールファイル '%s'の読み込みに失敗しました Error_FailedToLoad_COMMANDE_ADDON_File=モジュールファイル '%s'の読み込みに失敗しました -# Error_OrderNotChecked=No orders to invoice selected - - +Error_OrderNotChecked=No orders to invoice selected # Sources OrderSource0=商業的提案 OrderSource1=インターネット @@ -144,25 +141,22 @@ OrderSource5=コマーシャル OrderSource6=店舗 QtyOrdered=数量は、注文された AddDeliveryCostLine=注文の重量を示す配信コストの行を追加します。 - # Documents models PDFEinsteinDescription=完全受注モデル（logo. ..） PDFEdisonDescription=単純な次のモデル -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes OrderByMail=電子メール OrderByFax=ファックス OrderByEMail=メールしてください OrderByWWW=オンライン OrderByPhone=電話 - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/ja_JP/oscommerce.lang b/htdocs/langs/ja_JP/oscommerce.lang deleted file mode 100644 index ea408d55f39..00000000000 --- a/htdocs/langs/ja_JP/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OSコマース -OSCommerceSetup=OSコマースモジュールのセットアップ -OSCommerceSetupSaved=保存されたOSコマースのセットアップ -OSCommerceServer=OS Commerce Serverのホスト名/ IPアドレス -OSCommerceDatabaseName=OS Commerceデータベース名 -OSCommercePrefix=OSコマースのテーブルの接頭辞 -OSCommerceUser=OS Commerceデータベースへのログイン diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang index d182a87577a..9461761ac71 100644 --- a/htdocs/langs/ja_JP/other.lang +++ b/htdocs/langs/ja_JP/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=セキュリティコード Calendar=カレンダー -AddTrip=旅行を追加します。 Tools=ツール ToolsDesc=この領域は他のメニューエントリに利用できないグループ雑多なツールに捧げられています。

    これらのツールは、メニューから側に到達することができます。 Birthday=誕生日 @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=添付ファイル/文書の数 TotalSizeOfAttachedFiles=添付ファイル/文書の合計サイズ MaxSize=最大サイズ @@ -80,6 +80,16 @@ ModifiedBy=%sによって変更された ValidatedBy=%sによって検証 CanceledBy=%sにより取り消さ ClosedBy=%sによって閉じ +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=ファイルの%sは削除されました DirWasRemoved=ディレクトリの%sは削除されました FeatureNotYetAvailableShort=次のバージョンで利用可能 @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=カレンダー%sにエントリを追加します。 -NewCompanyToDolibarr=会社%sはDolibarrに追加 -ContractValidatedInDolibarr=Dolibarrで検証済みの契約%s -ContractCanceledInDolibarr=Dolibarrでキャンセル契約%s -ContractClosedInDolibarr=Dolibarrに閉鎖契約%s -PropalClosedSignedInDolibarr=提案%sはDolibarrに署名 -PropalClosedRefusedInDolibarr=Dolibarrで拒否提案%s -PropalValidatedInDolibarr=Dolibarrで検証提案%s -InvoiceValidatedInDolibarr=Dolibarrで検証送り状%s -InvoicePaidInDolibarr=請求書%sはDolibarrに支払われたように変更 -InvoiceCanceledInDolibarr=Dolibarrでキャンセル請求書%s -PaymentDoneInDolibarr=支払い%sはDolibarrで行わ -CustomerPaymentDoneInDolibarr=Dolibarrで行われた顧客の支払%s -SupplierPaymentDoneInDolibarr=Dolibarrで行わサプライヤーの支払い%s -MemberValidatedInDolibarr=Dolibarrで検証済みメンバー%s -MemberResiliatedInDolibarr=Dolibarrでresiliatedメンバー%s -MemberDeletedInDolibarr=Dolibarrから削除されたメンバーの%s -MemberSubscriptionAddedInDolibarr=Dolibarrで追加されたメンバーの%sのためのサブスクリプション -ShipmentValidatedInDolibarr=出荷%sはDolibarrで検証 -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=輸出 ExportsArea=輸出地域 diff --git a/htdocs/langs/ja_JP/paybox.lang b/htdocs/langs/ja_JP/paybox.lang index 4a92d442a4a..5f50dd57f04 100644 --- a/htdocs/langs/ja_JP/paybox.lang +++ b/htdocs/langs/ja_JP/paybox.lang @@ -32,6 +32,9 @@ VendorName=ベンダーの名前 CSSUrlForPaymentForm=支払いフォームのCSSスタイルシートのURL MessageOK=検証済みペイメントの戻りページでメッセージ MessageKO=キャンセル支払い戻りページでメッセージ -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/ja_JP/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang index 29247f90aa6..9a886c508f4 100644 --- a/htdocs/langs/ja_JP/sendings.lang +++ b/htdocs/langs/ja_JP/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=現時点では、新たな出荷の作成は、 RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=顧客がキャッチ diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang index 7c408e77115..e910ee7637c 100644 --- a/htdocs/langs/ja_JP/stocks.lang +++ b/htdocs/langs/ja_JP/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=倉庫のラベルが必要です CorrectStock=正しい株式 ListOfWarehouses=倉庫のリスト ListOfStockMovements=在庫変動のリスト -StocksArea=株式エリア +StocksArea=Warehouses area Location=場所 LocationSummary=短い名前の場所 NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang index d374d8740af..879183074fc 100644 --- a/htdocs/langs/ja_JP/users.lang +++ b/htdocs/langs/ja_JP/users.lang @@ -63,7 +63,6 @@ ShowGroup=グループを表示 ShowUser=ユーザーを表示する NonAffectedUsers=非影響を受けるユーザー UserModified=ユーザーが正常に変更 -GroupModified=グループが正常に変更 PhotoFile=写真ファイル UserWithDolibarrAccess=Dolibarrアクセス​​権を持つユーザー ListOfUsersInGroup=このグループのユーザのリスト @@ -103,7 +102,7 @@ UserDisabled=ユーザーの%sが無効になって UserEnabled=ユーザー%sは、アクティブ UserDeleted=ユーザー%sは削除され NewGroupCreated=グループ%sが作成 -GroupModified=グループが正常に変更 +GroupModified=Group %s modified GroupDeleted=グループ%sは削除され ConfirmCreateContact=あなたは、この連絡先のDolibarrアカウントを作成してもよろしいですか？ ConfirmCreateLogin=このメンバーのDolibarrアカウントを作成してもよろしいですか？ @@ -114,8 +113,10 @@ YourRole=あなたの役割 YourQuotaOfUsersIsReached=アクティブなユーザーのあなたのクォータに達している！ NbOfUsers=ユーザーのNb DontDowngradeSuperAdmin=唯一superadminはダウングレードは、superAdminできます -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang index 720288f291e..17e7c8c42b5 100644 --- a/htdocs/langs/ja_JP/withdrawals.lang +++ b/htdocs/langs/ja_JP/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=領収書 LastWithdrawalReceipts=最後%s撤退領収書 WithdrawedBills=取り下げ請求 WithdrawalsLines=撤退ライン -RequestStandingOrderToTreat=治療するために立っている注文のための要求 -RequestStandingOrderTreated=立っている注文の要求が処理された +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=顧客に立って受注 CustomerStandingOrder=顧客の地位の順序 NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=方式伝送 Send=送信 Lines=行 StandingOrderReject=拒否を発行 -InvoiceRefused=請求書が拒否されました WithdrawalRefused=撤退は拒否されました WithdrawalRefusedConfirm=あなたは社会のために撤退拒否を入力してもよろしいです RefusedData=拒絶反応の日付 RefusedReason=拒否理由 RefusedInvoicing=拒絶反応を請求 NoInvoiceRefused=拒絶反応を充電しないでください -InvoiceRefused=請求書が拒否されました +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=ステータス StatusUnknown=未知の StatusWaiting=待っている @@ -76,13 +76,14 @@ WithBankUsingRIB=RIBを使用した銀行口座 WithBankUsingBANBIC=IBAN / BIC / SWIFTを使用した銀行口座 BankToReceiveWithdraw=撤回を受け取るために銀行口座 CreditDate=クレジットで -WithdrawalFileNotCapable=あなたの国のために撤退領収書ファイルを生成することができません +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/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/ko_KR/accountancy.lang +++ b/htdocs/langs/ko_KR/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index 9fb727b20e4..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 @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Stock management (products) Module53Name=Services Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +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 -Module400Desc=Project management inside other modules +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=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 @@ -606,15 +613,16 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -701,8 +709,8 @@ Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Read stock movements Permission1005=Create/modify stock movements Permission1101=Read delivery orders @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Products module setup ServiceSetup=Services module setup @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang index f8dabc9f384..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 @@ -41,9 +42,10 @@ AutoActions= Automatic filling AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Invoice %s validated +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Order %s validated @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status OrderCanceledInDolibarr=Order %s canceled -InterventionValidatedInDolibarr=Intervention %s validated ProposalSentByEMail=Commercial proposal %s sent by EMail OrderSentByEMail=Customer order %s sent by EMail InvoiceSentByEMail=Customer invoice %s sent by EMail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail ShippingSentByEMail=Shipping %s sent by EMail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sent by EMail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date DateActionPlannedEnd= Planned end date @@ -70,9 +69,9 @@ DateActionStart= Start date DateActionEnd= End date AgendaUrlOptions1=You can also add following parameters to filter output: AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. -AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Show birthday's contacts AgendaHideBirthdayEvents=Hide birthday's contacts Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang index 1edd7213076..81b7515a8b8 100644 --- a/htdocs/langs/ko_KR/bills.lang +++ b/htdocs/langs/ko_KR/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit note InvoiceAvoirAsk=Credit note to correct invoice InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Replace invoice %s ReplacementInvoice=Replacement invoice ReplacedByInvoice=Replaced by invoice %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned' ClassifyClosed=Classify 'Closed' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Create Invoice -AddBill=Add invoice or credit note +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice @@ -99,7 +99,7 @@ DoPaymentBack=Do payment back ConvertToReduc=Convert into future discount EnterPaymentReceivedFromCustomer=Enter payment received from customer EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Amount PriceBase=Price base BillStatus=Invoice status @@ -137,8 +137,6 @@ BillFrom=From BillTo=To ActionsOnBill=Actions on invoice NewBill=New invoice -Prélèvements=Standing order -Prélèvements=Standing order LastBills=Last %s invoices LastCustomersBills=Last %s customers invoices LastSuppliersBills=Last %s suppliers invoices @@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice %s ? ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason @@ -191,9 +189,9 @@ AlreadyPaid=Already paid AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Abandoned -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received @@ -219,19 +217,18 @@ NoInvoice=No invoice ClassifyBill=Classify invoice SupplierBillsToPay=Suppliers invoices to pay CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms SetMode=Set payment mode Billed=Billed -RepeatableInvoice=Pre-defined invoice -RepeatableInvoices=Pre-defined invoices -Repeatable=Pre-defined -Repeatables=Pre-defined -ChangeIntoRepeatableInvoice=Convert into pre-defined -CreateRepeatableInvoice=Create pre-defined invoice -CreateFromRepeatableInvoice=Create from pre-defined invoice +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Customer invoices and payments ExportDataset_invoice_1=Customer invoices list and invoice's lines diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang index ed61bfc08a6..22914931db1 100644 --- a/htdocs/langs/ko_KR/categories.lang +++ b/htdocs/langs/ko_KR/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang index 3929cfde036..878eb49b3c9 100644 --- a/htdocs/langs/ko_KR/compta.lang +++ b/htdocs/langs/ko_KR/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 e5ad112b222..57ba3bb15d8 100644 --- a/htdocs/langs/ko_KR/contracts.lang +++ b/htdocs/langs/ko_KR/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastContracts=Last %s modified contracts +LastModifiedContracts=Last %s modified contracts AllContracts=All contracts ContractCard=Contract card ContractStatus=Contract status @@ -27,7 +27,7 @@ MenuRunningServices=Running services MenuExpiredServices=Expired services MenuClosedServices=Closed services NewContract=New contract -AddContract=Add contract +AddContract=Create contract SearchAContract=Search a contract DeleteAContract=Delete a contract CloseAContract=Close a contract @@ -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 %s modified 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/cron.lang b/htdocs/langs/ko_KR/cron.lang index 1be23d72ca3..195ad43c87c 100644 --- a/htdocs/langs/ko_KR/cron.lang +++ b/htdocs/langs/ko_KR/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# -# About = About -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +About = About +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job -# CronNone= None -# CronDtStart=Start date -# CronDtEnd=End date -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe -# CronMethod=Method -# CronModule=Module -# CronAction=Action -# CronStatus=Status -# CronStatusActive=Enabled -# CronStatusInactive=Disabled -# CronNoJobs=No jobs registered -# CronPriority=Priority -# CronLabel=Description -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job +CronNone= None +CronDtStart=Start date +CronDtEnd=End date +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe +CronMethod=Method +CronModule=Module +CronAction=Action +CronStatus=Status +CronStatusActive=Enabled +CronStatusInactive=Disabled +CronNoJobs=No jobs registered +CronPriority=Priority +CronLabel=Description +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create -# CronArgs=Parameters -# CronSaveSucess=Save succesfully -# CronNote=Comment -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable -# CronStatusInactiveBtn=Disable -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create +CronArgs=Parameters +CronSaveSucess=Save succesfully +CronNote=Comment +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable +CronStatusInactiveBtn=Disable +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/ko_KR/donations.lang b/htdocs/langs/ko_KR/donations.lang index 66ddea95a5c..f7aed91cf81 100644 --- a/htdocs/langs/ko_KR/donations.lang +++ b/htdocs/langs/ko_KR/donations.lang @@ -4,7 +4,7 @@ Donations=Donations DonationRef=Donation ref. Donor=Donor Donors=Donors -AddDonation=Add a donation +AddDonation=Create a donation NewDonation=New donation ShowDonation=Show donation DonationPromise=Gift promise @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/ko_KR/externalsite.lang index b915c37a5ab..da4853df0df 100644 --- a/htdocs/langs/ko_KR/externalsite.lang +++ b/htdocs/langs/ko_KR/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite -# ExternalSiteSetup=Setup link to external website -# ExternalSiteURL=External Site URL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteSetup=Setup link to external website +ExternalSiteURL=External Site URL +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/ko_KR/holiday.lang b/htdocs/langs/ko_KR/holiday.lang index c25abf6449c..f5b87fefb08 100644 --- a/htdocs/langs/ko_KR/holiday.lang +++ b/htdocs/langs/ko_KR/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Name Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/ko_KR/interventions.lang b/htdocs/langs/ko_KR/interventions.lang index 17641a0ab3e..c79da05364e 100644 --- a/htdocs/langs/ko_KR/interventions.lang +++ b/htdocs/langs/ko_KR/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Interventions InterventionCard=Intervention card NewIntervention=New intervention -AddIntervention=Add intervention +AddIntervention=Create intervention ListOfInterventions=List of interventions EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang index 6c9a445d4c1..dd8caefab78 100644 --- a/htdocs/langs/ko_KR/mails.lang +++ b/htdocs/langs/ko_KR/mails.lang @@ -115,7 +115,7 @@ SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -133,6 +133,9 @@ Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang index c303e23c2c0..2a7132201cd 100644 --- a/htdocs/langs/ko_KR/main.lang +++ b/htdocs/langs/ko_KR/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Dolibarr 데이타베이스에서 %sNet margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/ko_KR/orders.lang index 42444f0ec1c..6ee9c19fa95 100644 --- a/htdocs/langs/ko_KR/orders.lang +++ b/htdocs/langs/ko_KR/orders.lang @@ -1,168 +1,162 @@ # Dolibarr language file - Source file is en_US - orders -# OrdersArea=Customers orders area -# SuppliersOrdersArea=Suppliers orders area -# OrderCard=Order card -# OrderId=Order Id -# Order=Order -# Orders=Orders -# OrderLine=Order line -# OrderFollow=Follow up -# OrderDate=Order date -# OrderToProcess=Order to process -# NewOrder=New order -# ToOrder=Make order -# MakeOrder=Make order -# SupplierOrder=Supplier order -# SuppliersOrders=Suppliers orders -# SuppliersOrdersRunning=Current suppliers orders -# CustomerOrder=Customer order -# CustomersOrders=Customer's orders -# CustomersOrdersRunning=Current customer's orders -# CustomersOrdersAndOrdersLines=Customer orders and order's lines -# OrdersToValid=Customer's orders to validate -# OrdersToBill=Customer's orders delivered -# OrdersInProcess=Customer's orders in process -# OrdersToProcess=Customer's orders to process -# SuppliersOrdersToProcess=Supplier's orders to process -# StatusOrderCanceledShort=Canceled -# StatusOrderDraftShort=Draft -# StatusOrderValidatedShort=Validated -# StatusOrderSentShort=In process -# StatusOrderSent=Shipment in process -# StatusOrderOnProcessShort=Reception -# StatusOrderProcessedShort=Processed -# StatusOrderToBillShort=Delivered -# StatusOrderToBill2Short=To bill -# StatusOrderApprovedShort=Approved -# StatusOrderRefusedShort=Refused -# StatusOrderToProcessShort=To process -# StatusOrderReceivedPartiallyShort=Partially received -# StatusOrderReceivedAllShort=Everything received -# StatusOrderCanceled=Canceled -# StatusOrderDraft=Draft (needs to be validated) -# StatusOrderValidated=Validated -# StatusOrderOnProcess=Waiting to receive -# StatusOrderProcessed=Processed -# StatusOrderToBill=Delivered -# StatusOrderToBill2=To bill -# StatusOrderApproved=Approved -# StatusOrderRefused=Refused -# StatusOrderReceivedPartially=Partially received -# StatusOrderReceivedAll=Everything received -# ShippingExist=A shipment exists -# DraftOrWaitingApproved=Draft or approved not yet ordered -# DraftOrWaitingShipped=Draft or validated not yet shipped -# MenuOrdersToBill=Orders delivered -# MenuOrdersToBill2=Orders to bill -# SearchOrder=Search order -# SearchACustomerOrder=Search a customer order -# ShipProduct=Ship product -# Discount=Discount -# CreateOrder=Create Order -# RefuseOrder=Refuse order -# ApproveOrder=Accept order -# ValidateOrder=Validate order -# UnvalidateOrder=Unvalidate order -# DeleteOrder=Delete order -# CancelOrder=Cancel order -# AddOrder=Add order -# AddToMyOrders=Add to my orders -# AddToOtherOrders=Add to other orders -# AddToDraftOrders=Add to draft order -# ShowOrder=Show order -# NoOpenedOrders=No opened orders -# NoOtherOpenedOrders=No other opened orders -# NoDraftOrders=No draft orders -# OtherOrders=Other orders -# LastOrders=Last %s orders -# LastModifiedOrders=Last %s modified orders -# LastClosedOrders=Last %s closed orders -# AllOrders=All orders -# NbOfOrders=Number of orders -# OrdersStatistics=Order's statistics -# OrdersStatisticsSuppliers=Supplier order's statistics -# NumberOfOrdersByMonth=Number of orders by month -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) -# ListOfOrders=List of orders -# CloseOrder=Close order -# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. -# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. -# ConfirmDeleteOrder=Are you sure you want to delete this order ? -# ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? -# ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? -# ConfirmCancelOrder=Are you sure you want to cancel this order ? -# ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? -# GenerateBill=Generate invoice -# ClassifyShipped=Classify delivered -# ClassifyBilled=Classify billed -# ComptaCard=Accountancy card -# DraftOrders=Draft orders -# RelatedOrders=Related orders -# OnProcessOrders=In process orders -# RefOrder=Ref. order -# RefCustomerOrder=Ref. customer order -# CustomerOrder=Customer order -# RefCustomerOrderShort=Ref. cust. order -# SendOrderByMail=Send order by mail -# ActionsOnOrder=Events on order -# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order -# OrderMode=Order method -# AuthorRequest=Request author -# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address -# RunningOrders=Orders on process -# UserWithApproveOrderGrant=Users granted with "approve orders" permission. -# PaymentOrderRef=Payment of order %s -# CloneOrder=Clone order -# ConfirmCloneOrder=Are you sure you want to clone this order %s ? -# DispatchSupplierOrder=Receiving supplier order %s +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id +Order=Order +Orders=Orders +OrderLine=Order line +OrderFollow=Follow up +OrderDate=Order date +OrderToProcess=Order to process +NewOrder=New order +ToOrder=Make order +MakeOrder=Make order +SupplierOrder=Supplier order +SuppliersOrders=Suppliers orders +SuppliersOrdersRunning=Current suppliers orders +CustomerOrder=Customer order +CustomersOrders=Customer's orders +CustomersOrdersRunning=Current customer's orders +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customer's orders to validate +OrdersToBill=Customer's orders delivered +OrdersInProcess=Customer's orders in process +OrdersToProcess=Customer's orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderSentShort=In process +StatusOrderSent=Shipment in process +StatusOrderOnProcessShort=Reception +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=Delivered +StatusOrderToBill2Short=To bill +StatusOrderApprovedShort=Approved +StatusOrderRefusedShort=Refused +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received +StatusOrderCanceled=Canceled +StatusOrderDraft=Draft (needs to be validated) +StatusOrderValidated=Validated +StatusOrderOnProcess=Waiting to receive +StatusOrderProcessed=Processed +StatusOrderToBill=Delivered +StatusOrderToBill2=To bill +StatusOrderApproved=Approved +StatusOrderRefused=Refused +StatusOrderReceivedPartially=Partially received +StatusOrderReceivedAll=Everything received +ShippingExist=A shipment exists +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders +SearchOrder=Search order +SearchACustomerOrder=Search a customer order +ShipProduct=Ship product +Discount=Discount +CreateOrder=Create Order +RefuseOrder=Refuse order +ApproveOrder=Accept order +ValidateOrder=Validate order +UnvalidateOrder=Unvalidate order +DeleteOrder=Delete order +CancelOrder=Cancel order +AddOrder=Create order +AddToMyOrders=Add to my orders +AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order +ShowOrder=Show order +NoOpenedOrders=No opened orders +NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders +AllOrders=All orders +NbOfOrders=Number of orders +OrdersStatistics=Order's statistics +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +ListOfOrders=List of orders +CloseOrder=Close order +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +GenerateBill=Generate invoice +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s ##### Types de contacts ##### -# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order -# TypeContact_commande_internal_SHIPPING=Representative following-up shipping -# TypeContact_commande_external_BILLING=Customer invoice contact -# TypeContact_commande_external_SHIPPING=Customer shipping contact -# TypeContact_commande_external_CUSTOMER=Customer contact following-up order -# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order -# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping -# TypeContact_order_supplier_external_BILLING=Supplier invoice contact -# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact -# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order - -# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined -# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined -# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' -# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' -# Error_OrderNotChecked=No orders to invoice selected - +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected # Sources -# OrderSource0=Commercial proposal -# OrderSource1=Internet -# OrderSource2=Mail campaign -# OrderSource3=Phone compaign -# OrderSource4=Fax campaign -# OrderSource5=Commercial -# OrderSource6=Store -# QtyOrdered=Qty ordered -# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order - +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign +OrderSource5=Commercial +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order # Documents models -# PDFEinsteinDescription=A complete order model (logo...) -# PDFEdisonDescription=A simple order model -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes -# OrderByMail=Mail -# OrderByFax=Fax -# OrderByEMail=EMail -# OrderByWWW=Online -# OrderByPhone=Phone - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/ko_KR/oscommerce.lang b/htdocs/langs/ko_KR/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/ko_KR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang index 6fe5c904eec..d20bb5f39b1 100644 --- a/htdocs/langs/ko_KR/other.lang +++ b/htdocs/langs/ko_KR/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/ko_KR/paybox.lang b/htdocs/langs/ko_KR/paybox.lang index b689bb6cebf..aced32a4944 100644 --- a/htdocs/langs/ko_KR/paybox.lang +++ b/htdocs/langs/ko_KR/paybox.lang @@ -1,37 +1,40 @@ # Dolibarr language file - Source file is en_US - paybox -# PayBoxSetup=PayBox module setup -# PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) -# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects -# PaymentForm=Payment form -# WelcomeOnPaymentPage=Welcome on our online payment service -# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. -# ThisIsInformationOnPayment=This is information on payment to do -# ToComplete=To complete -# YourEMail=Email to receive payment confirmation -# Creditor=Creditor -# PaymentCode=Payment code -# PayBoxDoPayment=Go on payment -# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information -# PleaseBePatient=Please, be patient -# Continue=Next -# ToOfferALinkForOnlinePayment=URL for %s payment -# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order -# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice -# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line -# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount -# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription -# YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. -# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. -# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. -# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. -# AccountParameter=Account parameters -# UsageParameter=Usage parameters -# InformationToFindParameters=Help to find your %s account information -# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment -# VendorName=Name of vendor -# CSSUrlForPaymentForm=CSS style sheet url for payment form -# MessageOK=Message on validated payment return page -# MessageKO=Message on canceled payment return page -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/ko_KR/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang index 2ae43f39766..f6111bac684 100644 --- a/htdocs/langs/ko_KR/sendings.lang +++ b/htdocs/langs/ko_KR/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang index ef292b1b412..6af87274111 100644 --- a/htdocs/langs/ko_KR/stocks.lang +++ b/htdocs/langs/ko_KR/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=위치 LocationSummary=Short name location NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang index 0afaab6ad7f..baf209f9d1c 100644 --- a/htdocs/langs/ko_KR/users.lang +++ b/htdocs/langs/ko_KR/users.lang @@ -63,7 +63,6 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group modified successfully +GroupModified=Group %s modified GroupDeleted=Group %s removed ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? @@ -114,8 +113,10 @@ YourRole=Your roles YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb of users DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang index 58ac3e252ec..ea32511fefb 100644 --- a/htdocs/langs/ko_KR/withdrawals.lang +++ b/htdocs/langs/ko_KR/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Unknown StatusWaiting=Waiting @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/lt_LT/accountancy.lang +++ b/htdocs/langs/lt_LT/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index 82b6a410baa..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 @@ -437,14 +440,14 @@ Module52Name=Atsargos Module52Desc=Atsargų valdymas (produktai) Module53Name=Paslaugos Module53Desc=Paslaugų valdymas -Module54Name=Sutartys -Module54Desc=Sutarčių ir paslaugų valdymas +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Brūkšniniai kodai 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=Projektai -Module400Desc=Projektų valdymas kitų modulių viduje +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) @@ -484,7 +487,7 @@ Module500Desc=Spec. išlaidų valdymas, pavyzdžiui: mokesčių, socialinių įm Module510Name=Atlyginimai Module510Desc=Management of employees salaries and payments Module600Name=Pranešimai -Module600Desc=Siųsti pranešimus elektroniniu paštu apie kai kokius Dolibarr verslo įvykius į trečiųjų šalių kontaktus +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Parama Module700Desc=Paramos valdymas Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi įmonė Module5000Desc=Jums leidžiama valdyti kelias įmones Module6000Name=Darbo eiga Module6000Desc=Darbo eigos valdymas -Module20000Name=Švenčių dienos -Module20000Desc=Deklaruoti ir sekti darbuotojų atostogas +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 Module50100Desc=Pardavimų taško modulis -Module50200Name= PayPal -Module50200Desc= Modulis siūlo internetinio mokėjimo kreditine kortele per PayPal puslapį +Module50200Name=PayPal +Module50200Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per PayPal puslapį 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 @@ -606,15 +613,16 @@ Permission151=Skaityti pastovius užsakymus Permission152=Sukurti/pakeisti pastovių uždsakymų prašymus Permission153=Pastovių užsakymų pajamų perdavimas Permission154=Pastovių užsakymų pajamų kreditas/atmetimas -Permission161=Skaityti sutartis -Permission162=Sukurti/keisti sutartis -Permission163=Įjungti sutarties paslaugą -Permission164=Išjungti sutarties paslaugą -Permission165=Ištrinti sutartis -Permission171=Skaityti klaidas -Permission172=Sukurti/keisti klaidas -Permission173=Ištrinti klaidas -Permission178=Eksportuoti klaidas +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Skaityti tiekėjus Permission181=Skaityti tiekėjo užsakymus Permission182=Sukurti/keisti tiekėjo užsakymus @@ -671,7 +679,7 @@ Permission300=Skaityti brūkšninius kodus Permission301=Sukurti/keisti brūkšninius kodus Permission302=Ištrinti brūkšninius kodus Permission311=Skaityti paslaugas -Permission312=Priskirti paslaugas prie sutarties +Permission312=Assign service/subscription to contract Permission331=Skaityti žymes Permission332=Sukurti/keisti žymes Permission333=Ištrinti žymes @@ -701,8 +709,8 @@ Permission701=Skaityti aukas Permission702=Sukurti/keisti aukas Permission703=Ištrinti aukas Permission1001=Skaityti atsargas -Permission1002=Sukurti/keisti atsargas -Permission1003=Ištrinti atsargas +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Skaityti atsargų judėjimą Permission1005=Sukurti/keisti atsargų judėjimą Permission1101=Skaityti pristatymo užsakymus @@ -778,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šą @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Taip vasarą OnlyFollowingModulesAreOpenedToExternalUsers=Atkreipkite dėmesį, kad tik šie moduliai yra atviri išorės vartotojams (kokie bebūtų šių vartotojų leidimai): SuhosinSessionEncrypt=Sesijų saugykla užšifruota Suhosin ConditionIsCurrently=Dabartinė būklė yra %s -TestNotPossibleWithCurrentBrowsers=Automatinė detekcija negalima YouUseBestDriver=Jūs naudojate tvarkyklę %s, kuri yra geriausia tvarkyklė prieinama šiuo metu. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=Turite tik %s produktus/paslaugas duomenų bazėje. Tam nereikia jokio ypatingo optimizavimo. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Grąžinti apskaitos kodą, sudarytą pagal:
    %s po ModuleCompanyCodePanicum=Grąžinti tuščią apskaitos kodą. ModuleCompanyCodeDigitaria=Apskaitos kodas priklauso nuo trečiosios šalies kodo. Kodas yra sudarytas iš simbolių "C" į pirmąją poziciją, toliau seka 5 simbolių trečiosios šalies kodas. UseNotifications=Naudokite pranešimus -NotificationsDesc=El. pašto pranešimų funkcija leidžia Jums tyliai išsiųsti automatinį laišką dėl kai kurių Dolibarr įvykių trečiosioms šalims (klientams arba tiekėjams), kurie yra sukonfigūruoti. Aktyvių pranešimų ir kontaktų pasirinkimas galimas su viena trečiąja šalimi vienu metu. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Dokumentų šablonai DocumentModelOdt=Sukurti dokumentus pagal OpenDocuments šablonus (.ODT arba .OAM failus OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Vandens ženklas ant dokumento projekto @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Pridėti galimą pristatymo datą UseOptionLineIfNoQuantity=Produkto/paslaugos linija su nuline suma yra laikoma galima opcija FreeLegalTextOnProposal=Laisvas tekstas komerciniame pasiūlyme WatermarkOnDraftProposal=Vandens ženklas komercinių pasiūlymų projekte (nėra, jei lapas tuščias) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Užsakymų valdymo nuostatos OrdersNumberingModules=Užsakymų numeracijos modeliai @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Patvirtinti užsakymą, kuriam komercinis pasiūlymas jau pasibaigęs, leidžia be laikino užsakymo. FreeLegalTextOnOrders=Laisvas tekstas užsakymuose WatermarkOnDraftOrders=Vandens ženklas užsakymų projektuose (nėra, jei lapas tuščias) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial modulio nuostatos ClickToDialUrlDesc=Paspaudus telefono piktogramą kviečiamas URL. Galima naudoti žymes
    __PHONETO__, tam, kad pakeisti asmens, kuriam skambinama, telefono numeriu
    __PHONEFROM__, tam, kad pakeisti asmens, kuris skambina, telefono numeriu (Jūsų)
    __LOGIN__, tam, kad pakeisti Jūsų ClickToDial prisijungimo vardu (nustatytu vartotojo kortelėje)
    __PASS__, tam, kad pakeisti Jūsų ClickToDial slaptažodį (nustatytą vartotojo kortelėje). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervencijų numeracijos modeliai TemplatePDFInterventions=Intervencija kortelių dokumentų modeliai WatermarkOnDraftInterventionCards=Vandens ženklas ant intervencijų kortelės dokumentų (nėra, jei lapas tuščias) ##### Contracts ##### -ContractsSetup=Sutarčių modulio nuostatos +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Sutarčių numeracijos moduliai TemplatePDFContracts=Sutarčių dokumentų modeliai FreeLegalTextOnContracts=Laisvas tekstas sutartyse @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=%s tipo failai nėra suspausti HTTP serveryje CacheByServer=Laikoma serverio atmintyje CacheByClient=Laikoma naršyklės atmintyje CompressionOfResources=HTTP atsakymų suspaudimas -TestNotPossibleWithCurrentBrowsers=Automatinė detekcija negalima +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Produktų modulio nuostatos ServiceSetup=Paslaugų modulio nuostatos @@ -1382,9 +1393,10 @@ MailingSetup=E-pašto modulio nuostatos MailingEMailFrom=Siuntėjo e-paštas (nuo) e-laiškams, siunčiamiems per e-pašto modulį MailingEMailError=Grąžinamas e-paštas (Errors-to) klaidingiems e-laiškams ##### Notification ##### -NotificationSetup=Pranešimas apie e-pašto modulio nuostatas +NotificationSetup=EMail notification module setup NotificationEMailFrom=Siuntėjo e-paštas (nuo) e-laiškams siunčiamiems perspėjimams -ListOfAvailableNotifications=Galimų pranešimų sąrašas (sąrašas priklauso nuo aktyvuotų modulių) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Siuntimo modulio nuostatos SendingsReceiptModel=Įplaukų siuntimo modelis @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Prisijungimas prie serverio '%s' duomenų bazėje "%s" su varto OSCommerceTestKo1=Prisijungimas prie serverio '%s' pavyko, bet duomenų bazė "%s" nepasiekiama. OSCommerceTestKo2=Prisijungimas prie serverio '%s' su vartotoju '%s' nepavyko. ##### Stock ##### -StockSetup=Atsargų konfigūravimo modulis -UserWarehouse=Naudoti vartotojo asmenines atsargas +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Meniu ištrintas TreeMenu=Medžio meniu @@ -1478,11 +1491,14 @@ ClickToDialDesc=Šis modulis leidžia pridėti ikoną už telefono numerio. Šio ##### Point Of Sales (CashDesk) ##### CashDesk=Pardavimų taškas CashDeskSetup=Pardavimų taško modulio nustatymas -CashDeskThirdPartyForSell=Bendroji trečioji šalis naudojama pardavimams +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Sąskaita grynųjų pinigų įmokoms pagal nutylėjimą CashDeskBankAccountForCheque= Sąskaita čekių įmokoms pagal nutylėjimą CashDeskBankAccountForCB= Sąskaita įmokoms kreditinėmis kortelėmis pagal nutylėjimą -CashDeskIdWareHouse=Pardavimų sandėlis +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. ##### Bookmark ##### BookmarkSetup=Žymeklių modulio nustatymas BookmarkDesc=Šis modulis leidžia valdyti žymeklius. Taip pat galite pridėti trumpąsias nuorodas į bet kurį Dolibarr puslapį ar išorinį web tinklalapį Jūsų kairiajame meniu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang index 54733de0408..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 @@ -41,9 +42,10 @@ AutoActions= Automatinis užpildymas AgendaAutoActionDesc= Nustatykite įvykius, kuriems norite, kad Dolibarr sukurtų automatiškai įvykį operacijoje. Jei niekas nepažymėta (pagal nutylėjimą), tik rankomis įvesti veiksmai bus įtraukti į operaciją. AgendaSetupOtherDesc= Šis puslapis suteikia galimybę eksportuoti Jūsų Dolibarr įvykius į išorinį kalendorių (Thunderbird, Google Calendar, ...) AgendaExtSitesDesc=Šis puslapis leidžia paskelbti išorinius kalendorių šaltinius, kad pamatyti juose esančius įvykius Dolibarr operacijose. -ActionsEvents= Įvykiai, kuriems Dolibarr sukurs veiksmą operacijų sąraše automatiškai -PropalValidatedInDolibarr= Pasiūlymas %s pripažintas galiojančiu -InvoiceValidatedInDolibarr= Sąskaita-faktūra %s pripažinta galiojančia +ActionsEvents=Įvykiai, kuriems Dolibarr sukurs veiksmą operacijų sąraše automatiškai +PropalValidatedInDolibarr=Pasiūlymas %s pripažintas galiojančiu +InvoiceValidatedInDolibarr=Sąskaita-faktūra %s pripažinta galiojančia +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Sąskaita-faktūra %s grąžinama į projektinę būklę InvoiceDeleteDolibarr=Sąskaita-faktūra %s ištrinta OrderValidatedInDolibarr= Užsakymas %s pripažintas galiojančiu @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Užsakymas %s patvirtintas OrderRefusedInDolibarr=Užsakymas %s atmestas OrderBackToDraftInDolibarr=Užsakymas %s grąžintas į projektinę būklę OrderCanceledInDolibarr=Užsakymas %s atšauktas -InterventionValidatedInDolibarr=Intervencija %s pripažinta galiojančia ProposalSentByEMail=Komercinis pasiūlymas %s išsiųstas e-paštu OrderSentByEMail=Kliento užsakymas %s atsiųstas e-paštu InvoiceSentByEMail=Kliento sąskaita-faktūra %s išsiųsta e-paštu @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Tiekėjo užsakymas %s atsiųstas e-paštu SupplierInvoiceSentByEMail=Tiekėjo sąskaita-faktūra %s atsiųsta e-paštu ShippingSentByEMail=Pakrovimo dokumentas %s atsiųstas e-paštu ShippingValidated= Pakrovimas %s pripažintas galiojančiu -InterventionSentByEMail=Intervencija %s atsiųsta e-paštu -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Trečioji šalis sukūrė DateActionPlannedStart= Planuojama pradžios data DateActionPlannedEnd= Planuojama pabaigos data @@ -70,9 +69,9 @@ DateActionStart= Pradžios data DateActionEnd= Pabaigos data AgendaUrlOptions1=Taip pat galite pridėti šiuos parametrus išvesties filtravimui: AgendaUrlOptions2=login=%s ​​apriboti išvedimą veiksmais, sukurtais, priskirtais arba įvykdytais vartotojo %s. -AgendaUrlOptions3=logina=%s ​​apriboti išvedimą veiksmais, sukurtais vartotojo %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint =%s ​​apriboti išvedimą veiksmais, priskirtais vartotojui %s. -AgendaUrlOptions5=logind=%s ​​apriboti išvedimo veiksmais, padarytais vartotojo %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Rodyti gimtadienio adresatus AgendaHideBirthdayEvents=Paslėpti gimtadienio adresatus Busy=Užimtas @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL prieiga prie .ical failo ExtSiteNoLabel=Aprašymo nėra WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang index 8ccc4b6dd48..640764f26bd 100644 --- a/htdocs/langs/lt_LT/bills.lang +++ b/htdocs/langs/lt_LT/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Kreditinė sąskaita (kredito aviza) InvoiceAvoirAsk=Kreditinė sąskaita tikslinanti sąskaitą-faktūrą InvoiceAvoirDesc=Kreditinė sąskaita yra neigiama sąskaita-faktūra, naudojama išspręsti faktui, kai sąskaitos-faktūros suma realiai skiriasi nuo sumokėtos sumos (nes klientas per klaidą sumokėjo per daug, ar ​​nesumokėjo pilnai, nes grąžino dalį produktų). invoiceAvoirWithLines=Sukurti kreditinę sąskaitą su eilutėmis iš originalios sąskaitos-faktūros -invoiceAvoirWithPaymentRestAmount=Sukurti kreditinę sąskaitą su suma iš originalios sąskaitos-faktūros -invoiceAvoirLineWithPaymentRestAmount=Kreditinės sąskaitos suma iš sąskaitos-faktūros +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Pakeisti sąskaitą %s ReplacementInvoice=Sąskaitos-faktūros pakeitimas ReplacedByInvoice=Pakeistas sąskaita %s @@ -87,7 +87,7 @@ ClassifyCanceled=Priskirti 'Neįvykusios' ClassifyClosed=Priskirti 'Uždarytos' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Sukurti sąskaitą-faktūrą -AddBill=Pridėti sąskaitą-faktūrą ar kreditinę sąskaitą (kredito avizą) +AddBill=Create invoice or credit note AddToDraftInvoices=Pridėti į projektinę sąskaitą-faktūrą DeleteBill=Ištrinti sąskaitą-faktūrą SearchACustomerInvoice=Ieškoti kliento sąskaitos-faktūros @@ -99,7 +99,7 @@ DoPaymentBack=Atlikti sumokėtos sumos grąžinimą ConvertToReduc=Konvertuoti į ateities nuolaidą EnterPaymentReceivedFromCustomer=Įveskite gautą iš kliento mokėjimą EnterPaymentDueToCustomer=Atlikti mokėjimą klientui -DisabledBecauseRemainderToPayIsZero=Negalimas, nes likutis mokėti lygus nuliui +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Suma PriceBase=Kainos bazė BillStatus=Sąskaitos-faktūros būklė @@ -137,8 +137,6 @@ BillFrom=Iš BillTo=Į ActionsOnBill=Veiksmai sąskaitoje-faktūroje NewBill=Nauja sąskaita-faktūra -Prélèvements=Pastovus užsakymas -Prélèvements=Pastovus užsakymas LastBills=Paskutinės %s sąskaitos-faktūros LastCustomersBills=Paskutinės %s klientų sąskaitos-faktūros LastSuppliersBills=Paskutinės %s tiekėjų sąskaitos-faktūros @@ -156,9 +154,9 @@ ConfirmCancelBill=Ar tikrai norite atšaukti sąskaitą-faktūrą %s ? ConfirmCancelBillQuestion=Kodėl norite priskirti šią sąskaitą-faktūrą prie "Neįvykusi" ? ConfirmClassifyPaidPartially=Ar tikrai norite pakeisti sąskaitos-faktūros %s būklę į "Apmokėta" ? ConfirmClassifyPaidPartiallyQuestion=Ši sąskaita-faktūra nebuvo pilnai apmokėta. Kokios yra priežastys, kad norite uždaryti šią sąskaitą-faktūrą ? -ConfirmClassifyPaidPartiallyReasonAvoir=Likutis apmokėti (%s %s) yra atsižvelgiant į suteiktą nuolaidą, nes mokėjimas buvo atliktas prieš terminą. Sukoreguosiu PVM per kreditinę sąskaitą. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Likutis apmokėti (%s %s) yra atsižvelgiant į suteiktą nuolaidą, nes mokėjimas buvo atliktas prieš terminą. Sutinku prarasti PVM nuo šios nuolaidos. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Likutis apmokėti (%s i%s) yra atsižvelgiant į suteiktą nuolaidą, nes mokėjimas buvo atliktas prieš terminą. Aš susigrąžinsiu PVM per šią nuolaidą be kreditinės sąskaitos. +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=Blogas klientas ConfirmClassifyPaidPartiallyReasonProductReturned=Produktų dalis grąžinta ConfirmClassifyPaidPartiallyReasonOther=Suma atsisakyta dėl kitų priežasčių @@ -191,9 +189,9 @@ AlreadyPaid=Jau apmokėta AlreadyPaidBack=Mokėjimas jau grąžintas AlreadyPaidNoCreditNotesNoDeposits=Jau apmokėta (be kreditinių sąskaitų ir depozitų) Abandoned=Neįvykusi -RemainderToPay=Likutis apmokėti -RemainderToTake=Likutis gauti -RemainderToPayBack=Likutis grąžinti +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Laukiantis AmountExpected=Reikalaujama suma ExcessReceived=Gautas perviršis @@ -219,19 +217,18 @@ NoInvoice=Nėra sąskaitos-faktūros ClassifyBill=Priskirti sąskaitą-faktūrą SupplierBillsToPay=Tiekėjų sąskaitos-faktūros apmokėjimui CustomerBillsUnpaid=Neapmokėtos klientų sąskaitos-faktūros -DispenseMontantLettres=Sąskaita parengta mechanografiniu būdu atleidžiama nuo užsakymo raidėmis -DispenseMontantLettres=Sąskaita parengta mechanografiniu būdu atleidžiama nuo užsakymo raidėmis +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Neatitaisomas SetConditions=Nustatykite mokėjimo terminus SetMode=Nustatykite mokėjimo būdą Billed=Pateikta sąskaita -RepeatableInvoice=Iš anksto nustatyta sąskaita-faktūra -RepeatableInvoices=Iš anksto nustatytos sąskaitos-faktūros -Repeatable=Iš anksto nustatyta -Repeatables=Iš anksto nustatyta -ChangeIntoRepeatableInvoice=Konvertuoti į iš anksto nustatytą -CreateRepeatableInvoice=Sukurti iš anksto nustatytą sąskaitą-faktūrą -CreateFromRepeatableInvoice=Kurti iš apibrėžtos sąskaitos-faktūros +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Klientų sąskaitos-faktūros ir sąskaitų-faktūrų serijos CustomersInvoicesAndPayments=Kliento sąskaitos-faktūros ir mokėjimai ExportDataset_invoice_1=Kliento sąskaitų-faktūrų sąrašas ir sąskaitų-faktūros serijos diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang index 7f998cd3c4d..ffa404fbb6d 100644 --- a/htdocs/langs/lt_LT/categories.lang +++ b/htdocs/langs/lt_LT/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Ryšys tarp tiekėjų ir kategorijų CatCusLinks=Ryšys tarp klientų/planų ir kategorijų CatProdLinks=Ryšys tarp produktų/paslaugų ir kategorijų CatMemberLinks=Ryšys tarp narių ir kategorijų -CatProdLinks=Ryšys tarp produktų/paslaugų ir kategorijų -CatCusLinks=Ryšys tarp klientų/planų ir kategorijų -CatSupLinks=Ryšys tarp tiekėjų ir kategorijų DeleteFromCat=Pašalinti iš kategorijos DeletePicture=Ištrinti nuotrauką ConfirmDeletePicture=Patvirtinkite nuotraukos trynimą @@ -112,3 +109,4 @@ CategoriesSetup=Kategorijų nustatymai CategorieRecursiv=Automatiškai susieti su pirmine kategorija CategorieRecursivHelp=Jei įjungta, produktas taip pat susijęs su pirmine kategorija, kai dedamas į subkategoriją AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang index e30bc42289a..f029909d1db 100644 --- a/htdocs/langs/lt_LT/compta.lang +++ b/htdocs/langs/lt_LT/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Klaidingas kliento apskaitos kodas %s SuppliersProductsSellSalesTurnover=Sugeneruota apyvarta pagal tiekėjo produktų pardavimus. CheckReceipt=Čekio depozitas CheckReceiptShort=Čekio depozitas +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Nauja nuolaida NewCheckDeposit=Naujas čekio depozitas NewCheckDepositOn=Sukurti sąskaitos %s depozito kvitą @@ -196,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 3e4b6b1f9ad..669a370db74 100644 --- a/htdocs/langs/lt_LT/contracts.lang +++ b/htdocs/langs/lt_LT/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Sutarčių sritis ListOfContracts=Sutarčių sąrašas -LastContracts=Paskutinės %s pakeistos sutartys +LastModifiedContracts=Last %s modified contracts AllContracts=Visos sutartys ContractCard=Sutarties kortelė ContractStatus=Sutarties būklė @@ -27,7 +27,7 @@ MenuRunningServices=Veikiančios paslaugas MenuExpiredServices=Pasibaigusios paslaugos MenuClosedServices=Uždarytos paslaugos NewContract=Nauja sutartis -AddContract=Pridėti sutartį +AddContract=Create contract SearchAContract=Ieškoti sutarties DeleteAContract=Ištrinti sutartį CloseAContract=Uždaryti sutartį @@ -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=Paskutinės %s pakeistos sutartys +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/cron.lang b/htdocs/langs/lt_LT/cron.lang index 1be23d72ca3..6c9e5b5a84b 100644 --- a/htdocs/langs/lt_LT/cron.lang +++ b/htdocs/langs/lt_LT/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# -# About = About -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +About = Apie +CronAbout = Apie Cron +CronAboutPage = Cron apie puslapį # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Skaityti Numatytas užduotis +Permission23102 = Sukurti/atnaujinti Numatytas užduotis +Permission23103 = Ištrinti Numatytas užduotis +Permission23104 = Vykdyti Numatytas užduotis # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Numatytos užduoties valdymo nustatymas +URLToLaunchCronJobs=URL patikrinti ir pradėti cron darbą, jei reikės +OrToLaunchASpecificJob=Arba patikrinti ir pradėti spec. darbą +KeyForCronAccess=Apsaugos raktas URL pradėti cron darbus +FileToLaunchCronJobs=Komandinė eilutė paleisti cron darbą +CronExplainHowToRunUnix=Unix aplinkoje reikia naudoti crontab paleisti komandinę eilutę kiekvieną minutę +CronExplainHowToRunWin=Microsoft (tm) Windows aplinkoje galite naudoti Numatytų užduočių įrankį paleisti komandinę eilutę kiekvieną minutę # Menu -# -# CronJobs=Scheduled jobs -# CronListActive= List of active jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Suplanuoti darbai +CronListActive=List of active/scheduled jobs +CronListInactive=Išjungtų darbų sąrašas # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job -# CronNone= None -# CronDtStart=Start date -# CronDtEnd=End date -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe -# CronMethod=Method -# CronModule=Module -# CronAction=Action -# CronStatus=Status -# CronStatusActive=Enabled -# CronStatusInactive=Disabled -# CronNoJobs=No jobs registered -# CronPriority=Priority -# CronLabel=Description -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronDateLastRun=Paskutinis paleistas +CronLastOutput=Paskutinė paleista išvestis +CronLastResult=Paskutinio rezultato kodas +CronListOfCronJobs=Numatytų darbų sąrašas +CronCommand=Komanda +CronList=Darbų sąrašas +CronDelete= Ištrinti cron darbus +CronConfirmDelete= Ar tikrai norite ištrinti šį cron darbą ? +CronExecute=Pradėti darbą +CronConfirmExecute= Ar tikrai norite vykdyti šį darbą dabar ? +CronInfo= Darbai leidžia vykdyti užduotį, kuri buvo suplanuota +CronWaitingJobs=Laukiantys darbai +CronTask=Darbas +CronNone= Nė vienas +CronDtStart=Pradžios data +CronDtEnd=Pabaigos data +CronDtNextLaunch=Kitas vykdymas +CronDtLastLaunch=Paskutinis vykdymas +CronFrequency=Dažnis +CronClass=Klasė +CronMethod=Metodas +CronModule=Modulis +CronAction=Veiksmas +CronStatus=Būklė +CronStatusActive=Įjungtas +CronStatusInactive=Išjungtas +CronNoJobs=Nėra registruotų darbų +CronPriority=Prioritetas +CronLabel=Aprašymas +CronNbRun=Pradėti skaičių +CronEach=Kiekvienas +JobFinished=Darbas pradėtas ir baigtas #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create -# CronArgs=Parameters -# CronSaveSucess=Save succesfully -# CronNote=Comment -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable -# CronStatusInactiveBtn=Disable -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronAdd= Pridėti darbus +CronHourStart= Užduoties pradžios data ir valanda +CronEvery= Ir vykdyti kiekvieną užduotį +CronObject= Sukurti Instanciją.Objektą +CronArgs=Parametrai +CronSaveSucess=Išsaugota sėkmingai +CronNote=Komentaras +CronFieldMandatory=Laukai %s yra privalomi +CronErrEndDateStartDt=Pabaigos data negali būti ankstesnė už pradžios datą +CronStatusActiveBtn=Įjungti +CronStatusInactiveBtn=Išjungti +CronTaskInactive=Šis darbas yra išjungtas +CronDtLastResult=Paskutinio rezultato data +CronId=ID +CronClassFile=Klasės (filename.class.php) +CronModuleHelp=Dolibarr modulio aplanko vardas (taip pat dirba su išorės Dolibarr moduliu).
    Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, modulio reikšmė yra product +CronClassFileHelp=Failo pavadinimas įkėlimui.
    Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, klasės failo vardo reikšmė yra product.class.php +CronObjectHelp=Objekto pavadinimas įkėlimui.
    Pvz.:Dolibarr Produkto objekto patraukimo metodas /htdocs/product/clas/product.class.php, klasės failo vardo reikšmė yra Product +CronMethodHelp=Objekto metodas įkėlimui.
    Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, metodo reikšmė yra fecth +CronArgsHelp=Metodo argumentai.
    Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, parametrų reikšmė gali būti 0, ProductRef +CronCommandHelp=Sistemos komandinė eilutė vykdymui # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Informacija # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Užduoties tipas +CronType_method=Dolibarr klasės kvietimo metodas +CronType_command=Apvalkalo komanda +CronMenu=Cron +CronCannotLoadClass=Nepavyko įkelti klasės %s arba objekto %s +UseMenuModuleToolsToAddCronJobs=Eikite į meniu "Pagrindinis - Modulių įrankiai - Darbo sąrašas" norėdami peržiūrėti ir redaguoti numatytus darbus. diff --git a/htdocs/langs/lt_LT/donations.lang b/htdocs/langs/lt_LT/donations.lang index 1f5134b50e7..145d05b7cf1 100644 --- a/htdocs/langs/lt_LT/donations.lang +++ b/htdocs/langs/lt_LT/donations.lang @@ -4,7 +4,7 @@ Donations=Aukos DonationRef=Aukos nuoroda Donor=Donoras Donors=Donorai -AddDonation=Pridėti auką +AddDonation=Create a donation NewDonation=Nauja auka ShowDonation=Rodyti auką DonationPromise=Dovanos pažadas @@ -31,3 +31,8 @@ DonationRecipient=Aukos gavėjas ThankYou=Ačiū IConfirmDonationReception=Gavėjas deklaruoja sekančios sumos priėmimą kaip auką MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/lt_LT/externalsite.lang index b915c37a5ab..1196c8466c0 100644 --- a/htdocs/langs/lt_LT/externalsite.lang +++ b/htdocs/langs/lt_LT/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite -# ExternalSiteSetup=Setup link to external website -# ExternalSiteURL=External Site URL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteSetup=Nustatymų nuoroda į išorinę interneto svetainę +ExternalSiteURL=Išorinės svetainės URL +ExternalSiteModuleNotComplete=Modulis ExternalSite nebuvo tinkamai sukonfigūruotas. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/lt_LT/holiday.lang b/htdocs/langs/lt_LT/holiday.lang index 41e18664822..597f964781a 100644 --- a/htdocs/langs/lt_LT/holiday.lang +++ b/htdocs/langs/lt_LT/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Atnaujinimas CantUpdate=You cannot update this leave request. NoDateDebut=Turite pasirinkti pradžios datą. NoDateFin=Turite pasirinkti pabaigos datą. -ErrorDureeCP=Jūsų prašymas suteikti atostogas neturi darbo dienų. -TitleValidCP=Patvirtinti atostogų prašymą +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Data patvirtinta TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Atmesti atostogų prašymą +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Jūs turite pasirinkti priežastį dėl prašymo atostogoms atmetimo -TitleCancelCP=Atšaukti atostogų prašymą +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Atmetimo priežastis DateRefusCP=Atmetimo data @@ -78,7 +77,7 @@ ActionByCP=Atlieka UserUpdateCP=Vartotojui PrevSoldeCP=Ankstesnis balansas NewSoldeCP=Naujas balansas -alreadyCPexist=Atostogų prašymas jau buvo padarytas šiuo laikotarpiu. +alreadyCPexist=A leave request has already been done on this period. UserName=Pavadinimas/vardas Employee=Darbuotojas FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Rankinis atnaujinimas HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Atostogų modulio konfigūracija +ConfCP=Configuration of leave request module DescOptionCP=Opcijos aprašymas ValueOptionCP=Reikšmė -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Patvirtinti konfigūraciją -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Sėkmingai atnaujinta ErrorUpdateConfCP=Atnaujinimo metu įvyko klaida, prašome pabandyti dar kartą. -AddCPforUsers=Prašome pridėti vartotojų atostogų balansą pagal paspaudę čia . -DelayForSubmitCP=Terminas kreiptis dėl atostogų -AlertapprobatortorDelayCP=Neleidžia aprobuoti, jeigu atostogų prašymo pateikimui praleisti terminai +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Patvirtinti UpdateEventCP=Atnaujinti įvykius diff --git a/htdocs/langs/lt_LT/interventions.lang b/htdocs/langs/lt_LT/interventions.lang index 1c046dff1bc..f50261243a8 100644 --- a/htdocs/langs/lt_LT/interventions.lang +++ b/htdocs/langs/lt_LT/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervencija Interventions=Intervencijos InterventionCard=Intervencijos kortelė NewIntervention=Nauja intervencija -AddIntervention=Pridėti intervenciją +AddIntervention=Create intervention ListOfInterventions=Intervencijų sąrašas EditIntervention=Redaguoti intervenciją ActionsOnFicheInter=Intervencijos veiksmai @@ -30,6 +30,15 @@ StatusInterInvoiced=Pateikta sąskaita RelatedInterventions=Susiję intervencijos ShowIntervention=Rodyti intervenciją SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Sekančios intervencijos atstovas TypeContact_fichinter_internal_INTERVENING=Intervencija diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang index 5ffb0fd7525..39c860d518d 100644 --- a/htdocs/langs/lt_LT/mails.lang +++ b/htdocs/langs/lt_LT/mails.lang @@ -115,7 +115,7 @@ SentBy=Išsiųsta iš MailingNeedCommand=Saugumo sumetimais, siunčiant e-paštu yra geriau, kai tai atliekama iš komandinės eilutės. Jei turite vieną, kreipkitės į serverio administratorių pradėti šią komandą siųsti e-paštą visiems gavėjams: MailingNeedCommand2=Galite siųsti jiems internetu pridedant parametrą MAILING_LIMIT_SENDBYWEB su maks. laiškų kiekio, norimų siųsti sesijos metu, reikšme. Tam eiti į Pagrindinis-Nustatymai-Kiti. ConfirmSendingEmailing=Jei negalite ar teikiate prioritetą siųsti juos per Jūsų www naršyklę, prašome patvirtinti, kad esate tikri, kad norite siųsti e-paštą dabar iš naršyklės. -LimitSendingEmailing=Pastaba: Internetu siunčiamas e-paštas yra ribojamas saugumo ir laiko sumetimais %s gavėjams pagal siuntimo sesiją. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Išvalyti sąrašą ToClearAllRecipientsClickHere=Spauskite čia, kad išvalytumėte šio e-laiško gavėjų sąrašą ToAddRecipientsChooseHere=Įtraukti gavėjus pasirinkant iš sąrašų @@ -133,6 +133,9 @@ Notifications=Pranešimai NoNotificationsWillBeSent=Nėra numatytų e-pašto pranešimų šiam įvykiui ir įmonei ANotificationsWillBeSent=1 pranešimas bus išsiųstas e-paštu SomeNotificationsWillBeSent=%s pranešimai bus siunčiami e-paštu -AddNewNotification=Įjungti naujo e-pašto pranešimo užklausą -ListOfActiveNotifications=Visų aktyvių e-pašto pranešimo užklausų sąrašas +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Visų išsiųstų e-pašto pranešimų sąrašas +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang index 0e998278fa0..e994caef29e 100644 --- a/htdocs/langs/lt_LT/main.lang +++ b/htdocs/langs/lt_LT/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Nepavyko rasti vartotojo %s Dolibar ErrorNoVATRateDefinedForSellerCountry=Klaida, nėra apibrėžtų PVM tarifų šaliai '%s'. ErrorNoSocialContributionForSellerCountry=Klaida, nėra apibrėžtų socialinių įmokų šaliai '%s'. ErrorFailedToSaveFile=Klaida, nepavyko išsaugoti failo. -ErrorOnlyPngJpgSupported=Klaida, palaikomi tik .png ir .jpg ekrano vaizdo formatai. -ErrorImageFormatNotSupported=Jūsų PHP nepalaiko funkcijos konvertuoti šio formato vaizdus. SetDate=Nustatyti datą SelectDate=Pasirinkti datą SeeAlso=Taip pat žiūrėkite %s BackgroundColorByDefault=Fono spalva pagal nutylėjimą +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=Failas prikabinimui pasirinktas, bet dar nebuvo įkeltas. Paspauskite tam "Pridėti failą". NbOfEntries=Įrašų skaičius GoToWikiHelpPage=Skaityti tiesioginės pagalbos žinyne (būtina interneto prieiga) @@ -266,6 +266,7 @@ Afternoon=Popietė Quadri=Ketur- MonthOfDay=Dienos mėnuo HourShort=H +MinuteShort=mn Rate=Norma UseLocalTax=Įtraukti mokestį Bytes=Baitų @@ -340,6 +341,7 @@ FullList=Pilnas sąrašas Statistics=Statistika OtherStatistics=Kiti statistika Status=Būklė +Favorite=Favorite ShortInfo=Informacija Ref=Nuoroda RefSupplier=Tiekėjo nuoroda @@ -365,6 +367,7 @@ ActionsOnCompany=Įvykiai su šia trečiają šalimi ActionsOnMember=Įvykiai su šiuo nariu NActions=%s įvykiai NActionsLate=%s vėluoja +RequestAlreadyDone=Request already recorded Filter=Filtras RemoveFilter=Pašalinti filtrą ChartGenerated=Sukurta diagrama @@ -645,6 +648,7 @@ OptionalFieldsSetup=Papildomų atributų nustatymas URLPhoto=Nuotraukos/logotipo URL SetLinkToThirdParty=Saitas į kitą trečiąją šalį CreateDraft=Sukurti projektą +SetToDraft=Back to draft ClickToEdit=Spausk redaguoti ObjectDeleted=Objektas %s ištrintas ByCountry=Pagal šalį @@ -678,7 +682,7 @@ ViewPrivateNote=Peržiūrėti pastabas XMoreLines=%s paslėptos eilutės PublicUrl=Viešas URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Pirmadienis Tuesday=Antradienis diff --git a/htdocs/langs/lt_LT/margins.lang b/htdocs/langs/lt_LT/margins.lang index e8d5fed1af9..273ff448e74 100644 --- a/htdocs/langs/lt_LT/margins.lang +++ b/htdocs/langs/lt_LT/margins.lang @@ -1,50 +1,44 @@ # Dolibarr language file - Source file is en_US - marges -Margin=Margin -Margins=Margins -TotalMargin=Total Margin -MarginOnProducts=Margin / Products -MarginOnServices=Margin / Services -MarginRate=Margin rate -MarkRate=Mark rate -DisplayMarginRates=Display margin rates -DisplayMarkRates=Display mark rates -InputPrice=Input price - -margin=Profit margins management -margesSetup=Profit margins management setup - -MarginDetails=Margin details - -ProductMargins=Product margins -CustomerMargins=Customer margins -SalesRepresentativeMargins=Sales representative margins - -ProductService=Product or Service -AllProducts=All products and services -ChooseProduct/Service=Choose product or service - -StartDate=Start date -EndDate=End date -Launch=Start - -ForceBuyingPriceIfNull=Force buying price if null -ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) -MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts -UseDiscountAsProduct=As a product -UseDiscountAsService=As a service -UseDiscountOnTotal=On subtotal -MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - -MARGIN_TYPE=Margin type -MargeBrute=Raw margin -MargeNette=Net margin -MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - -CostPrice=Cost price -BuyingCost=Cost price -UnitCharges=Unit charges -Charges=Charges - -AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +Margin=Marža +Margins=Maržos +TotalMargin=Visa marža +MarginOnProducts=Maržos/Produktai +MarginOnServices=Maržos/Paslaugos +MarginRate=Maržos norma +MarkRate=Pažymėti normą +DisplayMarginRates=Rodyti maržos normas +DisplayMarkRates=Rodyti žymių normas +InputPrice=Įvesti kaina +margin=Pelno maržų valdymas +margesSetup=Pelno maržų valdymo nustatymai +MarginDetails=Maržos detalės +ProductMargins=Produkto maržos +CustomerMargins=Kliento maržos +SalesRepresentativeMargins=Prekybos atstovo maržos +ProductService=Produktas ar Paslaugos +AllProducts=Visi produktai ir paslaugos +ChooseProduct/Service=Pasirinkite produktą ar paslaugą +StartDate=Pradžios data +EndDate=Pabaigos data +Launch=Pradžia +ForceBuyingPriceIfNull=Priverstinė pirkimo kaina, jei nulis +ForceBuyingPriceIfNullDetails=Jei "ON", marža bus 0 (pirkimo kaina = pardavimo kaina), kitaip ("OFF"), marža bus lygi pardavimo kainai (pirkimo kaina = 0) +MARGIN_METHODE_FOR_DISCOUNT=Maržos metodas visuotinėms nuolaidoms +UseDiscountAsProduct=Kaip produktas +UseDiscountAsService=Kaip paslauga +UseDiscountOnTotal=Tarpinė suma +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Apibrėžia, ar visuotinė nuolaida yra traktuojama kaip produktas, kaip paslaugos ar tik tarpinė sumamaržos skaičiavimui. +MARGIN_TYPE=Maržos tipas +MargeBrute=Maržos eilutė +MargeNette=Grynojo pelno marža +MARGIN_TYPE_DETAILS=Maržos eilutė: Pardavimo kaina - Pirkimo kaina
    Grynoji marža: Pardavimo kaina - Savikaina +CostPrice=Savikaina +BuyingCost=Savikaina +UnitCharges=Vieneto sąnaudos +Charges=Sąnaudos +AgentContactType=Prekybos agento kontakto tipas +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/lt_LT/orders.lang index 8f24c815535..f17be373c09 100644 --- a/htdocs/langs/lt_LT/orders.lang +++ b/htdocs/langs/lt_LT/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Gabenimas vyksta DraftOrWaitingApproved=Projektas arba patvirtintas, bet dar nebuvo užsakymo DraftOrWaitingShipped=Projektas arba patvirtintas, bet dar negabenamas MenuOrdersToBill=Pristatyti užsakymai -MenuOrdersToBill2=Užsakymai, kuriems reikia pateikti sąskaitą-faktūrą +MenuOrdersToBill2=Billable orders SearchOrder=Ieškoti užsakymo SearchACustomerOrder=Ieškoti kliento užsakymo ShipProduct=Gabenti produktą @@ -65,7 +65,7 @@ ValidateOrder=Patvirtinti užsakymą UnvalidateOrder=Nepatvirtinti užsakymo DeleteOrder=Ištrinti užsakymą CancelOrder=Atšaukti užsakymą -AddOrder=Pridėti užsakymą +AddOrder=Create order AddToMyOrders=Įtraukti į mano užsakymus AddToOtherOrders=Įtraukti į kitų užsakymus AddToDraftOrders=Pridėti į užsakymo projektą @@ -154,7 +154,6 @@ OrderByPhone=Telefonas CreateInvoiceForThisCustomer=Pateikti sąskaitą užsakymams NoOrdersToInvoice=Nėra užsakymų, kuriems galima išrašyti sąskaitą CloseProcessedOrdersAutomatically=Klasifikuoti "Apdoroti" visus pasirinktus užsakymus. -MenuOrdersToBill2=Užsakymai, kuriems reikia pateikti sąskaitą-faktūrą OrderCreation=Užsakymo kūrimas Ordered=Užsakyta OrderCreated=Jūsų užsakymai sukurti diff --git a/htdocs/langs/lt_LT/oscommerce.lang b/htdocs/langs/lt_LT/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/lt_LT/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang index 87717932cad..36fb7dd69b7 100644 --- a/htdocs/langs/lt_LT/other.lang +++ b/htdocs/langs/lt_LT/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Saugos kodas Calendar=Kalendorius -AddTrip=Pridėti atskyriklį Tools=Įrankiai ToolsDesc=Ši sritis yra skirta įvairių Įrankių, nepasiekiamų per kitus meniu, grupei.

    Šie įrankiai gali būti pasiekiami iš šoninio meniu. Birthday=Gimimo diena @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Projekto kūrimas Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Prikabintų failų/dokumentų skaičius TotalSizeOfAttachedFiles=Iš viso prikabintų failų/dokumentų dydis MaxSize=Maksimalus dydis @@ -80,6 +80,16 @@ ModifiedBy=Modifikuota %s ValidatedBy=Patvirtinta %s CanceledBy=Atšaukta %s ClosedBy=Uždaryta %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Failas %s buvo pašalintas DirWasRemoved=Katalogas %s buvo pašalintas FeatureNotYetAvailableShort=Galimas sekančioje versijoje @@ -193,25 +203,26 @@ ForgetIfNothing=Jei neprašėte šio pakeitimo, tiesiog pamirškite šį praneš ##### Calendar common ##### AddCalendarEntry=Pridėti įrašą kalendoriuje %s -NewCompanyToDolibarr=Įmonė %s įdėta į Dolibarr -ContractValidatedInDolibarr=Sutartis %s pripažinta galiojančia Dolibarr -ContractCanceledInDolibarr=Sutartis %s atšaukta Dolibarr -ContractClosedInDolibarr=Sutartis %s uždaryta Dolibarr -PropalClosedSignedInDolibarr=Pasiūlymas %s pasirašytas Dolibarr -PropalClosedRefusedInDolibarr=Pasiūlymas %s atmestas Dolibarr -PropalValidatedInDolibarr=Pasiūlymas %s pripažintas galiojančiu Dolibarr -InvoiceValidatedInDolibarr=Sąskaita-faktūra %s pripažinta galiojančia Dolibarr -InvoicePaidInDolibarr=Sąskaita-faktūra %s pasikeista į apmokėtą Dolibarr -InvoiceCanceledInDolibarr=Sąskaita-faktūra %s atšaukta Dolibarr -PaymentDoneInDolibarr=Mokėjimas %s atliktas Dolibarr -CustomerPaymentDoneInDolibarr=Kliento mokėjimas %s atliktas Dolibarr -SupplierPaymentDoneInDolibarr=Tiekėjo mokėjimas %s atliktas Dolibarr -MemberValidatedInDolibarr=Narys %s patvirtintas Dolibarr -MemberResiliatedInDolibarr=Narys %s atkurtas Dolibarr -MemberDeletedInDolibarr=Narys %s ištrintas iš Dolibarr -MemberSubscriptionAddedInDolibarr=Pasirašymas nariui %s pridėtas į Dolibarr -ShipmentValidatedInDolibarr=Pakrovimas %s patvirtintas Dolibarr -ShipmentDeletedInDolibarr=Pakrovimas %s ištrintas iš Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Eksportas ExportsArea=Eksporto sritis diff --git a/htdocs/langs/lt_LT/paybox.lang b/htdocs/langs/lt_LT/paybox.lang index b689bb6cebf..b615d096db2 100644 --- a/htdocs/langs/lt_LT/paybox.lang +++ b/htdocs/langs/lt_LT/paybox.lang @@ -1,37 +1,40 @@ # Dolibarr language file - Source file is en_US - paybox -# PayBoxSetup=PayBox module setup -# PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) -# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects -# PaymentForm=Payment form -# WelcomeOnPaymentPage=Welcome on our online payment service -# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. -# ThisIsInformationOnPayment=This is information on payment to do -# ToComplete=To complete -# YourEMail=Email to receive payment confirmation -# Creditor=Creditor -# PaymentCode=Payment code -# PayBoxDoPayment=Go on payment -# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information -# PleaseBePatient=Please, be patient -# Continue=Next -# ToOfferALinkForOnlinePayment=URL for %s payment -# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order -# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice -# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line -# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount -# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription -# YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. -# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. -# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. -# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. -# AccountParameter=Account parameters -# UsageParameter=Usage parameters -# InformationToFindParameters=Help to find your %s account information -# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment -# VendorName=Name of vendor -# CSSUrlForPaymentForm=CSS style sheet url for payment form -# MessageOK=Message on validated payment return page -# MessageKO=Message on canceled payment return page -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PayBoxSetup=Paybox modulio nustatymas +PayBoxDesc=Šis modulis siūlo puslapius, leidžiančius mokėjimą Paybox klientams. Tai gali būti naudojama nemokamam mokėjimui arba tam tikram specifiniam Dolibarr mokėjimui (sąskaitos-faktūros, užskymas, ...) +FollowingUrlAreAvailableToMakePayments=Sekantys URL siūlo puslapį klientui Dolibarr objektų mokėjimui +PaymentForm=Mokėjimo forma +WelcomeOnPaymentPage=Sveiki atvykę į mūsų interneto mokėjimo paslaugą +ThisScreenAllowsYouToPay=Šis ekranas leidžia atlikti internetinį mokėjimą į %s +ThisIsInformationOnPayment=Tai informacija apie reikalingą atlikti mokėjimą +ToComplete=Užbaigti +YourEMail=E-paštas mokėjimo patvirtinimo gavimui +Creditor=Kreditorius +PaymentCode=Mokėjimo kodas +PayBoxDoPayment=Eiti į mokėjimą +YouWillBeRedirectedOnPayBox=Būsite nukreipti į saugų Paybox puslapį kredito kortelės informacijos įvedimui +PleaseBePatient=Prašome, būkite kantrūs +Continue=Kitas +ToOfferALinkForOnlinePayment=URL %s mokėjimui +ToOfferALinkForOnlinePaymentOnOrder=URL siūlo %s interneto mokėjimui vartotojo sąsają kliento užsakymui +ToOfferALinkForOnlinePaymentOnInvoice=URL siūlo %s interneto mokėjimui vartotojo sąsają kliento sąskaitai-faktūrai +ToOfferALinkForOnlinePaymentOnContractLine=URL siūlo %s interneto mokėjimui vartotojo sąsają sutarties eilutei. +ToOfferALinkForOnlinePaymentOnFreeAmount=URL siūlo %s interneto mokėjimui vartotojo sąsaja nemokamam kiekiui. +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL pasiūlymui %s interneto mokėjimui vartotojo sąsają nario pasirašymui. +YouCanAddTagOnUrl=Taip pat galite pridėti URL parametrą &tag=value į bet kurį URL (reikalingas tik nemokamam mokėjimui) pridėti nuosavo mokėjimo komentaro žymę. +SetupPayBoxToHavePaymentCreatedAutomatically=Nustatyti savo Paybox su URL %s, kad mokėjimas būtų sukuriamas automatiškai, kai patvirtintas per PayBox. +YourPaymentHasBeenRecorded=Šis puslapis patvirtina, kad jūsų mokėjimas buvo užregistruotas. Ačiū. +YourPaymentHasNotBeenRecorded=Mokėjimas nebuvo įregistruotas ir operacija buvo atšaukta. Ačiū. +AccountParameter=Sąskaitos parametrai +UsageParameter=Naudojimo parametrai +InformationToFindParameters=Padėti rasti savo %s sąskaitos informaciją +PAYBOX_CGI_URL_V2=Paybox CGI modulio mokėjimams URL +VendorName=Paravėjo vardas +CSSUrlForPaymentForm=CSS stiliaus lapo URL mokėjimo formai +MessageOK=Pranešimas patvirtinto mokėjimo grąžinimo puslapyje +MessageKO=Pranešimas atšaukto mokėjimo grąžinimo puslapyje +NewPayboxPaymentReceived=Naujas Paybox gautas mokėjimas +NewPayboxPaymentFailed=Naujas Paybox mokėjimo bandymas, bet nepavykęs +PAYBOX_PAYONLINE_SENDEMAIL=E-laiškas įspėjimui po apmokėjimo (sėkmingas ar ne) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/lt_LT/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang index 2e735a6697c..38030437e9b 100644 --- a/htdocs/langs/lt_LT/sendings.lang +++ b/htdocs/langs/lt_LT/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Šiuo metu, naujos siuntos sukūrimas atliktas i RelatedShippings=Susiję siuntos ShipmentLine=Siuntimo eilutė CarrierList=Vežėjų sąrašas +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Kliento pagautė diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang index 5a69d15bac6..de4457074dc 100644 --- a/htdocs/langs/lt_LT/stocks.lang +++ b/htdocs/langs/lt_LT/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Sandėlio etiketė būtina CorrectStock=Koreguoti atsargas ListOfWarehouses=Sandėlių sąrašas ListOfStockMovements=Atsargų judėjimų sąrašas -StocksArea=Atsargų sritis +StocksArea=Warehouses area Location=Vieta LocationSummary=Trumpas vietos pavadinimas NumberOfDifferentProducts=Skirtingų produktų skaičius diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang index 1bcbada5049..f463e8e7216 100644 --- a/htdocs/langs/lt_LT/users.lang +++ b/htdocs/langs/lt_LT/users.lang @@ -63,7 +63,6 @@ ShowGroup=Rodyti grupę ShowUser=Rodyti vartotoją NonAffectedUsers=Neįgalioti vartotojai UserModified=Vartotojas sėkmingai modifikuotas -GroupModified=Grupė sėkmingai modifikuota PhotoFile=Nuotraukos failas UserWithDolibarrAccess=Vartotojas su Dolibarr prieiga ListOfUsersInGroup=Šios grupės vartotojų sąrašas @@ -103,7 +102,7 @@ UserDisabled=Vartotojas %s išjungtas UserEnabled=Vartotojas %s aktyvuotas UserDeleted=Vartotojas %s pašalintas NewGroupCreated=Grupė %s sukurta -GroupModified=Grupė sėkmingai modifikuota +GroupModified=Group %s modified GroupDeleted=Grupė %s pašalinta ConfirmCreateContact=Ar tikrai norite sukurti Dolibarr sąskaitą šiam adresui ? ConfirmCreateLogin=Ar tikrai norite sukurti Dolibarr sąskaitą šiam nariui ? @@ -114,8 +113,10 @@ YourRole=Jūsų vaidmenys YourQuotaOfUsersIsReached=Jūsų aktyvių vartotojų kvota išnaudota ! NbOfUsers=Vartotojų skaičius DontDowngradeSuperAdmin=Tik superadministratorius gali sumažinti kito superadministratoriaus teises -HierarchicalResponsible=Atsakomybės hierarchija +HierarchicalResponsible=Supervisor HierarchicView=Hierarchinis vaizdas UseTypeFieldToChange=Pakeitimui naudoti laukelio tipą OpenIDURL=OpenID URL LoginUsingOpenID=Prisijungimui naudoti OpenID +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang index b9c09e7b8f5..9181af3d105 100644 --- a/htdocs/langs/lt_LT/withdrawals.lang +++ b/htdocs/langs/lt_LT/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kvitas LastWithdrawalReceipts=Paskutinio %s išėmimo įplaukos WithdrawedBills=Panaikintos sąskaitos-faktūros WithdrawalsLines=Atšaukimo eilutės -RequestStandingOrderToTreat=Periodinių neapdorotų užsakymų užklausa -RequestStandingOrderTreated=Periodinių apdorotų užsakymų užklausa +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Kliento periodiniai užsakymai CustomerStandingOrder=Kliento periodiniai užsakymai NbOfInvoiceToWithdraw=Sąskaitos-faktūros su atsiėmimo prašymu numeris @@ -40,14 +41,13 @@ TransMetod=Perdavimo būdas Send=Siųsti Lines=Linijos StandingOrderReject=Išduoti atmetimą -InvoiceRefused=Sąskaita-faktūra atmesta WithdrawalRefused=Išėmimas atmestas WithdrawalRefusedConfirm=Ar tikrai norite įvesti išėmimo atmetimą visuomenei ? RefusedData=Atmetimo data RefusedReason=Atmetimo priežastis RefusedInvoicing=Atmetimo apmokestinimas NoInvoiceRefused=Neapmokestinti atmetimo -InvoiceRefused=Sąskaita-faktūra atmesta +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Būklė StatusUnknown=Nežinomas StatusWaiting=Laukiama @@ -76,13 +76,14 @@ WithBankUsingRIB=Banko sąskaitoms, naudojančioms RIB WithBankUsingBANBIC=Banko sąskaitoms, naudojančioms IBAN / BIC / SWIFT BankToReceiveWithdraw=Banko sąskaita išėmimų gavimui CreditDate=Kreditą -WithdrawalFileNotCapable=Neįmanoma sugeneruoti išėmimo gavimo failo Jūsų šaliai +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/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang index e6c5bf4000e..cb192f1f684 100644 --- a/htdocs/langs/lv_LV/accountancy.lang +++ b/htdocs/langs/lv_LV/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Apstiprināt Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=Jānosūta Dispatched=Nosūtīts -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Atskaites ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=Virsgrāmata AccountBalanceByMonth=Konta bilance pa mēnešiem -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Apstrādā EndProcessing=The end of processing @@ -66,11 +66,11 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTING_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=CSV atdalītājs -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=Jaauns fiskālais gads -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index 7d86abfa21d..a0aeaf89735 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -14,7 +14,7 @@ SessionSavePath=Atmiņas sesija lokalizācija PurgeSessions=Iztīrīt sesijas ConfirmPurgeSessions=Vai jūs tiešām vēlaties iztīrītu visas sesijas? Tas atvienos katru lietotāju (izņemot sevi). NoSessionListWithThisHandler=Saglabāt sesija apdarinātājs konfigurēts jūsu PHP neļauj uzskaitīt visas darbojošās sesijas. -LockNewSessions=Lock jaunus sakarus +LockNewSessions=Bloķēt jaunas sesijas ConfirmLockNewSessions=Vai jūs tiešām vēlaties, lai ierobežotu jebkuru jaunu Dolibarr savienojumu ar sevi. Tikai lietotājs %s varēs pieslēgties pēc tam. UnlockNewSessions=Noņemt savienojuma bloķēšanu YourSession=Jūsu sesija @@ -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 @@ -359,7 +362,7 @@ UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites SecurityTokenIsUnique=Izmantojiet unikālu securekey parametrs katram URL EnterRefToBuildUrl=Ievadiet atsauci objektam %s GetSecuredUrl=Saņemt aprēķināto URL -ButtonHideUnauthorized=Slēpt pogas, lai neatļautu rīcību, nevis rāda invalīdu pogas +ButtonHideUnauthorized=Slēpt pogas, kas nav pieejamas nevis rādīt tās pelēcīgas OldVATRates=Vecā PVN likme NewVATRates=Jaunā PVN likme PriceBaseTypeToChange=Pārveidot par cenām ar bāzes atsauces vērtību, kas definēta tālāk @@ -437,14 +440,14 @@ Module52Name=Krājumi Module52Desc=Krājumu pārvaldīšana (produkti) Module53Name=Pakalpojumi Module53Desc=Pakalpojumu vadība -Module54Name=Līgumi -Module54Desc=Līgumu un pakalpojumu pārvaldība +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Svītrkodi 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=Projekti -Module400Desc=Projektu vadība iekšpusē citiem moduļiem +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Atalgojums Module510Desc=Management of employees salaries and payments Module600Name=Paziņojumi -Module600Desc=Sūtīt paziņojumus pa e-pastu uz dažiem Dolibarr biznesa notikumiem trešo pušu kontaktiem +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Ziedojumi Module700Desc=Ziedojumu pārvaldība Module1200Name=Dievlūdzējs @@ -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=Dinamiskas cenas +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 @@ -514,20 +521,20 @@ Module5000Name=Multi-kompānija Module5000Desc=Ļauj jums pārvaldīt vairākus uzņēmumus Module6000Name=Darba plūsma Module6000Desc=Plūsmas vadība -Module20000Name=Brīvdienas -Module20000Desc=Atzīt un ievērot darbinieku brīvdienas +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 Module50100Desc=Tirdzniecības punkta moduļi -Module50200Name= Paypal -Module50200Desc= Modulis piedāvā tiešsaistes maksājumu lapā ar kredītkarti ar Paypal +Module50200Name=Paypal +Module50200Desc=Modulis piedāvā tiešsaistes maksājumu lapā ar kredītkarti ar Paypal 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 @@ -543,7 +550,7 @@ Permission14=Pārbaudīt klientu rēķinus Permission15=Nosūtīt klientu rēķinus pa e-pastu Permission16=Izveidot maksājumus klientu rēķiniem Permission19=Dzēst klienta rēķinu -Permission21=Lasīt komerciālos priekšlikumus +Permission21=Skatīt komerciālos priekšlikumus Permission22=Izveidot/mainīt komerciālos priekšlikumus Permission24=Apstiprināt komerciālos priekšlikumus Permission25=Sūtīt komerciālus priekšlikumus @@ -606,15 +613,16 @@ Permission151=Lasīt pastāvīgos pieprasījumus Permission152=Izveidot / mainīt pastāvīgu pasūtījumu pieprasījumu Permission153=Transmisijas regulārā maksājuma rīkojumu ieņēmumi Permission154=Kredītkartes / atteikties regulārā maksājuma rīkojumu ieņēmumiem -Permission161=Lasīt līgumus -Permission162=Izveidot / mainīt līgumus -Permission163=Aktivizētu pakalpojumu līgumu -Permission164=Atslēgt pakalpojumu līguma slēgšanu -Permission165=Dzēst līgumus -Permission171=Lasīt braucienus -Permission172=Izveidot / mainīt braucienus -Permission173=Dzēst braucienus -Permission178=Eksportēt braucienus +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=Izveidot/labot ceļojumu un izdevumus +Permission173=Dzēst ceļojumus un izdevumus +Permission174=Read all trips and expenses +Permission178=Eksportēt ceļojumus un izdevumus Permission180=Lasīt piegādātājus Permission181=Lasīt piegādātāju pasūtījumus Permission182=Izveidot/mainīt piegādātāju pasūtījumus @@ -666,12 +674,12 @@ Permission283=Dzēst kontaktus Permission286=Eksportēt kontaktus Permission291=Skatīt tarifus Permission292=Kas atļaujas par tarifiem -Permission293=Modificēt klientiem tarifus +Permission293=Labot klientu tarifus Permission300=Lasīt svītrkodus Permission301=Izveidot / mainīt svītrkodus Permission302=Dzēst svītrkodus Permission311=Lasīt pakalpojumus -Permission312=Piešķirt pakalpojumu līgumam +Permission312=Assign service/subscription to contract Permission331=Lasīt grāmatzīmes Permission332=Izveidot/mainīt grāmatzīmes Permission333=Dzēst grāmatzīmes @@ -701,8 +709,8 @@ Permission701=Lasīt ziedojumus Permission702=Izveidot/mainīt ziedojumus Permission703=Dzēst ziedojumus Permission1001=Lasīt krājumus -Permission1002=Izveidot / mainīt krājumus -Permission1003=Dzēst krājumus +Permission1002=Assign service/subscription to contract +Permission1003=Dzēst noliktavas Permission1004=Lasīt krājumu pārvietošanas Permission1005=Izveidot/mainīt krājumu pārvietošanu Permission1101=Skatīt piegādes pasūtījumus @@ -778,6 +786,7 @@ DictionaryOrderMethods=Pasūtījumu veidi DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Kontu līknes DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=E-pastu paraugi SetupSaved=Iestatījumi saglabāti BackToModuleList=Atpakaļ uz moduļu sarakstu BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu @@ -887,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 @@ -995,9 +1005,9 @@ YourPHPDoesNotHaveSSLSupport=SSL funkcijas, kas nav pieejama jūsu PHP DownloadMoreSkins=Vairāki izskati lejupielādei SimpleNumRefModelDesc=Atgriež atsauces numuru formātā %syymm-NNNN kur yy ir gads, MM ir mēnesis, un nnnn ir secība bez cauruma un bez reset ShowProfIdInAddress=Rādīt professionnal id ar adresēm par dokumentu -ShowVATIntaInAddress=Slēpt PVN Intra num ar adresēm uz dokumentiem +ShowVATIntaInAddress=Slēpt PVN maksātāja numuru un adreses uz dokumentiem TranslationUncomplete=Daļējs tulkojums -SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/. +SomeTranslationAreUncomplete=Dažas valodas var būt daļēji iztulkotas, vai saturēt kļūdas. Ja atrodat kādu neprecizitāti, tad varat to izlabot piereģistrējoties http://transifex.com/projects/p/dolibarr/. MenuUseLayout=Padarīt vertikālās izvēlnes hidable (opcija JavaScript nedrīkst atspējots) MAIN_DISABLE_METEO=Atslēgt Meteo skatu TestLoginToAPI=Tests pieteikties API @@ -1038,7 +1048,6 @@ YesInSummer=Jā vasarā OnlyFollowingModulesAreOpenedToExternalUsers=Ņemiet vērā, ka tikai šādi moduļi ir pieejami ārējiem lietotājiem (Lai ar kādas ir atļaujas šiem lietotājiem): SuhosinSessionEncrypt=Sesija uzglabāšana šifrēta ar Suhosin ConditionIsCurrently=Stāvoklis šobrīd ir %s -TestNotPossibleWithCurrentBrowsers=Automātiska noteikšana nav iespējama YouUseBestDriver=Jūs varat izmantot vadītāja %s, kas ir labākais draiveris, kas pieejams šobrīd. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=Tev ir tikai %s produktus / pakalpojumus Into datu bāze. Tas nav nepieciešams kādu konkrētu optimizāciju. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Atgriezties grāmatvedības kodu būvēts pēc:
    % ModuleCompanyCodePanicum=Atgriezt tukšu grāmatvedības uzskaites kodu. ModuleCompanyCodeDigitaria=Grāmatvedība kods ir atkarīgs no trešās personas kodu. Kods sastāv no simbols "C" pirmajā pozīcijā un pēc tam pirmais 5 zīmēm no trešās puses kodu. UseNotifications=Izmantot paziņojumus -NotificationsDesc=E-pastus paziņojumi funkcija ļauj jums klusi sūtīt automātisko pastu, dažiem Dolibarr notikumiem, trešajām personām (klientiem vai piegādātājiem), kas ir konfigurēti. Izvēle aktīvas paziņošanas un Mērķu kontaktiem tiek veikta viena trešā persona laikā. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Dokumentu veidnes DocumentModelOdt=Izveidot dokumentus no OpenDocument veidnes (. ODT vai. ODS failus OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Ūdenszīme dokumenta projektā @@ -1124,7 +1133,7 @@ EnableEditDeleteValidInvoice=Nodrošinātu iespēju rediģēt / dzēst derīgu r SuggestPaymentByRIBOnAccount=Ieteikt maksājumus, ko izņemt no konta SuggestPaymentByChequeToAddress=Ieteikt maksājumu ar čeku, lai FreeLegalTextOnInvoices=Brīvs teksts uz rēķiniem -WatermarkOnDraftInvoices=Ūdenszīme projektu rēķiniem (none ja tukšs) +WatermarkOnDraftInvoices=Ūdenszīme uz sagataves rēķiniem (nav ja tukšs) ##### Proposals ##### PropalSetup=Commercial priekšlikumi modulis uzstādīšana CreateForm=Izveidot veidlapas @@ -1138,14 +1147,16 @@ AddDeliveryAddressAbility=Pievienot piegādes datuma iespējas UseOptionLineIfNoQuantity=Produkta / pakalpojuma ar nulles summu līnija tiek uzskatīta par iespēju FreeLegalTextOnProposal=Brīvais teksts komerciālajos priekšlikumos WatermarkOnDraftProposal=Ūdenszīme projektu komerciālo priekšlikumu (none ja tukšs) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Pasūtījumu vadības iestatīšana -OrdersNumberingModules=Pasūtījumi numerācijas modeļus +OrdersNumberingModules=Pasūtījumu numerācijas modeļi OrdersModelModule=Pasūtīt dokumenti modeļi HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Lai apstiprinātu pasūtījumu pēc priekšlikuma tuvāk, ļauj ne soli pa pagaidu rīkojumu FreeLegalTextOnOrders=Brīvs teksts pasūtījumos WatermarkOnDraftOrders=Ūdenszīme projektu pasūtījumiem (none ja tukšs) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Klikšķiniet Dial moduļa uzstādīšanas ClickToDialUrlDesc=Url sauc, kad uz tālruņa Piktogramma klikšķis tiek darīts. In URL, jūs varat izmantot tagus
    __PHONETO__ Kas tiks aizstāts ar tālruņa numuru personai, lai izsauktu
    __PHONEFROM__ Kas tiks aizstāts ar tālruņa numuru, aicinot personas (jūsu)
    __LOGIN__ Kas tiks aizstāts ar jūsu clicktodial pieteikšanās (definēts jūsu lietotāja kartes)
    __PASS__ Kas tiks aizstāts ar jūsu clicktodial paroli (definēts jūsu lietotāja kartes). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervences numerācijas modeļi TemplatePDFInterventions=Intervences karšu dokumenti modeļi WatermarkOnDraftInterventionCards=Ūdenszīme intervences karšu dokumentiem (neviena ja tukšs) ##### Contracts ##### -ContractsSetup=Līgumi modulis uzstādīšana +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Līgumi numerācijas moduļus TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1250,9 +1261,9 @@ LDAPLdapMapping=LDAP kartēšana LDAPFieldLoginUnix=Lietotājs (Unix) LDAPFieldLoginExample=Piemērs: uid LDAPFilterConnection=Meklēšanas filtrs -LDAPFilterConnectionExample=Piemērs: &(objektklase = inetOrgPerson) -LDAPFieldLoginSamba=Login (samba, ActiveDirectory) -LDAPFieldLoginSambaExample=Piemērs: samaccountname +LDAPFilterConnectionExample=Piemērs: &(objektClass = inetOrgPerson) +LDAPFieldLoginSamba=Lietotāja vārds (samba, Aktīvā direktorija) +LDAPFieldLoginSambaExample=Piemērs: kāds konta nosaukums LDAPFieldFullname=Vārds un uzvārds LDAPFieldFullnameExample=Piemērs: cn LDAPFieldPassword=Parole @@ -1264,7 +1275,7 @@ LDAPFieldCommonNameExample=Piemērs: cn LDAPFieldName=Nosaukums LDAPFieldNameExample=Piemērs: sn LDAPFieldFirstName=Vārds -LDAPFieldFirstNameExample=Piemērs: givenName +LDAPFieldFirstNameExample=Piemērs: Vārds LDAPFieldMail=E-pasta adrese LDAPFieldMailExample=Piemērs: pasts LDAPFieldPhone=Darba tālruņa numurs @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Faili Tipa %s nav saspiesti ar HTTP serveri CacheByServer=Cache serverim CacheByClient=Cache pārlūks CompressionOfResources=Kompresijas HTTP atbildes -TestNotPossibleWithCurrentBrowsers=Automātiska noteikšana nav iespējama +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Produktu moduļa uzstādīšana ServiceSetup=Pakalpojumu moduļa uzstādīšana @@ -1382,9 +1393,10 @@ MailingSetup=Pasta vēstuļu sūtīšanas modulis iestatīšanu MailingEMailFrom=Nosūtītāja e-pasts (No) uz e-pastu nosūtīto vēstuļu sūtīšanas modulis MailingEMailError=Atgriezties e-pastu (Kļūdas-līdz) uz e-pastu ar kļūdām ##### Notification ##### -NotificationSetup=Paziņošana bu e-pasta modulis iestatīšanas +NotificationSetup=EMail notification module setup NotificationEMailFrom=Nosūtītāja e-pasts (No) uz e-pastu nosūtīti paziņojumi -ListOfAvailableNotifications=Saraksts ar pieejamiem paziņojumiem (Šis saraksts ir atkarīgs no aktīvajiem moduļiem) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Nosūtot modulis iestatīšanu SendingsReceiptModel=Nosūtot saņemšanas modeli @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Savienojums ar serveri '%s' par datu bāzē '%s' ar lietotāja OSCommerceTestKo1=Savienojums ar serveri '%s' izdoties, bet datubāze '%s' nevar sasniegt. OSCommerceTestKo2=Savienojums ar serveri '%s' ar lietotāja '%s' neizdevās. ##### Stock ##### -StockSetup=Konfigurācijas modulis akciju -UserWarehouse=Izmantot lietotāja personīgos krājumi +StockSetup=Noliktavu moduļa iestatījumi +UserWarehouse=Izmantot lietotāja personīgās noliktavas +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=Izvēlne dzēsta TreeMenu=Izvēlņu koks @@ -1478,11 +1491,14 @@ ClickToDialDesc=Šis modulis ļauj pievienot ikonu pēc tālruņa numuriem. Uz ##### Point Of Sales (CashDesk) ##### CashDesk=Tirdzniecības punkts CashDeskSetup=Pārdošanas punktu moduļa iestatīšana -CashDeskThirdPartyForSell=Generic trešajai personai izmantot pārdod +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Noklusējuma konts, lai izmantotu, lai saņemtu naudas maksājumus CashDeskBankAccountForCheque= Noklusējuma konts, lai izmantotu, lai saņemtu maksājumus ar čeku CashDeskBankAccountForCB= Noklusējuma konts, lai izmantotu, lai saņemtu maksājumus ar kredītkarti -CashDeskIdWareHouse=Noliktava kuru jāizmanto pārdošanai +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. ##### Bookmark ##### BookmarkSetup=Grāmatzīme modulis iestatīšanu BookmarkDesc=Šis modulis ļauj pārvaldīt grāmatzīmes. Jūs varat arī pievienot īsceļus uz jebkuru Dolibarr lapām vai externale tīmekļa vietnes uz jūsu kreisajā izvēlnē. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Dzēst fiskālo gadu ConfirmDeleteFiscalYear=Vai tiešām vēlaties dzēst fiskālo gadu? Opened=Atvērts Closed=Slēgts - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Kārtošanas secība Format=Formāts TypePaymentDesc=0:Klienta maksāšanas veids, 1:Piegādātāja maksāšanas veids, 2:Abi klientu un piegādātāju maksāšanas veids diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang index 5a18b50c2c7..838abe3a851 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=Notikums piešķirts AllMyActions= Visi mani notikumi/uzdevumi AllActions= Visi notikumi/uzdevumi ViewList=Saraksta skats @@ -41,9 +42,10 @@ AutoActions= Automātiskā aizpildīšana AgendaAutoActionDesc= Noteikt šeit notikumus, par kuriem vēlaties Dolibarr izveidot automātiski Notikuma kārtībā. Ja nekas netiks pārbaudīts (pēc noklusējuma), tikai manuālā pasākumi tiks iekļauti darba kārtībā. AgendaSetupOtherDesc= Šī lapa sniedz iespējas, lai ļautu eksportēt savu Dolibarr notikumiem uz ārēju kalendāru (Thunderbird, Google Calendar, ...) AgendaExtSitesDesc=Šī lapa ļauj atzīt ārējos avotus kalendārus, lai redzētu savus notikumus uz Dolibarr kārtībā. -ActionsEvents= Pasākumi, par kuriem Dolibarr radīs prasību kārtībā automātiski -PropalValidatedInDolibarr= Priekšlikums %s apstiprināts -InvoiceValidatedInDolibarr= Rēķins %s apstiprināts +ActionsEvents=Pasākumi, par kuriem Dolibarr radīs prasību kārtībā automātiski +PropalValidatedInDolibarr=Priekšlikums %s apstiprināts +InvoiceValidatedInDolibarr=Rēķins %s apstiprināts +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Rēķins %s doties atpakaļ uz melnrakstu InvoiceDeleteDolibarr=Rēķins %s dzēsts OrderValidatedInDolibarr= Pasūtījums %s pārbaudīts @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Pasūtījums %s apstiprināts OrderRefusedInDolibarr=Pasūtījums %s atteikts OrderBackToDraftInDolibarr=Pasūtījums %s doties atpakaļ uz melnrakstu OrderCanceledInDolibarr=Pasūtījums %s atcelts -InterventionValidatedInDolibarr=Intervences %s apstiprināts ProposalSentByEMail=Komerciālais priedāvājums %s nosūtīts pa e-pastu OrderSentByEMail=Klienta pasūtījums %s nosūtīts pa e-pastu InvoiceSentByEMail=Klienta rēķins %s nosūtīts pa e-pastu @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Piegādātāja pasūtījums %s nosūtīts pa e-pastu SupplierInvoiceSentByEMail=Piegādātāja rēķins %s nosūtīts pa e-pastu ShippingSentByEMail=Piegāde %s nosūtīta pa pastu ShippingValidated= Piegāde %s apstiprināta -InterventionSentByEMail=Intervences %s nosūtīta pa pastu -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Trešā puses izveidota DateActionPlannedStart= Plānotais sākuma datums DateActionPlannedEnd= Plānotais beigu datums @@ -70,9 +69,9 @@ DateActionStart= Sākuma datums DateActionEnd= Beigu datums AgendaUrlOptions1=Jūs varat pievienot arī šādus parametrus, lai filtrētu produkciju: AgendaUrlOptions2=login=%s ierobežot izejas uz darbībām, ko rada, piešķirto vai izdarīt lietotāju %s. -AgendaUrlOptions3=Logina = %s ierobežot izejas uz darbībām, ko rada lietotāju %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint = %s ierobežot izejas darbībām piešķirto lietotāja %s. -AgendaUrlOptions5=logind = %s ierobežot izejas uz darbībām, ko veic lietotājs %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Rādīt kontaktu dzimšanas dienas AgendaHideBirthdayEvents=Slēpt kontaktu dzimšanas dienas Busy=Aizņemts @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL, lai piekļūtu. ICal failam ExtSiteNoLabel=Nav Apraksta WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Izveidot notikumu MyAvailability=My availability diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang index cb87cac35a7..bca0426a8b5 100644 --- a/htdocs/langs/lv_LV/bills.lang +++ b/htdocs/langs/lv_LV/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Kredīta piezīme InvoiceAvoirAsk=Kredīta piezīme, lai koriģētu rēķinu InvoiceAvoirDesc=Kredīts piezīme ir negatīvs rēķins izmantot, lai atrisinātu to, ka rēķins ir summa, kas atšķiras par summu, patiesībā maksā (jo klients maksā pārāk daudz kļūdas dēļ, vai arī nav samaksāta pilnībā, jo viņš atgriezās dažus produktus, piemēram). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Aizstāt rēķinu %s ReplacementInvoice=Nomaiņa rēķins ReplacedByInvoice=Aizstāts ar rēķinu %s @@ -87,7 +87,7 @@ ClassifyCanceled=Klasificēt "Abandoned" ClassifyClosed=Klasificēt 'Slēgts' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Izveidot rēķinu -AddBill=Pievienot rēķina vai kredīta piezīmi +AddBill=Create invoice or credit note AddToDraftInvoices=Pievienot izstrādāt rēķinu DeleteBill=Dzēst rēķinu SearchACustomerInvoice=Meklēt klienta rēķinu @@ -99,7 +99,7 @@ DoPaymentBack=Atgriezt maksājumu ConvertToReduc=Pārvērst nākotnes atlaidē EnterPaymentReceivedFromCustomer=Ievadiet saņemto naudas summu no klienta EnterPaymentDueToCustomer=Veikt maksājumu dēļ klientam -DisabledBecauseRemainderToPayIsZero=Atspējots, jo atlikusī maksāt ir nulle +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Summa PriceBase=Bāzes cena BillStatus=Rēķina statuss @@ -137,8 +137,6 @@ BillFrom=No BillTo=Kam ActionsOnBill=Pasākumi attiecībā uz rēķinu NewBill=Jauns rēķins -Prélèvements=Regulārais maksājums -Prélèvements=Regulārais maksājums LastBills=Pēdējie %s rēķini LastCustomersBills=Pēdējie %s klientu rēķini LastSuppliersBills=Pēdējie %s piegādātāju rēķini @@ -153,12 +151,12 @@ ConfirmValidateBill=Vai jūs tiešām vēlaties apstiprināt šo rēķinu ar ats ConfirmUnvalidateBill=Vai esat pārliecināts, ka vēlaties mainīt rēķinu %s uz sagataves statusu? ConfirmClassifyPaidBill=Vai esat pārliecināts, ka vēlaties mainīt rēķina %s, statusu uz maksāts? ConfirmCancelBill=Vai esat pārliecināts, ka vēlaties atcelt rēķinu %s ? -ConfirmCancelBillQuestion=Kāpēc jūs vēlaties, lai klasificētu šo rēķinu "pamesta"? +ConfirmCancelBillQuestion=Kāpēc jūs vēlaties, lai klasificētu šo rēķinu 'pamests'? ConfirmClassifyPaidPartially=Vai esat pārliecināts, ka vēlaties mainīt rēķina %s lai statusu apmaksāts? ConfirmClassifyPaidPartiallyQuestion=Šis rēķins nav samaksāts pilnībā. Kādi ir iemesli, lai jūs varētu aizvērt šo rēķinu? -ConfirmClassifyPaidPartiallyReasonAvoir=Atlikums maksāt (%s %s) ir atlaide piešķirta, jo maksājums tika veikts pirms termiņa. Es legalizēt PVN ar kredītu piezīmi. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Atlikums maksāt (%s %s) ir atlaide piešķirta, jo maksājums tika veikts pirms termiņa. Es piekrītu zaudēt PVN par šo atlaidi. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Atlikums maksāt (%s %s) ir atlaide piešķirta, jo maksājums tika veikts pirms termiņa. Es atgūt PVN par šo atlaidi, bez kredīta piezīmi. +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=Slikts klients ConfirmClassifyPaidPartiallyReasonProductReturned=Produkti daļēji atgriezti ConfirmClassifyPaidPartiallyReasonOther=Summa pamesti cita iemesla dēļ @@ -191,9 +189,9 @@ AlreadyPaid=Jau samaksāts AlreadyPaidBack=Jau atgriezta nauda AlreadyPaidNoCreditNotesNoDeposits=Jau samaksāts (bez kredīta piezīmes un noguldījumiem) Abandoned=Pamests -RemainderToPay=Atlikums, kas jāsamaksā -RemainderToTake=Atlikums veikt -RemainderToPayBack=Atlikums, kas jāatmaksā +RemainderToPay=Neapmaksāts +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Līdz AmountExpected=Pieprasīto summu ExcessReceived=Excess saņemti @@ -207,7 +205,7 @@ NoOtherDraftBills=Nekādi citi projekti rēķini NoDraftInvoices=Nav projektu rēķini RefBill=Rēķina ref ToBill=Lai likumprojektu -RemainderToBill=Atlikums rēķinu +RemainderToBill=Jāsamaksā vēl SendBillByMail=Nosūtīt rēķinu pa e-pastu SendReminderBillByMail=Sūtīt atgādinājumu pa e-pastu RelatedCommercialProposals=Saistītie tirdzniecības priekšlikumi @@ -219,26 +217,25 @@ NoInvoice=Nav rēķinu ClassifyBill=Klasificēt rēķinu SupplierBillsToPay=Piegādātāji rēķinus apmaksāt CustomerBillsUnpaid=Neapmaksātie klientu rēķini -DispenseMontantLettres=Likumprojektu izstrādāja mašīnraksta ir jāatbrīvo no rīkojuma burtiem -DispenseMontantLettres=Likumprojektu izstrādāja mašīnraksta ir jāatbrīvo no rīkojuma burtiem +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Neatgūstams SetConditions=Uzstādīt apmaksas nosacījumus SetMode=Uzstādīt maksājumu režīmu Billed=Samaksāts -RepeatableInvoice=Iepriekš definēts rēķins -RepeatableInvoices=Iepriekš definēti rēķini -Repeatable=Iepriekš definēts -Repeatables=Iepriekš definēts -ChangeIntoRepeatableInvoice=Pārvērst iepriekš definētā -CreateRepeatableInvoice=Izveidot iepriekš definētu rēķinu -CreateFromRepeatableInvoice=Izveidot no iepriekš noteiktā rēķina +RepeatableInvoice=Rēķina paraugs +RepeatableInvoices=Rēķinu paraugs +Repeatable=Sagateve +Repeatables=Sagataves +ChangeIntoRepeatableInvoice=Pārveidot par parauga rēķinu +CreateRepeatableInvoice=Izveidot rēķina paraugu +CreateFromRepeatableInvoice=Izveidot no parauga rēķina CustomersInvoicesAndInvoiceLines=Klientu rēķinus un rēķinu s līnijas CustomersInvoicesAndPayments=Klientu rēķiniem un maksājumiem ExportDataset_invoice_1=Klientu rēķinu sarakstu un rēķins ir līnijas ExportDataset_invoice_2=Klientu rēķiniem un maksājumiem ProformaBill=Proforma Bils: -Reduction=Samazināšana -ReductionShort=Samazināšana. +Reduction=Atlaide +ReductionShort=Atlaide. Reductions=Samazinājumi ReductionsShort=Samazināšana. Discount=Atlaide @@ -322,7 +319,7 @@ VarAmount=Mainīgais apjoms (%% tot.) PaymentTypeVIR=Bankas noguldījums PaymentTypeShortVIR=Bankas noguldījums PaymentTypePRE=Bankas rīkojums -PaymentTypeShortPRE=Bankas pasūtījums +PaymentTypeShortPRE=Bankas pārskaitījums PaymentTypeLIQ=Skaidra nauda PaymentTypeShortLIQ=Skaidra nauda PaymentTypeCB=Kredītkarte @@ -350,7 +347,7 @@ RegulatedOn=Regulēta uz ChequeNumber=Pārbaudiet N ° ChequeOrTransferNumber=Pārbaudiet / Transfer N ° ChequeMaker=Pārbaudiet raidītājs -ChequeBank=Banka pārbaude +ChequeBank=Čeka izsniegšanas banka NetToBePaid=Neto jāmaksā PhoneNumber=Tel FullPhoneNumber=Tālrunis @@ -410,6 +407,6 @@ TypeContact_facture_external_BILLING=Klienta rēķina kontakts TypeContact_facture_external_SHIPPING=Klientu kuģniecības kontakts TypeContact_facture_external_SERVICE=Klienta pakalpojuma kontakts TypeContact_invoice_supplier_internal_SALESREPFOLL=Pārstāvis turpinot darboties piegādātāju rēķinu -TypeContact_invoice_supplier_external_BILLING=Piegādātāju rēķinu kontakts +TypeContact_invoice_supplier_external_BILLING=Piegādātāja rēķinu kontaktpersona TypeContact_invoice_supplier_external_SHIPPING=Piegādātājs kuģniecības kontakts TypeContact_invoice_supplier_external_SERVICE=Piegādātājs dienests kontakts diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang index 3337dc5b403..54d4a89cb71 100644 --- a/htdocs/langs/lv_LV/categories.lang +++ b/htdocs/langs/lv_LV/categories.lang @@ -65,12 +65,12 @@ ReturnInSupplier=Atpakaļ uz piegādātāju karti ReturnInCompany=Atpakaļ uz klienta / izredzes kartes ContentsVisibleByAll=Saturs būs redzams visiem ContentsVisibleByAllShort=Saturs redzams visiem -ContentsNotVisibleByAllShort=Saturs nav redzami visi +ContentsNotVisibleByAllShort=Saturu visi neredz CategoriesTree=Sadaļu koks DeleteCategory=Dzēst kategoriju ConfirmDeleteCategory=Vai tiešām vēlaties dzēst šo sadaļu? RemoveFromCategory=Noņemt sadaļas saiti -RemoveFromCategoryConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījuma un kategorijā? +RemoveFromCategoryConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījumu un sadaļu? NoCategoriesDefined=Nav izveidotu sadaļu SuppliersCategoryShort=Piegādātāju sadaļa CustomersCategoryShort=Klientu sadaļa @@ -93,17 +93,14 @@ InternalCategory=Iekšējā sadaļa CategoryContents=Sadaļas saturs CategId=Sadaļas id CatSupList=Piegādātāju sadaļu saraksts -CatCusList=Saraksts klientu / perspektīva kategorijām +CatCusList=Klientu/perspektīva sadaļu saraksts CatProdList=Produktu sadaļu saraksts CatMemberList=Dalībnieku sadaļu saraksts CatContactList=Saraksts kontaktu kategorijām un kontaktu -CatSupLinks=Saikne starp piegādātājiem un kategorijām +CatSupLinks=Saikne starp piegādātājiem un sadaļām CatCusLinks=Saiknes starp klientu / perspektīvām un kategorijām CatProdLinks=Saiknes starp produktu / pakalpojumu un kategoriju CatMemberLinks=Saikne starp biedriem un kategorijām -CatProdLinks=Saiknes starp produktu / pakalpojumu un kategoriju -CatCusLinks=Saiknes starp klientu / perspektīvām un kategorijām -CatSupLinks=Saikne starp piegādātājiem un kategorijām DeleteFromCat=Noņemt no sadaļas DeletePicture=Dzēst attēlu ConfirmDeletePicture=Apstiprināt attēla dzēšanu @@ -112,3 +109,4 @@ CategoriesSetup=Sadaļas iestatījumi CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Rādīt sadaļu diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang index 21c2433e46d..51818210e66 100644 --- a/htdocs/langs/lv_LV/compta.lang +++ b/htdocs/langs/lv_LV/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad klienta grāmatvedības kodu %s SuppliersProductsSellSalesTurnover=Radītais apgrozījums, ko no piegādātāja produkcijas pārdošanas. CheckReceipt=Čeka depozīts CheckReceiptShort=Pārbaudīt depozītu +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Jauna atlaide NewCheckDeposit=Jauns pārbaude depozīts NewCheckDepositOn=Izveidot kvīti par depozīta kontā: %s @@ -196,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 44268727261..811966b56c3 100644 --- a/htdocs/langs/lv_LV/contracts.lang +++ b/htdocs/langs/lv_LV/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Līgumu sadaļa ListOfContracts=Līgumu sarakstu -LastContracts=Pēdējās %s modificēts līgumus +LastModifiedContracts=Last %s modified contracts AllContracts=Visi līgumi ContractCard=Līguma kartiņa ContractStatus=Līgums statuss @@ -27,7 +27,7 @@ MenuRunningServices=Darbojošies pakalpojumi MenuExpiredServices=Beigušies pakalpojumi MenuClosedServices=Slēgtie pakalpojumi NewContract=Jaunu līgumu -AddContract=Pievienot līgums +AddContract=Izveidot līgmu SearchAContract=Meklēt līgumu DeleteAContract=Dzēst līgumu CloseAContract=Slēgt līgumu @@ -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=Pēdējās %s modificēts līgumus +LastContracts=Pēdējie %s līgumi 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/cron.lang b/htdocs/langs/lv_LV/cron.lang index cca8d25e5af..fdbba9abcff 100644 --- a/htdocs/langs/lv_LV/cron.lang +++ b/htdocs/langs/lv_LV/cron.lang @@ -18,14 +18,13 @@ CronExplainHowToRunUnix=Par Unix vidē, jums vajadzētu izmantot crontab palaist CronExplainHowToRunWin=Microsoft (tm), Windows environement jūs varat izmantot regulāro uzdevums rīkus, lai palaistu komandrindas viena otras minūtes # Menu CronJobs=Plānotie darbi -CronListActive= Aktīvo darbu saraksts -CronListInactive= Saraksts ar invaliditāti darba vietas -CronListActive= Aktīvo darbu saraksts +CronListActive=List of active/scheduled jobs +CronListInactive=Saraksts ar invaliditāti darba vietas # Page list CronDateLastRun=Pēdējo reizi palaists CronLastOutput=Pēdējo reizi palaist izejas -CronLastResult=Pēdējais rezultāts kods -CronListOfCronJobs=Saraksts ar plānoto darbu +CronLastResult=Pēdējais rezultātu kods +CronListOfCronJobs=Saraksts ar plānotajiem darbiem CronCommand=Komanda CronList=Darbu saraksts CronDelete= Dzēst cron darbavietas diff --git a/htdocs/langs/lv_LV/deliveries.lang b/htdocs/langs/lv_LV/deliveries.lang index 2b5c6da82a6..2baad30f7d1 100644 --- a/htdocs/langs/lv_LV/deliveries.lang +++ b/htdocs/langs/lv_LV/deliveries.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - deliveries Delivery=Piegāde Deliveries=Piegādes -DeliveryCard=Piegādes karte +DeliveryCard=Piegādes kartiņa DeliveryOrder=Piegādes pasūtījums DeliveryOrders=Piegādes pasūtījumi DeliveryDate=Piegādes datums DeliveryDateShort=Ie. datums -CreateDeliveryOrder=Izveidot piegādes kārtību +CreateDeliveryOrder=Izveidot piegādes pasūtījumu QtyDelivered=Piegādātais daudz SetDeliveryDate=Uzstādīt piegādes datumu ValidateDeliveryReceipt=Apstiprināt piegādes saņemšanu @@ -24,3 +24,5 @@ Deliverer=Piegādātājs: Sender=Nosūtītājs Recipient=Saņēmējs ErrorStockIsNotEnough=Nav pietiekami daudz krājumu +Shippable=Shippable +NonShippable=Not Shippable diff --git a/htdocs/langs/lv_LV/donations.lang b/htdocs/langs/lv_LV/donations.lang index 8eeef8d3755..0d9036343bb 100644 --- a/htdocs/langs/lv_LV/donations.lang +++ b/htdocs/langs/lv_LV/donations.lang @@ -4,7 +4,7 @@ Donations=Ziedojumi DonationRef=Ziedojuma ref. Donor=Donors Donors=Donori -AddDonation=Pievienot ziedojumu +AddDonation=Izveidot ziedojumu NewDonation=Jauns ziedojums ShowDonation=Rādīt ziedojumu DonationPromise=Dāvanu solījumu @@ -30,4 +30,9 @@ SearchADonation=Meklēt ziedojumu DonationRecipient=Ziedojuma saņēmējs ThankYou=Paldies IConfirmDonationReception=Saņēmējs atzīt saņemšanu, kā ziedojums, par šādu summu -MinimumAmount=Minimum amount is %s +MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang index c0a9555b153..9733c26045e 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=Neatļauts simbols '%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=Nedefinēta vērtība '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Nav rezultāta '%s' +ErrorPriceExpression22=Negatīvs rezultāts '%s' +ErrorPriceExpressionInternal=Iekšēja kļūda '%s' +ErrorPriceExpressionUnknown=Nezināma kļūda '%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/externalsite.lang b/htdocs/langs/lv_LV/externalsite.lang index 2c84feb75bb..de165ef0b5b 100644 --- a/htdocs/langs/lv_LV/externalsite.lang +++ b/htdocs/langs/lv_LV/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Ārējo vietņu iestatīšana ExternalSiteURL=Ārējā Vietnes URL ExternalSiteModuleNotComplete=Modulis ExternalSite nav pareizi konfigurēts. +ExampleMyMenuEntry=Manas izvēlnes ieraksti diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang index 6580ca40ca2..358ca95141d 100644 --- a/htdocs/langs/lv_LV/holiday.lang +++ b/htdocs/langs/lv_LV/holiday.lang @@ -6,7 +6,7 @@ MenuReportMonth=Ikmēneša paziņojums MenuAddCP=Make a leave request NotActiveModCP=You must enable the module Leaves to view this page. NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . -NoCPforUser=You don't have any available day. +NoCPforUser=Jums nav nevienas brīvas dienas AddCP=Make a leave request Employe=Darbinieks DateDebCP=Sākuma datums @@ -35,7 +35,7 @@ InfosCP=Information of the leave request InfosWorkflowCP=Informācijas plūsma RequestByCP=Pieprasījis TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed +NbUseDaysCP=Patērēto atvaļinājuma dienu skaits EditCP=Rediģēt DeleteCP=Dzēst ActionValidCP=Apstiprināt @@ -43,25 +43,24 @@ ActionRefuseCP=Atteikt ActionCancelCP=Atcelt StatutCP=Statuss SendToValidationCP=Sūtīt uz apstiprināšanu -TitleDeleteCP=Delete the leave request +TitleDeleteCP=Leave request ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Atjaunināt CantUpdate=You cannot update this leave request. NoDateDebut=Jums ir jāizvēlas sākuma datums. NoDateFin=Jums ir jāizvēlas beigu datums. -ErrorDureeCP=Jūsu pieprasījums brīvdienas nesatur darba dienu. -TitleValidCP=Apstiprināt brīvdienu pieprasījumu +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Datums apstiprināts TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Noraidīt brīvdienu pieprasījumu +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Jums ir jāizvēlas iemesls kāpēc atteikt pieprasījums. -TitleCancelCP=Atcelt brīvdienu pieprasījumu +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Atteikuma iemesls DateRefusCP=Atteikuma datums @@ -78,35 +77,35 @@ ActionByCP=Veic UserUpdateCP=Lietotājam PrevSoldeCP=Iepriekšējā bilance NewSoldeCP=Jana Bilance -alreadyCPexist=Brīvdienām pieprasījums jau ir izdarīts šajā laika posmā. +alreadyCPexist=A leave request has already been done on this period. UserName=Vārds Employee=Darbinieks -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation +FirstDayOfHoliday=Pirmā atvaļinājuma diena +LastDayOfHoliday=Pēdēja atvaļinājuma diena HolidaysMonthlyUpdate=Ikmēneša atjauninājums ManualUpdate=Manuāla aktualizēšana HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Konfigurācija brīvdienas moduļa +ConfCP=Configuration of leave request module DescOptionCP=Apraksts iespēju ValueOptionCP=Vērtība -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Apstiprināt konfigurāciju -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Veiksmīgi atjaunināta. ErrorUpdateConfCP=Kļūda atjaunināšanas laikā, lūdzu, mēģiniet vēlreiz. -AddCPforUsers=Lūdzu, pievienojiet līdzsvaru svētkiem lietotājiem, klikšķinot šeit . -DelayForSubmitCP=Termiņš, lai pieteiktos brīvdienām -AlertapprobatortorDelayCP=Novērst approbator ja brīvdienu pieprasījums neatbilst termiņu +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance -nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbUserCP=Lietotāju skaits, kuru atbalsta modulis leaves +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Apstiprināt UpdateEventCP=Atjaunināt notikumus @@ -136,7 +135,7 @@ HolidaysToValidateDelay=This leave request will take place within a period of le HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. HolidaysValidated=Validated leave requests HolidaysValidatedBody=Your leave request for %s to %s has been validated. -HolidaysRefused=Request denied +HolidaysRefused=Pieprasījums noraidīts HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : HolidaysCanceled=Canceled leaved request HolidaysCanceledBody=Your leave request for %s to %s has been canceled. diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang index c24ded1a130..2b5798ca198 100644 --- a/htdocs/langs/lv_LV/interventions.lang +++ b/htdocs/langs/lv_LV/interventions.lang @@ -3,7 +3,7 @@ Intervention=Iejaukšanās Interventions=Iejaukšanās InterventionCard=Iejaukšanās kartiņa NewIntervention=Jauna iejaukšanās -AddIntervention=Pievienot iejaukšanos +AddIntervention=Create intervention ListOfInterventions=Iejaukšanās saraksts EditIntervention=Labot iejaukšanos ActionsOnFicheInter=Pasākumi attiecībā uz intervenci @@ -30,6 +30,15 @@ StatusInterInvoiced=Jāmaksā RelatedInterventions=Saistītie pasākumi ShowIntervention=Rādīt iejaukšanās SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Pārstāvis turpinot darboties iejaukšanās TypeContact_fichinter_internal_INTERVENING=Iejaukšanās diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang index 97e77443c8b..2a1530a3612 100644 --- a/htdocs/langs/lv_LV/mails.lang +++ b/htdocs/langs/lv_LV/mails.lang @@ -12,7 +12,7 @@ MailTitle=Apraksts MailFrom=Nosūtītājs MailErrorsTo=Kļūdas līdz MailReply=Atbildēt uz -MailTo=Uztvērējs (-i) +MailTo=Saņēmējs (-i) MailCC=Kopēt MailCCC=Kešatmiņā kopiju MailTopic=E-pasta tēma @@ -115,7 +115,7 @@ SentBy=Iesūtīja MailingNeedCommand=Drošības apsvērumu dēļ, sūtot e-pasta vēstuļu sūtīšanas ir labāk, ja to veic no komandrindas. Ja jums ir viens, jautājiet savam servera administratoru, lai uzsāktu šādu komandu, lai nosūtītu pasta vēstuļu sūtīšanas uz visiem saņēmējiem: MailingNeedCommand2=Taču jūs varat sūtīt tos tiešsaistē, pievienojot parametru MAILING_LIMIT_SENDBYWEB ar vērtību max skaitu e-pasta Jūs vēlaties nosūtīt pa sesiju. Lai to izdarītu, dodieties uz Home - Setup - pārējie. ConfirmSendingEmailing=Ja jūs nevarat vai dod nosūtot tos ar savu Web pārlūkprogrammu, lūdzu, apstipriniet, jūs esat pārliecināts, ka vēlaties nosūtīt e-pastu tagad no jūsu pārlūkprogrammā? -LimitSendingEmailing=Piezīme: On line nosūtīšanu emailings ir ierobežoti drošības un taimautu, Iemesli %s adresātus, nosūtot sesiju. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Nodzēst sarakstu ToClearAllRecipientsClickHere=Klikšķiniet šeit, lai notīrītu adresātu sarakstu par šo pasta vēstuļu sūtīšanas ToAddRecipientsChooseHere=Pievienotu adresātus, izvēloties no sarakstiem @@ -133,6 +133,9 @@ Notifications=Paziņojumi NoNotificationsWillBeSent=Nav e-pasta paziņojumi ir plānota šī notikuma, un uzņēmums ANotificationsWillBeSent=1 paziņojums tiks nosūtīts pa e-pastu SomeNotificationsWillBeSent=%s paziņojumi tiks nosūtīti pa e-pastu -AddNewNotification=Aktivizēt jaunu e-pasta paziņojumu pieteikumu -ListOfActiveNotifications=Uzskaitiet visus aktīvos e-pasta paziņojumu pieprasījumiem +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Uzskaitīt visus e-pasta nosūtītās paziņojumus +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang index 5a02e07292e..f2a4fe61cb8 100644 --- a/htdocs/langs/lv_LV/main.lang +++ b/htdocs/langs/lv_LV/main.lang @@ -55,15 +55,15 @@ ErrorDuplicateField=Dubulta vērtība unikālā laukā ErrorSomeErrorWereFoundRollbackIsDone=Dažas kļūdas tika atrastas. Mēs atgriezām atpakaļ visu izejas pozīcijā. ErrorConfigParameterNotDefined=Parametrs %s nav definētas Dolibarr konfigurācijas failā conf.php. ErrorCantLoadUserFromDolibarrDatabase=Neizdevās atrast lietotāju %s Dolibarr datu bāzē. -ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojošai valstij "%s". +ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojošai valstij '%s'. ErrorNoSocialContributionForSellerCountry=Kļūda, nav definēts sociālās iemaksas veids valstī "%s". ErrorFailedToSaveFile=Kļūda, neizdevās saglabāt failu. -ErrorOnlyPngJpgSupported=Kļūda, tikai. Png un. Jpg attēla formāti ir atļauti. -ErrorImageFormatNotSupported=Jūsu PHP neatbalsta funkcijas, lai pārvērstu attēlus šajā formātā. SetDate=Iestatīt datumu SelectDate=Izvēlēties datumu SeeAlso=Skatīt arī %s BackgroundColorByDefault=Noklusējuma fona krāsu +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=Fails ir izvēlēts pielikumam, bet vēl nav augšupielādēti. Noklikšķiniet uz "Pievienot failu", lai to pievienotu. NbOfEntries=Ierakstu sk GoToWikiHelpPage=Lasīt tiešsaistes palīdzību (nepieciešams interneta piekļuve) @@ -81,7 +81,7 @@ PasswordForgotten=Aizmirsāt paroli? SeeAbove=Skatīt iepriekš HomeArea=Mājas sadaļa LastConnexion=Pēdējā savienojums -PreviousConnexion=Iepriekšējais savienojums +PreviousConnexion=Iepriekšējā pieslēgšanās ConnectedOnMultiCompany=Pieslēgts videi ConnectedSince=Pievienots kopš AuthenticationMode=Autentifikācija režīms @@ -157,7 +157,7 @@ SearchOf=Meklēšana Valid=Derīgs Approve=Apstiprināt ReOpen=Atvērt par jaunu -Upload=Sūtīt failu +Upload=Augšupielādēt failu ToLink=Saite Select=Atlasīt Choose=Izvēlēties @@ -266,6 +266,7 @@ Afternoon=Vakars Quadri=Kvadrāt- MonthOfDay=Mēneša laikā no dienas HourShort=H +MinuteShort=mn Rate=Likme UseLocalTax=Ar PVN Bytes=Baiti @@ -339,7 +340,8 @@ List=Saraksts FullList=Pilns saraksts Statistics=Statistika OtherStatistics=Citas statistika -Status=Status +Status=Statuss +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. piegādātājs @@ -365,6 +367,7 @@ ActionsOnCompany=Pasākumi par šīs trešās personas ActionsOnMember=Pasākumi par šo locekli NActions=%s notikumi NActionsLate=%s vēlu +RequestAlreadyDone=Request already recorded Filter=Filtrs RemoveFilter=Noņemt filtru ChartGenerated=Grafiks izveidots @@ -375,16 +378,16 @@ Duration=Ilgums TotalDuration=Kopējais pasākuma ilgums Summary=Kopsavilkums MyBookmarks=Manas grāmatzīmes -OtherInformationsBoxes=Citas informācijas ailes +OtherInformationsBoxes=Cita informācija DolibarrBoard=Dolibarr padome DolibarrStateBoard=Statistika -DolibarrWorkBoard=Darba uzdevumi padome +DolibarrWorkBoard=Darba uzdevumi Available=Pieejams NotYetAvailable=Nav vēl pieejams NotAvailable=Nav pieejams Popularity=Popularitāte -Categories=Kategorijas -Category=Kategorija +Categories=Sadaļas +Category=Sadaļa By=Līdz From=No to=līdz @@ -403,7 +406,7 @@ Reporting=Pārskata Reportings=Pārskati Draft=Melnraksts Drafts=Melnraksti -Validated=Validēta +Validated=Apstiprināts Opened=Atvērts New=Jauns Discount=Atlaide @@ -540,7 +543,7 @@ InfoAdmin=Informācija administratoriem Undo=Atcelt Redo=Atcelt ExpandAll=Izvērst visu -UndoExpandAll=Atsaukt paplašināt +UndoExpandAll=Paplašināt Reason=Iemesls FeatureNotYetSupported=Funkcija netiek atbalstīta CloseWindow=Aizvērt logu @@ -645,6 +648,7 @@ OptionalFieldsSetup=Papildus atribūtu iestatīšana URLPhoto=Saite bildei/logo SetLinkToThirdParty=Saite uz citu trešo pusei CreateDraft=Izveidot melnrakstu +SetToDraft=Atpakaļ uz melnrakstu ClickToEdit=Klikšķiniet, lai rediģētu ObjectDeleted=Objekts %s dzēsts ByCountry=Pēc valsts @@ -678,7 +682,7 @@ ViewPrivateNote=Apskatīt piezīmes XMoreLines=%s līnija(as) slēptas PublicUrl=Publiskā saite AddBox=Pievienot info logu - +SelectElementAndClickRefresh=Izvēlieties elementu un nospiediet atjaunot # Week day Monday=Pirmdiena Tuesday=Otrdiena diff --git a/htdocs/langs/lv_LV/margins.lang b/htdocs/langs/lv_LV/margins.lang index 23e19fe3392..4a221740342 100644 --- a/htdocs/langs/lv_LV/margins.lang +++ b/htdocs/langs/lv_LV/margins.lang @@ -22,7 +22,7 @@ ChooseProduct/Service=Izvēlies preci vai pakalpojumu StartDate=Sākuma datums EndDate=Beigu datums Launch=Sākt -ForceBuyingPriceIfNull=Force iepirkuma cena, ja null +ForceBuyingPriceIfNull=Forsēt iepirkuma cenu, ja nulle ForceBuyingPriceIfNullDetails=ja "ON", starpība būs nulle tiešsaistē (pirkšanas cena = pārdošanas cenu), pretējā gadījumā ("OFF"), Marge būs vienāda ar pārdošanas cenu (pirkšanas cena = 0) MARGIN_METHODE_FOR_DISCOUNT=Maržinālā metode pasaules atlaides UseDiscountAsProduct=Kā produktu @@ -38,4 +38,7 @@ BuyingCost=Pašizmaksa UnitCharges=Vienības izmaksas Charges=Maksas AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/lv_LV/orders.lang index 5069f05eab4..a15b3d85d24 100644 --- a/htdocs/langs/lv_LV/orders.lang +++ b/htdocs/langs/lv_LV/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Sūtījums pastāv DraftOrWaitingApproved=Projektu vai apstiprinājušas vēl nav pasūtīts DraftOrWaitingShipped=Projektu vai apstiprināt vēl nav nosūtīti MenuOrdersToBill=Pasūtījumi piegādāti -MenuOrdersToBill2=Pasūtījumi, kas jāapmaksā +MenuOrdersToBill2=Billable orders SearchOrder=Meklēšanas kārtība SearchACustomerOrder=Meklēt klienta pasūtījumu ShipProduct=Sūtīt produktu @@ -65,7 +65,7 @@ ValidateOrder=Apstiprināt pasūtījumu UnvalidateOrder=Unvalidate pasūtījumu DeleteOrder=Dzēst pasūtījumu CancelOrder=Atcelt pasūtījumu -AddOrder=Pievienot pasūtījumu +AddOrder=Jauns pasūtījums AddToMyOrders=Pievienot maniem pasūtījumiem AddToOtherOrders=Pievienot citiem pasūtījumiem AddToDraftOrders=Pievienot rīkojuma projektu @@ -154,7 +154,6 @@ OrderByPhone=Telefons CreateInvoiceForThisCustomer=Rēķinu pasūtījumi NoOrdersToInvoice=Nav pasūtījumi apmaksājamo CloseProcessedOrdersAutomatically=Klasificēt "apstrādā" visus atlasītos pasūtījumus. -MenuOrdersToBill2=Pasūtījumi, kas jāapmaksā OrderCreation=Pasūtīt izveide Ordered=Sakārtots OrderCreated=Jūsu pasūtījumi ir radīti diff --git a/htdocs/langs/lv_LV/oscommerce.lang b/htdocs/langs/lv_LV/oscommerce.lang deleted file mode 100644 index 3841b934eb6..00000000000 --- a/htdocs/langs/lv_LV/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce moduļa konfigurēšana -OSCommerceSetupSaved=OS Commerce uzstādīšanas konfigurācija saglabāta -OSCommerceServer=OS Commerce servera nosaukums / ip adrese -OSCommerceDatabaseName=OS Commerce datubāzes nosaukums -OSCommercePrefix=OS Commerce tabulas prefikss -OSCommerceUser=OS Commerce datu bāzes pieteikšanās vārds diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang index f612333dce4..875d92a9d5e 100644 --- a/htdocs/langs/lv_LV/other.lang +++ b/htdocs/langs/lv_LV/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Drošības kods Calendar=Kalendārs -AddTrip=Pievienot ceļojumu Tools=Darbarīki ToolsDesc=Šī joma ir veltīta grupas dažādiem rīkiem nav pieejama citās izvēlnes ierakstus.

    Šos rīkus var sasniegt no izvēlnes uz pusi. Birthday=Dzimšanas diena @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Projekts izveidots Notify_TASK_CREATE=Uzdevums izveidots Notify_TASK_MODIFY=Uzdevums labots Notify_TASK_DELETE=Uzdevums dzēsts +SeeModuleSetup=See module setup NbOfAttachedFiles=Skaits pievienotos failus / dokumentus TotalSizeOfAttachedFiles=Kopējais apjoms pievienotos failus / dokumentus MaxSize=Maksimālais izmērs @@ -59,7 +59,7 @@ PredefinedMailTest=Šis ir testa e-pasts \\ nthe divas līnijas ir atdalīti ar PredefinedMailTestHtml=Tas ir tests pasts (vārds testam jābūt treknrakstā).
    Abas līnijas ir atdalīti ar rakstatgriezi.

    __SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\n\nYou will find here the invoice __FACREF__\n\n\n__PERSONALIZED__Sincerely\n\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n\n__PERSONALIZED__Sincerely\n\n\n\n__SIGNATURE__ -PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nJums tiek nosūtīts komerciālais piedāvājums __PROPREF__\n\n__PERSONALIZED__Ar cieņu\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ @@ -203,25 +203,26 @@ ForgetIfNothing=Ja Jums nav lūgt šīs izmaiņas, vienkārši aizmirst šo e-pa ##### Calendar common ##### AddCalendarEntry=Pievienot ierakstu kalendārā %s -NewCompanyToDolibarr=Uzņēmums %s pievienots Dolibarr -ContractValidatedInDolibarr=Līgums %s apstiprināts Dolibarr -ContractCanceledInDolibarr=Līgums %s anulēts Dolibarr -ContractClosedInDolibarr=Līgums %s slēgts Dolibarr -PropalClosedSignedInDolibarr=Priekšlikums %s parakstīts Dolibarr -PropalClosedRefusedInDolibarr=Priekšlikums %s atteikts Dolibarr -PropalValidatedInDolibarr=Priekšlikums %s apstiprināts Dolibarr -InvoiceValidatedInDolibarr=Rēķins %s pārbaudīts Dolibarr -InvoicePaidInDolibarr=Rēķins mainīts %s uz samaksāts Dolibarr -InvoiceCanceledInDolibarr=Rēķins %s atcelts Dolibarr -PaymentDoneInDolibarr=Maksājumu %s veikts Dolibarr -CustomerPaymentDoneInDolibarr=Klientu maksājumu %s veikts Dolibarr -SupplierPaymentDoneInDolibarr=Piegādātāja maksājums %s veikts Dolibarr -MemberValidatedInDolibarr=Dalībnieks %s apstiprināts ar Dolibarr -MemberResiliatedInDolibarr=Dalībvalstis %s resiliated jo Dolibarr -MemberDeletedInDolibarr=Dalībnieks %s izdzēsts no Dolibarr -MemberSubscriptionAddedInDolibarr=Parakstīšanās uz dalībvalstīm %s papildina Dolibarr -ShipmentValidatedInDolibarr=Sūtījumi %s apstiprināti Dolibarr -ShipmentDeletedInDolibarr=Sūtījums %s izdzēsts no Dolibarr +NewCompanyToDolibarr=Kompānijas %s pievienotas +ContractValidatedInDolibarr=Līgumi %s apstiprināti +ContractCanceledInDolibarr=Līgumi %s atcelti +ContractClosedInDolibarr=Līgumi %s slēgti +PropalClosedSignedInDolibarr=Piedāvājumi %s parakstīti +PropalClosedRefusedInDolibarr=Piedāvājumi %s atteikti +PropalValidatedInDolibarr=Piedāvājumi %s apstiprināti +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Rēķini %s apstiprināti +InvoicePaidInDolibarr=Rēķimi %s nomainīti uz apmaksātiem +InvoiceCanceledInDolibarr=Rēķini %s atcelti +PaymentDoneInDolibarr=Apmaksa %s veikta +CustomerPaymentDoneInDolibarr=Klienta apmaksa %s veikta +SupplierPaymentDoneInDolibarr=Piegādātāja apmaksa %s veikta +MemberValidatedInDolibarr=Dalībnieks %s apstiprināts +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Dalībnieks %s dzēsts +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Sūtījumi %s apstiprināti +ShipmentDeletedInDolibarr=Sūtījums %s dzēsts ##### Export ##### Export=Eksportēt ExportsArea=Eksportēšanas sadaļa diff --git a/htdocs/langs/lv_LV/paybox.lang b/htdocs/langs/lv_LV/paybox.lang index edfeea53eb3..1b7b7db71de 100644 --- a/htdocs/langs/lv_LV/paybox.lang +++ b/htdocs/langs/lv_LV/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Ziņa par atcelto maksājumu atgriešanās lapā NewPayboxPaymentReceived=Jauns Paybox maksājums saņemts NewPayboxPaymentFailed=Jauns Paybox maksājums mēģināju, bet neizdevās PAYBOX_PAYONLINE_SENDEMAIL=E-pastu, lai brīdinātu pēc maksājuma (veiksme vai nav) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/lv_LV/printipp.lang b/htdocs/langs/lv_LV/printipp.lang index 4a1fa4d4ed3..34b0d4c674c 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=Printeru serveris +PRINTIPP_PORT=Ports 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). +NoPrinterFound=Printeri nav atrasti (pārbaidiet CUPS iestatījumus) +FileWasSentToPrinter=Fails %s nosūtīts uz printeri +NoDefaultPrinterDefined=Nav definēts noklusējtais printeris +DefaultPrinter=Noklusētais printeris +Printer=Printeris +CupsServer=CUPS Serveris diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang new file mode 100644 index 00000000000..cab1130f7dc --- /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=Daudz.: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang index b575e82a1c9..3bfc33d66a9 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=Numurs 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 new file mode 100644 index 00000000000..6558915beb3 --- /dev/null +++ b/htdocs/langs/lv_LV/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resursi +MenuResourceAdd=Jauni resursi +MenuResourcePlanning=Resursu plānošana +DeleteResource=Dzēst resursu +ConfirmDeleteResourceElement=Apstiprināt resursu dzēšanu šim elementam +NoResourceInDatabase=Nav datubāzē resursu +NoResourceLinked=Nav saistītu resursu + +ResourcePageIndex=Resursu saraksts +ResourceSingular=Resursi +ResourceCard=Resursu karte +AddResource=Izveidot resursu +ResourceFormLabel_ref=Resursu nosaukums +ResourceType=Resursa veids +ResourceFormLabel_description=Resursa apraksts + +ResourcesLinkedToElement=Resurss saistīts ar elementu + +ShowResourcePlanning=Rādīt resursu plānošanu +GotoDate=Iet uz datumu + +ResourceElementPage=Elementa resursi +ResourceCreatedWithSuccess=Resurss veiksmīgi izveidots +RessourceLineSuccessfullyDeleted=Resursu līnija veiksmīgi dzēsta +RessourceLineSuccessfullyUpdated=Resursa līnija veiksmīgi atjaunota +ResourceLinkedWithSuccess=Resurs sasaistīts veiksmīgi + +TitleResourceCard=Resursu karte +ConfirmDeleteResource=Apstiprināt šī resursa dzēšanu +RessourceSuccessfullyDeleted=Resurss veiksmīgi dzēsts +DictionaryResourceType=Resursa veids + +SelectResource=Izvēlēties resursu diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang index 72849e0b9f7..7eed9a6f743 100644 --- a/htdocs/langs/lv_LV/sendings.lang +++ b/htdocs/langs/lv_LV/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Izveidot jaunu sūtījumu var no pasūtījuma ka RelatedShippings=Saistītie sūtījumi ShipmentLine=Sūtījumu līnija CarrierList=Saraksts pārvadātājiem +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Nozvejas klienta @@ -74,5 +76,5 @@ SumOfProductVolumes=Summa saražotās produkcijas apjomu SumOfProductWeights=Summēt produkta svaru # warehouse details -DetailWarehouseNumber= Warehouse details +DetailWarehouseNumber= Noliktavas detaļas DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang index b2b6cfc6e25..c09b15bc582 100644 --- a/htdocs/langs/lv_LV/stocks.lang +++ b/htdocs/langs/lv_LV/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Noliktavas nosaukums ir nepieciešams CorrectStock=Labot krājumus ListOfWarehouses=Saraksts noliktavās ListOfStockMovements=Krājumu pārvietošanas saraksts -StocksArea=Krājumu sadaļa +StocksArea=Noliktavas platība Location=Vieta LocationSummary=Īsais atrašanās vietas nosaukums NumberOfDifferentProducts=Dažādu produktu skaits @@ -118,8 +118,8 @@ SelectProductInAndOutWareHouse=Izvēlieties produktu, daudzumu, avota noliktavu RecordMovement=Ierakstīt transfert ReceivingForSameOrder=Šī pasūtījuma ienākumi StockMovementRecorded=Krājumu pārvietošana saglabāta -RuleForStockAvailability=Rules on stock requirements +RuleForStockAvailability=Noteikumi krājumu nepieciešamībai StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice -StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order +StockMustBeEnoughForOrder=Krājumiem jābūt pietiekošiem, lai preci/pakalpojum varētu pievienot pasūtījumam StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang index 8dd37898479..cbd3417f334 100644 --- a/htdocs/langs/lv_LV/users.lang +++ b/htdocs/langs/lv_LV/users.lang @@ -1,8 +1,8 @@ # Dolibarr language file - Source file is en_US - users HRMArea=HRM sadaļa -UserCard=Lietotāja karte -ContactCard=Kontaktu karte -GroupCard=Grupas karte +UserCard=Lietotāja kartiņa +ContactCard=Kontaktu kartiņa +GroupCard=Grupas kartiņa NoContactCard=Nav kartes vidū kontaktiem Permission=Atļauja Permissions=Atļaujas @@ -63,7 +63,6 @@ ShowGroup=Rādīt grupa ShowUser=Rādīt lietotāju NonAffectedUsers=Nav piešķirtis lietotājiem UserModified=Lietotājs modificēts veiksmīgi -GroupModified=Grupa modificēta veiksmīgi PhotoFile=Attēla fails UserWithDolibarrAccess=Lietotājs ar Dolibarr piekļuvi ListOfUsersInGroup=Lietotāju saraksts, kas atrodas šajā grupā @@ -103,7 +102,7 @@ UserDisabled=Lietotājs %s bloķēts UserEnabled=Lietotājs %s aktivizēts UserDeleted=Lietotājs %s noņemts NewGroupCreated=Grupa %s izveidota -GroupModified=Grupa modificēta veiksmīgi +GroupModified=Group %s modified GroupDeleted=Grupa %s noņemta ConfirmCreateContact=Vai jūs tiešām vēlaties, lai izveidotu Dolibarr kontu par šo kontaktu? ConfirmCreateLogin=Vai jūs tiešām vēlaties, lai izveidotu Dolibarr kontu ši? @@ -114,8 +113,10 @@ YourRole=Jūsu lomas YourQuotaOfUsersIsReached=Jūsu aktīvo lietotāju limits ir sasniegts! NbOfUsers=Lietotāju sk DontDowngradeSuperAdmin=Tikai superadmin var pazemināt superadmin -HierarchicalResponsible=Hierarhiska atbildīga +HierarchicalResponsible=Uzraugs HierarchicView=Hierarhiska view UseTypeFieldToChange=Izmantojiet lauka veids, lai mainītu OpenIDURL=OpenID URL LoginUsingOpenID=Izmantojiet OpenID, lai pieteiktos +WeeklyHours=Nedēļas stundas +ColorUser=Color of the user diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang index 1b880e82ebb..5341718719f 100644 --- a/htdocs/langs/lv_LV/withdrawals.lang +++ b/htdocs/langs/lv_LV/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Saņemšana LastWithdrawalReceipts=Pēdējās %s abstinences ieņēmumi WithdrawedBills=Atsauktie rēķini WithdrawalsLines=Abstinences līnijas -RequestStandingOrderToTreat=Pieprasījums stāvot pasūtījumus, lai ārstētu -RequestStandingOrderTreated=Pieprasījums regulārā maksājuma rīkojumu apstrādā +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Klientu regulārie maksājumi CustomerStandingOrder=Klientu regulārais maksājums NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,15 +41,14 @@ TransMetod=Darījuma veids Send=Sūtīt Lines=Lines StandingOrderReject=Noraidīt -InvoiceRefused=Rēķins atteikts WithdrawalRefused=Atsaukšana WithdrawalRefusedConfirm=Vai jūs tiešām vēlaties, lai ievadītu izdalīšanās noraidījumu sabiedrībai RefusedData=Noraidījuma datums RefusedReason=Noraidījuma iemesls RefusedInvoicing=Rēķinu noraidījumu NoInvoiceRefused=Nav maksas noraidīšanu -InvoiceRefused=Rēķins atteikts -Status=Status +InvoiceRefused=Invoice refused (Charge the rejection to customer) +Status=Statuss StatusUnknown=Nezināms StatusWaiting=Gaidīšana StatusTrans=Sūtīt @@ -76,13 +76,14 @@ WithBankUsingRIB=Attiecībā uz banku kontiem, izmantojot RIB WithBankUsingBANBIC=Attiecībā uz banku kontiem, izmantojot IBAN / BIC / SWIFT BankToReceiveWithdraw=Bankas kontu, lai saņemtu atsauc CreditDate=Kredīts -WithdrawalFileNotCapable=Nevar radīt izņemšanas kvīti failu jūsu valstī +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=Iestatīts uz statusu "File Sent" +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/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/mk_MK/accountancy.lang +++ b/htdocs/langs/mk_MK/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang index e3e30f01dd4..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 @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Stock management (products) Module53Name=Services Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +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 -Module400Desc=Project management inside other modules +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=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 @@ -606,15 +613,16 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -701,8 +709,8 @@ Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Read stock movements Permission1005=Create/modify stock movements Permission1101=Read delivery orders @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Products module setup ServiceSetup=Services module setup @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang index 9b3efc07dab..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 @@ -41,9 +42,10 @@ AutoActions= Automatic filling AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Invoice %s validated +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Order %s validated @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status OrderCanceledInDolibarr=Order %s canceled -InterventionValidatedInDolibarr=Intervention %s validated ProposalSentByEMail=Commercial proposal %s sent by EMail OrderSentByEMail=Customer order %s sent by EMail InvoiceSentByEMail=Customer invoice %s sent by EMail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail ShippingSentByEMail=Shipping %s sent by EMail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sent by EMail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date DateActionPlannedEnd= Planned end date @@ -70,9 +69,9 @@ DateActionStart= Start date DateActionEnd= End date AgendaUrlOptions1=You can also add following parameters to filter output: AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. -AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Show birthday's contacts AgendaHideBirthdayEvents=Hide birthday's contacts Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang index 1edd7213076..81b7515a8b8 100644 --- a/htdocs/langs/mk_MK/bills.lang +++ b/htdocs/langs/mk_MK/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit note InvoiceAvoirAsk=Credit note to correct invoice InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Replace invoice %s ReplacementInvoice=Replacement invoice ReplacedByInvoice=Replaced by invoice %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned' ClassifyClosed=Classify 'Closed' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Create Invoice -AddBill=Add invoice or credit note +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice @@ -99,7 +99,7 @@ DoPaymentBack=Do payment back ConvertToReduc=Convert into future discount EnterPaymentReceivedFromCustomer=Enter payment received from customer EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Amount PriceBase=Price base BillStatus=Invoice status @@ -137,8 +137,6 @@ BillFrom=From BillTo=To ActionsOnBill=Actions on invoice NewBill=New invoice -Prélèvements=Standing order -Prélèvements=Standing order LastBills=Last %s invoices LastCustomersBills=Last %s customers invoices LastSuppliersBills=Last %s suppliers invoices @@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice %s ? ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason @@ -191,9 +189,9 @@ AlreadyPaid=Already paid AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Abandoned -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received @@ -219,19 +217,18 @@ NoInvoice=No invoice ClassifyBill=Classify invoice SupplierBillsToPay=Suppliers invoices to pay CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms SetMode=Set payment mode Billed=Billed -RepeatableInvoice=Pre-defined invoice -RepeatableInvoices=Pre-defined invoices -Repeatable=Pre-defined -Repeatables=Pre-defined -ChangeIntoRepeatableInvoice=Convert into pre-defined -CreateRepeatableInvoice=Create pre-defined invoice -CreateFromRepeatableInvoice=Create from pre-defined invoice +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Customer invoices and payments ExportDataset_invoice_1=Customer invoices list and invoice's lines diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang index ed61bfc08a6..22914931db1 100644 --- a/htdocs/langs/mk_MK/categories.lang +++ b/htdocs/langs/mk_MK/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang index 3929cfde036..878eb49b3c9 100644 --- a/htdocs/langs/mk_MK/compta.lang +++ b/htdocs/langs/mk_MK/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 e5ad112b222..57ba3bb15d8 100644 --- a/htdocs/langs/mk_MK/contracts.lang +++ b/htdocs/langs/mk_MK/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastContracts=Last %s modified contracts +LastModifiedContracts=Last %s modified contracts AllContracts=All contracts ContractCard=Contract card ContractStatus=Contract status @@ -27,7 +27,7 @@ MenuRunningServices=Running services MenuExpiredServices=Expired services MenuClosedServices=Closed services NewContract=New contract -AddContract=Add contract +AddContract=Create contract SearchAContract=Search a contract DeleteAContract=Delete a contract CloseAContract=Close a contract @@ -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 %s modified 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/cron.lang b/htdocs/langs/mk_MK/cron.lang index 1be23d72ca3..195ad43c87c 100644 --- a/htdocs/langs/mk_MK/cron.lang +++ b/htdocs/langs/mk_MK/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# -# About = About -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +About = About +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job -# CronNone= None -# CronDtStart=Start date -# CronDtEnd=End date -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe -# CronMethod=Method -# CronModule=Module -# CronAction=Action -# CronStatus=Status -# CronStatusActive=Enabled -# CronStatusInactive=Disabled -# CronNoJobs=No jobs registered -# CronPriority=Priority -# CronLabel=Description -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job +CronNone= None +CronDtStart=Start date +CronDtEnd=End date +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe +CronMethod=Method +CronModule=Module +CronAction=Action +CronStatus=Status +CronStatusActive=Enabled +CronStatusInactive=Disabled +CronNoJobs=No jobs registered +CronPriority=Priority +CronLabel=Description +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create -# CronArgs=Parameters -# CronSaveSucess=Save succesfully -# CronNote=Comment -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable -# CronStatusInactiveBtn=Disable -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create +CronArgs=Parameters +CronSaveSucess=Save succesfully +CronNote=Comment +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable +CronStatusInactiveBtn=Disable +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/mk_MK/donations.lang b/htdocs/langs/mk_MK/donations.lang index 66ddea95a5c..f7aed91cf81 100644 --- a/htdocs/langs/mk_MK/donations.lang +++ b/htdocs/langs/mk_MK/donations.lang @@ -4,7 +4,7 @@ Donations=Donations DonationRef=Donation ref. Donor=Donor Donors=Donors -AddDonation=Add a donation +AddDonation=Create a donation NewDonation=New donation ShowDonation=Show donation DonationPromise=Gift promise @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/mk_MK/externalsite.lang index b915c37a5ab..da4853df0df 100644 --- a/htdocs/langs/mk_MK/externalsite.lang +++ b/htdocs/langs/mk_MK/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite -# ExternalSiteSetup=Setup link to external website -# ExternalSiteURL=External Site URL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteSetup=Setup link to external website +ExternalSiteURL=External Site URL +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/mk_MK/holiday.lang b/htdocs/langs/mk_MK/holiday.lang index c25abf6449c..f5b87fefb08 100644 --- a/htdocs/langs/mk_MK/holiday.lang +++ b/htdocs/langs/mk_MK/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Name Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/mk_MK/interventions.lang b/htdocs/langs/mk_MK/interventions.lang index 17641a0ab3e..c79da05364e 100644 --- a/htdocs/langs/mk_MK/interventions.lang +++ b/htdocs/langs/mk_MK/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Interventions InterventionCard=Intervention card NewIntervention=New intervention -AddIntervention=Add intervention +AddIntervention=Create intervention ListOfInterventions=List of interventions EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang index 98e6dc335ee..7a211198822 100644 --- a/htdocs/langs/mk_MK/mails.lang +++ b/htdocs/langs/mk_MK/mails.lang @@ -115,7 +115,7 @@ SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -133,6 +133,9 @@ Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang index 82e609d8ae6..0c3a3ca751c 100644 --- a/htdocs/langs/mk_MK/main.lang +++ b/htdocs/langs/mk_MK/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries GoToWikiHelpPage=Read online help (need Internet access) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier @@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events NActionsLate=%s late +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Remove filter ChartGenerated=Chart generated @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToThirdParty=Link to another third party CreateDraft=Create draft +SetToDraft=Back to draft ClickToEdit=Click to edit ObjectDeleted=Object %s deleted ByCountry=By country @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/mk_MK/margins.lang b/htdocs/langs/mk_MK/margins.lang index e8d5fed1af9..606d5e5053a 100644 --- a/htdocs/langs/mk_MK/margins.lang +++ b/htdocs/langs/mk_MK/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=Product or Service AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=Start date EndDate=End date Launch=Start - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/mk_MK/orders.lang index 42444f0ec1c..6ee9c19fa95 100644 --- a/htdocs/langs/mk_MK/orders.lang +++ b/htdocs/langs/mk_MK/orders.lang @@ -1,168 +1,162 @@ # Dolibarr language file - Source file is en_US - orders -# OrdersArea=Customers orders area -# SuppliersOrdersArea=Suppliers orders area -# OrderCard=Order card -# OrderId=Order Id -# Order=Order -# Orders=Orders -# OrderLine=Order line -# OrderFollow=Follow up -# OrderDate=Order date -# OrderToProcess=Order to process -# NewOrder=New order -# ToOrder=Make order -# MakeOrder=Make order -# SupplierOrder=Supplier order -# SuppliersOrders=Suppliers orders -# SuppliersOrdersRunning=Current suppliers orders -# CustomerOrder=Customer order -# CustomersOrders=Customer's orders -# CustomersOrdersRunning=Current customer's orders -# CustomersOrdersAndOrdersLines=Customer orders and order's lines -# OrdersToValid=Customer's orders to validate -# OrdersToBill=Customer's orders delivered -# OrdersInProcess=Customer's orders in process -# OrdersToProcess=Customer's orders to process -# SuppliersOrdersToProcess=Supplier's orders to process -# StatusOrderCanceledShort=Canceled -# StatusOrderDraftShort=Draft -# StatusOrderValidatedShort=Validated -# StatusOrderSentShort=In process -# StatusOrderSent=Shipment in process -# StatusOrderOnProcessShort=Reception -# StatusOrderProcessedShort=Processed -# StatusOrderToBillShort=Delivered -# StatusOrderToBill2Short=To bill -# StatusOrderApprovedShort=Approved -# StatusOrderRefusedShort=Refused -# StatusOrderToProcessShort=To process -# StatusOrderReceivedPartiallyShort=Partially received -# StatusOrderReceivedAllShort=Everything received -# StatusOrderCanceled=Canceled -# StatusOrderDraft=Draft (needs to be validated) -# StatusOrderValidated=Validated -# StatusOrderOnProcess=Waiting to receive -# StatusOrderProcessed=Processed -# StatusOrderToBill=Delivered -# StatusOrderToBill2=To bill -# StatusOrderApproved=Approved -# StatusOrderRefused=Refused -# StatusOrderReceivedPartially=Partially received -# StatusOrderReceivedAll=Everything received -# ShippingExist=A shipment exists -# DraftOrWaitingApproved=Draft or approved not yet ordered -# DraftOrWaitingShipped=Draft or validated not yet shipped -# MenuOrdersToBill=Orders delivered -# MenuOrdersToBill2=Orders to bill -# SearchOrder=Search order -# SearchACustomerOrder=Search a customer order -# ShipProduct=Ship product -# Discount=Discount -# CreateOrder=Create Order -# RefuseOrder=Refuse order -# ApproveOrder=Accept order -# ValidateOrder=Validate order -# UnvalidateOrder=Unvalidate order -# DeleteOrder=Delete order -# CancelOrder=Cancel order -# AddOrder=Add order -# AddToMyOrders=Add to my orders -# AddToOtherOrders=Add to other orders -# AddToDraftOrders=Add to draft order -# ShowOrder=Show order -# NoOpenedOrders=No opened orders -# NoOtherOpenedOrders=No other opened orders -# NoDraftOrders=No draft orders -# OtherOrders=Other orders -# LastOrders=Last %s orders -# LastModifiedOrders=Last %s modified orders -# LastClosedOrders=Last %s closed orders -# AllOrders=All orders -# NbOfOrders=Number of orders -# OrdersStatistics=Order's statistics -# OrdersStatisticsSuppliers=Supplier order's statistics -# NumberOfOrdersByMonth=Number of orders by month -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) -# ListOfOrders=List of orders -# CloseOrder=Close order -# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. -# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. -# ConfirmDeleteOrder=Are you sure you want to delete this order ? -# ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? -# ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? -# ConfirmCancelOrder=Are you sure you want to cancel this order ? -# ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? -# GenerateBill=Generate invoice -# ClassifyShipped=Classify delivered -# ClassifyBilled=Classify billed -# ComptaCard=Accountancy card -# DraftOrders=Draft orders -# RelatedOrders=Related orders -# OnProcessOrders=In process orders -# RefOrder=Ref. order -# RefCustomerOrder=Ref. customer order -# CustomerOrder=Customer order -# RefCustomerOrderShort=Ref. cust. order -# SendOrderByMail=Send order by mail -# ActionsOnOrder=Events on order -# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order -# OrderMode=Order method -# AuthorRequest=Request author -# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address -# RunningOrders=Orders on process -# UserWithApproveOrderGrant=Users granted with "approve orders" permission. -# PaymentOrderRef=Payment of order %s -# CloneOrder=Clone order -# ConfirmCloneOrder=Are you sure you want to clone this order %s ? -# DispatchSupplierOrder=Receiving supplier order %s +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id +Order=Order +Orders=Orders +OrderLine=Order line +OrderFollow=Follow up +OrderDate=Order date +OrderToProcess=Order to process +NewOrder=New order +ToOrder=Make order +MakeOrder=Make order +SupplierOrder=Supplier order +SuppliersOrders=Suppliers orders +SuppliersOrdersRunning=Current suppliers orders +CustomerOrder=Customer order +CustomersOrders=Customer's orders +CustomersOrdersRunning=Current customer's orders +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customer's orders to validate +OrdersToBill=Customer's orders delivered +OrdersInProcess=Customer's orders in process +OrdersToProcess=Customer's orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderSentShort=In process +StatusOrderSent=Shipment in process +StatusOrderOnProcessShort=Reception +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=Delivered +StatusOrderToBill2Short=To bill +StatusOrderApprovedShort=Approved +StatusOrderRefusedShort=Refused +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received +StatusOrderCanceled=Canceled +StatusOrderDraft=Draft (needs to be validated) +StatusOrderValidated=Validated +StatusOrderOnProcess=Waiting to receive +StatusOrderProcessed=Processed +StatusOrderToBill=Delivered +StatusOrderToBill2=To bill +StatusOrderApproved=Approved +StatusOrderRefused=Refused +StatusOrderReceivedPartially=Partially received +StatusOrderReceivedAll=Everything received +ShippingExist=A shipment exists +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders +SearchOrder=Search order +SearchACustomerOrder=Search a customer order +ShipProduct=Ship product +Discount=Discount +CreateOrder=Create Order +RefuseOrder=Refuse order +ApproveOrder=Accept order +ValidateOrder=Validate order +UnvalidateOrder=Unvalidate order +DeleteOrder=Delete order +CancelOrder=Cancel order +AddOrder=Create order +AddToMyOrders=Add to my orders +AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order +ShowOrder=Show order +NoOpenedOrders=No opened orders +NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders +AllOrders=All orders +NbOfOrders=Number of orders +OrdersStatistics=Order's statistics +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +ListOfOrders=List of orders +CloseOrder=Close order +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +GenerateBill=Generate invoice +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s ##### Types de contacts ##### -# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order -# TypeContact_commande_internal_SHIPPING=Representative following-up shipping -# TypeContact_commande_external_BILLING=Customer invoice contact -# TypeContact_commande_external_SHIPPING=Customer shipping contact -# TypeContact_commande_external_CUSTOMER=Customer contact following-up order -# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order -# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping -# TypeContact_order_supplier_external_BILLING=Supplier invoice contact -# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact -# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order - -# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined -# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined -# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' -# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' -# Error_OrderNotChecked=No orders to invoice selected - +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected # Sources -# OrderSource0=Commercial proposal -# OrderSource1=Internet -# OrderSource2=Mail campaign -# OrderSource3=Phone compaign -# OrderSource4=Fax campaign -# OrderSource5=Commercial -# OrderSource6=Store -# QtyOrdered=Qty ordered -# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order - +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign +OrderSource5=Commercial +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order # Documents models -# PDFEinsteinDescription=A complete order model (logo...) -# PDFEdisonDescription=A simple order model -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes -# OrderByMail=Mail -# OrderByFax=Fax -# OrderByEMail=EMail -# OrderByWWW=Online -# OrderByPhone=Phone - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/mk_MK/oscommerce.lang b/htdocs/langs/mk_MK/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/mk_MK/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang index b56ef294495..88991888183 100644 --- a/htdocs/langs/mk_MK/other.lang +++ b/htdocs/langs/mk_MK/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/mk_MK/paybox.lang b/htdocs/langs/mk_MK/paybox.lang index b689bb6cebf..aced32a4944 100644 --- a/htdocs/langs/mk_MK/paybox.lang +++ b/htdocs/langs/mk_MK/paybox.lang @@ -1,37 +1,40 @@ # Dolibarr language file - Source file is en_US - paybox -# PayBoxSetup=PayBox module setup -# PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) -# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects -# PaymentForm=Payment form -# WelcomeOnPaymentPage=Welcome on our online payment service -# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. -# ThisIsInformationOnPayment=This is information on payment to do -# ToComplete=To complete -# YourEMail=Email to receive payment confirmation -# Creditor=Creditor -# PaymentCode=Payment code -# PayBoxDoPayment=Go on payment -# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information -# PleaseBePatient=Please, be patient -# Continue=Next -# ToOfferALinkForOnlinePayment=URL for %s payment -# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order -# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice -# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line -# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount -# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription -# YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. -# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. -# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. -# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. -# AccountParameter=Account parameters -# UsageParameter=Usage parameters -# InformationToFindParameters=Help to find your %s account information -# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment -# VendorName=Name of vendor -# CSSUrlForPaymentForm=CSS style sheet url for payment form -# MessageOK=Message on validated payment return page -# MessageKO=Message on canceled payment return page -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/mk_MK/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang index 2ae43f39766..f6111bac684 100644 --- a/htdocs/langs/mk_MK/sendings.lang +++ b/htdocs/langs/mk_MK/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang index 5d11b0fd7a0..06c502504e9 100644 --- a/htdocs/langs/mk_MK/stocks.lang +++ b/htdocs/langs/mk_MK/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=Location LocationSummary=Short name location NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang index 0afaab6ad7f..baf209f9d1c 100644 --- a/htdocs/langs/mk_MK/users.lang +++ b/htdocs/langs/mk_MK/users.lang @@ -63,7 +63,6 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group modified successfully +GroupModified=Group %s modified GroupDeleted=Group %s removed ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? @@ -114,8 +113,10 @@ YourRole=Your roles YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb of users DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang index 58ac3e252ec..ea32511fefb 100644 --- a/htdocs/langs/mk_MK/withdrawals.lang +++ b/htdocs/langs/mk_MK/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Unknown StatusWaiting=Waiting @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang index 8cab9d2b651..8c7bb031ba0 100644 --- a/htdocs/langs/nb_NO/accountancy.lang +++ b/htdocs/langs/nb_NO/accountancy.lang @@ -1,13 +1,13 @@ # Dolibarr language file - en_US - Accounting Expert CHARSET=UTF-8 -Accounting=Accounting -Globalparameters=Global parameters +Accounting=Regnskap +Globalparameters=Globale parametre Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years -Menuaccount=Accounting accounts +Fiscalyear=Regnskapsår +Menuaccount=Regnskapskonti Menuthirdpartyaccount=Thirdparty accounts -MenuTools=Tools +MenuTools=Verktøy ConfigAccountingExpert=Configuration of the module accounting expert Journaux=Journals @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -96,20 +96,20 @@ Doctype=Type of document Docdate=Date Docref=Reference Numerocompte=Account -Code_tiers=Thirdparty -Labelcompte=Label account -Debit=Debit -Credit=Credit -Amount=Amount +Code_tiers=Tredjepart +Labelcompte=Kontoetikett +Debit=Debet +Credit=Kredit +Amount=Beløp Sens=Sens Codejournal=Journal -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Slett innholdet i hovedboken -SellsJournal=Sells journal -PurchasesJournal=Purchases journal -DescSellsJournal=Sells journal -DescPurchasesJournal=Purchases journal +SellsJournal=Salgsjournal +PurchasesJournal=Innkjøpsjournal +DescSellsJournal=Salgsjournal +DescPurchasesJournal=Innkjøpsjournal BankJournal=Bank journal DescBankJournal=Bank journal including all the types of payments other than cash CashJournal=Cash journal @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index 89545e80ea0..af6294c16fe 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -52,10 +52,12 @@ ErrorCodeCantContainZero=Koden kan ikke inneholde verdien 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) ConfirmAjax=Bruk bekreftelsesvinduer basert på Ajax UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. +UseSearchToSelectCompany=Bruk autofullfør-felt for å velge tredjepart, i stedet for å bruke listeboks. 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=Use autocompletion fields to choose contact (instead of using a list box). +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 @@ -120,7 +122,7 @@ LanguageBrowserParameter=Parameter %s LocalisationDolibarrParameters=Språkparametere for Dolibarr ClientTZ=Tidssone (bruker) ClientHour=Klienttid (bruker) -OSTZ=Server OS Time Zone +OSTZ=Server OS Tidssone PHPTZ=Tidssone PHP PHPServerOffsetWithGreenwich=Forskyvning for PHP-server mot Greenwich (sekunder) ClientOffsetWithGreenwich=Klient / Browser offset bredde Greenwich (sekunder) @@ -135,7 +137,7 @@ Box=Boks Boxes=Bokser MaxNbOfLinesForBoxes=Maks. antall linher for bokser PositionByDefault=Gjeldende rekkefølge -Position=Position +Position=Posisjon MenusDesc=Menybehandleren avgjør innholdet i de to menyene (horisontal og vertikal menybjelke). MenusEditorDesc=I menybehandleren kan du stille inn egne menyvalg. Bruk denne med forsiktighet for å unngå at Dolibarr blir ustabil eller at noen menyvalg blit permanent borte.
    Noen moduler legger til oppføringer i menyene (i meny Alle i de fleste tilfeller). Hvis du har fjernet noen av disse ved en feiltagelse kan du få dem tilbake ved å slå av og slå på modulen igjen. MenuForUsers=Brukermeny @@ -145,7 +147,7 @@ SystemInfo=Systeminformasjon SystemTools=Systemverktøy SystemToolsArea=Område for systemverktøy SystemToolsAreaDesc=Dette området gir tilgang til administrasjonsfunksjonene. Bruk menyen til å velge funksjonen du leter etter. -Purge=Purge +Purge=Utrenskning PurgeAreaDesc=Denne siden lar deg slette alle filer opprettet eller lagret av Dolibarr (midlertidige filer eller alle filer i mappen %s). Normalt er det ikke nødvendig å bruke denne funksjonen. Den er laget for brukere som har Dolibarr installert på en delt server, og hvor man ikke har tilgang til å slette filer opprettet av webserveren. PurgeDeleteLogFile=Slett loggfil %s definert for Syslog modul (ingen risiko for å miste data) PurgeDeleteTemporaryFiles=Slett alle midlertidige filer (medfører ingen risiko for å miste data) @@ -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 @@ -295,7 +298,7 @@ DownloadPackageFromWebSite=Last ned pakken fra nettstedet %s. UnpackPackageInDolibarrRoot=Pakk ut filen i Dolibarrs rotmappe %s SetupIsReadyForUse=Installasjonen er ferdig og Dolibarr er klar til bruk med den nye modulen. NotExistsDirect=Alternativ rotkatalog er ikke definert.
    -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).
    +InfDirAlt=Etter versjon 3 er det mulig å definere en alternativ rotkatalog. Dette lar deg lagre plug-ins og egendefinerte maler på samme sted.
    Bare lag en katalog i roten av Dolibarr (f.eks: egendefinert).
    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=Velg modul: CurrentVersion=Dolibarr gjeldende versjon @@ -306,8 +309,8 @@ GenericMaskCodes2={cccc} the client code on n characters
    {cccc000}< GenericMaskCodes3=Alle andre tegn i masken vil være intakt.
    Mellomrom er ikke tillatt.
    GenericMaskCodes4a=Eksempel på 99nde %s av tredje part TheCompany gjort 2007-01-31:
    GenericMaskCodes4b=Eksempel på tredjeparts opprettet på 2007-03-01:
    -GenericMaskCodes4c=Example on product created on 2007-03-01:
    -GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
    {0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX +GenericMaskCodes4c=Eksempel på produkt opprettet 2007-03-01:
    +GenericMaskCodes5=ABC{yy}{mm}-{000000} vil gi ABC0701-000099
    {0000+100@1}-ZZZ/{dd}/XXX vil gi 0199-ZZZ/31/XXX GenericNumRefModelDesc=Gir et egendefinert nummer etter en definert mal. ServerAvailableOnIPOrPort=Serveren er tilgjengelig på adressen %s på port %s ServerNotAvailableOnIPOrPort=Serveren er ikke tilgjengelig på adressen %s på port %s @@ -393,7 +396,7 @@ LinkToTest=Klikkbar link generert for bruker%s (klikk telefonnu KeepEmptyToUseDefault=Hold tomt for å bruke standardverdien DefaultLink=Standard kobling ValueOverwrittenByUserSetup=Advarsel, denne verdien kan bli overskrevet av brukerspesifikke oppsett (hver bruker kan sette sitt eget clicktodial url) -ExternalModule=External module - Installed into directory %s +ExternalModule=Ekstern modul - Installert i katalog %s BarcodeInitForThirdparties=Mass barcode init for thirdparties BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined. @@ -437,14 +440,14 @@ Module52Name=Beholdning Module52Desc=Behandling av lagerbeholdning Module53Name=Tjenester Module53Desc=Behandling av tjenester -Module54Name=Kontrakter -Module54Desc=Behandling av kontrakter og tjenester +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Strekkoder 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=Prosjekter -Module400Desc=Behandling av prosjekter inne i andre moduler +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) @@ -484,7 +487,7 @@ Module500Desc=Forvaltning av spesielle utgifter som skatt, sosiale bidrag, utbyt Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Varselmeldinger -Module600Desc=Sender beskjeder (med e-post) om Dolibarrhendleser +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donasjoner Module700Desc=Behandling av donasjoner Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-selskap Module5000Desc=Lar deg administrere flere selskaper Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Ferier -Module20000Desc=Erklære og følg ansattes ferie +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 Module50100Desc=Kassaapparatmodul -Module50200Name= Paypal -Module50200Desc= Modul å tilby en online betaling side med kredittkort med Paypal +Module50200Name=Paypal +Module50200Desc=Modul å tilby en online betaling side med kredittkort med 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=Marginer @@ -606,15 +613,16 @@ Permission151=Vise åpne ordre Permission152=Sette opp åpne ordre Permission153=Vise kvitteringer for stående ordre Permission154=Kreditt / nekte stående ordre kvitteringer -Permission161=Vise kontrakter -Permission162=Lage/endre kontrakter -Permission163=Aktivere en tjeneste i en kontrakt -Permission164=Deaktivere en tjeneste i en kontrakt -Permission165=Slette kontrakter -Permission171=Les turer -Permission172=Opprett / endre turer -Permission173=Slett turer -Permission178=Eksporter turer +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Vise leverandører Permission181=Vise leverandøreorde Permission182=Lage/endre leverandørordre @@ -671,7 +679,7 @@ Permission300=Vise strekkoder Permission301=Vise/endre strekkoder Permission302=Slette strekkoder Permission311=Les tjenester -Permission312=Tilordne service til kontrakt +Permission312=Assign service/subscription to contract Permission331=Vise bokmerker Permission332=Lage/endre bokmerker Permission333=Slette bokmerker @@ -701,8 +709,8 @@ Permission701=Vise donasjoner Permission702=Lage/endre donasjoner Permission703=Slette donasjoner Permission1001=Vise beholdning -Permission1002=Lage/endre beholdninger -Permission1003=Slette beholdninger +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Vise lagerbevegelser Permission1005=Lage/endre lagerbevegelser Permission1101=Vise pakksedler @@ -748,7 +756,7 @@ Permission2802=Bruk FTP-klient i skrivemodus (slette eller laste opp filer) Permission50101=Bruk Point of salg Permission50201=Les transaksjoner Permission50202=Importer transaksjoner -Permission54001=Print +Permission54001=Skriv ut Permission55001=Read polls Permission55002=Create/modify polls Permission59001=Read commercial margins @@ -774,10 +782,11 @@ DictionaryFees=Type of fees DictionarySendingMethods=Shipping methods DictionaryStaff=Staff DictionaryAvailability=Delivery delay -DictionaryOrderMethods=Ordering methods +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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Ja i sommer OnlyFollowingModulesAreOpenedToExternalUsers=Obs, bare følgende moduler er åpnet for eksterne brukere (uansett tillatelse for slike brukere): SuhosinSessionEncrypt=Session lagring kryptert av Suhosin ConditionIsCurrently=Tilstand er for øyeblikket %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by %s followed by thi ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Bruk beskjeder -NotificationsDesc=Beskjeder lar deg umerket sende automatiske e-poster for noen Dolibarr-hendelser til firmaer som er konfigurert for å motta slike +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Dokumenter maler DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Vannmerke på utkast @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Legg til felt for leveringsdato UseOptionLineIfNoQuantity=En produkt/tjeneste med med null i kvantum blir betraktet som en valgmulighet FreeLegalTextOnProposal=Fritekst på tilbud WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Innstillinger for ordre OrdersNumberingModules=Nummereringsmodul for ordre @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Ordre krever godkjenning etter at tilbudet er lukket FreeLegalTextOnOrders=Fritekst på ordre WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup='Click To Dial' modul ClickToDialUrlDesc=Url som hentes når brukeren trykker på telefonikonet.
    Full url vil være: URL?login=...&password=...&caller=...&called=phonecalled @@ -1158,10 +1169,10 @@ FicheinterNumberingModules=Nummereringsmodul for intervensjoner TemplatePDFInterventions=Intervensjonsmaler WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Kontrakter modul oppsett +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Kontrakter nummerering moduler TemplatePDFContracts=Contracts documents models -FreeLegalTextOnContracts=Free text on contracts +FreeLegalTextOnContracts=Fritekst på kontrakter WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) ##### Members ##### MembersSetup=Innstillnger for medlemsmodul @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Innstillinger for produktmodul ServiceSetup=Tjenester modul oppsett @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Tilbake e-post (Feil-til) for e-post med feil ##### Notification ##### -NotificationSetup=Mailing module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=Liste over tilgjengelige varslinger (Denne listen avhenger aktiverte moduler) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menyen er slettet TreeMenu=Tremenyer @@ -1478,11 +1491,14 @@ ClickToDialDesc=Denne modulen gir et telefonikon etter telefonnummeret til konta ##### Point Of Sales (CashDesk) ##### CashDesk=Point of salg CashDeskSetup=Instillinger for modulen kassaapparat -CashDeskThirdPartyForSell=Generisk tredjepart som skal brukes til kontantsalg +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Kassekonto som skal brukes til kontantsalg CashDeskBankAccountForCheque= Konto som skal brukes til å motta utbetalinger via sjekk CashDeskBankAccountForCB= Konto som skal brukes til å motta kontant betaling med kredittkort -CashDeskIdWareHouse=Lager som skal brukes for kontantsalg +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. ##### Bookmark ##### BookmarkSetup=Legg modul oppsett BookmarkDesc=Denne modulen kan du administrere bokmerker. Du kan også legge til snarveier til noen Dolibarr sider eller externale nettsteder på venstre meny. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang index 0d405ccd554..b277a015704 100644 --- a/htdocs/langs/nb_NO/agenda.lang +++ b/htdocs/langs/nb_NO/agenda.lang @@ -6,11 +6,11 @@ Agenda=Agenda Agendas=Agendaer Calendar=Kalender Calendars=Kalendrer -LocalAgenda=Internal calendar -ActionsOwnedBy=Event owned by +LocalAgenda=Intern kalender +ActionsOwnedBy=Hendelse tilhører AffectedTo=Relatert til DoneBy=Utført av -Event=Event +Event=Hendelse Events=Hendelser EventsNb=Antall hendelser MyEvents=Mine hendelser @@ -23,27 +23,29 @@ MenuToDoActions=Alle åpne handlinger MenuDoneActions=Alle avsluttede handlinger MenuToDoMyActions=Mine åpne handlinger MenuDoneMyActions=Mine avsluttede handlinger -ListOfEvents=List of events (internal calendar) +ListOfEvents=Hendelsesliste (intern kalender) ActionsAskedBy=Handlinger registrert av ActionsToDoBy=Handlinger relatert til ActionsDoneBy=Handlinger utført av -ActionsForUser=Events for user -ActionsForUsersGroup=Events for all users of group +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 ViewCal=Vis kalender ViewDay=Dagsvisning ViewWeek=Ukesvisning -ViewPerUser=Per user view +ViewPerUser=Visning pr. bruker ViewWithPredefinedFilters= Vis med forhåndsdefinerte filtere AutoActions= Automatisk utfylling av agenda AgendaAutoActionDesc= Her angir du hvilke handlinger du ønsker at Dolibarr automatisk skal registrere i agendaen. Hvis du ikke velger noe (forhåndsinnstilt), vil bare manuelle handlinger bli registrert i agendaen. AgendaSetupOtherDesc= Her kan du gjøre andre innstillinger i agendamodulen. AgendaExtSitesDesc=Denne siden lar deg erklære eksterne kilder til kalendere for å se sine arrangementer inn Dolibarr agenda. -ActionsEvents= Handlinger som Dolibarr automatisk registrerer i agendaen -PropalValidatedInDolibarr= Tilbud godkjent -InvoiceValidatedInDolibarr= Faktura godkjent +ActionsEvents=Handlinger som Dolibarr automatisk registrerer i agendaen +PropalValidatedInDolibarr=Tilbud godkjent +InvoiceValidatedInDolibarr=Faktura godkjent +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Faktura %s gå tilbake til utkast status InvoiceDeleteDolibarr=Faktura %s slettet OrderValidatedInDolibarr= Ordre godkjent @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Bestill %s godkjent OrderRefusedInDolibarr=Ordre %s nektet OrderBackToDraftInDolibarr=Bestill %s gå tilbake til utkast status OrderCanceledInDolibarr=Bestill %s kansellert -InterventionValidatedInDolibarr=Intervensjon %s validert ProposalSentByEMail=Kommersielle forslag %s på e-post OrderSentByEMail=Kundeordrer %s på e-post InvoiceSentByEMail=Faktura %s på e-post @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Leverandør bestill %s på e-post SupplierInvoiceSentByEMail=Leverandørfaktura %s på e-post ShippingSentByEMail=Frakt %s på e-post ShippingValidated= Shipping %s validert -InterventionSentByEMail=Intervensjon %s på e-post -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Tredjepart opprettet DateActionPlannedStart= Planlagt startdato DateActionPlannedEnd= Planlagt sluttdato @@ -70,24 +69,24 @@ DateActionStart= Startdato DateActionEnd= Sluttdato AgendaUrlOptions1=Du kan også bruke følgende parametere til å filtrere listen: AgendaUrlOptions2=login=%s for å begrense utvalg til handlinger registrert av, relatert til eller utført av bruker %s. -AgendaUrlOptions3=logina=%s for å begrense utvalg til handlinger registrert av bruker %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s for å begrense utvalg til handlinger relatert til bruker %s. -AgendaUrlOptions5=logind=%s for å begrense utvalg til handlinger utført av bruker %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Vis fødselsdager AgendaHideBirthdayEvents=Skjul fødselsdager Busy=Opptatt ExportDataset_event1=Liste over agenda hendelser -DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) -DefaultWorkingHours=Default working hours in day (Example: 9-18) +DefaultWorkingDays=Standard arbeidsuke (f.eks 1-5, 1-6) +DefaultWorkingHours=Standard arbeidstid (f.eks 9-18) # External Sites ical ExportCal=Eksporter kalender ExtSites=Importer eksterne kalendere -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesEnableThisTool=Vis eksterne kalendere (definert i global setup) i agenda. Påvirker ikke eksterne kalendere definert av brukere. ExtSitesNbOfAgenda=Antall kalendere AgendaExtNb=Kalender nb %s ExtSiteUrlAgenda=URL tilgang til. ICal-fil ExtSiteNoLabel=Ingen beskrivelse -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range -AddEvent=Add event -MyAvailability=My availability +WorkingTimeRange=Arbeidstid +WorkingDaysRange=Arbeidsuke +AddEvent=Create event +MyAvailability=Min tilgjengelighet diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang index 1253d145255..aa07946a216 100644 --- a/htdocs/langs/nb_NO/bills.lang +++ b/htdocs/langs/nb_NO/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Kreditnota InvoiceAvoirAsk=Kreditnota for å korriger fektura InvoiceAvoirDesc=En kreditnota er en negativ faktura som brukes for å løse situasjoner hvor en faktura har et annet beløp enn det som virkelig er betalt (fordi kunden har betalt for lite ved en feil, eller for eksempel ikke ønsker å betale alt fordi han har returnert noen varer.).

    Obs!: Originalfakturaen må allerede være lukket ('betalt' eller 'delbetalt') for at du skal kunne opprette en kreditnota mot den. invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Erstatt faktura %s ReplacementInvoice=Erstatningsfaktura ReplacedByInvoice=Erstattet av faktura %s @@ -58,7 +58,7 @@ Payment=Betaling PaymentBack=Betaling tilbake Payments=Betalinger PaymentsBack=Betalinger tilbake -PaidBack=Paid back +PaidBack=Tilbakebetalt DatePayment=Betalingsdato DeletePayment=Slett betaling ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen? @@ -77,7 +77,7 @@ PaymentMode=Betalingsmåte PaymentConditions=Betalingsbetingelser PaymentConditionsShort=Betalingsbetingelser PaymentAmount=Beløp til betaling -ValidatePayment=Validate payment +ValidatePayment=Godkjenn betaling PaymentHigherThanReminderToPay=Betalingen er høyere enn restbeløp HelpPaymentHigherThanReminderToPay=Oppmerksomhet, er betalingen mengden av en eller flere regninger høyere enn resten til å betale.
    Endre din oppføring, ellers bekrefte og tenke på å lage en kreditnota av det overskytende mottatt for hver overbetalte fakturaer. HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
    Edit your entry, otherwise confirm. @@ -87,7 +87,7 @@ ClassifyCanceled=Merk 'Tapsført' ClassifyClosed=Merk 'Lukket' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Lag faktura -AddBill=Legg til faktura eller kreditnota +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Slett faktura SearchACustomerInvoice=Finn kundefaktura @@ -99,7 +99,7 @@ DoPaymentBack=Utfør tilbakebetaling ConvertToReduc=Konverter til framtidig rabatt EnterPaymentReceivedFromCustomer=Legg inn betaling mottatt fra kunde EnterPaymentDueToCustomer=Lag purring til kunde -DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Beløp PriceBase=Prisgrunnlag BillStatus=Fakturastatus @@ -137,8 +137,6 @@ BillFrom=Fra BillTo=Fakturamottaker ActionsOnBill=Handlinger på faktura NewBill=Ny faktura -Prélèvements=Utestående ordre -Prélèvements=Utestående ordre LastBills=Siste %s fakturaer LastCustomersBills=Siste %s kundefakturaer LastSuppliersBills=Siste %s kundefakturaer @@ -156,9 +154,9 @@ ConfirmCancelBill=Er du sikker på at du vil kansellere faktura %s ? ConfirmCancelBillQuestion=hvorfor vil du tapsføre denne fakturaen? ConfirmClassifyPaidPartially=Er du sikker på at du vil endre status på faktura %s til betalt? ConfirmClassifyPaidPartiallyQuestion=Denne fakturaen er ikke fullt ut betalt. Hva er grunnen til at du vil lukke fakturaen? -ConfirmClassifyPaidPartiallyReasonAvoir=Restbeløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg ønsker å rette opp MVA med en kreditnota. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg aksepterer å miste MVA på denne rebatten. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Restebløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg skriver av MVA på denne rabatten uten kreditnota. +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=Dårlig kunde ConfirmClassifyPaidPartiallyReasonProductReturned=Varer delvis returnert ConfirmClassifyPaidPartiallyReasonOther=Beløpet tapsføres av en annen årsak @@ -191,10 +189,10 @@ AlreadyPaid=Allerede betalt AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditt notater og innskudd) Abandoned=Tapsført -RemainderToPay=Restbeløp -RemainderToTake=Restbeløp -RemainderToPayBack=Remainder to pay back -Rest=Pending +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back +Rest=Ventende AmountExpected=Beløp purret ExcessReceived=Overskytende EscompteOffered=Rabatt innrømmet (betalt før forfall) @@ -220,18 +218,17 @@ ClassifyBill=Klassifiser faktura SupplierBillsToPay=Leverandørfakturaer til betaling CustomerBillsUnpaid=Ubetalte kundefakturaer DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters -DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Angi betalingsbetingelser SetMode=Angi betalingsmodus Billed=Fakturert -RepeatableInvoice=Forhåndsdefinert faktura -RepeatableInvoices=Forhåndsdefinerte fakturaer -Repeatable=Forhåndsdefinert -Repeatables=Forhåndsdefinert -ChangeIntoRepeatableInvoice=Konverter til forhåndsdefinert -CreateRepeatableInvoice=Opprett forhåndsdefinert faktura -CreateFromRepeatableInvoice=Opprett fra forhåndsdefinert faktura +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Kundefakturaer og fakturalinjer CustomersInvoicesAndPayments=Kundefakturaer og betalinger ExportDataset_invoice_1=Oversikt over kundefakturaer og fakturalinjer @@ -315,9 +312,9 @@ PaymentConditionPT_DELIVERY=Ved levering PaymentConditionShortPT_ORDER=On order PaymentConditionPT_ORDER=On order PaymentConditionShortPT_5050=50-50 -PaymentConditionPT_5050=50%% in advance, 50%% on delivery -FixAmount=Fix amount -VarAmount=Variable amount (%% tot.) +PaymentConditionPT_5050=50%% i forskudd, 50%% ved levering +FixAmount=Fast beløp +VarAmount=Variabelt beløp # PaymentType PaymentTypeVIR=Bankgiro PaymentTypeShortVIR=Bankgiro @@ -367,7 +364,7 @@ LawApplicationPart2=intil de er fullt ut betalt. LawApplicationPart3=Fakturautsteder forbeholder seg salgspant LawApplicationPart4=i leverte varer inntil de er betalt i sin helhet. LimitedLiabilityCompanyCapital=AS med organisajonsnummer -UseLine=Apply +UseLine=Legg til UseDiscount=Bruk rabatt UseCredit=Bruk kredittkort UseCreditNoteInInvoicePayment=Rediset betaling med denne kreditnotaen @@ -394,9 +391,9 @@ PayedByThisPayment=Betales av denne betalingen ClosePaidInvoicesAutomatically=Klassifisere "betalt" alle standard eller utskifting fakturaer entirely utbetales. ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back. AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil bli automatisk stengt for status "betales". -ToMakePayment=Pay -ToMakePaymentBack=Pay back -ListOfYourUnpaidInvoices=List of unpaid invoices +ToMakePayment=Betal +ToMakePaymentBack=Tilbakebetal +ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative. RevenueStamp=Revenue stamp YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang index d272648cfc6..8c593d439f0 100644 --- a/htdocs/langs/nb_NO/categories.lang +++ b/htdocs/langs/nb_NO/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Koblinger mellom leverandører og kategorier CatCusLinks=Koblinger mellom kunder / prospekter og kategorier CatProdLinks=Koblinger mellom produkter / tjenester og kategorier CatMemberLinks=Koblinger mellom medlemmer og kategorier -CatProdLinks=Koblinger mellom produkter / tjenester og kategorier -CatCusLinks=Koblinger mellom kunder / prospekter og kategorier -CatSupLinks=Koblinger mellom leverandører og kategorier DeleteFromCat=Fjern fra kategori DeletePicture=Slette bilde ConfirmDeletePicture=Bekreft bildesletting? @@ -111,4 +108,5 @@ ExtraFieldsCategories=Komplementære attributter CategoriesSetup=Kategori-oppsett CategorieRecursiv=Link med overordnet kategori automatisk CategorieRecursivHelp=Hvis aktivert, vil produktet også knyttes til overordnet kategori når du legger inn en underkategori -AddProductServiceIntoCategory=Add the following product/service +AddProductServiceIntoCategory=Legg til følgende produkt/tjeneste +ShowCategory=Show category diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang index 0656184c281..a2c7df48a4d 100644 --- a/htdocs/langs/nb_NO/compta.lang +++ b/htdocs/langs/nb_NO/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Dårlig kunde regnskap koden for %s SuppliersProductsSellSalesTurnover=Den genererte omsetningen av salg av leverandørens produkter. CheckReceipt=Sjekk innskudd CheckReceiptShort=Sjekk innskudd +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Nye rabatt NewCheckDeposit=Ny sjekk innskudd NewCheckDepositOn=Lag kvittering for innskudd på konto: %s @@ -196,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 3a686d49669..e8fe7fe9637 100644 --- a/htdocs/langs/nb_NO/contracts.lang +++ b/htdocs/langs/nb_NO/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Kontraktsområde ListOfContracts=Oversikt over kontrakter -LastContracts=Siste %s endrede kontrakter +LastModifiedContracts=Last %s modified contracts AllContracts=Alle kontrakter ContractCard=Kontraktskort ContractStatus=Kontraktstatus @@ -27,7 +27,7 @@ MenuRunningServices=Løpende tjenester MenuExpiredServices=Utløpte tjenester MenuClosedServices=Lukkede tjenester NewContract=Ny kontrakt -AddContract=Legg til kontrakt +AddContract=Create contract SearchAContract=Finn kontrakt DeleteAContract=Slett kontrakt CloseAContract=Lukk kontrakt @@ -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=Siste %s endrede kontrakter +LastContracts=Last %s contracts LastActivatedServices=Siste %s aktiverte tjenester LastModifiedServices=Siste %s endrede tjenester EditServiceLine=Rediger tjenestelinje @@ -89,8 +89,9 @@ ListOfServicesToExpireWithDuration=Liste over tjenester som utløper innen %s da ListOfServicesToExpireWithDurationNeg=Liste over tjenester utløpt fra mer enn %s dager ListOfServicesToExpire=Liste over utløpende tjenester NoteListOfYourExpiredServices=Denne listen inneholder kun tjenester av kontrakter for tredjeparter du er koblet til som salgsrepresentant. -StandardContractsTemplate=Standard contracts template -ContactNameAndSignature=For %s, name and signature: +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/cron.lang b/htdocs/langs/nb_NO/cron.lang index 47d4378cd84..2fd21d9c44b 100644 --- a/htdocs/langs/nb_NO/cron.lang +++ b/htdocs/langs/nb_NO/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = Om -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job CronNone= Ingen CronDtStart=Startdato CronDtEnd=Sluttdato -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe CronMethod=Metode CronModule=Modul -# CronAction=Action +CronAction=Action CronStatus=Status CronStatusActive=Slått på CronStatusInactive=Slått av -# CronNoJobs=No jobs registered +CronNoJobs=No jobs registered CronPriority=Prioritet CronLabel=Beskrivelse -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create CronArgs=Parametere -# CronSaveSucess=Save succesfully +CronSaveSucess=Save succesfully CronNote=Kommentar -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable CronStatusInactiveBtn=Slå av -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/nb_NO/donations.lang b/htdocs/langs/nb_NO/donations.lang index f3b03e310b5..9d2ec5ceac9 100644 --- a/htdocs/langs/nb_NO/donations.lang +++ b/htdocs/langs/nb_NO/donations.lang @@ -4,7 +4,7 @@ Donations=Donasjoner DonationRef=Donation ref. Donor=Giver Donors=Givere -AddDonation=Legg til donasjon +AddDonation=Create a donation NewDonation=Ny donasjon ShowDonation=Show donation DonationPromise=Lovet donasjon @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/nb_NO/externalsite.lang index 58f2fa9833b..a9bb5c5b6b8 100644 --- a/htdocs/langs/nb_NO/externalsite.lang +++ b/htdocs/langs/nb_NO/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite ExternalSiteSetup=Oppsett lenke til ekstern nettside ExternalSiteURL=Ekstern nettstedadresse -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang index b8a8d1195da..77547730107 100644 --- a/htdocs/langs/nb_NO/holiday.lang +++ b/htdocs/langs/nb_NO/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Oppdater CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Navn Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Verdi -GroupToValidateCP=Group with the ability to approve vacation -ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation -UpdateConfCPOK=Updated successfully. -ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +GroupToValidateCP=Group with the ability to approve leave requests +ConfirmConfigCP=Valider konfigurasjonen +LastUpdateCP=Last automatic update of leaves allocation +UpdateConfCPOK=Vellykket oppdatering. +ErrorUpdateConfCP=En feil oppsto under oppdatering, vennligst prøv igjen. +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Godkjenn UpdateEventCP=Update events diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang index 1c7ce9ae202..5705c460ca4 100644 --- a/htdocs/langs/nb_NO/interventions.lang +++ b/htdocs/langs/nb_NO/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervensjon Interventions=Intervensjoner InterventionCard=Intervensjonskort NewIntervention=Ny intervensjon -AddIntervention=Legg til interensjon +AddIntervention=Create intervention ListOfInterventions=Oversikt over intervensjoner EditIntervention=Rediger intervensjon ActionsOnFicheInter=Handlinger om inngrep @@ -30,6 +30,15 @@ StatusInterInvoiced=Fakturert RelatedInterventions=Relaterte intervensjoner ShowIntervention=Vis intervensjon SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Ansvarlig for å følge opp intervensjonen TypeContact_fichinter_internal_INTERVENING=Tekniker diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang index 630eb5dcee9..011ac84fb48 100644 --- a/htdocs/langs/nb_NO/mails.lang +++ b/htdocs/langs/nb_NO/mails.lang @@ -79,7 +79,7 @@ MailtoEMail=Link til e-post ActivateCheckRead=Tillate å bruke "Avmelding" linken ActivateCheckReadKey=Key bruk for å kryptere URL bruk for "Les kvittering" og "melder"-funksjonen EMailSentToNRecipients=E-post sendt til %s mottakere. -XTargetsAdded=%s recipients added into target list +XTargetsAdded=%s mottakere lagt til i målliste EachInvoiceWillBeAttachedToEmail=Et dokument med standard faktura dokumentmal vil bli opprettet og sendt med hver e-post. MailTopicSendRemindUnpaidInvoices=Påminnelse om faktura %s (%s) SendRemind=Send påminnelse som e-post @@ -115,7 +115,7 @@ SentBy=Sendt av MailingNeedCommand=For sikkerhets skyld sende en e-post er bedre når utføres fra kommandolinjen. Hvis du har en, spør din server administrator å lansere følgende kommando for å sende e-post til alle mottakere: MailingNeedCommand2=Du kan imidlertid sende dem online ver å sette parameteret MAILING_LIMIT_SENDBYWEB til en verdi tilsvarende den maksimale antalle e-poster du ønsker å sende i en økt. ConfirmSendingEmailing=Hvis du ikke kan eller foretrekker å sende dem med din nettleser, må du bekrefte at du er sikker på at du vil sende e-post nå fra nettleseren din? -LimitSendingEmailing=Merk: På linjen sending av emailings er begrenset for sikkerhet og timeout grunner til %s mottakere ved å sende økten. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Tøm liste ToClearAllRecipientsClickHere=Trykk på knappen for å tømme mottagerlisten ToAddRecipientsChooseHere=Velg i listene for å legge til mottagere @@ -133,6 +133,9 @@ Notifications=Varsler NoNotificationsWillBeSent=Ingen e-postvarsler er planlagt for denne hendelsen/firmaet ANotificationsWillBeSent=1 e-postvarsel vil bli sendt med e-post SomeNotificationsWillBeSent=%s e-postvarsler vil bli sendt med e-post -AddNewNotification=Slå på en ny varslingsforespørsel -ListOfActiveNotifications=Vis alle altive varslingsforespørsler +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List alle e-postmeldinger sendt +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang index c4ba5f792fd..ad3577e6779 100644 --- a/htdocs/langs/nb_NO/main.lang +++ b/htdocs/langs/nb_NO/main.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - main -DIRECTION=ltr +DIRECTION=l # Note for Chinese: # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) # stsongstdlight or cid0cs are for simplified Chinese @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Fant ikke bruker %s i databasen. ErrorNoVATRateDefinedForSellerCountry=Feil: Det er ikke definert noen MVA-satser for landet '%s'. ErrorNoSocialContributionForSellerCountry=Feil, ingen sosiale bidrag type definert for landets %s '. ErrorFailedToSaveFile=Feil: Klarte ikke å lagre filen. -ErrorOnlyPngJpgSupported=Feil: Det er kun støtte for bilder i formatene .png og .jpg. -ErrorImageFormatNotSupported=Din PHP støtter ikke bildekonvertering i dette formatet. SetDate=Still dato SelectDate=Velg en dato SeeAlso=Se også %s BackgroundColorByDefault=Standard bakgrunnsfarge +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=En fil er valgt for feste, men var ennå ikke lastet opp. Klikk på "Legg ved fil" for dette. NbOfEntries=Nb oppføringer GoToWikiHelpPage=Les elektronisk hjelp (trenger Internett-tilgang) @@ -266,6 +266,7 @@ Afternoon=Ettermiddag Quadri=Quadri MonthOfDay=Month of the day HourShort=T +MinuteShort=mn Rate=Timesats UseLocalTax=Inkluderer skatt Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full liste Statistics=Statistikk OtherStatistics=Annen statistikk Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Nummer RefSupplier=Ref. leverandør @@ -365,6 +367,7 @@ ActionsOnCompany=Handlinger ifm. denne tredjeparten ActionsOnMember=Hendelser om dette medlemmet NActions=%s handlinger NActionsLate=%s forsinket +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Fjern filter ChartGenerated=Graf opprettet @@ -645,6 +648,7 @@ OptionalFieldsSetup=Ekstra attributter oppsett URLPhoto=Url av foto / logo SetLinkToThirdParty=Lenke til en annen tredjepart CreateDraft=Lag utkast +SetToDraft=Back to draft ClickToEdit=Klikk for å redigere ObjectDeleted=Objekt %s slettet ByCountry=Etter land @@ -678,7 +682,7 @@ ViewPrivateNote=Vis notater XMoreLines=%s linje(r) skjult PublicUrl=Offentlig URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Mandag Tuesday=Tirsdag diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang index 514969be259..229f4c06a93 100644 --- a/htdocs/langs/nb_NO/margins.lang +++ b/htdocs/langs/nb_NO/margins.lang @@ -38,4 +38,7 @@ BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/nb_NO/orders.lang index 7cfc760b572..fc6372a3cf4 100644 --- a/htdocs/langs/nb_NO/orders.lang +++ b/htdocs/langs/nb_NO/orders.lang @@ -53,7 +53,7 @@ ShippingExist=En forsendelse eksisterer DraftOrWaitingApproved=Utkast eller godkjent ennå ikke bestilt DraftOrWaitingShipped=Utkast eller validert ennå ikke levert MenuOrdersToBill=Ordre levert -MenuOrdersToBill2=Ordrer å fakturere +MenuOrdersToBill2=Billable orders SearchOrder=Søk i ordre SearchACustomerOrder=Søk etter kundeordre ShipProduct=Lever produkt @@ -65,7 +65,7 @@ ValidateOrder=Valider ordre UnvalidateOrder=Devalider ordre DeleteOrder=Slett ordre CancelOrder=Avbryt ordre -AddOrder=Legg til ordre +AddOrder=Create order AddToMyOrders=Legg til mine ordre AddToOtherOrders=Lagg til andre ordre AddToDraftOrders=Legg til ordreutkast @@ -154,7 +154,6 @@ OrderByPhone=Telefon CreateInvoiceForThisCustomer=Fakturer ordrer NoOrdersToInvoice=Ingen fakturerbare ordrer CloseProcessedOrdersAutomatically=Klassifiser alle valgte bestillinger "Behandlet". -MenuOrdersToBill2=Ordrer å fakturere OrderCreation=Opprett ordre Ordered=Bestilt OrderCreated=Din ordre har blitt opprettet diff --git a/htdocs/langs/nb_NO/oscommerce.lang b/htdocs/langs/nb_NO/oscommerce.lang deleted file mode 100644 index 49b04568b79..00000000000 --- a/htdocs/langs/nb_NO/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce moduloppsett -OSCommerceSetupSaved=OS Commerce innstillinger lagret -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce databasenavn -OSCommercePrefix=OS Commerce tabellprefix -OSCommerceUser=OS Commerce databaseinnlogging diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang index 534b90ca907..d634da4b41f 100644 --- a/htdocs/langs/nb_NO/other.lang +++ b/htdocs/langs/nb_NO/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Sikkerhetskode Calendar=Kalender -AddTrip=Legg til reise Tools=Verktøy ToolsDesc=Dette området er dedikert til gruppen diverse verktøy ikke er tilgjengelig i andre menyen oppføringer.

    Disse verktøyene kan nås fra menyen på siden. Birthday=Fødselsdag @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Antall vedlagte filer/dokumenter TotalSizeOfAttachedFiles=Total størrelse på vedlagte filer/dokumenter MaxSize=Maksimal størrelse @@ -80,6 +80,16 @@ ModifiedBy=Endret av %s ValidatedBy=Godkjent av %s CanceledBy=Kansellert av %s ClosedBy=Luket av %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Filen ble slettet DirWasRemoved=Mappen ble slettet FeatureNotYetAvailableShort=Tilgjengelig i en neste versjon @@ -187,31 +197,32 @@ PleaseBePatient=Vær tålmodig ... RequestToResetPasswordReceived=A request to change your Dolibarr password has been received NewKeyIs=This is your new keys to login NewKeyWillBe=Your new key to login to software will be -ClickHereToGoTo=Click here to go to %s +ClickHereToGoTo=Klikk her for å gå til %s YouMustClickToChange=You must however first click on the following link to validate this password change ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe. ##### Calendar common ##### AddCalendarEntry=Legg oppføring til kalender %s -NewCompanyToDolibarr=Firma %s lagt til Dolibarr -ContractValidatedInDolibarr=Kontrakt %s godkjent i Dolibarr -ContractCanceledInDolibarr=Kontrakt %s kansellert i Dolibarr -ContractClosedInDolibarr=Kontrakt %s lukket i Dolibarr -PropalClosedSignedInDolibarr=Tilbud %s signert i Dolibarr -PropalClosedRefusedInDolibarr=Tilbud %s avvist i Dolibarr -PropalValidatedInDolibarr=Tilbud %s godkjent i Dolibarr -InvoiceValidatedInDolibarr=Faktura %s godkjent i Dolibarr -InvoicePaidInDolibarr=Faktura %s satt til betalt i Dolibarr -InvoiceCanceledInDolibarr=Faktura %s kansellert i Dolibarr -PaymentDoneInDolibarr=Betaling %s utført i Dolibarr -CustomerPaymentDoneInDolibarr=Kundebetaling %s utført i Dolibarr -SupplierPaymentDoneInDolibarr=Leverandørbetaling %s utført i Dolibarr -MemberValidatedInDolibarr=Medlem %s godkjent i Dolibarr -MemberResiliatedInDolibarr=Medlem %s resiliated i Dolibarr -MemberDeletedInDolibarr=Medlem %s slettet fra Dolibarr -MemberSubscriptionAddedInDolibarr=Medlemskap for %s lagt til i Dolibarr -ShipmentValidatedInDolibarr=Forsendelse %s validert i Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Eksport ExportsArea=Eksportområde diff --git a/htdocs/langs/nb_NO/paybox.lang b/htdocs/langs/nb_NO/paybox.lang index 64038c859f4..0509a95252c 100644 --- a/htdocs/langs/nb_NO/paybox.lang +++ b/htdocs/langs/nb_NO/paybox.lang @@ -32,6 +32,9 @@ VendorName=Navn på leverandøren CSSUrlForPaymentForm=CSS-stilark url for betalingsformen MessageOK=Melding på godkjent betaling retur siden MessageKO=Melding om avbrutt betaling retur siden -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/nb_NO/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang index 0780ba80c90..7c11ec56d1e 100644 --- a/htdocs/langs/nb_NO/sendings.lang +++ b/htdocs/langs/nb_NO/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For øyeblikket er opprettelsen av en ny forsend RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch av kunde diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang index c6212a73793..401d409e0f1 100644 --- a/htdocs/langs/nb_NO/stocks.lang +++ b/htdocs/langs/nb_NO/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=du må angi en merkelapp for lageret CorrectStock=Riktig beholdning ListOfWarehouses=Oversikt over lagere ListOfStockMovements=Oversikt over bevegelser -StocksArea=Beholdningsområde +StocksArea=Warehouses area Location=Lokasjon LocationSummary=Kort navn på lokasjon NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang index 7e2b96ec226..f4a5d1800c3 100644 --- a/htdocs/langs/nb_NO/users.lang +++ b/htdocs/langs/nb_NO/users.lang @@ -63,7 +63,6 @@ ShowGroup=Vis gruppe ShowUser=Vis bruker NonAffectedUsers=Ikke berørte brukere UserModified=Brukeren er endret -GroupModified=Gruppen er endret PhotoFile=Bildefil UserWithDolibarrAccess=Bruker med Dolibarrtilgang ListOfUsersInGroup=Oversikt over brukere i denne gruppen @@ -87,7 +86,7 @@ MyInformations=Mine data ExportDataset_user_1=Dolibarr brukere og egenskaper DomainUser=Domenebruker %s Reactivate=Reaktiver -CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. +CreateInternalUserDesc=Med dette skjemaet kan du opprette en intern bruker til din bedrift / stiftelse. For å lage en ekstern bruker (kunde, leverandør, osv), bruk knappen 'Lag Dolibarr bruker' fra tredjeparts kontaktkort InternalExternalDesc=En intern bruker er er en som er en del av firmaet/organisasjonen.
    En ekstern bruker er en kunde, leverandør eller annen tredjeperson.

    I begge tilfelle styres brukeren av Dolibarr-rettigheter. Dessuten kan eksterne brukere ha en annen menybehandler enn interne brukere (Se Hjem - Instillinger - Visning) PermissionInheritedFromAGroup=Rettigheter innvilget fordi de er arvet av en brukegruppe. Inherited=Arvet @@ -103,7 +102,7 @@ UserDisabled=Brukeren %s er deaktivert UserEnabled=Brukeren %s er aktivert UserDeleted=Brukeren %s er fjernet NewGroupCreated=Gruppen %s er oprettet -GroupModified=Gruppen er endret +GroupModified=Group %s modified GroupDeleted=Gruppen %s er fjernet ConfirmCreateContact=Er du sikker på at du vil lage en Dolibarr-konto til denne kontaktpersonen? ConfirmCreateLogin=Er du sikker på at du vil opprette en Dolibarr konto for medlemmet? @@ -114,8 +113,10 @@ YourRole=Din roller YourQuotaOfUsersIsReached=Din kvote på aktive brukere er nådd! NbOfUsers=Nb av brukere DontDowngradeSuperAdmin=Bare en superadmin kan nedgradere en superadmin -HierarchicalResponsible=Hierarkisk ansvarlig +HierarchicalResponsible=Veileder HierarchicView=Hierarkisk visning UseTypeFieldToChange=Bruk feltet Type til endring OpenIDURL=OpenID URL LoginUsingOpenID=Bruk OpenID til å logge inn +WeeklyHours=Uketimer +ColorUser=Color of the user diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang index 0e67a922ea3..5de436e0476 100644 --- a/htdocs/langs/nb_NO/withdrawals.lang +++ b/htdocs/langs/nb_NO/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kvittering LastWithdrawalReceipts=Siste %s kvitteringer WithdrawedBills=Betalte fakturaer WithdrawalsLines=Betalte linjer -RequestStandingOrderToTreat=Vis utestående ordrer å behandle -RequestStandingOrderTreated=Vis behandlede utestående ordre +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Utestående kundeordre CustomerStandingOrder=Utestående kundeordre NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Metode Transmission Send=Send Lines=Linjer StandingOrderReject=Utstede en avvise -InvoiceRefused=Lad avvisningen til kunden WithdrawalRefused=Uttak Refuseds WithdrawalRefusedConfirm=Er du sikker på at du vil angi en tilbaketrekning avslag for samfunnet RefusedData=Dato for avvisning RefusedReason=Årsak til avslag RefusedInvoicing=Fakturering avvisningen NoInvoiceRefused=Ikke lad avvisningen -InvoiceRefused=Lad avvisningen til kunden +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Ukjent StatusWaiting=Venter @@ -76,13 +76,14 @@ WithBankUsingRIB=For bankkontoer bruker RIB WithBankUsingBANBIC=For bankkontoer bruker IBAN / BIC / SWIFT BankToReceiveWithdraw=Bankkonto til å motta trekker seg CreditDate=Kreditt på -WithdrawalFileNotCapable=Kan ikke generere uttak kvittering fil for ditt land +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_BE/agenda.lang b/htdocs/langs/nl_BE/agenda.lang index b15ab84156d..77fadd7de28 100644 --- a/htdocs/langs/nl_BE/agenda.lang +++ b/htdocs/langs/nl_BE/agenda.lang @@ -20,4 +20,3 @@ AgendaUrlOptions1=U kan ook de volgende parameters toevoegen voor de uitkomst va AgendaUrlOptions2=login=%s om de uitkomst van de acties te beperken: gemaakt door, beïnvloed door of gedaan door gebruiker %s AgendaUrlOptions3=logina=%s om de uitkomst van de acties te beperken: gemaakt door gebruiker %s AgendaUrlOptions4=logint=%s to restrict output to actions affected to user %s. -AgendaUrlOptions5=logind=%s om de uitkomst van de acties te beperken: gedaan door gebruiker %s diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang index 0b2f6cf3486..26c513c1640 100644 --- a/htdocs/langs/nl_BE/bills.lang +++ b/htdocs/langs/nl_BE/bills.lang @@ -65,7 +65,6 @@ ErrorInvoiceAvoirMustBeNegative=Fout, correctiefactuur moet een negatief bedrag ErrorInvoiceOfThisTypeMustBePositive=Fout, dit type factuur moet een positief bedrag hebben ErrorCantCancelIfReplacementInvoiceNotValidated=Fout, kan geen factuur annuleren die is vervangen door een andere factuur die nog in klad status is BillTo=Aan -Prélèvements=Domiciliëring LastCustomersBills=Laatste %s facturen klanten LastSuppliersBills=Laatste %s facturen leveranciers DraftBills=Klad facturen @@ -90,8 +89,6 @@ RemainderToPay=Rest te betalen RemainderToTake=Rest te ontvangen SendBillRef=Verstuur factuur %s SendReminderBillRef=Verstuur factuur %s (herinnering) -StandingOrders=Standing orders -StandingOrder=Standing order NoDraftBills=Geen klad facturen NoOtherDraftBills=Geen andere klad facturen RefBill=Factuur ref @@ -102,7 +99,6 @@ RelatedCommercialProposals=Gerelateerde commerciële voorstellen MenuToValid=Te valideren SupplierBillsToPay=Te betalen leveranciers facturen CustomerBillsUnpaid=Onbetaalde facturen klanten -DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Niet recupereerbaar RepeatableInvoice=Herhaalbare factuur RepeatableInvoices=Herhaalbare facturen @@ -147,7 +143,6 @@ BankCode=Bank code DeskCode=Desk code Residence=Domiciliering IBANNumber=IBAN nummer -BIC=BIC/SWIFT BICNumber=BIC/SWIFT nummer RegulatedOn=Regulariseerd op ChequeNumber=Cheque N° diff --git a/htdocs/langs/nl_BE/contracts.lang b/htdocs/langs/nl_BE/contracts.lang index a81cd5f1907..f6113661917 100644 --- a/htdocs/langs/nl_BE/contracts.lang +++ b/htdocs/langs/nl_BE/contracts.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracten gebied ListOfContracts=Lijst van opdrachten -LastContracts=Laatste %s bewerkte contracten ContractCard=Contract kaart ContractStatusDraft=Ontwerp ServiceStatusLate=Actief, verstreken @@ -24,6 +23,7 @@ ListOfServices=Lijst van diensten ListOfRunningContractsLines=Lijst van lopende contract lijnen ListOfRunningServices=Lijst van actieve diensten NotActivatedServices=Niet geactiveerde diensten (onder gevalideerde contracten) +LastContracts=Laatste %s bewerkte contracten LastActivatedServices=Laatste %s geactiveerde diensten EditServiceLine=Bewerken service lijn DateEndReal=Werkelijke einddatum van de dienst diff --git a/htdocs/langs/nl_BE/install.lang b/htdocs/langs/nl_BE/install.lang index e8eb624bb33..e768ee17942 100644 --- a/htdocs/langs/nl_BE/install.lang +++ b/htdocs/langs/nl_BE/install.lang @@ -33,7 +33,6 @@ DocumentsDirectory=Directorie om geüploade en gegenereerde documenten op te sla DolibarrDatabase=Dolibarr Databank ServerAddressDescription=Naam of IP-adres voor de database server, meestal "localhost" als database server wordt gehost op dezelfde server dan de web-server ServerPortDescription=Database server poort. Leeg houden als onbekend. -Login=Inloggen AdminLogin=Login voor administrator van de Dolibarr database. PasswordAgain=Bevestig uw wachtwoord een tweede keer AdminPassword=Wachtwoord voor administrator van de Dolibarr database. @@ -47,7 +46,6 @@ KeepEmptyIfNoPassword=Laat leeg als gebruiker geen wachtwoord heeft (dit vermijd SaveConfigurationFile=Opslaan waarden ConfigurationSaving=Configuratiebestand opslaan ServerConnection=Server-verbinding -DatabaseConnection=Database connectie DatabaseCreation=Database creatie UserCreation=Gebruiker creëren CreateDatabaseObjects=Database-objecten creëren diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang index 135b4dfe88b..e417a4ffc01 100644 --- a/htdocs/langs/nl_BE/main.lang +++ b/htdocs/langs/nl_BE/main.lang @@ -43,8 +43,6 @@ ErrorConfigParameterNotDefined=Parameter %s is niet gedefinieerd binnen D ErrorCantLoadUserFromDolibarrDatabase=Niet vinden van gebruiker %s in Dolibarr database. ErrorNoVATRateDefinedForSellerCountry=Fout, geen BTW-tarieven voor land "%s". ErrorFailedToSaveFile=Fout, mislukt om bestand op te slaan. -ErrorOnlyPngJpgSupported=Fout, alleen .png en .jpg afbeeldingen worden ondersteund. -ErrorImageFormatNotSupported=Uw PHP ondersteunt geen functies om foto's van dit formaat te converteren. RecordSaved=Record opgeslagen LevelOfFeature=Niveau van de functies DefinedAndHasThisValue=Omschreven en heeft waarde van diff --git a/htdocs/langs/nl_BE/oscommerce.lang b/htdocs/langs/nl_BE/oscommerce.lang deleted file mode 100644 index 10e961b84a2..00000000000 --- a/htdocs/langs/nl_BE/oscommerce.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerceSetup=OSCommerce module setup -OSCommerceSetupSaved=OSCommerce setup opgeslagen -OSCommerceServer=OSCommerce server host / ip diff --git a/htdocs/langs/nl_BE/other.lang b/htdocs/langs/nl_BE/other.lang index b0d8934fcfc..592c4f1547e 100644 --- a/htdocs/langs/nl_BE/other.lang +++ b/htdocs/langs/nl_BE/other.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - other -AddTrip=Verplaatsing toevoegen BirthdayDate=Datum verjaardag Notify_FICHINTER_VALIDATE=Valideer interventie Notify_BILL_VALIDATE=Valideer factuur diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang index 12ac84fa17f..74c92b41150 100644 --- a/htdocs/langs/nl_BE/products.lang +++ b/htdocs/langs/nl_BE/products.lang @@ -28,8 +28,6 @@ ProductStatusOnSellShort=In verkoop ProductStatusNotOnSellShort=NIET in verkoop UpdatePrice=Update prijs PublicPrice=Openbare prijs -ContractStatus=Contract status -ContractStatusRunning=Actief ContractStatusOnHold=In wacht ContractStatusToRun=Een METTRE en service ErrorProductBadRefOrLabel=Verkeerde waarde voor de referentie-of etiket. @@ -40,10 +38,7 @@ ProductsArea=Producten gebied ServicesArea=Diensten gebied AddToMyProposals=Toevoegen aan mijn voorstellen AddToOtherProposals=Toevoegen aan andere voorstellen -AddPhoto=Foto toevoegen -BuyingPrice=Aankoopprijs SupplierCard=Leverancierskaart -CommercialCard=Commerciële kaart AllWays=Pad naar het vinden van uw product in voorraad NoCat=Uw product is niet in elke categorie BarCode=Barcode @@ -67,8 +62,6 @@ ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is ouder met hui DeleteProduct=Het verwijderen van een product / dienst ConfirmDeleteProduct=Weet u zeker dat u dit product/dienst wilt verwijderen? ProductDeleted=Product / Dienst: %s geschrapt uit de database. -DeletePicture=Verwijderen van een foto -ConfirmDeletePicture=Weet u zeker dat u deze foto wilt verwijderen? ExportDataset_produit_1=Producten en diensten ConfirmDeleteProductLine=Weet u zeker dat u deze prodcutlijn wilt verwijderen? NoProductMatching=Geen product / dienst voldoen aan uw criteria diff --git a/htdocs/langs/nl_BE/users.lang b/htdocs/langs/nl_BE/users.lang index 46b8398974f..35f0e050fef 100644 --- a/htdocs/langs/nl_BE/users.lang +++ b/htdocs/langs/nl_BE/users.lang @@ -32,7 +32,6 @@ ConfirmSendNewPassword=Weet u zeker dat u een nieuw wachtwoord wilt genereren en LoginNotDefined=Inloggen is niet gedefiniëerd. NameNotDefined=Naam is niet gedefiniëerd. ListOfUsers=Lijsten van gebruikers -Administrator=De administrator DefaultRights=Standaardtoestemmingen DefaultRightsDesc=Definiëer hier standaardtoestemmingen die automatisch gegund zijn naar een nieuwe gecreëerde gebruiker. LastName=Naam @@ -40,7 +39,6 @@ PasswordChangeRequestSent=Verzoek om wachtwoord te wijzigen van %s naar < MenuUsersAndGroups=Gebruikers en groepen LastGroupsCreated=Laatste %s gemaakte groepen LastUsersCreated=Laatste %s gebruikers gecreëerd -GroupModified=Groep met succes gewijzigd NoLogin=Geen login CreateDolibarrLogin=Maak Dolibarr login LoginAccountDisableInLdap=Account uitgeschakeld in het domein. @@ -50,6 +48,7 @@ CreateInternalUserDesc=Dit formulier laat u toe om een interne gebruiker te make InternalExternalDesc=Een interne gebruiker is een gebruiker die deel uitmaakt van uw bedrijf.
    Een externe gebruiker is een klant, leverancier of andere.

    In beide gevallen, machtigingen omschrijft de rechten op Dolibarr, ook externe gebruiker kan beschikken over een ander menu manager dan een interne gebruiker (Zie Home - Opstelling - Display) PermissionInheritedFromAGroup=Toestemming verleend, omdat deze voort komt uit een bepaalde gebruikersgroep. EventUserModified=Gebruiker %s bewerkt +GroupModified=Groep met succes gewijzigd ConfirmCreateThirdParty=Weet u zeker dat u een derde partij wilt maken voor dit lid? LoginToCreate=Login te creëren NameToCreate=Naam van derde partij te creëren diff --git a/htdocs/langs/nl_BE/withdrawals.lang b/htdocs/langs/nl_BE/withdrawals.lang index da1080465ba..8e0a46c000b 100644 --- a/htdocs/langs/nl_BE/withdrawals.lang +++ b/htdocs/langs/nl_BE/withdrawals.lang @@ -2,8 +2,6 @@ StandingOrdersArea=Permanente opdrachten gebied CustomersStandingOrdersArea=Klanten permanente opdrachten gebied NewStandingOrder=Nieuwe doorlopende opdracht -Withdrawals=Intrekkingen -Withdrawal=Intrekking WithdrawalsReceipts=Intrekking van aandelen WithdrawalReceipt=Intrekking ontvangst LastWithdrawalReceipts=Last %s intrekking van aandelen diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/nl_NL/accountancy.lang +++ b/htdocs/langs/nl_NL/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index fcf67430b16..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 @@ -437,14 +440,14 @@ Module52Name=Productenvoorraad Module52Desc=Productenvoorraadbeheer Module53Name=Diensten Module53Desc=Dienstenbeheer -Module54Name=Contracten -Module54Desc=Contracten- en dienstenbeheer +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Streepjescodes 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=Projecten -Module400Desc=Projectenbeheer binnen andere modules +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) @@ -484,7 +487,7 @@ Module500Desc=Beheer van diverse uitgaven, zoals belastingen, sociale bijdragen, Module510Name=Salarissen Module510Desc=Beheer van de werknemers salarissen en betalingen Module600Name=Kennisgevingen -Module600Desc=Stuur kennisgevingen per e-mail van sommige Dolibarr zakelijke gebeurtenisen naar contactpersonen van derde partijen +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Giften Module700Desc=Donatiebeheer Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-bedrijf Module5000Desc=Hiermee kunt meerdere bedrijven beheren in Dolibarr Module6000Name=Workflow Module6000Desc=Workflow beheer -Module20000Name=Verlof -Module20000Desc=Aanmaken en opvolgen verlof werknemers. +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 Module50100Desc=Kassamodule -Module50200Name= Paypal -Module50200Desc= Module om een ​​online betaling pagina te bieden per credit card met Paypal +Module50200Name=Paypal +Module50200Desc=Module om een ​​online betaling pagina te bieden per credit card met 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 om online polls (zoals Doodle, Studs, Rdvz, ...) te maken Module59000Name=Marges @@ -606,15 +613,16 @@ Permission151=Bekijk doorlopende opdrachten Permission152=Creëer / bewerk een doorlopende opdracht verzoek Permission153=Bekijk doorlopende opdracht ontvangsten Permission154=Crediteren / afwijzen van uitstaande orderbonnen -Permission161=Bekijk contracten -Permission162=Creëren / wijzigen van opdrachten -Permission163=Activeren van een dienst van een contract -Permission164=Uitschakelen van een dienst van een contract -Permission165=Verwijderen contracten -Permission171=Bekijk verplaatsingen -Permission172=Creëren / bewerken verplaatsingen -Permission173=Verwijderen verplaatsingen -Permission178=Exporteereer verplaatsingen +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Bekijk leveranciers Permission181=Bekijk leverancier opdrachten Permission182=Creëren / wijzigen leverancier opdrachten @@ -671,7 +679,7 @@ Permission300=Bekijk streepjescodes Permission301=Creëren / wijzigen streepjescodes Permission302=Verwijderen streepjescodes Permission311=Diensten inzien -Permission312=Diensten aan het contract toevoegen +Permission312=Assign service/subscription to contract Permission331=Bekijk weblinks Permission332=Creëren / wijzigen weblinks Permission333=Verwijderen weblinks @@ -701,8 +709,8 @@ Permission701=Bekijk donaties Permission702=Creëren / wijzigen donaties Permission703=Verwijderen donaties Permission1001=Bekijk voorraden -Permission1002=Creëren / wijzigen voorraden -Permission1003=Verwijderen voorraden +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Bekijk voorraadmutaties Permission1005=Creëren / wijzigen voorraadmutaties Permission1101=Bekijk levering opdrachten @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Ja in de zomer OnlyFollowingModulesAreOpenedToExternalUsers=Let op, alleen volgende modules worden opengesteld voor externe gebruikers (ongeacht de rechten van zulke gebruikers): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Voorwaarde is momenteel %s -TestNotPossibleWithCurrentBrowsers=Automatische detectie niet mogelijk YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Geef een boekhoudkundige code terug opgebouwd uit "401 ModuleCompanyCodePanicum=Geef een lege boekhoudkundige code terug. ModuleCompanyCodeDigitaria=Boekhoudkundige-code is afhankelijk van derden code. De code bestaat uit het teken "C" in de eerste positie, gevolgd door de eerste 5 tekens van de derden code. UseNotifications=Gebruik kennisgevingen -NotificationsDesc=De e-mailkennisgevingenfunctionaliteit stelt u in staat om vooraf ingestelde automatisch e-mails naar derden te versturen. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documentensjablonen DocumentModelOdt=Genereer documenten uit OpenDocuments sjablonen (. ODT of. ODS-bestanden voor OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Watermerk op conceptdocumenten @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Voeg mogelijke leverdatum toe UseOptionLineIfNoQuantity=Product- / dienstregels met een waarde van 0 gebruiken FreeLegalTextOnProposal=Vrije tekst op Offertes WatermarkOnDraftProposal=Watermerk op ontwerp offertes (geen indien leeg) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Opdrachtenbeheerinstellingen OrdersNumberingModules=Opdrachtennummeringmodules @@ -1146,6 +1156,7 @@ HideTreadedOrders=Verberg de behandelde of geannuleerde orders in de lijst ValidOrderAfterPropalClosed=Om de opdracht te valideren na sluiting van de offerte, maakt het mogelijk om (TODO franse vertaling erbij pakken) FreeLegalTextOnOrders=Vrije tekst op opdrachten WatermarkOnDraftOrders=Watermerk op ontwerp-orders (geen indien leeg) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup='Click-To-Dial' moduleinstellingen ClickToDialUrlDesc=Aangeroepen URL wanneer er geklikt wordt op een telefoonicoontje. In de URL kunt u 'tags' gebruiken
    __PHONETO__ zal vervangen worden met het telefoonnummer dat gebeld moet worden
    __PHONEFROM__ zal worden vervangen met het telefoonnummer van de bellende persoon (uw telefoonnummer)
    __LOGIN__ zal vervangen worden door uw 'Click-To-Dial'-accountgebruikersnaam (Zoals ingesteld op uw gebruikerskaartdetails
    __PASS__ zal vervangen worden door uw "Click-To-Dial"-accountwachtwoord (Zoals ingesteld op uw gebruikerskaartdetails). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Interventienummeringsmodules TemplatePDFInterventions=Interventiekaartdocumentensjablonen WatermarkOnDraftInterventionCards=Watermerk op interventiekaart documenten (geen indien leeg) ##### Contracts ##### -ContractsSetup=Contracten module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracten nummering modules TemplatePDFContracts=Modeldocumenten contracten FreeLegalTextOnContracts=Vrije tekst op contracten @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatische detectie niet mogelijk +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Productenmoduleinstellingen ServiceSetup=Services module setup @@ -1382,9 +1393,10 @@ MailingSetup=EMailingmoduleinstellingen MailingEMailFrom=E-mailafzender (Van) voor e-mails die verstuurd worden door de EMailingmodule MailingEMailError=Retoure-mailadres (Errors-to) voor e-mails met fouten ##### Notification ##### -NotificationSetup=Moduleinstellingen voor kennisgeving door e-mail +NotificationSetup=EMail notification module setup NotificationEMailFrom=E-mailafzender (van) voor e-mails die verstuurd worden voor kennisgevingen -ListOfAvailableNotifications=Lijst van beschikbare meldingen (Deze lijst is afhankelijk van geactiveerde modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Verzendingsmoduleinstellingen SendingsReceiptModel=Verzendontvangstsjabloon @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Verbinding met de server '%s' en database '%s' met gebruiker '% OSCommerceTestKo1=Verbinding met de server '%s' gelukt maar de database '%s' kon niet worden bereikt. OSCommerceTestKo2=Verbinding met server '%s' met gebruiker '%s' mislukt. ##### Stock ##### -StockSetup=Vooraadmoduleinstellingen -UserWarehouse=Gebruik persoonlijke voorraden van gebruiker +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu verwijderd TreeMenu=Menustructuur @@ -1478,11 +1491,14 @@ ClickToDialDesc=Deze module maakt het mogelijk om een icoontje te tonen achter h ##### Point Of Sales (CashDesk) ##### CashDesk=Verkooppunten CashDeskSetup=Verkooppuntenmoduleinstellingen -CashDeskThirdPartyForSell=Algemene Klant te gebruiken bij verkopen +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Te gebruiken rekening voor ontvangst van contacte betalingen CashDeskBankAccountForCheque= Te gebruiken rekening voor ontvangst van betalingen per cheque CashDeskBankAccountForCB= Te gebruiken rekening voor ontvangst van betalingen per CreditCard -CashDeskIdWareHouse=Te gebruiken magazijn voor verkopen +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. ##### Bookmark ##### BookmarkSetup=Weblinkmoduleinstellingen BookmarkDesc=Deze module maakt het u mogelijk 'weblinks' te beheren. U kunt ook verwijzingen naar elke Dolibarr pagina of externe website in uw linker menu zetten. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Verwijder het boekjaar ConfirmDeleteFiscalYear=Weet u zeker dat u dit boekjaar wilt verwijderen? Opened=Geopend Closed=Gesloten - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Formaat TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang index 057cd9bdb37..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 @@ -41,9 +42,10 @@ AutoActions= Automatisch invullen van de agenda AgendaAutoActionDesc= Stel hier de gebeurtenissen in waarvoor u wilt dat Dolibarr automatische een afspraak in de agenda creëert. Als er niets is aangevinkt (standaard), zullen alleen handmatige acties worden opgenomen in de agenda. AgendaSetupOtherDesc= Op deze pagina kunt u andere instellingen van de agendamodule instellen. AgendaExtSitesDesc=Op deze pagina kunt configureren externe agenda. -ActionsEvents= Gebeurtenissen waarvoor Dolibarr automatisch een item zal maken in de agenda -PropalValidatedInDolibarr= Voorstel %s gevalideerd -InvoiceValidatedInDolibarr= Factuur %s gevalideerd +ActionsEvents=Gebeurtenissen waarvoor Dolibarr automatisch een item zal maken in de agenda +PropalValidatedInDolibarr=Voorstel %s gevalideerd +InvoiceValidatedInDolibarr=Factuur %s gevalideerd +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Factuur %s ga terug naar ontwerp van de status van InvoiceDeleteDolibarr=Factuur %s verwijderd OrderValidatedInDolibarr= Opdracht %s gevalideerd @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Bestel %s goedgekeurd OrderRefusedInDolibarr=Order %s is geweigerd OrderBackToDraftInDolibarr=Bestel %s terug te gaan naar ontwerp-status OrderCanceledInDolibarr=Bestel %s geannuleerd -InterventionValidatedInDolibarr=Interventie %s gevalideerd ProposalSentByEMail=Offerte %s verzonden per e-mail OrderSentByEMail=Afnemersopdracht %s verzonden per e-mail InvoiceSentByEMail=Afnemersfactuur %s verzonden per e-mail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Leveranciersopdracht %s verzonden per e-mail SupplierInvoiceSentByEMail=Leveranciersfactuur %s verzonden per e-mail ShippingSentByEMail=Verzendkosten %s per e-mail ShippingValidated= Verzending %s is gevalideerd -InterventionSentByEMail=Interventie %s per e-mail -InterventionClassifiedBilled=Interventie %s geclassificeerd als gefactureerd NewCompanyToDolibarr= Derde aangemaakt DateActionPlannedStart= Geplande startdatum DateActionPlannedEnd= Geplande einddatum @@ -70,9 +69,9 @@ DateActionStart= Startdatum DateActionEnd= Einddatum AgendaUrlOptions1=U kunt ook de volgende parameters gebruiken om te filteren: AgendaUrlOptions2=login=%s om uitvoer van acties gecreëerd door, toegewezen aan of gedaan door gebruiker %s te beperken. -AgendaUrlOptions3=login=%s om uitvoer van acties gecreëerd door gebruiker %s te beperken. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=login=%s om uitvoer van acties toegewezen aan gebruiker %s te beperken. -AgendaUrlOptions5=login=%s om uitvoer van acties gedaan door gebruiker %s te beperken. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Toon verjaardagen van contacten AgendaHideBirthdayEvents=Verberg verjaardagen van contacten Busy=Bezig @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL aan. Ical bestand te openen ExtSiteNoLabel=Geen omschrijving WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang index f6e7149a7d2..2bd991f4276 100644 --- a/htdocs/langs/nl_NL/bills.lang +++ b/htdocs/langs/nl_NL/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Creditnota InvoiceAvoirAsk=Creditnota te corrigeren factuur InvoiceAvoirDesc=De creditnota is een negatieve factuur die gebruikt wordt wanneer op een factuur het bedrag verschilt van het werkelijk betaalde bedrag (bijvoorbeeld omdat door de afnemer per abuis te veel is betaald of een aantal producten zijn geretouneerd).

    Opmerking: de originele factuur moet worden gesloten (en geclassificeerd als zijnde 'betaald' of 'gedeeltelijk betaald') om een creditnota te kunnen aanmaken. invoiceAvoirWithLines=Maak Credit Nota met lijnen van de oorsprongkelijke factuur -invoiceAvoirWithPaymentRestAmount=Maak Creditnota met het bedrag oorspronkelijke factuur betaling -invoiceAvoirLineWithPaymentRestAmount=Credit Nota bedrag van factuur betaling +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Vervangen factuur %s ReplacementInvoice=Vervangingsfactuur ReplacedByInvoice=Vervangen door factuur %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classificeer 'verlaten' ClassifyClosed=Classificeer 'Gesloten' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Creëer Factuur -AddBill=Toevoegen factuur of creditnota +AddBill=Create invoice or credit note AddToDraftInvoices=Toevoegen aan aanmaak factuur DeleteBill=Verwijderen factuur SearchACustomerInvoice=Zoek een afnemersfactuur @@ -99,7 +99,7 @@ DoPaymentBack=Doe een terugbetaling ConvertToReduc=Omzetten in een toekomstige korting EnterPaymentReceivedFromCustomer=Voer een ontvangen betaling van afnemer in EnterPaymentDueToCustomer=Voer een betaling te doen aan afnemer in -DisabledBecauseRemainderToPayIsZero=Uitgeschakeld omdat restant te betalen gelijk is aan 0 (nul) +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Hoeveelheid PriceBase=Basisprijs BillStatus=Factuurstatus @@ -137,8 +137,6 @@ BillFrom=Van BillTo=Geadresseerd aan ActionsOnBill=Acties op factuur NewBill=Nieuwe factuur -Prélèvements=Doorlopende opdrachten -Prélèvements=Doorlopende opdrachten LastBills=Laatste %s facturen LastCustomersBills=Laatste %s afnemersfacturen LastSuppliersBills=Laatste %s leveranciersfacturen @@ -156,9 +154,9 @@ ConfirmCancelBill=Weet u zeker dat ufactuur %s wilt annuleren? ConfirmCancelBillQuestion=Waarom zou u deze rekening als 'verlaten' willen classificeren ? ConfirmClassifyPaidPartially=Weet u zeker dat u factuur %s naar status betaald wilt wijzigen? ConfirmClassifyPaidPartiallyQuestion=Deze factuur is nog niet volledig betaald. Wat zijn redenen om deze factuur af te sluiten? -ConfirmClassifyPaidPartiallyReasonAvoir=Restant te betalen (%s %s) wordt een korting toegekend, omdat de betaling werd gedaan vóór de termijn. Ik regulariseer de BTW met een creditnota. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restant te betalen (%s %s) wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik accepteer de verliezen van de BTW op deze korting. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Restant te betalen (%s %s) wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik vorder de BTW terug van deze korting, zonder een credit nota. +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=Slechte afnemer ConfirmClassifyPaidPartiallyReasonProductReturned=Producten gedeeltelijk teruggegeven ConfirmClassifyPaidPartiallyReasonOther=Claim verlaten om andere redenen @@ -191,9 +189,9 @@ AlreadyPaid=Reeds betaald AlreadyPaidBack=Reeds terugbetaald AlreadyPaidNoCreditNotesNoDeposits=Reeds betaald (zonder creditnota's en stortingen's) Abandoned=Verlaten -RemainderToPay=Nog te betalen -RemainderToTake=Resterende deel te nemen -RemainderToPayBack=Herinnering terugbetaling +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Hangende AmountExpected=Gevorderde bedrag ExcessReceived=Overbetaling @@ -219,19 +217,18 @@ NoInvoice=Geen factuur ClassifyBill=Classifiseer factuur SupplierBillsToPay=Te betalen leveranciersfacturen CustomerBillsUnpaid=Onbetaalde afnemersfacturen -DispenseMontantLettres=De schriftelijke facturen via mecanographic procedures zijn vrijgesteld voor de volgorde van letters -DispenseMontantLettres=De schriftelijke facturen via mecanographic procedures zijn vrijgesteld voor de volgorde van letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Niet-terugvorderbare SetConditions=Stel betalingsvoorwaarden in SetMode=Stel betalingswijze in Billed=Gefactureerd -RepeatableInvoice=Vooraf gedefinieerde factuur -RepeatableInvoices=Vooraf gedefinieerde facturen -Repeatable=Vooraf gedefinieerde -Repeatables=Vooraf gedefinieerde -ChangeIntoRepeatableInvoice=Omzetten in vooraf gedefinieerde -CreateRepeatableInvoice=Creëer vooraf gedefinieerde factuur -CreateFromRepeatableInvoice=Creëren van vooraf gedefinieerde factuur +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Afnemersfacturen en factuurregels CustomersInvoicesAndPayments=Afnemersfacturen en betalingen ExportDataset_invoice_1=Afnemersfacturen en factuurregels diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang index 4ae5ae198e1..1819c47be8f 100644 --- a/htdocs/langs/nl_NL/categories.lang +++ b/htdocs/langs/nl_NL/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Verbinding tussen leverancier en categorie CatCusLinks=Verbinding tussen klant/prospect en categorie CatProdLinks=Verbinding tussen producten/diensten en categorieën CatMemberLinks=Verbinding tussen leden en categorieën -CatProdLinks=Verbinding tussen producten/diensten en categorieën -CatCusLinks=Verbinding tussen klant/prospect en categorie -CatSupLinks=Verbinding tussen leverancier en categorie DeleteFromCat=Verwijder uit categorie DeletePicture=Afbeelding verwijderen ConfirmDeletePicture=Bevestig verwijderen afbeelding @@ -111,4 +108,5 @@ ExtraFieldsCategories=Complementaire kenmerken 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=Add the following product/service +AddProductServiceIntoCategory=Voeg het volgende product/dienst toe +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 09c4b6782fc..2a093d76225 100644 --- a/htdocs/langs/nl_NL/compta.lang +++ b/htdocs/langs/nl_NL/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Onjuiste boekhoudkundige afnemerscode voor % SuppliersProductsSellSalesTurnover=De omzet gegenereerd door de verkoop van leveranciersproducten. CheckReceipt=Controleer stortingen CheckReceiptShort=Controleer stortingen +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Nieuwe korting NewCheckDeposit=Nieuwe chequestorting NewCheckDepositOn=Creeer een kwitantie voor de storting op rekening: %s @@ -196,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 d6f6de6bd0a..80c0173ed8d 100644 --- a/htdocs/langs/nl_NL/contracts.lang +++ b/htdocs/langs/nl_NL/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contractenoverzicht ListOfContracts=Contractenlijst -LastContracts=Laatste % contracten +LastModifiedContracts=Last %s modified contracts AllContracts=Alle contracten ContractCard=Contractendetails ContractStatus=Contractstatus @@ -27,7 +27,7 @@ MenuRunningServices=Actieve diensten MenuExpiredServices=Verlopen diensten MenuClosedServices=Gesloten diensten NewContract=Nieuw contract -AddContract=Contract toevoegen +AddContract=Create contract SearchAContract=Zoek een contract DeleteAContract=Verwijder een contract CloseAContract=Sluit een contract @@ -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=Laatste % contracten +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 4b1bcf235a9..e12bceca15f 100644 --- a/htdocs/langs/nl_NL/cron.lang +++ b/htdocs/langs/nl_NL/cron.lang @@ -1,114 +1,86 @@ # 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 -# 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 -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +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=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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active 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 -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Commando +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Weet je zker dat je deze cron taak wilt verwijderen? +CronExecute=Voer taak uit +CronConfirmExecute= Weet je zeker dat je deze taak nu uit wilt voeren +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wachtende taken +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 - -# +CronNbRun=Nb. launch +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 +CronSaveSucess=Save succesfully CronNote=Reactie -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable CronStatusInactiveBtn=Deactiveren -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Informatie # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Taak type +CronType_method=Aanroep methode van Dolibarr Class +CronType_command=Shell commando +CronMenu=Cron +CronCannotLoadClass=Kan klasse %s of object %s niet laden +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/nl_NL/dict.lang b/htdocs/langs/nl_NL/dict.lang index c0a47884920..3036761dcbf 100644 --- a/htdocs/langs/nl_NL/dict.lang +++ b/htdocs/langs/nl_NL/dict.lang @@ -253,7 +253,6 @@ CivilityMR=Meneer CivilityMLE=Mejuffrouw CivilityMTRE=Meester CivilityDR=Dokter - ##### Currencies ##### Currencyeuros=Euro CurrencyAUD=Australische Dollars @@ -290,10 +289,10 @@ CurrencyXOF=Francs CFA BCEAO CurrencySingXOF=Franc CFA BCEAO CurrencyXPF=Francs CFP CurrencySingXPF=Franc CFP - CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=paise CurrencyThousandthSingTND=duizend - #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Mailing campagne @@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=Mondeling DemandReasonTypeSRC_PARTNER=Partner DemandReasonTypeSRC_EMPLOYEE=Werknemer DemandReasonTypeSRC_SPONSORING=Sponsoring - #### Paper formats #### PaperFormatEU4A0=Grootte 4A0 PaperFormatEU2A0=Grootte 2A0 diff --git a/htdocs/langs/nl_NL/donations.lang b/htdocs/langs/nl_NL/donations.lang index 549c1831682..c666ad40925 100644 --- a/htdocs/langs/nl_NL/donations.lang +++ b/htdocs/langs/nl_NL/donations.lang @@ -4,7 +4,7 @@ Donations=Donaties DonationRef=Gift ref. Donor=Donor Donors=Donoren -AddDonation=Een donatie toevoegen +AddDonation=Create a donation NewDonation=Nieuwe donatie ShowDonation=Toon gift DonationPromise=Donatie toezegging @@ -31,3 +31,8 @@ DonationRecipient=Gift ontvanger ThankYou=Dank u IConfirmDonationReception=De ontvanger verklaart ontvangst als gift van het volgende bedrag MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/nl_NL/externalsite.lang index 9fdddaacccf..47a463d99cf 100644 --- a/htdocs/langs/nl_NL/externalsite.lang +++ b/htdocs/langs/nl_NL/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Setup link naar externe website ExternalSiteURL=Externe Site URL ExternalSiteModuleNotComplete=Module ExternalSite werd niet correct geconfigureerd. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang index d2e65bbc92e..7986b74bc44 100644 --- a/htdocs/langs/nl_NL/holiday.lang +++ b/htdocs/langs/nl_NL/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Achternaam Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Waardering -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Valideer UpdateEventCP=Update events diff --git a/htdocs/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang index 54609061a56..8a77c50fad0 100644 --- a/htdocs/langs/nl_NL/interventions.lang +++ b/htdocs/langs/nl_NL/interventions.lang @@ -3,7 +3,7 @@ Intervention=Interventie Interventions=Interventies InterventionCard=Interventiedetails NewIntervention=Nieuwe interventie -AddIntervention=Interventie toevoegen +AddIntervention=Create intervention ListOfInterventions=Interventielijst EditIntervention=Interventie bewerken ActionsOnFicheInter=Acties bij interventie @@ -30,6 +30,15 @@ StatusInterInvoiced=Gefactureerd RelatedInterventions=Interventies ShowIntervention=Tonen tussenkomst SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Vertegenwoordiger die de nabehandeling van de interventie doet TypeContact_fichinter_internal_INTERVENING=Tussenliggende diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang index 74c9d4dd34e..cdd2ca5a1c3 100644 --- a/htdocs/langs/nl_NL/mails.lang +++ b/htdocs/langs/nl_NL/mails.lang @@ -115,7 +115,7 @@ SentBy=Verzonden door MailingNeedCommand=Uit veiligheidsoverwegingen is het sturen van een e-mailing is beter wanneer deze wordt uitgevoerd vanaf de command line. Als je er een hebt, vraagt ​​u uw serverbeheerder om de volgende opdracht te lanceren om de e-mailing sturen naar alle geadresseerden: MailingNeedCommand2=U kunt ze echter online verzenden door toevoeging van de parameter MAILING_LIMIT_SENDBYWEB met een waarde van het maximaal aantal e-mails dat u wilt verzenden per sessie. ConfirmSendingEmailing=Als u dit niet kunt of liever verzendt met uw webbrowser, bevestig dat u zeker weet dat u nu wilt de e-mails wilt verzenden vanuit je browser? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Lijst legen ToClearAllRecipientsClickHere=Klik hier om de lijst met ontvangers van deze EMailing te legen ToAddRecipientsChooseHere=Voeg geadresseerden toe door deze uit de lijst te kiezen @@ -133,6 +133,9 @@ Notifications=Kennisgevingen NoNotificationsWillBeSent=Er staan geen e-mailkennisgevingen gepland voor dit evenement en bedrijf ANotificationsWillBeSent=1 kennisgeving zal per e-mail worden verzonden SomeNotificationsWillBeSent=%s kennisgevingen zullen per e-mail worden verzonden -AddNewNotification=Activeer een nieuw e-mailkennisgevingsverzoek -ListOfActiveNotifications=Toon een lijst met alle actieve kennisgevingsverzoeken +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Toon een lijst van alle verzonden kennisgevingen +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index 6dcb56010e5..40ef7311c4b 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Kan gebruiker %s niet in de Dolibar ErrorNoVATRateDefinedForSellerCountry=Fout, geen BTW-tarieven voor land '%s'. ErrorNoSocialContributionForSellerCountry=Fout, geen sociale bijdrage gedefinieerd voor het land '%s'. ErrorFailedToSaveFile=Fout, bestand opslaan mislukt. -ErrorOnlyPngJpgSupported=Fout, alleen .png en .jpg-bestandsformaten worden ondersteund. -ErrorImageFormatNotSupported=Uw PHP biedt geen ondersteuning om afbeeldingen met dit formaat te converteren SetDate=Stel datum in SelectDate=Selecteer een datum SeeAlso=Zie ook %s BackgroundColorByDefault=Standaard achtergrondkleur +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geupload. Klik hiervoor op "Bevestig dit bestand". NbOfEntries=Aantal invoeringen GoToWikiHelpPage=Bekijk de online hulp (internettoegang vereist) @@ -266,6 +266,7 @@ Afternoon=Namiddag Quadri=Trimester MonthOfDay=Maand van de dag HourShort=U +MinuteShort=mn Rate=Tarief UseLocalTax=Inclusief btw Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Volledig overzicht Statistics=Statistieken OtherStatistics=Andere statistieken Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Referentie RefSupplier=Leverancierreferentie @@ -365,6 +367,7 @@ ActionsOnCompany=Acties voor bedrijf ActionsOnMember=Events over dit lid NActions=%s acties NActionsLate=%s is laat +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Verwijder filter ChartGenerated=Grafiek gegenereerd @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributen instellen URLPhoto=Url van foto / logo SetLinkToThirdParty=Link naar een andere derde CreateDraft=Maak een ontwerp +SetToDraft=Back to draft ClickToEdit=Klik om te bewerken ObjectDeleted=Object %s verwijderd ByCountry=Per land @@ -678,7 +682,7 @@ ViewPrivateNote=Notities bekijken XMoreLines=%s regel(s) verborgen PublicUrl=Openbare URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Maandag Tuesday=Dinsdag diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang index 406c5be4adf..6429b4ddca9 100644 --- a/htdocs/langs/nl_NL/margins.lang +++ b/htdocs/langs/nl_NL/margins.lang @@ -38,4 +38,7 @@ BuyingCost=Kostprijs UnitCharges=Unit toeslag Charges=Toeslag AgentContactType=Contact type used voor commissie -AgentContactTypeDetails=Definieer het contact type (gelinked op facturen) wordt geassocieerd met commercieel agent +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/opensurvey.lang b/htdocs/langs/nl_NL/opensurvey.lang index aef968fe765..cf991212fb3 100644 --- a/htdocs/langs/nl_NL/opensurvey.lang +++ b/htdocs/langs/nl_NL/opensurvey.lang @@ -1,66 +1,66 @@ # Dolibarr language file - Source file is en_US - opensurvey -# Survey=Poll -# Surveys=Polls -# OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... -# NewSurvey=New poll -# NoSurveysInDatabase=%s poll(s) into database. -# OpenSurveyArea=Polls area -# AddACommentForPoll=You can add a comment into poll... -# AddComment=Add comment -# CreatePoll=Create poll -# PollTitle=Poll title -# ToReceiveEMailForEachVote=Receive an email for each vote -# TypeDate=Type date -# TypeClassic=Type standard -# OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it -# RemoveAllDays=Remove all days -# CopyHoursOfFirstDay=Copy hours of first day -# RemoveAllHours=Remove all hours -# SelectedDays=Selected days -# TheBestChoice=The best choice currently is -# TheBestChoices=The best choices currently are -# with=with -# OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. -# CommentsOfVoters=Comments of voters -# ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes) -# RemovePoll=Remove poll -# UrlForSurvey=URL to communicate to get a direct access to poll -# PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: -# CreateSurveyDate=Create a date poll -# CreateSurveyStandard=Create a standard poll -# CheckBox=Simple checkbox -# YesNoList=List (empty/yes/no) -# PourContreList=List (empty/for/against) -# AddNewColumn=Add new column -# TitleChoice=Choice label -# ExportSpreadsheet=Export result spreadsheet +Survey=Poll +Surveys=Polls +OrganizeYourMeetingEasily=Organiseer uw bijeenkomsten en polls eenvoudig. Kies eerst het type poll... +NewSurvey=Niewe poll +NoSurveysInDatabase=%s poll(s) in de database. +OpenSurveyArea=Polls sectie +AddACommentForPoll=U kunt een commentaar toevoegen aan de poll... +AddComment=Voeg commentaar toe +CreatePoll=Creëer poll +PollTitle=Poll titel +ToReceiveEMailForEachVote=Ontvang een E-mail voor iedere stem +TypeDate=Type datum +TypeClassic=Type standaard +OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it +RemoveAllDays=Remove all days +CopyHoursOfFirstDay=Copy hours of first day +RemoveAllHours=Remove all hours +SelectedDays=Selected days +TheBestChoice=The best choice currently is +TheBestChoices=The best choices currently are +with=with +OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. +CommentsOfVoters=Comments of voters +ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes) +RemovePoll=Remove poll +UrlForSurvey=URL to communicate to get a direct access to poll +PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: +CreateSurveyDate=Create a date poll +CreateSurveyStandard=Create a standard poll +CheckBox=Simple checkbox +YesNoList=List (empty/yes/no) +PourContreList=List (empty/for/against) +AddNewColumn=Add new column +TitleChoice=Choice label +ExportSpreadsheet=Export result spreadsheet ExpireDate=Termijn -# NbOfSurveys=Number of polls -# NbOfVoters=Nb of voters -# SurveyResults=Results -# PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. -# 5MoreChoices=5 more choices -# Abstention=Abstention -# Against=Against -# YouAreInivitedToVote=You are invited to vote for this poll -# VoteNameAlreadyExists=This name was already used for this poll -# ErrorPollDoesNotExists=Error, poll %s does not exists. -# OpenSurveyNothingToSetup=There is no specific setup to do. -# PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. -# AddADate=Add a date -# AddStartHour=Add start hour -# AddEndHour=Add end hour -# votes=vote(s) -# NoCommentYet=No comments have been posted for this poll yet -# CanEditVotes=Can change vote of others -# CanComment=Voters can comment in the poll -# CanSeeOthersVote=Voters can see other people's vote -# SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - "8h", "8H" or "8:00" to give a meeting's start hour,
    - "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
    - "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. -# BackToCurrentMonth=Back to current month -# ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation -# ErrorOpenSurveyOneChoice=Enter at least one choice -# ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD -# ErrorInsertingComment=There was an error while inserting your comment -# MoreChoices=Enter more choices for the voters -# SurveyExpiredInfo=The voting time of this poll has expired. -# EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s +NbOfSurveys=Number of polls +NbOfVoters=Nb of voters +SurveyResults=Results +PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. +5MoreChoices=5 more choices +Abstention=Abstention +Against=Against +YouAreInivitedToVote=You are invited to vote for this poll +VoteNameAlreadyExists=This name was already used for this poll +ErrorPollDoesNotExists=Error, poll %s does not exists. +OpenSurveyNothingToSetup=There is no specific setup to do. +PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. +AddADate=Add a date +AddStartHour=Add start hour +AddEndHour=Add end hour +votes=vote(s) +NoCommentYet=No comments have been posted for this poll yet +CanEditVotes=Can change vote of others +CanComment=Voters can comment in the poll +CanSeeOthersVote=Voters can see other people's vote +SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - "8h", "8H" or "8:00" to give a meeting's start hour,
    - "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
    - "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. +BackToCurrentMonth=Back to current month +ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation +ErrorOpenSurveyOneChoice=Enter at least one choice +ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD +ErrorInsertingComment=There was an error while inserting your comment +MoreChoices=Enter more choices for the voters +SurveyExpiredInfo=The voting time of this poll has expired. +EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang index 62f765a628b..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 @@ -53,7 +53,7 @@ ShippingExist=Een zending bestaat DraftOrWaitingApproved=Concept of nog niet goedgekeurd DraftOrWaitingShipped=Concept of nog niet verzonden MenuOrdersToBill=Te factureren opdrachten -MenuOrdersToBill2=Te factureren orders +MenuOrdersToBill2=Billable orders SearchOrder=Zoekopdracht SearchACustomerOrder=Zoek een klant bestelling ShipProduct=Verzend product @@ -65,7 +65,7 @@ ValidateOrder=Valideer opdracht UnvalidateOrder=Unvalidate order DeleteOrder=Verwijder opdracht CancelOrder=Annuleer opdracht -AddOrder=Opdracht toevoegen +AddOrder=Create order AddToMyOrders=Toevoegen aan mijn opdrachten AddToOtherOrders=Toevoegen aan andere opdrachten AddToDraftOrders=Voeg toe aan order in aanmaak @@ -154,7 +154,6 @@ OrderByPhone=Telefoon CreateInvoiceForThisCustomer=Factureer orders NoOrdersToInvoice=Geen te factureren orders CloseProcessedOrdersAutomatically=Alle geselecteerde orders zijn afgehandeld -MenuOrdersToBill2=Te factureren orders OrderCreation=Order aanmaak Ordered=Besteld OrderCreated=Je order is aangemaakt diff --git a/htdocs/langs/nl_NL/oscommerce.lang b/htdocs/langs/nl_NL/oscommerce.lang deleted file mode 100644 index 1f74f362df8..00000000000 --- a/htdocs/langs/nl_NL/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OSCommerce module instellen -OSCommerceSetupSaved=OSCommerce instellingen opgeslagen -OSCommerceServer=OSCommerce server host / IP -OSCommerceDatabaseName=OSCommerce databasenaam -OSCommercePrefix=OSCommerce tabellen voorvoegsel -OSCommerceUser=OSCommerce database login diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang index c39446cdb38..ff034237d4b 100644 --- a/htdocs/langs/nl_NL/other.lang +++ b/htdocs/langs/nl_NL/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Beveiligingscode Calendar=Kalender -AddTrip=Reis toevoegen Tools=Gereedschap ToolsDesc=Dit gebied is gewijd aan de groep diverse tools niet beschikbaar zijn in andere menu-items.

    Deze tools kan worden bereikt vanuit het menu aan de zijkant. Birthday=Verjaardag @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Creatie project Notify_TASK_CREATE=Taak gemaakt Notify_TASK_MODIFY=Taak gewijzigd Notify_TASK_DELETE=Taak verwijderd +SeeModuleSetup=See module setup NbOfAttachedFiles=Aantal bijgevoegde bestanden / documenten TotalSizeOfAttachedFiles=Totale omvang van de bijgevoegde bestanden / documenten MaxSize=Maximale grootte @@ -80,6 +80,16 @@ ModifiedBy=Gewijzigd door %s ValidatedBy=Gevalideerd door %s CanceledBy=Geannuleerd door %s ClosedBy=Gesloten door %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Bestand %s is verwijderd DirWasRemoved=Map %s is verwijderd FeatureNotYetAvailableShort=Beschikbaar in de volgende versie @@ -193,25 +203,26 @@ ForgetIfNothing=Als u deze wijziging niet heeft aangevraagd, negeer deze e-mail. ##### Calendar common ##### AddCalendarEntry=Nieuwe vermelding in de agenda %s -NewCompanyToDolibarr=Bedrijf %s toegevoegd in Dolibarr -ContractValidatedInDolibarr=Contract %s is gevalideerd in Dolibarr -ContractCanceledInDolibarr=Contract %s is geannuleerd in Dolibarr -ContractClosedInDolibarr=Contract %s gesloten in Dolibarr -PropalClosedSignedInDolibarr=Offerte %s is ondertekend in Dolibarr -PropalClosedRefusedInDolibarr=Offerte %s is geweigerd Dolibarr -PropalValidatedInDolibarr=Offerte %s is gevalideerd in Dolibarr -InvoiceValidatedInDolibarr=Factuur %s is gevalideerd in Dolibarr -InvoicePaidInDolibarr=Factuur %s gewijzigd in betaald in Dolibarr -InvoiceCanceledInDolibarr=Factuur %s is geannuleerd in Dolibarr -PaymentDoneInDolibarr=Betaling %s gedaan in Dolibarr -CustomerPaymentDoneInDolibarr=Afnemersbetaling %s is verricht in Dolibarr -SupplierPaymentDoneInDolibarr=Leverancier betaling %s is verricht in Dolibarr -MemberValidatedInDolibarr=Lid %s is gevalideerd in Dolibarr -MemberResiliatedInDolibarr=Lid %s is uitgeschreven in Dolibarr -MemberDeletedInDolibarr=Lid %s verwijderd van Dolibarr -MemberSubscriptionAddedInDolibarr=Abonnement voor lid %s toegevoegd in Dolibarr -ShipmentValidatedInDolibarr=Verzending %s gevalideerd in Dolibarr -ShipmentDeletedInDolibarr=Verzending %s verwijderd van Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Uitvoeroverzicht diff --git a/htdocs/langs/nl_NL/paybox.lang b/htdocs/langs/nl_NL/paybox.lang index 1321b2ed02c..1741d04d931 100644 --- a/htdocs/langs/nl_NL/paybox.lang +++ b/htdocs/langs/nl_NL/paybox.lang @@ -32,6 +32,9 @@ VendorName=Verkopersnaam CSSUrlForPaymentForm=URL van het CSS-stijlbestand voor het betalingsformulier MessageOK=Bericht opde bevestigingspagina van een gevalideerde betaling MessageKO=Bericht op de bevestigingspagina van een geannuleerde betaling -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..2f498d486b8 --- /dev/null +++ b/htdocs/langs/nl_NL/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=Nieuwe resource +MenuResourcePlanning=Resource planning +DeleteResource=Verwijder resource +ConfirmDeleteResourceElement=Bevestig het verwijderen van de resource voor dit element +NoResourceInDatabase=Geen resource in de database +NoResourceLinked=Geen gelinkte resource + +ResourcePageIndex=Resource lijst +ResourceSingular=Resource +ResourceCard=Resource kaart +AddResource=Creeer een resource +ResourceFormLabel_ref=Resource naam +ResourceType=Resource type +ResourceFormLabel_description=Resource beschrijving + +ResourcesLinkedToElement=Resources gekoppeld aan element + +ShowResourcePlanning=Toon resource planning +GotoDate=Ga naar datum + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource met succes gecreeerd +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource met succes gekoppeld + +TitleResourceCard=Resource kaart +ConfirmDeleteResource=Bevestig verwijderen van deze resource +RessourceSuccessfullyDeleted=Resource met succes verwijderd +DictionaryResourceType=Type resources + +SelectResource=Kies resource diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang index eb293581bbf..bf423135d82 100644 --- a/htdocs/langs/nl_NL/sendings.lang +++ b/htdocs/langs/nl_NL/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Op dit moment, is oprichting van een nieuwe zend RelatedShippings=Aanverwante verzendingen ShipmentLine=Verzendingslijn CarrierList=Lijst van transporteurs +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Afhalen door de afnemer diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang index 87fe47e9f56..f72c7aa88a7 100644 --- a/htdocs/langs/nl_NL/stocks.lang +++ b/htdocs/langs/nl_NL/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Magazijnlable is vereist CorrectStock=Corrigeer voorraad ListOfWarehouses=Magazijnenlijst ListOfStockMovements=Voorraadmutatielijst -StocksArea=Voorradenoverzicht +StocksArea=Warehouses area Location=Locatie LocationSummary=Korte naam locatie NumberOfDifferentProducts=Aantal verschillende producten diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang index 169c8dd231c..4b3028ac6f5 100644 --- a/htdocs/langs/nl_NL/users.lang +++ b/htdocs/langs/nl_NL/users.lang @@ -63,7 +63,6 @@ ShowGroup=Toon groep ShowUser=Toon gebruiker NonAffectedUsers=Niet betrokken gebruikers UserModified=Gebruiker met succes gewijzigd -GroupModified=Groep %s bewerkt PhotoFile=Foto bestand UserWithDolibarrAccess=Gebruiker met Dolibarr toegang ListOfUsersInGroup=Lijst van gebruikers in deze groep @@ -103,7 +102,7 @@ UserDisabled=Gebruiker %s uitgeschakeld UserEnabled=Gebruiker %s geactiveerd UserDeleted=Gebruiker %s verwijderd NewGroupCreated=Groep %s gemaakt -GroupModified=Groep %s bewerkt +GroupModified=Group %s modified GroupDeleted=Groep %s verwijderd ConfirmCreateContact=Weet u zeker dat u een Dolibarr account wilt maken voor deze contactpersoon? ConfirmCreateLogin=Weet u zeker dat u een Dolibarr account wilt maken voor dit lid? @@ -114,8 +113,10 @@ YourRole=Uw rollen YourQuotaOfUsersIsReached=Uw quotum van actieve gebruikers is bereikt! NbOfUsers=Nb van gebruikers DontDowngradeSuperAdmin=Alleen een superadmin kan downgrade een superadmin -HierarchicalResponsible=Overste +HierarchicalResponsible=Supervisor HierarchicView=Hiërarchisch schema UseTypeFieldToChange=Gebruik het veld Type om te veranderen OpenIDURL=OpenID URL LoginUsingOpenID=Gebruik OpenID om in te loggen +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang index ca843a161ad..191a09d27f3 100644 --- a/htdocs/langs/nl_NL/withdrawals.lang +++ b/htdocs/langs/nl_NL/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Ontvangst LastWithdrawalReceipts=Laatste %s terugname ontvangsten WithdrawedBills=Ingetrokken facturen WithdrawalsLines=Ingetrokken regels -RequestStandingOrderToTreat=Verzoek om periodieke overboeking te behandelen -RequestStandingOrderTreated=Verzoek om behandelde periodieke overboeking +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Periodieke overboekingen van afnemer CustomerStandingOrder=Periodieke overboeking van afnemer NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmissiewijze Send=Verzenden Lines=Regels StandingOrderReject=Geef een afwijzing -InvoiceRefused=Factureer de afwijzing aan de afnemer WithdrawalRefused=Intrekking afwijzigingen WithdrawalRefusedConfirm=Weet u zeker dat u een intrekkingsafwijzing wilt invoeren RefusedData=Datum van de afwijzing RefusedReason=Reden voor afwijzing RefusedInvoicing=Facturering van de afwijzing NoInvoiceRefused=Factureer de afwijzing niet -InvoiceRefused=Factureer de afwijzing aan de afnemer +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Onbekend StatusWaiting=Wachtend @@ -76,13 +76,14 @@ WithBankUsingRIB=Voor bankrekeningen die gebruik maken van RIB WithBankUsingBANBIC=Voor bankrekeningen die gebruik maken van IBAN / BIC / SWIFT BankToReceiveWithdraw=Informatie over uw bankrekening waarop intrekkingen moeten worden ontvangen CreditDate=Crediteer op -WithdrawalFileNotCapable=Kon geen intrekkingsbewijsbestand creëren voor uw land +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/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/pl_PL/accountancy.lang +++ b/htdocs/langs/pl_PL/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index ccd8fa8bdd7..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 @@ -437,14 +440,14 @@ Module52Name=Zapasy Module52Desc=Zapasy zarządzania produktów Module53Name=Usługi Module53Desc=Usługi zarządzania -Module54Name=Kontrakty -Module54Desc=Zamówienia i usług zarządzania +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Kody kreskowe 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=Projekty -Module400Desc=Projekty zarządzania wewnątrz inne moduły +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Powiadomienia -Module600Desc=Wyślij powiadomienia (przez e-mail) na Dolibarr działalności wydarzenia +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Darowizny Module700Desc=Darowizny zarządzania Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-firma Module5000Desc=Pozwala na zarządzanie wieloma firmami Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Kasa modułu -Module50200Name= Paypal -Module50200Desc= Moduł oferują online strony płatności za pomocą karty kredytowej z Paypal +Module50200Name=Paypal +Module50200Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z 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 @@ -606,15 +613,16 @@ Permission151=Czytaj stałych zleceń Permission152=Instalacji stałych zleceń Permission153=Czytaj zlecenia stałe wpływy Permission154=Karta kredytowa / odmówić zleceń stałych wpływów -Permission161=Czytaj umów -Permission162=Tworzenie / zmodyfikować umowy -Permission163=Aktywacja usługi na podstawie umowy -Permission164=Wyłączenie usługi na podstawie umowy -Permission165=Usuń umów -Permission171=Czytaj wycieczki -Permission172=Tworzenie / zmodyfikować wycieczki -Permission173=Usuń wycieczki -Permission178=Eksport wycieczki +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Czytaj dostawców Permission181=Czytaj dostawcy zamówienia Permission182=Tworzenie / zmodyfikować dostawcy zamówienia @@ -671,7 +679,7 @@ Permission300=Odczyt kodów kreskowych Permission301=Tworzenie / modyfikować kody kreskowe Permission302=Usuwanie kodów kreskowych Permission311=Czytaj usług -Permission312=Przypisz usługę umowy +Permission312=Assign service/subscription to contract Permission331=Czytaj zakładek Permission332=Utwórz / Modyfikuj zakładki Permission333=Usuwanie zakładki @@ -701,8 +709,8 @@ Permission701=Czytaj darowizn Permission702=Tworzenie / zmodyfikować darowizn Permission703=Usuń darowizn Permission1001=Czytaj zapasów -Permission1002=Tworzenie / zmodyfikować zapasów -Permission1003=Usuń zapasów +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Czytaj stanie ruchów Permission1005=Tworzenie / zmodyfikować stanie ruchów Permission1101=Przeczytaj zamówienia na dostawy @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Zwrócić rachunkowych kod zbudowany przez %s, a nast ModuleCompanyCodePanicum=Wróć pusty rachunkowych kodu. ModuleCompanyCodeDigitaria=Księgowość kod zależy od trzeciej kodu. Kod składa się z charakterem "C" na pierwszej pozycji, po którym następuje pierwsze 5 znaków w kodzie strony trzeciej. UseNotifications=Użyj powiadomień -NotificationsDesc=Powiadomienia umożliwia automatyczne cichu wysłać mail, w przypadku niektórych Dolibarr wydarzeń, do spółek, które są skonfigurowane do +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Szablony dokumentów DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Znak wodny w sprawie projektu dokumentu @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Dodaj datę dostawy zdolność UseOptionLineIfNoQuantity=Linia produktów / usług z zerową ilość jest traktowana jako opcja FreeLegalTextOnProposal=Darmowy tekstu propozycji WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Zamówienia zarządzania konfiguracją OrdersNumberingModules=Zamówienia numeracji modules @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Aby zatwierdzić wniosek, aby po bliższa, umożliwia nie krok po tymczasowym porządku FreeLegalTextOnOrders=Wolny tekst na zamówienie WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises
    __PHONETO__ qui sera remplacé par le téléphone de l'appelé
    __PHONEFROM__ qui sera remplacé par le téléphone de l'appelant (le votre)
    __LOGIN__ qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)
    __PASS__ qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Interwencja numeracji modules TemplatePDFInterventions=Interwencja karty wzorów dokumentów WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Konfiguracja modułu umowy +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Kontrakty numerowania modułów TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Produkty konfiguracji modułu ServiceSetup=Konfiguracja modułu Usługi @@ -1382,9 +1393,10 @@ MailingSetup=Moduł konfiguracji e-maila MailingEMailFrom=Nadawca wiadomości e-mail (Z) na e-maile wysyłane przez e-maila modułu MailingEMailError=Powrót e-mail (Errors-do) na e-maile z błędami ##### Notification ##### -NotificationSetup=Mailing konfiguracji modułu +NotificationSetup=EMail notification module setup NotificationEMailFrom=Nadawca wiadomości e-mail (Z) na e-maile wysyłane do powiadomień -ListOfAvailableNotifications=Lista dostępnych powiadomień (Ta lista zależy od aktywowanych modułów) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Wysyłanie konfiguracji modułu SendingsReceiptModel=Wysyłanie otrzymania modelu @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Połączenie do serwera ' %s' w bazie danych " %s" z użytkowni OSCommerceTestKo1=Połączenie do serwera ' %s' sukces, ale baza danych' %s' nie mógł zostać osiągnięty. OSCommerceTestKo2=Połączenie do serwera ' %s' z użytkownika' %s' nie powiodło się. ##### Stock ##### -StockSetup=Konfiguracja modułu zapasów -UserWarehouse=Wykorzystanie zasobów osobowych +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu skreślony TreeMenu=Drzewo menu @@ -1478,11 +1491,14 @@ ClickToDialDesc=Moduł ten pozwala dodać ikonę po numer telefonu Dolibarr kont ##### Point Of Sales (CashDesk) ##### CashDesk=Punktów sprzedaży CashDeskSetup=Kasa konfiguracji modułu -CashDeskThirdPartyForSell=Generic trzeciej do używania na sprzedaż +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Środki pieniężne na rachunku do korzystania sprzedaje CashDeskBankAccountForCheque= Chcesz używać do otrzymywania płatności w formie czeku CashDeskBankAccountForCB= Chcesz używać do przyjmowania płatności gotówkowych za pomocą kart kredytowych -CashDeskIdWareHouse=Datawarehous użytkownika na sprzedaż +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. ##### Bookmark ##### BookmarkSetup=Zakładka konfiguracji modułu BookmarkDesc=Moduł ten umożliwia zarządzanie zakładkami. Możesz także dodać skróty do jakichkolwiek Dolibarr strony lub stron internetowych externale po lewej stronie menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang index c21cd72a6dc..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 @@ -41,9 +42,10 @@ AutoActions= Automatyczne wypełnianie AgendaAutoActionDesc= Określ zdarzenia, dla których Dolibarr ma tworzyć automatycznie wpisy w agendzie. Jeżeli nie jest zaznaczone (domyślnie), w agendzie zostaną utworzone wpisy wyłącznie dla działań manualnych. AgendaSetupOtherDesc= Ta strona zawiera opcje, pozwalające eksportować Twoje zdarzenia Dolibarr do zewnętrznego kalendarza (Thunderbird, Google Calendar, ...) AgendaExtSitesDesc=Ta strona pozwala zdefiniować zewnętrzne źródła kalendarzy, aby zobaczyć uwzględnić zapisane tam zdarzenia w agendzie Dolibarr. -ActionsEvents= Zdarzenia, dla których Dolibarr stworzy automatycznie zadania w agendzie -PropalValidatedInDolibarr= Zatwierdzenie oferty %s -InvoiceValidatedInDolibarr= Zatwierdzenie faktury %s +ActionsEvents=Zdarzenia, dla których Dolibarr stworzy automatycznie zadania w agendzie +PropalValidatedInDolibarr=Zatwierdzenie oferty %s +InvoiceValidatedInDolibarr=Zatwierdzenie faktury %s +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Zmiana statusu faktura %s na draft InvoiceDeleteDolibarr=Usunięcie faktury %s OrderValidatedInDolibarr= Zatwierdzenie zamówienia %s @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Akceptacja zamówienia %s OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Zmiana statusu zamówienia %s na draft OrderCanceledInDolibarr=Anulowanie zamówienia %s -InterventionValidatedInDolibarr=Zatwierdzenie Interwencji %s ProposalSentByEMail=Oferta %s wysłana e-mailem OrderSentByEMail=Zamówienie %s Klienta wysłane e-mailem InvoiceSentByEMail=Faktura %s wysłana e-mailem @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Zamówienie %s wysłane do dostawcy e-mailem SupplierInvoiceSentByEMail=Faktura %s wysłana do dostawcy e-mailem ShippingSentByEMail=Informacje o dostawie %s wysłane e-mailem ShippingValidated= Shipping %s validated -InterventionSentByEMail=%s interwencyjne wysłane pocztą -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Stworzono kontrahenta DateActionPlannedStart= Planowana data rozpoczęcia DateActionPlannedEnd= Planowana data zakończenia @@ -70,9 +69,9 @@ DateActionStart= Data rozpoczęcia DateActionEnd= Data zakończenia AgendaUrlOptions1=Możesz także dodać następujące parametry do filtr wyjściowy: AgendaUrlOptions2=login= %s, aby ograniczyć wyjście do działań stworzonych lub przypisanych do użytkownika %s. -AgendaUrlOptions3=logina=logina= %s, aby ograniczyć wyjście do działań stworzonych przez użytkownika +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s, aby ograniczyć wyjścia do działań przypisanych do użytkownika %s. -AgendaUrlOptions5=logind=%s, aby ograniczyć wyjście do działań wykonanych przez użytkownika %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Pokaż urodziny kontaktów AgendaHideBirthdayEvents=Ukryj urodzin kontaktów Busy=Zajęty @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL dostępu. Plik iCal ExtSiteNoLabel=Brak opisu WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang index 4fa8baee43a..cf049d56d8e 100644 --- a/htdocs/langs/pl_PL/bills.lang +++ b/htdocs/langs/pl_PL/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Nota kredytowa InvoiceAvoirAsk=Kredyt notatkę do skorygowania faktury InvoiceAvoirDesc=Kredyt notatka jest negatywny faktury wykorzystane do rozwiązania, że na fakturze jest kwota, która różni się od kwoty faktycznie wypłacana (ponieważ klient wypłacana przez pomyłkę zbyt dużo, albo nie będzie wypłacana w całości, ponieważ wrócił niektórych produktów na przykład).

    Uwaga: oryginał faktury musi być już zamknięta ( "wypłata" lub "częściowo wypłacana") w celu umożliwienia stworzenia kredytowej notatkę na jej temat. invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Wymień faktury %s ReplacementInvoice=Zastąpienie faktury ReplacedByInvoice=Otrzymuje fakturę %s @@ -87,7 +87,7 @@ ClassifyCanceled=Klasyfikacji "Abandoned" ClassifyClosed=Klasyfikacja "zamkniętych" ClassifyUnBilled=Classify 'Unbilled' CreateBill=Utwórz fakturę -AddBill=Dodaj faktury lub noty uznaniowej +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Usuń faktury SearchACustomerInvoice=Szukaj klienta faktury @@ -99,7 +99,7 @@ DoPaymentBack=Czy płatności powrót ConvertToReduc=Konwersja w przyszłości rabatu EnterPaymentReceivedFromCustomer=Wprowadź płatności otrzymanych od klienta EnterPaymentDueToCustomer=Dokonaj płatności do klienta -DisabledBecauseRemainderToPayIsZero=Niepełnosprawnych, ponieważ pozostały do zapłaty wynosi zero +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Ilość PriceBase=Cena podstawy BillStatus=Faktura statusu @@ -137,8 +137,6 @@ BillFrom=Od BillTo=Bill do ActionsOnBill=Działania na fakturze NewBill=Nowe faktury -Prélèvements=Zlecenie stałe -Prélèvements=Zlecenie stałe LastBills=Ostatnia %s faktur LastCustomersBills=Ostatnia %s odbiorców faktur LastSuppliersBills=Ostatnia %s dostawców faktur @@ -156,9 +154,9 @@ ConfirmCancelBill=Czy na pewno chcesz anulować fakturę %s? ConfirmCancelBillQuestion=Dlaczego chcesz zaklasyfikować tę fakturę "opuszczonych"? ConfirmClassifyPaidPartially=Czy na pewno chcesz zmienić fakturę %s do statusu wypłatę? ConfirmClassifyPaidPartiallyQuestion=Niniejsza faktura nie została całkowicie wypłacana. Jakie są powody, aby zamknąć tę fakturę? -ConfirmClassifyPaidPartiallyReasonAvoir=Pozostająca do zapłaty ( %s %s) jest zniżka przyznane płatności, ponieważ został złożony przed terminem. I uregulowania podatku VAT z kredytu notatkę. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Pozostająca do zapłaty ( %s %s) jest zniżka przyznane płatności, ponieważ został złożony przed terminem. Przyjmuję do stracenia VAT na ten rabat. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Pozostająca do zapłaty ( %s %s) jest zniżka przyznane płatności, ponieważ został złożony przed terminem. Odzyskać VAT od tej zniżki bez kredytu notatkę. +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 klienta ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty częściowo zwrócone ConfirmClassifyPaidPartiallyReasonOther=Kwota porzucił dla innej przyczyny @@ -191,9 +189,9 @@ AlreadyPaid=Już paid AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Już wypłacone (bez not kredytowych i depozytów) Abandoned=Porzucone -RemainderToPay=Pozostająca do zapłaty -RemainderToTake=Pozostająca do podjęcia -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Kwota twierdził ExcessReceived=Trop Peru @@ -219,19 +217,18 @@ NoInvoice=Nr faktury ClassifyBill=Klasyfikacja faktury SupplierBillsToPay=Dostawcy faktur do zapłaty CustomerBillsUnpaid=Należne wpłaty klientów faktury -DispenseMontantLettres=Les factures rdiges par procdsmcanographiques sont zrezygnuje de l'arrt en lettres -DispenseMontantLettres=Les factures rdiges par procdsmcanographiques sont zrezygnuje de l'arrt en lettres +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Niepodlegające zwrotowi SetConditions=Ustaw warunki płatności SetMode=Ustaw tryb płatności Billed=Billed -RepeatableInvoice=Predefiniowane faktury -RepeatableInvoices=Predefiniowane faktur -Repeatable=Predefiniowane -Repeatables=Predefiniowane -ChangeIntoRepeatableInvoice=Konwersja na predefiniowane -CreateRepeatableInvoice=Tworzenie predefiniowane faktury -CreateFromRepeatableInvoice=Utwórz z góry określone faktury +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Klienta faktury i faktury linii CustomersInvoicesAndPayments=Klient faktur i płatności ExportDataset_invoice_1=Klient faktury i faktury listę "linii diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang index 9b86e6485be..8afe23bd46a 100644 --- a/htdocs/langs/pl_PL/categories.lang +++ b/htdocs/langs/pl_PL/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang index e8339bac60d..32f6c94a9ef 100644 --- a/htdocs/langs/pl_PL/compta.lang +++ b/htdocs/langs/pl_PL/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad klienta rachunkowych kod %s SuppliersProductsSellSalesTurnover=Obrotów generowanych przez sprzedaż dostawców produktów. CheckReceipt=Sprawdź depozyt CheckReceiptShort=Sprawdź depozyt +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Nowe zniżki NewCheckDeposit=Nowe sprawdzić depozytu NewCheckDepositOn=Nowe sprawdzić depozytu na konto: %s @@ -196,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 3a8c8fb161e..04e1d26974d 100644 --- a/htdocs/langs/pl_PL/contracts.lang +++ b/htdocs/langs/pl_PL/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Zamówienia obszarze ListOfContracts=Wykaz umów -LastContracts=Ostatnia %s zmodyfikowane umów +LastModifiedContracts=Last %s modified contracts AllContracts=Wszystkie umowy ContractCard=Zamówienie karty ContractStatus=Kontrakt statusu @@ -27,7 +27,7 @@ MenuRunningServices=Uruchamianie usług MenuExpiredServices=Minął usług MenuClosedServices=Zamknięte usług NewContract=Nowe umowy -AddContract=Dodaj umowy +AddContract=Create contract SearchAContract=Szukaj zamówienia DeleteAContract=Usuń umowy CloseAContract=Zamknij umowy @@ -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=Ostatnia %s zmodyfikowane umów +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/cron.lang b/htdocs/langs/pl_PL/cron.lang index 6abeda4f4aa..69d99203c3e 100644 --- a/htdocs/langs/pl_PL/cron.lang +++ b/htdocs/langs/pl_PL/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = O -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job CronNone= Żaden CronDtStart=Data rozpoczęcia CronDtEnd=Data zakończenia -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe CronMethod=Metoda CronModule=Moduł -# CronAction=Action +CronAction=Action CronStatus=Status CronStatusActive=Włączone CronStatusInactive=Niepełnosprawnych -# CronNoJobs=No jobs registered +CronNoJobs=No jobs registered CronPriority=Priorytet CronLabel=Opis -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create CronArgs=Parametry -# CronSaveSucess=Save succesfully +CronSaveSucess=Save succesfully CronNote=Komentarz -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable CronStatusInactiveBtn=Wyłączyć -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/pl_PL/donations.lang b/htdocs/langs/pl_PL/donations.lang index 8193fe23acb..2318d3bf19f 100644 --- a/htdocs/langs/pl_PL/donations.lang +++ b/htdocs/langs/pl_PL/donations.lang @@ -4,7 +4,7 @@ Donations=Darowizny DonationRef=Donation ref. Donor=Donor Donors=Darczyńcy -AddDonation=Dodaj darowiznę +AddDonation=Create a donation NewDonation=Nowe wpłaty ShowDonation=Show donation DonationPromise=Prezent obietnicy @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/pl_PL/externalsite.lang index e7b2b8625e8..35765bf2fd5 100644 --- a/htdocs/langs/pl_PL/externalsite.lang +++ b/htdocs/langs/pl_PL/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Skonfiguruj link do zewnętrznej strony internetowej ExternalSiteURL=Zewnętrzny URL strony ExternalSiteModuleNotComplete=Moduł zewnętrznej strony internetowej nie został skonfigurowany poprawny +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang index 3f09f0c79e9..bbf13703b82 100644 --- a/htdocs/langs/pl_PL/holiday.lang +++ b/htdocs/langs/pl_PL/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Uaktualnić CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Nazwa użytkownika Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Wartość -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang index 924ffd5321f..1bd9519089d 100644 --- a/htdocs/langs/pl_PL/interventions.lang +++ b/htdocs/langs/pl_PL/interventions.lang @@ -3,7 +3,7 @@ Intervention=Interwencja Interventions=Interwencje InterventionCard=Interwencja karty NewIntervention=Nowa interwencja -AddIntervention=Dodaj interwencji +AddIntervention=Create intervention ListOfInterventions=Wykaz interwencji EditIntervention=Editer interwencji ActionsOnFicheInter=Działania w zakresie interwencji @@ -30,6 +30,15 @@ StatusInterInvoiced=Zapowiadane RelatedInterventions=Podobne interwencje ShowIntervention=Pokaż interwencji SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Przedstawiciela w ślad za interwencję TypeContact_fichinter_internal_INTERVENING=Interwencja diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang index 3785889299f..d1a930134f5 100644 --- a/htdocs/langs/pl_PL/mails.lang +++ b/htdocs/langs/pl_PL/mails.lang @@ -115,7 +115,7 @@ SentBy=Wysłane przez MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=Możesz jednak wysłać je w sieci poprzez dodanie parametru MAILING_LIMIT_SENDBYWEB o wartości max liczba wiadomości e-mail, który chcesz wysłać przez sesji. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Wyczyść listę ToClearAllRecipientsClickHere=Aby wyczyścić odbiorców tego e-maila na listę, kliknij przycisk ToAddRecipientsChooseHere=Aby dodać odbiorców, wybierz w tych wykazach @@ -133,6 +133,9 @@ Notifications=Powiadomienia NoNotificationsWillBeSent=Brak powiadomień e-mail są planowane dla tego wydarzenia i spółka ANotificationsWillBeSent=1 zgłoszenie zostanie wysłane pocztą elektroniczną SomeNotificationsWillBeSent=%s powiadomienia będą wysyłane przez e-mail -AddNewNotification=Aktywacja nowego zgłoszenia wniosku -ListOfActiveNotifications=Lista wszystkich aktywnych zgłoszeń wniosków +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Lista wszystkich powiadomień e-mail wysłany +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index 7cce31efde2..49f64e5b926 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Nie można znaleźć użytkownika %sNet margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/pl_PL/orders.lang index e0b4afbf64f..a1caf98c9dd 100644 --- a/htdocs/langs/pl_PL/orders.lang +++ b/htdocs/langs/pl_PL/orders.lang @@ -2,7 +2,7 @@ OrdersArea=Klienci dziedzinie zamówień SuppliersOrdersArea=Dostawcy dziedzinie zamówień OrderCard=Zamów kartę -# OrderId=Order Id +OrderId=Order Id Order=Porządek Orders=Zamówienia OrderLine=Zamówienie linii @@ -28,7 +28,7 @@ StatusOrderCanceledShort=Odwołany StatusOrderDraftShort=Szkic StatusOrderValidatedShort=Zatwierdzona StatusOrderSentShort=W procesie -# StatusOrderSent=Shipment in process +StatusOrderSent=Shipment in process StatusOrderOnProcessShort=Na proces StatusOrderProcessedShort=Przetworzone StatusOrderToBillShort=Do rachunku @@ -53,9 +53,9 @@ ShippingExist=Przesyłka istnieje DraftOrWaitingApproved=Projekt nie został jeszcze zatwierdzony lub sortowane DraftOrWaitingShipped=Projekt lub zatwierdzonych jeszcze nie wysłane MenuOrdersToBill=Zamówienia na rachunku -# MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Szukaj celu -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=Statek produktu Discount=Rabat CreateOrder=Tworzenie Zamówienie @@ -65,14 +65,14 @@ ValidateOrder=Sprawdź zamówienie UnvalidateOrder=Unvalidate zamówienie DeleteOrder=Usuń zamówienie CancelOrder=Anulować zamówienie -AddOrder=Dodaj zamówienie +AddOrder=Create order AddToMyOrders=Dodaj do mojego zamówienia AddToOtherOrders=Dodaj do zamówienia -# AddToDraftOrders=Add to draft order +AddToDraftOrders=Add to draft order ShowOrder=Pokaż zamówienie NoOpenedOrders=Nie otworzył zamówień NoOtherOpenedOrders=Żadne inne otwarte zamówienia -# NoDraftOrders=No draft orders +NoDraftOrders=No draft orders OtherOrders=Inne zamówienia LastOrders=Ostatnia %s zamówień LastModifiedOrders=Ostatnia %s zmodyfikowane zamówień @@ -82,7 +82,7 @@ NbOfOrders=Liczba zleceń OrdersStatistics=Zamówienia statystyk OrdersStatisticsSuppliers=Dostawca zamówień statystyk NumberOfOrdersByMonth=Liczba zleceń przez miesiąc -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=Lista zamówień CloseOrder=Zamknij celu ConfirmCloseOrder=Czy na pewno chcesz zamknąć to zamówienie? Gdy zamówienie jest zamknięta, to może być rozliczone. @@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Czy na pewno chcesz przywrócić %s zamówień ze ConfirmCancelOrder=Czy na pewno chcesz anulować zamówienie? ConfirmMakeOrder=Czy na pewno chcesz, aby potwierdzić wprowadzone tym celu na %s? GenerateBill=Generowanie faktur -# ClassifyShipped=Classify delivered +ClassifyShipped=Classify delivered ClassifyBilled=Klasyfikacja "obciążonego" ComptaCard=Księgowość karty DraftOrders=Projekt zamówień @@ -101,7 +101,6 @@ RelatedOrders=Podobne zamówienia OnProcessOrders=Na proces zamówienia RefOrder=Nr ref. porządek RefCustomerOrder=Nr ref. zamówieniem -CustomerOrder=Zamówieniem RefCustomerOrderShort=Nr ref. cust. porządek SendOrderByMail=Wyślij zamówienie pocztą ActionsOnOrder=Działania mające na celu @@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Stała COMMANDE_SUPPLIER_ADDON nie zdef Error_COMMANDE_ADDON_NotDefined=Stała COMMANDE_ADDON nie zdefiniowane Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Nie można załadować modułu pliku ' %s' Error_FailedToLoad_COMMANDE_ADDON_File=Nie można załadować modułu pliku ' %s' -# Error_OrderNotChecked=No orders to invoice selected - - +Error_OrderNotChecked=No orders to invoice selected # Sources OrderSource0=Commercial wniosku OrderSource1=Internet @@ -144,25 +141,22 @@ OrderSource5=Komercyjne OrderSource6=Przechowywać QtyOrdered=Ilosc sortowane AddDeliveryCostLine=Dodaj dostawy koszt linii wskazujące wagi zamówienia - # Documents models PDFEinsteinDescription=Pełna kolejność modelu (logo. ..) PDFEdisonDescription=Prosty model celu -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes OrderByMail=Poczta OrderByFax=Faks OrderByEMail=EMail OrderByWWW=Online OrderByPhone=Telefon - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/pl_PL/oscommerce.lang b/htdocs/langs/pl_PL/oscommerce.lang deleted file mode 100644 index 6cf59eb65c6..00000000000 --- a/htdocs/langs/pl_PL/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce konfiguracji modułu -OSCommerceSetupSaved=OS Commerce konfiguracji zapisywane -OSCommerceServer=OS Commerce Server host / ip -OSCommerceDatabaseName=OS Handlowa nazwa bazy danych -OSCommercePrefix=OS Commerce prefiks tabel -OSCommerceUser=OS Commerce bazy danych logowania diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang index bb487092ed5..fe2b5107356 100644 --- a/htdocs/langs/pl_PL/other.lang +++ b/htdocs/langs/pl_PL/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Kod zabezpieczający Calendar=Kalendarz -AddTrip=Dodaj podróż Tools=Narzędzia ToolsDesc=Obszar ten jest poświęcony grupie różnorodnych nie dostępnych narzędzi do innych pozycji w menu.

    Narzędzia te mogą zostać osiągnięte z menu na stronie. Birthday=Urodziny @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Liczba załączonych plików / dokumentów TotalSizeOfAttachedFiles=Całkowita wielkość załączonych plików / dokumentów MaxSize=Maksymalny rozmiar @@ -80,6 +80,16 @@ ModifiedBy=Zmodyfikowane przez %s ValidatedBy=Zatwierdzona przez %s CanceledBy=Odwołany przez %s ClosedBy=Zamknięte przez %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Plik został usunięty DirWasRemoved=Katalog został usunięty FeatureNotYetAvailableShort=Dostępne w następnej wersji @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Dodaj wpis w kalendarzu %s -NewCompanyToDolibarr=Firma %s dodany do Dolibarr -ContractValidatedInDolibarr=Kontrakt %s zatwierdzone w Dolibarr -ContractCanceledInDolibarr=Kontrakt %s anulowany w Dolibarr -ContractClosedInDolibarr=Kontrakt %s zamknięty w Dolibarr -PropalClosedSignedInDolibarr=Wniosek podpisany w %s Dolibarr -PropalClosedRefusedInDolibarr=Wniosek %s odmówił w Dolibarr -PropalValidatedInDolibarr=Wniosek %s zatwierdzone w Dolibarr -InvoiceValidatedInDolibarr=Faktura %s zatwierdzone w Dolibarr -InvoicePaidInDolibarr=Faktura %s zmieniono na wypłatę w Dolibarr -InvoiceCanceledInDolibarr=Faktura %s anulowany w Dolibarr -PaymentDoneInDolibarr=Płatność dokonana w %s Dolibarr -CustomerPaymentDoneInDolibarr=Klient płatności %s wykonane w Dolibarr -SupplierPaymentDoneInDolibarr=Dostawca płatności %s wykonane w Dolibarr -MemberValidatedInDolibarr=Państwa %s zatwierdzone w Dolibarr -MemberResiliatedInDolibarr=Państwa %s resiliated w Dolibarr -MemberDeletedInDolibarr=Państwa %s usuwane z Dolibarr -MemberSubscriptionAddedInDolibarr=Subskrypcja członek %s dodany w Dolibarr -ShipmentValidatedInDolibarr=%s wysyłki zatwierdzone w Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Eksport ExportsArea=Wywóz obszarze diff --git a/htdocs/langs/pl_PL/paybox.lang b/htdocs/langs/pl_PL/paybox.lang index af727252f41..9d629ea7e16 100644 --- a/htdocs/langs/pl_PL/paybox.lang +++ b/htdocs/langs/pl_PL/paybox.lang @@ -32,6 +32,9 @@ VendorName=Nazwa dostawcy CSSUrlForPaymentForm=CSS url arkusz dla formy płatności MessageOK=Wiadomość na zatwierdzonych strony powrót płatności MessageKO=Wiadomość na odwołana strony powrotnej płatności -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/pl_PL/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang index c678dc2b9f9..3ff7b8f5fb7 100644 --- a/htdocs/langs/pl_PL/sendings.lang +++ b/htdocs/langs/pl_PL/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Na razie utworzenie nowego przesyłki odbywa si RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch przez klientów diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang index 93f24786db7..86f5d735d69 100644 --- a/htdocs/langs/pl_PL/stocks.lang +++ b/htdocs/langs/pl_PL/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Magazyn etykiecie jest wymagane CorrectStock=Poprawny stanie ListOfWarehouses=Lista magazynów ListOfStockMovements=Wykaz stanu magazynowego -StocksArea=Zapasy obszarze +StocksArea=Warehouses area Location=Lieu LocationSummary=Nazwa skrócona lokalizacji NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang index ef8b60b0f67..467c34b1af8 100644 --- a/htdocs/langs/pl_PL/users.lang +++ b/htdocs/langs/pl_PL/users.lang @@ -63,7 +63,6 @@ ShowGroup=Pokaż grupy ShowUser=Pokaż użytkownika NonAffectedUsers=Brak wpływu na użytkowników UserModified=Użytkownik zmodyfikowano pomyślnie -GroupModified=Grupa zmodyfikowano pomyślnie PhotoFile=Plików ze zdjęciami UserWithDolibarrAccess=Użytkownik z Dolibarr dostępu ListOfUsersInGroup=Lista użytkowników w tej grupie @@ -103,7 +102,7 @@ UserDisabled=Użytkownik %s osób niepełnosprawnych UserEnabled=Użytkownik %s aktywowany UserDeleted=Użytkownik %s usunięto NewGroupCreated=Grupa %s tworzone -GroupModified=Grupa zmodyfikowano pomyślnie +GroupModified=Group %s modified GroupDeleted=Grupa %s usunięto ConfirmCreateContact=Czy na pewno chcesz yu Dolibarr utworzyć konto dla tego kontaktu? ConfirmCreateLogin=Czy na pewno chcesz, aby utworzyć konto dla tego Dolibarr członkiem? @@ -114,8 +113,10 @@ YourRole=Swoje role YourQuotaOfUsersIsReached=Limitu aktywnych użytkowników został osiągnięty! NbOfUsers=Nb użytkowników DontDowngradeSuperAdmin=Tylko superadmin niższej wersji superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang index 2efd9456102..f4a7f570e6b 100644 --- a/htdocs/langs/pl_PL/withdrawals.lang +++ b/htdocs/langs/pl_PL/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Odbiór LastWithdrawalReceipts=Ostatnia %s wycofania wpływy WithdrawedBills=Withdrawed faktur WithdrawalsLines=Wycofania linie -RequestStandingOrderToTreat=Wniosek o stałych zleceń w leczeniu -RequestStandingOrderTreated=Wniosek o stałych zleceń leczonych +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Stałych zleceń klienta CustomerStandingOrder=Klient zlecenie stałe NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Tryb transmisji Send=Wysłać Lines=Linie StandingOrderReject=Problem odrzucenia -InvoiceRefused=Za odrzucenie klienta WithdrawalRefused=Wypłaty Refuseds WithdrawalRefusedConfirm=Czy na pewno chcesz wprowadzić odrzucenie wycofania dla społeczeństwa RefusedData=Od odrzucenia RefusedReason=Powodem odrzucenia RefusedInvoicing=Rozliczeniowych odrzucenia NoInvoiceRefused=Nie za odrzucenie -InvoiceRefused=Za odrzucenie klienta +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Nieznany StatusWaiting=Czekanie @@ -76,13 +76,14 @@ WithBankUsingRIB=Na rachunkach bankowych z wykorzystaniem RIB WithBankUsingBANBIC=Na rachunkach bankowych z wykorzystaniem IBAN / BIC / SWIFT BankToReceiveWithdraw=Konto bankowe do odbioru odstępuje CreditDate=Kredyt na -WithdrawalFileNotCapable=Nie można wygenerować plik potwierdzenia wypłaty dla swojego kraju +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_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang new file mode 100644 index 00000000000..26dd25027a2 --- /dev/null +++ b/htdocs/langs/pt_BR/accountancy.lang @@ -0,0 +1,96 @@ +# Dolibarr language file - Source file is en_US - accountancy +Accounting=Contabilidade +Globalparameters=Parametros globais +Fiscalyear=Ano fiscal +Menuaccount=Contas contábeis +ConfigAccountingExpert=Configuração do módulo especialista em contabilidade +Journaux=Jornais +JournalFinancial=Jornais financeiros +Exports=Exportações +Selectmodelcsv=Escolha um modelo de exportação +Modelcsv_normal=Exportação classica +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Breakdown +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account +Ventilate=Ventilate +VentilationAuto=Automatic breakdown +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Linhas selecionadas +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account +ACCOUNTING_SEPARATORCSV=Separator CSV +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait +Docref=Referência +Code_tiers=Cliente/Fornecedor +Labelcompte=Label account +Sens=Sens +Codejournal=Journal +DelBookKeeping=Delete the records of the general ledger +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash +CashPayment=Cash Payment +ThirdPartyAccount=Thirdparty account +NewAccountingMvt=Nova movimentação +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts +ListAccounts=List of the accounting accounts +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Active=Statement +NewFiscalYear=New fiscal year +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account +ValidateHistory=Validate Automatically +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used +FicheVentilation=Breakdown card diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 1ba5011996d..1211cf13d32 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -1,13 +1,8 @@ # Dolibarr language file - Source file is en_US - admin Foundation=Empresa/Instituição -Version=Versão VersionProgram=Versão do programa VersionLastInstall=Versão da instalação inicial VersionLastUpgrade=Versão da última atualização -VersionExperimental=Experimental -VersionDevelopment=Desenvolvimento -VersionUnknown=Desconhecida -VersionRecommanded=Recomendada SessionId=ID da sessao SessionSaveHandler=Manipulador para salvar sessões. SessionSavePath=Localizacao da sessao guardada @@ -32,90 +27,58 @@ InternalUser=Usuário Interno ExternalUser=Usuário Externo InternalUsers=Usuários Internos ExternalUsers=Usuários Externos -GlobalSetup=Geral -GUISetup=Layout SetupArea=Área Configuração FormToTestFileUploadForm=Formulário para testar upload de arquivo (de acordo com a configuração) IfModuleEnabled=Nota: Sim só é eficaz se o módulo %s estiver ativado RemoveLock=Exclua o arquivo %s se tem permissão da ferramenta de atualização. RestoreLock=Substituir o arquivo %s e apenas dar direito de ler a esse arquivo, a fim de proibir novas atualizações. -SecuritySetup=Configuração de Segurança -ErrorModuleRequirePHPVersion=Erro, este módulo requer uma versão %s ou superior de PHP ErrorModuleRequireDolibarrVersion=Erro, este módulo requer uma versão %s ou superior do ERP -ErrorDecimalLargerThanAreForbidden=Erro, as casas decimais superiores a %s não são suportadas. DictionarySetup=Configuração Dicionário -Dictionary=Dicionários ErrorReservedTypeSystemSystemAuto=Valores 'system' e 'systemauto' para o tipo é reservado. Você pode usar "usuário" como valor para adicionar seu próprio registro ErrorCodeCantContainZero=Código não pode conter valor 0 -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=Desative as funções de JavaScript e Ajax (Recomendado para deficientes visuais ou navegadores somente texto) ConfirmAjax=Utilizar os popups de confirmação Ajax UseSearchToSelectCompanyTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo COMPANY_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string. UseSearchToSelectCompany=Use campos de completação automática para escolher terceiros em vez de usar uma caixa de listagem. -ActivityStateToSelectCompany= Adicionar uma opção de filtro para exibir / ocultar thirdparties que estão atualmente em atividade ou deixou de ativar +ActivityStateToSelectCompany=Adicionar uma opção de filtro para exibir / ocultar thirdparties que estão atualmente em atividade ou deixou de ativar UseSearchToSelectContactTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo CONTACT_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string. UseSearchToSelectContact=Use campos de completação automática para escolher de contato (em vez de usar uma caixa de lista). SearchFilter=Opções de filtro para pesquisa NumberOfKeyToSearch=Número de caracteres para iniciar a pesquisa: %s ViewFullDateActions=Ver as datas das ações na totalidade na ficha do fornecedor -NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax esta desativado -JavascriptDisabled=Javascript Desativado UsePopupCalendar=Utilizar popups para a introdução das datas UsePreviewTabs=Use guias de visualização ShowPreview=Ver Preview -PreviewNotAvailable=Visualização não disponível ThemeCurrentlyActive=Tema Atualmente Ativo CurrentTimeZone=Fuso horário PHP (servidor) MySQLTimeZone=Zona tempo MySql (banco de dados) TZHasNoEffect=Datas são guardadas e retornadas pelo servidor de banco de dados como se fosse guardados em formato de texto. A zona temporal tem effeito somente quando e usada a UNIX_TIMESTAMP função ( isso não deveria ser usado pelo Dolibarr, portanto o banco de dados TZ não deveria ter effeito, tambem se mudado apos que os dados foram inseridos). -Space=Área -Table=Tabela -Fields=Campos -Index=Índice -Mask=Máscara -NextValue=Próximo Valor NextValueForInvoices=Próximo Valor (Faturas) -NextValueForCreditNotes=Próximo Valor (Notas de Entregas) NextValueForDeposit=Próxima valor (depósito) NextValueForReplacements=Próxima valor (substituições) MustBeLowerThanPHPLimit=Observação: Parâmetros PHP limita o tamanho a %s %s de máximo, qualquer que seja o valor deste parâmetros NoMaxSizeByPHPLimit=Nota: Não há limite definido em sua configuração do PHP -MaxSizeForUploadedFiles=Tamanho máximo dos documentos a carregar (0 para proibir o carregamento) UseCaptchaCode=Utilização do Captcha no login UseAvToScanUploadedFiles=Utilização de um antivírus para scanear os arquivos enviados -AntiVirusCommand= Caminho completo para o comando de antivírus -AntiVirusCommandExample= Exemplo de Comando: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe
    Exemplo de Mexilhão: / usr / bin / clamscan -AntiVirusParam= Mais parâmetros na linha de comando -AntiVirusParamExample= Exemplo de Parametro de Comando: - database = "C: \\ Program Files (x86) \\ lib ClamWin \\" -ComptaSetup=Configuração do Módulo Contabilidade +AntiVirusCommandExample=Exemplo de Comando: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe
    Exemplo de Mexilhão: / usr / bin / clamscan +AntiVirusParam=Mais parâmetros na linha de comando +AntiVirusParamExample=Exemplo de Parametro de Comando: - database = "C: \\ Program Files (x86) \\ lib ClamWin \\" UserSetup=Configuração e Administração dos Usuário MenuSetup=Configuração do gerenciamento de menu MenuLimits=Limites e Precisão -MenuIdParent=Id do menu pai -DetailMenuIdParent=ID do menu pai (0 para um menu superior) DetailPosition=Número de ordem para a posição do menu PersonalizedMenusNotSupported=Menus personalizados não são suportados -AllMenus=Todos NotConfigured=Modulo nao configurado -Setup=Configuração do Sistema Activation=Ativação -Active=Ativo SetupShort=Configuracao -OtherOptions=Outras Opções OtherSetup=Outras configuracoes -CurrentValueSeparatorDecimal=Separador decimal CurrentValueSeparatorThousand=Separador milhar Destination=Destino IdModule=Módulo ID IdPermissions=Permissão ID -Modules=Módulos ModulesCommon=Módulos Principais -ModulesOther=Outros módulos ModulesInterfaces=Módulos de interface ModulesSpecial=Módulos muito específico -ParameterInDolibarr=Variável %s -LanguageParameter=Variável idioma %s -LanguageBrowserParameter=Variável %s -LocalisationDolibarrParameters=Parâmetros de localização ClientTZ=Fuso horário do cliente (usuário). ClientHour=Horário do cliente (usuário) OSTZ=Fuso horário do sistema operacional do servidor @@ -129,16 +92,13 @@ CompanyHour=Horário na empresa (empresa principal) CurrentSessionTimeOut=Tempo limite da sessão atual YouCanEditPHPTZ=Para definir um fuso horário diferente PHP (não obrigatório), você pode tentar adicionar um arquivo. Htacces com uma linha como esta "SetEnv TZ Europa / Paris" OSEnv=OS Ambiente -Box=Caixa -Boxes=Caixas MaxNbOfLinesForBoxes=Numero de linhas máximo para as caixas PositionByDefault=Posição por padrao -Position=Ordem +Position=Posição MenusDesc=Os configuradores do menu definem o conteúdo das 2 barras de menus (a barra horizontal e a barra vertical). É possível atribuir configuradores diferentes segundo o usuário seja interno ou externo. MenusEditorDesc=O editor de menus permite definir entradas personalizadas nos menus. Deve utilizar com prudência sobe pena de colocar o ERP numa situação instável sendo necessário uma reinstalação para encontrar um menu coerente. MenuForUsers=menu para os usuarios LangFile=Arquivo .lang -System=Sistema SystemInfo=Informações de Sistema SystemTools=Ferramentas do Sistema SystemToolsArea=Área de ferramentas do sistema @@ -156,7 +116,6 @@ ConfirmPurgeAuditEvents=Tem a certeza que pretende limpar a lista de eventos de NewBackup=Novo Backup GenerateBackup=Gerar Backup Backup=Backup -Restore=Restaurar RunCommandSummary=A cópia será executada pelo seguinte comando RunCommandSummaryToLaunch=O backup pode ser executado com o seguinte comando WebServerMustHavePermissionForCommand=Seu servidor deve ter permissoes para executar esta ordem @@ -164,50 +123,33 @@ BackupResult=Resultado do Backup BackupFileSuccessfullyCreated=Arquivo de Backup gerado corretamente YouCanDownloadBackupFile=Pode ser feito o download dos arquivos gerados NoBackupFileAvailable=Nenhum Backup Disponivel -ExportMethod=Método de exportação -ImportMethod=Método de importação ToBuildBackupFileClickHere=Para criar uma cópia, clique here. ImportMySqlDesc=Para importar um backup, deve usar o mysql e na linha de comando seguinte: ImportPostgreSqlDesc=Para importar um arquivo de backup, você deve utilizar o pg_restore através do prompt de comando: ImportMySqlCommand=%s %s < meuArquivobackup.sql ImportPostgreSqlCommand=%s %s meuarquivodebackup.sql FileNameToGenerate=Nome do arquivo a gerar -Compression=Compressão CommandsToDisableForeignKeysForImport=Comando para desativar as chave estrangeira para a importação CommandsToDisableForeignKeysForImportWarning=Obrigatório se você quer ser capaz de restaurar o despejo sql mais tarde ExportCompatibility=Compatibilidade do arquivo de exportação gerado -MySqlExportParameters=Parâmetros da exportação MySql -PostgreSqlExportParameters= Parâmetros de exportação do PostgreSQL +PostgreSqlExportParameters=Parâmetros de exportação do PostgreSQL UseTransactionnalMode=Utilizar o modo transacional -FullPathToMysqldumpCommand=Rota completa do comando mysqldump -FullPathToPostgreSQLdumpCommand=Caminho completo para o comando pg_dump -ExportOptions=Opções de exportação +FullPathToPostgreSQLdumpCommand=Caminho completo para o comando pg_dump AddDropDatabase=Adicionar comando DROP DATABASE AddDropTable=Adicionar comando DROP TABLE -ExportStructure=Estrutura -Datas=Dados -NameColumn=Nome das colunas ExtendedInsert=Instruções INSERT estendidas NoLockBeforeInsert=Sem comandos de bloqueio em torno INSERIR -DelayedInsert=Adições com atraso EncodeBinariesInHexa=Codificar os campos binários em hexadecimal IgnoreDuplicateRecords=Ignorar erros de registros duplicados(INSERT IGNORE) -Yes=Sim -No=Não -AutoDetectLang=Autodetecção (navegador) FeatureDisabledInDemo=Opção desabilitada em mode demonstracao -Rights=Permissões BoxesDesc=As caixas são zonas de informação reduzidas que se mostram em algumas páginas. Voce pode escolher entre mostrar as caixas ou nao selecionando a opcao desejada e clicando em 'Ativar', ou clicando na lixeira para desativá-lo. OnlyActiveElementsAreShown=Somente elementos de habilitado módulos são mostrados. ModulesDesc=Os módulos do ERP definem as Funcionalidades disponíveis na aplicação. Alguns módulos requerem direitos que deverão indicar-se nos Usuários para que possam acessar ás suas Funcionalidades. -ModulesInterfaceDesc=Os módulos de interface são módulos que permitem vincular o ERP com sistemas, aplicações ou serviços externos. -ModulesSpecialDesc=Os módulos especiais são módulos de uso específico ou menos corrente que os módulos normais. ModulesJobDesc=Os módulos mpresariais permitem uma pré-configuração simplificada do ERP para um negocio especifico. ModulesMarketPlaceDesc=Voce pode encontrar mais modulos para download em sites externos na internet ModulesMarketPlaces=Mais módulos DoliStoreDesc=DoliStore, Pagina oficial para modulos externos do Dolibarr ERP/CRM. WebSiteDesc=Você pode pesquisar para encontrar mais módulos em Provedores de sites -URL=Link BoxesAvailable=Caixas disponíveis BoxesActivated=Caixas ativadas ActivateOn=Ative em @@ -216,8 +158,6 @@ SourceFile=Arquivo origem AutomaticIfJavascriptDisabled=Automático se Javascript está desativado AvailableOnlyIfJavascriptNotDisabled=Disponível somente se Javascript esta ativado AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript e Ajax estão ativados -Required=Requerido -Security=Segurança Passwords=Senhas DoNotStoreClearPassword=Nao salve senhas faceis no banco de dados mas salvar senhas criptografadas(Ativacao recomendada) MainDbPasswordFileConfEncrypted=Encriptar a senha da base em arquivo conf.php(Ativacao Recomendada) @@ -226,13 +166,11 @@ InstrucToClearPass=Para ter a senha codificada na conf.php file , subst ProtectAndEncryptPdfFiles=Proteção e encriptação dos pdf gerados(Ativado não recomendado, quebra geração pdf massa) ProtectAndEncryptPdfFilesDesc=A proteção de um documento pdf deixa o documento livre para leitura e para impressão a qualquer leitor de PDF. Ao contrário, a modificação e a cópia resultam impossível. Feature=Caracteristica -DolibarrLicense=Licença DolibarrProjectLeader=Lider de projeto Developpers=Programadores/contribuidores OtherDeveloppers=Outros Programadores/contribuidores OfficialWebSite=Site oficial do Dolibarr OfficialWebSiteFr=site web oficial falado/escrito em francês -OfficialWiki=Wiki ERP OfficialDemo=Demo online ERP OfficialMarketPlace=Loja Oficial para módulos / addons externos OfficialWebHostingService=Serviços de hospedagem web referenciados (Hospedagem em nuvem) @@ -246,47 +184,34 @@ CurrentTopMenuHandler=Manipulador de menu superior atual CurrentLeftMenuHandler=Manipulador de menu à esquerda atual CurrentMenuHandler=Manipulador do menu atual CurrentSmartphoneMenuHandler=Manipular do Menu Smartphone Atual -MeasuringUnit=Unidade de medida -Emails=E-Mails EMailsSetup=configuração E-Mails EMailsDesc=Esta página permite substituir os parâmetros PHP relacionados com o envio de correios eletrônicos. Na maioria dos casos como UNIX/Linux, os parâmetros PHP estão corretos e esta página é inútil. MAIN_MAIL_SMTP_PORT=Porta do servidor SMTP (Por default no php.ini: %s) MAIN_MAIL_SMTP_SERVER=Nome host ou ip do servidor SMTP (Por padrao em php.ini: %s) -MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta do servidor SMTP (Não definido em PHP em sistemas de tipo Unix) -MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nome servidor ou ip do servidor SMTP (Não definido em PHP em sistemas de tipo Unix) MAIN_MAIL_EMAIL_FROM=E-Mail do emissor para envios E-Mail automáticos (Por padrao no php.ini: %s) MAIN_MAIL_ERRORS_TO=Remetente de e-mail utilizado para retornar emails enviados com erros -MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia oculta de todos os emails enviados para +MAIN_MAIL_AUTOCOPY_TO=Enviar sistematicamente uma cópia oculta de todos os emails enviados para +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO=Enviar sistematicamente uma cópia carbono oculta de propostas enviadas por email para +MAIN_MAIL_AUTOCOPY_ORDER_TO=Enviar sistematicamente uma cópia carbono oculta de ordens enviadas por email para +MAIN_MAIL_AUTOCOPY_INVOICE_TO=Enviar sistematicamente uma cópia carbono oculta da fatura enviada por e-mails para MAIN_DISABLE_ALL_MAILS=Desativar globalmente todo o envio de correios eletrônicos (para modo de testes) MAIN_MAIL_SENDMODE=Método de envio de e-mails -MAIN_MAIL_SMTPS_ID=ID SMTP para autenticação SMTP -MAIN_MAIL_SMTPS_PW=Password SMTP para autenticação SMTP -MAIN_MAIL_EMAIL_TLS= Usar encryptacao TLS(SSL) +MAIN_MAIL_EMAIL_TLS=Usar encryptacao TLS(SSL) MAIN_DISABLE_ALL_SMS=Desabilitar todos os envios de SMS(para testes ou demonstracoes) MAIN_SMS_SENDMODE=Método para envio de SMS MAIN_MAIL_SMS_FROM=Número padrão para envio de SMS FeatureNotAvailableOnLinux=Funcionalidade não disponível em sistemas Unix. Teste parâmetros sendmail localmente. SubmitTranslation=Se a tradução para esse idioma não estiver completa ou você encontrar erros, você pode corrigir isso através da edição de arquivos no diretório langs /% s e enviar arquivos modificados no forum www.dolibarr.org. -ModuleSetup=Configuração do módulo -ModulesSetup=Configuração dos módulos -ModuleFamilyBase=Sistema ModuleFamilyCrm=Administração cliente (CRM) ModuleFamilyProducts=Administração produtos -ModuleFamilyHr=Recursos Humanos ModuleFamilyProjects=Projetos/Trabalho cooperativo -ModuleFamilyOther=Outro -ModuleFamilyTechnic=Módulos ferramentas do sistema -ModuleFamilyExperimental=Módulos testes -ModuleFamilyFinancial=Módulos financeiros (Contabilidade/Tesouraria) ModuleFamilyECM=Gerenciamento de Conteúdo Eletrônico (ECM) MenuHandlers=Configuradores menu MenuAdmin=Editor menu DoNotUseInProduction=Não utilizar em produção ThisIsProcessToFollow=Está aqui o procedimento a seguir: -StepNb=Passo %s FindPackageFromWebSite=Encontre um pacote que oferece recurso desejado (por exemplo, no site oficial % s). DownloadPackageFromWebSite=Descarregar o pacote -UnpackPackageInDolibarrRoot=Descompactar o pacote na pasta raiz do ERP %s SetupIsReadyForUse=A Instalação está finalizada e o ERP está liberada para usar com o novo componente NotExistsDirect=O diretório alternativo para o root não foi definido InfDirAlt=Desde a versão 3, é possível definir um diretorio root alternativo. Esta funcoa permitepermite que você armazene, no mesmo lugar, plug-ins e templates personalizados
    apenas crie um diretório na raiz do Dolibarr. (Por exemplo: custom)
    @@ -305,7 +230,6 @@ GenericMaskCodes5=ABC {yy} {mm} - {000000} dará ABC0701-000099 %s na porta %s ServerNotAvailableOnIPOrPort=Servidor não disponível não endereço %s na Porta %s -DoTestServerAvailability=Teste de conectividade com o servidor DoTestSend=Teste envio DoTestSendHTML=Teste envio HTML ErrorCantUseRazIfNoYearInMask=Erro, não pode usar a opção para redefinir @ contador a cada ano se sequência {yy} ou {aaaa} não está na máscara. @@ -313,7 +237,7 @@ ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não se pode usar opção UMask=Parâmetro UMask de novos arquivos em Unix/Linux/BSD. UMaskExplanation=Este parâmetro determina os direitos dos arquivos criados não servidor do ERP (durante o carregamento, por Exemplo).
    Este deve ter o valor octal (por Exemplo, 0666 significa leitura / escrita para todos).
    Este parâmetro não tem nenhum efeito sobre um servidor Windows. SeeWikiForAllTeam=Veja o wiki para mais detalhes de todos os autores e da sua organização -UseACacheDelay= Atraso para a resposta cache em segundos (0 ou vazio para nenhum cache) +UseACacheDelay=Atraso para a resposta cache em segundos (0 ou vazio para nenhum cache) DisableLinkToHelpCenter=Esconde link Precisa ajuda ou suporte " na página de login DisableLinkToHelp=Esconde link "%s Ajuda online " no menu esquerdo AddCRIfTooLong=Não há envolvimento automático, por isso, se linha está fora da página em documentos, porque por muito tempo, você deve adicionar-se os retornos de carro no testar área. @@ -328,7 +252,6 @@ ListOfDirectoriesForModelGenODT=Lista de diretórios contendo modelos de arquivo NumberOfModelFilesFound=Números de arquivos de modelos ODT/ODS encontrados neste diretório ExampleOfDirectoriesForModelGen=Exemplos de sintaxe:
    c:\\mydir
    /home/mydir
    DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=Para saber como criar seu documento seu modelo de documento odt, antes de armazená-lo naquele diretório, leia a documentação wiki -FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Posição do Nome/Sobrenome DescWeather=As imagens a seguir será mostrado no painel quando o número de ações final atingir os seguintes valores: KeyForWebServicesAccess=A chave para usar Web Services (parâmetro "dolibarrkey" em webservices) @@ -341,14 +264,12 @@ SmsTestMessage=Mensagem de teste a partir de __ para __ PHONEFROM__ PHONETO__ ModuleMustBeEnabledFirst=Módulo deve ser ativado antes de usar este recurso. SecurityToken=Chave para URLs seguras NoSmsEngine=No SMS gerente disponível remetente. Gerente de SMS do remetente não são instalados com a distribuição padrão (porque depende de um fornecedor externo), mas você pode encontrar em alguns. -PDF=PDF PDFDesc=Você pode definir cada uma das opções globais relacionadas com a geração de PDF PDFAddressForging=Regras de estabelecimento de caixas de endereço HideAnyVATInformationOnPDF=Esconder todas as informações relativas ao IVA em PDF gerados HideDescOnPDF=Esconder descrição dos produtos em PDF gerados HideRefOnPDF=Esconder ref. dos produtos em PDF gerados HideDetailsOnPDF=Ocultar artigos linhas detalhes sobre PDF gerado -Library=Biblioteca UrlGenerationParameters=Parâmetros para proteger URLs SecurityTokenIsUnique=Use um parâmetro SecureKey exclusivo para cada URL EnterRefToBuildUrl=Digite referência para o objeto @@ -357,32 +278,22 @@ ButtonHideUnauthorized=Ocultar botões para ações não autorizadas em vez de m OldVATRates=Taxa de VAt anterior NewVATRates=Nova taxa do VAT PriceBaseTypeToChange=Modificar sobre os preços com valor de referência de base definida em -MassConvert=Inicie a conversão em massa -String=Cadeia -TextLong=Texto longo -Int=Número inteiro +MassConvert=Inicie a conversão em massa Float=Flutuar -DateAndTime=Data e hora -Unique=Único Boolean=Booleano (Caixa de seleção) -ExtrafieldPhone = Telefone -ExtrafieldPrice = Preço -ExtrafieldMail = Email -ExtrafieldSelect = Selecionar lista -ExtrafieldSelectList = Selecione da tabela -ExtrafieldSeparator=Separador +ExtrafieldSelect =Selecionar lista +ExtrafieldSelectList =Selecione da tabela ExtrafieldCheckBox=Caixa de seleção ExtrafieldRadio=Botão de opção ExtrafieldParamHelpselect=Lista de parâmetros tem que ser como chave, valor por exemplo: 1, valor1 2, valor2 < 3, value3 ... A fim de ter a lista dependendo outro: 1, valor1 | parent_list_code: parent_key 2, valor2 | parent_list_code: parent_key ExtrafieldParamHelpcheckbox=Lista de parâmetros tem que ser como chave, valor

    por exemplo:
    1, valor1
    2, valor2
    3, value3
    ... -ExtrafieldParamHelpradio=Lista de parâmetros tem que ser como chave, valor por exemplo: 1, valor 2, valor2 1 3, value3 ... +ExtrafieldParamHelpradio=Lista de parâmetros tem que ser como chave, valor por exemplo: 1, valor 2, valor2 1 3, value3 ... ExtrafieldParamHelpsellist=Lista Parâmetros vem de uma tabela
    Sintaxe: table_name: label_field: id_field :: filtro
    Exemplo: c_typent: libelle: id :: filtro

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

    A fim de ter a lista dependendo outro:
    c_typent: libelle: id: parent_list_code | parent_column: Filtro LibraryToBuildPDF=Biblioteca utilizada para criar o PDF WarningUsingFPDF=Atenção: Seu conf.php contém dolibarr_pdf_force_fpdf directiva = 1. Isto significa que você usar a biblioteca FPDF para gerar arquivos PDF. Esta biblioteca é velho e não suporta um monte de recursos (Unicode, a transparência da imagem, cirílicos, árabes e asiáticos, ...), por isso podem ocorrer erros durante a geração de PDF.
    Para resolver isso e ter um apoio total de geração de PDF, faça o download     da biblioteca TCPDF , em seguida, comentar ou remover a linha $ dolibarr_pdf_force_fpdf = 1, e adicione ao invés $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' LocalTaxDesc=Alguns países aplicam 2 ou 3 impostos sobre cada linha de nota fiscal. Se este for o caso, escolha o tipo de segundo e terceiro imposto e sua taxa. Tipos possíveis são:
    1: impostos locais, aplicar sobre produtos e serviços, sem IVA (IVA não é aplicado sobre o imposto local)
    2: impostos locais, aplicar sobre produtos e serviços antes de IVA (IVA é calculado sobre o montante + localtax)
    3: impostos locais, aplicar em produtos sem IVA (IVA não é aplicado sobre o imposto local)
    4: impostos locais, aplicadas aos produtos antes de IVA (IVA é calculado sobre o montante + localtax)
    5: impostos locais, aplicar em serviços sem IVA (IVA não é aplicado sobre o imposto local)
    6: impostos locais, aplicar em serviços antes de IVA (IVA é calculado sobre o montante + localtax) SMS=Mensagem de texto LinkToTestClickToDial=Digite um número de telefone para ligar para mostrar um link para testar a url ClickToDial para o usuário% s -RefreshPhoneLink=Atualizar link LinkToTest=Link clicável gerado para o usuário% s (clique número de telefone para testar) KeepEmptyToUseDefault=Manter em branco para usar o valor padrão DefaultLink=Link padrão @@ -397,91 +308,51 @@ ConfirmEraseAllCurrentBarCode=Tem certeza de que deseja apagar todos os valores AllBarcodeReset=Todos os valores de código de barras foram removidas NoBarcodeNumberingTemplateDefined=Nenhum modelo de numeração de código de barras habilitado para configuração do módulo de código de barras. NoRecordWithoutBarcodeDefined=Sem registro, sem valor de código de barras definido. - -# Modules Module0Name=Usuários e Grupos Module0Desc=Administração de Usuários e Grupos Module1Name=Fornecedores Module1Desc=Administração de Fornecedores (Empresas, Particulares) e Contatos -Module2Name=Comercial Module2Desc=Administração comercial -Module10Name=Contabilidade Module10Desc=Administração simples da Contabilidade (repartição das receitas e pagamentos) -Module20Name=Orçamentos Module20Desc=Administração de Orçamentos/Propostas comerciais -Module22Name=E-Mailings Module22Desc=Administração e envio de E-Mails massivos -Module23Name= Energia -Module23Desc= Acompanhamento do consumo de energias -Module25Name=Pedidos de clientes +Module23Desc=Acompanhamento do consumo de energias Module25Desc=Administração de pedidos de clientes Module30Name=Faturas e Recibos Module30Desc=Administração de faturas e recibos de clientes. Administração de faturas de Fornecedores -Module40Name=Fornecedores Module40Desc=Administração de Fornecedores -Module42Name=Syslog -Module42Desc=Utilização de logs (syslog) -Module49Name=Editores Module49Desc=Administração de Editores -Module50Name=Produtos Module50Desc=Administração de produtos Module51Name=Correspondência em massa Module51Desc=Gestão de correspondência do massa Module52Name=Estoques de produtos Module52Desc=Administração de estoques de produtos -Module53Name=Serviços Module53Desc=Administração de serviços -Module54Name=Contratos -Module54Desc=Administração de contratos Module55Name=Códigos de barra Module55Desc=Administração dos códigos de barra Module56Name=Telefonia Module56Desc=Administração da telefonia Module57Name=Débitos Diretos Module57Desc=Administração de débitos diretos e créditos bancários -Module58Name=ClickToDial -Module58Desc=Integração com ClickToDial -Module59Name=Bookmark4u Module59Desc=Adicione função para gerar uma conta Bookmark4u desde uma conta do ERP -Module70Name=Intervenções Module70Desc=Administração de Intervenções Module75Name=Notas de despesas e deslocamentos Module75Desc=Administração das notas de despesas e deslocamentos -Module80Name=Expedições Module80Desc=Administração de Expedições e Recepções -Module85Name=Bancos e Caixas Module85Desc=Administração das contas financeiras de tipo contas bancarias, postais o efetivo Module100Name=Site externo Module100Desc=Este módulo inclui um web site ou página externa em menus Dolibarr e vê-lo em um quadro Dolibarr Module105Name=Mailman e SPIP Module105Desc=Mailman ou interface SPIP para o módulo membro -Module200Name=LDAP Module200Desc=sincronização com um anuário LDAP -Module210Name=PostNuke -Module210Desc=Integração com PostNuke -Module240Name=Exportações de dados -Module240Desc=Ferramenta de exportação de dados do ERP (com assistente) -Module250Name=Importação de dados -Module250Desc=Ferramenta de Importação de dados do ERP (com assistente) -Module310Name=Membros Module310Desc=Administração de Membros de uma associação -Module320Name=Ligações RSS -Module320Desc=Criação de ligações de informação RSS nas janelas do ERP -Module330Name=Favoritos Module330Desc=Administração de Favoritos -Module400Name=Projetos -Module400Desc=Administração dos projetos nos outros módulos -Module410Name=Webcalendar Module410Desc=Interface com calendário Webcalendar Module500Name=Despesas especiais (impostos, contribuições sociais, dividendos) Module500Desc=Gestão de despesas especiais, como impostos, contribuição social, dividendos e salários -Module510Name=Salários Module510Desc=Gestão de funcionários salários e pagamentos -Module600Name=Notificações -Module600Desc=Envio de Notificações (por correio eletrônico) sobre os eventos de trabalho Dolibarr -Module700Name=Bolsas +Module600Desc=Enviar notificação via EMail para terceiros sobre algums eventos do Dolibarr ( configurado para cada terceiro) Module700Desc=Administração de Bolsas -Module1200Name=Mantis Module1200Desc=Interface com o sistema de seguimento de incidências Mantis Module1400Name=Contabilidade Module1400Desc=Gestão de Contabilidade (partes duplas) @@ -489,40 +360,33 @@ Module1780Name=Categorias Module1780Desc=Administração de categorias (produtos, Fornecedores e clientes) Module2000Name=Editor WYSIWYG Module2000Desc=Permitir editar alguma área de texto usando um editor avançado -Module2300Name=Cron Module2300Desc=Gerenciamento de tarefas agendadas -Module2400Name=Agenda Module2400Desc=Administração da agenda e das ações Module2500Name=Administração Eletrônica de Documentos -Module2500Desc=Permite administrar uma base de documentos Module2600Name=Webservices Module2600Desc=Ativar o servidor de serviços web Dolibarr Module2700Name=Sobrescrito Module2700Desc=Usar o serviço on-line Gravatar (www.gravatar.com) para mostrar fotos de usuários / membros (que se encontra com os seus e-mails). Precisa de um acesso à Internet Module2800Desc=Cliente de FTP -Module2900Name=GeoIPMaxmind Module2900Desc=GeoIP Maxmind conversões capacidades -Module3100Name=Skype Module3100Desc=Adicionar um botão do Skype no cartão de adeptos / terceiros / contatos Module5000Name=Multi-Empresa Module5000Desc=Permite-lhe gerenciar várias empresas -Module6000Name=Fluxo de Trabalho Module6000Desc=Gestão de fluxo de trabalho -Module20000Name=Ferias -Module20000Desc=Declare e siga funcionários de férias +Module20000Name=Sair da configuração de pedidos +Module39000Name=Lote de produto +Module39000Desc=Número do lote, para gestão da data de validade para venda dos produtos Module50000Name=PayBox Module50000Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com PayBox -Module50100Name=Caixa Module50100Desc=Caixa registradora -Module50200Name= Paypal -Module50200Desc= Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal -Module54000Name=PrintIPP +Module50200Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal +Module50400Name=Contabilidade (avançada) +Module50400Desc=Gestão de Contabilidade (partes duplas) Module54000Desc=Imprimir via Cups IPP Impressora. Module55000Name=Abrir Enquete Module55000Desc=Módulo para fazer pesquisas on-line (como Doodle, Studs, Rdvz ...) Module59000Name=Margems Module59000Desc=Módulo para gerenciar as margens -Module60000Name=Comissões Module60000Desc=Módulo para gerenciar comissões Module150010Name=Número do lote, de comer por data e data de validade Module150010Desc=Número do lote, prazo de validade de venda gestão de data para o produto @@ -533,104 +397,35 @@ Permission14=Confirmar faturas Permission15=Enviar faturas por correio Permission16=Emitir pagamentos de faturas Permission19=Eliminar faturas -Permission21=Consultar Orçamentos -Permission22=Criar/Modificar Orçamentos -Permission24=Confirmar Orçamentos -Permission25=Enviar os Orçamentos -Permission26=Fechar Orçamentos -Permission27=Eliminar Orçamentos -Permission28=Exportação propostas comerciais -Permission31=Consultar produtos/serviços -Permission32=Criar/Modificar produtos/serviços -Permission34=Eliminar produtos/serviços -Permission36=Exportar produtos/serviços -Permission38=Exportar Produtos Permission41=Consultar projetos Permission42=Criar/Modificar projetos Permission44=Eliminar projetos -Permission61=Consultar Intervenções -Permission62=Criar/Modificar Intervenções -Permission64=Eliminar Intervenções -Permission67=Exportar Intervenções -Permission71=Consultar Membros -Permission72=Criar/Modificar Membros -Permission74=Eliminar Membros -Permission75=Configurar tipos e atributos dos Membros -Permission76=Exportar Bolsas -Permission78=Consultar honorários -Permission79=Criar/Modificar honorários -Permission81=Consultar pedidos de clientes -Permission82=Criar/Modificar pedidos de clientes -Permission84=Confirmar pedidos de clientes -Permission86=Enviar pedidos de clientes -Permission87=Fechar pedidos de clientes -Permission88=Anular pedidos de clientes -Permission89=Eliminar pedidos de clientes Permission91=Consultar Impostos e ICMS Permission92=Criar/Modificar Impostos e ICMS Permission93=Eliminar Impostos e ICMS -Permission94=Exportar Impostos Sociais -Permission95=Consultar balanços e resultados -Permission101=Consultar Expedições -Permission102=Criar/Modificar Expedições -Permission104=Confirmar Expedições Permission106=Envios de exportação -Permission109=Eliminar Expedições -Permission111=Consultar contas financeiras (contas bancarias, caixas) Permission112=Criar/Modificar quantidade/eliminar registros bancários Permission113=Configurar contas financeiras (criar, controlar as categorias) Permission114=Exportar transações e registros bancários Permission115=Exportar transações e extratos Permission116=Captar transferências entre contas Permission117=Gerenciar envio de cheques -Permission121=Consultar empresas -Permission122=Criar/Modificar empresas -Permission125=Eliminar empresas -Permission126=Exportar as empresas Permission141=Leia projetos (também privado não estou em contato para) Permission142=Criar / modificar projetos (também privado não estou em contato para) Permission144=Excluir projetos (também privado não estou em contato para) Permission146=Consultar Prestadores -Permission147=Consultar Estados Permission151=Consultar Débitos Diretos Permission152=Configurar Débitos Diretos Permission153=Consultar Débitos Diretos Permission154=Crédito / recusar ordens permanentes recibos -Permission161=Consultar contratos de serviço -Permission162=Criar/Modificar contratos de serviço -Permission163=Ativar os serviços de um contrato -Permission164=Desativar os serviços de um contrato -Permission165=Eliminar contratos -Permission171=Criar/Modificar Deslocamento -Permission172=Eliminar Deslocamento -Permission173=apagar viagens -Permission178=Exportar Deslocamento -Permission180=Consultar Fornecedores -Permission181=Consultar pedidos a Fornecedores -Permission182=Criar/Modificar pedidos a Fornecedores -Permission183=Confirmar pedidos a Fornecedores -Permission184=Aprovar pedidos a Fornecedores -Permission185=Enviar pedidos a Fornecedores -Permission186=Receber pedidos de Fornecedores -Permission187=Fechar pedidos a Fornecedores -Permission188=Anular pedidos a Fornecedores -Permission192=Criar Linhas -Permission193=Cancelar Linhas +Permission172=Criar/Modificar viagens e gastos +Permission173=Remover viagens e gastos +Permission178=Exportar viagens e gastos Permission194=Consultar Linhas da Lagura de Banda -Permission202=Criar Ligações ADSL -Permission203=Ordem das ligações encomendadas -Permission204=Comprar Ligações Permission205=Gerenciar Ligações -Permission206=Consultar Ligações -Permission211=Ler Telefone -Permission212=Comprar Linhas Permission213=Ativar Linha -Permission214=Configurar Telefone -Permission215=Configurar Fornecedores -Permission221=Consultar E-Mails Permission222=Criar/Modificar E-Mails (assunto, destinatários, etc.) Permission223=Confirmar E-Mails (permite o envio) -Permission229=Eliminar E-Mails Permission237=Exibir os destinatários e as informações Permission238=Envio manual de e-mails Permission239=Deletar e-mail após o envio @@ -639,7 +434,6 @@ Permission242=Criar/Modificar categorias Permission243=Eliminar categorias Permission244=Ver conteúdo de categorias ocultas Permission251=Consultar Outros Usuário, grupos e permissões -PermissionAdvanced251=Leia outros usuários Permission252=Criar/Modificar outros usuário, grupos e permissões Permission253=Modificar a senha de outros usuário PermissionAdvanced253=Criar ou modificar usuários internos ou externos e suas permissões @@ -647,28 +441,15 @@ Permission254=Eliminar ou desativar outros usuário Permission255=Criar/Modificar a sua propia informação de usuário Permission256=Modificar a sua propia senha Permission262=Consultar todas as empresas (somente Usuários internos. Os externos estão limitados a eles mesmos) -Permission271=Ler CA Permission272=Ler Faturas Permission273=Emitir Fatura Permission281=Consultar contatos Permission282=Criar/Modificar contatos Permission283=Eliminar contatos Permission286=Exportar os contatos -Permission291=Consultar Tarifas -Permission292=Permissões das Tarifas -Permission293=Modificar Fornecedor de Tarifas -Permission300=Consultar códigos de barra -Permission301=Criar/Modificar códigos de barra -Permission302=Eliminar código de barras -Permission311=Consultar Serviços -Permission312=Assinalar Serviço ao Contrato -Permission331=Consultar Favoritos -Permission332=Criar/Modificar Favoritos -Permission333=Eliminar Favoritos Permission341=Ler suas próprias permissões Permission342=Criar ou modificar informações do próprio usuário Permission343=Modificar sua senha -Permission344=Modificar suas próprias permissões Permission351=Ler grupos Permission352=Ler permissões do grupo Permission353=Criar ou modificar grupos @@ -682,7 +463,6 @@ Permission510=Leia Salários Permission512=Criar / modificar salários Permission514=Excluir salários Permission517=Salários de exportação -Permission531=Ler serviços Permission532=Criar ou modificar serviços Permission534=Excluir serviços Permission536=Visualizar ou gerenciar serviços ocultos @@ -691,24 +471,12 @@ Permission701=Criar/Modificar Bolsas Permission702=Eliminar Bolsas Permission703=Excluir doações Permission1001=Consultar estoques -Permission1002=Criar/Modificar estoques -Permission1003=Eliminar estoques Permission1004=Consultar movimentos de estoque Permission1005=Criar/Modificar movimentos de estoque Permission1101=Consultar ordens de envio Permission1102=criar/modificar ordens de envio Permission1104=Confirmar ordem de envio Permission1109=Eliminar ordem de envio -Permission1181=Consultar Fornecedores -Permission1182=Consultar pedidos a Fornecedores -Permission1183=Criar pedidos a Fornecedores -Permission1184=Confirmar pedidos a Fornecedores -Permission1185=Aprovar pedidos a Fornecedores -Permission1186=Enviar pedidos a Fornecedores -Permission1187=Receber pedidos de Fornecedores -Permission1188=Fechar pedidos a Fornecedores -Permission1201=Obter resultado de uma exportação -Permission1202=Criar/Modificar Exportações Permission1231=Consultar faturas de Fornecedores Permission1232=Criar faturas de Fornecedores Permission1233=Confirmar faturas de Fornecedores @@ -719,10 +487,9 @@ Permission1237=Pedidos a fornecedores Export e seus detalhes Permission1251=Execute as importações em massa de dados externos para o banco de dados (carga de dados) Permission1321=Exportar faturas a clientes, atributos e cobranças Permission1421=Exportar faturas de clientes e atributos -Permission23001 = Ler tarefa agendada -Permission23002 = Criar/atualizar tarefa agendada -Permission23003 = Apagar tarefa agendada -Permission23004 = Executar tarefa agendada +Permission23001 =Ler tarefa agendada +Permission23002 =Criar/atualizar tarefa agendada +Permission23003 =Apagar tarefa agendada Permission2401=Ler ações (eventos ou tarefas) vinculadas na sua conta Permission2402=Criar/Modificar/Eliminar ações (eventos ou tarefas) vinculadas na sua conta Permission2403=Consultar ações (acontecimientos ou tarefas) de outros @@ -731,12 +498,10 @@ Permission2412=Criar / modificar ações (eventos ou tarefas) de outros Permission2413=Excluir ações (eventos ou tarefas) de outros Permission2501=Enviar ou eliminar documentos Permission2502=Baixar documentos -Permission2503=Enviar ou excluir documentos Permission2515=Configuração de diretorios de documentos Permission2801=Use cliente FTP em modo de leitura (navegar e baixar apenas) Permission2802=Use o cliente FTP no modo de escrita (apagar ou fazer upload de arquivos) Permission50101=Usar ponto de vendas -Permission50201=Leia transações Permission50202=Importar transacções Permission54001=Impressão Permission55001=Leia urnas @@ -747,9 +512,6 @@ DictionaryCompanyType=Tipo de clientes DictionaryCompanyJuridicalType=Tipos jurídicos de thirdparties DictionaryProspectLevel=Nível potencial Prospect DictionaryCanton=Estado / cantões -DictionaryRegion=Regiões -DictionaryCountry=Países -DictionaryCurrency=Moedas DictionaryCivility=Título Civilidade DictionaryActions=Tipo de eventos da agenda DictionarySocialContributions=Contribuições Sociais tipos @@ -760,16 +522,13 @@ DictionaryPaymentModes=Modos de pagamento DictionaryTypeContact=Tipos Contato / Endereço DictionaryEcotaxe=Ecotaxa (REEE) DictionaryPaperFormat=Formatos de papel -DictionaryFees=Tipo de taxas DictionarySendingMethods=Métodos do transporte DictionaryStaff=Pessoal -DictionaryAvailability=Atraso na entrega DictionaryOrderMethods=Métodos de compra DictionarySource=Origem das propostas / ordens DictionaryAccountancyplan=Plano de contas DictionaryAccountancysystem=Modelos para o plano de contas SetupSaved=configuração guardada -BackToModuleList=Voltar à lista de módulos BackToDictionaryList=Voltar para a lista de dicionários VATReceivedOnly=Impostos especiais não faturaveis VATManagement=Administração ICMS @@ -777,32 +536,25 @@ VATIsUsedDesc=o tipo de ICMS proposto por default em criações de Orçamentos, VATIsNotUsedDesc=o tipo de ICMS proposto por default é 0. Este é o caso de associações, particulares o algunas pequenhas sociedades. VATIsUsedExampleFR=em Francia, se trata das sociedades u organismos que eligen um regime fiscal general (General simplificado o General normal), regime ao qual se declara o ICMS. VATIsNotUsedExampleFR=em Francia, se trata de associações exentas de ICMS o sociedades, organismos o profesiones liberales que han eligedo o regime fiscal de módulos (ICMS em franquicia), pagando um ICMS em franquicia sem fazer declaração de ICMS. Esta elecção hace aparecer a anotação "IVA não aplicable - art-293B do CGI" em faturas. -##### Local Taxes ##### LTRate=Rata LocalTax1IsUsed=Utilize segundo imposto LocalTax1IsNotUsed=Não use o segundo imposto LocalTax1IsUsedDesc=Use um segundo tipo de impostos (excepto o IVA) LocalTax1IsNotUsedDesc=Não use outro tipo de impostos (excepto o IVA) LocalTax1Management=Segundo tipo de imposto -LocalTax1IsUsedExample= -LocalTax1IsNotUsedExample= LocalTax2IsUsed=Use terceiro imposto LocalTax2IsNotUsed=Não use terceiro imposto LocalTax2IsUsedDesc=Use um terceiro tipo de impostos (excepto o VAT) LocalTax2IsNotUsedDesc=Não use outro tipo de impostos (excepto o VAT) LocalTax2Management=Terceiro tipo de imposto -LocalTax2IsUsedExample= -LocalTax2IsNotUsedExample= -LocalTax1ManagementES= RE Gestão -LocalTax1IsUsedDescES= A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo:
    Se te comprador não está sujeito a RE, RP por default = 0. Fim da regra.
    Se o comprador está sujeito a RE então o RE por padrão. Fim da regra.
    -LocalTax1IsNotUsedDescES= Por padrão, o RE proposto é 0. Fim da regra. -LocalTax1IsUsedExampleES= Na Espanha, eles são profissionais sujeitos a algumas seções específicas do IAE espanhol. -LocalTax1IsNotUsedExampleES= Na Espanha, eles são profissionais e sociedades e sujeito a determinadas seções do IAE espanhol. -LocalTax2ManagementES= Gestão IRPF -LocalTax2IsUsedDescES= A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo:
    Se o vendedor não está sujeito a IRPF, então IRPF por default = 0. Fim da regra.
    Se o vendedor é submetido a IRPF, em seguida, o IRPF por padrão. Fim da regra.
    -LocalTax2IsNotUsedDescES= Por padrão, o IRPF proposta é 0. Fim da regra. -LocalTax2IsUsedExampleES= Na Espanha, freelancers e profissionais independentes que prestam serviços e empresas que escolheram o sistema fiscal de módulos. -LocalTax2IsNotUsedExampleES= Na Espanha, eles são bussines não sujeitas ao regime fiscal dos módulos. +LocalTax1IsUsedDescES=A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo:
    Se te comprador não está sujeito a RE, RP por default = 0. Fim da regra.
    Se o comprador está sujeito a RE então o RE por padrão. Fim da regra.
    +LocalTax1IsUsedExampleES=Na Espanha, eles são profissionais sujeitos a algumas seções específicas do IAE espanhol. +LocalTax1IsNotUsedExampleES=Na Espanha, eles são profissionais e sociedades e sujeito a determinadas seções do IAE espanhol. +LocalTax2ManagementES=Gestão IRPF +LocalTax2IsUsedDescES=A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo:
    Se o vendedor não está sujeito a IRPF, então IRPF por default = 0. Fim da regra.
    Se o vendedor é submetido a IRPF, em seguida, o IRPF por padrão. Fim da regra.
    +LocalTax2IsNotUsedDescES=Por padrão, o IRPF proposta é 0. Fim da regra. +LocalTax2IsUsedExampleES=Na Espanha, freelancers e profissionais independentes que prestam serviços e empresas que escolheram o sistema fiscal de módulos. +LocalTax2IsNotUsedExampleES=Na Espanha, eles são bussines não sujeitas ao regime fiscal dos módulos. CalcLocaltax=Relatorio CalcLocaltax1ES=Vendas - Compras CalcLocaltax1Desc=Relatorios de taxas locais são calculados pela differença entre taxas locais de venda e taxas locais de compra @@ -810,92 +562,41 @@ CalcLocaltax2ES=Compras CalcLocaltax2Desc=Relatorio de taxas locais e o total de taxas locais nas compras CalcLocaltax3ES=Vendas CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas -LabelUsedByDefault=Etiqueta que se utilizará se não se encontra tradução para este código -LabelOnDocuments=Etiqueta sobre documentos NbOfDays=N� de Dias -AtEndOfMonth=No Fim de Mês -Offset=Deslocado AlwaysActive=Sempre Ativo UpdateRequired=Parâmetros sistema necessita de uma atualização. Para atualizar click em Empresa/Instituição     a administrar é requerida já que se utiliza a informação para a introdução de dados na maioria das janelas, em inserciones, ou para modificar o comportamento de Dolibarr (como, por Exemplo, das funções que dependem do seu país). SetupDescription4=A configuração Módulos é indispensável já que Dolibarr não é um ERP/CRM monolítico, é um conjunto de módulos mais ou menos independente. Depois de ativar os módulos que lhe interessem verificar as suas funcionalidades nos menus de Dolibarr. SetupDescription5=Outros itens do menu gerenciar parâmetros opcionais. -EventsSetup=Configuração do registo de eventos -LogEvents=Auditoría da segurança de eventos -Audit=Auditoría InfoDolibarr=Infos Dolibarr -InfoBrowser=Infos Browser +InfoBrowser=Infos Navegador InfoOS=Informações do sistema operacional InfoWebServer=Informações do Web Server InfoDatabase=Informações da base de dados InfoPHP=Informações do PHP InfoPerf=Infos performances -BrowserName=Browser name -BrowserOS=Browser OS -ListEvents=Auditoría de eventos +BrowserName=Nome do navegador +BrowserOS=Navegador OS ListOfSecurityEvents=Listado de eventos de segurança Dolibarr SecurityEventsPurged=Os eventos de segurança expurgados LogEventDesc=Pode ativar o registo de eventos de segurança Dolibarr aqui. os administradores podem ver o seu conteúdo a travé de menu ferramentas do sistema - Auditoria.Atenção, esta característica pode consumir uma gran quantidade de dados na base de dados. @@ -959,13 +655,12 @@ MAIN_MAX_DECIMALS_UNIT=Casas decimais máximas para os preços unitários MAIN_MAX_DECIMALS_TOT=Casas decimais máximas para os preços totais MAIN_MAX_DECIMALS_SHOWN=Casas decimais máximas para os valores mostrados em janela (Colocar ... depois do máximo quer ver ... quando o número se trunque à mostrar em janela) MAIN_DISABLE_PDF_COMPRESSION=Utilizar a compressão PDF para os Arquivos PDF gerados -MAIN_ROUNDING_RULE_TOT= Tamanho da faixa de arredondamento (para os países raros em que o arredondamento é feito em outra coisa do que base 10) +MAIN_ROUNDING_RULE_TOT=Tamanho da faixa de arredondamento (para os países raros em que o arredondamento é feito em outra coisa do que base 10) UnitPriceOfProduct=Preço líquido unitário de um produto TotalPriceAfterRounding=Preço total (imposto net / cuba / manhã) após arredondamento ParameterActiveForNextInputOnly=parâmetro efetivo somente a partir das próximas sessões NoEventOrNoAuditSetup=não são registrado eventos de segurança. Esto pode ser normal sim a auditoría não ha sido habilitado na página "configuração->segurança->auditoría". NoEventFoundWithCriteria=não são encontrado eventos de segurança para tais criterios de pesquisa. -SeeLocalSendMailSetup=Ver a configuração local de sendmail BackupDesc=Para realizar uma Cópia de segurança completa de Dolibarr, voçê deve: BackupDesc2=* Guardar o conteúdo da pasta de documentos (%s) que contém todos os Arquivos enviados o gerados (em um zip, por Exemplo). BackupDesc3=* Guardar o conteúdo de a sua base de dados em um Arquivo de despejo. Para ele pode utilizar o assistente a continuação. @@ -976,9 +671,8 @@ RestoreDesc=Para restaurar uma Cópia de segurança de Dolibarr, voçê deve: RestoreDesc2=* Tomar o Arquivo (Arquivo zip, por Exemplo) da pasta dos documentos e Descompactá-lo na pasta dos documentos de uma Nova Instalação de Dolibarr diretorio o na pasta dos documentos desta Instalação (%s). RestoreDesc3=* Recargar o Arquivo de despejo guardado na base de dados de uma Nova Instalação de Dolibarr o desta Instalação. Atenção, uma vez realizada a Restaurar, deverá utilizar um login/senha de administrador existente ao momento da Cópia de segurança para conectarse. Para restaurar a base de dados na Instalação atual, pode utilizar o assistente a continuação. RestoreMySQL=importar do MySQL -ForcedToByAModule= Esta regra é forçado a por um módulo ativado +ForcedToByAModule=Esta regra é forçado a por um módulo ativado PreviousDumpFiles=Arquivos de despejo de backup de banco de dados disponível -WeekStartOnDay=Primeiro dia da semana RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser exigido (Programas versão difere da versão do banco de dado) YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve executar este comando a partir da linha de comando após o login a um shell com o usuário ou você deve adicionar-W opção no final da linha de comando para fornece a senha. YourPHPDoesNotHaveSSLSupport=Funções SSL não disponíveis no seu PHP @@ -992,43 +686,30 @@ MenuUseLayout=Faça cardápio compativel vertical (opção javascript não deve MAIN_DISABLE_METEO=Desativar vista meteo TestLoginToAPI=Testar Acesso ao API ProxyDesc=Algumas características do Dolibarr precisa ter um acesso à Internet ao trabalho. Defina aqui os parâmetros para isso. Se o servidor Dolibarr está atrás de um servidor proxy, esses parâmetros diz Dolibarr como acessar Internet através dele. -ExternalAccess=Acesso externo MAIN_PROXY_USE=Usar um servidor proxy (caso contrário, o acesso direto a internet) MAIN_PROXY_HOST=Nome / Endereço do servidor proxy MAIN_PROXY_PORT=Porto de servidor proxy MAIN_PROXY_USER=Entre para usar o servidor proxy -MAIN_PROXY_PASS=Senha para usar o servidor proxy DefineHereComplementaryAttributes=Defina aqui todos os atributos, não já disponíveis por padrão, e que pretende ser apoiada por. -ExtraFields=Atributos complementares -ExtraFieldsLines=Atributos complementares (linhas) ExtraFieldsThirdParties=Atributos complementares (clientes) ExtraFieldsContacts=Atributos complementares (contato / endereço) -ExtraFieldsMember=Atributos complementares (membro) -ExtraFieldsMemberType=Atributos complementares (tipo de membro) ExtraFieldsCustomerOrders=Atributos complementares (ordens) -ExtraFieldsCustomerInvoices=Atributos complementares (faturas) ExtraFieldsSupplierOrders=Atributos complementares (ordens) -ExtraFieldsSupplierInvoices=Atributos complementares (faturas) -ExtraFieldsProject=Atributos complementares (projetos) -ExtraFieldsProjectTask=Atributos complementares (tarefas) ExtraFieldHasWrongValue=Atributo% s tem um valor errado. AlphaNumOnlyCharsAndNoSpace=apenas alfanuméricos caracteres sem espaço AlphaNumOnlyLowerCharsAndNoSpace=apenas alfanumérico e minúsculas, sem espaço SendingMailSetup=Configuração de envios por e-mail SendmailOptionNotComplete=Atenção, em alguns sistemas Linux, para enviar e-mail de seu e-mail, sendmail instalação execução must contém opção-ba (mail.force_extra_parameters parâmetros no seu arquivo php.ini). Se alguns destinatários não receber e-mails, tentar editar este parâmetro PHP com mail.force_extra_parameters =-ba). PathToDocuments=Rotas de acesso a documentos -PathDirectory=Catálogo SendmailOptionMayHurtBuggedMTA=Recurso para enviar e-mails usando o método "PHP mail direto" irá gerar uma mensagem de correio que pode não ser corretamente analisado por alguns servidores de correio de recepção. Resultado é que alguns e-mails não podem ser lidos por pessoas, alojadas pela thoose plataformas escutas. É caso para alguns provedores de Internet (Ex: Laranja na França). Este não é um problema em Dolibarr nem em PHP, mas para receber servidor de correio. No entanto, pode adicionar a opção MAIN_FIX_FOR_BUGGED_MTA a 1 no setup - outro para modificar Dolibarr para evitar isso. No entanto, você pode experimentar problemas com outros servidores que respeitem rigorosamente o padrão SMTP. A outra solução (recommanded) é usar o método de "biblioteca de tomada de SMTP" que não tem desvantagens. TranslationSetup=Configuração de tradução TranslationDesc=Escolha da língua visível na tela pode ser modificado: * A nível mundial a partir do menu strong Home - Setup - Exibição* Para o usuário apenas de guia de exibição do usuário de cartão de usuário (clique sobre o login no topo da tela). TotalNumberOfActivatedModules=Número total de módulos de recursos ativados: YouMustEnableOneModule=Você deve, pelo menos, permitir que um módulo ClassNotFoundIntoPathWarning=A classe não foi encontrado em caminho PHP -YesInSummer=Sim no verão OnlyFollowingModulesAreOpenedToExternalUsers=Note-se, apenas seguintes módulos são abertos a usuários externos (o que quer que sejam permissão desses usuários): SuhosinSessionEncrypt=Armazenamento de sessão criptografada pelo Suhosin ConditionIsCurrently=Condição é atualmente -TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível YouUseBestDriver=Você usa o driverque é o melhor driver disponível atualmente. YouDoNotUseBestDriver=Você usa drive mas recomendado. NbOfProductIsLowerThanNoPb=Você tem produtos / serviços somente no banco de dados. Isso não exigida qualquer otimização particular. @@ -1042,12 +723,9 @@ AddRefInList=Mostrar ao cliente / fornecedor ref em lista (lista ou combobox sel FieldEdition=Edição de campo FixTZ=Correção de fuso horário FillThisOnlyIfRequired=Exemplo: 2 (preencher somente se deslocamento de fuso horário problemas são experientes) -GetBarCode=Obter código de barras EmptyNumRefModelDesc=O código é livre. Este código pode ser modificado a qualquer momento. -##### Module password generation PasswordGenerationStandard=Devolve uma senha generada por o algoritmo interno Dolibarr: 8 caracteres, números e caracteres em minúsculas mescladas. PasswordGenerationNone=não oferece Senhas. a senha se introduce manualmente. -##### Users setup ##### UserGroupSetup=Configuração Módulo Usuários e Grupos GeneratePassword=Propor uma senha generada RuleForGeneratedPasswords=Norma para a geração das Senhas Propostas @@ -1056,33 +734,25 @@ EncryptedPasswordInDatabase=Permitir encriptação das Senhas na base de dados DisableForgetPasswordLinkOnLogonPage=não mostrar o link "senha esquecida" na página de login UsersSetup=Configuração do módulo Usuários UserMailRequired=EMail necessário para criar um novo usuário -##### Company setup ##### CompanySetup=configuração do módulo empresas CompanyCodeChecker=Módulo de geração e control dos códigos de Fornecedores (clientes/Fornecedores) AccountCodeManager=Módulo de geração dos códigos contabíls (clientes/Fornecedores) ModuleCompanyCodeAquarium=Devolve um código contabíl composto de %s seguido do código Fornecedor de provedor para o código contabíl de provedor, e %s seguido do código Fornecedor de cliente para o código contabíl de cliente. ModuleCompanyCodePanicum=Devolve um código contabíl vazio. ModuleCompanyCodeDigitaria=Devolve um código contabíl composto seguindo o código de Fornecedor. o código está formado por caracter0 ' C ' em primeiroa posição seguido dos 5 primeiroos caracteres do código Fornecedor. -UseNotifications=Usar Notificações -NotificationsDesc=a função das Notificações permite enviar automaticamente um correio eletrônico para um determinado evento Dolibarr em empresas configuradas para ele ModelModules=Modelos de documentos DocumentModelOdt=Gere documentos a partir de modelos OpenDocuments (. ODT ou. Arquivos ODS para OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Marca d'água sobre o projeto de documento +JSOnPaimentBill=Ative a função de preenchimento automático de linhas no formulário de pagamento CompanyIdProfChecker=Regras sobre profissional Ids -MustBeUnique=Deve ser exclusivo? MustBeMandatory=Obrigatório para criar terceiros? MustBeInvoiceMandatory=Obrigatório para validar faturas? -Miscellaneous=Diversos -##### Webcal setup ##### WebCalSetup=configuração de link com o calendário Webcalendar WebCalSyncro=Integrar os eventos Dolibarr em WebCalendar -WebCalAllways=Sempre, sem consultar WebCalYesByDefault=Consultar (sim por default) WebCalNoByDefault=Consultar (não por default) -WebCalNever=Nunca WebCalURL=endereço (URL) de acesso ao calendário WebCalServer=Servidor da base de dados do calendário -WebCalDatabaseName=Nome da base de dados WebCalUser=Usuário com acesso e a base WebCalSetupSaved=os dados de link são guardado corretamente. WebCalTestOk=A ligação ao servidor no banco de dados com o usuário de sucesso. @@ -1097,15 +767,11 @@ WebCalAddEventOnStatusBill=Adicionar evento ao calendário ao alterar destado da WebCalAddEventOnStatusMember=Adicionar evento ao calendário ao alterar destado dos Membros WebCalUrlForVCalExport=um link de exportação do calendário em formato %s estará disponível na url: %s WebCalCheckWebcalSetup=a configuração do módulo Webcal pode ser incorreta -##### Invoices ##### BillsSetup=configuração do módulo Faturas BillsDate=Data das faturas BillsNumberingModule=Módulo de numeração de faturas e entregas BillsPDFModules=Modelo de documento de faturas CreditNoteSetup=configuração do módulo entregas -CreditNotePDFModules=Modelo de documento de entregas -CreditNote=Entrega -CreditNotes=Entregas ForceInvoiceDate=Forçar a data de fatura e a data de validação DisableRepeatable=Desativar as faturas Repetitivas SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pagamento sugeridas para as faturas senão estão definidas explicitamente @@ -1114,85 +780,51 @@ SuggestPaymentByRIBOnAccount=Sugerenciar o pagamento por transfência em conta SuggestPaymentByChequeToAddress=Sugerenciar o pagamento por cheque a FreeLegalTextOnInvoices=Texto livre em faturas WatermarkOnDraftInvoices=Marca d'água sobre o projeto de faturas (nenhum se estiver vazio) -##### Proposals ##### PropalSetup=configuração do módulo Orçamentos CreateForm=criação formulário -NumberOfProductLines=Numero de linhas de produtos -ProposalsNumberingModules=Módulos de numeração de Orçamentos -ProposalsPDFModules=Modelos de documentos de Orçamentos ClassifiedInvoiced=Classificar faturado HideTreadedPropal=Ocultar os Orçamentos processados do listado AddShippingDateAbility=possibilidade de determinar uma data de entregas AddDeliveryAddressAbility=possibilidade de selecionar uma endereço de envio UseOptionLineIfNoQuantity=uma linha de produto/serviço que tem uma quantidade nula se considera como uma Opção -FreeLegalTextOnProposal=Texto livre em Orçamentos WatermarkOnDraftProposal=Marca d'água em projetos de propostas comerciais (nenhum se estiver vazio) -##### Orders ##### OrdersSetup=configuração do módulo pedidos -OrdersNumberingModules=Módulos de numeração dos pedidos OrdersModelModule=Modelos de documentos de pedidos HideTreadedOrders=Esconder as ordens tratados ou cancelados na lista -ValidOrderAfterPropalClosed=Confirmar o pedido depois de fechar o orçamento, permite não passar por um pedido provisório -FreeLegalTextOnOrders=Texto livre em pedidos WatermarkOnDraftOrders=Marca d'água em projetos de ordem (nenhum se estiver vazio) -##### Clicktodial ##### ClickToDialSetup=configuração do módulo Click To Dial ClickToDialUrlDesc=Url de chamada fazendo click ao ícone telefone.
    a 'url completa chamada será: URL?login -##### Bookmark4u ##### Bookmark4uSetup=configuração do módulo Bookmark4u -##### Interventions ##### InterventionsSetup=configuração do módulo Intervenções FreeLegalTextOnInterventions=Texto livre em documentos de intervenção -FicheinterNumberingModules=Módulos de numeração das fichas de intervenção -TemplatePDFInterventions=Modelo de documentos das fichas de intervenção WatermarkOnDraftInterventionCards=Marca d'água em documentos de cartão de intervenção (nenhum se estiver vazio) -##### Contracts ##### -ContractsSetup=Configuração do módulo Contratos ContractsNumberingModules=Contratos numeração módulos TemplatePDFContracts=Modelos de documentos Contratos FreeLegalTextOnContracts=Texto livre em contratos WatermarkOnDraftContractCards=Marca d'água em projetos de contratos (nenhum se estiver vazio) -##### Members ##### MembersSetup=configuração do módulo associações MemberMainOptions=opções principales AddSubscriptionIntoAccount=Registar honorários em conta bancaria ou Caixa do módulo bancario -AdherentLoginRequired= Gerenciar um login para cada membro AdherentMailRequired=E-Mail obrigatório para criar um membro novo MemberSendInformationByMailByDefault=Caixa de verificação para enviar o correio de confirmação a os Membros é por default "sí" -##### LDAP setup ##### LDAPSetup=Configuracón do módulo LDAP -LDAPGlobalParameters=parâmetros globais LDAPUsersSynchro=Usuário -LDAPGroupsSynchro=Grupos LDAPContactsSynchro=Contatos -LDAPMembersSynchro=Membros LDAPSynchronization=sincronização LDAP LDAPFunctionsNotAvailableOnPHP=as funções LDAP não estão disponíveis na sua PHP LDAPToDolibarr=LDAP -> Dolibarr DolibarrToLDAP=Dolibarr -> LDAP -LDAPNamingAttribute=Chave em LDAP LDAPSynchronizeUsers=sincronização dos Usuários Dolibarr com LDAP LDAPSynchronizeGroups=sincronização dos grupos de Usuários Dolibarr com LDAP LDAPSynchronizeContacts=sincronização dos contatos Dolibarr com LDAP LDAPSynchronizeMembers=sincronização dos Membros do módulo associações de Dolibarr com LDAP LDAPTypeExample=OpenLdap, Egroupware o Active Diretory -LDAPPrimaryServer=Servidor primario -LDAPSecondaryServer=Servidor secundario -LDAPServerPort=Porta do servidor LDAPServerPortExample=Porta por default : 389 -LDAPServerProtocolVersion=Versão de protocolo LDAPServerUseTLS=Usuário TLS LDAPServerUseTLSExample=a sua servidor utiliza TLS -LDAPServerDn=DN do servidor -LDAPAdminDn=DN do administrador -LDAPAdminDnExample=DN completo (ej: cn LDAPPassword=senha do administrador LDAPUserDn=DN dos Usuário -LDAPUserDnExample=DN completo (ej: ou -LDAPGroupDn=DN dos grupos -LDAPGroupDnExample=DN completo (ej: ou LDAPServerExample=endereço do servidor (ej: localhost, 192.168.0.2, ldaps://ldap.example.com/) -LDAPServerDnExample=DN completo (ej: dc LDAPPasswordExample=senha do administrador LDAPDnSynchroActive=Sincronização de Usuários e Grupos LDAPDnSynchroActiveExample=sincronização LDAP vers Dolibarr ó Dolibarr vers LDAP @@ -1202,25 +834,13 @@ LDAPDnContactActiveExample=sincronização ativada/desativada LDAPDnMemberActive=sincronização dos Membros LDAPDnMemberActiveExample=sincronização ativada/desativada LDAPContactDn=DN dos contatos Dolibarr -LDAPContactDnExample=DN completo (ej: ou -LDAPMemberDn=DN dos Membros -LDAPMemberDnExample=DN completo (ex: ou -LDAPMemberObjectClassList=Lista de objectClass LDAPMemberObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active diretory) -LDAPUserObjectClassList=Lista de objectClass LDAPUserObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active diretory) -LDAPGroupObjectClassList=Lista de objectClass -LDAPGroupObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,groupOfUniqueNames) -LDAPContactObjectClassList=Lista de objectClass LDAPContactObjectClassListExample=Lista de objectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active diretory) -LDAPMemberTypeDn=DN dos tipos de Membros -LDAPMemberTypeDnExample=DN complet (ej: ou LDAPTestConnect=Teste a login LDAP LDAPTestSynchroContact=Teste a sincronização de contatos LDAPTestSynchroUser=Teste a sincronização de Usuário -LDAPTestSynchroGroup=Teste a sincronização de grupos -LDAPTestSynchroMember=Teste a sincronização de Membros -LDAPTestSearch= Teste uma pesquisa LDAP +LDAPTestSearch=Teste uma pesquisa LDAP LDAPSynchroOK=Prueba de sincronização realizada corretamente LDAPSynchroKO=Prueba de sincronização errada LDAPSynchroKOMayBePermissions=Error da prueba de sincronização. verifique que a login à servidor sea correta e que permite as atualizaciones LDAP @@ -1229,62 +849,31 @@ LDAPTCPConnectKO=Fallo de login TCP à servidor LDAP (Servidor LDAPBindOK=Ligue / authentificate ao servidor LDAP sucesso (Server =% s, Port =% s, Admin =% s, Password =% s) LDAPBindKO=Fallo de login/autentificação à servidor LDAP (Servidor LDAPUnbindSuccessfull=Desconecte sucesso -LDAPUnbindFailed=Saida falhada LDAPConnectToDNSuccessfull=login a DN (%s) realizada LDAPConnectToDNFailed=Connexión a DN (%s) falhada -LDAPSetupForVersion3=Servidor LDAP configurado em Versão 3 -LDAPSetupForVersion2=Servidor LDAP configurado em Versão 2 LDAPDolibarrMapping=Mapping Dolibarr -LDAPLdapMapping=Mapping LDAP -LDAPFieldLoginUnix=Login (unix) -LDAPFieldLoginExample=Exemplo : uid -LDAPFilterConnection=Filtro de pesquisa -LDAPFilterConnectionExample=Exemplo : &(objectClass -LDAPFieldLoginSamba=Login (samba, activedirectory) LDAPFieldLoginSambaExample=Exemplo : samaccountname -LDAPFieldFullname=Nome completo -LDAPFieldFullnameExample=Exemplo : cn LDAPFieldPassword=senha LDAPFieldPasswordNotCrypted=senha não encriptada LDAPFieldPasswordCrypted=senha encriptada -LDAPFieldPasswordExample=Exemplo : userPassword -LDAPFieldCommonName=Nome comun -LDAPFieldCommonNameExample=Exemplo : cn -LDAPFieldName=Nome -LDAPFieldNameExample=Exemplo : sn -LDAPFieldFirstName=Nome LDAPFieldFirstNameExample=Exemplo : givenname -LDAPFieldMail=E-Mail -LDAPFieldMailExample=Exemplo : mail LDAPFieldPhone=telefone Trabalho LDAPFieldPhoneExample=Exemplo : telephonenumber LDAPFieldHomePhone=telefone personal LDAPFieldHomePhoneExample=Exemplo : homephone LDAPFieldMobile=telefone móvil LDAPFieldMobileExample=Exemplo : mobile -LDAPFieldFax=Fax LDAPFieldFaxExample=Exemplo : facsimiletelephonenumber LDAPFieldAddress=endereço LDAPFieldAddressExample=Exemplo : street LDAPFieldZip=Código Postal LDAPFieldZipExample=Exemplo : postalcode LDAPFieldTown=Município -LDAPFieldTownExample=Exemplo : l -LDAPFieldCountry=País -LDAPFieldCountryExample=Exemplo : c -LDAPFieldDescription=Descrição LDAPFieldDescriptionExample=Exemplo : description -LDAPFieldGroupMembers= Os membros do grupo -LDAPFieldGroupMembersExample= Exemplo: uniqueMember +LDAPFieldGroupMembersExample=Exemplo: uniqueMember LDAPFieldBirthdate=data de nascimento -LDAPFieldBirthdateExample=Exemplo : -LDAPFieldCompany=Empresa -LDAPFieldCompanyExample=Exemplo : o -LDAPFieldSid=SID LDAPFieldSidExample=Exemplo : objectsid LDAPFieldEndLastSubscription=data finalização como membro -LDAPFieldTitle=Posto/Função -LDAPFieldTitleExample=Exemplo: título LDAPParametersAreStillHardCoded=Parâmetros LDAP ainda são codificados (na classe de contato) LDAPSetupNotComplete=configuração LDAP incompleta (a completar em Outras pestanhas) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o senha não indicados. os acessos LDAP serão anônimos e em só leitura. @@ -1293,7 +882,6 @@ LDAPDescUsers=Esta página permite definir o Nome dos atributos da árvore LDAP LDAPDescGroups=Esta página permite definir o Nome dos atributos da árvore LDAP para cada informação dos grupos Usuários Dolibarr. LDAPDescMembers=Esta página permite definir o Nome dos atributos da árvore LDAP para cada informação dos Membros do módulo associações Dolibarr. LDAPDescValues=os valores de Exemplos se adaptan a OpenLDAP com os schemas carregados: core.schema, cosine.schema, inetorgperson.schema). sim voçê utiliza os a valores sugeridos e OpenLDAP, modifique a sua arquivo de configuração LDAP slapd.conf para tener todos estos schemas ativos. -ForANonAnonymousAccess=Para um acesso autentificado PerfDolibarr=Relatório de configuração Desempenho / otimização YouMayFindPerfAdviceHere=Você vai encontrar nesta página algumas verificações ou conselhos relacionados com o desempenho. NotInstalled=Não instalado, por que o seu servidor não está mais lento por isso. @@ -1311,8 +899,6 @@ FilesOfTypeNotCompressed=Arquivos do tipo não são compactados pelo servidor HT CacheByServer=Cache por servidor CacheByClient=Cache pelo navegador CompressionOfResources=A compressão das respostas HTTP -TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível -##### Products ##### ProductSetup=configuração do módulo produtos ServiceSetup=Configuração do módulo Serviços ProductServiceSetup=Configuração de Produtos e Serviços módulos @@ -1326,95 +912,52 @@ UseSearchToSelectProduct=Use um formulário de pesquisa para escolher um produto UseEcoTaxeAbility=Asumir ecotaxa (DEEE) SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por default para os produtos SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por default para os Fornecedores -ProductCodeChecker= Módulo para geração de código do produto e verificação (produto ou serviço) -ProductOtherConf= A configuração do produto / serviço -##### Syslog ##### -SyslogSetup=configuração do módulo Syslog +ProductCodeChecker=Módulo para geração de código do produto e verificação (produto ou serviço) +ProductOtherConf=A configuração do produto / serviço SyslogOutput=Saída do log -SyslogSyslog=Syslog -SyslogFacility=Facilidade SyslogLevel=Nível SyslogSimpleFile=Arquivo SyslogFilename=Nome e Rota do Arquivo YouCanUseDOL_DATA_ROOT=pode utilizar DOL_DATA_ROOT/dolibarr.log para um log na pasta 'documentos' de Dolibarr. ErrorUnknownSyslogConstant=a constante %s não é uma constante syslog conhecida OnlyWindowsLOG_USER=Somente para Windows suporta LOG_USER -##### Donations ##### DonationsSetup=configuração do módulo Bolsas -DonationsReceiptModel=Modelo de recibo de doação -##### Barcode ##### BarcodeSetup=configuração dos códigos de barra -PaperFormatModule=Módulos de formatos de impressão BarcodeEncodeModule=Módulos de codificação dos códigos de barra -UseBarcodeInProductModule=Utilizar os códigos de barra nos produtos CodeBarGenerator=gerador do código ChooseABarCode=nenhum gerador selecionado -FormatNotSupportedByGenerator=Formato não gerado por este gerador BarcodeDescEAN8=Códigos de barra tipo EAN8 BarcodeDescEAN13=Códigos de barra tipo EAN13 BarcodeDescUPC=Códigos de barra tipo UPC BarcodeDescISBN=Códigos de barra tipo ISBN BarcodeDescC39=Códigos de barra tipo C39 BarcodeDescC128=Códigos de barra tipo C128 -GenbarcodeLocation=Ferramenta de geração de código de barras em linha de pedido (utilizado por o motor phpbar para determinados tipos de códigos barra) -BarcodeInternalEngine=Motor interno BarCodeNumberManager=Gerente de auto definir números de código de barras -##### Prelevements ##### WithdrawalsSetup=configuração do módulo Débitos Diretos -##### ExternalRSS ##### ExternalRSSSetup=configuração das importações do fluxos RSS NewRSS=Sindicação de um Novo fluxos RSS RSSUrl=RSS URL -RSSUrlExample=Um feed RSS interessante -##### Mailing ##### -MailingSetup=configuração do módulo E-Mailing -MailingEMailFrom=E-Mail emissor (From) dos correios enviados por E-Mailing MailingEMailError=Voltar E-mail (Erros-to) para e-mails com erros -##### Notification ##### -NotificationSetup=configuração do módulo Notificações -NotificationEMailFrom=E-Mail emissor (From) dos correios enviados a traves de Notificações -ListOfAvailableNotifications=Lista de notificações disponíveis (Esta lista depende módulos ativados) -##### Sendings ##### +NotificationSetup=Configuração do módulo de notificações por e-mail SendingsSetup=configuração do módulos envios -SendingsReceiptModel=Modelo da ficha de expedição SendingsNumberingModules=Expedição de numeração de módulos SendingsAbility=Fretes pagos pelo cliente NoNeedForDeliveryReceipts=na maioria dos casos, as entregas utilizam como nota de entregas ao cliente (lista de produtos a enviar), se recebem e assinam por o cliente. Por o tanto, a hoja de entregas de produtos é uma característica duplicada e rara vez é ativada. -FreeLegalTextOnShippings=Texto livre em embarques -##### Deliveries ##### -DeliveryOrderNumberingModules=Módulo de numeração dos envios a clientes DeliveryOrderModel=Modelo de ordem de envio DeliveriesOrderAbility=Fretes pagos por o cliente -FreeLegalTextOnDeliveryReceipts=Texto livre em notas de entregas. -##### FCKeditor ##### AdvancedEditor=Formatação avançada ActivateFCKeditor=Ativar FCKeditor para : FCKeditorForCompany=Criação/Edição WYSIWIG da descrição e notas dos Fornecedores -FCKeditorForProduct=Criação/Edição WYSIWIG da descrição e notas dos produtos/serviços FCKeditorForProductDetails=Criação/Edição WYSIWIG das linhas de detalhe dos produtos (em pedidos, Orçamentos, faturas, etc.) -FCKeditorForMailing= Criação/Edição WYSIWIG dos E-Mails FCKeditorForUserSignature=WYSIWIG criação / edição da assinatura do usuário FCKeditorForMail=Criação WYSIWIG / edição para todos os emails (exceto Outils-> e-mail) -##### OSCommerce 1 ##### OSCommerceErrorConnectOkButWrongDatabase=a login se ha estabelecido, mas a base de dados não parece de OSCommerce. OSCommerceTestOk=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' é correta. OSCommerceTestKo1=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' não se pode efetuar. OSCommerceTestKo2=a login à servidor '%s' por o Usuário '%s' ha falhado. -##### Stock ##### -StockSetup=configuração do módulo Estoque -UserWarehouse=Utilizar os estoques personais de Usuário -##### Menu ##### -MenuDeleted=Menu Eliminado -TreeMenu=Estructura dos menus -Menus=Menus -TreeMenuPersonalized=Menus personalizados -NewMenu=Novo Menu -MenuConf=Configuração dos menus Menu=Seleção dos menus MenuHandler=Gerente de menus -MenuModule=Módulo origem -HideUnauthorizedMenu= Esconder menus não autorizadas (cinza) -DetailId=Identificador do menu +HideUnauthorizedMenu=Esconder menus não autorizadas (cinza) DetailMenuHandler=Nome do gerente de menus DetailMenuModule=Nome do módulo sim a entrada do menu é resultante de um módulo DetailType=Tipo de menu (superior o izquierdp) @@ -1425,36 +968,25 @@ DetailLeftmenu=Condição de visualização o não (obsoleto) DetailEnabled=Condição para mostrar ou não entrada DetailRight=Condição de visualização completa o cristálida DetailLangs=Arquivo langs para a tradução do título -DetailUser=Interno / Externo / Todos -Target=Alvo DetailTarget=Objetivo DetailLevel=Nível (-1:menu superior, 0:principal, >0 menu e submenú) -ModifMenu=Modificação do menu -DeleteMenu=Eliminar entrada de menu ConfirmDeleteMenu=Tem certeza que quer eliminar a entrada de menu %s ? DeleteLine=Apagar a Linha ConfirmDeleteLine=Tem certeza que quer eliminar esta linha? -##### Tax ##### -TaxSetup=Configuração do Módulo Impostos, Cargas Sociais e Dividendos OptionVatMode=Opção de carga de ICMS -OptionVATDefault=Cash basis -OptionVATDebitOption=Accrual basis +OptionVATDefault=Regime de caixa +OptionVATDebitOption=Regime de competência OptionVatDefaultDesc=a carga do ICMS é:
    -ao envio dos bens
    -sobre o pagamento por os serviços OptionVatDebitOptionDesc=a carga do ICMS é:
    -ao envio dos bens
    -sobre o faturamento dos serviços SummaryOfVatExigibilityUsedByDefault=Hora do VTA exigibilidade por padrão de acordo com a opção escolhida: -OnDelivery=Na entrega OnPayment=Mediante o pagamento OnInvoice=Na fatura SupposedToBePaymentDate=Data de pagamento usado SupposedToBeInvoiceDate=Data da fatura usado -Buy=Comprar -Sell=Vender InvoiceDateUsed=Data da fatura usado YourCompanyDoesNotUseVAT=Sua empresa foi definido para não usar de IVA (Home - Configuração - Empresa / Fundação), então não há nenhuma opção de VAT a configuração. -AccountancyCode=Código de Contabilidade AccountancyCodeSell=Conta Venda. código AccountancyCodeBuy=Compre conta. código -##### Agenda ##### AgendaSetup=Módulo configuração de ações e agenda PasswordTogetVCalExport=Chave de autorização vcal export link PastDelayVCalExport=Não exportar evento mais antigo que @@ -1462,67 +994,49 @@ AGENDA_USE_EVENT_TYPE=Use eventos tipos (geridos em Setup Menu -> Dicionário -> AGENDA_DEFAULT_FILTER_TYPE=Use automaticamente este tipo de evento no filtro de busca da agenda AGENDA_DEFAULT_FILTER_STATUS=Use automaticamente este estado no filtro das buscas da agenda AGENDA_DEFAULT_VIEW=Qual aba voçê quer abrir por padrão quando o menu Agenda e selecionado -##### ClickToDial ##### ClickToDialDesc=Este módulo permite agregar um ícone depois do número de telefone de contatos Dolibarr. um clic neste ícone, Chama a um servidor com uma URL que se indica a continuação. Esto pode ser usado para Chamar à sistema call center de Dolibarr que pode Chamar à número de telefone em um sistema SIP, por Exemplo. -##### Point Of Sales (CashDesk) ##### -CashDesk=Caixa CashDeskSetup=configuração do módulo de Caixa registradora -CashDeskThirdPartyForSell=Fornecedor genérico a usar para a venda CashDeskBankAccountForSell=conta de efetivo que se utilizará para as vendas -CashDeskBankAccountForCheque= Padrão conta para usar a receber pagamentos por cheque -CashDeskBankAccountForCB= Padrão conta para usar a receber pagamentos por cartões de crédito -CashDeskIdWareHouse=Almoxarifado que se utiliza para as vendas -##### Bookmark ##### +CashDeskBankAccountForCheque=Padrão conta para usar a receber pagamentos por cheque +CashDeskBankAccountForCB=Padrão conta para usar a receber pagamentos por cartões de crédito BookmarkSetup=Configuração do Módulo de Favoritos BookmarkDesc=Este módulo lhe permite Gerenciar os links e acessos diretos. também permite Adicionar qualquer página de Dolibarr o link web ao menu de acesso rápido da esquerda. NbOfBoomarkToShow=Número máximo de marcadores que se mostrará ao menu -##### WebServices ##### WebServicesSetup=Configuração do módulo Webservices WebServicesDesc=Ao habilitar este módulo, Dolibarr se tornar um servidor web service para fornecer serviços web diversos. WSDLCanBeDownloadedHere=Arquivos descritores WSDL dos serviços prestados pode ser baixado aqui EndPointIs=Clientes SOAP devem enviar seus pedidos para o terminal Dolibarr Disponível em URL -##### Bank ##### BankSetupModule=Configuração do módulo Banco FreeLegalTextOnChequeReceipts=Texto livre em recibos de verificação BankOrderShow=Ordem de apresentação das contas bancárias para os países usando o "número do banco detalhada" BankOrderGlobal=General -BankOrderGlobalDesc=Ordem de exibição Geral BankOrderES=Espanhol BankOrderESDesc=Ordem de exibição Espanhol -##### Multicompany ##### MultiCompanySetup=Configuração do módulo Multi-empresa -##### Suppliers ##### SuppliersSetup=Configuração Módulo Fornecedor SuppliersCommandModel=Modelo completo de ordem fornecedor (logo. ..) SuppliersInvoiceModel=Modelo completo da fatura do fornecedor (logo. ..) SuppliersInvoiceNumberingModel=Faturas de fornecedores de numeração modelos -##### GeoIPMaxmind ##### GeoIPMaxmindSetup=Configuração do módulo GeoIP Maxmind PathToGeoIPMaxmindCountryDataFile=Caminho para o arquivo que contém a tradução Maxmind ip país. Exemplos: / Usr / local / share / GeoIP / GeoIP.dat / Usr / share / GeoIP / GeoIP.dat NoteOnPathLocation=Note-se que o seu ip para o arquivo de dados do país devem estar dentro de um diretório do seu PHP pode ler (Verifique se o seu PHP open_basedir configuração e as permissões do sistema de arquivos). YouCanDownloadFreeDatFileTo=Você pode baixar uma versão demo gratuita do arquivo país Maxmind GeoIP em. YouCanDownloadAdvancedDatFileTo=Você também pode baixar uma versão,mais completa, com atualizações, do arquivo país em Maxmind GeoIP. TestGeoIPResult=Teste de um IP de conversão -> país -##### Projects ##### ProjectsNumberingModules=Projetos de numeração módulo ProjectsSetup=Configuração do módulo de Projetos ProjectsModelModule=Os relatórios do projeto modelo de documento TasksNumberingModules=Módulo de numeração de Tarefas TaskModelModule=Relatórios Tarefas modelo de documento -##### ECM (GED) ##### -ECMSetup = Instalar GED -ECMAutoTree = Pasta árvore automática e documento -##### Fiscal Year ##### +ECMSetup =Instalar GED +ECMAutoTree =Pasta árvore automática e documento FiscalYears=Anos fiscais FiscalYear=Ano fiscal FiscalYearCard=Ficha ano fiscal -NewFiscalYear=Novo ano fiscal EditFiscalYear=Editar ano fiscal OpenFiscalYear=Abrir ano fiscal CloseFiscalYear=Fechar ano fiscal DeleteFiscalYear=Remover ano fiscal ConfirmDeleteFiscalYear=Voçê tem certeza que quer deleitar este ano fical ? -Opened=Aberto -Closed=Fechado - Format=Formato +TypePaymentDesc=0: Pagamento para Cliente, 1: Pagamento para Fornecedor, 2: Pagamentos para Clientes e Fornecedores diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang index 360b037d5e2..e6bf3c55b2a 100644 --- a/htdocs/langs/pt_BR/agenda.lang +++ b/htdocs/langs/pt_BR/agenda.lang @@ -2,85 +2,71 @@ IdAgenda=ID evento Actions=Eventos ActionsArea=Área de eventos (Atividades e Tarefas) -Agenda= Agenda -Agendas= Agendas -Calendar= Calendário -Calendars= Calendários -LocalAgenda=Calendário local -AffectedTo= Atribuído à -DoneBy= Concluído por -Events= Eventos +LocalAgenda=Calendário interno +ActionsOwnedBy=Evento de propriedade do +DoneBy=Concluído por +Event=Evento EventsNb=Numero de eventos -MyEvents=Meus eventos -OtherEvents=Outros eventos -ListOfActions=Lista de Eventos -Location=Localização EventOnFullDay=Evento durante todo o dia (s) -SearchAnAction= Procurar um evento/tarefa -MenuToDoActions= Todos os eventos incompletos -MenuDoneActions= Todas os eventos completos -MenuToDoMyActions= Os meus eventos incompletas -MenuDoneMyActions= Os meus eventos completos -ListOfEvents= Lista de eventos Dolibarr +SearchAnAction=Procurar um evento/tarefa +MenuToDoActions=Todos os eventos incompletos +MenuDoneActions=Todas os eventos completos +MenuToDoMyActions=Os meus eventos incompletas +MenuDoneMyActions=Os meus eventos completos +ListOfEvents=Lista de eventos (calendário interno) ActionsAskedBy=Eventos registrados por ActionsToDoBy=Eventos atribuídos à ActionsDoneBy=Eventos concluído por ActionsForUser=Eventos para o usuário ActionsForUsersGroup=Eventos para todos os usuários do grupo -AllMyActions= Todos meus eventos/tarefas -AllActions= Todas os eventos/tarefas +AllMyActions=Todos meus eventos/tarefas +AllActions=Todas os eventos/tarefas ViewList=Exibir lista ViewCal=Exibir Calendário ViewDay=Exibir dia ViewWeek=Exibir semana -ViewPerUser=Por usuario -ViewWithPredefinedFilters= Exibir com filtros predefinidos -AutoActions= Preenchimento automático -AgendaAutoActionDesc= Defina aqui quais os eventos que deseja que o Dolibarr adicione automaticamente na sua agenda. Se nada estiver marcado (por padrão), sera incluído só eventos manualmente na agenda. -AgendaSetupOtherDesc= Esta página fornece opções para permitir a exportação de seus eventos do Dolibarr para um calendário externo (thunderbird, google agenda, ...) +ViewPerUser=Visão do usuário +ViewWithPredefinedFilters=Exibir com filtros predefinidos +AgendaAutoActionDesc=Defina aqui quais os eventos que deseja que o Dolibarr adicione automaticamente na sua agenda. Se nada estiver marcado (por padrão), sera incluído só eventos manualmente na agenda. +AgendaSetupOtherDesc=Esta página fornece opções para permitir a exportação de seus eventos do Dolibarr para um calendário externo (thunderbird, google agenda, ...) AgendaExtSitesDesc=Esta página permite importar calendários de fontes externas para sua agenda de eventos no Dolibarr. -ActionsEvents= Para qual eventos o Dolibarr irá criar uma atividade na agenda automaticamente -PropalValidatedInDolibarr= Proposta %s validada -InvoiceValidatedInDolibarr= Fatura %s validada +ActionsEvents=Para qual eventos o Dolibarr irá criar uma atividade na agenda automaticamente +PropalValidatedInDolibarr=Proposta %s validada +InvoiceValidatedInDolibarr=Fatura %s validada InvoiceBackToDraftInDolibarr=Fatura %s volta ao estado de rascunho -InvoiceDeleteDolibarr=Fatura %s apagada -OrderValidatedInDolibarr= Pedido %s validado +OrderValidatedInDolibarr=Pedido %s validado OrderApprovedInDolibarr=Pedido %s aprovado OrderRefusedInDolibarr=Pedido %s recusado OrderBackToDraftInDolibarr=Pedido %s volta ao estado de rascunho OrderCanceledInDolibarr=Pedido %s cancelado -InterventionValidatedInDolibarr=Intervenção %s validada ProposalSentByEMail=Proposta comercial %s enviada por e-mail OrderSentByEMail=Pedido do cliente %s enviado por e-mail InvoiceSentByEMail=Fatura do cliente %s enviada por e-mail SupplierOrderSentByEMail=Pedido do fornecedor %s enviado por e-mail SupplierInvoiceSentByEMail=Fatura do fornecedor %s enviada por e-mail ShippingSentByEMail=Entrega %s enviado por e-mail -ShippingValidated= Envio %s validado -InterventionSentByEMail=Intervenção %s enviada por e-mail -InterventionClassifiedBilled=Intervenção %s classificada como Faturada -NewCompanyToDolibarr= Fornecedor criado -DateActionPlannedStart= Data de início do planejamento -DateActionPlannedEnd= Data final do planejamento -DateActionDoneStart= Data real de início -DateActionDoneEnd= Data real de fim -DateActionStart= Data de Início -DateActionEnd= Data de término +ShippingValidated=Envio %s validado +NewCompanyToDolibarr=Fornecedor criado +DateActionPlannedStart=Data de início do planejamento +DateActionPlannedEnd=Data final do planejamento +DateActionDoneStart=Data real de início +DateActionDoneEnd=Data real de fim +DateActionEnd=Data de término AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros para filtrar o resultado: AgendaUrlOptions2=Usuário=%s permitir apenas resultados para atividades atribuídas, criadas ou concluídas pelo usuário %s. -AgendaUrlOptions3=Usuário=%s permitir resultados apenas para atividades criadas pelo usuário %s +AgendaUrlOptions3=logina=%s para restringir açoes de propriedade do usuario %s. AgendaUrlOptions4=Usuário=%s permitir apenas resultados para atividades atribuídas ao usuário %s. -AgendaUrlOptions5=Usuário=%s não permitir resultados para atividades concluídas pelo usuário %s. +AgendaUrlOptionsProject=project=PROJECT_ID para restringir a saida de açoes associadas ao projeto PROJECT_ID. AgendaShowBirthdayEvents=Visualizar aniversários dos contatos AgendaHideBirthdayEvents=Esconder aniversários dos contatos -Busy=Ocupado ExportDataset_event1=Lista de eventos na agenda - -# External Sites ical -ExportCal=Exportar calendário -ExtSites=Importar calendários externos -ExtSitesEnableThisTool=Visualizar calendários externos na agenda -ExtSitesNbOfAgenda=Número de calendários +DefaultWorkingDays=Padrão dias úteis por semana (Exemplo: 1-5, 1-6) +DefaultWorkingHours=Padrão horas de trabalho em dia (Exemplo: 9-18) +ExtSitesEnableThisTool=Mostrar calendários externos (definidos na configuração global) na agenda. Não afeta calendários externos definidos pelos usuários. AgendaExtNb=Calendário nr. %s ExtSiteUrlAgenda=URL para acessar arquivos .ical ExtSiteNoLabel=Sem descrição +WorkingTimeRange=Intervalo de tempo trabalhado +WorkingDaysRange=Intervalo de dias trabalhado +AddEvent=Criar evento +MyAvailability=Minha disponibilidade diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang index f66ea39964d..90bb4e1584c 100644 --- a/htdocs/langs/pt_BR/banks.lang +++ b/htdocs/langs/pt_BR/banks.lang @@ -1,11 +1,7 @@ # Dolibarr language file - Source file is en_US - banks -Bank=Banco -Banks=Bancos MenuBankCash=Banco/Caixa MenuSetupBank=Configuração Banco/Caixa BankName=Nome do Banco -FinancialAccount=Conta -FinancialAccounts=Contas BankAccount=Conta Bancaria BankAccounts=Contas Bancarias AccountRef=Ref. Conta Financeira @@ -18,59 +14,38 @@ CurrentAccounts=Contas Correntes SavingAccount=Conta a Prazo SavingAccounts=Contas a Prazo ErrorBankLabelAlreadyExists=Etiqueta de Conta Financeira já existente -BankBalance=Saldo BankBalanceBefore=Sldo anterior BankBalanceAfter=Saldo depois -BalanceMinimalAllowed=Saldo Máximo Autorizado -BalanceMinimalDesired=Saldo Mínimo Desejado -InitialBankBalance=Saldo Inicial -EndBankBalance=Saldo Final CurrentBalance=Saldo atual -FutureBalance=Saldo Previsto ShowAllTimeBalance=Mostrar Balanço Desde do Inicio AllTime=Do inicio -Reconciliation=Conciliação RIB=Conta Bancaria -IBAN=Identificador IBAN -BIC=Identificador BIC/SWIFT StandingOrders=Débitos Diretos StandingOrder=Domicilio -Withdrawals=Reembolsos -Withdrawal=Reembolso AccountStatement=Extrato da Conta AccountStatementShort=Extrato AccountStatements=Extratos das Contas LastAccountStatements=�ltimos Extratos Bancários -Rapprochement=Conciliação IOMonthlyReporting=Relatório Mensal E/S BankAccountDomiciliation=Domicilio de Conta BankAccountCountry=Conta do pais BankAccountOwner=Nome do Proprietário da Conta BankAccountOwnerAddress=Endereço do Proprietário da Conta RIBControlError=Se a integridade das verificações de valores falhar. Isto significa que informações para este número de conta não estão completos ou errados (verifique País, números e IBAN). -CreateAccount=Criar Conta -NewAccount=Nova Conta NewBankAccount=Nova Conta Bancaria NewFinancialAccount=Nova Conta Financeira MenuNewFinancialAccount=Nova Conta Financeira NewCurrentAccount=Nova Conta Corrente NewSavingAccount=Nova Conta de a Prazo -NewCashAccount=Nova Conta de Caixa -EditFinancialAccount=Edição Conta -AccountSetup=Configuração das Contas financeiras SearchBankMovement=Procurar Registo Bancario -Debts=Dívidas LabelBankCashAccount=Etiqueta da Conta ou Caixa -AccountType=Tipo de Conta BankType0=Conta Bancaria a Prazo BankType1=Conta Bancaria Corrente BankType2=Conta Caixa/Efetivo IfBankAccount=Se a Conta Bancária AccountsArea=Área das Contas AccountCard=Ficha da Conta -DeleteAccount=Apagar Conta ConfirmDeleteAccount=Tem certeza que quer eliminar esta Conta? -Account=Conta ByCategories=Por Categorias ByRubriques=Por Rúbricas BankTransactionByCategories=Registros bancários por rúbricas @@ -84,25 +59,15 @@ SearchTransaction=Procurar Registo ListTransactions=Lista Transações ListTransactionsByCategory=Lista Transações/Categoria TransactionsToConciliate=Registros a Conciliar -Conciliable=Conciliável -Conciliate=Conciliar -Conciliation=Conciliação -ConciliationForAccount=Conciliações nesta Conta IncludeClosedAccount=Incluir Contas Fechadas OnlyOpenedAccount=Somente Contas Abertas AccountToCredit=Conta de Crédito AccountToDebit=Conta de Débito DisableConciliation=Desativar a função de Conciliação para esta Conta ConciliationDisabled=Função de Conciliação Desativada -StatusAccountOpened=Aberta -StatusAccountClosed=Fechada -AccountIdShort=Número EditBankRecord=Editar Registo -LineRecord=Registo AddBankRecord=Adicionar Registo AddBankRecordLong=Realizar um registo manual fora de uma fatura -ConciliatedBy=Conciliado por -DateConciliating=Data Conciliação BankLineConciliated=Registo Conciliado CustomerInvoicePayment=Pagamento de Cliente CustomerInvoicePaymentBack=Pagamento do cliente de volta @@ -113,22 +78,17 @@ FinancialAccountJournal=Diário de Tesouraria da Conta BankTransfer=Transferencia Bancaria BankTransfers=Transferências Bancarias TransferDesc=Ao criar uma transferencia de uma das suas contas bancarias fazia outra, Dolibarr cria os registros contabeis (um de débito em uma Conta e outro de crédito, do mesmo valor, na outra Conta. Se utiliza para os dois registros a mesma etiqueta de transferencia e a mesma data) -TransferFrom=De -TransferTo=Para TransferFromToDone=A transferencia de %s fazia %s de %s %s foi criado. -CheckTransmitter=Emissor ValidateCheckReceipt=Validar esta ficha de entregas? ConfirmValidateCheckReceipt=Tem certeza que quer Confirmar esta ficha (Nenhuma modificação será possível uma vez a ficha este validada)? DeleteCheckReceipt=Eliminar esta ficha de entregas? ConfirmDeleteCheckReceipt=Tem certeza que quer eliminar esta ficha? -BankChecks=Cheques BankChecksToReceipt=Cheques a Depositar ShowCheckReceipt=Mostra recibos do deposito com cheque. NumberOfCheques=N� de Cheques DeleteTransaction=Eliminar a Transação ConfirmDeleteTransaction=Tem certeza que quer eliminar esta transação? ThisWillAlsoDeleteBankRecord=Esto eliminará também os registros bancários gerados -BankMovements=Movimentos CashBudget=Orçamento de Tesouraria PlannedTransactions=Transações Previstas Graph=Graficos @@ -138,13 +98,11 @@ TransactionOnTheOtherAccount=Transação Sobre Outra Conta TransactionWithOtherAccount=Transferencia de Conta PaymentNumberUpdateSucceeded=Numero de pagamento modificado PaymentNumberUpdateFailed=Numero de pagamento não foi possível modificar -PaymentDateUpdateSucceeded=Data de pagamento modificada PaymentDateUpdateFailed=Data de pagamento não pode ser modificada Transactions=Transações BankTransactionLine=Transação Bancária AllAccounts=Todas as Contas bancarias/de Caixa BackToAccount=Voltar e a Conta -ShowAllAccounts=Mostrar para todas as Contas FutureTransaction=Transação futura. Impossivel conciliar. SelectChequeTransactionAndGenerate=Selecionar/filtrar cheques a se incluir no recibo de deposito e clickar no "Criar" InputReceiptNumber=Escolha o relatorio bancario relativo a conciliação. Use um valor numerico (como AAAAMM) diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang index 76381b66dfa..730cdb1ee6d 100644 --- a/htdocs/langs/pt_BR/bills.lang +++ b/htdocs/langs/pt_BR/bills.lang @@ -24,12 +24,11 @@ InvoiceProFormaDesc=Fatura Pro-Forma é uma verdadeira imagem de uma fatu InvoiceReplacement=Substituição da Fatura InvoiceReplacementAsk=Substituição da Fatura para Fatura InvoiceReplacementDesc=A fatura retificada serve para cancelar e para substituir uma fatura existente em que ainda não existe pagamentos.

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

    Nota: Tenha em conta que a fatura original a corrigir deve ter sido fechada (' paga' ou ' paga parcialmente ') para poder realizar uma nota de crédito. invoiceAvoirWithLines=Criar Nota de Crédito conforme a fatura original -invoiceAvoirWithPaymentRestAmount=Criar Nota de Crédito com o montante dos pagamentos da fatura de origem -invoiceAvoirLineWithPaymentRestAmount= Nota de Crédito de pagamentos fatura +invoiceAvoirWithPaymentRestAmount=Cirar nota de credito com restante não pago da fatura original +invoiceAvoirLineWithPaymentRestAmount=Nota de credito para valor restante não pago ReplaceInvoice=Retificar a Fatura %s ReplacementInvoice=Substituição da Fatura ReplacedByInvoice=Substituído por Fatura %s @@ -37,11 +36,9 @@ ReplacementByInvoice=Substituído por Fatura CorrectInvoice=Correção de Fatura %s CorrectionInvoice=Correção de Fatura UsedByInvoice=Aplicar sobre a fatura %s -ConsumedBy=Consumida por NotConsumed=Sem Consumo NoReplacableInvoice=Sem Faturas Retificáveis NoInvoiceToCorrect=Sem Faturas a Corrigir -InvoiceHasAvoir=Corrigida por um ou mais recibos CardBill=Ficha Fatura PredefinedInvoices=Fatura Predefinida Invoice=Fatura @@ -55,15 +52,12 @@ SuppliersInvoices=Faturas de Fornecedores SupplierBill=Fatura de Fornecedor SupplierBills=Faturas de Fornecedores Payment=Pagamento -PaymentBack=Reembolso Payments=Pagamentos -PaymentsBack=Reembolsos PaidBack=Reembolso DatePayment=Data de Pagamento DeletePayment=Eliminar o Pagamento ConfirmDeletePayment=Tem certeza que quer eliminar este pagamento? ConfirmConvertToReduc=Quer converter este deposito numa redução futura?
    O valor deste deposito ficará guardado para este cliente. Poderá utiliza-lo para reduzir o valor de uma próxima fatura do cliente. -SupplierPayments=Pagamentos a Fornecedores ReceivedPayments=Pagamentos Recebidos ReceivedCustomersPayments=Pagamentos Recebidos de Cliente PayedSuppliersPayments=Pagamentos pago ao fornecedores @@ -73,20 +67,17 @@ PaymentsReports=Relatórios de Pagamentos PaymentsAlreadyDone=Pagamentos Efetuados PaymentsBackAlreadyDone=Reembolsos já efetuados PaymentRule=Regra de pagamento -PaymentMode=Forma de Pagamento -PaymentConditions=Tipo de Pagamento -PaymentConditionsShort=Tipo de Pagamento PaymentAmount=Valor a Pagar ValidatePayment=Validar Pagamento -PaymentHigherThanReminderToPay=Pagamento superior ao resto a pagar HelpPaymentHigherThanReminderToPay=Atenção, o valor de uma fatura ou mais faturas e maior do que o que resta a pagar.
    Editar a sua entrada ou confirme e pense em criar uma nota de credito para o excesso recebido por cada fatura paga alem do valor da mesma. HelpPaymentHigherThanReminderToPaySupplier=Atenção, o valor do pagamento de uma ou mais contas é maior do que o resto a pagar.
    Edite sua entrada, caso contrário, confirmar. ClassifyPaid=Clasificar 'pago' ClassifyPaidPartially=Clasificar 'parcialmente pago' ClassifyCanceled=Classificar 'Cancelado' ClassifyClosed=Classificar 'Encerrado' +ClassifyUnBilled=Classificar "à faturar" CreateBill=Criar Fatura -AddBill=Criar Fatura ou Deposito +AddBill=Criar fatura ou nota de credito AddToDraftInvoices=Nenhuma Outra Fatura Rascunho DeleteBill=Deletar Fatura SearchACustomerInvoice=Procurar uma fatura de cliente @@ -96,9 +87,8 @@ SendRemindByMail=Enviar Lembrete DoPayment=Emitir Pagamento DoPaymentBack=Emitir Reembolso ConvertToReduc=Converter em Redução Futura -EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente EnterPaymentDueToCustomer=Realizar pagamento de recibos ao cliente -DisabledBecauseRemainderToPayIsZero=Desativar já que o resto a pagar é 0 +DisabledBecauseRemainderToPayIsZero=Desabilitado porque o restante não pago e zero Amount=Valor PriceBase=Preço Base BillStatus=Status da fatura @@ -106,19 +96,14 @@ BillStatusDraft=Rascunho (A Confirmar) BillStatusPaid=Pago BillStatusPaidBackOrConverted=Pago ou convertido para o desconto BillStatusConverted=Pago (pronto para fatura final) -BillStatusCanceled=Abandonada BillStatusValidated=Validada (A Pagar) BillStatusStarted=Paga Parcialmente BillStatusNotPaid=Não paga BillStatusClosedUnpaid=Fechado (não pago) BillStatusClosedPaidPartially=Pago (parcialmente) -BillShortStatusDraft=Rascunho BillShortStatusPaid=Pago BillShortStatusPaidBackOrConverted=Processado BillShortStatusConverted=Tratada -BillShortStatusCanceled=Abandonada -BillShortStatusValidated=Validada -BillShortStatusStarted=Iniciada BillShortStatusNotPaid=Nao pago BillShortStatusClosedUnpaid=Fechado BillShortStatusClosedPaidPartially=Pago (parcialmente) @@ -132,12 +117,8 @@ ErrorDiscountAlreadyUsed=Erro, desconto já utilizado ErrorInvoiceAvoirMustBeNegative=Erro, uma fatura de tipo deposito deve ter um valor negativo ErrorInvoiceOfThisTypeMustBePositive=Erro, uma fatura deste tipo deve ter um valor positivo ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não pode cancelar uma fatura que tenha sido substituída por uma outra fatura e que está status rascunho -BillFrom=Emissor -BillTo=Enviar a ActionsOnBill=Ações Sobre a fatura NewBill=Nova Fatura -Prélèvements=Débito Direto -Prélèvements=Débito Direto LastBills=As %s últimas faturas LastCustomersBills=As %s últimas faturas a clientes LastSuppliersBills=As %s últimas faturas de Fornecedores @@ -155,9 +136,9 @@ ConfirmCancelBill=Tem certeza que quer cancelar esta fatura %s ? ConfirmCancelBillQuestion=Por qué Razão quer abandonar a fatura? ConfirmClassifyPaidPartially=Tem certeza de que deseja voltar a fatura: %s ao status de paga ? ConfirmClassifyPaidPartiallyQuestion=Esta fatura não foi paga em completo. Qual as razoes para fecha-la ? -ConfirmClassifyPaidPartiallyReasonAvoir=Restante a pagar (%s %s) é um desconto concedido porque foi feita antes de prazo de pagamento. Regularizar o ICMS, com uma nota de crédito. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restante a pagar (%s %s) é um desconto concedido porque foi feita antes de prazo de pagamento. Eu aceito perder o ICMS sobre este desconto. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Restante a pagar (%s %s) é um desconto concedido porque foi feita antes do prazo de pagamento. Recuperar o ICMS sobre este desconto, sem uma nota de crédito. +ConfirmClassifyPaidPartiallyReasonAvoir=Valor restante não pago (%s %s) e um desconto porque o pagamento foi effetuado antes do vencimento. eu regulariso o VAT com a nota de credito. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Valor restante não pago (%s %s) e um desconto porque o pagamento foi effetuado antes do vencimento. Eu aceito de perder o valor do VAT neste desconto. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Valor restante não pago (%s %s) e um desconto porque o pagamento foi effetuado antes do vencimento. Eu recupero o valor do VAT neste desconto sem a nota de credito. ConfirmClassifyPaidPartiallyReasonBadCustomer=Mau cliente ConfirmClassifyPaidPartiallyReasonProductReturned=Produtos parcialmente devolvidos ConfirmClassifyPaidPartiallyReasonOther=Valor abandonado por outra razão @@ -167,9 +148,7 @@ ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use esta opção se todos os outros ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Um mau cliente, é um cliente que se recusa a pagar a sua dívida. ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Esta escolha é utilizado quando o pagamento não está completo, porque alguns dos produtos foram devolvidos ConfirmClassifyPaidPartiallyReasonOtherDesc=Use esta opção se todos os outros não se adequar, por exemplo, na seguinte situação:
    - pagamento não está completo porque alguns produtos foram enviados de volta
    - montante reclamado muito importante porque um desconto foi esquecido
    Em todos os casos, a quantidade deve ser corrigido no sistema de contabilidade, criando uma nota de crédito. -ConfirmClassifyAbandonReasonOther=Outro ConfirmClassifyAbandonReasonOtherDesc=Esta eleição será para qualquer outro caso. Por Exemplo a raíz da intenção de Criar uma fatura retificativa. -ConfirmCustomerPayment=Confirma o processo deste pagamento de %s %s ? ConfirmSupplierPayment=Confirma o processo deste pagamento de %s %s ? ConfirmValidatePayment=Tem certeza que quer Confirmar este pagamento (Nenhuma modificação é possível uma vez o pagamento este validado)? ValidateBill=Confirmar Fatura @@ -189,18 +168,14 @@ File=Arquivo AlreadyPaid=Pago AlreadyPaidBack=Pagamento voltou AlreadyPaidNoCreditNotesNoDeposits=Já pago (sem notas de crédito e depósitos) -Abandoned=Abandonada -RemainderToPay=Falta a Pagar -RemainderToTake=Falta Cobrar -RemainderToPayBack=Restante a pagar -Rest=Pendente +RemainderToPay=Restante não pago +RemainderToTake=Valor restante a se levar +RemainderToPayBack=Valor restante para pagar de volta AmountExpected=Valor Reclamado ExcessReceived=Recebido em Excesso EscompteOffered=Desconto (Pagamento antecipado) -SendBillRef=Enviar Fatura %s -SendReminderBillRef=Lembrete Fatura %s -StandingOrders=Débitos Diretos -StandingOrder=Débito Direto +SendBillRef=Confirmação de fatura %s +SendReminderBillRef=Lembrete de confirmação de fatura %s NoDraftBills=Nenhuma Fatura Rascunho NoOtherDraftBills=Nenhuma Outra Fatura Rascunho NoDraftInvoices=Nenhuma Fatura Rascunho @@ -208,65 +183,43 @@ RefBill=Ref. Fatura ToBill=A Faturar RemainderToBill=Falta Faturar SendBillByMail=Enviar a fatura por E-Mail -SendReminderBillByMail=Enviar um lembrete por E-Mail RelatedCommercialProposals=Orçamentos Associados -MenuToValid=A Confirmar DateMaxPayment=Data limite de Pagamento -DateEcheance=Data Vencimento DateInvoice=Data da fatura NoInvoice=Nenhuma Fatura ClassifyBill=Classificar a Fatura SupplierBillsToPay=Faturas de Fornecedores a Pagar CustomerBillsUnpaid=Faturas de Clientes Pendentes de Cobrança -DispenseMontantLettres=Faturas preparadas por processos mecânicos estão isentas da ordem em letras -DispenseMontantLettres=Faturas preparadas por processos mecânicos estão isentas da ordem em letras NonPercuRecuperable=Sem Recuperação SetConditions=Definir Condições de Pagamento SetMode=Definir Modo de Pagamento Billed=Faturado -RepeatableInvoice=Fatura predefinida -RepeatableInvoices=Faturas predefinidas -Repeatable=Predefinida -Repeatables=Predefinidas -ChangeIntoRepeatableInvoice=Modificar p/ Predefinida -CreateRepeatableInvoice=Criar Fatura Predefinida -CreateFromRepeatableInvoice=Criar a partir de uma fatura predefinida +RepeatableInvoice=Modelo fatura +RepeatableInvoices=Modelos da fatura +Repeatable=Modelo +Repeatables=Modelos +ChangeIntoRepeatableInvoice=Converter para modelo de fatura +CreateRepeatableInvoice=Criar modelo de fatura +CreateFromRepeatableInvoice=Criar da fatura modelo CustomersInvoicesAndInvoiceLines=Faturas a clientes e linhas de faturas CustomersInvoicesAndPayments=Faturas a clientes e pagamentos ExportDataset_invoice_1=Faturas a clientes e linhas de fatura ExportDataset_invoice_2=Faturas a clientes e pagamentos ProformaBill=Fatura Pro-Forma: -Reduction=Redução ReductionShort=Desc. -Reductions=Descontos ReductionsShort=Desc. -Discount=Desconto -Discounts=Descontos -AddDiscount=Adicionar Desconto -AddRelativeDiscount=Criar desconto relativo EditRelativeDiscount=Alterar Desconto Relativo AddGlobalDiscount=Adicionar Desconto Fixo EditGlobalDiscounts=Alterar Descontos Globais -AddCreditNote=Criar nota de crédito ShowDiscount=Ver o Desconto ShowReduc=Mostrar a dedução RelativeDiscount=Desconto Relativo GlobalDiscount=Desconto Fixo CreditNote=Depósito -CreditNotes=Recibos -Deposit=Depósito -Deposits=Depósitos -DiscountFromCreditNote=Desconto resultante do deposito %s DiscountFromDeposit=Pagamentos a partir de depósito na fatura %s AbsoluteDiscountUse=Este tipo de crédito não pode ser usado em um projeto antes da sua validação CreditNoteDepositUse=O projeto deve ser validado para utilizar este tipo de crédito -NewGlobalDiscount=Novo Desconto fixo NewRelativeDiscount=Novo desconto relacionado -NoteReason=Nota/Motivo -ReasonDiscount=Motivo -DiscountOfferedBy=Acordado por -DiscountStillRemaining=Descontos fixos Pendentes -DiscountAlreadyCounted=Descontos fixos já aplicados BillAddress=Endereço de Faturamento HelpEscompte=Um Desconto é um desconto acordado sobre uma fatura dada, a um cliente que realizou o seu pagamento muito antes do vencimiento. HelpAbandonBadCustomer=Este valor foi esquecido (cliente classificado como devedor) e considera-se como uma perda excepcional. @@ -280,7 +233,6 @@ InvoiceStatus=Status da Fatura InvoiceNote=Nota Fatura InvoicePaid=Fatura paga PaymentNumber=Número de Pagamento -RemoveDiscount=Eliminar Desconto WatermarkOnDraftBill=Marca de água em faturas rascunho (nada se está vazia) InvoiceNotChecked=Não há notas fiscais selecionadas CloneInvoice=Clonar Fatura @@ -295,10 +247,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual ConfirmRemoveDiscount=Você tem certeza que deseja remover este desconto? RelatedBill=Fatura Anexo RelatedBills=Faturas Anexos - -# PaymentConditions -PaymentConditionShortRECEP=Pronto Pagamento -PaymentConditionRECEP=Pronto Pagamento +LatestRelatedBill=Últimas fatura correspondente +WarningBillExist=Atenção, um ou mais fatura já existem PaymentConditionShort30D=30 Dias PaymentCondition30D=Pagamento a 30 Dias PaymentConditionShort30DENDMONTH=30 Dias Fim do Mês @@ -307,43 +257,24 @@ PaymentConditionShort60D=60 Dias PaymentCondition60D=Pagamento a 60 Dias PaymentConditionShort60DENDMONTH=60 Dias Fim de Mês PaymentCondition60DENDMONTH=Pagamento a 60 Dias até ao Fim do Mês -PaymentConditionShortPT_DELIVERY=Envio -PaymentConditionPT_DELIVERY=Na entrega PaymentConditionShortPT_ORDER=Em ordem PaymentConditionPT_ORDER=Em ordem -PaymentConditionShortPT_5050=50-50 PaymentConditionPT_5050=50 por cento adiantado, 50 por cento na entrega FixAmount=Quantidade fixa VarAmount=Quantidade variável -# PaymentType PaymentTypeVIR=Transferência Bancaria -PaymentTypeShortVIR=Transferência PaymentTypePRE=Débito Direto Bancario PaymentTypeShortPRE=Débito Direto PaymentTypeLIQ=Espécie -PaymentTypeShortLIQ=Espécies -PaymentTypeCB=Cartão -PaymentTypeShortCB=Cartão -PaymentTypeCHQ=Cheque -PaymentTypeShortCHQ=Cheque PaymentTypeTIP=Em Dinheiro PaymentTypeShortTIP=Em Dinheiro -PaymentTypeVAD=Pagamento On Line -PaymentTypeShortVAD=Pagamento On Line PaymentTypeTRA=Letra -PaymentTypeShortTRA=Letra BankDetails=Dados Bancários BankCode=Código Banco DeskCode=Código Balcão BankAccountNumber=Número Conta -BankAccountNumberKey=Dígito Control Residence=Domicilio -IBANNumber=Código IBAN -IBAN=IBAN -BIC=BIC/SWIFT -BICNumber=Código BIC/SWIFT ExtraInfos=Informações Complementares -RegulatedOn=Pagar o ChequeNumber=Cheque N� ChequeOrTransferNumber=Cheque/Transferência n� ChequeMaker=Emissor do Cheque @@ -351,31 +282,22 @@ ChequeBank=Banco do Cheque NetToBePaid=Neto a Pagar PhoneNumber=Telf. FullPhoneNumber=Telefone -TeleFax=Fax PrettyLittleSentence=Aceito o pagamento mediante cheques a meu nome dos valores em divida, na qualidade de membro de uma empresa autorizada pela Administração Fiscal. IntracommunityVATNumber=Número de ICMS Intracomunitario -PaymentByChequeOrderedTo=Pagamento Mediante Cheque Nominativo a %s enviado a PaymentByChequeOrderedToShort=Pagamento Mediante Cheque Nominativo a SendTo=- A Enviar Para PaymentByTransferOnThisBankAccount=Pagamento Mediante Trasferência Sobre a Conta Bancária Seguinte VATIsNotUsedForInvoice=* ICMS não aplicável art-293B do CGI -LawApplicationPart1=Por aplicação da lei 80.335 de 12/05/80 LawApplicationPart2=As mercadoriias permanecem em propiedade de LawApplicationPart3=Vendedor até cobrança completa de LawApplicationPart4=Os Seus Preços -LimitedLiabilityCompanyCapital=SRL com capital de -UseLine=Aplicar -UseDiscount=Aplicar Desconto UseCredit=Utilizar Crédito UseCreditNoteInInvoicePayment=Reduzir o pagamento com este depósito -MenuChequeDeposits=Depósito de Cheques MenuCheques=Administração Cheques -MenuChequesReceipts=Fichas NewChequeDeposit=Novo Depósito ChequesReceipts=Ficha Emissão de Cheques ChequesArea=Área Emissão de Cheques ChequeDeposits=Depósito de Cheques -Cheques=Cheques CreditNoteConvertedIntoDiscount=Este depósito converteu-se em %s UsBillingContactAsIncoiveRecipientIfExist=Utilizar o endereço do contato de cliente de faturação da fatura em vez do endereço do Fornecedor como destinatário das faturas ShowUnpaidAll=Mostrar todas as faturas @@ -383,17 +305,14 @@ ShowUnpaidLateOnly=Mostrar apenas faturas em Atraso PaymentInvoiceRef=Pagamento Fatura %s ValidateInvoice=Validar a fatura Cash=em dinheiro -Reported=Atrasado DisabledBecausePayments=Não é possível uma vez já que existem alguns pagamentos CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento já que há pelo menos uma fatura classificada como pago ExpectedToPay=Esperando pagamento -PayedByThisPayment=Pago +PayedByThisPayment=Pago ClosePaidInvoicesAutomatically=Classifique "Paid" todas as faturas padrão ou a substituição inteiramente paga. ClosePaidCreditNotesAutomatically=Classificar "pagou" todas as notas de crédito totalmente pago de volta. AllCompletelyPayedInvoiceWillBeClosed=Todos fatura que permanecer sem pagar será automaticamente fechada ao status de "Paid". -ToMakePayment=Pagar ToMakePaymentBack=pagar tudo -ListOfYourUnpaidInvoices=Lista de faturas não pagas NoteListOfYourUnpaidInvoices=Atenção: Esta lista inclue somente faturas para terceiros para as quais voce esta conectado como vendedor. RevenueStamp=Selo da receita YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar fatura de terceiros @@ -401,7 +320,6 @@ PDFCrabeDescription=Modelo de fatura completo (ICMS, método de pagamento a most TerreNumRefModelDesc1=Mostrarr número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0 MarsNumRefModelDesc1=Mostrar número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0 TerreNumRefModelError=O projeto começa começado por $syymm já existe e não é compatível com este modelo de seq�ência. Remova-o ou renomei-o para ativar este módulo. -##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Responsável do acompanhamento da fatura do cliente TypeContact_facture_external_BILLING=Contato fatura cliente TypeContact_facture_external_SHIPPING=Contato envio cliente diff --git a/htdocs/langs/pt_BR/bookmarks.lang b/htdocs/langs/pt_BR/bookmarks.lang index 90abb0ab323..2d4ff9f572e 100644 --- a/htdocs/langs/pt_BR/bookmarks.lang +++ b/htdocs/langs/pt_BR/bookmarks.lang @@ -1,15 +1,9 @@ -# Dolibarr language file - Source file is en_US - marque pages -AddThisPageToBookmarks=Adicionar esta página aos Favoritos -Bookmark=Favorito -Bookmarks=Favoritos -NewBookmark=Novo Favorito +# Dolibarr language file - Source file is en_US - bookmarks ShowBookmark=Visualizar Favorito OpenANewWindow=Abrir em uma nova janela -ReplaceWindow=Substituir a janela atual BookmarkTargetNewWindowShort=Uma nova janela BookmarkTargetReplaceWindowShort=Na janela atual BookmarkTitle=Título do favorito -UrlOrLink=URL BehaviourOnClick=Comportamento ao clicar em uma URL CreateBookmark=Criar favorito SetHereATitleForLink=Definir um título para ao favorito diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang index c8d45909f77..c1e1dde6f55 100644 --- a/htdocs/langs/pt_BR/boxes.lang +++ b/htdocs/langs/pt_BR/boxes.lang @@ -1,70 +1,44 @@ # Dolibarr language file - Source file is en_US - boxes -BoxLastRssInfos=Links de informação RSS -BoxLastProducts=Últimos produtos/serviços BoxProductsAlertStock=Produtos em alerta de estoque -BoxLastProductsInContract=Últimos produtos/serviços contratados BoxLastSupplierBills=Últimas faturas de Fornecedores BoxLastCustomerBills=Últimas faturas a Clientes BoxOldestUnpaidCustomerBills=Primeira fatura pendente do cliente BoxOldestUnpaidSupplierBills=Primeira fatura pendentes do fornecedor -BoxLastProposals=Últimos Orçamentos -BoxLastProspects=Últimos clientes potenciais -BoxLastCustomers=Últimos clientes -BoxLastSuppliers=Últimos Fornecedores -BoxLastCustomerOrders=Últimos pedidos -BoxLastBooks=Últimos books BoxLastActions=Últimas ações BoxLastContracts=Últimos contratos BoxLastContacts=Últimos contatos/endereços -BoxLastMembers=Últimos membros BoxFicheInter=Últimas intervenções BoxCurrentAccounts=Abrir saldo das contas -BoxSalesTurnover=Volume de negocio -BoxTotalUnpaidCustomerBills=Total de faturas pendentes de clientes +BoxTotalUnpaidCustomerBills=Total de faturas pendentes de clientes BoxTotalUnpaidSuppliersBills=Total de faturas pendentes de fornecedores -BoxTitleLastBooks=Os %s últimos Favoritos registados -BoxTitleNbOfCustomers=Número de clientes BoxTitleLastRssInfos=As %s últimas Infos de %s BoxTitleLastProducts=Os %s últimos Produtos/Serviços Registados BoxTitleProductsAlertStock=Produtos em alerta de estoque -BoxTitleLastCustomerOrders=Os %s últimos pedidos de clientes modificados -BoxTitleLastSuppliers=Os %s últimos Fornecedores modificados -BoxTitleLastCustomers=Os %s últimos clientes modificados BoxTitleLastModifiedSuppliers=Últimos %s fornecedores modificados BoxTitleLastModifiedCustomers=Últimos clientes -BoxTitleLastCustomersOrProspects=Os %s últimos clientes ou clientes potenciais registados -BoxTitleLastPropals=Os %s últimos Orçamentos registados BoxTitleLastCustomerBills=As %s últimas faturas a clientes registradas BoxTitleLastSupplierBills=As %s últimas faturas de Fornecedores registradas -BoxTitleLastProspects=Os %s últimos clientes potenciais modificados BoxTitleLastModifiedProspects=Últimos clientes potenciais modificados -BoxTitleLastProductsInContract=Os %s últimos produtos/serviços contratados BoxTitleLastModifiedMembers=os %s últimos Membros modificados BoxTitleLastFicheInter=As últimas % s intervenções modificadas BoxTitleOldestUnpaidCustomerBills=Primeira %s fatura pendente do cliente BoxTitleOldestUnpaidSupplierBills=Primeira %s fatura pendente do fornecedor BoxTitleCurrentAccounts=Abrir saldo das contas -BoxTitleSalesTurnover=Volume de negocio realizado BoxTitleTotalUnpaidCustomerBills=Faturas de Clientes Pendentes de Cobrança BoxTitleTotalUnpaidSuppliersBills=Faturas de Fornecedores Pendentes de Pagamento BoxTitleLastModifiedContacts=Últimos %s contatos/endereços BoxMyLastBookmarks=Os meus últimos Favoritos BoxOldestExpiredServices=Primeiro serviços expirados ativos -BoxLastExpiredServices=Últimos %s contatos com os serviços expirados ativos +BoxLastExpiredServices=Últimos %s contatos com os serviços expirados ativos BoxTitleLastActionsToDo=As %s últimas ações a realizar -BoxTitleLastContracts=Últimos contratos -BoxTitleLastModifiedDonations=As ultimas %s doações modificadaas +BoxTitleLastModifiedDonations=As ultimas %s doações modificadaas BoxTitleLastModifiedExpenses=Últimas despesas modificadas BoxGlobalActivity=Atividade geral (notas fiscais, propostas, ordens) FailedToRefreshDataInfoNotUpToDate=Erro na atualização do fluxos RSS. Data da última atualização: %s LastRefreshDate=Data da última atualização -NoRecordedBookmarks=Não existem favoritos pessoais. Click aqui para adicionar. ClickToAdd=Clique aqui para adicionar -NoRecordedCustomers=Nenhum cliente registado NoRecordedContacts=Nenhum contato registrado NoActionsToDo=Sem ações a realizar -NoRecordedOrders=Sem pedidos de clientes registados -NoRecordedProposals=Sem Orçamentos registados NoRecordedInvoices=Sem faturas a clientes registados NoUnpaidCustomerBills=Cliente sem faturas em aberto NoRecordedSupplierInvoices=Sem faturas de Fornecedores @@ -76,16 +50,14 @@ NoContractedProducts=Nenhum Produto/Serviço contratado NoRecordedContracts=Nenhum contrato registrado NoRecordedInterventions=Não há intervenções gravadas BoxLatestSupplierOrders=Últimos pedidos a forcecedores -BoxTitleLatestSupplierOrders= %s últimos pedidos a forcecedores +BoxTitleLatestSupplierOrders=%s últimos pedidos a forcecedores NoSupplierOrder=Nenhum pedido a fornecedor registrado BoxCustomersInvoicesPerMonth=Faturas de cliente por mês BoxSuppliersInvoicesPerMonth=Faturas de fornecedor por mês BoxCustomersOrdersPerMonth=Pedidos de clientes por mês BoxSuppliersOrdersPerMonth=Pedidos de fornecedor por mês -BoxProposalsPerMonth=Propostas por mês NoTooLowStockProducts=Nenhum produto abaixo do limite de estoque BoxProductDistribution=Produtos / Serviços e distribuição BoxProductDistributionFor=Distribuição de para ForCustomersInvoices=Faturas de Clientes ForCustomersOrders=Ordem de clientes -ForProposals=Orçamentos diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang index 83670dde415..f2098c9655c 100644 --- a/htdocs/langs/pt_BR/cashdesk.lang +++ b/htdocs/langs/pt_BR/cashdesk.lang @@ -1,40 +1,18 @@ -# Language file - Source file is en_US - cashdesk -CashDeskMenu=Ponto de venda -CashDesk=Ponto de venda +# Dolibarr language file - Source file is en_US - cashdesk CashDesks=Ponto de vendas CashDeskBank=Conta Bancaria -CashDeskBankCash=Conta bancária (dinheiro) -CashDeskBankCB=Conta bancária (cartão) -CashDeskBankCheque=Conta bancária (cheque) -CashDeskWarehouse=Armazém -CashdeskShowServices=Venda de serviços -CashDeskProducts=Produtos CashDeskStock=Estoque CashDeskOn=Ligado CashDeskThirdParty=Fornecedor CashdeskDashboard=Ponto de acesso de venda -ShoppingCart=Carrinho de compras NewSell=Nova venda -BackOffice=Back office AddThisArticle=Adicione este artigo RestartSelling=Volte para vendas SellFinished=Venda finalizada PrintTicket=Imprimir cupom -NoProductFound=Nenhum artigo encontrado -ProductFound=produto encontrado -ProductsFound=produtos encontrados -NoArticle=Nenhum artigo -Identification=Identificação -Article=Artigo -Difference=Diferença TotalTicket=Total do cupom -NoVAT=Sem IVA para esta venda Change=Recebido em Excesso -CalTip=Clique para ver o calendário CashDeskSetupStock=Você tentou retirar do estoque com a emissão da fatura, mas o usuário não tem permissão para usar o armazém
    Altere a configuração do módulo de estoque, ou escolha outro armazém BankToPay=Carregar Conta ShowCompany=Exibir empresa -ShowStock=Mostrar armazém -DeleteArticle=Clique para remover este artigo FilterRefOrLabelOrBC=Busca (Ref/Etiqueta) -UserNeedPermissionToEditStockToUsePos=Você tentou retirar do estoque com a emissão da fatura, mas o usuário precisa ter permissão para editar estoque. diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang index afc5bc8a79a..9ea64949849 100644 --- a/htdocs/langs/pt_BR/categories.lang +++ b/htdocs/langs/pt_BR/categories.lang @@ -1,85 +1,31 @@ # Dolibarr language file - Source file is en_US - categories -Category=Categoria -Categories=Categorias Rubrique=Rubrica Rubriques=Rubricas categories=Categorias -TheCategorie=A Categoria -NoCategoryYet=Nenhuma Categoria Deste Tipo Criada In=Em -AddIn=Adicionar em -modify=Modificar -Classify=Classificar -CategoriesArea=Área Categorias -ProductsCategoriesArea=Área Categorias de Produtos e Serviços -SuppliersCategoriesArea=Área Categorias Fornecedores -CustomersCategoriesArea=Área Categorias Clientes ThirdPartyCategoriesArea=Área Categorias de Fornecedores MembersCategoriesArea=Área categorias membros ContactsCategoriesArea=Contatos area categorias -MainCats=Categorias Principais -SubCats=Sub-Categorias -CatStatistics=Estatísticas -CatList=Lista de Categorias -AllCats=Todas as Categorias -ViewCat=Ver Categoria -NewCat=Nova Categoria -NewCategory=Nova Categoria -ModifCat=Modificar uma Categoria -CatCreated=Categoria Criada -CreateCat=Adicionar uma Categoria -CreateThisCat=Adicionar esta Categoria -ValidateFields=Confirmar os campos NoSubCat=Esta categoria não contém Nenhuma subcategoria. -SubCatOf=Subcategoria -FoundCats=Categorias Encontradas -FoundCatsForName=Categorias Encontradas com o Nome: -FoundSubCatsIn=Subcategorias Encontradas na Categoria ErrSameCatSelected=Selecionou a mesma categoria varias vezes ErrForgotCat=Esqueceu de escolher a categoria ErrForgotField=Esqueceu de atribuir um campo ErrCatAlreadyExists=Este nome esta sendo utilizado -AddProductToCat=Adicionar este produto a uma categoria? ImpossibleAddCat=Impossível Adicionar a categoria -ImpossibleAssociateCategory=Impossível associar a categoria -WasAddedSuccessfully=Foi adicionado com êxito. ObjectAlreadyLinkedToCategory=O elemento já está associado a esta categoria -CategorySuccessfullyCreated=A Categoria %s foi inserida com sucesso -ProductIsInCategories=Este produto/serviço encontra-se nas seguintes categorias -SupplierIsInCategories=Este fornecedor encontra-se nas seguintes categorias -CompanyIsInCustomersCategories=Esta empresa encontra-se nas seguintes categorias -CompanyIsInSuppliersCategories=Esta empresa encontra-se nas seguintes categorias de Fornecedores MemberIsInCategories=Este membro deve as seguintes categorias de membros ContactIsInCategories=Este contato pertence as seguentes categorias contatos -ProductHasNoCategory=Este produto/serviço não se encontra em nenhuma categoria em particular -SupplierHasNoCategory=Este fornecedor não se encontra em Nenhuma categoria em particular CompanyHasNoCategory=Esta empresa não se encontra em Nenhuma categoria em particular MemberHasNoCategory=Este membro nao esta em nenhuma categoria ContactHasNoCategory=Este contato nao esta em nenhuma categoria ClassifyInCategory=Esta categoria não contém clientes -NoneCategory=Nenhuma -NotCategorized=Sem categoria -CategoryExistsAtSameLevel=Esta categoria já existe na mesma localização -ReturnInProduct=Voltar à ficha produto/serviço -ReturnInSupplier=Voltar à ficha fornecedor -ReturnInCompany=Voltar à ficha cliente/cliente potencial ContentsVisibleByAll=O Conteúdo Será Visivel por Todos? ContentsVisibleByAllShort=Conteúdo visivel por todos ContentsNotVisibleByAllShort=Conteúdo não visivel por todos CategoriesTree=Tipos de categoria -DeleteCategory=Eliminar Categoria ConfirmDeleteCategory=Tem certeza que quer eliminar esta categoria? -RemoveFromCategory=Eliminar link com categoria RemoveFromCategoryConfirm=Tem certeza que quer eliminar o link entre a transação e a categoria? -NoCategoriesDefined=Nenhuma Categoria Definida -SuppliersCategoryShort=Categoria Fornecedores -CustomersCategoryShort=Categoria Clientes -ProductsCategoryShort=Categoria Produtos MembersCategoryShort=Categoria de membros -SuppliersCategoriesShort=Categorias Fornecedores -CustomersCategoriesShort=Categorias Clientes -CustomersProspectsCategoriesShort=Cat. Clientes/Potenciais -ProductsCategoriesShort=Categorias Produtos MembersCategoriesShort=Categoria de membros ContactCategoriesShort=Categorias contatos ThisCategoryHasNoProduct=Esta categoria não contém nenhum produto. @@ -87,11 +33,6 @@ ThisCategoryHasNoSupplier=Esta categoria não contém a nenhum fornecedor. ThisCategoryHasNoCustomer=Esta categoria não contém a nenhum cliente. ThisCategoryHasNoMember=Esta categoria nao contem nenhum membro. ThisCategoryHasNoContact=Esta categoria nao contem nenhum contato. -AssignedToCustomer=Atribuir a um cliente -AssignedToTheCustomer=Atribuido a um cliente -InternalCategory=Categoria Interna -CategoryContents=Conteúdo da Categoria -CategId=Id Categoria CatSupList=Lista de categorias de fornecedores CatCusList=Lista de Categorias de Clientes/Perspectivas CatProdList=Lista de Categorias de Produtos @@ -101,9 +42,6 @@ CatSupLinks=Linkes entre fornecedores e catogorias CatCusLinks=Linkes entre clientes/prospetivas e categorias CatProdLinks=Linkes entre produtos/servicos e categorias CatMemberLinks=Linkes entre membros e categorias -CatProdLinks=Linkes entre produtos/servicos e categorias -CatCusLinks=Linkes entre clientes/prospetivas e categorias -CatSupLinks=Linkes entre fornecedores e catogorias DeleteFromCat=Excluir da categoria DeletePicture=Apagar foto ConfirmDeletePicture=Confirmar eliminação de fotografias @@ -111,3 +49,5 @@ ExtraFieldsCategories=atributos complementares CategoriesSetup=Configuração de categorias CategorieRecursiv=Ligação com a categoria automaticamente CategorieRecursivHelp=Se ativado, o produto também será ligada a categoria original quando adicionando em uma subcategoria +AddProductServiceIntoCategory=Adicione o seguinte produto / serviço +ShowCategory=Mostrar categoria diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang index 1fd54b255ec..68b7321fe1b 100644 --- a/htdocs/langs/pt_BR/commercial.lang +++ b/htdocs/langs/pt_BR/commercial.lang @@ -1,25 +1,16 @@ # Dolibarr language file - Source file is en_US - commercial -Commercial=Comercial CommercialArea=Área Comercial CommercialCard=Ficha Comercial -CustomerArea=Área de Clientes -Customer=Cliente -Customers=Clientes -Prospect=Cliente Potencial -Prospects=Clientes Potenciais DeleteAction=Eliminar um evento/tarefa NewAction=Novo evento/tarefa -AddAction=Adicionar evento/tarefa -AddAnAction=Adicionar um evento/tarefa -AddActionRendezVous=Criar uma reunião -Rendez-Vous=Reunião +AddAction=Criar evento/tarefa +AddAnAction=Criar um evento/tarefa +AddActionRendezVous=Criar evento tipo Rendez-vous ConfirmDeleteAction=Você tem certeza que deseja excluir este evento/tarefa? CardAction=Ficha de evento PercentDone=Percentual completo ActionOnCompany=Tarefa relativa à empresa ActionOnContact=Tarefa relativa a um contato -TaskRDV=Reunião -TaskRDVWith=Reunião com %s ShowTask=Visualizar tarefa ShowAction=Visualizar evento ActionsReport=Relatório de eventos @@ -33,8 +24,6 @@ ErrorWrongCode=Código Incorreto NoSalesRepresentativeAffected=Nenhum Comercial Afetado ShowCustomer=Ver Cliente ShowProspect=Ver Clientes Potenciais -ListOfProspects=Lista de Clientes Potenciais -ListOfCustomers=Lista de Clientes LastDoneTasks=As %s últimas Ações Efetuadas LastRecordedTasks=últimas Ações Registradas LastActionsToDo=As %s últimas Ações não Completadas @@ -44,11 +33,10 @@ DoneActions=Lista de Ações Realizadas DoneActionsFor=Lista de Ações Realizadas por %s ToDoActions=Lista de Ações Incompletas ToDoActionsFor=Lista de Ações Incompletas de %s -SendPropalRef=Enviar Orçamento %s -SendOrderRef=Enviar Pedido %s +SendPropalRef=Confirmação de proposta comercial %s +SendOrderRef=Confirmação da ordem %s StatusNotApplicable=Não aplicavel StatusActionToDo=A Realizar -StatusActionDone=Realizado MyActionsAsked=Ações que Registei MyActionsToDo=Ações que tenho que fazer MyActionsDone=Ações que me afetam @@ -60,31 +48,22 @@ LastProspectToContact=A Contactar LastProspectContactInProcess=Contato em Curso LastProspectContactDone=Clientes Potenciais Contactados DateActionPlanned=Data Planificação -DateActionDone=Data realização ActionAskedBy=Ação Questionada por -ActionAffectedTo=Ação associada a +ActionAffectedTo=Responsável pelo evento ActionDoneBy=Ação Realizada por ActionUserAsk=Registrada por ErrorStatusCantBeZeroIfStarted=Se o campo 'Ficha de Realização' tiver dados a ação está em curso, por isso o campo 'Estado' não pode ser 0%%. ActionAC_TEL=Chamada Telefônica ActionAC_FAX=Envio Fax ActionAC_PROP=Envio Orçamento por Correio -ActionAC_EMAIL=Envio E-Mail -ActionAC_RDV=Reunião ActionAC_INT=Intervenção no lugar ActionAC_FAC=Envio Fatura por Correio ActionAC_REL=Lembrete fatura por correio -ActionAC_CLO=Fechar ActionAC_EMAILING=Envio mailing massivo ActionAC_COM=Envio Pedido por Correio ActionAC_SHIP=Enviar Por E-Mail ActionAC_SUP_ORD=Enviar pedido de fornecedor por e-mail ActionAC_SUP_INV=Enviar fatura de fornecedor por e-mail -ActionAC_OTH=Outro -ActionAC_OTH_AUTO=Outros (eventos inseridos automaticamente) -ActionAC_MANUAL=Eventos inseridos manualmente -ActionAC_AUTO=Eventos inseridos automaticamente -Stats=Estatisticas de Venda CAOrder=Ordem CA FromTo=A partir de %s até %s MargeOrder=Ordem da Margem diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang index 4c604834236..7d3adf0d865 100644 --- a/htdocs/langs/pt_BR/companies.lang +++ b/htdocs/langs/pt_BR/companies.lang @@ -2,300 +2,128 @@ ErrorCompanyNameAlreadyExists=Nome da empresa %s já existe. Indique outro. ErrorPrefixAlreadyExists=Prefixo %s já existe. Indique outro. ErrorSetACountryFirst=Primeiro defina o Pais -SelectThirdParty=Selecione um Terceiro -DeleteThirdParty=Excluir um Terceiro +SelectThirdParty=Selecione um cliente/fornecedor +DeleteThirdParty=Excluir um cliente/fornecedor ConfirmDeleteCompany=Tem certeza que quer excluir esta empresa e toda a informação dela pendente? DeleteContact=Excluir um contato ConfirmDeleteContact=Tem certeza que quer excluir este contato e toda a sua informação inerente? -MenuNewThirdParty=Novo Terceiro -MenuNewCompany=Nova Empresa -MenuNewCustomer=Novo Cliente -MenuNewProspect=Novo Cliente Potencial -MenuNewSupplier=Novo Fornecedor -MenuNewPrivateIndividual=Novo Particular -MenuSocGroup=Grupos -NewCompany=Nova Empresa (Cliente Potencial, Cliente, Fornecedor) -NewThirdParty=Novo Terceiro (Cliente Potencial, Cliente, Fornecedor) +MenuNewThirdParty=Novo cliente/fornecedor +MenuNewProspect=Novo cliente em potencial +MenuNewSupplier=Novo fornecedor +NewCompany=Nova Empresa (cliente em potencial, cliente, fornecedor) +NewThirdParty=Novo cliente/fornecedor (cliente em potencial, cliente, fornecedor) NewSocGroup=Novo grupo de empresas -NewPrivateIndividual=Novo Particular (Cliente Potencial, Cliente, Fornecedor) -CreateDolibarrThirdPartySupplier=Criar um terceiro(Fornecedor) -ProspectionArea=Área de prospeção +NewPrivateIndividual=Nova pessoa física (cliente em potencial, cliente, fornecedor) +CreateDolibarrThirdPartySupplier=Criar um fornecedor SocGroup=Agrupamento de empresas -IdThirdParty=ID Terceiro -IdCompany=Id Empresa +IdThirdParty=ID do cliente/fornecedor IdContact=Id Contato Contacts=Contatos -ThirdPartyContacts=Contatos de Fornecedores -ThirdPartyContact=Contato de Fornecedor +ThirdPartyContacts=Contatos de clientes/fornecedores +ThirdPartyContact=Contato/Endereço de cliente/fornecedor StatusContactValidated=Estado do Contato -Company=Empresa CompanyName=Razão Social -Companies=Empresas CountryIsInEEC=País da Comunidadeee Económica Europeia -ThirdPartyName=Nome do fornecedor -ThirdParty=Fornecedor -ThirdParties=Empresas -ThirdPartyAll=Fornecedores (Todos) -ThirdPartyProspects=Clientes Potenciais -ThirdPartyProspectsStats=Clientes Potenciais -ThirdPartyCustomers=Clientes -ThirdPartyCustomersStats=Clientes -ThirdPartyCustomersWithIdProf12=Clientes com %s ó %s -ThirdPartySuppliers=Fornecedores -ThirdPartyType=Tipo de Fornecedor -Company/Fundation=Empresa/Associação -Individual=Particular +ThirdPartyName=Nome do cliente/fornecedor +ThirdParty=Cliente/Fornecedor +ThirdParties=Clientes/Fornecedores +ThirdPartyAll=Clientes/Fornecedores (Todos) +ThirdPartyProspects=Clientes em potencial +ThirdPartyProspectsStats=Clientes em potencial +ThirdPartyType=Tipo de cliente/fornecedor ToCreateContactWithSameName=Criar automaticamente um contato fisico com a mesma informação ParentCompany=Casa Mãe Subsidiary=Subsidiário Subsidiaries=Subsidiários NoSubsidiary=Sem subsidiário -ReportByCustomers=Relatório por cliente -ReportByQuarter=Relatório por trimestre -CivilityCode=Código cortesía RegisteredOffice=Domicilio Social -Name=Nome -Lastname=Apelidos -Firstname=Primeiro Nome -PostOrFunction=Posto/Função -UserTitle=Título -Surname=Pseudonimo Address=Endereço -State=Distrito -Region=Região -Country=País CountryCode=Código País CountryId=ID do país -Phone=Telefone -Skype=Skype Call=Ligar -Chat=Chat -PhonePro=Telef. Trabalho PhonePerso=Telef. Particular -PhoneMobile=Telemovel No_Email=Não envie e-mails em massa -Fax=Fax Zip=Código Postal Town=Município -Web=Web -Poste= Posição DefaultLang=Linguagem por padrão VATIsUsed=Sujeito a ICMS VATIsNotUsed=Não Sujeito a ICMS -CopyAddressFromSoc=Preencha o endereço com o endereço do fornecedor +CopyAddressFromSoc=Preencha com o endereço do cliente/fornecedor NoEmailDefined=Não tem email definido -##### Local Taxes ##### -LocalTax1IsUsedES= Sujeito a RE -LocalTax1IsNotUsedES= Não sujeito a RE -LocalTax2IsUsedES= Sujeito a IRPF -LocalTax2IsNotUsedES= Não sujeito a IRPF -LocalTax1ES=RE -LocalTax2ES=IRPF +LocalTax1IsUsedES=Sujeito a RE +LocalTax1IsNotUsedES=Não sujeito a RE +LocalTax2IsUsedES=Sujeito a IRPF +LocalTax2IsNotUsedES=Não sujeito a IRPF TypeLocaltax1ES=RE Tipo TypeLocaltax2ES=IRPF Tipo TypeES=Tipo -ThirdPartyEMail=%s WrongCustomerCode=Código cliente incorreto -WrongSupplierCode=Código fornecedor incorreto -CustomerCodeModel=Modelo de código cliente -SupplierCodeModel=Modelo de código fornecedor -Gencod=Código de barras -##### Professional ID ##### -ProfId1Short=Prof. id 1 -ProfId2Short=Prof. id 2 -ProfId3Short=Prof. id 3 -ProfId4Short=Prof. id 4 +WrongSupplierCode=Código do fornecedor incorreto ProfId5Short=Prof. id 5 ProfId6Short=Prof. id 6 -ProfId1=ID profesional 1 -ProfId2=ID profesional 2 -ProfId3=ID profesional 3 -ProfId4=ID profesional 4 ProfId5=ID profesional 5 ProfId6=ID profesional 6 ProfId1AR=Prof Id 1 (CUIT/CUIL) ProfId2AR=Prof Id 2 (Receitas brutas) -ProfId3AR=- -ProfId4AR=- -ProfId5AR=- -ProfId6AR=- -ProfId1AU=ABN -ProfId2AU=- -ProfId3AU=- -ProfId4AU=- -ProfId5AU=- -ProfId6AU=- ProfId1BE=Núm da Ordem -ProfId2BE=- -ProfId3BE=- -ProfId4BE=- -ProfId5BE=- -ProfId6BE=- -ProfId1BR=- -ProfId2BR=IE (Inscricao Estadual) -ProfId3BR=IM (Inscricao Municipal) -ProfId4BR=CPF -#ProfId5BR=CNAE -#ProfId6BR=INSS -ProfId1CH=- -ProfId2CH=- -ProfId3CH=Número federado -ProfId4CH=Núm. Registo de Comércio -ProfId5CH=- -ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) -ProfId2CL=- -ProfId3CL=- -ProfId4CL=- -ProfId5CL=- -ProfId6CL=- ProfId1CO=Prof Id 1 (R.U.T.) -ProfId2CO=- -ProfId3CO=- -ProfId4CO=- -ProfId5CO=- -ProfId6CO=- -ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) -ProfId4DE=- -ProfId5DE=- -ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Número do seguro social) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- -ProfId6ES=- -ProfId1FR=SIREN -ProfId2FR=SIRET -ProfId3FR=NAF (Ex APE) -ProfId4FR=RCS/RM ProfId5FR=- -ProfId6FR=- -ProfId1GB=Número Registo -ProfId2GB=- -ProfId3GB=SIC -ProfId4GB=- -ProfId5GB=- -ProfId6GB=- -ProfId1HN=Id prof. 1 (RTN) -ProfId2HN=- -ProfId3HN=- -ProfId4HN=- -ProfId5HN=- -ProfId6HN=- -ProfId1IN=Prof Id 1 (TIN) ProfId2IN=Prof Id 2 (PAN) ProfId3IN=Prof Id 3 (Taxa de Serviço) -ProfId4IN=Prof Id 4 -ProfId5IN=Prof Id 5 -ProfId6IN=- ProfId1MA=Id prof. 1 (R.C.) -ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=- -ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) ProfId3MX=Prof Id 3 (Carta Profissional) -ProfId4MX=- -ProfId5MX=- -ProfId6MX=- ProfId1NL=KVK nummer -ProfId2NL=- -ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- -ProfId6NL=- -ProfId1PT=NIPC -ProfId2PT=Núm. Segurança Social -ProfId3PT=Num. Reg. Comercial -ProfId4PT=Conservatória -ProfId5PT=- -ProfId6PT=- -ProfId1SN=RC -ProfId2SN=NINEA -ProfId3SN=- -ProfId4SN=- -ProfId5SN=- -ProfId6SN=- -ProfId1TN=RC -ProfId2TN=Matrícula Fiscal -ProfId3TN=Código na Alfandega -ProfId4TN=CCC -ProfId5TN=- -ProfId6TN=- ProfId1RU=Id prof 1 (I.E.) ProfId2RU=Id prof 2 (I.M.) ProfId3RU=Id prof. 3 (CGC) ProfId4RU=Id prof. 4 (Livre) -ProfId5RU=- -ProfId6RU=- VATIntra=Cadastro Nacional Pessoa Juridica - CNPJ -VATIntraShort=CNPJ -VATIntraVeryShort=CNPJ -VATIntraSyntaxIsValid=Sintaxe Válida -VATIntraValueIsValid=Valor Válido -ProspectCustomer=Cliente Potencial/Cliente -Prospect=Cliente Potencial -CustomerCard=Ficha de Cliente -Customer=Cliente -CustomerDiscount=Desconto Cliente -CustomerRelativeDiscount=Desconto Cliente Relativo -CustomerAbsoluteDiscount=Desconto Cliente Fixo -CustomerRelativeDiscountShort=Desconto Relativo -CustomerAbsoluteDiscountShort=Desconto Fixo +ProspectCustomer=Cliente em potencial/Cliente CompanyHasRelativeDiscount=Este cliente tem um Desconto por default de %s%% CompanyHasNoRelativeDiscount=Este cliente não tem Descontos relativos por default CompanyHasAbsoluteDiscount=Este cliente tem %s %s Descontos fixos disponíveis CompanyHasCreditNote=Este cliente tem %s %s recibos disponíveis CompanyHasNoAbsoluteDiscount=Este cliente não tem mais Descontos fixos disponíveis CustomerAbsoluteDiscountAllUsers=Descontos fixos em curso (acordado por todos os Usuário) -CustomerAbsoluteDiscountMy=Descontos fixos em curso (acordados Pessoalmente) DefaultDiscount=Desconto por Fefeito AvailableGlobalDiscounts=Descontos Fixos Disponíveis -DiscountNone=Nenhuma -Supplier=Fornecedor -CompanyList=Lista de Empresas -AddContact=Criar Contato -AddContactAddress=Novo Contato/Endereço +AddContact=Criar contato +AddContactAddress=Criar contato/endereço EditContact=Editar contato EditContactAddress=Editar contato/endereco Contact=Contato ContactsAddresses=Contatos/Enderecos -NoContactDefinedForThirdParty=Nenhum contato definido para este terceiro -NoContactDefined=Nenhum contato definido para este fornecedor +NoContactDefinedForThirdParty=Nenhum contato definido para este cliente/fornecedor +NoContactDefined=Nenhum contato definido DefaultContact=Contato por Padrao -AddCompany=Criar Empresa -AddThirdParty=Criar Fornecedor -DeleteACompany=Eliminar uma Empresa -PersonalInformations=Informação Pessoal -AccountancyCode=Código Contabilidade -CustomerCode=Código Cliente -SupplierCode=Código Fornecedor -CustomerAccount=Conta Cliente -SupplierAccount=Conta Fornecedor -CustomerCodeDesc=Código único cliente para cada cliente -SupplierCodeDesc=Código único fornecedor para cada fornecedor -RequiredIfCustomer=Requerida se o Fornecedor for Cliente ou Cliente Potencial -RequiredIfSupplier=Requerida se o Fornecedor for Fornecedor -ValidityControledByModule=Validação Controlada pelo Módulo -ThisIsModuleRules=Esta é a regra para este módulo -LastProspect=último Cliente Potencial -ProspectToContact=Cliente Potencial a Contactar -CompanyDeleted=A Empresa "%s" foi Eliminada +AddCompany=Criar empresa +AddThirdParty=Criar cliente/fornecedor +SupplierCode=Código do fornecedor +SupplierAccount=Conta do fornecedor +SupplierCodeDesc=Código do fornecedor, único para cada fornecedor +RequiredIfCustomer=Requerida se for cliente ou cliente em potencial +RequiredIfSupplier=Obrigatório se for fornecedor +LastProspect=último cliente em potencial +ProspectToContact=Cliente em potencial a contatar ListOfContacts=Lista de Contatos/Endereços ListOfContactsAddresses=Lista de Contatos/Endereços ListOfProspectsContacts=Lista de Contatos Clientes Potenciais ListOfCustomersContacts=Lista de Contatos Clientes -ListOfSuppliersContacts=Lista de Contatos Fornecedores -ListOfCompanies=Lista de Empresas -ListOfThirdParties=Lista de Fornecedores -ShowCompany=Mostar Empresa +ListOfSuppliersContacts=Lista de contatos de fornecedores +ListOfThirdParties=Lista de clientes/fornecedores ShowContact=Mostrar Contato -ContactsAllShort=Todos (sem filtro) ContactType=Tipo de Contato ContactForOrders=Contato para Pedidos ContactForProposals=Contato de Orçamentos @@ -309,68 +137,37 @@ NewContact=Novo Contato NewContactAddress=Novo Contato/Endereço LastContacts=Últimos contatos MyContacts=Meus Contatos -Phones=Telefones -Capital=Capital -CapitalOf=Capital Social de %s -EditCompany=Modificar Empresa EditDeliveryAddress=Modificar Endereço de Envio -ThisUserIsNot=Este usuário nem é um cliente potencial, nem um cliente, nem um fornecedor -VATIntraCheck=Verificar +ThisUserIsNot=Este usuário não é um cliente em potencial, nem um cliente, nem um fornecedor VATIntraCheckDesc=o link %s permite consultar à serviço europeo de control de números de ICMS intracomunitario. Se requer acesso a internet para que o serviço funcione VATIntraCheckURL=http://www.receita.fazenda.gov.br/pessoajuridica/cnpj/cnpjreva/cnpjreva_solicitacao.asp VATIntraCheckableOnEUSite=Verificar na web da Comisión Europea VATIntraManualCheck=pode também realizar uma verificação manual na web europea     configuração do módulo Impostos para modificar regras de cálculo TaxModuleSetupToModifyRulesLT=Ir para Configurações da Empresa para modificar as regras de calculação OptionMode=Opção de Administração Contabilidade OptionModeTrue=Opção Depositos/Despesas -OptionModeVirtual=Opção Créditos/Dividas OptionModeTrueDesc=Neste método, o balanço calcula-se sobre a base das faturas pagas.\nA validade dos valores não está garantida pois a Administração da Contabilidade pasa rigurosamente pelas entradas/saidas das contas mediante as faturas.\nNota : Nesta Versão, Dolibarr utiliza a data da fatura ao estado ' Validada ' e não a data do estado ' paga '. OptionModeVirtualDesc=neste método, o balanço se calcula sobre a base das faturas validadas. pagas o não, aparecen ao resultado em quanto sejam discolocaçãos. FeatureIsSupportedInInOutModeOnly=função disponível somente ao modo contas CREDITOS-dividas (Véase a configuração do módulo contas) VATReportBuildWithOptionDefinedInModule=Os valores aqui apresentados são calculados usando as regras definidas pela configuração do módulo Fiscal. LTReportBuildWithOptionDefinedInModule=Valores mostrados aqui são calculados usando as regras definidas nas configurações da empresa. -Param=Parametrização RemainingAmountPayment=Pagamento montante remanescente: AmountToBeCharged=O valor total a pagar: -AccountsGeneral=Contas Gerais -Account=Conta -Accounts=Contas Accountparent=Conta pai Accountsparent=Contas pai BillsForSuppliers=Faturas de Fornecedores Income=Depositos -Outcome=Despesas -ReportInOut=Resultado / Exercício -ReportTurnover=Volume de Negócios PaymentsNotLinkedToInvoice=pagamentos vinculados a Nenhuma fatura, por o que nenhum Fornecedor PaymentsNotLinkedToUser=pagamentos não vinculados a um usuário -Profit=Beneficio -Balance=Saldo -Debit=Débito -Credit=Crédito Piece=Contabilidade Doc. -Withdrawal=Levantamento -Withdrawals=Levantamentos -AmountHTVATRealReceived=Total Recebido AmountHTVATRealPaid=líquido pago VATToPay=ICMS a Pagar VATReceived=ICMS Recebido @@ -52,33 +33,14 @@ LT2SupplierES=IRPF de compras LT1CustomerES=RE vendas LT1SupplierES=RE compras VATCollected=ICMS Recuperado -ToPay=A Pagar -ToGet=Para restituir +ToGet=Para restituir SpecialExpensesArea=Área para todos os pagamentos especiais -TaxAndDividendsArea=Área Impostos, gastos sociais e dividendos -SocialContribution=Gasto social -SocialContributions=Gastos sociais MenuSpecialExpenses=Despesas especiais -MenuTaxAndDividends=Impostos e Dividas -MenuSalaries=Salários -MenuSocialContributions=Gastos sociais -MenuNewSocialContribution=Novo gasto -NewSocialContribution=Novo gasto social -ContributionsToPay=Gastos por pagar -AccountancyTreasuryArea=Área Contabilidade/Tesouraria -AccountancySetup=Configuração Contabilidade -NewPayment=Novo Pagamento -Payments=Pagamentos PaymentCustomerInvoice=Pagamento de fatura do cliente PaymentSupplierInvoice=Pagamento de fatura do fornecedor PaymentSocialContribution=pagamento gasto social PaymentVat=Pagamento ICMS PaymentSalary=Pagamento de salário -ListPayment=Lista de pagamentos -ListOfPayments=Lista de pagamentos -ListOfCustomerPayments=Lista de pagamentos de clientes -ListOfSupplierPayments=Lista de pagamentos a Fornecedores -DatePayment=Data de Pagamento DateStartPeriod=Período de início e data DateEndPeriod=Período e data final NewVATPayment=Novo Pagamento de ICMS @@ -92,43 +54,27 @@ VATPayment=Pagamento ICMS VATPayments=Pagamentos ICMS SocialContributionsPayments=Pagamento de contribuições sociais ShowVatPayment=Ver Pagamentos ICMS -TotalToPay=Total a Pagar TotalVATReceived=Total do ICMS Recebido -CustomerAccountancyCode=Código contabilidade cliente -SupplierAccountancyCode=Código contabilidade fornecedor -AccountNumberShort=Nº de conta AccountNumber=Nº de conta -NewAccount=Nova conta -SalesTurnover=Volume de Negócio SalesTurnoverMinimum=Volume de negócios mínimo de vendas ByThirdParties=Por Fornecedor ByUserAuthorOfInvoice=Por autor da fatura AccountancyExport=exportação Contabilidade ErrorWrongAccountancyCodeForCompany=Código contabilidade incorreto para %s -SuppliersProductsSellSalesTurnover=Volume de negócio gerado por venda de produtos aos Fornecedores -CheckReceipt=Ficha de cheques -CheckReceiptShort=Ficha -NewCheckReceipt=Novo Cheque -NewCheckDeposit=Novo Deposito -NewCheckDepositOn=Criar Novo deposito na conta: %s -NoWaitingChecks=Não existe cheque em espera para depositar. -DateChequeReceived=Data introdução de dados de recepção cheque +LastCheckReceiptShort=Ultimos %s cheques recebidos NbOfCheques=N� de Cheques -PaySocialContribution=Pagar uma gasto social ConfirmPaySocialContribution=? Tem certeza que quer classificar esta gasto social como paga? -DeleteSocialContribution=Eliminar gasto social ConfirmDeleteSocialContribution=? Tem certeza que quer eliminar esta gasto social? -ExportDataset_tax_1=gastos sociais e pagamentos CalcModeVATDebt=Modo% S VAT compromisso da contabilidade% s. CalcModeVATEngagement=Modo% SVAT sobre os rendimentos e as despesas% s. CalcModeDebt=Modo % s declarações de dívidas% s diz Compromisso da contabilidade . CalcModeEngagement=Modo % s rendimentos e as despesas% s contabilidade do caixa > -CalcModeLT1= Modo %sRE nas faturas dos clientes - faturas dos fornecedores%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 +CalcModeLT1=Modo %sRE nas faturas dos clientes - faturas dos fornecedores%s +CalcModeLT1Debt=Modo %sRE nas faturas dos clientes%s +CalcModeLT1Rec=Modo %sRE nas faturas dos fornecedores%s +CalcModeLT2=Modo %sIRPF nas faturas de clientes - fornecedores%s +CalcModeLT2Debt=Modo %sIRPF nas faturas de clientes%s +CalcModeLT2Rec=Modo %sIRPF nas faturas de fornecedores%s AnnualSummaryDueDebtMode=Balanço de receitas e despesas, resumo anual AnnualSummaryInputOutputMode=Balanço de receitas e despesas, resumo anual AnnualByCompaniesDueDebtMode=balanço de depositos e despesas, desglosado por Fornecedores, em modo %sCréditos-dividas%s chamada Contabilidade de compromisso. @@ -152,7 +98,6 @@ LT2ReportByQuartersInInputOutputMode=Relatoriopor rata IRPF VATReportByQuartersInDueDebtMode=Relatório da taxa do IVA cobrado e pago LT1ReportByQuartersInDueDebtMode=Relatorio por rata RE LT2ReportByQuartersInDueDebtMode=Relatorio por rata IRPF -SeeVATReportInInputOutputMode=Ver o Relatório %sIVA pago%s para um modo de cálculo Standard SeeVATReportInDueDebtMode=Ver o Relatório %sIVA a dever%s para um modo de cálculo com a opção sobre a divida RulesVATInServices=- No caso dos serviços, o relatório inclui os regulamentos IVA efetivamente recebidas ou emitidas com base na data de pagamento. RulesVATInProducts=- Para os bens materiais, que inclui as notas fiscais de IVA com base na data da fatura. @@ -164,18 +109,14 @@ NotUsedForGoods=Bens não utilizados ProposalStats=As estatísticas sobre as propostas OrderStats=Estatísticas de comandos InvoiceStats=As estatísticas sobre as contas -Dispatch=Repartição -Dispatched=Repartições -ToDispatch=A Repartir ThirdPartyMustBeEditAsCustomer=Fornecedor deve ser definido como um cliente SellsJournal=Diário de Vendas PurchasesJournal=Diário de Compras DescSellsJournal=Diário de Vendas DescPurchasesJournal=Diário de Compras -InvoiceRef=Ref. Fatura CodeNotDef=Não Definida AddRemind=Exibir o valor disponível -RemainToDivide= Saldo disponível +RemainToDivide=Saldo disponível WarningDepositsNotIncluded=Depósitos faturas não estão incluídos nesta versão com este módulo de contabilidade. DatePaymentTermCantBeLowerThanObjectDate=Data Prazo de pagamento não pode ser inferior a data da compra ou aquisição Pcg_version=Versão Pcg @@ -187,20 +128,19 @@ AccountancyDashboard=Resumo Contabilidade ByProductsAndServices=Por produtos e serviços RefExt=Ref externo ToCreateAPredefinedInvoice=Para criar uma Fatura predefinida, criar uma fatura padrão, em seguida, sem validá-la, clique no botão "Converter para fatura pré-definida". -LinkedOrder=ligado ao pedido -ReCalculate=Recalcular -Mode1=Método 1 -Mode2=Método 2 +LinkedOrder=Atalho para ordem CalculationRuleDesc=Para calcular o total do VAT, há dois métodos:
    Método 1 é arredondamento cuba em cada linha, em seguida, soma-los.
    Método 2 é somando tudo cuba em cada linha, em seguida, o arredondamento resultado.
    Resultado final pode difere de alguns centavos. O modo padrão é o modo% s. CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequado aplicar mesma regra de cálculo e obter mesmo resultado esperado pelo seu fornecedor. TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de contabilidade de caixa não é relevante. Este relatório está disponível somente quando utilizar o modo de contabilidade engajamento (ver configuração do módulo de contabilidade). -CalculationMode=Modo de cálculo AccountancyJournal=Codigo do jornal fiscal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Código de contabilidade padrão para comprar produtos -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Código de contabilidade padrão para vender produtos -ACCOUNTING_SERVICE_BUY_ACCOUNT=Código de contabilidade padrão para comprar serviços -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Código de contabilidade padrão para vender serviços -ACCOUNTING_VAT_ACCOUNT=Código de contabilidade padrão para cobrança do VAT -ACCOUNTING_VAT_BUY_ACCOUNT=Código de contabilidade padrão para pagar o VAT -ACCOUNTING_ACCOUNT_CUSTOMER=Código Contabilidade por padrão para fornecedores de clientes -ACCOUNTING_ACCOUNT_SUPPLIER=Código da contabilidade por padrão para fornecedor +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codigo contavel padrao para compra de produtos +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codigo contavel padrao para venda de produtos +ACCOUNTING_SERVICE_BUY_ACCOUNT=Codigo contavel padrao para compra de servicos +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codigo contavel padrao para venda de serviços +ACCOUNTING_VAT_ACCOUNT=Codigo contavel padrao para credito VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Codigo contavel padrao para pagamento do VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Codigo contavel padrao para clientes +ACCOUNTING_ACCOUNT_SUPPLIER=Codigo contavel padrao para fornecedores +CloneTax=Clonar contribuição social +ConfirmCloneTax=Confirmar clonação da contribuição social +CloneTaxForNextMonth=Clonar para o proximo mes diff --git a/htdocs/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang index 6d8f0befe60..33c7bf3054f 100644 --- a/htdocs/langs/pt_BR/contracts.lang +++ b/htdocs/langs/pt_BR/contracts.lang @@ -1,41 +1,28 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Área Contratos ListOfContracts=Lista de Contratos -LastContracts=Os últimos %s contratos modificados AllContracts=Todos os Contratos ContractCard=Ficha Contrato ContractStatus=Estado do Contrato ContractStatusNotRunning=Fora de Serviço ContractStatusRunning=Em Serviço -ContractStatusDraft=Rascunho -ContractStatusValidated=Validado ContractStatusClosed=Encerrado ServiceStatusInitial=Inativo ServiceStatusRunning=Em Serviço ServiceStatusNotLate=Rodando, nao vencido ServiceStatusNotLateShort=Nao vencido ServiceStatusLate=Em Serviço, Expirado -ServiceStatusLateShort=Expirado ServiceStatusClosed=Encerrado ServicesLegend=Legenda para os Serviços Contracts=Contratos -Contract=Contrato NoContracts=Sem Contratos -MenuServices=Serviços MenuInactiveServices=Serviços Inativos MenuRunningServices=Serviços Ativos -MenuExpiredServices=Serviços Expirados -MenuClosedServices=Serviços Fechados -NewContract=Novo Contrato -AddContract=Criar Contrato -SearchAContract=Procurar um Contrato -DeleteAContract=Eliminar um Contrato -CloseAContract=Fechar um Contrato +AddContract=Criar contrato ConfirmDeleteAContract=Tem certeza que quer eliminar este contrato? ConfirmValidateContract=Tem certeza que quer Confirmar este contrato? ConfirmCloseContract=Tem certeza que quer Fechar este contrato? ConfirmCloseService=Tem certeza que quer Fechar este serviço? -ValidateAContract=Confirmar um contrato ActivateService=Ativar o serviço ConfirmActivateService=Tem certeza que quer ativar este serviço em data %s? RefContract=Referencia contrato @@ -53,7 +40,6 @@ ListOfRunningContractsLines=Lista de Linhas de Contratos em Serviço ListOfRunningServices=Lista de Serviços Ativos NotActivatedServices=Serviços Desativados (Com os Contratos Validados) BoardNotActivatedServices=Serviços a Ativar (Com os Contratos Validados) -LastContracts=Os últimos %s contratos modificados LastActivatedServices=Os %s últimos Serviços Ativados LastModifiedServices=Os %s últimos Serviços Modificados EditServiceLine=Edição Linha do Serviço @@ -79,10 +65,7 @@ CloseAllContracts=Fechar Todos os Contratos DeleteContractLine=Eliminar a linha do contrato ConfirmDeleteContractLine=Voce tem certeza que deseja apagar esta linha de contrato ? MoveToAnotherContract=Mover o serviço a outro contrato deste Fornecedor. -ConfirmMoveToAnotherContract=Escolhi o contrato e confirmo o alterar de serviço ao presente contrato. ConfirmMoveToAnotherContractQuestion=Escolha qualquer outro contrato do mesmo Fornecedor, deseja mover este serviço? -PaymentRenewContractId=Renovação do Serviço (Numero %s) -ExpiredSince=Expirado desde RelatedContracts=Contratos relativos NoExpiredServices=Nao tem servicos ativos vencidos ListOfServicesToExpireWithDuration=Lista de servicos a vencer em %s dias @@ -91,10 +74,6 @@ ListOfServicesToExpire=Lista de servicos a vencer NoteListOfYourExpiredServices=Esta lista contém apenas contratos de serviços de terceiros as quais você está ligado como representante de vendas. StandardContractsTemplate=Modelo de contratos simples ContactNameAndSignature=Para %s, nome e assinatura: - -##### Types de contacts ##### -TypeContact_contrat_internal_SALESREPSIGN=Comercial assinante do contrato -TypeContact_contrat_internal_SALESREPFOLL=Comercial seguimento do contrato TypeContact_contrat_external_BILLING=Contato cliente de faturação do contrato TypeContact_contrat_external_CUSTOMER=Contato cliente seguimento do contrato TypeContact_contrat_external_SALESREPSIGN=Contato cliente assinante do contrato diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang index 5e6d6e4b967..36a14dfc527 100644 --- a/htdocs/langs/pt_BR/cron.lang +++ b/htdocs/langs/pt_BR/cron.lang @@ -1,41 +1,30 @@ # Dolibarr language file - Source file is en_US - cron -# About page -About = Sobre -CronAbout = Sobre Cron -CronAboutPage = Pagina sobre Cron -# Right -Permission23101 = Ler tarefa agendada -Permission23102 = Criar/atualizar tarefa agendada -Permission23103 = Apagar tarefa agendada -Permission23104 = Executar tarefa agendada -# Admin -CronSetup= Configuração do gerenciamento de trabalho agendado +About =Sobre +CronAboutPage =Pagina sobre Cron +Permission23101 =Ler tarefa agendada +Permission23102 =Criar/atualizar tarefa agendada +Permission23103 =Apagar tarefa agendada +CronSetup=Configuração do gerenciamento de trabalho agendado URLToLaunchCronJobs=URL para checar e iniciar os cron se necessario OrToLaunchASpecificJob=Ou checkar e iniciar um specifico trabalho KeyForCronAccess=Chave seguranca para URL que lanca tarefas cron FileToLaunchCronJobs=Linha de comando para iniciar tarefas agendadas CronExplainHowToRunUnix=No ambiente Unix você deve usar crontab para executar linha de comando a cada minuto CronExplainHowToRunWin=No ambiente Microsoft (tm) Windows você pode usar ferramentas tarefa agendada para executar a linha de comando cada minuto -# Menu CronJobs=Trabalhos programados -CronListActive= Lista de trabalhos ativos -CronListInactive= Lista de trabalhos nao ativos -CronListActive= Lista de trabalhos ativos -# Page list +CronListInactive=Lista de trabalhos nao ativos CronDateLastRun=Ultimo acionamento CronLastOutput=Saida do ultimo acionamento CronLastResult=Codigo do ultimo resultado -CronListOfCronJobs=Lista de tarefas agendadas -CronCommand=Comando CronList=Lista trabalhos -CronDelete= Apagar tarefas cron -CronConfirmDelete= Tem certeza que deseja apagar este trabalho cron ? +CronDelete=Apagar tarefas cron +CronConfirmDelete=Tem certeza que deseja apagar este trabalho cron ? CronExecute=Lançar trabalho -CronConfirmExecute= Tem certeza que quer executar esta tarefa agora ? -CronInfo= Tarefas permitem de executar aòoes nao planejadas +CronConfirmExecute=Tem certeza que quer executar esta tarefa agora ? +CronInfo=Tarefas permitem de executar aòoes nao planejadas CronWaitingJobs=Trabalhos na espera CronTask=Trabalho -CronNone= Nenhum +CronNone=Nenhum CronDtStart=Data inicio CronDtEnd=Data fim CronDtNextLaunch=Proxima execuçao @@ -45,20 +34,17 @@ CronClass=Clase CronMethod=Metodo CronModule=Modulo CronAction=Açao -CronStatus=Estado CronStatusActive=Ativado CronStatusInactive=Desativado CronNoJobs=Nenhum trabalho registrado -CronPriority=Prioridade CronLabel=Descriçao CronNbRun=Nr. execuçao CronEach=Cada JobFinished=Trabalho iniciado e terminado -#Page card -CronAdd= Adicionar trabalho -CronHourStart= Hora e data do inicio do trabalho -CronEvery= E execute cada tarefa -CronObject= Instancia/Objeto a se criar +CronAdd=Adicionar trabalho +CronHourStart=Hora e data do inicio do trabalho +CronEvery=E execute cada tarefa +CronObject=Instancia/Objeto a se criar CronArgs=Parametros CronSaveSucess=Salvo corretamente CronNote=Comentario @@ -68,7 +54,6 @@ CronStatusActiveBtn=Ativar CronStatusInactiveBtn=Desativar CronTaskInactive=Este trabalho foi desativado CronDtLastResult=Data ultimo resultado -CronId=Id CronClassFile=Classe (nomearquivo.class.php) CronModuleHelp=Nome do diretório do módulo Dolibarr (também trabalha com módulo Dolibarr externo). Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produto/class/product.class.php, o valor do módulo é o produto CronClassFileHelp=O nome do arquivo a ser carregado.
    Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/classe/product.class.php, o valor do nome do arquivo de classe é product.class.php @@ -76,12 +61,9 @@ CronObjectHelp=O nome do objeto a ser carregado. Por exemplo para buscar método CronMethodHelp=O método de objeto para o lançamento. Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/class/product.class.php, o valor do método é fecth CronArgsHelp=Os argumentos do método. Por exemplo para buscar método do objeto Product do Dolibarr /htdocs/produto/class/product.class.php, o valor de paramtetros pode ser 0, ProductRef CronCommandHelp=A linha de comando do sistema a se executar. -# Info CronInfoPage=Informaçao -# Common CronType=Tipo tarefa CronType_method=Chamar metodo da classe Dolibarr CronType_command=Comando Shell -CronMenu=Cron CronCannotLoadClass=Nao e possivel carregar a classe %s ou o objeto %s UseMenuModuleToolsToAddCronJobs=Vá ao menu "Principal - Módulo de ferramentas - Lista de trabalhos" para ver e editar a programação dos trabalhos. diff --git a/htdocs/langs/pt_BR/deliveries.lang b/htdocs/langs/pt_BR/deliveries.lang index 231eca9935d..3c9465cd4b3 100644 --- a/htdocs/langs/pt_BR/deliveries.lang +++ b/htdocs/langs/pt_BR/deliveries.lang @@ -1,26 +1,9 @@ # Dolibarr language file - Source file is en_US - deliveries -Delivery=Envio -Deliveries=Envios -DeliveryCard=Ficha Envio -DeliveryOrder=Ordem de Envio -DeliveryOrders=Ordens de Envio -DeliveryDate=Data de Envio -DeliveryDateShort=Data Envio -CreateDeliveryOrder=Gerar Ordem de Entrega -QtyDelivered=Quant. Enviada -SetDeliveryDate=Indicar a Data de Envio -ValidateDeliveryReceipt=Confirmar a Nota de Entrega ValidateDeliveryReceiptConfirm=Tem certeza de que deseja confirmar esta entrega? DeleteDeliveryReceipt=Apagar Recibo de Entrega DeleteDeliveryReceiptConfirm=Tem certeza de que deseja apagar o recibo de entrega %s ? -DeliveryMethod=Método de Envio TrackingNumber=Nr. de rastreamento DeliveryNotValidated=Entrega nao validada -# merou PDF model -NameAndSignature=Nome e assinatura: -ToAndDate=Em___________________________________ a ____/_____/__________ GoodStatusDeclaration=Recebi a mercadorias acima em bom estado, Deliverer=Destinatario: Sender=Remetente -Recipient=Destinatário -ErrorStockIsNotEnough=Não existe estoque suficiente diff --git a/htdocs/langs/pt_BR/dict.lang b/htdocs/langs/pt_BR/dict.lang index 0dddb4b8b74..20fff4ba5e1 100644 --- a/htdocs/langs/pt_BR/dict.lang +++ b/htdocs/langs/pt_BR/dict.lang @@ -1,318 +1,30 @@ # Dolibarr language file - Source file is en_US - dict -CountryFR=França -CountryBE=Belgica -CountryIT=Italia -CountryES=Espanha -CountryDE=Alemanha -CountryCH=Suiça -CountryGB=Grã-Bretanha -CountryUK=Reino Unido -CountryIE=Irlanda -CountryCN=China -CountryTN=Tunísia -CountryUS=Estados Unidos -CountryMA=Marrocos -CountryDZ=Algeria -CountryCA=Canada -CountryTG=Togo -CountryGA=Gabão -CountryNL=Holanda -CountryHU=Hungria -CountryRU=Russia -CountrySE=Suécia -CountryCI=Costa do Marfim -CountrySN=Senegal -CountryAR=Argentina -CountryCM=Camarões -CountryPT=Portugal -CountrySA=Arábia Saudita -CountryMC=Mônaco -CountryAU=Austrália -CountrySG=Singapura -CountryAF=Afeganistão -CountryAX=Terra Ilhas -CountryAL=Albânia -CountryAS=Samoa Americana -CountryAD=Andorra -CountryAO=Angola -CountryAI=Anguilla -CountryAQ=Antártica -CountryAG=Antígua e Barbuda -CountryAM=Armênia -CountryAW=Aruba -CountryAT=Áustria -CountryAZ=Azerbaijão -CountryBS=Bahamas -CountryBH=Barém -CountryBD=Bangladesh -CountryBB=Barbados -CountryBY=Bielorrússia -CountryBZ=Belize -CountryBJ=Benin -CountryBM=Bermudas -CountryBT=Butão -CountryBO=Bolívia -CountryBA=Bósnia e Herzegovina -CountryBW=Botsuana -CountryBV=Ilha Bouvet -CountryBR=Brasil -CountryIO=Território Britânico do Oceano Índico -CountryBN=Brunei Darussalam -CountryBG=Bulgaria -CountryBF=Burkina Faso -CountryBI=Burundi -CountryKH=Camboja -CountryCV=Cabo Verde -CountryKY=Ilhas Cayman -CountryCF=Central Africano República -CountryTD=Chade -CountryCL=Chile -CountryCX=Ilha Christmas -CountryCC=Ilhas Cocos (Keeling) -CountryCO=Colômbia -CountryKM=Comoros -CountryCG=Congo -CountryCD=Congo, República Democrática do -CountryCK=Ilhas Cook -CountryCR=Costa Rica -CountryHR=Croácia -CountryCU=Cuba -CountryCY=Chipre -CountryCZ=República Checa -CountryDK=Dinamarca -CountryDJ=Djibuti -CountryDM=Dominica -CountryDO=República Dominicana -CountryEC=Equador -CountryEG=Egito -CountrySV=El Salvador -CountryGQ=Guiné Equatorial -CountryER=Eritréia -CountryEE=Estônia -CountryET=Etiópia -CountryFK=Ilhas Malvinas -CountryFO=Ilhas Faroé -CountryFJ=Ilhas Fiji -CountryFI=Finlândia -CountryGF=Guiana Francesa CountryPF=Polinéia Francesa -CountryTF=Territórios Franceses do Sul -CountryGM=Gâmbia -CountryGE=Georgia -CountryGH=Gana -CountryGI=Gibraltar -CountryGR=Grécia -CountryGL=Gronelândia -CountryGD=Granada -CountryGP=Guadalupe -CountryGU=Guam -CountryGT=Guatemala -CountryGN=Guiné -CountryGW=Guiné-Bissau -CountryGY=Guiana -CountryHT=Hati -CountryHM=Ilha Heard e McDonald -CountryVA=Santa Sé (Vaticano) -CountryHN=Honduras -CountryHK=Hong Kong -CountryIS=Icelande -CountryIN=Índia CountryID=Indonéia -CountryIR=Irão -CountryIQ=Iraque -CountryIL=Israel -CountryJM=Jamaica -CountryJP=Japão -CountryJO=Jordânia -CountryKZ=Cazaquistão -CountryKE=Quênia -CountryKI=Kiribati -CountryKP=Coreia do Norte -CountryKR=Coréia do Sul -CountryKW=Kuwait -CountryKG=Kyrghyztan -CountryLA=Laociano -CountryLV=Letônia -CountryLB=Líbano -CountryLS=Lesoto -CountryLR=Libéria -CountryLY=Líbia -CountryLI=Lichtenstein -CountryLT=Lituania -CountryLU=Luxemburgo -CountryMO=Macau -CountryMK=Macedónia, antiga República Jugoslava da -CountryMG=Madagascar -CountryMW=Malauí -CountryMY=Malásia -CountryMV=Maldivas -CountryML=Mali -CountryMT=Malta -CountryMH=Ilhas Marshall -CountryMQ=Martinica -CountryMR=Mauritânia -CountryMU=Maurício -CountryYT=Mayotte -CountryMX=México CountryFM=Micronéia -CountryMD=Moldávia -CountryMN=Mongólia -CountryMS=Montserrat -CountryMZ=Moçambique -CountryMM=Birmania (Myanmar) -CountryNA=Namíbia -CountryNR=Nauruano -CountryNP=Nepal -CountryAN=Antilhas Holandesas -CountryNC=Nova Caledónia -CountryNZ=Nova Zelândia -CountryNI=Nicarágua -CountryNE=Níger -CountryNG=Nigéria -CountryNU=Niue -CountryNF=Ilha Norfolk -CountryMP=Ilhas Marianas do Norte -CountryNO=Noruega -CountryOM=Omã -CountryPK=Paquistão -CountryPW=Palau -CountryPS=Território Palestiniano, Ocupado -CountryPA=Panamá -CountryPG=Papuásia-Nova Guiné -CountryPY=Paraguai -CountryPE=Peru -CountryPH=Filipinas -CountryPN=Ilhas Pitcairn -CountryPL=Polônia -CountryPR=Porto Rico -CountryQA=Catar -CountryRE=Reunião -CountryRO=Romênia -CountryRW=Ruanda -CountrySH=Santa Helena -CountryKN=Saint Kitts e Nevis -CountryLC=Santa Lúcia -CountryPM=Saint-Pierre e Miquelon -CountryVC=São Vicente e Granadinas -CountryWS=Samoa -CountrySM=San Marino -CountryST=São Tomé e Príncipe -CountryRS=Sérvia -CountrySC=Seychelles -CountrySL=Serra Leoa -CountrySK=Eslováquia -CountrySI=Eslovênia -CountrySB=Ilhas Salomão -CountrySO=Somália -CountryZA=África do Sul -CountryGS=Geórgia do Sul e Ilhas Sandwich do Sul -CountryLK=Sri Lanka -CountrySD=Sudão -CountrySR=Suriname -CountrySJ=Svalbard e Jan Mayen -CountrySZ=Suazilândia -CountrySY=Síria -CountryTW=Taiwan -CountryTJ=Tajiquistão -CountryTZ=Tanzânia -CountryTH=Tailândia -CountryTL=Timor-Leste -CountryTK=Toquelau -CountryTO=Tonga -CountryTT=Trinidad e Tobago -CountryTR=Turquia -CountryTM=Turquemenistão -CountryTC=Ilhas Turcas e Cailos -CountryTV=Tuvaluano -CountryUG=Uganda -CountryUA=Ucrania -CountryAE=Emirados Árabes Unidos -CountryUM=Territórios Insulares dos Estados Unidos -CountryUY=Uruguai -CountryUZ=Uzbequistão -CountryVU=Vanuatu -CountryVE=Venezuela -CountryVN=Viet Nam -CountryVG=Ilhas Virgens Britânicas -CountryVI=Ilhas Virgens, E.U. -CountryWF=Wallis e Futuna -CountryEH=Sara Ocidental -CountryYE=Iêmen -CountryZM=Zâmbia -CountryZW=Zimbabué -CountryGG=Guernsey -CountryIM=Ilha de Man -CountryJE=Jersey -CountryME=Montenegro -CountryBL=Saint Barthelemy -CountryMF=Saint Martin - -##### Civilities ##### -CivilityMME=Sra. -CivilityMR=Sr. -CivilityMLE=Dr. -CivilityMTRE=Eng. -CivilityDR=Doutor -##### Currencies ##### -Currencyeuros=Euros CurrencyAUD=Dólaros Australianos CurrencySingAUD=Dólaro Australiano CurrencyCAD=Dólaros CAN CurrencySingCAD=Dolaro Canadense -CurrencyCHF=Francos suíços CurrencySingCHF=Franco Suico -CurrencyEUR=Euros -CurrencySingEUR=Euro -CurrencyFRF=Francos Franceses CurrencySingFRF=Franco Frances CurrencyGBP=Esterlinas Inglesas CurrencySingGBP=Esterlina Inglesa CurrencyINR=Rupias India CurrencySingINR=Rupia India -CurrencyMAD=Dirham -CurrencySingMAD=Dirham -CurrencyMGA=Ariary -CurrencySingMGA=Ariary CurrencyMUR=Mauritius rupias CurrencySingMUR=Mauritius rupia CurrencyNOK=Coroas Norwegas CurrencySingNOK=Coroa Norwega -CurrencyTND=TND CurrencySingTND=Dinaro Tunisino CurrencyUSD=Dólaros E.U. CurrencySingUSD=Dólar E.U. -CurrencyUAH=Hryvnia -CurrencySingUAH=Hryvnia -CurrencyXAF=Francos CFA BEAC -CurrencySingXAF=Franco CFA BEAC -CurrencyXOF=Francos CFA BCEAO -CurrencySingXOF=Franco CFA BCEAO CurrencyXPF=Francos CFP -CurrencySingXPF=Franco CFP -CurrencyCentSingEUR=centavo -CurrencyThousandthSingTND=mil -#### Input reasons ##### -DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Campanha correio DemandReasonTypeSRC_CAMP_EMAIL=Campanha por E-mail DemandReasonTypeSRC_CAMP_PHO=Campanha Telefone -DemandReasonTypeSRC_CAMP_FAX=Campanha Fax -DemandReasonTypeSRC_COMM=Contato comercial DemandReasonTypeSRC_SHOP=Contato na loja -DemandReasonTypeSRC_WOM=Palavra da boca -DemandReasonTypeSRC_PARTNER=Parceiro -DemandReasonTypeSRC_EMPLOYEE=Empregado DemandReasonTypeSRC_SPONSORING=Sponsorizacao -#### Paper formats #### -PaperFormatEU4A0=Formato 4A0 -PaperFormatEU2A0=Formato 2A0 -PaperFormatEUA0=Formato A0 -PaperFormatEUA1=Formato A1 -PaperFormatEUA2=Formato A2 -PaperFormatEUA3=Formato A3 -PaperFormatEUA4=Formato A4 -PaperFormatEUA5=Formato A5 -PaperFormatEUA6=Formato A6 PaperFormatUSLETTER=Formato Carta E.U.A. PaperFormatUSLEGAL=Formato Legal E.U.A. PaperFormatUSEXECUTIVE=Formato Executivo E.U.A. diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang index 22908e103a7..60c851b3eaf 100644 --- a/htdocs/langs/pt_BR/donations.lang +++ b/htdocs/langs/pt_BR/donations.lang @@ -4,29 +4,12 @@ Donations=Doações DonationRef=Doaçaõ ref. Donor=Dador Donors=Dadores -AddDonation=Adicionar Doação -NewDonation=Nova Doação ShowDonation=Mostrar doaçaõ -DonationPromise=Promessa de Doação -PromisesNotValid=Promessas Não Validadas -PromisesValid=Promessas Validadas DonationsPaid=Doações pagas -DonationsReceived=Doações Recebidas -PublicDonation=Doação Pública -DonationsNumber=Número de Doações -DonationsArea=Área de Doações -DonationStatusPromiseNotValidated=Promessa Não Validada -DonationStatusPromiseValidated=Promessa Validada DonationStatusPaid=Doaçaõ recebida -DonationStatusPromiseNotValidatedShort=Não Validada -DonationStatusPromiseValidatedShort=Validada DonationStatusPaidShort=Recebido -ValidPromess=Validar promessa DonationReceipt=Recibo doaçaõ -BuildDonationReceipt=Criar Recibo -DonationsModels=Modelo de documento de recepção de Doação -LastModifiedDonations=As ultimas %s doações modificadaas +LastModifiedDonations=As ultimas %s doações modificadaas SearchADonation=Buscar doaçaõ DonationRecipient=Recipiente doaçaõ -ThankYou=Obrigado IConfirmDonationReception=Declaro o recebimento como doaçaõ, de seguinte montante. diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang index 957a7778fef..950e0e3cdc3 100644 --- a/htdocs/langs/pt_BR/ecm.lang +++ b/htdocs/langs/pt_BR/ecm.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - ecm -MenuECM=Documentos DocsMine=Os meus documentos DocsGenerated=Documentos gerados DocsElements=Elementos dos documentos @@ -10,13 +9,10 @@ DocsOrders=Documentos de pedidos DocsInvoices=Documentos de faturas ECMNbOfDocs=Nr. de documentos ECMNbOfDocsSmall=Nr. de doc. -ECMSection=Pasta ECMSectionManual=Pasta manual ECMSectionAuto=Pasta automática ECMSectionsManual=Pastas manuais ECMSectionsAuto=Pastas automáticas -ECMSections=Pastas -ECMRoot=Raíz ECMNewSection=Criar pasta ECMAddSection=Adicionar pasta ECMNewDocument=Novo documento @@ -25,25 +21,16 @@ ECMNbOfFilesInDir=Número de arquivos na pasta ECMNbOfSubDir=Número de subpastas ECMNbOfFilesInSubDir=Numero de arquivos nos subpastas ECMCreationUser=Criado por -ECMArea=Área GED ECMAreaDesc=O GED (Gestão Eletrônica de Documentos) permite salvar, compartilhar e pesquisar rapidamente todos os tipos de documentos contidos no Dolibarr. ECMAreaDesc2=* As pastas automáticas são geradas automaticamente quando algum arquivo é adicionado a algum ficheiro do sistema.
    * As pastas manuais podem ser usados ​​para guardar documentos sem ligação a um cadastro do sistema. -ECMSectionWasRemoved=A pasta %s foi eliminada ECMDocumentsSection=Documento da pasta ECMSearchByKeywords=Busca usando palavras chave ECMSearchByEntity=Busca por objeto ECMSectionOfDocuments=Pastas de documentos -ECMTypeManual=Manual -ECMTypeAuto=Automático -ECMDocsBySocialContributions=Documentos associados a contribuições sociais ECMDocsByThirdParties=Documentos associados a fornecedores ECMDocsByProposals=Documentos associados a orçamentos -ECMDocsByOrders=Documentos associados a pedidos -ECMDocsByContracts=Documentos associados a contratos ECMDocsByInvoices=Documentos associados a faturas do cliente -ECMDocsByProducts=Documentos associados a produtos ECMDocsByProjects=Documentos associados a projetos -ECMNoDirectoryYet=Nenhuma pasta criada ShowECMSection=Exibir pasta DeleteSection=Apagar pasta ConfirmDeleteSection=Você confirmar que quer apagar a pasta %s ? @@ -52,4 +39,3 @@ CannotRemoveDirectoryContainsFiles=Não foi possível apagar, porque contém alg ECMFileManager=Gerenciador de arquivos ECMSelectASection=Selecione uma pasta na árvore a esquerda... DirNotSynchronizedSyncFirst=Esta pasta parece que foi criada ou modificada fora do módulo GED. Você deve clicar no botão "Atualizar" para sincronizar as informações com o banco de dados e poder ver o conteúdo da pasta. - diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang index 3f9d535095b..6bdc570f7f9 100644 --- a/htdocs/langs/pt_BR/errors.lang +++ b/htdocs/langs/pt_BR/errors.lang @@ -1,10 +1,5 @@ # Dolibarr language file - Source file is en_US - errors - -# No errors NoErrorCommitIsDone=Nenhum erro, cometemos -# Errors -Error=Erro -Errors=Erros ErrorButCommitIsDone=Erros encontrados, mas que, apesar disso validar ErrorBadEMail=EMail% s está errado ErrorBadUrl=Url% s está errado @@ -16,28 +11,21 @@ ErrorFailToRenameFile=Falha ao renomear o arquivo '% s' para '% s'.%s    '. ErrorFailToCreateFile=Erro ao criar o arquivo '' ErrorFailToRenameDir=Error à renombar a pasta '%s' a '%s'. -ErrorFailToCreateDir=Erro ao criar a pasta '%s' ErrorFailToDeleteDir=Error à eliminar a pasta '%s'. ErrorFailedToDeleteJoinedFiles=impossível eliminar a entidade já que tem Arquivos anexos. Elimine antes os Arquivos anexos ErrorThisContactIsAlreadyDefinedAsThisType=Este contato já está definido como contato para este tipo. -ErrorCashAccountAcceptsOnlyCashMoney=Esta conta bancaria é de tipo Caixa e só aceita o método de pagamento de tipo especie. ErrorFromToAccountsMustDiffers=a conta origem e destino devem ser diferentes. ErrorBadThirdPartyName=Nome de Fornecedor incorreto ErrorProdIdIsMandatory=Obrigatório ErrorBadCustomerCodeSyntax=a sintaxis do código cliente é incorreta ErrorBadBarCodeSyntax=A sintaxe do código de barras esta incorreta -ErrorCustomerCodeRequired=Código cliente obrigatório ErrorBarCodeRequired=Código de barras necessário -ErrorCustomerCodeAlreadyUsed=Código de cliente já utilizado ErrorBarCodeAlreadyUsed=Código de barras já utilizado -ErrorPrefixRequired=Prefixo obrigatório ErrorUrlNotValid=O Endereço do Site está incorreta ErrorBadSupplierCodeSyntax=a sintaxis do código fornecedor é incorreta -ErrorSupplierCodeRequired=Código fornecedor obrigatório -ErrorSupplierCodeAlreadyUsed=Código de fornecedor já utilizado ErrorBadParameters=parâmetros incorretos -ErrorBadValueForParameter=Valor errado, parâmetro incorreto -ErrorBadImageFormat=O arquivo de imagem não tem um formato suportado +ErrorBadValueForParameter=Valor errado, parâmetro incorreto +ErrorBadImageFormat=Arquivo imagem de formato não suportado (Seu PHP não suporta funções para converter neste formato) ErrorBadDateFormat=Valor tem o formato de data errada ErrorWrongDate=A data não está correta! ErrorFailedToWriteInDir=impossível escribir na pasta %s @@ -72,31 +60,25 @@ ErrorLDAPSetupNotComplete=a configuração Dolibarr-LDAP é incompleta. ErrorLDAPMakeManualTest=foi criado unn Arquivo .ldif na pasta %s. Trate de gastor manualmente este Arquivo a partir da linha de comandos para Obter mais detalles acerca do error. ErrorCantSaveADoneUserWithZeroPercentage=No se pode cambiar uma acção ao estado no comenzada si tiene un usuario realizante de a acción. ErrorRefAlreadyExists=a referencia utilizada para a criação já existe -ErrorPleaseTypeBankTransactionReportName=Introduzca o Nome do registo bancario sobre a qual o escrito está constatado (formato AAAAMM ó AAAMMJJ) ErrorRecordHasChildren=não se pode eliminar o registo porque tem hijos. ErrorRecordIsUsedCantDelete=Não é possível excluir registro. Ele já é usado ou incluídos em outro objeto. ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display. -ErrorPasswordsMustMatch=Ambas as senhas digitadas devem corresponder entre si ErrorContactEMail=Um erro técnico ocorrido. Por favor, contate o administrador para seguinte e-mail% s en fornecer o código de erro% s em sua mensagem, ou ainda melhor, adicionando uma cópia de tela da página. ErrorWrongValueForField=Valor errado para o número do campo% s (valor '% s' não corresponde regra% s) ErrorFieldValueNotIn=Valor errado para o número do campo% s (valor '% s' não é um valor disponível no campo% s da tabela% s) ErrorFieldRefNotIn=Valor errado para o número do campo% s (valor '% s' não é um% s ref existente) ErrorsOnXLines=Erros no registro de origem% s (s) -ErrorFileIsInfectedWithAVirus=O programa antivírus não foi capaz de validar o arquivo (arquivo pode ser infectado por um vírus) ErrorSpecialCharNotAllowedForField=Os caracteres especiais não são permitidos para o campo "% s" ErrorDatabaseParameterWrong=Parâmetro de configuração do banco de dados '% s' tem um valor não é compatível para usar Dolibarr (deve ter o valor '% s'). ErrorNumRefModel=Uma referência existe no banco de dados (% s) e não é compatível com esta regra de numeração. Remover registro ou referência renomeado para ativar este módulo. ErrorQtyTooLowForThisSupplier=Quantidade insuficiente para este fornecedor ErrorModuleSetupNotComplete=Configuração do módulo parece ser incompleto. Vá em Setup - Módulos para ser concluído. -ErrorBadMask=Erro na máscara ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sem número de sequência ErrorBadMaskBadRazMonth=Erro, valor de redefinição ruim -ErrorSelectAtLeastOne=Erro. Selecione pelo menos uma entrada. ErrorProductWithRefNotExist=O produto com referência não existem '% s' ErrorDeleteNotPossibleLineIsConsolidated=Não e possívelexcluir porque registro está ligada a uma transação bancária que está conciliada ErrorProdIdAlreadyExist=% S é atribuída a outro terço ErrorFailedToSendPassword=Erro ao enviar a senha -ErrorFailedToLoadRSSFile=Falha ao obter feed RSS. Tente adicionar MAIN_SIMPLEXMLLOAD_DEBUG constante se as mensagens de erro não fornecer informações suficientes. ErrorPasswordDiffers=As Senhas não são identicas, volte a introduzi-las ErrorForbidden=acesso não autorizado.
    Tentando acessar a uma página, zona o função sem estar em uma Sessão autentificada o que não se autoriza para a sua conta de usuário. ErrorForbidden2=Os permissões para este usuário podem ser designados por o administrador Dolibarr mediante o menu %s-> %s. @@ -104,7 +86,6 @@ ErrorForbidden3=Dolibarr não parece funcionar em uma Sessão autentificada. Con ErrorNoImagickReadimage=a função imagick_readimage não está presente nesta Instalação de PHP. a resenha não está pois disponível. Os administradores podem desativar esta separador ao menu configuração - visualização. ErrorRecordAlreadyExists=registo já existente ErrorCantReadFile=Erro na leitura do arquivo '&s' -ErrorCantReadDir=Erro na leitura da pasta '%s' ErrorFailedToFindEntity=Error de leitura da entidade '%s' ErrorBadLoginPassword=Identificadores de usuário o senha incorretos ErrorLoginDisabled=a sua conta está desativada @@ -114,8 +95,7 @@ ErrorLoginDoesNotExists=a conta de usuário de %s não foi encontrado. ErrorLoginHasNoEmail=Este usuário não tem e-mail. impossível continuar. ErrorBadValueForCode=Valor incorreto para o código. volte a \ttentar com um Novo valor... ErrorBothFieldCantBeNegative=Campos% se% s não pode ser tanto negativo -ErrorWebServerUserHasNotPermission=Conta de usuário usado para executar servidor não tem permissão -ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado +ErrorWebServerUserHasNotPermission=Conta de usuário usado para executar servidor não tem permissão ErrUnzipFails=Falha ao descompactar com ZipArchive ErrNoZipEngine=Não esta instaladoo programa para descompactar o arquivo% s neste PHP ErrorFileMustBeADolibarrPackage=O arquivo deve ser um pacote zip Dolibarr @@ -126,18 +106,16 @@ ErrorFailedToRemoveToMailmanList=Falha ao remover registro% s para% s Mailman li ErrorNewValueCantMatchOldValue=O novo valor não pode ser igual ao anterior ErrorFailedToValidatePasswordReset=Falha ao reinicializar senha. Pode ser o reinit já foi feito (este link pode ser usado apenas uma vez). Se não, tente reiniciar o processo reinit. ErrorToConnectToMysqlCheckInstance=Conecte-se ao banco de dados falhar. Verifique servidor MySQL está rodando (na maioria dos casos, você pode iniciá-lo a partir de linha de comando com o "sudo / etc / init.d / mysql start '). -ErrorFailedToAddContact=Falha ao adicionar contato ErrorDateMustBeBeforeToday=A data não pode ser maior do que hoje ErrorPaymentModeDefinedToWithoutSetup=A modalidade de pagamento foi definido para tipo% s mas a configuração do módulo de fatura não foi concluída para definir as informações para mostrar para esta modalidade de pagamento. ErrorPHPNeedModule=Erro, o PHP deve ter módulo% s instalado para usar este recurso. ErrorOpenIDSetupNotComplete=Você arquivo de configuração Dolibarr configuração para permitir a autenticação OpenID, mas a URL de serviço OpenID não está definido em constante% s ErrorWarehouseMustDiffers=A conta origem e destino devem ser diferentes ErrorBadFormat=Formato ruim! -ErrorPaymentDateLowerThanInvoiceDate=Data de Pagamento (% s) não pode "ser antes da data da fatura para faturar. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erro, esse membro ainda não está vinculado a qualquer fornecedor. Fazer a ligação membro a um terceiro existente ou criar uma novo fornecedor antes de criar assinatura com nota fiscal. ErrorThereIsSomeDeliveries=Erro, há algumas entregas ligados a este envio. Supressão recusou. - -# Warnings +ErrorCantDeletePaymentReconciliated=Não posso deletar o pagamento que gerou uma transação bancaria conciliada. +ErrorCantDeletePaymentSharedWithPayedInvoice=Não e possivel cancelar o pagamento condiviso para pelo menos uma fatura com estado Pago WarningMandatorySetupNotComplete=Parâmetros de configuração obrigatórios ainda não estão definidos WarningSafeModeOnCheckExecDir=Atenção, a opção PHP safe_mode está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro safe_mode_exec_dir. WarningAllowUrlFopenMustBeOn=o parâmetro allow_url_fopen deve ser especificado a on ao Arquivo php.ini para discolocar deste módulo completamente ativo. deve modificar este Arquivo manualmente @@ -153,4 +131,6 @@ WarningCloseAlways=Atenção, o fechamento é feito mesmo se o valor difere entr WarningUsingThisBoxSlowDown=Atenção, utilizando esta caixa de abrandar a sério todas as páginas que mostram a caixa. WarningClickToDialUserSetupNotComplete=Configuração de informações ClickToDial para o usuário não são completas (ver guia ClickToDial no seu cartão de usuário). WarningNotRelevant=Operação irrelevante para este conjunto de dados -WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Função desabilitada quando a tela e optimizada para uso das pessoas cegas ou navegadores de texto. +WarningPaymentDateLowerThanInvoiceDate=Data de pagamento (%s) e antes da data da nota (%s) para a fatura %s. +WarningTooManyDataPleaseUseMoreFilters=Dados de mais, por favor use mais filtros diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang index 51eeab11ac9..d680c4d1145 100644 --- a/htdocs/langs/pt_BR/exports.lang +++ b/htdocs/langs/pt_BR/exports.lang @@ -1,49 +1,23 @@ # Dolibarr language file - Source file is en_US - exports ExportsArea=Área Exportações -ImportArea=Área de Importação -NewExport=Nova Exportação -NewImport=Nova Importação -ExportableDatas=Conjunto de dados exportáveis ImportableDatas=Conjunto de dados importaveis SelectExportDataSet=Escolha um conjunto predefinido de dados que deseja exportar... SelectImportDataSet=Escolha um conjunto predefinido de dados que deseja importar... -SelectExportFields=Escolha os campos que devem exportar-se, ou escolha um perfil de exportação predefinido SelectImportFields=Escolha campos de arquivo de fonte que você deseja importar e seu campo de destino no banco de dados, movendo-os para cima e para baixo com a seta, ou selecione um perfil de importação pré-definido: NotImportedFields=Os campos de arquivo de origem não importado -SaveExportModel=Guardar este perfil de exportação assim pode reutiliza-lo posteriormente... SaveImportModel=Guardar este perfil de importação assim pode reutiliza-lo posteriormente... -ExportModelName=Nome do perfil de exportação -ExportModelSaved=Perfil de exportação guardado com o nome de %s. -ExportableFields=Campos Exportáveis -ExportedFields=Campos a Exportar ImportModelName=Nome do perfil de importação ImportModelSaved=Perfil de importação guardado com o nome de %s. ImportableFields=Campos Importáveis ImportedFields=Campos a Importar -DatasetToExport=Conjunto de dados a exportar DatasetToImport=Conjunto de dados a importar NoDiscardedFields=Não há campos em arquivo de origem são descartados -Dataset=Conjunto de Dados -ChooseFieldsOrdersAndTitle=Escolha a ordem dos campos... -FieldsOrder=Ordem dos Campos -FieldsTitle=Título Campos FieldOrder=Ordem de campo -FieldTitle=Campo título -ChooseExportFormat=Escolha o formato de exportação NowClickToGenerateToBuildExportFile=Agora, faça click em "Gerar" para gerar o arquivo exportação... -AvailableFormats=Formatos Disponíveis -LibraryShort=Biblioteca LibraryUsed=Bibliotéca Utilizada -LibraryVersion=Versão -Step=Passo -FormatedImport=Assistente de Importação -FormatedImportDesc1=Esta área permite realizar importações personalizadas de dados mediante um ajudante que evita ter conhecimentos técnicos de Dolibarr. FormatedImportDesc2=O primeiro passo consiste em escolher o tipo de dado que deve importar, logo o arquivo e a continuação escolher os campos que deseja importar. -FormatedExport=Assistente de Exportação -FormatedExportDesc1=Esta área permite realizar exportações personalizadas dos dados mediante um ajudante que evita ter conhecimentos técnicos de Dolibarr. FormatedExportDesc2=O primeiro passo consiste em escolher um dos conjuntos de dados predefinidos, a continuação escolher os campos que quer exportar para o arquivo e em que ordem. FormatedExportDesc3=Uma vez selecionados os dados, é possível escolher o formato do arquivo de exportação gerado. -Sheet=Folha NoImportableData=Não existe tipo de dados importavel (não existe nenhum módulo com definições de dados importavel ativado) FileSuccessfullyBuilt=Arquivo de exportação gerado SQLUsedForExport=Pedido de SQL usado para construir exportação de arquivo @@ -56,17 +30,13 @@ LineTotalHT=Valor do HT por linha LineTotalTTC=Acrescido de ICMS da linha LineTotalVAT=Valor ICMS por Linha TypeOfLineServiceOrProduct=Tipo de Linha (0 -FileWithDataToImport=Arquivo com os dados de importação FileToImport=Arquivo de origem de importação FileMustHaveOneOfFollowingFormat=Arquivo para importação deve ter um dos seguinte formato DownloadEmptyExample=Baixar exemplo de arquivo de origem vazio ChooseFormatOfFileToImport=Escolha o formato de arquivo a ser usado como formato de arquivo de importação clicando no para selecioná-lo ... ChooseFileToImport=Carregar arquivo e clique no picto% s para selecionar o arquivo como arquivo de importação de fonte ... -SourceFileFormat=Formato de arquivo de origem FieldsInSourceFile=Campos em arquivo de origem FieldsInTargetDatabase=Campos de destino no banco de dados Dolibarr (negrito = obrigatório) -Field=Campo -NoFields=Nenhum campo MoveField=Mover campo número da colunas ExampleOfImportFile=Exemplo de arquivo de importação SaveImportProfile=Guardar este perfil de importação @@ -78,13 +48,10 @@ TableTarget=Alvo FieldTarget=Campo de destino FieldSource=Campo Fonte DoNotImportFirstLine=Não importar primeira linha de arquivo de origem -NbOfSourceLines=Número de linhas no arquivo de origem NowClickToTestTheImport=Verifique os parâmetros de importação que você definiu. Se eles estiverem corretos, clique no botão "% s" para iniciar uma simulação do processo de importação (os dados não serão alterados em seu banco de dados, é apenas uma simulação para o momento) ... -RunSimulateImportFile=Inicie a simulação de importação FieldNeedSource=Este campo requer dados do arquivo de origem SomeMandatoryFieldHaveNoSource=Alguns campos obrigatórios não têm nenhuma fonte de arquivo de dados InformationOnSourceFile=Informações sobre arquivo de origem -InformationOnTargetTables=Informações sobre os campos de destino SelectAtLeastOneField=Mude pelo menos um campo de origem na coluna de campos para exportar SelectFormat=Escolha este formato de arquivo de importação RunImportFile=Arquivo de importação de lançamento @@ -94,7 +61,6 @@ ErrorMissingMandatoryValue=Dados obrigatórios esta vazio no arquivo de origem p TooMuchErrors=Há ainda outras linhas de origem com erros mas a produção tem sido limitado. TooMuchWarnings=Há ainda outras linhas de origem com avisos, mas a produção tem sido limitado. EmptyLine=Linha vazia (serão descartados) -CorrectErrorBeforeRunningImport=Primeiro, você deve corrigir todos os erros antes de executar a importação definitiva. FileWasImported=O arquivo foi importado com o números. YouCanUseImportIdToFindRecord=Você pode encontrar todos os registros importados em seu banco de dados, filtrando em campo import_key. NbOfLinesOK=Número de linhas sem erros e sem avisos: @@ -106,29 +72,21 @@ DataComeFromIdFoundFromCodeId=O código que vem de número do campo do arquivo d DataIsInsertedInto=Dados provenientes do arquivo de origem será inserido o seguinte campo: DataIDSourceIsInsertedInto=O id do objeto pai encontrado usando os dados em arquivo de origem, será inserido o seguinte campo: DataCodeIDSourceIsInsertedInto=O ID da linha pai encontrado a partir do código, será inserido no campo a seguir: -SourceRequired=Valor dos dados é obrigatória SourceExample=Exemplo de possível valor dos dados ExampleAnyRefFoundIntoElement=Qualquer ref encontrada para o elemento ExampleAnyCodeOrIdFoundIntoDictionary=Qualquer código (ou id) encontrado em dicionário -CSVFormatDesc=Formato de arquivo de valores separados por vírgulas . Este é um formato de arquivo de texto, onde os campos são separados pelo separador. Se separador é encontrado dentro de um conteúdo de campo, o campo é arredondado pelo caráter rodada . Fuja personagem para escapar caráter rodada é +CSVFormatDesc=Formato de arquivo de valores separados por vírgulas . Este é um formato de arquivo de texto, onde os campos são separados pelo separador. Se separador é encontrado dentro de um conteúdo de campo, o campo é arredondado pelo caráter rodada . Fuja personagem para escapar caráter rodada é Excel95FormatDesc=Formato de arquivo do Excel. (Xls) Este é o formato Excel 95 nativa (BIFF5). Excel2007FormatDesc=Formato de arquivo do Excel (. Xlsx) Este é o formato Excel 2007 nativo (SpreadsheetML). TsvFormatDesc=Formato de arquivo Tab Separated Value (. TSV) Este é um formato de arquivo de texto, onde os campos são separados por um tabulador [Tab]. ExportFieldAutomaticallyAdded=O campo foi adicionado automaticamente. Ele vai evitar que você tenha linhas semelhantes a serem tratados como registros duplicados (com este campo adicionado, todas as linhas serão possuem seu próprio ID e será diferente). CsvOptions=Opções csv -Separator=Separador Enclosure=Recinto SuppliersProducts=Fornecedores Produtos -BankCode=Código Banco -DeskCode=Código Balcão -BankAccountNumber=Número de conta -BankAccountNumberKey=Dígito Control SpecialCode=Código especial ExportStringFilter=Permite substituir um ou mais caracteres no texto ExportDateFilter='AAAA' YYYYMM 'AAAAMMDD': filtros em um ano / mês / dia
    'AAAA + AAAA' YYYYMM + YYYYMM 'AAAAMMDD + AAAAMMDD': filtros mais uma série de anos / meses / dias
    > AAAA ''> YYYYMM ''> AAAAMMDD ': filtros nos seguintes anos / meses / dias
    ' filtros "NNNNN + NNNNN 'mais de uma faixa de valores
    '> NNNNN' filtros por valores mais baixos
    '> NNNNN' filtros por valores mais elevados -## filters SelectFilterFields=Se você deseja filtrar alguns valores, apenas os valores de entrada aqui. -FilterableFields=Champs Filtrables FilteredFields=Campos filtrados FilteredFieldsValues=Valor para o filtro diff --git a/htdocs/langs/pt_BR/externalsite.lang b/htdocs/langs/pt_BR/externalsite.lang index 6999e5d2f56..f0669dcd138 100644 --- a/htdocs/langs/pt_BR/externalsite.lang +++ b/htdocs/langs/pt_BR/externalsite.lang @@ -1,4 +1,4 @@ # Dolibarr language file - Source file is en_US - externalsite -ExternalSiteSetup=Link configuraçao ao site externo +ExternalSiteSetup=Link configuraçao ao site externo ExternalSiteURL=URL site externo ExternalSiteModuleNotComplete=Modulo SiteExterno nao foi configurado corretamente. diff --git a/htdocs/langs/pt_BR/ftp.lang b/htdocs/langs/pt_BR/ftp.lang index 50e84ff872f..b388a7474cb 100644 --- a/htdocs/langs/pt_BR/ftp.lang +++ b/htdocs/langs/pt_BR/ftp.lang @@ -9,4 +9,3 @@ FailedToConnectToFTPServer=Falha na conexão ao servidor FTP (server% s, porta% FailedToConnectToFTPServerWithCredentials=Falha ao efetuar login no servidor FTP com login/senha FTPFailedToRemoveFile=Falha ao remover o arquivo %s. FTPFailedToRemoveDir=Falha ao remover diretório %s (verifique as permissões e se o diretório está vazio). -FTPPassiveMode=Modo passivo diff --git a/htdocs/langs/pt_BR/help.lang b/htdocs/langs/pt_BR/help.lang index ac681075712..45771022c6c 100644 --- a/htdocs/langs/pt_BR/help.lang +++ b/htdocs/langs/pt_BR/help.lang @@ -1,23 +1,19 @@ # Dolibarr language file - Source file is en_US - help -CommunitySupport=Fórum/Wiki suporte +CommunitySupport=Fórum/Wiki suporte EMailSupport=E-mails de suporte RemoteControlSupport=Suporte em tempo real / remoto OtherSupport=Outros suportes ToSeeListOfAvailableRessources=Entrar em contato com/consulte os recursos disponíveis: -ClickHere=Clickque aqui HelpCenter=Central de ajuda DolibarrHelpCenter=Centro de suporte e ajuda Dolibarr ToGoBackToDolibarr=Caso contrário, clique aqui para usar Dolibarr TypeOfSupport=Fonte de suporte -TypeSupportCommunauty=Comunidade (grátis) -TypeSupportCommercial=Comercial -TypeOfHelp=Tipo NeedHelpCenter=Precisa de ajuda ou suporte ? Efficiency=eficiência TypeHelpOnly=Somente ajuda TypeHelpDev=Ajuda+Desenvolvimento TypeHelpDevForm=Ajuda+Desenvolvimento+Formação -ToGetHelpGoOnSparkAngels1=Algumas empresas podem prover um suporte online rápido (às vezes imediato) e mais eficiente ao assumirem o controle de seu computador. Tais ajudantes podem ser encontrados na página %s: +ToGetHelpGoOnSparkAngels1=Algumas empresas podem prover um suporte online rápido (às vezes imediato) e mais eficiente ao assumirem o controle de seu computador. Tais ajudantes podem ser encontrados na página %s: ToGetHelpGoOnSparkAngels3=Você também pode acessar a lista de todos os treinadores disponíveis para o Dolibarr, para isto clique no botão ToGetHelpGoOnSparkAngels2=Às vezes, não há nenhuma empresa disponível no momento de fazer sua pesquisa, por isso acho que para mudar o filtro para procurar "tudo disponibilidade". Você será capaz de enviar mais pedidos. BackToHelpCenter=Caso contrário, clique aqui para ir para trás para ajudar a home page . diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang index bd3f3d02f2f..7586477f9e5 100644 --- a/htdocs/langs/pt_BR/holiday.lang +++ b/htdocs/langs/pt_BR/holiday.lang @@ -1,68 +1,57 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Ferias -CPTitreMenu=Ferias +Holidays=Leaves +CPTitreMenu=Leaves MenuReportMonth=Relatorio mensal -MenuAddCP=Aplicar para ferias -NotActiveModCP=Vocẽ tem que habilitar o modulo de ferias para ver esta pagina. -NotConfigModCP=Você precisa configurar o modulo de ferias para ver esta pagina. Para faze-lo, clickque aqui . -NoCPforUser=Voce nao tem demandado as ferias. -AddCP=Aplique-se para as ferias. -Employe=Empregado +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request DateDebCP=Data inicio DateFinCP=Data fim DateCreateCP=Data criacão -DraftCP=Rascunho ToReviewCP=Aguardando aprovação -ApprovedCP=Aprovado -CancelCP=Cancelado RefuseCP=Negado ValidatorCP=Aprovador -ListeCP=Lista de feriados +ListeCP=List of leaves ReviewedByCP=Sera revisado por -DescCP=Descrição -SendRequestCP=Criando demanda para ferias -DelayToRequestCP=Demandas para ferias teram que ser feitas no minimo %s dias antes. -MenuConfCP=Editar balancete das ferias -UpdateAllCP=Atualizar ferias -SoldeCPUser=Equilíbrio dos feriados dias. +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Você deve selecionar uma data final posterior à data inicial. ErrorSQLCreateCP=Ocorreu um erro no SQL durante a criação: -ErrorIDFicheCP=Ocorreu um erro, no pedido de ferias não existe. +ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Retorne à página anterior -ErrorUserViewCP=Você não está autorizado a ler essa requisição de férias. -InfosCP=Informações da demanda das férias +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request InfosWorkflowCP=Fluxo de Trabalho de Informação RequestByCP=Requisitado por -TitreRequestCP=Folha de férias -NbUseDaysCP=Número de dias utilizados das férias -EditCP=Editar +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed DeleteCP=Eliminar ActionValidCP=Confirmar ActionRefuseCP=Não autorizar -ActionCancelCP=Cancelar -StatutCP=Estado -SendToValidationCP=Enviar para validação -TitleDeleteCP=Apagar a requisição de férias -ConfirmDeleteCP=Confirme a eliminação deste pedido para férias? -ErrorCantDeleteCP=Você não tem privilégios para apanhar essa requisição de férias -CantCreateCP=Você não tem o direito de aplicar para férias. -InvalidValidatorCP=Você deve escolher um aprovador ao seu pedido de férias. -UpdateButtonCP=Modificar -CantUpdate=Você não pode atualizar esta solicitação de férias. +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. +CantUpdate=You cannot update this leave request. NoDateDebut=Você deve selecionar uma data inicial. NoDateFin=Você deve selecionar uma data final. -ErrorDureeCP=O seu pedido de férias não contém dia de trabalho. -TitleValidCP=Aprovar a requisição de férias -ConfirmValidCP=Você tem certeza que deseja aprovar a requisição de férias? -DateValidCP=Data aprovada -TitleToValidCP=Enviar requisição de férias -ConfirmToValidCP=Você tem certeza que deseja enviar a requisição de férias? -TitleRefuseCP=Não autorizar a requisição de férias -ConfirmRefuseCP=Você tem certeza que não deseja autorizar a requisição de férias? +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request +ConfirmValidCP=Are you sure you want to approve the leave request? +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? +TitleRefuseCP=Refuse the leave request +ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Você deve selecionar uma razão para não autorizar a requisição. -TitleCancelCP=Cancelar a requisição de férias -ConfirmCancelCP=Você tem certeza que deseja cancelar a requisição de férias? +TitleCancelCP=Cancel the leave request +ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Motivo da recusa DateRefusCP=Data da recusa DateCancelCP=Data do cancelamento @@ -72,45 +61,27 @@ MotifCP=Razão UserCP=Usuário ErrorAddEventToUserCP=Ocorreu um erro ao adicionar a licença excepcional. AddEventToUserOkCP=A adição da licença excepcional tenha sido concluída. -MenuLogCP=Ver registos de ferias -LogCP=Calculo de atualizações de ferias +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days ActionByCP=Interpretada por -UserUpdateCP=Para o utilizador PrevSoldeCP=Balanço anterior NewSoldeCP=Novo Balanco -alreadyCPexist=Um pedido de ferias já foi feito neste período. +alreadyCPexist=A leave request has already been done on this period. UserName=Apelidos -Employee=Empregado -FirstDayOfHoliday=Primeiro dia de férias -LastDayOfHoliday=Último dia de férias +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=A atualização mensal ManualUpdate=Atualização manual -HolidaysCancelation=Feriados cancelados - -## Configuration du Module ## -ConfCP=A configuração do módulo de ferias +ConfCP=Configuration of leave request module DescOptionCP=Descrição da opção ValueOptionCP=Valor -GroupToValidateCP=Grupo com a capacidade de aprovar ferias +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validar a configuração -LastUpdateCP=Última atualização automática das férias +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Atualizado com sucesso. ErrorUpdateConfCP=Ocorreu um erro durante a atualização, por favor, tente novamente. -AddCPforUsers=Por favor, adicione o balanço dos feriados de usuários, define_ferias" estilo="fonte -weight: normal; color: vermelha; texto decoração: sublinhar; clicando aqui . -DelayForSubmitCP=Prazo para solicitar feriados -AlertapprobatortorDelayCP=Impedir a approvação se o pedido de férias não coincidir com a data limite -AlertValidatorDelayCP=Prevenir o aprovador se o pedido de férias exceder atraso -AlertValidorSoldeCP=Impedir a aprovador se o pedido de férias exceder o equilíbrio -nbUserCP=Número de usuários suportados nas férias de módulo -nbHolidayDeductedCP=Número de feriados a ser deduzido por dia de feriado tomado -nbHolidayEveryMonthCP=Número de feriados adicionados a cada mês -Module27130Name= Gestão das férias -Module27130Desc= Gestão das férias -TitleOptionMainCP=Principais configurações de ferias -TitleOptionEventCP=Configurações de feriados relacionados a eventos ValidEventCP=Confirmar UpdateEventCP=Eventos de atualização -CreateEventCP=Criar NameEventCP=Nome do evento OkCreateEventCP=A adição do evento correu bem. ErrorCreateEventCP=Erro ao criar o evento. @@ -127,23 +98,3 @@ UpdateEventOptionCP=Modificar ErrorMailNotSend=Ocorreu um erro durante o envio de e-mail: NoCPforMonth=Não deixe este mês. nbJours=Número de dias -TitleAdminCP=Configuração de Férias -#Messages -Hello=Olá -HolidaysToValidate=Validar feriados -HolidaysToValidateBody=Abaixo está um pedido de férias para validar -HolidaysToValidateDelay=Este pedido de ferias terá lugar dentro de um período de menos dias. -HolidaysToValidateAlertSolde=O usuário que fez o pedido de feriados não têm número suficiente de dias disponíveis. -HolidaysValidated=Feriados validados -HolidaysValidatedBody=O seu pedido de ferias foi validado. -HolidaysRefused=Feriados negados -HolidaysRefusedBody=O seu pedido de ferias foi negado pelo seguinte motivo: -HolidaysCanceled=Feriados cancelados -HolidaysCanceledBody=O seu pedido de ferias foi cancelada. -Permission20000=Leia você próprios feriados -Permission20001=Criar / modificar as suas férias -Permission20002=Criar / modificar feriados para todos -Permission20003=Excluir pedidos férias -Permission20004=Usuários de configuração ferias -Permission20005=Revisão dos feriados modificados -Permission20006=Leia feriados relatório mensal diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang index 216b5905732..0f356aad94d 100644 --- a/htdocs/langs/pt_BR/install.lang +++ b/htdocs/langs/pt_BR/install.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - install InstallEasy=Tentámos tornar a instalação do Dolibarr o mais fácil possível. É favor seguir as instruções passo-a-passo. MiscellaneousChecks=Checkando pré-requisitos -DolibarrWelcome=Bem-vindo ao Dolibarr ConfFileExists=O arquivo de configuração conf.php existe. ConfFileDoesNotExists=Arquivo de configuração %s não existe! ConfFileDoesNotExistsAndCouldNotBeCreated=Arquivo de configuração %s não existe e não poderia ser criado! @@ -12,13 +11,7 @@ ConfFileReload=Recarregar todas as informaçoes do arquivo de configuraçao. PHPSupportSessions=Esta PHP suporta sessões. PHPSupportPOSTGETOk=Esta PHP suporta variáveis GET e POST. PHPSupportPOSTGETKo=É possível configurar o PHP não suporta variáveis POST e / ou GET. Verifique se o seu parâmetro variables_order em php.ini. -PHPSupportGD=Este suporte PHP GD gráfica funções. -PHPSupportUTF8=Este suporte PHP UTF8 funções. -PHPMemoryOK=Seu PHP max sessão memória está definido para %s. Isto deve ser suficiente. PHPMemoryTooLow=Seu PHP max sessão memória está definido para %s bytes. Isto deve ser muito baixo. Alterar o seu php.inem memory_limit para definir parâmetro para pelo menos %s bytes. -Recheck=Clique aqui para um teste mais significativo -ErrorPHPDoesNotSupportSessions=Sua instalação não suporta PHP sessões. Esta característica é necessária para tornar Dolibarr trabalho. Verifique a sua configuração do PHP. -ErrorPHPDoesNotSupportGD=Sua instalação PHP não suporta gráficos função GD. Não gráfico estarão disponíveis. ErrorPHPDoesNotSupportUTF8=Sua instalação PHP não suporta UTF8 funções. Dolibarr pode não funcionar corretamente. Resolva este antes de instalar Dolibarr. ErrorDirDoesNotExists=Diretório %s não existe. ErrorGoBackAndCorrectParameters=Ir para trás e corrigir errado parâmetros. @@ -33,112 +26,60 @@ ErrorDatabaseAlreadyExists=Base de dados' %s' já existe. IfDatabaseNotExistsGoBackAndUncheckCreate=Se não existe base de dados, volte e verifique a opção "Criar uma base de dados". IfDatabaseExistsGoBackAndCheckCreate=Caso dados já existe, volte e desmarque "Criar uma base de dados" opção. WarningBrowserTooOld=Navegador antigo. Faça a atualizaçao do seu navegador para uma versao mais recente de Firefox, Chrome ou Opera, e altamente recomendado. -PHPVersion=Versão PHP YouCanContinue=Pode continuar... -PleaseBePatient=Por favor, seja paciente ... License=A usar licença ConfigurationFile=Arquivo de configuração WebPagesDirectory=Directoria onde armazenar as páginas web DocumentsDirectory=Directoria onde armazenar documentos enviados e/ou gerados -URLRoot=URL de raiz ForceHttps=Forcar conexoes seguras (https) CheckToForceHttps=Escolha esta opcao para forcar conexoes seguras (https).
    Isto requere que o servidor web esta configurado para uso com certificado SSL. DolibarrDatabase=Base de dados Dolibarr -DatabaseChoice=Escolha de base de dados -DatabaseType=Tipo de base de dados -DriverType=Driver tipo Server=Servidor -ServerAddressDescription=Nome ou endereço IP para o servidor de dados, normalmente 'localhost' ao banco de dados está hospedado no mesmo servidor que servidor web -ServerPortDescription=Database server port. Mantenha vazio se desconhecido. -DatabaseServer=Database server -DatabaseName=Nome da base de dados DatabasePrefix=Prefixo tabela banco de dados -Login=Login AdminLogin=Login para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo -Password=Password PasswordAgain=Introduza a password uma segunda vez AdminPassword=Password para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo CreateDatabase=Criar uma base de dados CreateUser=Criar usuário DatabaseSuperUserAccess=Base de dados - Acesso Superuser -CheckToCreateDatabase=Verifique se caixa de dados não existe e deve ser criado.
    Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página. -CheckToCreateUser=Caixa de login, se não existe e deve ser criado.
    Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página. Experimental=(experimental, não operacional) -DatabaseRootLoginDescription=Login do usuário permissão para criar novas bases de dados ou de novos usuários, inútil se o seu banco de dados e seu banco de dados já existe login (como quando você está hospedado por um provedor de hospedagem da web). KeepEmptyIfNoPassword=Deixar em branco se o usuário não tiver password SaveConfigurationFile=Gravar configuração ConfigurationSaving=A gravar... ServerConnection=Conexão ao servidor -DatabaseConnection=Conexão à base de dados DatabaseCreation=Database criação UserCreation=Usuário criação CreateDatabaseObjects=Criação dos objetos na base de dados... -ReferenceDataLoading=Dados de base a carregar... TablesAndPrimaryKeysCreation=Tabelas e chaves primárias criação -CreateTableAndPrimaryKey=Criar tabela %s -CreateOtherKeysForTable=Crie chaves estrangeiras e índices para a tabela %s -OtherKeysCreation=Chaves estrangeiras e índices criação -FunctionsCreation=Funções criação AdminAccountCreation=A criar login do Administradore PleaseTypePassword=Por favor escreva uma password, passwords vazias não são permitidas ! PleaseTypeALogin=Por favor escreva um login ! PasswordsMismatch=As passwords diferem, tente novamente sff ! -SetupEnd=Fim da Configuração SystemIsInstalled=Instalação completa. SystemIsUpgraded=Dolibarr foi atualizado com êxito. -YouNeedToPersonalizeSetup=Agora necessita de configurar o Dolibarr por forma a corresponder às suas necessidades (aspecto, funcionalidades, ...). Para tal clique no seguinte link: AdminLoginCreatedSuccessfuly=Login de Administrador criado com sucesso. GoToDolibarr=Vai para Dolibarr GoToSetupArea=Prosseguir para a área de configuração MigrationNotFinished=A versao do banco de dados nao e competamente atualizada, voce tera que aviar o processo de atualizacao novamente. GoToUpgradePage=Vai para a pagina de atualizaçao novamente -Examples=Exemplos -WithNoSlashAtTheEnd=Sem a barra "/" no final DirectoryRecommendation=É recomendado que você ponha esta directry das páginas da web diretório. -LoginAlreadyExists=Já existe DolibarrAdminLogin=Dolibarr admin login AdminLoginAlreadyExists=Dolibarr conta administrador ' %s' já existe. WarningRemoveInstallDir=Atenção, por razões de segurança, uma vez que a instalação ou atualização estiver completa, você deve remover o diretório de instalação ou renomeá-lo para install.lock a fim de evitar o seu uso malicioso. ThisPHPDoesNotSupportTypeBase=PHP Este sistema não suporta qualquer tipo de interface para acesso de dados %s -FunctionNotAvailableInThisPHP=Não disponível neste PHP -MigrateScript=Migrar script -ChoosedMigrateScript=Escolhido migrar script -DataMigration=Migração de dados DatabaseMigration=Estrutura migração de dados -ProcessMigrateScript=Script transformação -ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar" ... FreshInstall=Fresh instalar -FreshInstallDesc=Utilize este modo, se esta for a primeira instalação. Se não, este modo pode reparar uma instalação anterior incompleto, mas se você deseja atualizar sua versão, selecione "Atualizar" modo. Upgrade=Upgrade UpgradeDesc=Use este modo se você tiver substituído Dolibarr antigos arquivos com arquivos de uma versão mais recente. Isto irá atualizar o seu banco de dados e dados. -Start=Iniciar InstallNotAllowed=Instalação não permitidas pela conf.php permissões -NotAvailable=Não disponível YouMustCreateWithPermission=Você deve criar o arquivo %s e definir permissões escrever sobre ele para instalar o servidor web durante o processo. CorrectProblemAndReloadPage=Corrija o problema e pressione a tecla F5 para recarregar página. -AlreadyDone=Já migrou DatabaseVersion=Database versão ServerVersion=Database server version YouMustCreateItAndAllowServerToWrite=Você deve criar este diretório e para permitir que o servidor da web para escrever nela. CharsetChoice=Conjunto de caracteres escolha -CharacterSetClient=Conjunto de caracteres utilizados para páginas HTML geradas -CharacterSetClientComment=Escolher conjunto de caracteres para exibir na web.
    Padrão proposto um conjunto de caracteres é o do seu banco de dados. -DBSortingCollation=Caracteres triagem fim -DBSortingCollationComment=Escolha página código que define o caráter triagem fim utilizado por base de dados. Este parâmetro é também chamado de "recolha" por alguns bancos de dados.
    Esse parâmetro não pode ser definido se de dados já existe. -CharacterSetDatabase=Conjunto de caracteres para o banco de dados -CharacterSetDatabaseComment=Escolher conjunto de caracteres queria para o banco de dados criação.
    Esse parâmetro não pode ser definido se de dados já existe. -YouAskDatabaseCreationSoDolibarrNeedToConnect=Você pergunta para criar base de dados %s, mas, para isso, Dolibarr necessidade de se conectar ao servidor com o super-usuário %s %s permissões. -YouAskLoginCreationSoDolibarrNeedToConnect=Você pergunta para criar base de dados login %s, mas, para isso, Dolibarr necessidade de se conectar ao servidor com o super-usuário %s %s permissões. -BecauseConnectionFailedParametersMayBeWrong=Como conexão falhou, de acolhimento ou super usuário parâmetros devem ser errado. -OrphelinsPaymentsDetectedByMethod=Orphelins pagamento detectado pelo método %s -RemoveItManuallyAndPressF5ToContinue=Removê-lo manualmente e pressione F5 para continuar. -KeepDefaultValuesWamp=Você usa o DoliWamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz. KeepDefaultValuesDeb=Voce esta usando o assistente de configuração do Dolibarr do pacote Linux (Ubuntu, Debian, Fedora...), portanto os valores propostos aqui estao ja optimizados. O unico parametro a se completar e a senha do administrador de banco de dados. Mude outros parametros somente se voce sabe o que esta fazendo. -KeepDefaultValuesMamp=Você usa o DoliMamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz. KeepDefaultValuesProxmox=Voçê esta usando o asistente de configuração do Dolibarr da Proxmox aplicação virtual, portanto os valores propostos aqui estão ja otimizados. Mude-os somente se voçê sabe o que esta fazendo. -FieldRenamed=Campo renomeado -IfLoginDoesNotExistsCheckCreateUser=Se login não existe ainda, você deve verificar a opção "Criar usuário" -ErrorConnection=Servidor " %s", nome do banco de dados " %s", login " %s", ou banco de dados senha pode estar errado ou PHP versão cliente pode ser muito velho para comparação de dados versão. InstallChoiceRecommanded=Versao recomendada para instalação %s da sua versao corrente %s InstallChoiceSuggested=Escolha sugerida pelo sistema de installação MigrateIsDoneStepByStep=A versão (%s) alvo tem uma lacuna de varias versões, portanto o asistente de instalação retornara com a sugestão seguinte apos terminado esta instalação. @@ -155,47 +96,26 @@ MigrationFinished=Migração terminada LastStepDesc=Ultimo passo: Defina aqui o usuario e a senha que voce planeja usar para conectar-se ao software. Nao perca estas credenciais, pois sao da conta que administra todas as outras contas. ActivateModule=Ativar modulo %s ShowEditTechnicalParameters=Clique aqui para mostrar/editar parametros avançados (modo avançado) - -######### -# upgrade MigrationFixData=Correção para dados não normalizados -MigrationOrder=Migração de dados para os clientes "ordens -MigrationSupplierOrder=Migração de dados de Fornecedores' ordens MigrationProposal=Migração de dados de propostas comerciais MigrationInvoice=Migração de dados para os clientes "faturas -MigrationContract=Migração de dados para os contratos -MigrationSuccessfullUpdate=Atualização bem sucedida MigrationUpdateFailed=Falied atualizar processo MigrationRelationshipTables=Migração de dados para as tabelas de relação (%s) -MigrationPaymentsUpdate=Pagamento correção de dados -MigrationPaymentsNumberToUpdate=%s pagamento (s) para atualizar -MigrationProcessPaymentUpdate=Atualização pagamento (s) %s -MigrationPaymentsNothingToUpdate=Não há mais coisas para fazer MigrationPaymentsNothingUpdatable=Não mais pagamentos que podem ser corrigidos MigrationContractsUpdate=Contrato correção de dados -MigrationContractsNumberToUpdate=%s contrato (s) para atualizar -MigrationContractsLineCreation=Criar uma linha de contrato contrato ref %s -MigrationContractsNothingToUpdate=Não há mais coisas para fazer -MigrationContractsFieldDontExist=Campo fk_facture não existe mais. Nada a fazer. MigrationContractsEmptyDatesUpdate=Contrato vazio data correção MigrationContractsEmptyDatesUpdateSuccess=Contrato emtpy data correção feita com sucesso MigrationContractsEmptyDatesNothingToUpdate=Nenhum contrato vazio data para corrigir -MigrationContractsEmptyCreationDatesNothingToUpdate=Nenhum contrato data de criação para corrigir MigrationContractsInvalidDatesUpdate=Bad data valor contrato correção MigrationContractsInvalidDateFix=Corret contrato %s (Contrato date -MigrationContractsInvalidDatesNumber=%s contratos modificados MigrationContractsInvalidDatesNothingToUpdate=Não data com valor negativo para corrigir MigrationContractsIncoherentCreationDateUpdate=Bad valor contrato data de criação correção MigrationContractsIncoherentCreationDateUpdateSuccess=Bad valor contrato data de criação correção feita com sucesso MigrationContractsIncoherentCreationDateNothingToUpdate=Não mau contrato data de criação de valor para corrigir MigrationReopeningContracts=Abrir contrato encerrado pelo erro -MigrationReopenThisContract=Reabra contrato %s -MigrationReopenedContractsNumber=%s contratos modificados MigrationReopeningContractsNothingToUpdate=Não encerrado contrato para abrir MigrationBankTransfertsUpdate=Atualizar vínculos entre banco e uma transação bancária transferência -MigrationBankTransfertsNothingToUpdate=Todas as ligações são até à data MigrationShipmentOrderMatching=Sendings recepção atualização -MigrationDeliveryOrderMatching=Entrega recepção atualização MigrationDeliveryDetail=Entraga atualizada MigrationStockDetail=Atualizar valores do estoque dos produtos MigrationMenusDetail=Atualize menus das tabelas dinâmicas @@ -205,7 +125,5 @@ MigrationProjectUserResp=Dados da migração do campo fk_user_resp de llx_projet MigrationProjectTaskTime=Atualizar tempo gasto em sgundos MigrationActioncommElement=Atualizar dados nas ações MigrationPaymentMode=Migração de dados para o modo de pagamento -MigrationCategorieAssociation=Migração de categorias - ShowNotAvailableOptions=Mostrar as opções não disponíveis HideNotAvailableOptions=Esconder as opção não disponível diff --git a/htdocs/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang index 2019b1645c0..bfd7757fb23 100644 --- a/htdocs/langs/pt_BR/interventions.lang +++ b/htdocs/langs/pt_BR/interventions.lang @@ -1,40 +1,18 @@ # Dolibarr language file - Source file is en_US - interventions -Intervention=Intervenção -Interventions=Intervenções -InterventionCard=Ficha de Intervenção -NewIntervention=Nova Intervenção -AddIntervention=Criar Intervenção -ListOfInterventions=Lista de Intervenções -EditIntervention=Editar ActionsOnFicheInter=Açoes na intervençao -LastInterventions=As %s últimas Intervenções -AllInterventions=Todas as Intervenções -CreateDraftIntervention=Criar Rascunho CustomerDoesNotHavePrefix=O cliente não tem prefixoo de definido InterventionContact=Contato Intervenção -DeleteIntervention=Eliminar Intervenção -ValidateIntervention=Confirmar Intervenção ModifyIntervention=Modificar intervençao -DeleteInterventionLine=Eliminar Linha de Intervenção ConfirmDeleteIntervention=Tem certeza que quer eliminar esta intervenção? ConfirmValidateIntervention=Tem certeza que quer Confirmar esta intervenção? ConfirmModifyIntervention=Tem certeza que quer modificar esta intervenção? ConfirmDeleteInterventionLine=Tem certeza que quer eliminar esta linha? -NameAndSignatureOfInternalContact=Nome e Assinatura do Participante: -NameAndSignatureOfExternalContact=Nome e Assinatura do Cliente: -DocumentModelStandard=Modelo da Norma Intervenção -InterventionCardsAndInterventionLines=Fichas e Linhas de Intervenção -ClassifyBilled=Clasificar "Faturado" StatusInterInvoiced=Faturado RelatedInterventions=Intervençoes relativas ShowIntervention=Mostrar intervençao -##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsável do Seguimento da Intervenção -TypeContact_fichinter_internal_INTERVENING=Interveniente TypeContact_fichinter_external_BILLING=Contato do cliente da faturação da intervenção TypeContact_fichinter_external_CUSTOMER=Contato do cliente do seguimento da intervenção -# Modele numérotation -ArcticNumRefModelDesc1=Modelo de numeração genérico ArcticNumRefModelError=Ativação Impossível PacificNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn onde yy é o ano, mm. O mês e nnnn um contador seq�êncial sem ruptura e sem ficar a 0 PacificNumRefModelError=Uma fatura que começa por # $$syymm existe na base e é incompativel com esta numeração. Eliminia ou renomea-la para ativar este módulo. diff --git a/htdocs/langs/pt_BR/languages.lang b/htdocs/langs/pt_BR/languages.lang index c237b9e8daf..b6de66e3bb3 100644 --- a/htdocs/langs/pt_BR/languages.lang +++ b/htdocs/langs/pt_BR/languages.lang @@ -1,9 +1,7 @@ # Dolibarr language file - Source file is en_US - languages - Language_ar_AR=Arabe Language_ar_SA=Arabe Language_bg_BG=Bulgaro -Language_bs_BA=Bósnio Language_ca_ES=Catalao Language_cs_CZ=Tcheco Language_da_DA=Danes @@ -11,61 +9,33 @@ Language_da_DK=Danes Language_de_DE=Alemao Language_de_AT=Alemao (Austria) Language_de_CH=Alemão (Suíça) -Language_el_GR=Grego Language_en_AU=Ingles (Australia) Language_en_GB=Ingles (Renho Unido) Language_en_IN=Ingles (India) Language_en_NZ=Ingles (Nova Zelandia) Language_en_SA=Ingles (Arabia Saudita) Language_en_US=Ingles (Estados Unidos) -Language_en_ZA=Inglês (África do Sul) -Language_es_ES=Espanhol Language_es_DO=Espanhol (República Dominicana) -Language_es_AR=Espanhol (Argentina) Language_es_CL=Espanhol (Chile) -Language_es_HN=Espanhol (Honduras) Language_es_MX=Espanhol (Mexico) -Language_es_PY=Espanhol (Paraguai) -Language_es_PE=Espanhol (Peru) -Language_es_PR=Espanhol (Porto Rico) Language_et_EE=Estone -Language_eu_ES=Basco Language_fa_IR=Persio Language_fi_FI=Finlandes Language_fr_BE=Fançes (Belgica) Language_fr_CA=Françes (Canada) Language_fr_CH=Françes (Suiça) Language_fr_FR=Françes -Language_fr_NC=Francês (Nova Caledónia) Language_he_IL=Ebreo -Language_hr_HR=Croata Language_hu_HU=Ungeres Language_id_ID=Indonésio Language_is_IS=Islandes -Language_it_IT=Italiano Language_ja_JP=Japones -Language_ko_KR=Coreano -Language_lt_LT=Lituano -Language_lv_LV=Letão -Language_mk_MK=Macedónio Language_nb_NO=Norveges (Bokmal) -Language_nl_BE=Holandês (Bélgica) Language_nl_NL=Holandês (Holanda) Language_pl_PL=Polones Language_pt_BR=Portugues (Brasil) Language_pt_PT=Portugues -Language_ro_RO=Romeno -Language_ru_RU=Russo Language_ru_UA=Russo (Ukrania) -Language_tr_TR=Turco -Language_sl_SI=Esloveno -Language_sv_SV=Sueco -Language_sv_SE=Sueco -Language_sq_AL=Albanês -Language_sk_SK=Eslovaco Language_th_TH=Thai -Language_uk_UA=Ucraniano -Language_uz_UZ=Uzbeque -Language_vi_VN=Vietnamita Language_zh_CN=Chines Language_zh_TW=Chines (Tradicional) diff --git a/htdocs/langs/pt_BR/ldap.lang b/htdocs/langs/pt_BR/ldap.lang index bad6ddd0bba..53e5d6957a5 100644 --- a/htdocs/langs/pt_BR/ldap.lang +++ b/htdocs/langs/pt_BR/ldap.lang @@ -7,23 +7,10 @@ LdapUacf_DONT_EXPIRE_PASSWORD=A senha não caduca LdapUacf_ACCOUNTDISABLE=A conta está desativada ao domínio LDAPInformationsForThisContact=Informação da base de dados LDAP deste contato LDAPInformationsForThisUser=Informação da base de dados LDAP deste usuário -LDAPInformationsForThisGroup=Informação da base de dados LDAP deste grupo -LDAPInformationsForThisMember=Informação da base de dados LDAP deste membro -LDAPAttribute=Atributo LDAP -LDAPAttributes=Atributos LDAP -LDAPCard=Ficha LDAP -LDAPRecordNotFound=Registo não encontrado na base de dados LDAP LDAPUsers=Usuário na base de dados LDAP -LDAPGroups=Grupos na base de dados LDAP -LDAPFieldStatus=Estatuto -LDAPFieldFirstSubscriptionDate=Data primeira adesão LDAPFieldFirstSubscriptionAmount=Valor da Primeira Adesão LDAPFieldLastSubscriptionDate=Data da Última Adesão LDAPFieldLastSubscriptionAmount=Valor Última Adesão SynchronizeDolibarr2Ldap=Sincronizar usuário (Dolibarr -> LDAP) UserSynchronized=Usuário Sincronizado -GroupSynchronized=Grupo sincronizado -MemberSynchronized=Membro sincronizado -ContactSynchronized=Contato sincronizado -ForceSynchronize=forçar sincronização Dolibarr -> LDAP ErrorFailedToReadLDAP=Erro na leitura do anuário LDAP. Verificar a configuração do módulo LDAP e a acessibilidade do anuário. diff --git a/htdocs/langs/pt_BR/link.lang b/htdocs/langs/pt_BR/link.lang index 8b1efb75ef3..c7f0b5b148e 100644 --- a/htdocs/langs/pt_BR/link.lang +++ b/htdocs/langs/pt_BR/link.lang @@ -1,8 +1,9 @@ +# Dolibarr language file - Source file is en_US - link LinkANewFile=Link a new file/document LinkedFiles=Linked files and documents NoLinkFound=No registered links LinkComplete=The file has been linked successfully ErrorFileNotLinked=The file could not be linked LinkRemoved=The link %s has been removed -ErrorFailedToDeleteLink= Failed to remove link '%s' -ErrorFailedToUpdateLink= Failed to update link '%s' +ErrorFailedToDeleteLink=Failed to remove link '%s' +ErrorFailedToUpdateLink=Failed to update link '%s' diff --git a/htdocs/langs/pt_BR/mailmanspip.lang b/htdocs/langs/pt_BR/mailmanspip.lang index f19d9b79984..c557e757950 100644 --- a/htdocs/langs/pt_BR/mailmanspip.lang +++ b/htdocs/langs/pt_BR/mailmanspip.lang @@ -1,27 +1,14 @@ # Dolibarr language file - Source file is en_US - mailmanspip -MailmanSpipSetup=Configuração do módulo Mailman e SPIP -MailmanTitle=Sistema de envio em massa Mailman -TestSubscribe=Para testar a inscriçao nas listas Mailman -TestUnSubscribe=Para testa a desenscriçao das listas do Mailman -MailmanCreationSuccess=Teste de inscriçao executado com sucesso +MailmanCreationSuccess=Teste de inscriçao executado com sucesso MailmanDeletionSuccess=Teste de desenscriçao executado com sucesso -SynchroMailManEnabled=O Mailman sera atualizado SynchroSpipEnabled=O SPIP sera atualizado -DescADHERENT_MAILMAN_ADMINPW=Senha do administrador Mailman -DescADHERENT_MAILMAN_URL=URL para inscriçoes Mailman -DescADHERENT_MAILMAN_UNSUB_URL=URL para desenscriçoes Mailman DescADHERENT_MAILMAN_LISTS=Lista(s) para inscriçao automatica de novos membros (separado por virgula) -SPIPTitle=Gerenciamento do conteudo do sistema SPIP -DescADHERENT_SPIP_SERVEUR=Servidor SPIP DescADHERENT_SPIP_DB=Nome do banco de dados SPIP DescADHERENT_SPIP_USER=Login do banco de dados SPIP DescADHERENT_SPIP_PASS=Senha do banco de dados SPIP AddIntoSpip=Adicionar no SPIP AddIntoSpipConfirmation=Tem certeza que quer adicionar este membro no SPIP ? AddIntoSpipError=Falha em adicionar o usuario no SPIP -DeleteIntoSpip=Remover do SPIP DeleteIntoSpipConfirmation=Tem certeza que quer remover este membro do SPIP ? DeleteIntoSpipError=Falha no suprimir o usuario do SPIP SPIPConnectionFailed=Falha na conexao com o SPIP -SuccessToAddToMailmanList=Adicao de %s na lista Mailman %s ou SPIP banco de dados completado -SuccessToRemoveToMailmanList=Remoçao de %s na lista Mailman %s ou SPIP banco de dados completado diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang index a411c0a72da..71482c658bd 100644 --- a/htdocs/langs/pt_BR/mails.lang +++ b/htdocs/langs/pt_BR/mails.lang @@ -1,47 +1,10 @@ # Dolibarr language file - Source file is en_US - mails -Mailing=Mailing -EMailing=Mailing -Mailings=Mailings -EMailings=Mailings -AllEMailings=Todos os E-Mailings -MailCard=Ficha de Mailing MailTargets=Destinatários -MailRecipients=Dsetinatarios MailRecipient=Destinatário -MailTitle=Titulo -MailFrom=Remetente -MailErrorsTo=Erros a -MailReply=Responder a MailTo=Destinatário(s) -MailCC=Cópia a -MailCCC=Adicionar Cópia a -MailTopic=Assunto do e-mail -MailText=Mensagem MailFile=Arquivo -MailMessage=Mensagem do e-mail -ShowEMailing=Mostrar E-Mailing -ListOfEMailings=Lista de mailings -NewMailing=Novo Mailing -EditMailing=Editar Mailing ResetMailing=Limpar Mailing -DeleteMailing=Eliminar Mailing -DeleteAMailing=Eliminar um Mailing -PreviewMailing=Previsualizar um Mailing -PrepareMailing=Preparar Mailing -CreateMailing=Criar E-Mailing -MailingDesc=Esta página permite enviar e-mails a um grupo de pessoas. MailingResult=Resultado do envio de e-mails -TestMailing=Teste mailing -ValidMailing=Confirmar Mailing -ApproveMailing=Aprovar Mailing -MailingStatusDraft=Rascunho -MailingStatusValidated=Validado -MailingStatusApproved=Aprovado -MailingStatusSent=Enviado -MailingStatusSentPartialy=Enviado Parcialmente -MailingStatusSentCompletely=Enviado Completamente -MailingStatusError=Erro -MailingStatusNotSent=Não Enviado MailSuccessfulySent=E-mail enviado corretamente (de %s a %s) MailingSuccessfullyValidated=Emailins validado com sucesso MailUnsubcribe=Desenscrever @@ -49,9 +12,7 @@ Unsuscribe=Desenscrever MailingStatusNotContact=Nao contactar mais ErrorMailRecipientIsEmpty=A endereço do destinatário está vazia WarningNoEMailsAdded=nenhum Novo e-mail a Adicionar à lista destinatários. -ConfirmValidMailing=Confirma a validação do mailing? ConfirmResetMailing=Confirma a limpeza do mailing? -ConfirmDeleteMailing=Confirma a eliminação do mailing? NbOfRecipients=Número de destinatários NbOfUniqueEMails=N� de e-mails únicos NbOfEMails=N� de E-mails @@ -59,9 +20,7 @@ TotalNbOfDistinctRecipients=Número de destinatários únicos NoTargetYet=Nenhum destinatário definido AddRecipients=Adicionar destinatários RemoveRecipient=Eliminar destinatário -CommonSubstitutions=Substituições comuns YouCanAddYourOwnPredefindedListHere=Para Criar o seu módulo de seleção e-mails, tem que ir a htdocs/core/modules/mailings/README. -EMailTestSubstitutionReplacedByGenericValues=Em modo teste, as Variávels de substituição são sustituidas por valores genéricos MailingAddFile=Adicionar este Arquivo NoAttachedFiles=Sem arquivos anexos BadEMail=Valor errado para e-mail @@ -70,9 +29,6 @@ ConfirmCloneEMailing=Voce tem certeza que quer clonar este e-mailing ? CloneContent=Clonar mensagem CloneReceivers=Clonar recebidores DateLastSend=Data ultimo envio -DateSending=Data envio -SentTo=Enviado para %s -MailingStatusRead=Ler CheckRead=Ler recebidor YourMailUnsubcribeOK=O e-mail %s foi removido com sucesso da lista MailtoEMail=Hyper-link ao e-mail @@ -87,11 +43,8 @@ RemindSent=%s lembrete(s) de envio AllRecipientSelectedForRemind=Todos os endereços de e-mails dos representantes selecionados (note que será enviada uma mensagem por fatura) NoRemindSent=Sem lembrete de e-mail enviado ResultOfMassSending=Resultado do lembretes de envio em massa de e-mails - -# Libelle des modules de liste de destinataires mailing MailingModuleDescContactCompanies=Contatos de Fornecedores (clientes potenciais, clientes, Fornecedores...) MailingModuleDescDolibarrUsers=Usuários de Dolibarr que tem e-mail -MailingModuleDescFundationMembers=Membros que tem e-mail MailingModuleDescEmailsFromFile=E-Mails de um Arquivo (e-mail;Nome;Vários) MailingModuleDescEmailsFromUser=Entrar e-mails de usuario (email;sobrenome;nome;outro) MailingModuleDescContactsCategories=Fornecedores com e-mail (por categoria) @@ -103,36 +56,25 @@ MailingModuleDescContactsByFunction=Contatos/Enderecos de terceiros (por posiç LineInFile=Linha %s em arquivo RecipientSelectionModules=Módulos de seleção dos destinatários MailSelectedRecipients=Destinatários selecionados -MailingArea=Área mailings -LastMailings=Os %s últimos mailings TargetsStatistics=Estatísticas destinatários NbOfCompaniesContacts=Contatos únicos de empresas MailNoChangePossible=Destinatários de um mailing validado não modificaveis -SearchAMailing=Procurar um mailing -SendMailing=Enviar mailing -SendMail=Enviar e-mail -SentBy=Enviado por MailingNeedCommand=Para razões de segurança, o envio de um mailing em massa e melhor quando feito da linha de comando. Se voce tem uma, pergunte ao seu administrador de serviço de executar o comando seguinte para enviar o mailing em massa a todos os destinatarios: MailingNeedCommand2=Pode enviar em linha adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com um valor número que indica o máximo n� de e-mails enviados por Sessão. ConfirmSendingEmailing=Caso voçê não pode ou prefere envia-los do seu www navegador, por favor confirme que voce tem certeza que quer enviar um mailing em massa do seu navegador ? -LimitSendingEmailing=Observação: Envios online de mailings em massa são limitados por causa de segurança e tempo limite a n.%s destinatarios por sessão de envio. -TargetsReset=Limpar lista +LimitSendingEmailing=Observação: Envios de mailings em massa da interface web são feitas em varias vezes por causa de segurança e tempo limite, %s destinatarios por sessão de envio. ToClearAllRecipientsClickHere=Para limpar a lista dos destinatários deste mailing, faça click ao botão ToAddRecipientsChooseHere=Para Adicionar destinatários, escoja os que figuran em listas a continuação NbOfEMailingsReceived=Mailings em massa recebidos NbOfEMailingsSend=E-mails em massa enviados -IdRecord=ID registo -DeliveryReceipt=Recibo de recpção YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o caracter0 de separação coma para especificar multiplos destinatários. TagCheckMail=Seguir quando o e-mail sera lido TagUnsubscribe=Atalho para se desenscrever TagSignature=Assinatura do remetente TagMailtoEmail=E-mail destinatario -# Module Notifications -Notifications=Notificações -NoNotificationsWillBeSent=Nenhuma notificação por e-mail está prevista para este evento e empresa -ANotificationsWillBeSent=1 notificação vai a ser enviada por e-mail -SomeNotificationsWillBeSent=%s Notificações vão ser enviadas por e-mail -AddNewNotification=Ativar uma Nova pedido de notificação -ListOfActiveNotifications=Lista das pedidos de Notificações ativas +AddNewNotification=Ativar uma nova notificação email para alvo +ListOfActiveNotifications=Listar todos os alvos ativos para notificação de email ListOfNotificationsDone=Listar todas as notificações de e-mail enviadas +MailSendSetupIs=Configuração do envio de e-mails foi configurado a '%s'. Este modo não pode ser usado para envios de massa de e-mails. +MailSendSetupIs2=Voçê precisa primeiramente acessar com uma conta de Administrador o menu %sInicio - Configurações - EMails%s para mudar o parametro '%s' para usar o modo '%s'. Neste modo voçê pode entrar a configuração do servidor SMTP fornecido pelo seu Provedor de Acesso a Internet e usar a funcionalidade de envios de massa de EMails. +MailSendSetupIs3=Se tiver perguntas sobre como configurar o seu servidor SMTP voçê pode perguntar %s. diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang index 662ace989a3..be5e7c3b146 100644 --- a/htdocs/langs/pt_BR/main.lang +++ b/htdocs/langs/pt_BR/main.lang @@ -1,9 +1,5 @@ # Dolibarr language file - Source file is en_US - main DIRECTION=ltr -# Note for Chinese: -# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) -# stsongstdlight or cid0cs are for simplified Chinese -# To read Chinese pdf with Linux: sudo apt-get install poppler-data FONTFORPDF=helvetica FONTSIZEFORPDF=10 SeparatorDecimal=, @@ -23,97 +19,53 @@ FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p FormatDateHourTextShort=%d %b, %Y, %I:%M %p FormatDateHourText=%d %B, %Y, %I:%M %p DatabaseConnection=Login à Base de Dados -NoTranslation=Sem tradução NoRecordFound=Registro nao encontrado NoError=Sem erro -Error=Erro -ErrorFieldRequired=O campo '%s' é obrigatório ErrorFieldFormat=O campo '%s' tem um valor incorreto ErrorFileDoesNotExists=O Arquivo %s não existe ErrorFailedToOpenFile=Impossível abrir o arquivo %s -ErrorCanNotCreateDir=Impossível criar a pasta %s -ErrorCanNotReadDir=Impossível ler a pasta %s -ErrorConstantNotDefined=Parâmetro %s não definido -ErrorUnknown=Erro desconhecido -ErrorSQL=Erro de SQL ErrorLogoFileNotFound=O arquivo logo '%s' não se encontra -ErrorGoToGlobalSetup=Ir á configuração ' Empresa/Instituição ' para corrigir -ErrorGoToModuleSetup=Ir á configuração do módulo para corrigir ErrorFailedToSendMail=Erro ao envio do e-mail (emissor ErrorAttachedFilesDisabled=A Administração dos arquivos associados está desativada neste servidor ErrorFileNotUploaded=O arquivo não foi possível transferir -ErrorInternalErrorDetected=Erro detectado -ErrorNoRequestRan=Nenhuma petição realizada -ErrorWrongHostParameter=Parâmetro Servidor inválido ErrorYourCountryIsNotDefined=O seu país não está definido. corrija indo a Configuração-Geral-Editar ErrorRecordIsUsedByChild=Impossível de suprimir este registo. Esta sendo utilizado como pai pelo menos em um registo filho. ErrorWrongValue=Valor incorreto ErrorWrongValueForParameterX=Valor incorreto do parâmetro %s -ErrorNoRequestInError=Nenhuma petição em erro ErrorServiceUnavailableTryLater=Serviço não disponível atualmente. Volte a execução mais tarde. -ErrorDuplicateField=Duplicado num campo único -ErrorSomeErrorWereFoundRollbackIsDone=Encontraram-se alguns erros. Modificações desfeitas. ErrorConfigParameterNotDefined=O parâmetro %s não está definido ao arquivo de configuração Dolibarr conf.php. ErrorCantLoadUserFromDolibarrDatabase=Impossível encontrar o usuário %s na base de dados do Dolibarr. ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de ICMS definido para o país '%s'. ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definido para o pais '%s'. ErrorFailedToSaveFile=Erro, o registo do arquivo falhou. -ErrorOnlyPngJpgSupported=Erro, somente suportam os formatos de imagem jpg e png. -ErrorImageFormatNotSupported=A sua versão PHP não suporta as funções de conVersão deste formato de imagen. -SetDate=Definir data SelectDate=Selecionar uma data SeeAlso=Ver tambem %s BackgroundColorByDefault=Cor do fundo padrão +FileNotUploaded=O arquivo nao foi carregado +FileUploaded=O arquivo foi carregado com sucesso FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique no "Anexar arquivo" para proceder. NbOfEntries=Nr. de entradas GoToWikiHelpPage=Ler ajuda online ( necesita de acosso a internet) GoToHelpPage=Consulte a ajuda (pode necessitar de acesso à internet) -RecordSaved=Registo Guardado RecordDeleted=Registro apagado LevelOfFeature=Nível de funções -NotDefined=Não Definida DefinedAndHasThisValue=Definido e valor para -IsNotDefined=indefinido DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr está configurado em modo de autenticação %s ao arquivo de configuração conf.php.
    Eso significa que a base de dados das Senhas é externa a Dolibarr, por eso toda modificação deste campo pode resultar sem efeito alguno. -Administrator=Administrador -Undefined=Não Definido PasswordForgotten=Esqueceu de da sua senha? -SeeAbove=Mencionar anteriormente -HomeArea=Área Principal LastConnexion=último login PreviousConnexion=último login ConnectedOnMultiCompany=Conectado no ambiente -ConnectedSince=Conectado desde -AuthenticationMode=Modo autenticação -RequestedUrl=Url solicitada DatabaseTypeManager=Tipo de gerente de base de dados RequestLastAccess=Petição último acesso e a base de dados RequestLastAccessInError=Petição último acesso e a base de dados errado ReturnCodeLastAccessInError=Código devolvido último acesso e a base de dados errado InformationLastAccessInError=informação sobre o último acesso e a base de dados errado -DolibarrHasDetectedError=O Dolibarr detectou um erro técnico -InformationToHelpDiagnose=É aqui que a informação pode ajudar no diagnóstico -MoreInformation=Mais Informação -TechnicalInformation=Informação técnica -NotePublic=Nota (pública) -NotePrivate=Nota (privada) PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar a precisão dos preços unitários a %s Decimais. -DoTest=Teste -ToFilter=Filtrar WarningYouHaveAtLeastOneTaskLate=Atenção, tem um elemento a menos que passou a data de tolerância. yes=sim -Yes=Sim no=não -No=Não -All=Tudo -Home=Inicio -Help=Ajuda OnlineHelp=Ajuda online PageWiki=Pagina wiki -Always=Sempre -Never=Nunca -Under=Baixo -Period=Periodo PeriodEndDate=Data final periodo Activate=Ativar Activated=Ativado @@ -123,175 +75,53 @@ Enabled=Ativado Deprecated=Obsoleto Disable=Desativar Disabled=Desativado -Add=Adicionar -AddLink=Adicionar link -Update=Modificar AddActionToDo=Adicionar ação a realizar AddActionDone=Adicionar ação realizada -Close=Fechar -Close2=Fechar -Confirm=Confirmar -ConfirmSendCardByMail=Quer enviar esta ficha por e-mail? -Delete=Eliminar -Remove=Retirar -Resiliate=Cancelar -Cancel=Cancelar -Modify=Modificar -Edit=Editar -Validate=Confirmar -ToValidate=A Confirmar -Save=Guardar -SaveAs=Guardar como TestConnection=Teste a login -ToClone=Cópiar ConfirmClone=Selecciones dados que deseja Cópiar. -NoCloneOptionsSpecified=Não existem dados definidos para copiar -Of=de Go=Ir Run=Attivo -CopyOf=Cópia de -Show=Ver -ShowCardHere=Mostrar cartão -Search=Procurar SearchOf=Procurar -Valid=Confirmar -Approve=Aprovar -ReOpen=Reabrir Upload=Enviar Arquivo -ToLink=Link Select=Selecionar -Choose=Escolher -ChooseLangage=Escolher o seu idioma Resize=Modificar tamanho Recenter=Recolocar no centro -Author=Autor User=Usuário Users=Usuário -Group=Grupo -Groups=Grupos Password=Senha PasswordRetype=Repetir Senha NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo -Name=Nome -Person=Pessoa -Parameter=Parâmetro -Parameters=Parâmetros -Value=Valor -GlobalValue=Valor global -PersonalValue=Valor Personalizado -NewValue=Novo valor CurrentValue=Valor atual -Code=Código -Type=Tipo -Language=Idioma -MultiLanguage=Multi Idioma -Note=Nota CurrentNote=Nota atual -Title=Título -Label=Etiqueta -RefOrLabel=Ref. da etiqueta -Info=Log -Family=Familia -Description=Descrição -Designation=Designação -Model=Modelo DefaultModel=Modelo Padrão Action=Ação -About=Acerca de -Number=Número NumberByMonth=Numero por mes -AmountByMonth=Valor por mês -Numero=Número Limit=Límite -Limits=Limites DevelopmentTeam=Equipe de Desenvolvimento Logout=Sair NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação Connection=Login -Setup=Configuração -Alert=Alerta -Previous=Anterior -Next=Seguinte -Cards=Fichas -Card=Ficha Now=Agora -Date=Data DateStart=Data Inicio DateEnd=Data Fim -DateCreation=Data de Criação -DateModification=Data Modificação -DateModificationShort=Data Modif. DateLastModification=Data última Modificação DateValidation=Data Validação -DateClosing=Data de Encerramento -DateDue=Data Vencimento -DateValue=Data Valor -DateValueShort=Data Valor -DateOperation=Data Operação -DateOperationShort=Data Op. DateLimit=Data Límite -DateRequest=Data Consulta -DateProcess=Data Processo -DatePlanShort=Data Planif. -DateRealShort=Data Real -DateBuild=Data da geração do Relatório -DatePayment=Data de pagamento -DurationYear=Ano -DurationMonth=Mês -DurationWeek=Semana DurationDay=Día -DurationYears=Anos -DurationMonths=Meses -DurationWeeks=Semanas -DurationDays=Dias -Year=Ano -Month=Mês -Week=Semana Day=Día -Hour=Hora -Minute=Minuto -Second=Segundo -Years=Anos -Months=Meses -Days=Dias days=Dias -Hours=Horas -Minutes=Minutos -Seconds=Segundos -Today=Hoje -Yesterday=Ontem -Tomorrow=Amanhã Morning=Manha -Afternoon=Tarde Quadri=Trimistre -MonthOfDay=Dia do mês -HourShort=H -Rate=Tipo UseLocalTax=Incluindo taxa -Bytes=Bytes -KiloBytes=Kilobytes -MegaBytes=Megabytes -GigaBytes=Gigabytes -TeraBytes=Terabytes -b=b. -Kb=Kb -Mb=Mb -Gb=Gb Tb=Tb -Cut=Cortar Copy=Cópiar -Paste=Colar Default=Padrao DefaultValue=Valor por default -DefaultGlobalValue=Valor global -Price=Preço UnitPrice=Preço Unit. -UnitPriceHT=Preço Base UnitPriceTTC=Preço Unit. Total PriceU=Preço Unit. PriceUHT=Preço Unit. PriceUTTC=Preço Unit. Total -Amount=Valor AmountInvoice=Valor Fatura AmountPayment=Valor Pagamento AmountHTShort=Valor (neto) @@ -305,147 +135,53 @@ AmountLT1ES=Valor RE AmountLT2ES=Valor IRPF AmountTotal=Valor Total AmountAverage=Valor médio -PriceQtyHT=Preço para a quantidade total -PriceQtyMinHT=Preço quantidade min total -PriceQtyTTC=Preço total para a quantidade -PriceQtyMinTTC=Preço quantidade min. total -Percentage=Percentagem -Total=Total -SubTotal=Subtotal TotalHTShort=Total (neto) TotalTTCShort=Total (incl. taxas) TotalHT=Valor TotalHTforthispage=Total (sem impostos) desta pagina TotalTTC=Total -TotalTTCToYourCredit=Total a crédito TotalVAT=Total do ICMS TotalLT1=Total taxa 2 TotalLT2=Total taxa 3 TotalLT1ES=Total RE -TotalLT2ES=Total IRPF IncludedVAT=ICMS incluido HT=Sem ICMS TTC=ICMS Incluido VAT=ICMS -LT1ES=RE -LT2ES=IRPF VATRate=Taxa ICMS -Average=Média -Sum=Soma -Delta=Divergencia -Module=Módulo -Option=Opção -List=Lista FullList=Lista Completa -Statistics=Estatísticas OtherStatistics=Outras estatisticas -Status=Estado +Favorite=Favorito ShortInfo=Info. -Ref=Ref. RefSupplier=Ref. Fornecedor RefPayment=Ref. Pagamento -CommercialProposalsShort=Orçamentos Comment=Comentario Comments=Comentarios ActionsToDo=Ações a realizar ActionsDone=Ações realizadas -ActionsToDoShort=A realizar ActionsRunningshort=Iniciada -ActionsDoneShort=Realizadas ActionNotApplicable=Não aplicavel ActionRunningNotStarted=A Iniciar -ActionRunningShort=Iniciado -ActionDoneShort=Terminado ActionUncomplete=Imcompleto CompanyFoundation=Companhia/Fundação ContactsForCompany=Contatos desta empresa ContactsAddressesForCompany=Contatos/Endereços do Cliente ou Fornecedor -AddressesForCompany=Endereços para este terceiro ActionsOnCompany=Ações nesta sociedade ActionsOnMember=Eventos deste membro NActions=%s ações -NActionsLate=%s em atraso -Filter=Filtro -RemoveFilter=Eliminar filtro -ChartGenerated=Gráficos gerados -ChartNotGenerated=Gráfico não gerado +RequestAlreadyDone=Pedido ja registrado GeneratedOn=Gerado a %s -Generate=Gerar -Duration=Duração -TotalDuration=Duração total -Summary=Resumo -MyBookmarks=Os Meus Favoritos -OtherInformationsBoxes=Outras Caixas de informação -DolibarrBoard=Indicadores -DolibarrStateBoard=Estatísticas -DolibarrWorkBoard=Indicadores de Trabalho Available=Disponivel NotYetAvailable=Ainda não disponível NotAvailable=Não disponível -Popularity=Popularidade -Categories=Categorias -Category=Categoria -By=Por -From=De to=para -and=e -or=ou -Other=Outro -Others=Outros -OtherInformations=Outras Informações -Quantity=quantidade -Qty=Quant. -ChangedBy=Modificado por -ReCalculate=Recalcular -ResultOk=Éxito -ResultKo=Erro -Reporting=Relatório -Reportings=Relatórios -Draft=Rascunho Drafts=Drafts -Validated=Validado -Opened=Aberto -New=Novo -Discount=Desconto -Unknown=Desconhecido -General=General -Size=Tamanho -Received=Recebido -Paid=Pago -Topic=Assunto -ByCompanies=Por empresa ByUsers=Por usuário -Links=Links -Link=Link -Receipts=Recibos -Rejects=Reprovado Preview=Preview -NextStep=Passo Seguinte -PreviousStep=Passo Anterior -Datas=Dados -None=Nenhum -NoneF=Nenhuma -Late=Atraso -Photo=Foto -Photos=Fotos -AddPhoto=Adicionar foto Login=Login CurrentLogin=Login atual -January=Janeiro -February=Fevereiro -March=Março -April=Abril -May=Maio -June=Junho -July=Julho -August=Agosto -September=Setembro -October=Outubro -November=Novembro -December=Dezembro JanuaryMin=Jan FebruaryMin=Fev -MarchMin=Mar AprilMin=Abr MayMin=Mai JuneMin=Jun @@ -455,18 +191,6 @@ SeptemberMin=Set OctoberMin=Out NovemberMin=Nov DecemberMin=Dez -Month01=Janeiro -Month02=Fevereiro -Month03=Março -Month04=Abril -Month05=Maio -Month06=Junho -Month07=Julho -Month08=Agosto -Month09=Setembro -Month10=Outubro -Month11=Novembro -Month12=Dezembro MonthShort01=Jan MonthShort02=Fev MonthShort03=Mar @@ -481,52 +205,18 @@ MonthShort11=Nov MonthShort12=Dez AttachedFiles=Arquivos e Documentos Anexos FileTransferComplete=Foi transferido corretamente o Arquivo -DateFormatYYYYMM=YYYY-MM -DateFormatYYYYMMDD=YYYY-MM-DD -DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS -ReportName=Nome do Relatório ReportPeriod=Periodo de Análise -ReportDescription=Descrição -Report=Relatório -Keyword=Chave -Legend=Legenda FillTownFromZip=Indicar Município Fill=Preencher Reset=Resetar ShowLog=Ver Histórico -File=Arquivo Files=Arquivos -NotAllowed=Não Autorizado -ReadPermissionNotAllowed=Leitura não Autorizada AmountInCurrency=Valores Apresentados em %s -Example=Exemplo -Examples=Exemplos -NoExample=Sem Exemplo -FindBug=Sinalizar um bug NbOfThirdParties=Numero de Fornecedores -NbOfCustomers=Numero de Clientes -NbOfLines=Numeros de Linhas NbOfObjects=Numero de Objetos NbOfReferers=Numero de Referencias Referers=Referindo-se objetos -TotalQuantity=Quantidade Total -DateFromTo=De %s a %s -DateFrom=A partir de %s -DateUntil=Até %s -Check=Verificar -Internal=Interno -External=Externo -Internals=Internos -Externals=Externos -Warning=Alerta -Warnings=Alertas -BuildPDF=Gerar o PDF -RebuildPDF=Recriar o PDF -BuildDoc=Gerar o doc -RebuildDoc=Recriar o doc -Entity=Entidade Entities=Entidadees -EventLogs=Log CustomerPreview=Historico Cliente SupplierPreview=Historico Fornecedor AccountancyPreview=Historico Contabilidade @@ -534,80 +224,26 @@ ShowCustomerPreview=Ver Historico Cliente ShowSupplierPreview=Ver Historico Fornecedor ShowAccountancyPreview=Ver Historico Contabilidade ShowProspectPreview=Ver Historico Cliente Potencial -RefCustomer=Ref. Cliente -Currency=Moeda -InfoAdmin=Informação para os administradores -Undo=Desfazer -Redo=Refazer -ExpandAll=Expandir tudo -UndoExpandAll=Anular Expansão -Reason=Razão -FeatureNotYetSupported=Funcionalidade ainda não suportada -CloseWindow=Fechar Janela -Question=Pregunta -Response=Resposta -Priority=Prioridade SendByMail=Enviado por e-mail -MailSentBy=Mail enviado por -TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem -SendAcknowledgementByMail=Envio rec. por e-mail -NoEMail=Sem e-mail NoMobilePhone=Sem celular Owner=Proprietário -DetectedVersion=Versão Detectada -FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente. Refresh=Atualizar -BackToList=Mostar Lista -GoBack=Voltar CanBeModifiedIfOk=Pode modificarse se é valido CanBeModifiedIfKo=Pode modificarse senão é valido -RecordModifiedSuccessfully=Registo modificado com êxito RecordsModified=%s registros modificados -AutomaticCode=Criação automática de código -NotManaged=Não gerado FeatureDisabled=Função Desativada -MoveBox=Mover a Caixa %s -Offered=Oferta NotEnoughPermissions=Não tem permissões para esta ação -SessionName=Nome Sessão -Method=Método -Receive=Recepção -PartialWoman=Parcial -PartialMan=Parcial -TotalWoman=Total -TotalMan=Total -NeverReceived=Nunca Recebido -Canceled=Cancelado YouCanChangeValuesForThisListFromDictionarySetup=Voce pode modificar os valores para esta lista no menu Configuração - dicionario -Color=Cor -Documents=Documentos DocumentsNb=Arquivos conectados (%s) -Documents2=Documentos -BuildDocuments=Documentos Gerados UploadDisabled=Carregamento Desativada -MenuECM=Documentos -MenuAWStats=Estatisticas -MenuMembers=Membros -MenuAgendaGoogle=Agenda Google -ThisLimitIsDefinedInSetup=Límite Dolibarr (menu inicio-configuração-segurança): %s Kb, PHP limit: %s Kb -NoFileFound=Não existem documentos guardados nesta pasta CurrentUserLanguage=Idioma atual CurrentTheme=Tema atual CurrentMenuManager=Administração do menu atual DisabledModules=Módulos desativados -For=Para -ForCustomer=Para cliente -Signature=Assinatura HidePassword=Mostrar comando com senha oculta UnHidePassword=Mostrar comando com senha e a vista -Root=Raíz -Informations=Informação -Page=Página -Notes=Notas -AddNewLine=Adicionar nova linha AddFile=Adicionar arquivo ListOfFiles=Lista de arquivos disponiveis -FreeZone=Entrada livre FreeLineOfType=Entrada livre de tipo CloneMainAttributes=Clonar o objeto com estes atributos PDFMerge=Fusão de PDF @@ -616,95 +252,50 @@ PrintContentArea=Mostrar pagina a se imprimir na area principal MenuManager=Administração do menu NoMenu=Sem sub-menu WarningYouAreInMaintenanceMode=Atenção, voce esta no modo de manutenção, somente o login %s tem permissões para uso da aplicação no momento. -CoreErrorTitle=Erro de sistema -CoreErrorMessage=Occoreu erro. Verifique os arquivos de log ou contate seu administrador de sistema. +CoreErrorMessage=Occoreu erro. Verifique os arquivos de log ou contate seu administrador de sistema. CreditCard=Cartão de credito FieldsWithAreMandatory=Campos com %s são obrigatorios FieldsWithIsForPublic=Campos com %s são mostrados na lista publica de membros. Se não deseja isto, deselecione a caixa "publico". AccordingToGeoIPDatabase=(conforme a convenção GeoIP) -Line=Linha NotSupported=Não suportado RequiredField=Campo obrigatorio -Result=Resultado -ToTest=Teste ValidateBefore=Precisa de um cartão valido antes de usar esta função -Visibility=Visibilidade -Private=Privado Hidden=Escondido Resources=Resorsas -Source=Fonte -Prefix=Prefixo -Before=Antes -After=Depois IPAddress=endereco IP Frequency=Frequencia IM=Mensagems instantaneas -NewAttribute=Novo atributo AttributeCode=Codigo do atributo OptionalFieldsSetup=Configuração dos atributos extra URLPhoto=URL da photo/logo SetLinkToThirdParty=Atalho para outro terceiro CreateDraft=Criar RascunhoCriar rascunho -ClickToEdit=Clique para editar +SetToDraft=Voltar para modo rascunho ObjectDeleted=Objeto %s apagado -ByCountry=Por país -ByTown=Por cidade -ByDate=Por data ByMonthYear=Por mes/ano ByYear=Por ano ByMonth=Por mes ByDay=Por día BySalesRepresentative=Por vendedor representante -LinkedToSpecificUsers=Conectado com um contato particular do usuario +LinkedToSpecificUsers=Conectado com um contato particular do usuario DeleteAFile=Apagar arquivo -ConfirmDeleteAFile=Voce tem certeza que quer apagar este arquivo -NoResults=Sem resultados +ConfirmDeleteAFile=Voce tem certeza que quer apagar este arquivo ModulesSystemTools=Ferramentas de modulos -Test=Teste -Element=Elemento NoPhotoYet=Sem fotos disponiveis no momento HomeDashboard=Resumo de inicio Deductible=Deduzivel from=de toward=para -Access=Acesso HelpCopyToClipboard=Use Ctrl+C para copiar para o clipboard SaveUploadedFileWithMask=Salvar arquivo no servidor com nome "%s" (alternativamente "%s") OriginFileName=Nome original do arquivo SetDemandReason=Escolher fonte -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency +SetBankAccount=Definir conta bancaria +AccountCurrency=Moeda conta ViewPrivateNote=Ver anotaçoes XMoreLines=%s linha(s) escondidas PublicUrl=URL pública -AddBox=Add box - -# Week day -Monday=Segunda-feira -Tuesday=Terça-feira -Wednesday=Quarta-feira -Thursday=Quinta-feira -Friday=Sexta-feira +AddBox=Adicionar caixa +SelectElementAndClickRefresh=Selecionar um elemento e clickar atualizar Saturday=Sabado -Sunday=Domingo -MondayMin=Seg -TuesdayMin=Ter -WednesdayMin=Qua -ThursdayMin=Qui -FridayMin=Sex SaturdayMin=Sab -SundayMin=Dom -Day1=Segunda-Feira -Day2=Terça-Feira -Day3=Quarta-Feira -Day4=Quinta-Feira -Day5=Sexta-Feria -Day6=Sábado -Day0=Domingo -ShortMonday=Seg -ShortTuesday=Ter -ShortWednesday=Qua -ShortThursday=Qui -ShortFriday=Sex -ShortSaturday=Sab -ShortSunday=Dom diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang index 093c530bbec..aad28107830 100644 --- a/htdocs/langs/pt_BR/margins.lang +++ b/htdocs/langs/pt_BR/margins.lang @@ -1,11 +1,6 @@ -# Dolibarr language file - Source file is en_US - marges - -Margin=Margem +# Dolibarr language file - Source file is en_US - margins Margins=Margems TotalMargin=Total margem -MarginOnProducts=Margem / Produtos -MarginOnServices=Margem / Serviços -MarginRate=Taxa de margem MarkRate=Taxa de marca DisplayMarginRates=Visualizar taxas de margem DisplayMarkRates=Visualizar taxas de aumento @@ -17,8 +12,6 @@ ProductMargins=Margem de produtos CustomerMargins=Margems de clientes SalesRepresentativeMargins=Tolerância aos representante de vendas ProductService=Produto ou serviço -AllProducts=Todos os produtos e serviços -ChooseProduct/Service=Escolher produto ou serviço StartDate=Data inicio EndDate=Data fim Launch=Inicio @@ -29,13 +22,13 @@ UseDiscountAsProduct=Como o produto UseDiscountAsService=Como serviço UseDiscountOnTotal=Em sub-total MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global e tratado como o produto, serviço, ou somente sob o sub-total na margem. -MARGIN_TYPE=Tipo de margem MargeBrute=Margem grosa MargeNette=Mergem neta -MARGIN_TYPE_DETAILS=Margem grosa: Preço de venda - Preço de compra
    Margem neta: Preço de venda - Preço de custo -CostPrice=Preço de custo -BuyingCost=Preço de custo +MARGIN_TYPE_DETAILS=Margem grosa: Preço de venda - Preço de compra
    Margem neta: Preço de venda - Preço de custo UnitCharges=Taxas unitárias Charges=Despesas AgentContactType=Tipo contato do agente comercial -AgentContactTypeDetails=Define o tipo de contato (conectado as faturas) sera usado para relatorio de margem dos agentes comerciais +AgentContactTypeDetails=Defina o tipo de contato (conectado coma as faturas) sera usado para o relatorio de margem dos representantes +rateMustBeNumeric=Rata deve ser um valor numerico +markRateShouldBeLesserThan100=Rata marcada teria que ser menor do que 100 +ShowMarginInfos=Mostrar informações de margems diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang index bd6c5e7969e..49fd906d30b 100644 --- a/htdocs/langs/pt_BR/members.lang +++ b/htdocs/langs/pt_BR/members.lang @@ -11,31 +11,14 @@ UserNotLinkedToMember=Usuário não vinculado a um associado ThirdpartyNotLinkedToMember=Fornecedores não ligados a um membro MembersTickets=Etiquetas de associado FundationMembers=Membros da fundação -Attributs=Atributos -ErrorMemberTypeNotDefined=Não foi indicado o tipo de membro -ListOfPublicMembers=Lista de Membros públicos -ListOfValidatedPublicMembers=Lista de Membros públicos validados -ErrorThisMemberIsNotPublic=Este membro não é público ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro já está vinculado a um terceiro. Remover este link em primeiro lugar porque um terceiro não pode ser ligado a apenas um membro (e vice-versa). ErrorUserPermissionAllowsToLinksToItselfOnly=Por razões de segurança, você deve ter permissões para editar todos os usuários sejam capazes de ligar um membro a um usuário que não é seu. ThisIsContentOfYourCard=Este é os detalhes do seu cartão CardContent=Conteúdo da sua ficha de membro -SetLinkToUser=Link para um usuário Dolibarr -SetLinkToThirdParty=Link para um fornecedor Dolibarr -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 MembersListResiliated=Lista dos Membros cancelados -MembersListQualified=Lista dos Membros qualificados -MenuMembersToValidate=Membros rascunho -MenuMembersValidated=Membros validados MenuMembersUpToDate=Membros ao día MenuMembersNotUpToDate=Membros não ao día MenuMembersResiliated=Membros cancelados -MembersWithSubscriptionToReceive=Membros com assinatura para receber DateAbonment=data filiação DateSubscription=data filiação DateNextSubscription=data próxima filiação @@ -43,136 +26,74 @@ DateEndSubscription=data final filiação EndSubscription=fim filiação SubscriptionId=Id adesão MemberId=Id adesão -NewMember=Novo membro -NewType=Novo tipo de membro -MemberType=Tipo de Membro -MemberTypeId=ID tipo de membro -MemberTypeLabel=Etiqueta tipo de membro -MembersTypes=Tipos de Membros MembersAttributes=Atributos Membros SearchAMember=procurar um membro MemberStatusDraft=rascunho (a Confirmar) -MemberStatusDraftShort=A Confirmar -MemberStatusActive=Validado (em espera de filiação ) -MemberStatusActiveShort=Validado MemberStatusActiveLate=filiação não à día MemberStatusActiveLateShort=não à día MemberStatusPaid=Assinatura em dia MemberStatusPaidShort=Até à data MemberStatusResiliated=membro dado de baixa -MemberStatusResiliatedShort=De baixa -MembersStatusToValid=Membros rascunho -MembersStatusToValidShort=Membros rascunho -MembersStatusValidated=Membros validados MembersStatusPaid=Assinatura em dia MembersStatusPaidShort=Até à data MembersStatusNotPaid=Assinatura desatualizado MembersStatusNotPaidShort=Expirada MembersStatusResiliated=Membros cancelados MembersStatusResiliatedShort=Membros cancelados -NewCotisation=Nova filiação PaymentSubscription=Subscrição de Pagamento EditMember=edição membro SubscriptionEndDate=data final filiação -MembersTypeSetup=configuração dos tipos de Membros -NewSubscription=Nova filiação NewSubscriptionDesc=Este formulário permite que você grave a sua assinatura como um novo membro da fundação. Se você quiser renovar a sua assinatura (se já for membro), por favor, entre em contato com Conselho de Fundadores não por e-mail. -Subscription=Filiação Subscriptions=Filiações SubscriptionLate=Em Atraso SubscriptionNotReceived=filiação não recibida SubscriptionLateShort=em atraso SubscriptionNotReceivedShort=não recibida ListOfSubscriptions=Lista de Filiações -SendCardByMail=Enviar ficha -AddMember=Adicionar membro +AddMember=Criar membro NoTypeDefinedGoToSetup=nenhum tipo de membro definido. ir a configuração -> Tipos de Membros -NewMemberType=Novo tipo de membro -WelcomeEMail=E-mail -SubscriptionRequired=Sujeito a cotação EditType=edição do tipo de membro -DeleteType=Eliminar -VoteAllowed=Voto autorizado Physical=Físico Moral=Moral MorPhy=Moral/Físico Reenable=Reativar ResiliateMember=Baixar um membro ConfirmResiliateMember=Tem certeza que quer cancelar este membro? -DeleteMember=Eliminar um membro ConfirmDeleteMember=Tem certeza que quer eliminar este membro (Eliminar um membro elimina também todas as suas honorários)? -DeleteSubscription=Eliminar uma filiação ConfirmDeleteSubscription=Tem certeza que quer eliminar esta filiação? Filehtpasswd=Arquivo htpasswd -ValidateMember=Confirmar um membro ConfirmValidateMember=Tem certeza que quer Confirmar a este membro? FollowingLinksArePublic=os vínculos seguintes são páginas acessiveis a todos e não protegidas por Nenhuma habilitação Dolibarr. PublicMemberList=Lista público de Membros BlankSubscriptionForm=Formulário de inscrição BlankSubscriptionFormDesc=Dolibarr pode fornecer uma URL pública para permitir que os visitantes externos de pedir para se inscrever para a fundação. Se um módulo de pagamento on-line estiver ativado, uma forma de pagamento também será fornecido automaticamente. EnablePublicSubscriptionForm=Habilite a forma pública auto-assinatura -MemberPublicLinks=Likns/páginas publicas ExportDataset_member_1=Membros e Filiações -ImportDataset_member_1=Membros -LastMembers=os %s últimos Membros -LastMembersModified=os %s últimos Membros modificados LastSubscriptionsModified=Assinaturas Últimas modificadas -AttributeName=Nome do atributo -String=Cadeia -Text=Texto largo -Int=Numérico -Date=Data -DateAndTime=data e hora -PublicMemberCard=Ficha pública membro MemberNotOrNoMoreExpectedToSubscribe=não submetida a cotação -AddSubscription=Adicionar filiação -ShowSubscription=Mostrar filiação +AddSubscription=Criar subscripção MemberModifiedInDolibarr=membro modificado em Dolibarr -SendAnEMailToMember=Enviar e-mail de informação à membro (E-mail: %s) -DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assunto do e-mail recebido em caso de auto-inscrição de um convidado -DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recebido em caso de auto-inscrição de um convidado DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Assunto do email em caso de inscrição automática DescADHERENT_AUTOREGISTER_MAIL=Email a enviar em caso de convite para inscrição automática -DescADHERENT_MAIL_VALID_SUBJECT=assunto do e-mail de validação de membro -DescADHERENT_MAIL_VALID=E-mail de validação de membro -DescADHERENT_MAIL_COTIS_SUBJECT=assunto do e-mail de validação de cotação -DescADHERENT_MAIL_COTIS=E-mail de validação de uma filiação -DescADHERENT_MAIL_RESIL_SUBJECT=assunto de e-mail de baixa -DescADHERENT_MAIL_RESIL=E-mail de baixa -DescADHERENT_MAIL_FROM=E-mail emissor para os e-mails automáticos -DescADHERENT_ETIQUETTE_TYPE=Formato etiquetas DescADHERENT_ETIQUETTE_TEXT=Texto impresso em folhas de endereço de membros DescADHERENT_CARD_TYPE=Formato da página fichas -DescADHERENT_CARD_HEADER_TEXT=Texto a imprimir na parte superior do cartão de membro -DescADHERENT_CARD_TEXT=Texto a imprimir ao cartão de membro DescADHERENT_CARD_TEXT_RIGHT=Texto impresso em cartões de membros (alinhar à direita) -DescADHERENT_CARD_FOOTER_TEXT=Texto a imprimir na parte inferior do cartão de membro GlobalConfigUsedIfNotDefined=Texto definido na configuração do módulo fundação será usada se não for definido aqui MayBeOverwrited=Este texto pode ser sobrescrito pelo valor definido para o tipo de membro -ShowTypeCard=Ver tipo '%s' HTPasswordExport=geração Arquivo htpassword NoThirdPartyAssociatedToMember=nenhum Fornecedor associado a este membro ThirdPartyDolibarr=Fornecedores Dolibarr -MembersAndSubscriptions= Membros e Subscrições +MembersAndSubscriptions=Membros e Subscrições MoreActions=Ação complementar em gravação MoreActionsOnSubscription=Ação complementar, sugerido por padrão durante a gravação de uma assinatura -MoreActionBankDirect=Criar um registro de transação direto na conta -MoreActionBankViaInvoice=Criar uma fatura e pagamento por conta -MoreActionInvoiceOnly=Criar uma fatura sem pagamento LinkToGeneratedPages=Gerar cartões de visitas LinkToGeneratedPagesDesc=Esta tela permite gerar arquivos PDF com cartões de visita para todos os seus membros ou um membro particular. DocForAllMembersCards=Gerar cartões de visita para todos os membros DocForOneMemberCards=Gerar cartões de visita para um determinado membro DocForLabels=Gerar folhas de endereço -SubscriptionPayment=Pagamento Assinatura LastSubscriptionDate=Data da Última Adesão LastSubscriptionAmount=Valor Última Adesão -MembersStatisticsByCountries=Membros estatísticas por país -MembersStatisticsByState=Membros estatísticas por estado / província -MembersStatisticsByTown=Membros estatísticas por cidade MembersStatisticsByRegion=Membros por região estatísticas -MemberByRegion=Membros por região -NbOfMembers=Número de membros NoValidatedMemberYet=Nenhum membro validados encontrado MembersByCountryDesc=Esta tela mostrará estatísticas sobre usuários por países. Gráfico depende, contudo, do Google serviço gráfico on-line e está disponível apenas se uma conexão à Internet é está funcionando. MembersByStateDesc=Esta tela mostrará estatísticas sobre usuários por estado / província / cantão. @@ -180,22 +101,13 @@ MembersByTownDesc=Esta tela mostrará estatísticas sobre usuários por cidade. MembersStatisticsDesc=Escolha as estatísticas que você quer ler ... MenuMembersStats=Estatísticas LastMemberDate=Data do membro -Nature=Tipo de produto Public=Informações são públicas -Exports=Exportações NewMemberbyWeb=Novo membro adicionado. Aguardando aprovação NewMemberForm=Formulário para novo membro -SubscriptionsStatistics=Estatísticas sobre assinaturas NbOfSubscriptions=Número de inscrições -AmountOfSubscriptions=Quantidade de assinaturas TurnoverOrBudget=Volume de negócios (para uma empresa) ou de orçamento (para uma fundação) -DefaultAmount=Quantidade padrão de assinatura CanEditAmount=Visitante pode escolher/editar quantidade da sua subscrição MEMBER_NEWFORM_PAYONLINE=Ir na página de pagamento online integrado -Associations=Fundações -Collectivités=Organizações -Particuliers=Pessoal -Entreprises=Empresas DOLIBARRFOUNDATION_PAYMENT_FORM=Para fazer o seu pagamento de assinatura usando uma transferência bancária, consulte a página     http://wiki.dolibarr.org/index.php/Subscribe .
    Para pagar utilizando um cartão de crédito ou Paypal, clique no botão na parte inferior desta página.
    ByProperties=Por características MembersStatisticsByProperties=Membros estatísticas por características diff --git a/htdocs/langs/pt_BR/opensurvey.lang b/htdocs/langs/pt_BR/opensurvey.lang index 3b8473f8874..c595c56280f 100644 --- a/htdocs/langs/pt_BR/opensurvey.lang +++ b/htdocs/langs/pt_BR/opensurvey.lang @@ -1,66 +1,27 @@ # Dolibarr language file - Source file is en_US - opensurvey -Survey=Enquete -Surveys=Enquetes -OrganizeYourMeetingEasily=Organize suas reuniões e enquetes facilmente. Em primeiro lugar selecione o tipo de enquete... -NewSurvey=Nova enquete -NoSurveysInDatabase=%s enquete(s) na base de dados. -OpenSurveyArea=Área de enquetes -AddACommentForPoll=Você pode adicionar um comentário na enquete... -AddComment=Adicionar comentário CreatePoll=Criar uma enquete PollTitle=Titulo da enquete -ToReceiveEMailForEachVote=Receba um e-mail a cada novo voto TypeDate=Modelo para datas TypeClassic=Modelo padrão -OpenSurveyStep2=Selecione os dias livres (cinza). Os dias escolhidos são verdes. Você pode desmarcar um dia previamente selecionado, clicando novamente sobre ele RemoveAllDays=Remova todos os dias -CopyHoursOfFirstDay=Copiar horários do primeiro dia -RemoveAllHours=Apagar todos os horários -SelectedDays=Dias selecionados TheBestChoice=A melhor escolha no momento é TheBestChoices=As melhores escolhas no momento são -with=com -OpenSurveyHowTo=Se você quiser votar nesta enquete, você tem que preencher o seu nome, escolha as opções que se encaixam melhor para você e confirme com o botão de mais no final da linha. -CommentsOfVoters=Comentários dos votantes ConfirmRemovalOfPoll=Você tem certeza que deseja remover esta enquete (e todos os votos) RemovePoll=Remover enquete -UrlForSurvey=URL para obter um acesso direto à pesquisa -PollOnChoice=Você está criando uma enquete e se quiser ainda pode optar por votos multi escolhas em cada item. Basta entrar com o tipo de resposta para o voto: -CreateSurveyDate=Criar uma enquete para datas -CreateSurveyStandard=Criar uma enquete padrão CheckBox=Caixa de resposta simples YesNoList=Escolher (nulo/sim/não) PourContreList=Escolher (nulo/a favor/contra) -AddNewColumn=Adicionar nova coluna -TitleChoice= Escolha a resposta ExportSpreadsheet=Exportar resultado para planilha -ExpireDate=Data Limite -NbOfSurveys=Número de enquetes NbOfVoters=Nr. de eleitores SurveyResults=Resultado -PollAdminDesc=Você está autorizado a alterar todas as linhas da votação desta enquete, com o botão "Editar". Você pode, também remover uma coluna ou uma linha com o %s. Você também pode adicionar uma nova coluna com o %s. -5MoreChoices=Mais 5 opções -Abstention=Abstenção -Against=Contra YouAreInivitedToVote=Você foi convidado para votar nesta enquete -VoteNameAlreadyExists=Este nome já foi usada na enquete ErrorPollDoesNotExists=Erro, enquete %s não existe. -OpenSurveyNothingToSetup=Não há nenhuma configuração específica a fazer. -PollWillExpire=Sua votação expira automaticamente em %s dias após a última data preenchida na enquete. -AddADate=Adicionar uma data -AddStartHour=Adicionar hora de início AddEndHour=Adicionar hora final votes=voto(s) NoCommentYet=Nenhum comentário foi publicado para este voto ainda CanEditVotes=É possível alterar voto dos demais CanComment=Os eleitores podem comentar na enquete CanSeeOthersVote=Os eleitores podem ver os votos de outras pessoas -SelectDayDesc=Em cada dia selecionado, você pode escolher ou não preencher os horários com o seguinte formato:
    - vazio,
    - "8h", "8H" ou "08:00" horário de início da reunião,
    - "8-11", "8h-11h", "8H-11H" ou "8:00-11:00" horário de início da reunião e do termino,
    - "8h15-11h15", "8h15-11H15 " ou " 8:15-11:15 " mesma funcionalidade, mas com preenchimento dos minutos. -BackToCurrentMonth=Voltar para o mês atual -ErrorOpenSurveyFillFirstSection=Você não preencheu o primeiro passo para criação da enquete ErrorOpenSurveyOneChoice=Digite pelo menos uma opção ErrorOpenSurveyDateFormat=A data deve ter o formato YYYY-MM-DD -ErrorInsertingComment=Houve um erro ao inserir o seu comentário -MoreChoices=Digite mais opções para os votos SurveyExpiredInfo=O período de votação da enquete expirou. -EmailSomeoneVoted=%s preencheu uma linha.\nVocê pode encontrar sua enquete no link:\n%s diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang index 9e85157ef44..ccf3c96b8bc 100644 --- a/htdocs/langs/pt_BR/orders.lang +++ b/htdocs/langs/pt_BR/orders.lang @@ -1,90 +1,27 @@ # Dolibarr language file - Source file is en_US - orders OrdersArea=Área de Pedidos de Clientes -SuppliersOrdersArea=Área de Pedidos a Fornecedores -OrderCard=Ficha Pedido OrderId=ID Pedido -Order=Pedido -Orders=Pedidos OrderLine=Linha de Comando -OrderFollow=Seguimento -OrderDate=Data Pedido OrderToProcess=Pedido a se processar -NewOrder=Novo Pedido -ToOrder=Realizar Pedido -MakeOrder=Realizar Pedido -SupplierOrder=Pedido a Fornecedor -SuppliersOrders=Pedidos a Fornecedores -SuppliersOrdersRunning=Pedidos a Fornecedores em Curso CustomerOrder=Pedido de Cliente -CustomersOrders=Pedidos de Clientes -CustomersOrdersRunning=Pedidos de Clientes em Curso -CustomersOrdersAndOrdersLines=Pedidos de Clientes e Linhas de Pedido -OrdersToValid=Pedidos a Confirmar OrdersToBill=Pedidos por Faturar -OrdersInProcess=Pedidos em Processo -OrdersToProcess=Pedidos a Processar SuppliersOrdersToProcess=Pedidos de fornecedor a se processar -StatusOrderCanceledShort=Anulado -StatusOrderDraftShort=Rascunho -StatusOrderValidatedShort=Validado StatusOrderSentShort=Em processo StatusOrderSent=Envio em processo -StatusOrderOnProcessShort=Em curso -StatusOrderProcessedShort=Processado StatusOrderToBillShort=Entregue StatusOrderToBill2Short=A se faturar -StatusOrderApprovedShort=Aprovado -StatusOrderRefusedShort=Reprovado -StatusOrderToProcessShort=A Processar -StatusOrderReceivedPartiallyShort=Recebido Parcialmente -StatusOrderReceivedAllShort=Recebido -StatusOrderCanceled=Anulado -StatusOrderDraft=Rascunho (a Confirmar) -StatusOrderValidated=Validado -StatusOrderOnProcess=Em processo -StatusOrderProcessed=Processado StatusOrderToBill=A Faturar StatusOrderToBill2=A Faturar -StatusOrderApproved=Aprovado -StatusOrderRefused=Reprovado -StatusOrderReceivedPartially=Recebido Parcialmente -StatusOrderReceivedAll=Recebido ShippingExist=Existe envio DraftOrWaitingApproved=Rascunho aprovado mas ainda não controlado -DraftOrWaitingShipped=Rascunho o validado mas ainda não expedido MenuOrdersToBill=Pedidos por Faturar -MenuOrdersToBill2=Pedidos a se faturar -SearchOrder=Procurar um Pedido SearchACustomerOrder=Procure um pedido do cliente -ShipProduct=Enviar Produto -Discount=Desconto -CreateOrder=Criar Pedido -RefuseOrder=Rejeitar o Pedido -ApproveOrder=Aceitar o Pedido -ValidateOrder=Confirmar o Pedido UnvalidateOrder=Desaprovar pedido -DeleteOrder=Eliminar o pedido -CancelOrder=Anular o Pedido -AddOrder=Criar Pedido -AddToMyOrders=Adicionar os meus Pedidos -AddToOtherOrders=Adicionar a outros pedidos +AddOrder=Criar ordem AddToDraftOrders=Adicionar a projeto de pedido -ShowOrder=Mostrar Pedido -NoOpenedOrders=Nenhum pedido em aberto -NoOtherOpenedOrders=Nenhum outro pedido aberto NoDraftOrders=Não há projetos de pedidos -OtherOrders=Outros Pedidos -LastOrders=Os %s últimos pedidos -LastModifiedOrders=Os %s últimos pedidos modificados LastClosedOrders=Os últimos %s Pedidos -AllOrders=Todos os Pedidos -NbOfOrders=Número de Pedidos -OrdersStatistics=Estatísticas de pedidos -OrdersStatisticsSuppliers=Estatísticas de Pedidos a Fornecedores -NumberOfOrdersByMonth=Número de Pedidos por Mês AmountOfOrdersByMonthHT=Numero de pedidos por mes (sem impostos) -ListOfOrders=Lista de Pedidos -CloseOrder=Fechar Pedido ConfirmCloseOrder=Tem certeza de que deseja fechar este pedido? Quando um pedido é fechado, ele só pode ser cobrado. ConfirmCloseOrderIfSending=Tem certeza de que deseja fechar este pedido? Veve fechar no somente quando todos os transfretes marítimos são feitos. ConfirmDeleteOrder=Tem certeza que quer eliminar este pedido? @@ -95,26 +32,13 @@ ConfirmMakeOrder=Tem certeza que quer confirmar este pedido em data de%s GenerateBill=Faturar ClassifyShipped=Clasificar entregue ClassifyBilled=Classificar "Faturado" -ComptaCard=Ficha Contabilidade -DraftOrders=Rascunhos de Pedidos -RelatedOrders=Pedidos Anexos -OnProcessOrders=Pedidos em Processo -RefOrder=Ref. Pedido -RefCustomerOrder=Ref. Pedido Cliente -RefCustomerOrderShort=Ref. Ped. Cliente -SendOrderByMail=Enviar pedido por e-mail ActionsOnOrder=Ações sobre o pedido NoArticleOfTypeProduct=Não existe artigos de tipo 'produto' e por tanto expedidos neste pedido -OrderMode=Método de pedido -AuthorRequest=Autor/Solicitante UseCustomerContactAsOrderRecipientIfExist=Utilizar endereço do contato do cliente de seguimento cliente se está definido em vez do Fornecedor como destinatário dos pedidos -RunningOrders=Pedidos em Curso UserWithApproveOrderGrant=Usuários autorizados a aprovar os pedidos. -PaymentOrderRef=Pagamento de Pedido %s CloneOrder=Copiar o Pedido ConfirmCloneOrder=Tem certeza de que deseja clonar este%s ? DispatchSupplierOrder=Receber pedido de fornecedor %s -##### Types de contacts ##### TypeContact_commande_internal_SALESREPFOLL=Responsável do seguimento do pedido do cliente TypeContact_commande_internal_SHIPPING=Representante seguindo o envio TypeContact_commande_external_BILLING=Contato fatura cliente @@ -125,36 +49,19 @@ TypeContact_order_supplier_internal_SHIPPING=Representante seguindo o envio TypeContact_order_supplier_external_BILLING=Contato fatura fornecedor TypeContact_order_supplier_external_SHIPPING=Contato envio fornecedor TypeContact_order_supplier_external_CUSTOMER=Contato fornecedor seguindo o pedido - -Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON não definida -Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON não definida Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Erro na carga do Arquivo módulo '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Erro na carga de arquivo módulo '%s' Error_OrderNotChecked=Nenhum pedido seleçionado para se faturar -# Sources -OrderSource0=Orçamento Proposto -OrderSource1=Internet -OrderSource2=Campanha por correio OrderSource3=Campanha telefônica -OrderSource4=Campanha por fax -OrderSource5=Comercial -OrderSource6=Revistas -QtyOrdered=Quant. Pedida AddDeliveryCostLine=Adicionar uma linha de despesas de fretes indicando o peso do pedido -# Documents models PDFEinsteinDescription=Modelo de pedido completo (logo...) PDFEdisonDescription=O modelo simplificado do pedido PDFProformaDescription=A proforma fatura completa (logomarca...) -# Orders modes -OrderByMail=Correio -OrderByFax=Fax OrderByEMail=E-mail OrderByWWW=Online -OrderByPhone=Telefone CreateInvoiceForThisCustomer=Faturar pedidos NoOrdersToInvoice=Nenhum pedido faturavel CloseProcessedOrdersAutomatically=Clasificar "processados" os pedidos selecionados. -MenuOrdersToBill2=Pedidos a se faturar OrderCreation=Criação de pedidos Ordered=Pedido OrderCreated=Seus pedidos foram criados diff --git a/htdocs/langs/pt_BR/oscommerce.lang b/htdocs/langs/pt_BR/oscommerce.lang deleted file mode 100644 index 3df1b087212..00000000000 --- a/htdocs/langs/pt_BR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Configuração do módulo OS Commerce -OSCommerceSetupSaved=Configuração OS Commerce guardada -OSCommerceServer=Nome/IP servidor da base de dados OS commerce -OSCommerceDatabaseName=Nome da base de dados OS Commerce -OSCommercePrefix=Prefixo Tabelas OS Commerce -OSCommerceUser=Usuário da base de dados OS Commerce diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang index 76796886a59..dbbed148c06 100644 --- a/htdocs/langs/pt_BR/other.lang +++ b/htdocs/langs/pt_BR/other.lang @@ -1,14 +1,11 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Código Segurança -Calendar=Calendário -AddTrip=Criar Deslocamento -Tools=Utilidades -ToolsDesc=Esta area e dedicada para o grupo de ferramentas varias não disponivel em outros menus.

    Estas ferramentas podem se acionar atraves do menu ao lado. +ToolsDesc=Esta area e dedicada para o grupo de ferramentas varias não disponivel em outros menus.

    Estas ferramentas podem se acionar atraves do menu ao lado. Birthday=Aniversário BirthdayDate=Data de aniversário DateToBirth=Data de nascimento -BirthdayAlertOn= Alerta de aniversário ativo -BirthdayAlertOff= Alerta de aniversário desativado +BirthdayAlertOn=Alerta de aniversário ativo +BirthdayAlertOff=Alerta de aniversário desativado Notify_FICHINTER_VALIDATE=Intervenção validada Notify_FICHINTER_SENTBYMAIL=Intervenção enviada por e-mail Notify_BILL_VALIDATE=Fatura cliente validada @@ -23,7 +20,6 @@ Notify_WITHDRAW_TRANSMIT=Revogação de transmissão Notify_WITHDRAW_CREDIT=Revogação de credito Notify_WITHDRAW_EMIT=Revogação de performance Notify_ORDER_SENTBYMAIL=Pedido cliente enviado por e-mail -Notify_COMPANY_CREATE=Terceiro criado Notify_COMPANY_SENTBYMAIL=E-mails enviados a partir do cartão de terceiros Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por e-mail Notify_BILL_PAYED=Fatura cliente paga @@ -35,12 +31,9 @@ Notify_BILL_SUPPLIER_VALIDATE=Fatura fornecedor validada Notify_BILL_SUPPLIER_PAYED=Fatura fornecedor paga Notify_BILL_SUPPLIER_SENTBYMAIL=Fatura fornecedor enviada por e-mail Notify_BILL_SUPPLIER_CANCELED=Fornecedor fatura cancelada -Notify_CONTRACT_VALIDATE=Contrato validado Notify_FICHEINTER_VALIDATE=Intervenção validada Notify_SHIPPING_VALIDATE=Envio validado Notify_SHIPPING_SENTBYMAIL=Envio enviado por e-mail -Notify_MEMBER_VALIDATE=Membro validado -Notify_MEMBER_MODIFY=Membro modificado Notify_MEMBER_SUBSCRIPTION=Membro inscrito Notify_MEMBER_RESILIATE=Membro resiliado Notify_MEMBER_DELETE=Membro apagado @@ -48,13 +41,9 @@ Notify_PROJECT_CREATE=criação de projeto Notify_TASK_CREATE=Tarefa criada Notify_TASK_MODIFY=Tarefa alterada Notify_TASK_DELETE=Tarefa excluída -NbOfAttachedFiles=Número Arquivos/Documentos Anexos +SeeModuleSetup=Ver modulo configurações TotalSizeOfAttachedFiles=Tamanho Total dos Arquivos/Documentos Anexos -MaxSize=Tamanho Máximo -AttachANewFile=Adicionar Novo Arquivo/Documento LinkedObject=Arquivo Anexo -Miscellaneous=Diversos -NbOfActiveNotifications=Número Notificações PredefinedMailTest=Esse e um teste de envio.⏎\nAs duas linhas estao separadas por retono de linha.⏎\n⏎\n__SIGNATURE__ PredefinedMailTestHtml=Esse e um email de teste (a palavra test deve ser em bold).
    As duas linhas estao separadas por retorno de linha.

    __SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Você vai encontrar aqui a factura __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ @@ -75,65 +64,30 @@ DemoCompanyShopWithCashDesk=Administração de uma loja com Caixa DemoCompanyProductAndStocks=Administração de uma PYME com venda de produtos DemoCompanyAll=Administração de uma PYME com Atividades multiplos (todos Os módulos principais) GoToDemo=Acessar ao demo -CreatedBy=Criado por %s -ModifiedBy=Modificado por %s -ValidatedBy=Validado por %s -CanceledBy=Anulado por %s ClosedBy=Encerrado por %s +CreatedById=Id usuario que criou +ModifiedById=Id usuario que fiz a ultima alteração +ValidatedById=Id usuario que validou +CanceledById=Id usuario que cancelou +ClosedById=Id usuario que fecho +CreatedByLogin=Login usuario que criou +ModifiedByLogin=Login usuario que fiz a ultima alteração +ValidatedByLogin=Login usuario que foi validado +CanceledByLogin=Login usuario que cancelou +ClosedByLogin=Login usuario que fechou FileWasRemoved=o Arquivo foi eliminado DirWasRemoved=a pasta foi eliminado FeatureNotYetAvailableShort=Disponível numa próxima versão FeatureNotYetAvailable=Funcionalidade não disponível nesta versão FeatureExperimental=Funcionalidade experimental. não é estável nesta versão FeatureDevelopment=Funcionalidade em Desenvolvimento. não estável nesta versão -FeaturesSupported=Funcionalidades suportadas -Width=Largura -Height=Altura -Depth=Fundo -Top=Topo -Bottom=Fundo Left=Esquerda Right=Direita -CalculatedWeight=Peso calculado -CalculatedVolume=Volume calculado -Weight=Peso -TotalWeight=Peso total -WeightUnitton=Toneladas -WeightUnitkg=kg -WeightUnitg=g -WeightUnitmg=mg -WeightUnitpound=libra -Length=Comprimento -LengthUnitm=m -LengthUnitdm=dm LengthUnitcm=cm LengthUnitmm=mm Surface=Area -SurfaceUnitm2=m2 -SurfaceUnitdm2=dm2 -SurfaceUnitcm2=cm2 -SurfaceUnitmm2=mm2 -SurfaceUnitfoot2=ft2 -SurfaceUnitinch2=in2 -Volume=Volume -TotalVolume=Volume total -VolumeUnitm3=m3 -VolumeUnitdm3=dm3 -VolumeUnitcm3=cm3 -VolumeUnitmm3=mm3 -VolumeUnitfoot3=ft3 -VolumeUnitinch3=in3 -VolumeUnitounce=onça -VolumeUnitlitre=litro VolumeUnitgallon=gallão -Size=Tamanho -SizeUnitm=m -SizeUnitdm=dm -SizeUnitcm=cm -SizeUnitmm=mm -SizeUnitinch=polegada SizeUnitfoot=pe -SizeUnitpoint=ponto BugTracker=Incidências SendNewPasswordDesc=Este formulário permite enviar uma Nova senha. Será enviado ao e-mail do usuário
    a modificação da senha não será efetiva até que o usuário click no link de confirmação neste e-mail.
    Verifique sua caixa de correio. BackToLoginPage=Voltar e a página de login @@ -141,16 +95,9 @@ AuthenticationDoesNotAllowSendNewPassword=o modo de autentificação de Dolibarr EnableGDLibraryDesc=deve ativar o instalar a Bibliotéca GD na sua PHP para poder ativar esta Opção EnablePhpAVModuleDesc=deve instalar um módulo PHP compatible com a sua antivírus. (Clamav : php4-clamavlib ó php5-clamavlib) ProfIdShortDesc=Prof Id %s é uma informação dePendente do país do Fornecedor.
    Por Exemplo, para o país %s, é o código %s. -DolibarrDemo=Demo de Dolibarr ERP/CRM -StatsByNumberOfUnits=Estatísticas em número de unidades de produto/serviço -StatsByNumberOfEntities=Estatísticas em número de identidadees referentes -NumberOfProposals=Número de Orçamentos nos últimos 12 meses -NumberOfCustomerOrders=Número de pedidos de clientes nos últimos 12 meses NumberOfCustomerInvoices=Número de faturas a clientes nos últimos 12 meses NumberOfSupplierOrders=Numero de pedidos dos fornecedores nos ultimos 12 meses NumberOfSupplierInvoices=Número de faturas de Fornecedores nos últimos 12 meses -NumberOfUnitsProposals=Número de unidades nos Orçamentos nos últimos 12 meses -NumberOfUnitsCustomerOrders=Número de unidades nos pedidos de clientes nos últimos 12 meses NumberOfUnitsCustomerInvoices=Número de unidades em faturas a clientes nos últimos 12 meses NumberOfUnitsSupplierOrders=Numero de unidades nos pedidos a fornecedor nos ultimos 12 meses NumberOfUnitsSupplierInvoices=Número de unidades em faturas de Fornecedores nos últimos 12 meses @@ -158,15 +105,9 @@ EMailTextInterventionValidated=A intervenção %s foi validada EMailTextInvoiceValidated=A fatura %s foi validada. EMailTextProposalValidated=A proposta %s foi validada. EMailTextOrderValidated=O pedido %s foi validado. -EMailTextOrderApproved=Pedido %s Aprovado -EMailTextOrderApprovedBy=Pedido %s Aprovado por %s -EMailTextOrderRefused=Pedido %s Reprovado -EMailTextOrderRefusedBy=Pedido %s Reprovado por %s -EMailTextExpeditionValidated=O envio %s foi validado. ImportedWithSet=Data importacao DolibarrNotification=Notificação automatica ResizeDesc=Insira a nova largura OU o novo peso. A proporção sera mantida durante a transformacao... -NewLength=Nova largura NewHeight=Nova altrua NewSizeAfterCropping=Nova dimensao depois do recorte DefineNewAreaToPick=Definir nova area na imagem para escolher ( click esquerdo na imagem e depois arastar ate o canto oposto) @@ -179,48 +120,32 @@ ClickHere=Clickque aqui UseAdvancedPerms=Use as permissões avançadas de algums modulos FileFormat=Arquivo formato SelectAColor=Escolha a cor -AddFiles=Adicionar arquivos StartUpload=Iniciar o "upload" CancelUpload=Cancelar o "upload" FileIsTooBig=Tamanho do arquivo grande de mais -PleaseBePatient=Por favor aguarde.... RequestToResetPasswordReceived=Recebemos a pedido de mudar a sua senha do Dolibarr NewKeyIs=Estas sao as suas novas chaves de acesso NewKeyWillBe=Sua nova chave de acesso do software sera ClickHereToGoTo=Clickar aqui para ir a %s YouMustClickToChange=Voce tem que clickar no seguinte atalho para validar a sua troca de senha ForgetIfNothing=Se voce nao pediu esta mudanca, simplismente esquece deste email. Suas credenciais estao seguras. - -##### Calendar common ##### AddCalendarEntry=Adicionar entrada ao calendário -NewCompanyToDolibarr=Empresa %s Cadastrada -ContractValidatedInDolibarr=Contrato %s Confirmado -ContractCanceledInDolibarr=Contrato %s Cancelado -ContractClosedInDolibarr=Contrato %s Encerrado -PropalClosedSignedInDolibarr=Orçamento %s Assinado -PropalClosedRefusedInDolibarr=Orçamento %s rejeitado -PropalValidatedInDolibarr=Orçamento %s Validado -InvoiceValidatedInDolibarr=Fatura %s Confirmada -InvoicePaidInDolibarr=Fatura %s modificada em paga in Dolibarr -InvoiceCanceledInDolibarr=Fatura %s Cancelada -PaymentDoneInDolibarr=Pagamento %s Realizado -CustomerPaymentDoneInDolibarr=Pagamento do cliente %s -SupplierPaymentDoneInDolibarr=Pagamento a fornecedor %s -MemberValidatedInDolibarr=Membro %s Confirmado -MemberResiliatedInDolibarr=Membro %s Baixado -MemberDeletedInDolibarr=Membro %s Excluido -MemberSubscriptionAddedInDolibarr=Inscrição do membro % adicionada -ShipmentValidatedInDolibarr=Envio %s validado em Dolibarr -ShipmentDeletedInDolibarr=Envio %s cancelado de Dolibarr -##### Export ##### +ContractValidatedInDolibarr=Contrato %s validado +ContractCanceledInDolibarr=Contrato %s cancelado +ContractClosedInDolibarr=Contrato %s fechado +PropalClosedSignedInDolibarr=Proposta %s assinada +PropalClosedRefusedInDolibarr=Proposta %s declinada +PropalClassifiedBilledInDolibarr=Proposta %s classificada faturada +InvoicePaidInDolibarr=Fatura %s marcada paga +InvoiceCanceledInDolibarr=Fatura %s cancelada +PaymentDoneInDolibarr=Pagamento %s effetuado +CustomerPaymentDoneInDolibarr=PAgamento do cliente %s effetuado +SupplierPaymentDoneInDolibarr=Pagamento do fornecedor %s effetuado +MemberValidatedInDolibarr=Membro %s validado +MemberResiliatedInDolibarr=Membro %s baixado +MemberDeletedInDolibarr=Membro %s cancelado +MemberSubscriptionAddedInDolibarr=Inscrição do membo %s adicionada +ShipmentValidatedInDolibarr=Envio %s validado +ShipmentDeletedInDolibarr=Envio %s cancelado Export=Exportar -ExportsArea=Área de Exportações -AvailableFormats=Formatos disponíveis -LibraryUsed=Bibliotéca utilizada -LibraryVersion=Versão -ExportableDatas=dados exportáveis NoExportableData=não existe dados exportáveis (sem módulos com dados exportáveis gastodos, necessitam de permissões) -ToExport=Exportar -NewExport=Nova Exportação -##### External sites ##### -ExternalSites=Sites externos diff --git a/htdocs/langs/pt_BR/paybox.lang b/htdocs/langs/pt_BR/paybox.lang index 95d125d8fdd..383d49a131f 100644 --- a/htdocs/langs/pt_BR/paybox.lang +++ b/htdocs/langs/pt_BR/paybox.lang @@ -1,19 +1,13 @@ # Dolibarr language file - Source file is en_US - paybox -PayBoxSetup=Configuração do módulo PayBox PayBoxDesc=Este módulo oferece uma página de pagamento atravé do fornecedor %s     PAYPAL_ADD_PAYMENT_URL=Adicionar URL do pagamento Paypal quando se envia o documento por e-mail -PAYPAL_IPN_MAIL_ADDRESS=Endereço e-mail para notificaçao instantanea do pagamento (IPN) +PAYPAL_IPN_MAIL_ADDRESS=Endereço e-mail para notificaçao instantanea do pagamento (IPN) PredefinedMailContentLink=Clique no link seguro abaixo para fazer o pagamento (PayPal) se nao esta ainda effetuado.⏎\n⏎\n%s⏎\n⏎\n YouAreCurrentlyInSandboxMode=No momento esta no modo "caixa de areia" -NewPaypalPaymentReceived=Novo pagamento Paypal recebido NewPaypalPaymentFailed=Tentado novo pagamento Paypal mas sem hesito. PAYPAL_PAYONLINE_SENDEMAIL=Endereço e-mail para aviso apos o pagamento (positivo ou nao) ReturnURLAfterPayment=Retornar URL após o pagamento ValidationOfPaypalPaymentFailed=Validação do pagamento do Paypal falhou -PaypalConfirmPaymentPageWasCalledButFailed= Pagamento completo mas nenhum pagamento foi recebido no PayPal +PaypalConfirmPaymentPageWasCalledButFailed=Pagamento completo mas nenhum pagamento foi recebido no PayPal diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang index 9384b6dd0f3..a44226c4a38 100644 --- a/htdocs/langs/pt_BR/products.lang +++ b/htdocs/langs/pt_BR/products.lang @@ -1,173 +1,74 @@ # Dolibarr language file - Source file is en_US - products ProductRef=Ref produto. ProductLabel=Nome do Produto -ProductServiceCard=Ficha Produto/Serviço -Products=Produtos -Services=Serviços -Product=Produto -Service=Serviço -ProductId=ID Produto/Serviço -Create=Criar -Reference=Referencia -NewProduct=Novo Produto -NewService=Novo Serviço -ProductCode=Código Produto -ServiceCode=Código Serviço ProductVatMassChange=Mudança VAT Massa ProductVatMassChangeDesc=Esta página pode ser utilizado para modificar uma taxa VAT definido em produtos ou serviços a partir de um valor para outro. Atenção, esta mudança é feita em todos os banco de dados. -MassBarcodeInit=Inicialização de código de barras. +MassBarcodeInit=Inicialização de código de barras. MassBarcodeInitDesc=Esta página pode ser usado para inicializar um código de barras em objetos que não têm código de barras definidas. Verifique antes que a instalação do módulo de código de barras é completa. ProductAccountancyBuyCode=Codigo contabilidade (compras) ProductAccountancySellCode=Codigo contabilidade (vendas) -ProductOrService=Produto ou Serviço -ProductsAndServices=Produtos e Serviços -ProductsOrServices=Produtos ou Serviços -ProductsAndServicesOnSell=Produtos e Serviços de Venda -ProductsAndServicesNotOnSell=Produtos e Serviços Fora de Venda -ProductsAndServicesStatistics=Estatísticas Produtos e Serviços -ProductsStatistics=Estatísticas Produtos -ProductsOnSell=Produtos em Venda -ProductsNotOnSell=Produtos Fora de Venda ProductsOnSellAndOnBuy=Produtos não para venda ou compra -ServicesOnSell=Serviços em Venda -ServicesNotOnSell=Serviços Fora de Venda ServicesOnSellAndOnBuy=Serviços não para venda ou compra -InternalRef=Referencia Interna LastRecorded=últimos Produtos/Serviços em Venda Registados LastRecordedProductsAndServices=Os %s últimos Produtos/Perviços Registados LastModifiedProductsAndServices=Os %s últimos Produtos/Serviços Registados LastRecordedProducts=Os %s últimos Produtos Registados LastRecordedServices=Os %s últimos Serviços Registados LastProducts=últimos Produtos -CardProduct0=Ficha do Produto -CardProduct1=Ficha do Serviço -CardContract=Ficha do Contrato -Warehouse=Armazém -Warehouses=Armazens -WarehouseOpened=Armazém Aberto -WarehouseClosed=Armazém Encerrado -Stock=Estoque -Stocks=Estoques -Movement=Movimento -Movements=Movimentos -Sell=Vendas -Buy=Compras OnSell=Para Venda OnBuy=Para compra -NotOnSell=Fora de Venda ProductStatusOnSell=Para Venda -ProductStatusNotOnSell=Fora de Venda ProductStatusOnSellShort=Para Venda -ProductStatusNotOnSellShort=Fora de venda ProductStatusOnBuy=Para compra ProductStatusNotOnBuy=Não para-se comprar ProductStatusOnBuyShort=Para compra ProductStatusNotOnBuyShort=Não para-se comprar -UpdatePrice=Alterar preço -AppliedPricesFrom=Preço de venda válido a partir de SellingPrice=Preço de Venda SellingPriceHT=Preço de venda (sem taxas) SellingPriceTTC=Preço de venda (incl. taxas) -PublicPrice=Preço público CurrentPrice=Preço atual NewPrice=Novo Preço MinPrice=Preço mínimo de venda MinPriceHT=Minimo preço de venda (líquido de imposto) MinPriceTTC=Minimo preço de venda (inc. taxa) CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS) -ContractStatus=Estado de contrato -ContractStatusClosed=Encerrado -ContractStatusRunning=Em Serviço -ContractStatusExpired=Expirado -ContractStatusOnHold=Fora de serviço -ContractStatusToRun=A colocar em serviço -ContractNotRunning=Este contrato não está em serviço -ErrorProductAlreadyExists=Um produto com a referencia %s já existe. +ContractStatusToRun=Para començar ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço. -Suppliers=Fornecedores -SupplierRef=Ref. fornecedor -ShowProduct=Mostrar produto -ShowService=Mostrar serviço -ProductsAndServicesArea=Área de Produtos e Serviços -ProductsArea=Área de Produtos -ServicesArea=Área de Serviços -AddToMyProposals=Adicionar aos meus Orçamentos -AddToOtherProposals=Adicionar a Outros Orçamentos +ErrorPriceCantBeLowerThanMinPrice=Erro Preço nao pode ser menor do preço minimo. AddToMyBills=Adicionar às minhas faturas AddToOtherBills=Adicionar a Outras faturas -CorrectStock=Corrigir estoque -AddPhoto=Adicionar uma foto -ListOfStockMovements=Lista de movimentos de estoque -BuyingPrice=Preço de compra -SupplierCard=Ficha fornecedor -CommercialCard=Ficha comercial AllWays=Rota para encontrar o sua produto ao estoque NoCat=O sua produto não pertence a nenhuma categoria -PrimaryWay=Rota Primaria: -PriceRemoved=Preço eliminado -BarCode=Código de barras -BarcodeType=Tipo de código de barras -SetDefaultBarcodeType=Defina o tipo de código de barras -BarcodeValue=Valor do código de barras NoteNotVisibleOnBill=Nota (Não é visivel as faturas, orçamentos, etc.) -CreateCopy=Criar Cópia -ServiceLimitedDuration=Sim o serviço é de Duração limitada : MultiPricesAbility=Vários preços por produto / serviço MultiPricesNumPrices=Numero de preços MultiPriceLevelsName=Categoria de preços -AssociatedProductsAbility=Ativar produtos associados -AssociatedProducts=Produtos associados -AssociatedProductsNumber=N� de produtos associados -ParentProductsNumber=Numero de produto virtual pai -IfZeroItIsNotAVirtualProduct=Se 0, este produto não e produto virtual -IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto nao e usado por nenhum produto virtual -EditAssociate=Associar -Translation=Tradução -KeywordFilter=Filtro por Chave +AssociatedProductsAbility=Activar a função do pacote virtual +AssociatedProducts=Pacote produto +AssociatedProductsNumber=Numero de produtos compondo este pacote virtual do produto +ParentProductsNumber=Numero de pacotes pais do produto +IfZeroItIsNotAVirtualProduct=Se 0, este produto não e um pacote virtual do produto +IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto não e usado em nenhum pacote virtual do produto CategoryFilter=Filtro por categoria -ProductToAddSearch=Procurar produtos a Adicionar -AddDel=Adicionar/Retirar -Quantity=Quantidade -NoMatchFound=Não foram encontrados resultados ProductAssociationList=Lista de produtos/serviços associados : Nome do produto/servisio (quantidade afetada) -ProductParentList=Lista de produtos/servicos virtuais com este produto como componente +ProductParentList=Lista de pacote produtos/serviços com este produto como componente ErrorAssociationIsFatherOfThis=Um dos produtos selecionados é pai do produto em curso -DeleteProduct=Eliminar um produto/serviço ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço? -ProductDeleted=O produto/serviço "%s" foi eliminado da base de dados. -DeletePicture=Eliminar uma foto -ConfirmDeletePicture=? Tem certeza que quer eliminar esta foto? -ExportDataset_produit_1=Produtos e Serviços -ExportDataset_service_1=Serviços -ImportDataset_produit_1=Produtos -ImportDataset_service_1=Serviços -DeleteProductLine=Eliminar linha de produto ConfirmDeleteProductLine=Tem certeza que quer eliminar esta linha de produto? -NoProductMatching=Nenhum produto/serviço responde à criterio -MatchingProducts=Produtos/Serviços encontrados NoStockForThisProduct=Não existe estoque deste produto NoStock=Sem estoque -Restock=Recolocar -ProductSpecial=Especial QtyMin=Quantidade min -PriceQty=Preço para a quantidade PriceQtyMin=Preco para esta qtd min. (sem desconto) VATRateForSupplierProduct=Percentual ICMS (para este fornecedor/produto) DiscountQtyMin=Desconto padrao para qtd -NoPriceDefinedForThisSupplier=Nenhum Preço/Quant. definido para este fornecedor/produto -NoSupplierPriceDefinedForThisProduct=Nenhum Preço/Quant. Fornecedor definida para este produto -RecordedProducts=Produtos em venda RecordedServices=Serviços gravados -RecordedProductsAndServices=Produtos/Serviços para Venda PredefinedProductsToSell=Produtos pré-definidas para vender PredefinedServicesToSell=Serviços predefinidos para vender PredefinedProductsAndServicesToSell=Produtos / serviços pré-definidas para vender PredefinedProductsToPurchase=Produto pré-definidas para compra PredefinedServicesToPurchase=Serviços pré-definidos para compra PredefinedProductsAndServicesToPurchase=Produtos / serviços predefinidos para compra. -GenerateThumb=Gerar a etiqueta -ProductCanvasAbility=Usar as extensões especiais "canvas" ServiceNb=Serviço n� %s ListProductServiceByPopularity=Lista de produtos/serviços por popularidade ListProductByPopularity=Lista de produtos por popularidade @@ -178,7 +79,7 @@ CloneProduct=Clonar produto ou serviço ConfirmCloneProduct=Voce tem certeza que deseja clonar o produto ou servico %s ? CloneContentProduct=Clonar todas as principais informações de um produto/serviço ClonePricesProduct=Clonar principais informações e preços -CloneCompositionProduct=Produtos / serviços copias virtuais +CloneCompositionProduct=Clonar produto/serviço empacotado ProductIsUsed=Este produto é usado NewRefForClone=Ref. do novo produto/serviço CustomerPrices=Preços de clientes @@ -194,16 +95,12 @@ AddThisProductCard=Criar ficha produto HelpAddThisProductCard=Esta opção permite de criar ou clonar um produto caso nao exista. AddThisServiceCard=Criar ficha serviço HelpAddThisServiceCard=Esta opção permite de criar ou clonar um serviço caso o mesmo não existe. -CurrentProductPrice=Preço atual AlwaysUseNewPrice=Usar sempre preço atual do produto/serviço AlwaysUseFixedPrice=Usar preço fixo -PriceByQuantity=Preço por quantidade PriceByQuantityRange=Intervalo de quantidade ProductsDashboard=Resumo de produtos/serviços -UpdateOriginalProductLabel=Modificar etiqueta original HelpUpdateOriginalProductLabel=Permite editar o nome do produto -### composition fabrication -Building=Produção e despacho de items +Building=Produção e despacho de items Build=Produzir BuildIt=Produzir & Enviar BuildindListInfo=Quantidade disponivel para produção por cada estoque (coloque 0 para nenhuma ação) @@ -212,7 +109,6 @@ UnitPmp=Unidades VWAP CostPmpHT=Total unidades VWAP ProductUsedForBuild=Automaticamente consumidos pela produção ProductBuilded=Produção completada -ProductsMultiPrice=Produto multi-preço ProductsOrServiceMultiPrice=Preços Clientes (de produtos ou serviços, multi-preços) ProductSellByQuarterHT=Total de produtos vendidos no trimestre ServiceSellByQuarterHT=Total de servicos vendidos no trimestre @@ -233,9 +129,10 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definição do código ou valor do c BarCodeDataForProduct=Informações de código de barras do produto% s: BarCodeDataForThirdparty=Informações de código de barras do fornecedor: ResetBarcodeForAllRecords=Definir o valor de código de barras para todos os registros (isto também irá repor valor de código de barras já definido com novos valores) -PriceByCustomer=Preço por cliente PriceCatalogue=Preço único por produto / serviço PricingRule=As regras de tarifação AddCustomerPrice=Adicione preço por parte dos clientes ForceUpdateChildPriceSoc=Situado mesmo preço em outros pedidos dos clientes PriceByCustomerLog=Preço por cliente +MinimumPriceLimit=Preço minimo nao pode ser inferior a %s +MinimumRecommendedPrice=Preço minimo recomendado e: %s diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang index b6a3119b993..9c4a65dbfba 100644 --- a/htdocs/langs/pt_BR/projects.lang +++ b/htdocs/langs/pt_BR/projects.lang @@ -1,8 +1,5 @@ # Dolibarr language file - Source file is en_US - projects -RefProject=Ref. do projeto ProjectId=Id do projeto -Project=Projeto -Projects=Projetos SharedProject=A todos PrivateProject=Contatos do projeto MyProjectsDesc=Exibe apenas os projetos que você for um contato (independente do tipo). @@ -12,86 +9,54 @@ MyTasksDesc=Esta exibição é limitado a projetos ou tarefas que você é um co TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler. TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo). Myprojects=Os Meus Projetos -ProjectsArea=Área de Projetos -NewProject=Novo Projeto -AddProject=Criar Projeto -DeleteAProject=Eliminar um Projeto -DeleteATask=Eliminar uma Tarefa +AddProject=Criar projeto ConfirmDeleteAProject=Tem certeza que quer eliminar este projeto? ConfirmDeleteATask=Tem certeza que quer eliminar esta tarefa? OfficerProject=Responsável do Projeto LastProjects=Os %s últimos Projetos -AllProjects=Todos os Projetos -ProjectsList=Lista de Projetos ShowProject=Adicionar Projeto -SetProject=Definir Projeto -NoProject=Nenhum Projeto Definido NbOpenTasks=No Tarefas Abertas NbOfProjects=No de Projetos TimeSpent=Tempo Dedicado TimesSpent=Tempo gasto RefTask=Ref. Tarefa -LabelTask=Etiqueta de Tarefa TaskTimeSpent=O tempo gasto nas tarefas TaskTimeUser=Usuário -TaskTimeNote=Nota -TaskTimeDate=Data NewTimeSpent=Novo Tempo Dedicado MyTimeSpent=O Meu Tempo Dedicado MyTasks=As minhas Tarefas -Tasks=Tarefas -Task=Tarefa TaskDateStart=Data de início da tarefa TaskDateEnd=Data final da tarefa -TaskDescription=Descrição da tarefa -NewTask=Nova Tarefa -AddTask=Adicionar Tarefa +AddTask=Criar tarefa AddDuration=Indicar Duração -Activity=Atividade -Activities=Tarefas/Atividades MyActivity=A Minha Atividade MyActivities=Minhas Tarefas/Atividades MyProjects=Os Meus Projetos -DurationEffective=Duração Efetiva -Progress=Progresso ProgressDeclared=o progresso declarado ProgressCalculated=calculado do progresso -Time=Tempo -ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projeto ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projeto -ListInvoicesAssociatedProject=Lista de Faturas Associadas ao Projeto -ListPredefinedInvoicesAssociatedProject=Lista de Faturas a Clientes Predefinidas Associadas ao Projeto -ListSupplierOrdersAssociatedProject=Lista de Pedidos a Fornecedores Associados ao Projeto ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedor Associados ao Projeto -ListContractAssociatedProject=Lista de Contratos Associados ao Projeto -ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto ListTripAssociatedProject=Lista de viagens e despesas associadas com o projeto -ListActionsAssociatedProject=Lista de eventos associados ao projeto ActivityOnProjectThisWeek=Atividade ao Projeto esta Semana ActivityOnProjectThisMonth=Atividade ao Projeto este Mês ActivityOnProjectThisYear=Atividade ao Projeto este Ano ChildOfTask=Link da Tarefa NotOwnerOfProject=Não é responsável deste projeto privado -AffectedTo=Atribuido a CantRemoveProject=Este projeto não pode ser eliminado porque está referenciado por muito objetos (facturas, pedidos e outros). ver a lista no separador referencias. ValidateProject=Validar projeto ConfirmValidateProject=Você tem certeza que deseja validar esse projeto? -CloseAProject=Fechar projeto ConfirmCloseAProject=Tem certeza de que quer encerrar esse projeto? ReOpenAProject=Abrir projeto ConfirmReOpenAProject=Tem certeza de que quer voltar a abrir este projeto? ProjectContact=Contatos do projeto ActionsOnProject=Eventos do projeto YouAreNotContactOfProject=Você não é um contato deste projeto privado -DeleteATimeSpent=Excluir o tempo gasto ConfirmDeleteATimeSpent=Tem certeza de que deseja excluir este tempo? -DoNotShowMyTasksOnly=Veja também as tarefas não alocada para mim -ShowMyTasksOnly=Ver apenas tarefas que me forem atribuídos -TaskRessourceLinks=Recursos -ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro +DoNotShowMyTasksOnly=Ver tambem tarefas não associadas comigo +ShowMyTasksOnly=Ver so minhas tarefas NoTasks=Não há tarefas para este projeto LinkedToAnotherCompany=Ligado a outros terceiros -TaskIsNotAffectedToYou=Tarefa não alocado para você +TaskIsNotAffectedToYou=Tarefas não associadas a voce ErrorTimeSpentIsEmpty=Tempo gasto está vazio ThisWillAlsoRemoveTasks=Esta ação também vai apagar todas as tarefas do projeto (tarefas% s no momento) e todas as entradas de tempo gasto. IfNeedToUseOhterObjectKeepEmpty=Se alguns objetos (nota fiscal, ordem, ...), pertencentes a um terceiro, deve estar vinculado ao projeto de criar, manter este vazio para que o projeto de vários fornecedores. @@ -104,12 +69,9 @@ CloneTaskFiles=Copia(s) do(s) arquivo(s) do projeto(s) finalizado ConfirmCloneProject=Tem certeza que deseja copiar este projeto? ProjectReportDate=Alterar a data da tarefa de acordo com a data de início do projeto ErrorShiftTaskDate=Impossível mudar data da tarefa de acordo com a nova data de início do projeto -ProjectsAndTasksLines=Projetos e tarefas -ProjectCreatedInDolibarr=Projeto %s criado TaskCreatedInDolibarr=Tarefa %s criada TaskModifiedInDolibarr=Tarefa %s alterada TaskDeletedInDolibarr=Tarefa %s excluída -##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Chefe de projeto TypeContact_project_external_PROJECTLEADER=Chefe de projeto TypeContact_project_internal_PROJECTCONTRIBUTOR=Colaborador @@ -120,11 +82,12 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Colaborador TypeContact_project_task_external_TASKCONTRIBUTOR=Colaborador SelectElement=Selecionar componente AddElement=Link para componente -# Documents models +UnlinkElement=Desligar elemento DocumentModelBaleine=Modelo de relatório de um projeto completo (logo. ..) -PlannedWorkload = carga horária planejada -WorkloadOccupation= Carga horária empregada +PlannedWorkload =carga horária planejada +WorkloadOccupation=Carga horária empregada ProjectReferers=Fazendo referência a objetos SearchAProject=Buscar um projeto ProjectMustBeValidatedFirst=O projeto tem que primeiramente ser validado ProjectDraft=Rascunhos de projetos +FirstAddRessourceToAllocateTime=Associar recurso para alocar tempo diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang index 7b11b13a198..760efce5296 100644 --- a/htdocs/langs/pt_BR/propal.lang +++ b/htdocs/langs/pt_BR/propal.lang @@ -1,78 +1,26 @@ # Dolibarr language file - Source file is en_US - propal -Proposals=Orçamentos -Proposal=Orçamento -ProposalShort=Proposta -ProposalsDraft=Orçamentos Rascunho -ProposalDraft=Orçamento Rascunho -ProposalsOpened=Orçamentos Abertos -Prop=Orçamentos -CommercialProposal=Orçamento -CommercialProposals=Orçamentos ProposalCard=Cartao de proposta -NewProp=Novo Orçamento -NewProposal=Novo Orçamento -NewPropal=Novo Orçamento -Prospect=Cliente Potencial -ProspectList=Lista de Clientes Potenciais -DeleteProp=Eliminar Orçamento -ValidateProp=Confirmar Orçamento -AddProp=Criar Orçamento +AddProp=Criar proposta ConfirmDeleteProp=Tem certeza que quer eliminar este orçamento? ConfirmValidateProp=Tem certeza que quer Confirmar este orçamento? LastPropals=Os %s últimos Orçamentos LastClosedProposals=Os últimos Orçamentos Encerrados LastModifiedProposals=As últimas %s propostas modificadas -AllPropals=Todos Os Orçamentos LastProposals=últimos Orçamentos -SearchAProposal=Procurar um Orçamento -ProposalsStatistics=Estatísticas de Orçamentos -NumberOfProposalsByMonth=Número por Mês AmountOfProposalsByMonthHT=Valor por Mês (sem ICMS) -NbOfProposals=Número Orçamentos -ShowPropal=Ver Orçamento -PropalsDraft=Rascunho -PropalsOpened=Abertos PropalsNotBilled=Não Faturados -PropalStatusDraft=Rascunho (a Confirmar) -PropalStatusValidated=Validado (Orçamento Aberto) -PropalStatusOpened=Validado (Orçamento Aberto) -PropalStatusClosed=Encerrado PropalStatusSigned=Assinado (A Faturar) PropalStatusNotSigned=Sem Assinar (Encerrado) PropalStatusBilled=Faturado -PropalStatusDraftShort=Rascunho -PropalStatusValidatedShort=Validado -PropalStatusOpenedShort=Aberto PropalStatusClosedShort=Encerrado -PropalStatusSignedShort=Assinado -PropalStatusNotSignedShort=Sem Assinar PropalStatusBilledShort=Faturado PropalsToClose=Orçamentos a Fechar PropalsToBill=Orçamentos Assinados a Faturar -ListOfProposals=Lista de Orçamentos ActionsOnPropal=Ações sobre o Orçamento -NoOpenedPropals=Sem Orçamentos Abertos -NoOtherOpenedPropals=Nenhum outro orçamento aberto -RefProposal=Ref. Orçamento -SendPropalByMail=Enviar Orçamento por E-mail -FileNotUploaded=Não foi Carregado o Arquivo -FileUploaded=O Arquivo foi carregado corretamente -AssociatedDocuments=Documentos Associados ao Orçamento : ErrorCantOpenDir=Impossível Abrir a Pasta DatePropal=Data da Proposta -DateEndPropal=Válido até -DateEndPropalShort=Data Fim -ValidityDuration=Duração da Validade CloseAs=Fechado como -ClassifyBilled=Classificar Faturado BuildBill=Criar Fatura -ErrorPropalNotFound=Orçamento %s Inexistente -Estimate=Orçamento: -EstimateShort=Orç. -OtherPropals=Outros Orçamentos -AddToDraftProposals=Adicionar a projeto de proposta -NoDraftProposals=Não há projetos de propostas -CopyPropalFrom=Criar orçamento por Cópia de um existente CreateEmptyPropal=Criar orçamento a partir da Lista de produtos predefinidos DefaultProposalDurationValidity=Prazo de validez por default (em dias) UseCustomerContactAsPropalRecipientIfExist=Utilizar endereço contato de seguimento de cliente definido em vez do endereço do Fornecedor como destinatário dos Orçamentos @@ -84,19 +32,10 @@ ProposalLine=Linha da Proposta AvailabilityPeriod=Data de aprontamento SetAvailability=Atrazo de entrega AfterOrder=Apos o pedido -##### Availability ##### -AvailabilityTypeAV_NOW=Imediato -AvailabilityTypeAV_1W=1 semana -AvailabilityTypeAV_2W=2 semanas -AvailabilityTypeAV_3W=3 semanas AvailabilityTypeAV_1M=1 mes -##### Types de contacts ##### TypeContact_propal_internal_SALESREPFOLL=Representante seguindo a proposta TypeContact_propal_external_BILLING=Contato da fatura cliente -TypeContact_propal_external_CUSTOMER=Contato cliente seguindo a proposta -# Document models -DocModelAzurDescription=Modelo de orçamento completo (logo...) -DocModelJauneDescription=Modelo de Orçamento Jaune +TypeContact_propal_external_CUSTOMER=Contato cliente seguindo a proposta DefaultModelPropalCreate=Criaçao modelo padrao DefaultModelPropalToBill=Modelo padrao no fechamento da proposta comercial ( a se faturar) DefaultModelPropalClosed=Modelo padrao no fechamento da proposta comercial (nao faturada) diff --git a/htdocs/langs/pt_BR/resource.lang b/htdocs/langs/pt_BR/resource.lang new file mode 100644 index 00000000000..ac5195cbe84 --- /dev/null +++ b/htdocs/langs/pt_BR/resource.lang @@ -0,0 +1,27 @@ +# Dolibarr language file - Source file is en_US - resource +MenuResourceIndex=Recursos +MenuResourceAdd=Novo recurso +MenuResourcePlanning=Planejamento de recurso +DeleteResource=Remover recurso +ConfirmDeleteResourceElement=Confirmar remoção do recurso para este elemento +NoResourceInDatabase=Nenhum recurso na base de dados +NoResourceLinked=Nenhum recurso vinculado +ResourcePageIndex=Lista de recursos +ResourceSingular=Recurso +ResourceCard=Cartao recursos +AddResource=Criar recurso +ResourceFormLabel_ref=Nome do recurso +ResourceType=Tipo de recurso +ResourceFormLabel_description=Descrição do recurso +ResourcesLinkedToElement=Recursos vinculados ao elemento +ShowResourcePlanning=Mostrar planejamento do recurso +GotoDate=Ir para data +ResourceElementPage=Elemento recursos +ResourceCreatedWithSuccess=Recurso criado com sucesso +ResourceLinkedWithSuccess=Recurso conectado com sucesso +TitleResourceCard=Cartao recurso +ConfirmDeleteResource=Confirme para remover este recurso +RessourceSuccessfullyDeleted=Recurso removido com sucesso +DictionaryResourceType=Tipo de recurso +DictionaryEMailTemplates=Modelos de Emails +SelectResource=Selecionar recurso diff --git a/htdocs/langs/pt_BR/salaries.lang b/htdocs/langs/pt_BR/salaries.lang index 6a69041ef30..ae54678cc61 100644 --- a/htdocs/langs/pt_BR/salaries.lang +++ b/htdocs/langs/pt_BR/salaries.lang @@ -1,8 +1,4 @@ -# Dolibarr language file - Source file is en_US - users -Salary=Salário -Salaries=Salários -Employee=Empregado +# Dolibarr language file - Source file is en_US - salaries NewSalaryPayment=Novo pagamento de salário SalaryPayment=Pagamento de salário SalariesPayments=Pagamentos de salários -ShowSalaryPayment=Mostrar pagamento de salário diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang index 91ca6e88639..a17cd46bf39 100644 --- a/htdocs/langs/pt_BR/sendings.lang +++ b/htdocs/langs/pt_BR/sendings.lang @@ -1,43 +1,10 @@ # Dolibarr language file - Source file is en_US - sendings RefSending=Ref. Envio -Sending=Envio -Sendings=Envios -Shipment=Envio -Shipments=Envios -Receivings=Recepções SendingsArea=Área Envios -ListOfSendings=Lista de Envios -SendingMethod=Método de Envio -SendingReceipt=Entrega LastSendings=Os %s últimos Envios -SearchASending=Procurar Envio -StatisticsOfSendings=Estatísticas de Envios -NbOfSendings=Número de Envios -NumberOfShipmentsByMonth=Número de envios por mês -SendingCard=Ficha de Envio -NewSending=Novo Envio -CreateASending=Criar um Envio -CreateSending=Criar Envio -QtyOrdered=Quant. Pedida -QtyShipped=Quant. Enviada -QtyToShip=Quant. a Enviar QtyReceived=Quant. Recibida KeepToShip=Fica por Enviar -OtherSendingsForSameOrder=Outros Envios deste Pedido -DateSending=Data de Expedição -DateSendingShort=Data de Expedição -SendingsForSameOrder=Expedições deste Pedido -SendingsAndReceivingForSameOrder=Envios e Recepções deste pedido -SendingsToValidate=Envios a Confirmar -StatusSendingCanceled=Cancelado -StatusSendingDraft=Rascunho StatusSendingValidated=Validado (produtos a enviar o enviados) -StatusSendingProcessed=Processado -StatusSendingCanceledShort=Cancelado -StatusSendingDraftShort=Rascunho -StatusSendingValidatedShort=Validado -StatusSendingProcessedShort=Processado -SendingSheet=Ficha de envio Carriers=Transportadoras Carrier=Transportadora CarriersArea=Área Transportadoras @@ -45,30 +12,28 @@ NewCarrier=Novo Transportadora ConfirmDeleteSending=Tem certeza que quer eliminar esta expedição? ConfirmValidateSending=Tem certeza que quer Confirmar esta expedição? ConfirmCancelSending=Tem certeza que quer anular esta expedição? -GenericTransport=Transporte Genérico -Enlevement=Pick-up por o Cliente -DocumentModelSimple=Modelo Simples DocumentModelMerou=Modelo A5 Merou WarningNoQtyLeftToSend=Atenção, nenhum produto à espera de ser enviado. StatsOnShipmentsOnlyValidated=Estatisticas referentes os envios , mas somente validados. Data usada e data da validacao do envio ( a data planejada da entrega nao e sempre conhecida). DateDeliveryPlanned=Data de entrega planejada DateReceived=Data de entrega recebida SendShippingByEMail=Envio enviado por e-mail -SendShippingRef=Enviar envio %s +SendShippingRef=Submeter para envio %s ActionsOnShipping=Eventos no envio LinkToTrackYourPackage=Atalho para rastreamento do pacote ShipmentCreationIsDoneFromOrder=No momento a criaçao de um novo envio e feito da ficha de pedido. RelatedShippings=Envios relativos ShipmentLine=Linha de envio CarrierList=Lista de transportadoras - -# Sending methods +SendingRunning=Produto da ordem do cliente ja enviado +SuppliersReceiptRunning=Produto do pedido do fornecedor ja recebido SendingMethodCATCH=Remoção pelo cliente SendingMethodTRANS=Transportadora SendingMethodCOLSUI=Acompanhamento -# ModelDocument DocumentModelSirocco=Modelo de Documento Sirocco DocumentModelTyphon=Modelo de Documento Typhon Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER nao definida SumOfProductVolumes=Soma do volume dos pedidos SumOfProductWeights=Soma do peso dos produtos +DetailWarehouseNumber=Detalhes do estoque +DetailWarehouseFormat=W:%s (Qtd : %d) diff --git a/htdocs/langs/pt_BR/sms.lang b/htdocs/langs/pt_BR/sms.lang index 6143de38322..fe0e300bf2b 100644 --- a/htdocs/langs/pt_BR/sms.lang +++ b/htdocs/langs/pt_BR/sms.lang @@ -1,18 +1,12 @@ # Dolibarr language file - Source file is en_US - sms -Sms=Sms SmsSetup=Configuraçao sms SmsDesc=Esta pagina permite definir as opçoes globais para os SMS SmsCard=Cartao SMS AllSms=Todas as campnhas SMS SmsTargets=Alvos SmsRecipients=Alvos -SmsRecipient=Alvo SmsTitle=Descriçao -SmsFrom=Remetente -SmsTo=Alvo SmsTopic=Topico do SMS -SmsText=Mensagem -SmsMessage=Mensagem SMS ShowSms=Mostrar SMS ListOfSms=Listar campanhas SMS NewSms=Nova campanha SMS @@ -27,27 +21,13 @@ SmsResult=Resultado do envio SMS TestSms=Testar SMS ValidSms=Validar SMS ApproveSms=Aprovar SMS -SmsStatusDraft=Rascunho -SmsStatusValidated=Validado -SmsStatusApproved=Aprovado -SmsStatusSent=Enviado -SmsStatusSentPartialy=Enviado parcialmente -SmsStatusSentCompletely=Enviado completamente -SmsStatusError=Erro SmsStatusNotSent=Nao enviado SmsSuccessfulySent=SMS enviado coretamente (de %s a %s) ErrorSmsRecipientIsEmpty=Numero de alvos vazio WarningNoSmsAdded=Falta numero telefone para adicionar a lista de alvos ConfirmValidSms=Voce confiram a validaçao desta campanha ? -ConfirmResetMailing=Atençao, se voce reinicializar a campanha SMS %s, voce permitira o envio de masa da mesma pela segunda vez. E veramente isto o que se quer ? -ConfirmDeleteMailing=Voce confirma a remoçao da campanha ? -NbOfRecipients=Numero de alvos NbOfUniqueSms=Nr. de numeros telefonicos unicos NbOfSms=Numero de numeros telefonicos ThisIsATestMessage=Isto e uma mensagem de teste -SendSms=Enviar SMS SmsInfoCharRemain=Nr de caracteres restantes -SmsInfoNumero= (formato internacional ex: +33899701761) -DelayBeforeSending=Atraso antes de enviar (minutos) -SmsNoPossibleRecipientFound=Nenhum alvo disponível. Verifique a configuração do seu provedor de SMS. - +SmsInfoNumero=(formato internacional ex: +33899701761) diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang index c0183f790da..62b718a2a79 100644 --- a/htdocs/langs/pt_BR/stocks.lang +++ b/htdocs/langs/pt_BR/stocks.lang @@ -9,45 +9,28 @@ WarehouseOpened=Armazém Aberto WarehouseClosed=Armazém Encerrado WarehouseSource=Armazém Origem WarehouseSourceNotDefined=Sem armazém definido, -AddOne=Adicionar um -WarehouseTarget= Destino do armazenamento +WarehouseTarget=Destino do armazenamento ValidateSending=Confirmar Envio CancelSending=Cancelar Envio DeleteSending=Eliminar Envio Stock=Estoque Stocks=Estoques -Movement=Movimento -Movements=Movimentos ErrorWarehouseRefRequired=Nome de referência do armazenamento é necessária ErrorWarehouseLabelRequired=A etiqueta do armazenamento é obrigatória CorrectStock=Corrigir Estoque ListOfWarehouses=Lista de armazenamento -ListOfStockMovements=Lista de movimentos de stock -StocksArea=Área estoques -Location=Localização -LocationSummary=Nome abreviado da localização +StocksArea=Area de estoque NumberOfDifferentProducts=Número de produtos diferentes -NumberOfProducts=Numero total de produtos -LastMovement=Último movimento -LastMovements=Últimos movimentos -Units=Unidades -Unit=Unidade StockCorrection=Correção estoque StockTransfer=Banco de transferência -StockMovement=Transferencia StockMovements=Movimentos de estoque LabelMovement=Etiqueta Movimento -NumberOfUnit=Número de peças UnitPurchaseValue=Preço de compra da unidade TotalStock=Total em estoque StockTooLow=Estoque insuficiente StockLowerThanLimit=Da ação inferior limite de alerta -EnhancedValue=Valor -PMPValue=Valor (PMP) -PMPValueShort=PMP EnhancedValueOfWarehouses=Valor de estoques UserWarehouseAutoCreate=Criar existencias automaticamente na criação de um usuário -QtyDispatched=Quantidade desagregada OrderDispatch=Recepção de estoques RuleForStockManagementDecrease=Regra de Administração de decrementos de estoque RuleForStockManagementIncrease=Regra de Administração de incrementos de estoque @@ -59,9 +42,7 @@ ReStockOnValidateOrder=Incrementar os estoques físicos sobre os pedidos ReStockOnDispatchOrder=Aumentar os estoques reais no envio manual para armazenamento, depois de receber ordem fornecedor ReStockOnDeleteInvoice=Aumentar os estoques reais sobre exclusão fatura OrderStatusNotReadyToDispatch=Não tem ordem ainda não ou nato tem um status que permite envio de produtos em para armazenamento. -StockDiffPhysicTeoric=Motivo da diferença entre valores físicos e teóricos NoPredefinedProductToDispatch=Não há produtos pré-definidos para este objeto. Portanto, não envio em estoque é necessária. -DispatchVerb=Expedição StockLimitShort=Limite para alerta StockLimit=Limite de estoque para alerta PhysicalStock=Estoque físico @@ -78,8 +59,6 @@ WarehousesAndProducts=Armazenamento de produtos AverageUnitPricePMPShort=Preço médio de entrada AverageUnitPricePMP=Preço médio de entrada SellPriceMin=Venda Preço unitário -EstimatedStockValueSellShort=Valor para vender -EstimatedStockValueSell=Valor para vender EstimatedStockValueShort=O valor das ações de entrada EstimatedStockValue=O valor das ações de entrada DeleteAWarehouse=Excluir um arquivo @@ -103,7 +82,6 @@ CurentlyUsingVirtualStock=Estoque virtual CurentlyUsingPhysicalStock=Estoque físico RuleForStockReplenishment=Regra para as ações de reposição SelectProductWithNotNullQty=Selecione pelo menos um produto com um qty não nulo e um fornecedor -AlertOnly= Só Alertas WarehouseForStockDecrease=Os arquivos serão utilizados para redução estoque WarehouseForStockIncrease=O arquivos serão utilizados para aumento de ForThisWarehouse=Para este armazenamento @@ -111,7 +89,7 @@ ReplenishmentStatusDesc=Esta lista de todos os produtos com um estoque menor do ReplenishmentOrdersDesc=Esta lista de todos os pedidos de fornecedores esta aberto Replenishments=Reconstituições NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado -NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois +NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois MassMovement=Movimento de massas MassStockMovement=Movimento de estoque em massa SelectProductInAndOutWareHouse=Selecione um produto, uma quantidade, um armazém de origem e um armazém de destino e clique em "% s". Uma vez feito isso para todos os movimentos necessários, clique em "% s". @@ -121,5 +99,4 @@ StockMovementRecorded=Movimentos de estoque gravados RuleForStockAvailability=Regras sobre os requisitos de ações StockMustBeEnoughForInvoice=Banco de nível deve ser o suficiente para adicionar o produto / serviço em fatura StockMustBeEnoughForOrder=Banco de nível deve ser o suficiente para adicionar o produto / serviço em ordem -StockMustBeEnoughForShipment= Banco de nível deve ser o suficiente para adicionar o produto / serviço no transporte - +StockMustBeEnoughForShipment=Banco de nível deve ser o suficiente para adicionar o produto / serviço no transporte diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang index 566987d55a2..747ddb02476 100644 --- a/htdocs/langs/pt_BR/suppliers.lang +++ b/htdocs/langs/pt_BR/suppliers.lang @@ -1,42 +1,22 @@ # Dolibarr language file - Source file is en_US - suppliers -Suppliers=Fornecedores -Supplier=Fornecedor -AddSupplier=Adicionar Fornecedor -SupplierRemoved=Fornecedor Eliminado +AddSupplier=Criar fornecedor SuppliersInvoice=Faturas do Fornecedor -NewSupplier=Novo Fornecedor -History=Histórico -ListOfSuppliers=Lista de Fornecedores -ShowSupplier=Mostrar Fornecedor -OrderDate=Data Pedido -BuyingPrice=Preço de Compra BuyingPriceMin=Preco de compra minimo BuyingPriceMinShort=Preco de compra min TotalBuyingPriceMin=Total de precos de compra dos subprodutos SomeSubProductHaveNoPrices=Algums dos sub-produtos nao tem um preco definido -AddSupplierPrice=Adicionar Preço de Fornecedor -ChangeSupplierPrice=Modificar Preço de Fornecedor -ErrorQtyTooLowForThisSupplier=Quantidade insuficiente para este fornecedor -ErrorSupplierCountryIsNotDefined=O país deste fornecedor não está definido, corrija na sua ficha ProductHasAlreadyReferenceInThisSupplier=Este produto já tem uma referencia neste fornecedor ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de fornecedor ja esta asociada com a referenca: %s -NoRecordedSuppliers=Sem Fornecedores Registados -SupplierPayment=Pagamento a Fornecedor -SuppliersArea=Área Fornecedores -RefSupplierShort=Ref. Fornecedor Availability=Entrega ExportDataset_fournisseur_1=Faturas de Fornecedores e Linhas de Fatura ExportDataset_fournisseur_2=Faturas Fornecedores e Pagamentos ExportDataset_fournisseur_3=Ordems de fornecedor e linhas de ordem -ApproveThisOrder=Aprovar este Pedido ConfirmApproveThisOrder=Tem certeza que quer aprovar este pedido? -DenyingThisOrder=Negar este Pedido ConfirmDenyingThisOrder=Tem certeza que quer negar este pedido? ConfirmCancelThisOrder=Tem certeza que quer cancelar este pedido? -AddCustomerOrder=Criar Pedido do Cliente AddCustomerInvoice=Criar Fatura para o Cliente -AddSupplierOrder=Criar Pedido a Fornecedor AddSupplierInvoice=Criar Fatura do Fornecedor -ListOfSupplierProductForSupplier=Lista de produtos e preços do fornecedor %s NoneOrBatchFileNeverRan=Nenhum lote ou %s não foi executado recentemente SentToSuppliers=Enviado para fornecedores +ListOfSupplierOrders=Lista de pedidos do fornecedor +MenuOrdersSupplierToBill=Pedidos a se faturar do foprnecedor diff --git a/htdocs/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang index c236b55cb3c..8af39e7001d 100644 --- a/htdocs/langs/pt_BR/trips.lang +++ b/htdocs/langs/pt_BR/trips.lang @@ -2,20 +2,15 @@ Trip=Deslocamento Trips=Deslocamentos TripsAndExpenses=Deslocamentos e Despesas -TripsAndExpensesStatistics=Estatisticas de viagems e despesas +TripsAndExpensesStatistics=Estatisticas de viagems e despesas TripCard=Ficha de Deslocamento -AddTrip=Adicionar Deslocamento +AddTrip=Criar viagem ListOfTrips=Lista de Deslocamentos -ListOfFees=Lista de Taxas NewTrip=Nova Deslocamento -CompanyVisited=Empresa/Instituição Visitada Kilometers=Kilometros FeesKilometersOrAmout=Quantidade de Kilometros DeleteTrip=Eliminar Deslocamento ConfirmDeleteTrip=Tem certeza que quer eliminar esta deslocamento? -TF_OTHER=Outro -TF_LUNCH=Alimentação -TF_TRIP=Viagem -ListTripsAndExpenses=Lista de viagens e despesas ExpensesArea=Area de viagems e despesas SearchATripAndExpense=Buscar para uma viagem ou despesa +ClassifyRefunded=Classificar 'Rembolsado' diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang index 6f403983441..71a6fdf9790 100644 --- a/htdocs/langs/pt_BR/users.lang +++ b/htdocs/langs/pt_BR/users.lang @@ -2,10 +2,7 @@ HRMArea=área de gestão de recursos humanos UserCard=Ficha de Usuário ContactCard=Ficha de Contato -GroupCard=Ficha de Grupo NoContactCard=Nenhum cartão para os contatos -Permission=Permissão -Permissions=Permissões EditPassword=Alterar senha SendNewPassword=Enviar nova senha ReinitPassword=Gerar nova senha @@ -35,14 +32,11 @@ ConfirmEnableGroup=Você tem certeza que quer reativar o grupo %s ? ConfirmReinitPassword=Você tem certeza que quer gerar uma nova senha para o usuário %s ? ConfirmSendNewPassword=Você tem certeza que quer enviar uma nova senha para o usuário %s ? NewUser=Novo usuário -CreateUser=Criar usuário SearchAGroup=Buscar um grupo SearchAUser=Buscar um usuário LoginNotDefined=O usuário não está definido NameNotDefined=O nome não está definido ListOfUsers=Lista de usuário -Administrator=Administrador -SuperAdministrator=Super Administrador SuperAdministratorDesc=Administrador geral AdministratorDesc=Entidade do administrador DefaultRights=Permissões por Padrao @@ -57,13 +51,11 @@ RemoveFromGroup=Remover do grupo PasswordChangedAndSentTo=Senha alterada e enviada a %s. PasswordChangeRequestSent=Solicitação para alterar a senha para %s enviada a %s. MenuUsersAndGroups=Usuários e Grupos -LastGroupsCreated=Os %s últimos grupos criados LastUsersCreated=Os %s últimos usuários criados ShowGroup=Visualizar grupo ShowUser=Visualizar usuário NonAffectedUsers=Usuários não atribuídos UserModified=Usuário modificado com sucesso -GroupModified=Grupo modificado com sucesso PhotoFile=Arquivo de foto UserWithDolibarrAccess=Usuário com acesso ao Dolibarr ListOfUsersInGroup=Lista de usuários deste grupo @@ -80,20 +72,14 @@ CreateDolibarrThirdParty=Criar um fornecedor LoginAccountDisable=A conta está desativada, indique um Novo login para a ativar. LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr LoginAccountDisableInLdap=A conta está desativada ao domínio -UsePersonalValue=Utilizar valores personalizados -GuiLanguage=Idioma do Interface -InternalUser=Usuário Interno -MyInformations=A Minha Informação ExportDataset_user_1=Usuários e Atributos DomainUser=Usuário de Domínio Reactivate=Reativar CreateInternalUserDesc=Este formulario permite criar um usuario interno a sua compania/fundação. Para criar um usuario externo (cliente, fornecedor, ...), use o botão 'Criar usuario Dolibarr' da ficha de contatos dos terceiro.. InternalExternalDesc=Um usuário interno é um usuário que pertence à sua Empresa/Instituição.
    Um usuário externo é um usuário cliente, fornecedor ou outro.

    Nos 2 casos, as permissões de Usuários definem os direitos de acesso, mas o usuário externo pode além disso ter um gerente de menus diferente do usuário interno (ver Inicio - configuração - visualização) PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertence o usuário. -Inherited=Herdado UserWillBeInternalUser=Usuario criado sera um usuario interno (porque nao esta conectado a um particular terceiro) UserWillBeExternalUser=Usuario criado sera um usuario externo (porque esta conectado a um particular terceiro) -IdPhoneCaller=ID chamador (telefone) UserLogged=Usuário %s Conectado UserLogoff=Usuario %s desconectou NewUserCreated=Usuário %s Criado @@ -102,20 +88,17 @@ EventUserModified=Usuário %s Modificado UserDisabled=Usuário %s Desativado UserEnabled=Usuário %s Ativado UserDeleted=Usuário %s Eliminado -NewGroupCreated=Grupo %s Criado -GroupModified=Grupo modificado com sucesso -GroupDeleted=Grupo %s Eliminado ConfirmCreateContact=Tem certeza que quer criar uma conta para este contato? ConfirmCreateLogin=Tem certeza de que deseja criar uma conta para este membro? ConfirmCreateThirdParty=Tem certeza que quer criar um Fornecedor para este membro? -LoginToCreate=Login a Criar NameToCreate=Nome do Fornecedor a Criar YourRole=Suas funções YourQuotaOfUsersIsReached=Sua cota de usuarios ativos atingida ! -NbOfUsers=N. de usuarios +NbOfUsers=N. de usuarios DontDowngradeSuperAdmin=Somente um Super Administrador pode rebaixar um Super Administrador -HierarchicalResponsible=Responsabilidade hierárquica HierarchicView=Visão hierárquica UseTypeFieldToChange=Use campo Tipo para mudar OpenIDURL=URL do OpenID LoginUsingOpenID=Usar o OpenID para efetuar o login +WeeklyHours=Horas semanais +ColorUser=Cor do usuario diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang index e288e999d4e..08653c368d4 100644 --- a/htdocs/langs/pt_BR/withdrawals.lang +++ b/htdocs/langs/pt_BR/withdrawals.lang @@ -1,31 +1,19 @@ # Dolibarr language file - Source file is en_US - withdrawals StandingOrdersArea=Área ordens permanentes CustomersStandingOrdersArea=Área de Débitos Diretos de Clientes -StandingOrders=Débitos Diretos -StandingOrder=Débitos Diretos NewStandingOrder=Novo Débito Direto StandingOrderToProcess=A Processar -StandingOrderProcessed=Processado -Withdrawals=Levantamentos -Withdrawal=Levantamento -WithdrawalsReceipts=Ordens de Levantamento -WithdrawalReceipt=Ordem de Levantamento -WithdrawalReceiptShort=Ordem -LastWithdrawalReceipts=As %s últimas ordens de levantamento WithdrawedBills=Faturas de Levantamentos -WithdrawalsLines=Linhas de Levantamento -RequestStandingOrderToTreat=Pedidos de Débitos Diretos a Tratar -RequestStandingOrderTreated=Pedidos de Débitos Diretos Processados +RequestStandingOrderToTreat=Pedido de processamento das ordems abertas +RequestStandingOrderTreated=Pedido para ordems abertas processado CustomersStandingOrders=Débitos Diretos de Clientes CustomerStandingOrder=Débito Direto de Cliente NbOfInvoiceToWithdraw=Nb. da fatura para realizar pedido NbOfInvoiceToWithdrawWithInfo=Nb. da fatura para realizar pedido para os clientes com informações de conta bancária definida InvoiceWaitingWithdraw=Faturas em Espera de Levantamento -AmountToWithdraw=Quantidade a Levantar WithdrawsRefused=Débitos Diretos Rejeitados NoInvoiceToWithdraw=Nenhuma fatura a cliente com modo de pagamento 'Débito Directo' em espera. Ir ao separador 'Débito Directo' na ficha da fatura para fazer um pedido. ResponsibleUser=Usuário Responsável dos Débitos Diretos -WithdrawalsSetup=Configuração dos Débitos Diretos WithdrawStatistics=Estatísticas de Débitos Diretos WithdrawRejectStatistics=Estatísticas de Débitos Diretos Rejeitados LastWithdrawalReceipt=Os %s últimos Débitos Diretos Recebidos @@ -37,22 +25,13 @@ ClassCredited=Classificar Acreditados ClassCreditedConfirm=Você tem certeza que querer marcar este pagamento como realizado em a sua conta bancaria? TransData=Data da transferência TransMetod=Método de transferência -Send=Enviar -Lines=Linhas StandingOrderReject=Emitir uma recusa -InvoiceRefused=Nota Fiscal recusada WithdrawalRefused=Retirada recusada WithdrawalRefusedConfirm=Você tem certeza que quer entrar com uma rejeição de retirada para a sociedade -RefusedData=Data de rejeição -RefusedReason=Motivo da rejeição RefusedInvoicing=Cobrança da rejeição NoInvoiceRefused=Não carregue a rejeição -InvoiceRefused=Nota Fiscal recusada -Status=Estado -StatusUnknown=Desconhecido StatusWaiting=Aguardando StatusTrans=Enviado -StatusCredited=Creditado StatusRefused=Negado StatusMotif0=Não especificado StatusMotif1=Saldo insuficiente @@ -60,31 +39,22 @@ StatusMotif2=Solicitação contestada StatusMotif3=Não há pedido de retirada StatusMotif4=Pedido do Cliente StatusMotif5=RIB inutilizável -StatusMotif6=Conta sem saldo -StatusMotif7=Decisão Judicial StatusMotif8=Outras razões CreateAll=Retirar tudo CreateGuichet=Apenas do escritório -CreateBanque=Apenas banco OrderWaiting=Aguardando resolução NotifyTransmision=Retirada de Transmissão -NotifyEmision=Emissões de retirada +NotifyEmision=Emissões de retirada NotifyCredit=Revogação de crédito NumeroNationalEmetter=Nacional Número Transmissor -PleaseSelectCustomerBankBANToWithdraw=Selecione informações sobre conta bancária do cliente para retirar -WithBankUsingRIB=Para contas bancárias usando RIB -WithBankUsingBANBIC=Para contas bancárias usando IBAN / BIC / SWIFT BankToReceiveWithdraw=Conta bancária para receber saques CreditDate=A crédito -WithdrawalFileNotCapable=Não foi possível gerar arquivo recibo de retirada para o seu país ShowWithdraw=Mostrar Retire IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se fatura não tem pelo menos um pagamento retirada ainda processado, não vai ser definido como pago para permitir a gestão de remoção prévia. DoStandingOrdersBeforePayments=Essa guia permite que você solicite uma ordem permanente. Depois de concluído, você pode digitar o pagamento para fechar a fatura. WithdrawalFile=Arquivo Retirada SetToStatusSent=Defina o status "arquivo enviado" ThisWillAlsoAddPaymentOnInvoice=Isto também se aplica aos pagamentos de faturas e classificá-los como "Paid" - -### Notifications InfoCreditSubject=Pagamento pendente pelo banco InfoCreditMessage=O pedido pendente foi pago pelo banco
    Dados de pagamento:% s InfoTransSubject=Transmissão de pedido pendente para o banco diff --git a/htdocs/langs/pt_BR/workflow.lang b/htdocs/langs/pt_BR/workflow.lang index f90ce09f782..1f532022dee 100644 --- a/htdocs/langs/pt_BR/workflow.lang +++ b/htdocs/langs/pt_BR/workflow.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - Source file is en_US - admin +# Dolibarr language file - Source file is en_US - workflow WorkflowSetup=Configuração do módulo de Fluxo de Trabalho WorkflowDesc=Este módulo foi projetado para modificar o comportamento de ações automáticas dentro a aplicação. Por padrão, o fluxo de trabalho e abilitado (você faz as coisas em ordem que você quiser). Você pode habilitar ações automáticas que são de seu interesse. ThereIsNoWorkflowToModify=Não há fluxo de trabalho que você pode modificar para o módulo que você ativou. diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang index 8cab9d2b651..91d161ef1c6 100644 --- a/htdocs/langs/pt_PT/accountancy.lang +++ b/htdocs/langs/pt_PT/accountancy.lang @@ -1,158 +1,158 @@ # Dolibarr language file - en_US - Accounting Expert CHARSET=UTF-8 -Accounting=Accounting -Globalparameters=Global parameters -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years -Menuaccount=Accounting accounts -Menuthirdpartyaccount=Thirdparty accounts -MenuTools=Tools +Accounting=Contabilista +Globalparameters=Parâmetros Globais +Chartofaccounts=Plano de contas +Fiscalyear=Anos fiscais +Menuaccount=Contas contabilísticas +Menuthirdpartyaccount=Contas de terceiros +MenuTools=Ferramentas -ConfigAccountingExpert=Configuration of the module accounting expert -Journaux=Journals -JournalFinancial=Financial journals -Exports=Exports -Modelcsv=Model of export -Selectmodelcsv=Select a model of export -Modelcsv_normal=Classic export -Modelcsv_CEGID=Export towards CEGID Expert -BackToChartofaccounts=Return chart of accounts -Back=Return +ConfigAccountingExpert=A configuração do módulo especialista em contabilidade +Journaux=Diarios +JournalFinancial=Diarios financeiros +Exports=Exportados +Modelcsv=Modelo de exportação +Selectmodelcsv=Selecione um modelo de exportação +Modelcsv_normal=Exportação classica +Modelcsv_CEGID=Exportação em direção Especialista CEGID +BackToChartofaccounts=Voltar ao plano de contas +Back=Voltar -Definechartofaccounts=Define a chart of accounts -Selectchartofaccounts=Select a chart of accounts -Validate=Validate -Addanaccount=Add an accounting account -AccountAccounting=Accounting account -Ventilation=Ventilation -ToDispatch=To dispatch -Dispatched=Dispatched +Definechartofaccounts=Defenir plano de contas +Selectchartofaccounts=Selecione plano de contas +Validate=Valide +Addanaccount=Adicione uma conta contabilistica +AccountAccounting=Conta contabilistica +Ventilation=Separação +ToDispatch=A despachar +Dispatched=Despachado -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers -TradeMargin=Trade margin -Reports=Reports -ByCustomerInvoice=By invoices customers -ByMonth=By Month -NewAccount=New accounting account -Update=Update -List=List -Create=Create -UpdateAccount=Modification of an accounting account -UpdateMvts=Modification of a movement -WriteBookKeeping=Record accounts in general ledger -Bookkeeping=General ledger -AccountBalanceByMonth=Account balance by month +CustomersVentilation=Separação de Cliente +SuppliersVentilation=Separação de Fornecedor +TradeMargin=Margem de distribuição +Reports=Relatórios +ByCustomerInvoice=Por fatura de cliente +ByMonth=Por mês +NewAccount=Nova Conta Contabilistica +Update=Atualizar +List=Lista +Create=Criar +UpdateAccount=Modificação de conta contabilistica +UpdateMvts=modificação de movimento +WriteBookKeeping= Gravar conta em contabilidade geral +Bookkeeping=Contabilidade geral +AccountBalanceByMonth=Balanço de contas mensal -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer -Line=Line +AccountingVentilation=contabilidade desagregada +AccountingVentilationSupplier=Contabilidade desagregada de Fornecedor +AccountingVentilationCustomer=Contabilidade desagregada de Cliente +Line=Linha -CAHTF=Total purchase supplier HT -InvoiceLines=Lines of invoice to be ventilated -InvoiceLinesDone=Ventilated lines of invoice -IntoAccount=In the accounting account +CAHTF=Total de compras fornecedor HT +InvoiceLines=Linhas de fatura a ser limpa +InvoiceLinesDone=Linhas limpas de fatura +IntoAccount=Na conta de contabilidade -Ventilate=Ventilate -VentilationAuto=Automatic ventilation +Ventilate=Limpar +VentilationAuto=Desagregação automática -Processing=Processing -EndProcessing=The end of processing -AnyLineVentilate=Any lines to ventilate -SelectedLines=Selected lines -Lineofinvoice=Line of invoice -VentilatedinAccount=Ventilated successfully in the accounting account -NotVentilatedinAccount=Not ventilated in the accounting account +Processing=Processando +EndProcessing=Fim de processamento +AnyLineVentilate=Alguma linha para limpar +SelectedLines=Selecione a linha +Lineofinvoice=Linha de fatura +VentilatedinAccount=Limpo com succeso na conta de contabilidade +NotVentilatedinAccount=Por limpar na conta de contabilidade -ACCOUNTING_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Separador CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a ser mostrado por página (máxima recomendada: 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comece a classificação das páginas repartição "Tem que repartir" pelos elementos mais recentes +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comece a triagem das páginas repartidas "repartir " pelos elementos mais recentes -AccountLength=Length of the accounting accounts shown in Dolibarr -AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts +AccountLength=Comprimento das contas de contabilidade mostradas em Dolibarr +AccountLengthDesc=Função que permite simular um comprimento de conta contábil, substituindo espaços pela figura zero. Esta função só toca a tela, ele não modifica as contas contábeis registradas no Dolibarr. Para a exportação, esta função é necessária para ser compatível com determinado software. +ACCOUNTING_LENGTH_GACCOUNT=Comprimento de conta geral +ACCOUNTING_LENGTH_AACCOUNT=Comprimento de conta de terceiros -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal -ACCOUNTING_CASH_JOURNAL=Cash journal -ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTING_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Diário de vendas +ACCOUNTING_PURCHASE_JOURNAL=Diário de compras +ACCOUNTING_BANK_JOURNAL=diário de bancos +ACCOUNTING_CASH_JOURNAL=diário de caixa +ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário de diversos +ACCOUNTING_SOCIAL_JOURNAL=Diário social -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta de transferencia +ACCOUNTING_ACCOUNT_SUSPENSE=conta de espera -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT= Conta de contabilidade padrão para produtos comprados (se não for definido na folha de produto) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta de contabilidade padrão para produtos vendidos (se não for definido na folha de produto) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta de contabilidade padrão para compra de serviços (se não for definido na folha de serviços) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta de contabilidade padrão para serviços vendidos (se não for definido na folha de serviços) -Doctype=Type of document -Docdate=Date -Docref=Reference -Numerocompte=Account -Code_tiers=Thirdparty -Labelcompte=Label account -Debit=Debit -Credit=Credit -Amount=Amount -Sens=Sens -Codejournal=Journal +Doctype=Tipo de documento +Docdate=Data +Docref=Referencia +Numerocompte=Conta +Code_tiers=Terceiros +Labelcompte=Etiqueta de conta +Debit=Débito +Credit=Crédito +Amount=Valor +Sens=Sentido +Codejournal=Diário -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Apagar os registos em Contabilidade geral -SellsJournal=Sells journal -PurchasesJournal=Purchases journal -DescSellsJournal=Sells journal -DescPurchasesJournal=Purchases journal -BankJournal=Bank journal -DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Cash journal -DescCashJournal=Cash journal including the type of payment cash +SellsJournal=Diário de vendas +PurchasesJournal=Diário de compras +DescSellsJournal=Diário de vendas +DescPurchasesJournal=Diário de compras +BankJournal=Diário de bancos +DescBankJournal=Diário de bancos incluindo todos os tipos de pagamentos excepto em moeda +CashJournal=Diário de caixa +DescCashJournal=Diário de caixa incluído pagamentos em moeda -CashPayment=Cash Payment +CashPayment=Pagamento em moeda -SupplierInvoicePayment=Payment of invoice supplier -CustomerInvoicePayment=Payment of invoice customer +SupplierInvoicePayment=Pagamento de fatura de fornecedor +CustomerInvoicePayment=Pagamento de fatura de cliente -ThirdPartyAccount=Thirdparty account +ThirdPartyAccount=Conta de terceiros -NewAccountingMvt=New movement -NumMvts=Number of movement -ListeMvts=List of the movement -ErrorDebitCredit=Debit and Credit cannot have a value at the same time +NewAccountingMvt=Novo movimento +NumMvts=Numero de movimentos +ListeMvts=Lista de movimentos +ErrorDebitCredit=Débito e crédito não pode ter um valor, ao mesmo tempo -ReportThirdParty=List thirdparty account -DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts +ReportThirdParty=Lista de contas de terceiros +DescThirdPartyReport=Consulte aqui a lista terceiros, clientes e de fornecedores e as suas contas contábeis -ListAccounts=List of the accounting accounts +ListAccounts=Lista de contas contabeis -Pcgversion=Version of the plan -Pcgtype=Class of account -Pcgsubtype=Under class of account -Accountparent=Root of the account -Active=Statement +Pcgversion=Versão do plano +Pcgtype=Classe de conta +Pcgsubtype=sub-classe de conta +Accountparent=raiz da conta +Active=Declaração -NewFiscalYear=New fiscal year +NewFiscalYear=Novo ano fiscal -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers -TotalVente=Total turnover HT -TotalMarge=Total sales margin -DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account -DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account -ChangeAccount=Change the accounting account for lines selected by the account: +DescVentilCustomer=Consulte aqui a repartição anual das contas de faturas a clientes +TotalVente=Volume de negócios de HT +TotalMarge=Margem total de vendas +DescVentilDoneCustomer=Consulte aqui a lista das linhas de facturas a clientes e as suas conta de contabilidade +DescVentilTodoCustomer=Alinhar suas linhas de fatura do cliente com uma conta de contabilidade +ChangeAccount=Alterar a conta contábil para linhas selecionadas por conta: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers -DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account -DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account +DescVentilSupplier=Consulte aqui a desagregação anual das suas faturas de fornecedores +DescVentilTodoSupplier=Verifique as suas linhas da fatura de fornecedor com a conta de contabilidade +DescVentilDoneSupplier=Consulte as suas linhas da fatura de fornecedor com a conta de contabilidade -ValidateHistory=Validate Automatically +ValidateHistory=Validação automatica -ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used +ErrorAccountancyCodeIsAlreadyUse=Erro, Não pode apagar uma conta em uso -FicheVentilation=Ventilation card +FicheVentilation=Carta de desagregação diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index bb9d495ca4c..9bd8dc355ed 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -16,7 +16,7 @@ ConfirmPurgeSessions=Deseja limpar todas as sessões? Isto irá terminar as sess NoSessionListWithThisHandler=O gestor de guardar a sessão configurado no seu PHP não permite listar todas as sessões em execução. LockNewSessions=Bloquear novas ligações ConfirmLockNewSessions=Tem certeza que quer restringir qualquer ligação nova EPR para si mesmo? Depois disso, só o utilizador %s poderá conetar. -UnlockNewSessions=Remover bloqueio da conexão +UnlockNewSessions=Remover bloqueio de ligação YourSession=A sua sessão Sessions=Sessão do utilizador WebUserGroup=Utilizador / grupo do servidor da Web @@ -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 @@ -120,7 +122,7 @@ LanguageBrowserParameter=Variável %s LocalisationDolibarrParameters=Parâmetros de localização ClientTZ=Fuso Horário do Cliente (utilizador) ClientHour=Hora do Cliente (utilizador) -OSTZ=Server OS Time Zone +OSTZ=Fuso Horário do Servidor do SO PHPTZ=Zona horaria PHP PHPServerOffsetWithGreenwich=Offset con Greenwich (segundos) ClientOffsetWithGreenwich=Greenwich (segundos) @@ -135,7 +137,7 @@ Box=Caixa Boxes=Caixas MaxNbOfLinesForBoxes=Nº de linhas máximo para as caixas PositionByDefault=Posição por defeito -Position=Position +Position=Posição MenusDesc=Os gestores do menu definem o conteúdo das 2 barras de menus (a barra horizontal e a barra vertical). É possível atribuir diferentes gestores segundo o utilizador seja interno ou externo. MenusEditorDesc=O editor de menus permite definir entradas personalizadas nos menus. Deve utilizar com prudência com a pena de colocar o ERP numa situação instável sendo necessário uma reinstalação para encontrar um menu coerente. MenuForUsers=Menu para os Utilizadores @@ -145,7 +147,7 @@ SystemInfo=Info Sistema SystemTools=Utilidades do Sistema SystemToolsArea=Área de utilidades do sistema SystemToolsAreaDesc=Esta área oferece diferentes funções de administração. Use o menu para escolher a Funcionalidade e pesquisa. -Purge=Purge +Purge=Limpar PurgeAreaDesc=Esta página permite eliminar todos os ficheiros criados ou Gravados pelo ERP/CRM (Ficheiros temporários ou todos os ficheiros da pasta %s). O uso desta função não é necessária. Proporciona-se para os utilizadores que albergam o ERP/CRM no servidor que oferece as permissões de eliminação de ficheiros salvaguardados pelo servidor Web. PurgeDeleteLogFile=Apagar ficheiro %s definido para o módulo Syslog (sem risco de perderem os dados) PurgeDeleteTemporaryFiles=Eliminar todos os ficheiros temporários (sem perigo de perca de dados) @@ -179,7 +181,7 @@ CommandsToDisableForeignKeysForImport=Comando para desactivar a chave exclusiva CommandsToDisableForeignKeysForImportWarning=Obrigatório, se pretender restaurar mais tarde o lixo 'sql' ExportCompatibility=Compatibilidade do ficheiro de exportação gerado MySqlExportParameters=Parâmetros da exportação MySql -PostgreSqlExportParameters= PostgreSQL export parameters +PostgreSqlExportParameters= Parâmetros de exportação PostgreSQL UseTransactionnalMode=Utilizar o modo transaccional FullPathToMysqldumpCommand=Rota completa do comando mysqldump FullPathToPostgreSQLdumpCommand=Caminho completo para o pg_dump comando @@ -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 @@ -230,7 +233,7 @@ ProtectAndEncryptPdfFiles=Protecção e encriptação dos pdf gerados ProtectAndEncryptPdfFilesDesc=A protecção de um documento pdf deixa o documento livre para leitura e impressão a qualquer leitor de PDF. Ao contrário, a modificação e a cópia são impossíveis. Feature=Característica DolibarrLicense=Licença -DolibarrProjectLeader=Chefe de projecto +DolibarrProjectLeader=Chefe de Projeto Developpers=Programadores/contribuintes OtherDeveloppers=Outros Programadores/contribuintes OfficialWebSite=Sitio web oficial internacional @@ -263,12 +266,12 @@ MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia carbono de todos os e- MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to -MAIN_DISABLE_ALL_MAILS=Desactivar globalmente todo o envío de correios electrónicos (para modo de teste) +MAIN_DISABLE_ALL_MAILS=Desativar globalmente todo o envio de correios eletrónicos (para fins de teste ou demonstrações) MAIN_MAIL_SENDMODE=Método de envío de e-mails MAIN_MAIL_SMTPS_ID=ID SMTP para autenticação SMTP MAIN_MAIL_SMTPS_PW=Password SMTP para autenticação SMTP MAIN_MAIL_EMAIL_TLS= Utilizar TLS (SSL) criptografia -MAIN_DISABLE_ALL_SMS=Desative todos os envios de SMS (para fins de teste ou demos) +MAIN_DISABLE_ALL_SMS=Desative todos os envios de SMS (para fins de teste ou demonstrações) MAIN_SMS_SENDMODE=Método a ser usado para enviar SMS MAIN_MAIL_SMS_FROM=Número de telefone padrão do remetente para envio de SMS FeatureNotAvailableOnLinux=Funcionalidade não disponivel em sistemas Unix. Teste parâmetros sendmail localmente. @@ -294,7 +297,7 @@ FindPackageFromWebSite=Encontre um pacote que fornece a funcionalidade desejada DownloadPackageFromWebSite=Descarregar o pacote do sitio %s. UnpackPackageInDolibarrRoot=Descompactar o pacote na pasta raiz do ERP %s SetupIsReadyForUse=A Instalação está finalizada e o ERP/CRM está disponivel com o novo componente. -NotExistsDirect=The alternative root directory is not defined.
    +NotExistsDirect=A diretoria raiz alternativa não está definida.
    InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
    Just create a directory at the root of Dolibarr (eg: custom).
    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=Seleccione o módulo: @@ -306,8 +309,8 @@ GenericMaskCodes2={cccc} the client code on n characters
    {cccc000}< GenericMaskCodes3=Qualquer outro caractere na máscara fica sem alterações.
    Não são permitidos espaços
    GenericMaskCodes4a=Exemplo em 99 ª %s o Terceiro a Empresa realizada em 31/03/2007:
    GenericMaskCodes4b=Exemplo sobre um Terceiro criado em 31/03/2007:
    -GenericMaskCodes4c=Example on product created on 2007-03-01:
    -GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
    {0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX +GenericMaskCodes4c=Exemplo no produto criado em 2007-03-01:
    +GenericMaskCodes5=ABC{yy}{mm}-{000000} dará ABC0701-000099
    {0000+100@1}-ZZZ/{dd}/XXX dará 0199-ZZZ/31/XXX GenericNumRefModelDesc=Devolve um número criado na linha numa máscara definida. ServerAvailableOnIPOrPort=Servidor disponivel no endereço %s na porta %s ServerNotAvailableOnIPOrPort=Servidor não disponivel no endereço %s na Porta %s @@ -331,7 +334,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Arquivos. Lang carregado na memória co ExamplesWithCurrentSetup=Exemplos com o funcionamento da actual configuração ListOfDirectories=Lista dos modelos OpenDocument directórios ListOfDirectoriesForModelGenODT=Lista dos diretórios que contêm arquivos de modelos com o formato OpenDocument.

    Coloque aqui o caminho completo de directórios.
    Adicionar um retorno de carro entre eah directório.
    Para adicionar um directório do módulo de GED, adicione aqui DOL_DATA_ROOT / ECM / yourdirectoryname.

    Os arquivos desses directórios devem terminar com. Odt. -NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories +NumberOfModelFilesFound=Número de ficheiros de modelos ODT/ODS encontrados nessas diretorias ExampleOfDirectoriesForModelGen=Exemplos de sintaxe:
    c: \\ mydir
    / Home mydir /
    DOL_DATA_ROOT ecm / ecmdir / FollowingSubstitutionKeysCanBeUsed=
    Para saber como criar os seus modelos de documentos odt, antes de armazená-los nestas listas, ler a documentação wiki: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template @@ -437,14 +440,14 @@ Module52Name=Stocks de produtos Module52Desc=Gestão de stocks de produtos Module53Name=Serviços Module53Desc=Gestão de serviços -Module54Name=Contratos -Module54Desc=Gestão de contratos +Module54Name=Contractos/Subscrições +Module54Desc=Gestão de contractos (serviços ou subscrições periódicas) Module55Name=Códigos de barras 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=Projectos -Module400Desc=Gestão dos projectos nos outros módulos +Module400Name=Projetos/Oportunidades/Chefias +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Interface com calendario Webcalendar Module500Name=Special expenses (tax, social contributions, dividends) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salários Module510Desc=Management of employees salaries and payments Module600Name=Notificações -Module600Desc=Envío de Notificações (por correio electrónico) sobre os eventos de trabalho ERP/CRM +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Bolsas Module700Desc=Gestão de Bolsas Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-empresa Module5000Desc=Permite-lhe gerir várias empresas Module6000Name=Fluxo de Trabalho Module6000Desc=Gestão do fluxo de trabalho -Module20000Name=Férias -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Caixa registadora -Module50200Name= Paypal -Module50200Desc= Módulo para oferecer uma página de pagamento online por cartão de crédito com Paypal +Module50200Name=Paypal +Module50200Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com 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=Margens @@ -581,11 +588,11 @@ Permission92=Criar/Modificar Impostos e IVA Permission93=Eliminar Impostos e IVA Permission94=Exportar Impostos Sociais Permission95=Consultar balanços e resultados -Permission101=Consultar Expedições -Permission102=Criar/Modificar Expedições -Permission104=Confirmar Expedições -Permission106=Export sendings -Permission109=Eliminar Expedições +Permission101=Consultar envios +Permission102=Criar/modificar envios +Permission104=Confirmar envios +Permission106=Exportar envios +Permission109=Eliminar envios Permission111=Consultar contas financeiras (contas bancarias, caixas) Permission112=Criar/Modificar quantidade/eliminar registos bancarios Permission113=Configurar contas financeiras (criar, controlar as categorías) @@ -606,15 +613,16 @@ Permission151=Consultar Débitos Directos Permission152=Configurar Débitos Directos Permission153=Consultar Débitos Directos Permission154=Crédito / recusar recibos de ordens permanentes -Permission161=Consultar contratos de serviço -Permission162=Criar/Modificar contratos de serviço -Permission163=Activar os serviços de um contrato -Permission164=Desactivar os serviços de um contrato -Permission165=Eliminar contratos -Permission171=Ler deslocação -Permission172=Criar/Modificar deslocação -Permission173=Eliminar deslocação -Permission178=Exportar deslocação +Permission161=Ler contractos/subscrições +Permission162=Criar/modificar contractos/subscrições +Permission163=Ativar um serviço/subscrição de um contracto +Permission164=Desativar um serviço/subscrição de um contracto +Permission165=Apagar contractos/subscrições +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Criar/modificar viagens e despesas +Permission173=Apagar viagens e despesas +Permission174=Read all trips and expenses +Permission178=Exportar viagens e despesas Permission180=Consultar Fornecedores Permission181=Consultar pedidos a Fornecedores Permission182=Criar/Modificar pedidos a Fornecedores @@ -641,7 +649,7 @@ Permission221=Consultar E-Mails Permission222=Criar/Modificar E-Mails (assunto, destinatarios, etc.) Permission223=Confirmar E-Mails (permite o envío) Permission229=Eliminar E-Mails -Permission237=View recipients and info +Permission237=Ver destinatários e informação Permission238=Manually send mailings Permission239=Delete mailings after validation or sent Permission241=Consultar categorías @@ -671,7 +679,7 @@ Permission300=Consultar códigos de barra Permission301=Criar/Modificar códigos de barra Permission302=Eliminar código de barras Permission311=Consultar Serviços -Permission312=Assignar Serviço ao Contrato +Permission312=Assign service/subscription to contract Permission331=Consultar Favoritos Permission332=Criar/Modificar Favoritos Permission333=Eliminar Favoritos @@ -701,8 +709,8 @@ Permission701=Consultar Bolsas Permission702=Criar/Modificar Bolsas Permission703=Eliminar Bolsas Permission1001=Consultar stocks -Permission1002=Criar/Modificar stocks -Permission1003=Eliminar stocks +Permission1002=Criar/modificar armazéns +Permission1003=Apagar armazéns Permission1004=Consultar movimientos de stock Permission1005=Criar/Modificar movimentos de stock Permission1101=Consultar ordens de envío @@ -729,7 +737,7 @@ Permission1237=Export supplier orders and their details Permission1251=Executar importações em massa de dados externos em bases de dados (dados de carga) Permission1321=Exportar facturas a clientes, atributos e cobranças Permission1421=Exportar facturas de clientes e atributos -Permission23001 = Read Scheduled task +Permission23001 = Ler tarefa agendada Permission23002 = Criar/alterar tarefa agendada Permission23003 = Eliminar tarefa agendada Permission23004 = Executar tarefa agendada @@ -778,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 @@ -789,15 +798,15 @@ VATIsUsedExampleFR=Em França, trata-se de sociedades ou organismos que elegem u VATIsNotUsedExampleFR=Em França, trata-se de associações ou sociedades isentas de IVA, organismos o profissionais liberais que escolheram o régime fiscal de módulos (IVA em franquia), pagando um IVA em franquia sem fazer declarações de IVA. Esta eleição faz aparecer a anotação "IVA não aplicavel" nas facturas. ##### Local Taxes ##### LTRate=Rate -LocalTax1IsUsed=Use second tax -LocalTax1IsNotUsed=Do not use second tax -LocalTax1IsUsedDesc=Use a second type of tax (other than VAT) -LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT) -LocalTax1Management=Second type of tax +LocalTax1IsUsed=Utilizar um segundo imposto +LocalTax1IsNotUsed=Não utilizar um segundo imposto +LocalTax1IsUsedDesc=Utilizar um segundo tipo de imposto (não IVA) +LocalTax1IsNotUsedDesc=Não utilizar outro tipo de imposto (não IVA) +LocalTax1Management=Segundo tipo de imposto LocalTax1IsUsedExample= LocalTax1IsNotUsedExample= -LocalTax2IsUsed=Use third tax -LocalTax2IsNotUsed=Do not use third tax +LocalTax2IsUsed=Utilizar um terceiro imposto +LocalTax2IsNotUsed=Não utilizar um terceiro imposto LocalTax2IsUsedDesc=Use a third type of tax (other than VAT) LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT) LocalTax2Management=Third type of tax @@ -887,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 @@ -1024,7 +1034,7 @@ ExtraFieldsProjectTask=Atributos complementares (tarefas) ExtraFieldHasWrongValue=Attribute %s has a wrong value. AlphaNumOnlyCharsAndNoSpace=apenas caracteres alfanuméricos sem espaços AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space -SendingMailSetup=Instalação de envios por e-mail +SendingMailSetup=Configuração de envios por correio eletrónico SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar e-mails, a configuração sendmail deve conter a opção ba-(mail.force_extra_parameters parâmetro em seu arquivo php.ini). Se alguns destinatários não receberem e-mails, tente editar este parâmetro PHP com mail.force_extra_parameters PathToDocuments=Caminhos de acesso a documentos PathDirectory=Catálogo @@ -1038,7 +1048,6 @@ YesInSummer=Sim no verão OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Devolve um código contabilistico composto de 401 segu ModuleCompanyCodePanicum=Devolve um código contabilistico vazio. ModuleCompanyCodeDigitaria=Devolve um código contabilistico composto por o código do Terceiro. O código está formado por caracter ' C ' na primeira posição seguido dos 5 primeiros caracteres do código do Terceiro. UseNotifications=Usar Notificações -NotificationsDesc=A função das Notificações permite enviar automáticamente um correio electrónico para um determinado evento ERP/CRM em empresas configuradas +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documentos modelos DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Marca d' @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Possibilidade de seleccionar uma direcção de envío UseOptionLineIfNoQuantity=Uma linha de producto/serviço que tem uma quantidade nula, considera-se como uma Opção FreeLegalTextOnProposal=Texto livre em Orçamentos WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Configuração do módulo pedidos OrdersNumberingModules=Módulos de numeração dos pedidos @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Confirmar o pedido depois de fechar o orçamento, permite não passar por um pedido provisório FreeLegalTextOnOrders=Texto livre em pedidos WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Configuração do módulo Click To Dial ClickToDialUrlDesc=Efectue uma chamada, fazendo click no icon (URL) do telefone .
    a 'url completa da chamada será: URL?login @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Módulos de numeração das fichas de intervenção TemplatePDFInterventions=Modelo de documentos das fichas de intervenção WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contratos de instalação do módulo +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contratos de numeração módulos TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Ficheiros do tipo %s não são comprimidos pelo servido CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compressão das respostas HTTP -TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Configuração do módulo produtos ServiceSetup=Serviços de instalação do módulo @@ -1382,15 +1393,16 @@ MailingSetup=configuração do módulo E-Mailing MailingEMailFrom=E-Mail emissor (From) dos correios enviados por E-Mailing MailingEMailError=Retorno EMail (Erros a) para e-mails com erros ##### Notification ##### -NotificationSetup=Configuração do módulo Notificações +NotificationSetup=EMail notification module setup NotificationEMailFrom=E-Mail emissor (From) dos correios enviados a traves de Notificações -ListOfAvailableNotifications=Lista de notificações disponíveis (Esta lista depende módulos ativados) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Configuração do módulos envíos SendingsReceiptModel=Modelo da ficha de expedição -SendingsNumberingModules=Envios de numeração módulos -SendingsAbility=Portes pagos pelo cliente -NoNeedForDeliveryReceipts=Na maioria dos casos, as entregas utilizam a nota de entregas ao cliente (lista de produtos a enviar), quando recebido assinam pelo cliente. Portanto, a hoja de entregas de produtos é uma operação duplicada sendo rara a vez que é activada. +SendingsNumberingModules=Envios módulos numerados +SendingsAbility=Suporte para notas de expedição para as entregas de cliente +NoNeedForDeliveryReceipts=Na maioria dos casos, as entregas utilizam a nota de entregas ao cliente (lista de produtos a enviar), quando recebido assinam pelo cliente. Portanto, a hora de entregas de produtos é uma operação duplicada sendo rara a vez que é ativada. FreeLegalTextOnShippings=Texto livre em embarques ##### Deliveries ##### DeliveryOrderNumberingModules=Módulo de numeração dos envios a clientes @@ -1412,8 +1424,9 @@ OSCommerceTestOk=A ligação ao servidor '%s' sobre a base '%s' pelo Utilizador OSCommerceTestKo1=A ligação ao servidor '%s' sobre a base '%s' por o Utilizador '%s' não se pode efectuar. OSCommerceTestKo2=A ligação ao servidor '%s' pelo Utilizador '%s' falhou. ##### Stock ##### -StockSetup=Configuração do módulo Stocks -UserWarehouse=Utilizar os stocks pessoais de Utilizadores +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu Eliminado TreeMenu=Estructura dos menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=Este módulo permite juntar um icon depois do número de telefon ##### Point Of Sales (CashDesk) ##### CashDesk=Pontos de vendas CashDeskSetup=Configuração do módulo de Caixa Registadora -CashDeskThirdPartyForSell=Terceiro genérico a usar para as vendas +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Conta de efectivo que se utilizará para as vendas CashDeskBankAccountForCheque= Conta a ser usada para receber pagamentos através de cheques CashDeskBankAccountForCB= Conta a ser usada para receber pagamentos em dinheiro ou por cartões de crédito -CashDeskIdWareHouse=Armazém que é utilizado para as vendas +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. ##### Bookmark ##### BookmarkSetup=Configuração do Modulo de Favoritos BookmarkDesc=Este módulo permite gerir as ligações e acessos directos. Também permite adicionar qualquer página do ERP/CRM ou o link web ao menu de acesso rápido na esquerda. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang index 1363003e274..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 @@ -41,9 +42,10 @@ AutoActions= Preenchimento automático AgendaAutoActionDesc= Defina aqui os eventos para os quais deseja que o Dolibarr crie automaticamente um evento na agenda. Se não for seleccionada nenhuma opção (por omissão), apenas as acções manuais serão incluídas na agenda AgendaSetupOtherDesc= Esta página fornece opções para permitir a exportação dos seus eventos no Dolibarr para um calendário externo (Thunderbird, calendário Google, ...) AgendaExtSitesDesc=Esta página permite declarar as fontes externas de calendários para ver os seus eventos na agenda do Dolibarr. -ActionsEvents= Eventos em que o Dolibarr criará uma acção em agenda automáticamente -PropalValidatedInDolibarr= Proposta Validada -InvoiceValidatedInDolibarr= Factura Validada +ActionsEvents=Eventos em que o Dolibarr criará uma acção em agenda automáticamente +PropalValidatedInDolibarr=Proposta Validada +InvoiceValidatedInDolibarr=Factura Validada +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Factura %s voltou ao estado de rascunho InvoiceDeleteDolibarr=Fatura %s apagada OrderValidatedInDolibarr= Encomenda %s validada @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Encomenda %s aprovada OrderRefusedInDolibarr=Encomenda %s recusada OrderBackToDraftInDolibarr=Encomenda %s voltou ao estado de rascunho OrderCanceledInDolibarr=Encomenda %s cancelada -InterventionValidatedInDolibarr=Intervenção %s validada ProposalSentByEMail=Proposta a cliente %s enviada por e-mail OrderSentByEMail=Encomenda de cliente %s enviada por email InvoiceSentByEMail=Factura de cliente %s enviada por e-mail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Encomenda a fornecedor %s enviada por email SupplierInvoiceSentByEMail=Factura de fornecedor %s enviada por e-mail ShippingSentByEMail=Expedição %s enviada por email ShippingValidated= Transporte %s validado -InterventionSentByEMail=Intervanção %s enviada por e-mail -InterventionClassifiedBilled=Intervenção %s classificada como faturada NewCompanyToDolibarr= Nova Empresa Adicionada DateActionPlannedStart= Planeada data de início DateActionPlannedEnd= Planeada data de fim @@ -70,9 +69,9 @@ DateActionStart= Data de Início DateActionEnd= Data Fim AgendaUrlOptions1=Também pode adicionar os seguintes parâmetros de filtro de saída: AgendaUrlOptions2=login=%spara restringir a produção para acções criadas por, ou afectadas a fazer pelo utilizador %s. -AgendaUrlOptions3=logina=%s para restringir a produção para acções criadas pelo utilizador %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s para restringir a produção para as acções para o utilizador afectado %s. -AgendaUrlOptions5=logind=%s para restringir a produção para acções feitas pelo utilizador %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Mostrar Aniversários dos Contactos AgendaHideBirthdayEvents=Esconder Aniversários dos Contactos Busy=Ocupado @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL para aceder. Ficheiro iCal ExtSiteNoLabel=Sem Descrição WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang index 0db5b15ea95..57682ef6df2 100644 --- a/htdocs/langs/pt_PT/bills.lang +++ b/htdocs/langs/pt_PT/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Nota de Crédito InvoiceAvoirAsk=Nota de Crédito para Corrigir a Factura InvoiceAvoirDesc=A Nota de Crédito é uma factura negativa destinada a compensar um montante de uma factura que difere do montante realmente pago (por haver pago de mais ou por devolução de produtos, por Exemplo).

    Nota: Tenha em conta que a factura original a corrigir deve ter sido fechada (' paga' ou ' paga parcialmente ') para poder realizar uma nota de crédito.' invoiceAvoirWithLines=Criar Nota de Crédito com as linhas da fatura de origem -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Rectificar a Factura %s ReplacementInvoice=Substituição da Factura ReplacedByInvoice=Substituído por Factura %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classificar 'Abandonado' ClassifyClosed=Classificar 'Fechado' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Criar Factura -AddBill=Criar Factura ou Deposito +AddBill=Create invoice or credit note AddToDraftInvoices=Adicionar à fatura rascunho DeleteBill=Eliminar Factura SearchACustomerInvoice=Procurar uma factura de cliente @@ -99,7 +99,7 @@ DoPaymentBack=Emitir reembolso ConvertToReduc=Converter em redução futura EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente EnterPaymentDueToCustomer=Realizar pagamento de recibos à cliente -DisabledBecauseRemainderToPayIsZero=Desactivar já que o resto a pagar é 0 +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Montante PriceBase=preço base BillStatus=Estado da factura @@ -137,8 +137,6 @@ BillFrom=Emissor BillTo=Enviar a ActionsOnBill=Acções sobre a factura NewBill=Nova factura -Prélèvements=Pedidos Permanentes -Prélèvements=Pedidos Permanentes LastBills=as %s últimas facturas LastCustomersBills=as %s últimas facturas a clientes LastSuppliersBills=as %s últimas facturas de Fornecedores @@ -156,9 +154,9 @@ ConfirmCancelBill=Está seguro de querer anular a factura %s ? ConfirmCancelBillQuestion=Porque Razão quer abandonar a factura? ConfirmClassifyPaidPartially=Está seguro de querer classificar a factura %s como paga? ConfirmClassifyPaidPartiallyQuestion=Esta factura não foi totalmente paga.Porque quer classifica-la como paga? -ConfirmClassifyPaidPartiallyReasonAvoir=O resto a pagar (%s %s) foi regularizado (já que artigo foi devolvido, esquecido de entregar, Desconto não definido...) mediante um deposito -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=O resto a pagar (%s %s) é um Desconto acordado depois da factura. Aceito perder o IVA deste Desconto -ConfirmClassifyPaidPartiallyReasonDiscountVat=O resto a pagar(%s %s) é um Desconto +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=Cliente devedor ConfirmClassifyPaidPartiallyReasonProductReturned=Produtos devolvidos em parte ConfirmClassifyPaidPartiallyReasonOther=Por outra Razão @@ -191,9 +189,9 @@ AlreadyPaid=Já e AlreadyPaidBack=Já reembolsado AlreadyPaidNoCreditNotesNoDeposits=Já pagas (sem notas de crédito e depósitos) Abandoned=Abandonada -RemainderToPay=Falta por Pagar -RemainderToTake=Falta de pagamento -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pendente AmountExpected=Montante reclamado ExcessReceived=Recebido em excesso @@ -219,19 +217,18 @@ NoInvoice=Nenhuma Factura ClassifyBill=Classificar a factura SupplierBillsToPay=Facturas de Fornecedores a pagar CustomerBillsUnpaid=Facturas a Clientes Pendentes de Cobrança -DispenseMontantLettres=Valor Cartas de isenção -DispenseMontantLettres=Valor Cartas de isenção +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Não recuperável SetConditions=Definir Condições de pagamento SetMode=Definir modo de pagamento Billed=Facturado -RepeatableInvoice=Factura em Massa -RepeatableInvoices=Facturas em Massa -Repeatable=Em Massa -Repeatables=Em Massa -ChangeIntoRepeatableInvoice=Modificar em Massa -CreateRepeatableInvoice=Criar Factura Predefinida -CreateFromRepeatableInvoice=Criar a partir de uma factura pré-definida +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Facturas a clientes e linhas de facturas CustomersInvoicesAndPayments=Facturas a clientes e pagamentos ExportDataset_invoice_1=Facturas a clientes e linhas de factura diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang index 32a51ccee83..7bf37e00221 100644 --- a/htdocs/langs/pt_PT/boxes.lang +++ b/htdocs/langs/pt_PT/boxes.lang @@ -1,52 +1,56 @@ # Dolibarr language file - Source file is en_US - boxes -BoxLastRssInfos=Links de informação RSS -BoxLastProducts=Últimos produtos/serviços +BoxLastRssInfos=Informação RSS +BoxLastProducts=Últimos %s produtos/serviços BoxProductsAlertStock=Products in stock alert -BoxLastProductsInContract=Últimos produtos/serviços contratados -BoxLastSupplierBills=Últimas facturas de Fornecedores -BoxLastCustomerBills=Últimas facturas a clientes -BoxOldestUnpaidCustomerBills=Facturas a clientes mais antiguas pendentes de pagamento -BoxOldestUnpaidSupplierBills=Facturas de Fornecedores mais antiguas pendentes de pagamento +BoxLastProductsInContract=Últimos %s produtos/serviços contratados +BoxLastSupplierBills=Últimas faturas dos fornecedores +BoxLastCustomerBills=Últimas faturas a clientes +BoxOldestUnpaidCustomerBills=Faturas a clientes mais antigas em débito +BoxOldestUnpaidSupplierBills=Faturas de fornecedores mais antigas em crédito BoxLastProposals=Últimos Orçamentos -BoxLastProspects=Últimos clientes potenciais -BoxLastCustomers=Últimos clientes -BoxLastSuppliers=Últimos Fornecedores -BoxLastCustomerOrders=Últimos pedidos +BoxLastProspects=Últimos clientes modificados +BoxLastCustomers=Últimos clientes modificados +BoxLastSuppliers=Últimos fornecedores modificados +BoxLastCustomerOrders=Últimos pedidos de cliente +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Últimos books BoxLastActions=Últimas acções -BoxLastContracts=Ultimos Contractos +BoxLastContracts=Últimos contractos BoxLastContacts=Últimos contatos, endereços BoxLastMembers=Últimos membros -BoxFicheInter=Last interventions -BoxCurrentAccounts=Opened accounts balance +BoxFicheInter=Últimas intervenções +BoxCurrentAccounts=Balanço de abertura das contas BoxSalesTurnover=Volume de negocio -BoxTotalUnpaidCustomerBills=Total facturas a clientes pendentes de pagamento -BoxTotalUnpaidSuppliersBills=Total facturas de Fornecedores pendentes de pagamento +BoxTotalUnpaidCustomerBills=Total das faturas de clientes em débito +BoxTotalUnpaidSuppliersBills=Total das faturas dos fornecedores em crédito BoxTitleLastBooks=Os %s últimos Favoritos registados BoxTitleNbOfCustomers=Número de clientes -BoxTitleLastRssInfos=As %s Ultimas Infos de %s -BoxTitleLastProducts=Os %s Ultimos Produtos/Serviços Registados +BoxTitleLastRssInfos=As %s últimas notícias de %s +BoxTitleLastProducts=Os %s últimos produtos/serviços modificados BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=Os %s últimos pedidos de clientes modificados +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Os %s últimos Fornecedores modificados BoxTitleLastCustomers=Os %s últimos clientes modificados BoxTitleLastModifiedSuppliers=%s Modificada fornecedores BoxTitleLastModifiedCustomers=%s Modificada clientes -BoxTitleLastCustomersOrProspects=Os %s últimos clientes ou clientes potenciais registados -BoxTitleLastPropals=Os %s últimos Orçamentos registados +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=As %s últimas facturas a clientes registadas +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=As %s últimas facturas de Fornecedores registadas -BoxTitleLastProspects=Os %s últimos clientes potenciais modificados +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=%s Modificada perspectivas BoxTitleLastProductsInContract=Os %s últimos produtos/serviços contratados -BoxTitleLastModifiedMembers=%s últimos membros modificados +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Last %s modified intervention -BoxTitleOldestUnpaidCustomerBills=As %s facturas mais antiguas a clientes Pendentes de cobrança -BoxTitleOldestUnpaidSupplierBills=As %s facturas mais antiguas de Fornecedores Pendentes de pagamento +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Opened account's balances BoxTitleSalesTurnover=Volume de negocio realizado -BoxTitleTotalUnpaidCustomerBills=Facturas pendentes de clientes -BoxTitleTotalUnpaidSuppliersBills=Facturas pendentes de Fornecedores +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=%s Última modificação contatos, endereços BoxMyLastBookmarks=Os meus ultimos Favoritos BoxOldestExpiredServices=Mais antigos ativos de serviços vencidos @@ -76,7 +80,8 @@ NoContractedProducts=Não contractados produtos / serviços NoRecordedContracts=Sem contratos registrados NoRecordedInterventions=No recorded interventions BoxLatestSupplierOrders=Latest supplier orders -BoxTitleLatestSupplierOrders=%s latest supplier orders +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=No recorded supplier order BoxCustomersInvoicesPerMonth=Faturas de clientes por mês BoxSuppliersInvoicesPerMonth=Facturas de fornecedores por mês diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang index 06ef47aa0c3..e0bf9a1007d 100644 --- a/htdocs/langs/pt_PT/categories.lang +++ b/htdocs/langs/pt_PT/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remover da categoria DeletePicture=Apagar Imagem ConfirmDeletePicture=Confirmar eliminação da imagem? @@ -112,3 +109,4 @@ CategoriesSetup=Configurar Categorias CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang index 83024e188b6..3d3c2c4ecf5 100644 --- a/htdocs/langs/pt_PT/companies.lang +++ b/htdocs/langs/pt_PT/companies.lang @@ -3,14 +3,14 @@ ErrorCompanyNameAlreadyExists=O nome da empresa %s já existe. Indique outro. ErrorPrefixAlreadyExists=O prefixo %s já existe. Indique outro. ErrorSetACountryFirst=Defina primeiro o país SelectThirdParty=Selecione um terceiro -DeleteThirdParty=Eliminar um Terceiro -ConfirmDeleteCompany=Está seguro de querer eliminar esta empresa e toda a informação dela pendente? -DeleteContact=Eliminar um contacto -ConfirmDeleteContact=Está seguro de querer eliminar este contacto e toda a sua informação inerente? +DeleteThirdParty=Apague um terceiro +ConfirmDeleteCompany=Deseja apagar esta empresa e toda a sua informação? +DeleteContact=Apagar um contacto/morada +ConfirmDeleteContact=Deseja apagar este contacto e toda a sua informação? MenuNewThirdParty=Novo Terceiro MenuNewCompany=Nova Empresa MenuNewCustomer=Novo Cliente -MenuNewProspect=Novo Cliente Potencial +MenuNewProspect=Novo Potencial Cliente MenuNewSupplier=Novo Fornecedor MenuNewPrivateIndividual=Novo Particular MenuSocGroup=Grupos @@ -93,7 +93,7 @@ LocalTax1ES=RE LocalTax2ES=IRPF TypeLocaltax1ES=RE Type TypeLocaltax2ES=IRPF Type -TypeES=Type +TypeES=Tipo ThirdPartyEMail=%s WrongCustomerCode=Código cliente incorrecto WrongSupplierCode=Código fornecedor incorrecto @@ -112,7 +112,7 @@ ProfId2=ID profesional 2 ProfId3=ID profesional 3 ProfId4=ID profesional 4 ProfId5=Professional ID 5 -ProfId6=Professional ID 6 +ProfId6=Id. Professional 6 ProfId1AR=Prof Id 1 (CUIL) ProfId2AR=Id Prof 2 (brutos Revenu) ProfId3AR=- @@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Descontos fixos disponiveis DiscountNone=Nenhuma Supplier=Fornecedor CompanyList=Lista de Empresas -AddContact=Criar Contacto -AddContactAddress=Adicionar contactos/endereços +AddContact=Criar contacto +AddContactAddress=Novo contacto/morada EditContact=Editar contato / endereço EditContactAddress=Editar contactos/endereços Contact=Contacto @@ -268,8 +268,8 @@ ContactsAddresses=Contato / Endereços NoContactDefinedForThirdParty=Não existem contactos definidos para este terceiro NoContactDefined=Nenhum contacto definido para este terceiro DefaultContact=Contacto por Defeito -AddCompany=Criar Empresa -AddThirdParty=Criar Terceiro +AddCompany=Criar empresa +AddThirdParty=Criar terceiro DeleteACompany=Eliminar uma Empresa PersonalInformations=Informação Pessoal AccountancyCode=Código Contabilidade @@ -379,8 +379,8 @@ DeliveryAddressLabel=Etiqueta de Envío DeleteDeliveryAddress=Eliminar uma Direcção de Envío ConfirmDeleteDeliveryAddress=Está seguro de querer eliminar esta direcção de envío? NewDeliveryAddress=Nova Direcção de Envío -AddDeliveryAddress=Adicionar Direcção -AddAddress=Adicionar Direcção +AddDeliveryAddress=Criar morada +AddAddress=Criar morada NoOtherDeliveryAddress=Não Existe Direcção alternatica definidas SupplierCategory=categoria Fornecedor JuridicalStatus200=Independente @@ -397,7 +397,7 @@ YouMustCreateContactFirst=Você deve criar contactos e-mails para terceiros, pri ListSuppliersShort=Lista de fornecedores ListProspectsShort=Lista das perspectivas ListCustomersShort=Lista de clientes -ThirdPartiesArea=Third parties and contact area +ThirdPartiesArea=Terceiros e árrea de contacto LastModifiedThirdParties=%s Última modificação terceiros UniqueThirdParties=Total de originais terceiros InActivity=Aberto @@ -410,5 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Devolve um número baixo o formato %syymm-nnnn para os códigos de clientes e %syymm-nnnn para os códigos dos Fornecedores, donde yy é o ano, mm o mês e nnnn um contador sequêncial sem ruptura e sem Voltar a 0. LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. pode ser modificado em qualquer momento. ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...) -SearchThirdparty=Search thirdparty -SearchContact=Search contact +SearchThirdparty=Procurar terceiro +SearchContact=Procurar contacto diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang index d4d73129bf1..e28633c2e24 100644 --- a/htdocs/langs/pt_PT/compta.lang +++ b/htdocs/langs/pt_PT/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Código contabilidade incorrecto para %s SuppliersProductsSellSalesTurnover=Volume de negócio gerado por venda de produtos aos Fornecedores CheckReceipt=Ficha de cheques CheckReceiptShort=Ficha +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Novo Cheque NewCheckDeposit=Novo Deposito NewCheckDepositOn=Criar Novo deposito na conta: %s @@ -196,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 7ce40bddee1..2c51fe50855 100644 --- a/htdocs/langs/pt_PT/contracts.lang +++ b/htdocs/langs/pt_PT/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Área contractos ListOfContracts=Lista de contractos -LastContracts=Os Ultimos %s Contractos Modificados +LastModifiedContracts=Last %s modified contracts AllContracts=Todos os contractos ContractCard=Ficha contrato ContractStatus=Estado do contrato @@ -27,7 +27,7 @@ MenuRunningServices=Serviços Activos MenuExpiredServices=Serviços Expirados MenuClosedServices=Serviços Fechados NewContract=Novo Contrato -AddContract=Criar Contrato +AddContract=Create contract SearchAContract=Procurar um Contrato DeleteAContract=Eliminar um Contrato CloseAContract=Fechar um Contrato @@ -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=Os Ultimos %s Contractos Modificados +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/cron.lang b/htdocs/langs/pt_PT/cron.lang index e9964d1bba8..7894645a502 100644 --- a/htdocs/langs/pt_PT/cron.lang +++ b/htdocs/langs/pt_PT/cron.lang @@ -18,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes # Menu CronJobs=Tarefas agendadas -CronListActive= Lista de trabalhos ativos -CronListInactive= Lista de trabalhos inativos -CronListActive= Lista de trabalhos ativos +CronListActive=List of active/scheduled jobs +CronListInactive=Lista de trabalhos inativos # Page list CronDateLastRun=Última execução CronLastOutput=Resultado da última execução 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/donations.lang b/htdocs/langs/pt_PT/donations.lang index a6788f3fa03..7a31ae91628 100644 --- a/htdocs/langs/pt_PT/donations.lang +++ b/htdocs/langs/pt_PT/donations.lang @@ -4,7 +4,7 @@ Donations=Donativos DonationRef=Ref. do donativo Donor=Doador Donors=Doadores -AddDonation=Adicionar uma Doação +AddDonation=Create a donation NewDonation=Nova Doação ShowDonation=Mostrar Donativo DonationPromise=Promessa de Doação @@ -31,3 +31,8 @@ DonationRecipient=Destinatário do donativo ThankYou=Obrigado IConfirmDonationReception=O destinatário acusou a recepção, como um donativo, do seguinte montante MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang index 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/externalsite.lang b/htdocs/langs/pt_PT/externalsite.lang index b14afaf0494..6795e54c6a0 100644 --- a/htdocs/langs/pt_PT/externalsite.lang +++ b/htdocs/langs/pt_PT/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Configurar ligação com site externo ExternalSiteURL=URL do site externo ExternalSiteModuleNotComplete=O módulo Site Externo não está configurado correctamente. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/pt_PT/ftp.lang b/htdocs/langs/pt_PT/ftp.lang index 6a364103be8..252525c10a6 100644 --- a/htdocs/langs/pt_PT/ftp.lang +++ b/htdocs/langs/pt_PT/ftp.lang @@ -1,12 +1,12 @@ # Dolibarr language file - Source file is en_US - ftp -FTPClientSetup=Configuração do módulo Cliente de FTP -NewFTPClient=Nova configuração da ligação FTP +FTPClientSetup=Configuração do módulo de Cliente FTP +NewFTPClient=Nova configuração de ligação FTP FTPArea=Área de FTP -FTPAreaDesc=Esta área mostrará o conteúdo de uma visão do servidor FTP -SetupOfFTPClientModuleNotComplete=Instalação do módulo cliente FTP parece não estar completa -FTPFeatureNotSupportedByYourPHP=A versão do PHP não suporta funções FTP -FailedToConnectToFTPServer=Falha ao ligar ao servidor de FTP (servidor: %s, porta: %s) -FailedToConnectToFTPServerWithCredentials=Falha de login do servidor de FTP com login definido e senha +FTPAreaDesc=Este ecrã mostra o seu conteúdo de uma visualização do servidor FTP +SetupOfFTPClientModuleNotComplete=A configuração do módulo de cliente FTP parece não estar concluída +FTPFeatureNotSupportedByYourPHP=A sua versão do PHP não suporta as funções FTP +FailedToConnectToFTPServer=Não foi possível ligar ao servidor FTP (servidor: %s, porta: %s) +FailedToConnectToFTPServerWithCredentials=Não foi possível iniciar a sessão no servidor FTP com o nome/senha definidos FTPFailedToRemoveFile=Falha ao remover o ficheiro: %s. -FTPFailedToRemoveDir=Falha ao remover o directório: %s (Verifique as permissões do diretório e que está vazia). +FTPFailedToRemoveDir=Não foi possível ao remover a diretoria: %s (Verifique as permissões e se a diretoria está sem dados). FTPPassiveMode=Modo passivo diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang index 581f48d225c..2f8cd8f23f1 100644 --- a/htdocs/langs/pt_PT/holiday.lang +++ b/htdocs/langs/pt_PT/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=RH -Holidays=Leaves -CPTitreMenu=Leaves +Holidays=Folgas +CPTitreMenu=Folgas MenuReportMonth=Monthly statement -MenuAddCP=Make a leave request -NotActiveModCP=You must enable the module Leaves to view this page. -NotConfigModCP=You must configure the module Leaves to view this page. To do this,     click here . -NoCPforUser=You don't have any available day. -AddCP=Make a leave request +MenuAddCP=Faça uma requesição de folgas +NotActiveModCP=Deve ativar o modulo de folgas para ver esta página +NotConfigModCP=Você deve configurar o módulo de folgas para ver esta página. Para fazer isso, click here . +NoCPforUser=Não tem nenhum dia disponivel +AddCP=Faça uma requisição de folga Employe=Empregado DateDebCP=Data de início DateFinCP=Data de fim @@ -18,24 +18,24 @@ ApprovedCP=Aprovado CancelCP=Cancelado RefuseCP=Recusado ValidatorCP=Approbator -ListeCP=List of leaves +ListeCP=Lista de folgas ReviewedByCP=Será analisado por DescCP=Descrição -SendRequestCP=Create leave request -DelayToRequestCP=Leave requests must be made at least %s day(s) before them. -MenuConfCP=Edit balance of leaves -UpdateAllCP=Update the leaves -SoldeCPUser=Leaves balance is %s days. +SendRequestCP=Criar requisição de folga +DelayToRequestCP=Requisição de folga de ser feita pelo menos %s dia(s) antes de. +MenuConfCP=Editar balanço de folgas +UpdateAllCP=Atualisar folgas +SoldeCPUser=Balanço de folgas é %s dias ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=Ocorreu um erro de SQL durante a criação: -ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ErrorIDFicheCP=Um erro ocorreu, a requisição de folga não existe ReturnCP=Voltar à página anterior -ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request +ErrorUserViewCP=Não está autorizado a ler esta requisição de folga +InfosCP=Informação da requisição de folga InfosWorkflowCP=Information Workflow RequestByCP=Pedido por -TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed +TitreRequestCP=Folga requirida +NbUseDaysCP=Numero de dias de férias consumido EditCP=Editar DeleteCP=Apagar ActionValidCP=Validar @@ -43,26 +43,25 @@ ActionRefuseCP=Recusar ActionCancelCP=Cancelar StatutCP=Estado SendToValidationCP=Enviar para validação -TitleDeleteCP=Delete the leave request -ConfirmDeleteCP=Confirm the deletion of this leave request? -ErrorCantDeleteCP=Error you don't have the right to delete this leave request. -CantCreateCP=You don't have the right to make leave requests. -InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Actualizar -CantUpdate=You cannot update this leave request. +TitleDeleteCP=apagar a requisição de folga +ConfirmDeleteCP=confirme que quer apagar requisição +ErrorCantDeleteCP=Erro não tem direitos para apagar reuisição +CantCreateCP=Não tem direitos para criar requisição de folgas +InvalidValidatorCP=Deve escolher um aprovador para as suas requisições +CantUpdate=Não pode atualisar a requisição NoDateDebut=Seleccione a data de início. NoDateFin=Seleccione a data de fim. -ErrorDureeCP=O seu pedido de férias não contém dias de trabalho. -TitleValidCP=Aprovar pedido de férias -ConfirmValidCP=Are you sure you want to approve the leave request? +ErrorDureeCP=A sua requisição não contempla dias obráveis +TitleValidCP=Aprove a requisição +ConfirmValidCP=tem a certeza que quer aprovar? DateValidCP=Data aprovada -TitleToValidCP=Send leave request -ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Recusar pedido de férias -ConfirmRefuseCP=Are you sure you want to refuse the leave request? +TitleToValidCP=Envie requisição +ConfirmToValidCP=tem a certeza que quer enviar requisição? +TitleRefuseCP=Recuse a requisição +ConfirmRefuseCP=Tem a certeza que quer recusar a requisição? NoMotifRefuseCP=Deve indicar um motivo para recusar o pedido. -TitleCancelCP=Cancelar o pedido de férias -ConfirmCancelCP=Are you sure you want to cancel the leave request? +TitleCancelCP=Cancel a requisição +ConfirmCancelCP=Tem a certeza que quer cancelar a requisição? DetailRefusCP=Razão para a rejeiçao DateRefusCP=Data de rejeição DateCancelCP=Data de cancelamento @@ -72,41 +71,41 @@ MotifCP=Motivo UserCP=Utilizador ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. AddEventToUserOkCP=The addition of the exceptional leave has been completed. -MenuLogCP=View logs of leave requests -LogCP=Log of updates of available vacation days +MenuLogCP=Veja registo de requisições +LogCP=Registo de actualizações de dias disponíveis ActionByCP=Realizado por UserUpdateCP=Para o utilizador PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=Uma requisição existe para esse período UserName=Nome Employee=Empregado -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation +FirstDayOfHoliday=Primeiro dia de férias +LastDayOfHoliday=Ultimo dia de férias HolidaysMonthlyUpdate=Actualização Mensal ManualUpdate=Actualização Manual HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuração de requisição de folga DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Grupo habilitado para aprovar requisições ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Ultima atualização de alocação de requisições UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validar UpdateEventCP=Update events diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang index 12ca0b0b0ed..8c6632c56ab 100644 --- a/htdocs/langs/pt_PT/install.lang +++ b/htdocs/langs/pt_PT/install.lang @@ -1,30 +1,30 @@ # Dolibarr language file - Source file is en_US - install InstallEasy=Basta seguir as instruções passo-a-passo. -MiscellaneousChecks=Verificar Pré-requisitos +MiscellaneousChecks=Verificar pré-requisitos DolibarrWelcome=Bem-vindo ao Dolibarr -ConfFileExists=O ficheiro %s de configuração já existe. -ConfFileDoesNotExists=O ficheiro %s de configuração não existe! -ConfFileDoesNotExistsAndCouldNotBeCreated=O ficheiro %s de configuração não existe e não foi possível criá-lo! -ConfFileCouldBeCreated=Foi possível criar o ficheiro %s de configuração. -ConfFileIsNotWritable=O ficheiro de configuração conf.php não é passível de escrita, verifique as permissões sff, o seu servidor web tem de ter permissões de escrita neste ficheiro em Linux, chmod 666). -ConfFileIsWritable=O ficheiro de configuração conf.php tem as permissões correctas. -ConfFileReload=Atualizar todas as informações do arquivo de configuração. +ConfFileExists=O ficheiro de configuração %s já existe. +ConfFileDoesNotExists=O ficheiro de configuração %s não existe! +ConfFileDoesNotExistsAndCouldNotBeCreated=O ficheiro de configuração %s não existe e não foi possível criá-lo! +ConfFileCouldBeCreated=Foi criado o ficheiro de configuração %s. +ConfFileIsNotWritable=O ficheiro de configuração %s não é gravável. Verifique as permissões. Na primeira instalação, o seu servidor da Web tem de ter permissões de gravação para este ficheiro durante o processo de configuração ("chmod 666", por exemplo num SO, tal como o Unix). +ConfFileIsWritable=O ficheiro de configuração %s é gravável. +ConfFileReload=Recarregar toda a informação do ficheiro de configuração. PHPSupportSessions=Este PHP suporta sessões. PHPSupportPOSTGETOk=Este PHP suporta variáveis GET e POST. -PHPSupportPOSTGETKo=É possível configurar o PHP não suporta variáveis POST e / ou GET. Verifique se o seu parâmetro variables_order em php.ini -PHPSupportGD=Este suporte PHP GD gráfica funções. -PHPSupportUTF8=Este suporte PHP UTF8 funções. -PHPMemoryOK=Seu PHP max sessão memória está definido para %s. Isto deve ser suficiente. -PHPMemoryTooLow=Seu PHP max sessão memória está definido para %s bytes. Isto deve ser muito baixo. Alterar o seu php.ini memory_limit para definir parâmetro para pelo menos %s bytes. +PHPSupportPOSTGETKo=É possível que a sua configuração PHP não suporte as variáveis POST e/ou GET. Verifique o seu parâmetro variables_order no php.ini +PHPSupportGD=Este PHP suporta funções gráficas GD . +PHPSupportUTF8=Este PHP suporte funções UTF8. +PHPMemoryOK=A sua memória máxima da sessão PHP está definida para %s. Isto deverá ser suficiente. +PHPMemoryTooLow=A sua memória máxima da sessão PHP está definida para %s bytes. Isto deve ser muito baixo. Altere o seu php.ini para definir o parâmetro memory_limit para pelo menos %s bytes. Recheck=Clique aqui para um teste mais significativo -ErrorPHPDoesNotSupportSessions=Sua instalação não suporta PHP sessões. Esta característica é necessária para tornar Dolibarr trabalho. Verifique a sua configuração do PHP. -ErrorPHPDoesNotSupportGD=Sua instalação PHP não suporta gráficos função GD. Não gráfico estarão disponíveis. -ErrorPHPDoesNotSupportUTF8=Sua instalação PHP não suporta funções UTF8. Dolibarr pode não funcionar corretamente. Resolva este antes de instalar Dolibarr. +ErrorPHPDoesNotSupportSessions=A sua instalação PHP não suporta sessões. Esta função é necessária para que o Dolibarr funcione. Verifique a sua configuração PHP. +ErrorPHPDoesNotSupportGD=A sua instalação PHP não suporta a função gráfica GD. Não terá nenhum gráfico disponível. +ErrorPHPDoesNotSupportUTF8=A sua instalação PHP não suporta as funções UTF8. O Dolibarr não pode funcionar corretamente. Resolva isto antes de instalar o Dolibarr. ErrorDirDoesNotExists=A diretoria %s não existe. ErrorGoBackAndCorrectParameters=Voltar atrás e corrigir os parâmetros errados. -ErrorWrongValueForParameter=Pode ter digitado um valor incorreto para o parâmetro ' %s'. +ErrorWrongValueForParameter=Pode ter inserido um valor incorreto para o parâmetro ' %s'. ErrorFailedToCreateDatabase=Não foi possível criar a base de dados' %s'. -ErrorFailedToConnectToDatabase=Não foi possível conetar à base de dados' %s'. +ErrorFailedToConnectToDatabase=Não foi possível ligar à base de dados' %s'. ErrorDatabaseVersionTooLow=A versão da base de dados (%s) é muito antiga. É necessária a versão %s ou superior. ErrorPHPVersionTooLow=A versão PHP é muito antiga. É necessária a versão %s. WarningPHPVersionTooLow=PHP versão muito antiga. %s versão ou mais é o esperado. Esta versão deverá permitir instalar, mas não é suportado. @@ -34,131 +34,131 @@ IfDatabaseNotExistsGoBackAndUncheckCreate=Se a base de dados não existir, volte IfDatabaseExistsGoBackAndCheckCreate=Se a base de dados já existir, volte e desmarque a opção "Criar base de dados". WarningBrowserTooOld=A versão do navegador é muito antiga. Atualize o seu navegador para uma versão mais recente do Firefox, Chrome ou Ópera. PHPVersion=Versão PHP -YouCanContinue=Pode continuar ... -PleaseBePatient=Por favor, seja paciente ... -License=A usar a licença -ConfigurationFile=Ficheiro de configuração -WebPagesDirectory=A diretoria onde as páginas da web estão guardadas -DocumentsDirectory=A diretoria para guardar os documentos e gerados -URLRoot=URL de raiz -ForceHttps=Forçar conexões seguras (https) -CheckToForceHttps=Marque esta opção para forçar conexões seguras (https).
    Isso exige que o servidor web está configurado com um certificado SSL. +YouCanContinue=Pode continuar... +PleaseBePatient=Por favor, seja paciente... +License=A utilizar a licença +ConfigurationFile=Ficheiro de Configuração +WebPagesDirectory=A diretoria onde as páginas da Web são guardadas +DocumentsDirectory=A diretoria para guardar os documentos enviados e gerados +URLRoot=URL Raiz +ForceHttps=Forçar ligações seguras (https) +CheckToForceHttps=Marque esta opção para forçar as ligações seguras (https).
    Isto requer que o servidor da Web esteja configurado com um certificado SSL. DolibarrDatabase=Base de Dados Dolibarr -DatabaseChoice=Escolha de base de dados +DatabaseChoice=Escolha da Base de Dados DatabaseType=Tipo de base de dados -DriverType=Driver tipo -Server=Server +DriverType=Tipo de Controlador +Server=Servidor ServerAddressDescription=Nome ou endereço IP para o servidor de dados, normalmente 'localhost' ao banco de dados está hospedado no mesmo servidor que servidor web -ServerPortDescription=Database server port. Mantenha vazio se desconhecido. -DatabaseServer=Database server -DatabaseName=Nome da base de dados -DatabasePrefix=Tabela de prefixos de banco de dados +ServerPortDescription=A porta do servidor da base de dados. Mantenha em branco, se desconhecida. +DatabaseServer=Servidor da Base de Dados +DatabaseName=Nome da Base de Dados +DatabasePrefix=Tabela de prefixos da base de dados Login=Iniciar Sessão -AdminLogin=Login para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anónimo +AdminLogin=Início de sessão para o administrador da base de dados Dolibarr. Deixar em branco se a ligação for efetuada como anónimo Password=Senha PasswordAgain=Contrassenha AdminPassword=A senha para o utilizador da base de dados Dolibarr. CreateDatabase=Criar base de dados -CreateUser=Criar utilizador -DatabaseSuperUserAccess=Servidor da Base de Dados - Acesso Administrador -CheckToCreateDatabase=Verifique se caixa de dados não existe e deve ser criado.
    Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página. -CheckToCreateUser=Caixa de login, se não existe e deve ser criado.
    Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página. +CreateUser=Criar administrador +DatabaseSuperUserAccess=Servidor da Base de Dados - Acesso de Administrador +CheckToCreateDatabase=Marque a caixa se a base de dados não existir e se deverá ser criada.
    Neste caso, deve preencher o nome/senha para a conta de administrador, no fim desta página. +CheckToCreateUser=Marque a caixa se o administrador da base de dados não existir e se deverá ser criado.
    Neste caso, deve escolher o seu nome/senha e preencher também os dados da conta de administrador no fim desta página. Se esta caixa estiver desmarcada, o administrador da base de dados e a sua senha já deverão existir. Experimental=(experimental) -DatabaseRootLoginDescription=Login do usuário permissão para criar novas bases de dados ou de novos usuários, inútil se o seu banco de dados e seu banco de dados já existe login (como quando você está hospedado por um provedor de hospedagem da web). +DatabaseRootLoginDescription=Início de sessão do utilizador autorizado para criar as novas bases de dados ou novos utilizadores, obrigatório se a sua base de dados ou o administrador já existirem. KeepEmptyIfNoPassword=Deixar em branco se o utilizador não tiver uma senha (evitar isto) SaveConfigurationFile=Guardar valores -ConfigurationSaving=A guardar o ficheiro da configuração ... -ServerConnection=Conexão ao Servidor -DatabaseConnection=Conexão à Base de Dados +ConfigurationSaving=A guardar o ficheiro da configuração... +ServerConnection=Ligação ao Servidor +DatabaseConnection=Ligação à Base de Dados DatabaseCreation=Criação da Base de Dados UserCreation=Criação do Utilizador CreateDatabaseObjects=Criação dos objetos da base de dados -ReferenceDataLoading=Dados de base a carregar... +ReferenceDataLoading=A carregar os dados de referência... TablesAndPrimaryKeysCreation=Criação das Tabelas e Chaves Primárias CreateTableAndPrimaryKey=Criar tabela %s CreateOtherKeysForTable=Crie chaves estrangeiras e índices para a tabela %s -OtherKeysCreation=Chaves estrangeiras e índices criação -FunctionsCreation=Funções criação +OtherKeysCreation=Chaves estrangeiras e criação de índex +FunctionsCreation=Criação de Funções AdminAccountCreation=Criação da sessão do Administrador -PleaseTypePassword=Por favor, digite uma senha, não são permitidas senhas em branco! +PleaseTypePassword=Por favor, insira uma senha, não são permitidas senhas em branco! PleaseTypeALogin=Por favor, digite um nome! PasswordsMismatch=As senhas não coincidem, por favor, tente de novo! SetupEnd=Fim da Configuração SystemIsInstalled=Esta instalação está completa. SystemIsUpgraded=O Dolibarr foi atualizado com sucesso. -YouNeedToPersonalizeSetup=Agora necessita de configurar o Dolibarr por forma a corresponder às suas necessidades (aspecto, funcionalidades, ...). Para tal clique no seguinte link: -AdminLoginCreatedSuccessfuly=Sessão de Administrador '%s' criada com sucesso. +YouNeedToPersonalizeSetup=Precisa de configurar o Dolibarr de acordo com as suas necessidades (apresentação, caraterísticas, ...). Para o efetuar, clique na seguinte hiperligação: +AdminLoginCreatedSuccessfuly=A sessão de Administrador '%s' foi criada com sucesso. GoToDolibarr=Ir para Dolibarr GoToSetupArea=Ir para Dolibarr (área de configuração) -MigrationNotFinished=Versão da base de dados não está completamente atualizada, assim terá que executar novamente o processo de atualização. +MigrationNotFinished=A versão da base de dados não está completamente atualizada, assim terá que executar novamente o processo de atualização. GoToUpgradePage=Ir novamente para a página de atualização Examples=Exemplos -WithNoSlashAtTheEnd=Sem a barra "/" no final +WithNoSlashAtTheEnd=Sem a barra "/" no fim DirectoryRecommendation=É recomendado a utilização da diretoria fora da sua diretoria das suas páginas da web. LoginAlreadyExists=Já existe DolibarrAdminLogin=Sessão Administrador Dolibarr AdminLoginAlreadyExists=A conta de administrador ' %s' Dolibarr já existe. Volte atrás, se desejar criar uma conta. -WarningRemoveInstallDir=Atenção, por razões de segurança, assim que a instalação ou a atualização estiver completa, para evitar novamente a utilização das ferramentas de instalação, deverá adicionar um ficheiro com o nome install.lock na diretoria de documentos Dolibarr, para evitar a sua utilização maliciosa.     +WarningRemoveInstallDir=Aviso: por motivos de segurança, assim que a instalação ou a atualização estiverem completas, e para evitar novamente a utilização das ferramentas de instalação, deverá adicionar um ficheiro com o nome install.lock na diretoria de documentos Dolibarr, para evitar a sua utilização maliciosa.     ThisPHPDoesNotSupportTypeBase=Este sistema PHP não suporta qualquer interface para aceder ao tipo da base de dados %s FunctionNotAvailableInThisPHP=Não disponível neste PHP MigrateScript=Migrar script ChoosedMigrateScript=Escolhido migrar script DataMigration=Migração de dados DatabaseMigration=Migração da base de dados da estrutura -ProcessMigrateScript=Script transformação -ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar" ... -FreshInstall=Nova Instalação -FreshInstallDesc=Utilize este modo, se esta for a primeira instalação. Se não, este modo pode reparar uma instalação anterior incompleto, mas se você deseja atualizar sua versão, selecione "Atualizar" modo. +ProcessMigrateScript=Processamento do "Script" +ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar"... +FreshInstall=Instalação Nova +FreshInstallDesc=Utilize este modo, se esta for a sua primeira instalação. Se não, este modo pode reparar uma instalação anterior incompleta, mas se deseja atualizar a sua versão, selecione o modo "Atualizar". Upgrade=Atualizar UpgradeDesc=Utilize este modo se tiver substituído os ficheiros Dolibarr antigos com ficheiros de uma versão mais recente. Isto irá atualizar a sua base de dados e os dados. Start=Iniciar -InstallNotAllowed=Configuração não permitidas pelas permissões conf.php +InstallNotAllowed=Configuração não permitida pelas permissões conf.php NotAvailable=Não disponível -YouMustCreateWithPermission=Deve criar o ficheiro %s e definir as permissões de gravação deste para o servidor da web, durante o processo de instalação. +YouMustCreateWithPermission=Deve criar o ficheiro %s e definir as permissões de gravação deste para o servidor da Web, durante o processo de instalação. CorrectProblemAndReloadPage=Por favor, corrija o problema e pressione em 'F5' para recarregar a página. -AlreadyDone=Já migrou +AlreadyDone=Já migrada DatabaseVersion=Versão da Base de Dados ServerVersion=Versão do Servidor da Base de Dados YouMustCreateItAndAllowServerToWrite=Deve criar esta diretoria e permitir que o servidor da web grave nela. CharsetChoice=Conjunto de carateres escolha CharacterSetClient=Conjunto de caracteres utilizados para páginas HTML geradas CharacterSetClientComment=Escolher conjunto de caracteres para exibir na web.
    Padrão proposto um conjunto de caracteres é o do seu banco de dados. -DBSortingCollation=Caracteres triagem fim +DBSortingCollation=Ordem da ordenação dos carateres DBSortingCollationComment=Escolha página código que define o caráter triagem fim utilizado por base de dados. Este parâmetro é também chamado de "recolha" por alguns bancos de dados.
    Esse parâmetro não pode ser definido se de dados já existe. -CharacterSetDatabase=Conjunto de caracteres para o banco de dados +CharacterSetDatabase=Conjunto de carateres para a base de dados CharacterSetDatabaseComment=Escolher conjunto de caracteres queria para o banco de dados criação.
    Esse parâmetro não pode ser definido se de dados já existe. -YouAskDatabaseCreationSoDolibarrNeedToConnect=Você pergunta para criar base de dados %s, mas, para isso, Dolibarr necessidade de se conectar ao servidor com o super-usuário %s %s permissões. -YouAskLoginCreationSoDolibarrNeedToConnect=Você pergunta para criar base de dados login %s, mas, para isso, Dolibarr necessidade de se conectar ao servidor com o super-usuário %s %s permissões. +YouAskDatabaseCreationSoDolibarrNeedToConnect=Pediu para criar a base de dados %s, mas para isso, o Dolibarr precisa de ligar ao servidor %s com permissões de administrador %s. +YouAskLoginCreationSoDolibarrNeedToConnect=Pediu para criar a base de dados da sessão %s, mas para isso, o Dolibarr precisa de ligar ao servidor %s com permissões de administrador %s. BecauseConnectionFailedParametersMayBeWrong=Como conexão falhou, de acolhimento ou super usuário parâmetros devem ser errado. -OrphelinsPaymentsDetectedByMethod=Orphelins pagamento detectado pelo método %s -RemoveItManuallyAndPressF5ToContinue=Removê-lo manualmente e pressione F5 para continuar. +OrphelinsPaymentsDetectedByMethod=Detetado o pagamento Orphelins pelo método %s +RemoveItManuallyAndPressF5ToContinue=Remova-o manualmente e pressione F5 para continuar. KeepDefaultValuesWamp=Você usa o DoliWamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz. KeepDefaultValuesDeb=Você pode usar o assistente de configuração Dolibarr de um Ubuntu ou um pacote Debian, então os valores propostos aqui já estão otimizados. Apenas a senha do proprietário do banco de dados para criar tem de ser concluída. Alterar parâmetros outros apenas se você sabe o que fazer. KeepDefaultValuesMamp=Você usa o DoliMamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz. KeepDefaultValuesProxmox=Você usa o assistente de configuração Dolibarr de um appliance virtual Proxmox, para valores propostos aqui já são otimizados. Alterá-los apenas se você sabe o que fazer. FieldRenamed=Campo renomeado -IfLoginDoesNotExistsCheckCreateUser=Se login não existe ainda, você deve verificar a opção "Criar usuário" +IfLoginDoesNotExistsCheckCreateUser=Se a sessão ainda não existir, deve marcar a opção "Criar Utilizador" ErrorConnection=Servidor " %s", nome do banco de dados " %s", login " %s", ou banco de dados senha pode estar errado ou PHP versão cliente pode ser muito velho para comparação de dados versão. InstallChoiceRecommanded=Recomendado opção de instalar a versão do seu %s %s versão atual -InstallChoiceSuggested=Instale opção sugerida pelo instalador. +InstallChoiceSuggested=Opção de instalação sugerida pelo instalador. MigrateIsDoneStepByStep=A versão de destino (%s) tem uma abertura de várias versões, então assistente de instalação vai voltar a sugerir próxima migração uma vez que esta será uma final. CheckThatDatabasenameIsCorrect=Verifique se o nome do banco de dados "%s" está correto. IfAlreadyExistsCheckOption=Se esse nome está correto e que banco de dados ainda não existe, você deve marcar a opção "Criar banco de dados". OpenBaseDir=parametr openbasedir PHP -YouAskToCreateDatabaseSoRootRequired=Você marcou a caixa "Criar banco de dados". Para isso, você precisa fornecer login e senha de superusuário (parte inferior do formulário). -YouAskToCreateDatabaseUserSoRootRequired=Você marcou a caixa "Criar banco de dados proprietário". Para isso, você precisa fornecer login e senha de superusuário (parte inferior do formulário). +YouAskToCreateDatabaseSoRootRequired=Marcou a caixa "Criar Base de Dados". Para isto, precisa de indicar o nome/senha do administrador (base do formulário). +YouAskToCreateDatabaseUserSoRootRequired=Marcou a caixa "Criar base de dados do administrador". Para isso, precisa do início de sessão/senha de administrador (base do formulário). NextStepMightLastALongTime=etapa atual pode durar vários minutos. Por favor, aguarde até a próxima tela é mostrada completamente antes de continuar. MigrationCustomerOrderShipping=Migrar para o transporte de armazenamento ordens do cliente -MigrationShippingDelivery=Upgrade de armazenamento de navegação -MigrationShippingDelivery2=Upgrade de armazenamento do transporte 2 -MigrationFinished=Migração terminou +MigrationShippingDelivery=Atualizar armazenamento de transporte +MigrationShippingDelivery2=Atualizar armazenamento de transporte 2 +MigrationFinished=Migração terminada LastStepDesc=Último passo: Defina aqui o login ea senha que você planeja usar para se conectar ao software. Não perca isso, pois é a conta para administrar todos os outros. -ActivateModule=Ative %s módulo -ShowEditTechnicalParameters=Clique aqui para exibir / editar os parâmetros avançados (modo avançado) +ActivateModule=Ative o módulo %s +ShowEditTechnicalParameters=Clique aqui para mostrar/editar os parâmetros avançados (modo avançado) ######### # upgrade -MigrationFixData=Correção de dados desnormalizada +MigrationFixData=Correção para os dados não normalizados MigrationOrder=Migração de dados para os clientes "ordens MigrationSupplierOrder=Migração de dados de Fornecedores' ordens MigrationProposal=Data migrering for kommersielle forslag @@ -202,10 +202,10 @@ MigrationMenusDetail=Atualização dinâmica menus quadros MigrationDeliveryAddress=Atualizar endereço de entrega em transferências MigrationProjectTaskActors=Migração de dados para llx_projet_task_actors tabela MigrationProjectUserResp=Dados fk_user_resp domínio da migração de llx_projet para llx_element_contact -MigrationProjectTaskTime=Atualização de tempo gasto em segundos -MigrationActioncommElement=Atualizar os dados sobre as ações +MigrationProjectTaskTime=Atualização do tempo despendido em segundos +MigrationActioncommElement=Atualizar os dados nas 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 indisponíveis +HideNotAvailableOptions=Ocultar opções indisponíveis diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang index 5fece10ddef..1d827400a02 100644 --- a/htdocs/langs/pt_PT/interventions.lang +++ b/htdocs/langs/pt_PT/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervenção Interventions=Intervenções InterventionCard=Ficha de Intervenção NewIntervention=Nova Intervenção -AddIntervention=Criar Intervenção +AddIntervention=Create intervention ListOfInterventions=Lista de Intervenções EditIntervention=Editar ActionsOnFicheInter=Ações de intervenção @@ -30,6 +30,15 @@ StatusInterInvoiced=Faturados RelatedInterventions=Intervenções relacionadas ShowIntervention=Mostrar intervenção SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsável do Seguimiento da Intervenção TypeContact_fichinter_internal_INTERVENING=Interveniente diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang index 86eef561efe..df457e8d64f 100644 --- a/htdocs/langs/pt_PT/languages.lang +++ b/htdocs/langs/pt_PT/languages.lang @@ -10,7 +10,7 @@ Language_da_DA=Dinamarquês Language_da_DK=Dinamarquês Language_de_DE=Alemão Language_de_AT=Alemão (Áustria) -Language_de_CH=German (Switzerland) +Language_de_CH=Alemão (Suíça) Language_el_GR=Grego Language_en_AU=Inglês (Austrália) Language_en_GB=Inglês (Reino Unido) @@ -20,9 +20,9 @@ Language_en_SA=Inglês (Arábia Saudita) Language_en_US=Inglês (Estados Unidos) Language_en_ZA=Inglês (África do Sul) Language_es_ES=Espanhol -Language_es_DO=Spanish (Dominican Republic) +Language_es_DO=Espanhol (República Dominicana) Language_es_AR=Espanhol (Argentina) -Language_es_CL=Spanish (Chile) +Language_es_CL=Espanhol (Chile) Language_es_HN=Espanhol (Honduras) Language_es_MX=Espanhol (México) Language_es_PY=Espanhol (Paraguai) @@ -31,7 +31,7 @@ Language_es_PR=Espanhol (Porto Rico) Language_et_EE=Estónia Language_eu_ES=Basco Language_fa_IR=Persa -Language_fi_FI=Fins +Language_fi_FI=Finlandês Language_fr_BE=Francês (Bélgica) Language_fr_CA=Francês (Canadá) Language_fr_CH=Francês (Suíça) @@ -40,7 +40,7 @@ Language_fr_NC=Francês (Nova Caledónia) Language_he_IL=Hebreu Language_hr_HR=Croata Language_hu_HU=Húngaro -Language_id_ID=Indonesian +Language_id_ID=Indonésio Language_is_IS=Islandês Language_it_IT=Italiano Language_ja_JP=Japonês @@ -48,7 +48,7 @@ Language_ko_KR=Coreano Language_lt_LT=Lituano Language_lv_LV=Letão Language_mk_MK=Macedónio -Language_nb_NO=Norueguês (bokmål) +Language_nb_NO=Norueguês (Bokmål) Language_nl_BE=Holandês (Bélgica) Language_nl_NL=Holandês (Países Baixos) Language_pl_PL=Polaco diff --git a/htdocs/langs/pt_PT/link.lang b/htdocs/langs/pt_PT/link.lang index 8b1efb75ef3..ed0611101e4 100644 --- a/htdocs/langs/pt_PT/link.lang +++ b/htdocs/langs/pt_PT/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=Link a novao ficheiro/documento +LinkedFiles=Ficheiros e documento ligados +NoLinkFound=sem reigisto de ligações +LinkComplete=Os ficheiros foram ligados com sucesso +ErrorFileNotLinked=Os ficheiros não puderam ser ligados +LinkRemoved=A ligação %s foi removida +ErrorFailedToDeleteLink= falhou a remoção da ligação '%s' +ErrorFailedToUpdateLink= Falha na atualização de ligação '%s' diff --git a/htdocs/langs/pt_PT/mailmanspip.lang b/htdocs/langs/pt_PT/mailmanspip.lang index 17e8f05968c..ea2d6f990f5 100644 --- a/htdocs/langs/pt_PT/mailmanspip.lang +++ b/htdocs/langs/pt_PT/mailmanspip.lang @@ -1,27 +1,27 @@ # Dolibarr language file - Source file is en_US - mailmanspip -# MailmanSpipSetup=Mailman and SPIP module Setup -# MailmanTitle=Mailman mailing list system -# TestSubscribe=To test subscription to Mailman lists -# TestUnSubscribe=To test unsubscribe from Mailman lists -MailmanCreationSuccess=O teste subscrição foi executado com sucesso -MailmanDeletionSuccess=O teste de desubscrição foi executado com sucesso -# SynchroMailManEnabled=A Mailman update will be performed -SynchroSpipEnabled=Uma atualização ao SPIP será realizado -# DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password -# DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions -# DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions -DescADHERENT_MAILMAN_LISTS=Lista(s) para inscrição automática de novos membros (separados por uma vírgula) -# SPIPTitle=SPIP Content Management System +MailmanSpipSetup=Mailman and SPIP module Setup +MailmanTitle=Mailman mailing list system +TestSubscribe=To test subscription to Mailman lists +TestUnSubscribe=To test unsubscribe from Mailman lists +MailmanCreationSuccess=O teste da subscrição foi executado com sucesso +MailmanDeletionSuccess=O teste do cancelamento da subscrição foi executado com sucesso +SynchroMailManEnabled=A Mailman update will be performed +SynchroSpipEnabled=Será efetuada uma atualização ao Spip +DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password +DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions +DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions +DescADHERENT_MAILMAN_LISTS=Lista(s) para a inscrição automática dos novos membros (separados por uma vírgula) +SPIPTitle=Sistema de Gestão do Conteúdo SPIP DescADHERENT_SPIP_SERVEUR=Servidor SPIP DescADHERENT_SPIP_DB=Nome da base de dados SPIP -DescADHERENT_SPIP_USER=Login de base de dados SPIP -DescADHERENT_SPIP_PASS=Password da base de dados SPIP -AddIntoSpip=Adicionar a SPIP -AddIntoSpipConfirmation=Tem a certeza que quer adicionar este membro ao SPIP? -AddIntoSpipError=Falha ao adicionar o utilizador ao SPIP +DescADHERENT_SPIP_USER=Sessão da base de dados SPIP +DescADHERENT_SPIP_PASS=Senha da base de dados SPIP +AddIntoSpip=Adicionar ao SPIP +AddIntoSpipConfirmation=Deseja adicionar este membro ao SPIP? +AddIntoSpipError=Falha ao adicionar o utilizador no SPIP DeleteIntoSpip=Remover do SPIP -DeleteIntoSpipConfirmation=Tem a certeza que quer remover este membro do SPIP? -DeleteIntoSpipError=Falha ao eliminar o utilizador do SPIP -SPIPConnectionFailed=Falha ao ligar-se ao SPIP -# SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done -# SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done +DeleteIntoSpipConfirmation=Deseja remover este membro do SPIP? +DeleteIntoSpipError=Falha ao remover o utilizador do SPIP +SPIPConnectionFailed=Falha ao ligar ao SPIP +SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done +SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang index a20b5e02227..cdcc999daa0 100644 --- a/htdocs/langs/pt_PT/mails.lang +++ b/htdocs/langs/pt_PT/mails.lang @@ -115,7 +115,7 @@ SentBy=Enviado por 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=Pode enviar em linha adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com um valor número que indica o máximo nº de e-mails enviados por Sessão. 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Limpar lista ToClearAllRecipientsClickHere=Para limpar a lista dos destinatarios deste mailing, faça click ao botão ToAddRecipientsChooseHere=Para Adicionar destinatarios, escoja os que figuran em listas a continuação @@ -133,6 +133,9 @@ Notifications=Notificações NoNotificationsWillBeSent=Nenhuma notificação por e-mail está prevista para este evento e empresa ANotificationsWillBeSent=1 notificação vai a ser enviada por e-mail SomeNotificationsWillBeSent=%s Notificações vão ser enviadas por e-mail -AddNewNotification=Activar um novo pedido de notificação -ListOfActiveNotifications=Lista das pedidos de notificações activas +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Lista de todas as notificações de e-mail enviado +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index deb3ea0b099..8bde1900e18 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossivel encontrar o utilizador %s%s     ao ficheiro de configuração conf.php.
    Isto significa que a base de dados das Palavras-Passe é externa ao Dolibarr, por isso toda modificação deste campo pode resultar sem efeito algum. Administrator=Administrador Undefined=Não Definido -PasswordForgotten=Esqueceu-se da sua palavra-passe? -SeeAbove=Mencionar anteriormente +PasswordForgotten=Esqueceu-se da sua senha? +SeeAbove=Ver acima HomeArea=Área Principal LastConnexion=Ultima Ligação -PreviousConnexion=Ultima Ligação +PreviousConnexion=Ligação Anterior ConnectedOnMultiCompany=Conectado sobre entidade ConnectedSince=Conectado desde -AuthenticationMode=Modo autenticação -RequestedUrl=Url solicitada -DatabaseTypeManager=Tipo de gestor de base de dados -RequestLastAccess=Petição último acesso à base de dados -RequestLastAccessInError=Petição último acesso à base de dados errado +AuthenticationMode=Modo de autenticação +RequestedUrl=Url solicitado +DatabaseTypeManager=Gestor do tipo de base de dados +RequestLastAccess=Pedido para o último acesso à base de dados +RequestLastAccessInError=Pedido errado para o último acesso à base de dados ReturnCodeLastAccessInError=Código devolvido último acesso à base de dados errado InformationLastAccessInError=informação sobre o último acesso à base de dados errado DolibarrHasDetectedError=O Dolibarr detectou um erro técnico @@ -108,8 +108,8 @@ No=Não All=Tudo Home=Inicio Help=Ajuda -OnlineHelp=Ajuda on-line -PageWiki=Página da wiki +OnlineHelp=Ajuda On-line +PageWiki=Página Wiki Always=Sempre Never=Nunca Under=Baixo @@ -120,48 +120,48 @@ Activated=Activado Closed=Fechado Closed2=Fechado Enabled=Activado -Deprecated=obsoleto +Deprecated=Obsoleto Disable=Desactivar Disabled=Desactivado Add=Adicionar -AddLink=Adicionar link -Update=Modificar -AddActionToDo=Adicionar acção a realizar -AddActionDone=Adicionar acção realizada +AddLink=Adicionar hiperligação +Update=Atualizar +AddActionToDo=Adicionar evento a realizar +AddActionDone=Adicionar evento realizado Close=Fechar Close2=Fechar Confirm=Confirmar -ConfirmSendCardByMail=Quer enviar esta ficha por e-mail? -Delete=Eliminar -Remove=Retirar +ConfirmSendCardByMail=Deseja enviar o conteúdo desta ficha por correio eletrónico para %s? +Delete=Apagar +Remove=Remover Resiliate=Cancelar Cancel=Cancelar Modify=Modificar Edit=Editar -Validate=Confirmar -ToValidate=A Confirmar +Validate=Validar +ToValidate=Para validar Save=Guardar -SaveAs=Guardar como +SaveAs=Guardar Como TestConnection=Teste a ligação -ToClone=Cópiar -ConfirmClone=Seleccione os dados que deseja copiar. -NoCloneOptionsSpecified=Não existem dados definidos para copiar +ToClone=Clonar +ConfirmClone=Selecione os dados que deseja clonar: +NoCloneOptionsSpecified=Não existem dados definidos para clonar. Of=de Go=Avançar Run=continuar CopyOf=Cópia de -Show=Ver -ShowCardHere=Mostrar cartão +Show=Mostrar +ShowCardHere=Mostrar ficha Search=Procurar -SearchOf=Pesquisar +SearchOf=Procurar Valid=Confirmar Approve=Aprovar ReOpen=Reabrir Upload=Enviar Ficheiro ToLink=Link -Select=Seleccionar +Select=Selecionar Choose=Escolher -ChooseLangage=Escolher o seu idioma +ChooseLangage=Por favor, escolha o seu idioma Resize=Redimensionar Recenter=Centrar Author=Autor @@ -169,35 +169,35 @@ User=Utilizador Users=Utilizadores Group=Grupo Groups=Grupos -Password=Palavra-Passe -PasswordRetype=Repetir Palavra-Passe -NoteSomeFeaturesAreDisabled=Atenção, só poucos módulos/funcionalidades foram activados nesta demo +Password=Senha +PasswordRetype=Contrassenha +NoteSomeFeaturesAreDisabled=Note que estão desativados muitos módulos/funções nesta demonstração. Name=Nome Person=Pessoa Parameter=Parâmetro Parameters=Parâmetros Value=Valor GlobalValue=Valor global -PersonalValue=Valor Personalizado +PersonalValue=Valor pessoal NewValue=Novo valor CurrentValue=Valor actual Code=Código Type=Tipo Language=Idioma -MultiLanguage=Multi Idioma +MultiLanguage=Múltiplos Idiomas Note=Nota -CurrentNote=Nota actual +CurrentNote=Nota atual Title=Título Label=Etiqueta -RefOrLabel=Ref. da etiqueta -Info=Log +RefOrLabel=Referência ou etiqueta +Info=Registo de Eventos Family=Familia Description=Descrição Designation=Designação Model=Modelo -DefaultModel=Modelo por defeito -Action=Acção -About=Acerca de +DefaultModel=Modelo predefinido +Action=Evento +About=Sobre Number=Número NumberByMonth=Número por mês AmountByMonth=Valor por mês @@ -206,7 +206,7 @@ Limit=Limite Limits=Limites DevelopmentTeam=Equipa de Desenvolvimento Logout=Terminar Sessão -NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s +NoLogoutProcessWithAuthMode=Função aplicativo não desconetado com modo de autenticação %s Connection=Ligação Setup=Configuração Alert=Alerta @@ -219,19 +219,19 @@ Date=Data DateStart=Data de Início DateEnd=Data de Fim DateCreation=Data de Criação -DateModification=Data Modificação -DateModificationShort=Data Modif. -DateLastModification=Data Ultima Modificação +DateModification=Data de Modificação +DateModificationShort=Data de Modif. +DateLastModification=Data da última modificação DateValidation=Data de Validação DateClosing=Data de Encerramento -DateDue=Data Vencimento -DateValue=Data Valor -DateValueShort=Data Valor -DateOperation=Data Operação -DateOperationShort=Data Op. +DateDue=Data de Vencimento +DateValue=Data do valor +DateValueShort=Data do valor +DateOperation=Data da operação +DateOperationShort=Data da Op. DateLimit=Data Limite -DateRequest=Data Consulta -DateProcess=Data Processo +DateRequest=Data do Pedido +DateProcess=Data do Processo DatePlanShort=Data Planif. DateRealShort=Data Real DateBuild=Data da geração do Relatório @@ -266,6 +266,7 @@ Afternoon=Tarde Quadri=Trimestre MonthOfDay=Dia do mês HourShort=H +MinuteShort=mn Rate=Tipo UseLocalTax=IVA incluído Bytes=Bytes @@ -277,30 +278,30 @@ b=b. Kb=Kb Mb=Mb Gb=Gb -Tb=Terabyte +Tb=Tb Cut=Cortar Copy=Copiar Paste=Colar -Default=Defeito -DefaultValue=Valor por defeito -DefaultGlobalValue=Valor global +Default=Predefinição +DefaultValue=Valor Predefinido +DefaultGlobalValue=Valor Global Price=Preço UnitPrice=Preço Unitário -UnitPriceHT=Preço Base -UnitPriceTTC=Preço Unitário Total -PriceU=PU -PriceUHT=PU -PriceUTTC=PU Total +UnitPriceHT=Preço Base (base) +UnitPriceTTC=Preço Unitário +PriceU=P.U. +PriceUHT=P.U. (base) +PriceUTTC=P.U. Amount=Montante -AmountInvoice=Montante Factura -AmountPayment=Montante Pagamento -AmountHTShort=Montante base +AmountInvoice=Montante da Fatura +AmountPayment=Montante do Pagamento +AmountHTShort=Montante (base) AmountTTCShort=Montante (IVA inc.) -AmountHT=Montante Base -AmountTTC=Montante -AmountVAT=Montante IVA -AmountLT1=Valor de Imposto 2 -AmountLT2=Valor de Imposto 3 +AmountHT=Montante (base) +AmountTTC=Montante (IVA inc.) +AmountVAT=Montante do IVA +AmountLT1=Valor do IVA 2 +AmountLT2=Valor do IVA 3 AmountLT1ES=Montante RE AmountLT2ES=Montante IRPF AmountTotal=Montante Total @@ -315,7 +316,7 @@ SubTotal=Subtotal TotalHTShort=Montante base TotalTTCShort=Total (IVA inc.) TotalHT=Total -TotalHTforthispage=Total (net of tax) for this page +TotalHTforthispage=Total (liquido de imposto) para esta página TotalTTC=Total (IVA inc.) TotalTTCToYourCredit=Total a crédito TotalVAT=Total do IVA @@ -336,10 +337,11 @@ Delta=Divergencia Module=Módulo Option=Opção List=Lista -FullList=Lista completa +FullList=Lista Completa Statistics=Estatísticas OtherStatistics=Outras estatísticas Status=Estado +Favorite=Favoritos ShortInfo=Informação Ref=Ref. RefSupplier=Ref. fornecedor @@ -347,8 +349,8 @@ RefPayment=Ref. pagamento CommercialProposalsShort=Orçamentos Comment=Comentário Comments=Comentários -ActionsToDo=Acções a realizar -ActionsDone=Acções realizadas +ActionsToDo=Eventos a realizar +ActionsDone=Eventos realizados ActionsToDoShort=A realizar ActionsRunningshort=Iniciado ActionsDoneShort=Realizadas @@ -356,17 +358,18 @@ ActionNotApplicable=Não aplicável ActionRunningNotStarted=Não Iniciado ActionRunningShort=Iniciado ActionDoneShort=Terminado -ActionUncomplete=Uncomplete -CompanyFoundation=Empresa ou Instituição -ContactsForCompany=Contactos desta empresa -ContactsAddressesForCompany=Contatos / endereços para este terceiro -AddressesForCompany=Endereços para este terceiro -ActionsOnCompany=Acções nesta sociedade +ActionUncomplete=Incompleta +CompanyFoundation=Empresa/Fundação +ContactsForCompany=Contactos para este terceiro +ContactsAddressesForCompany=Contactos/moradas para este terceiro +AddressesForCompany=Moradas para este terceiro +ActionsOnCompany=Eventos sobre este terceiro ActionsOnMember=Eventos sobre este membro -NActions=%s acções +NActions=%s eventos NActionsLate=%s em atraso +RequestAlreadyDone=O pedido já foi realizado anteriormente Filter=Filtro -RemoveFilter=Eliminar filtro +RemoveFilter=Remover filtro ChartGenerated=Gráficos gerados ChartNotGenerated=Gráfico não gerado GeneratedOn=Gerado o %s @@ -508,7 +511,7 @@ NbOfCustomers=Numero de Clientes NbOfLines=Numeros de Linhas NbOfObjects=Numero de Objectos NbOfReferers=Numero de Referências -Referers=Refering objects +Referers=Referências a objetos TotalQuantity=Quantidade Total DateFromTo=De %s a %s DateFrom=A partir de %s @@ -552,7 +555,7 @@ MailSentBy=Mail enviado por TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem SendAcknowledgementByMail=Envio rec. por e-mail NoEMail=Sem e-mail -NoMobilePhone=No mobile phone +NoMobilePhone=Sem telefone móvel Owner=Propietario DetectedVersion=Versão Detectada FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente. @@ -607,8 +610,8 @@ Notes=Notas AddNewLine=Adicionar nova linha AddFile=Adicionar ficheiro ListOfFiles=Lista de ficheiros disponíveis -FreeZone=Free entry -FreeLineOfType=Free entry of type +FreeZone=Entrada livre +FreeLineOfType=Entrada livre do tipo CloneMainAttributes=Copiar objeto com os seus atributos principais PDFMerge=PDF Merge Merge=Junção @@ -645,6 +648,7 @@ OptionalFieldsSetup=Configuração de atributos extra URLPhoto=Url da foto / logotipo SetLinkToThirdParty=Link para um terceiro CreateDraft=Criar Rascunho +SetToDraft=Voltar para o rascunho ClickToEdit=Clique para editar ObjectDeleted=%s objeto removido ByCountry=Por país @@ -672,13 +676,13 @@ HelpCopyToClipboard=Use Ctrl+C para copiar SaveUploadedFileWithMask=Guardar o ficheiro no servidor com o nome "%s" (caso contrário "%s") OriginFileName=Nome do ficheiro original SetDemandReason=Definir fonte -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency +SetBankAccount=Definir Conta Bancária +AccountCurrency=Moeda da conta ViewPrivateNote=Ver notas XMoreLines=%s linhas(s) ocultas PublicUrl=URL público -AddBox=Add box - +AddBox=Adicionar Caixa +SelectElementAndClickRefresh=Selecione um elemento e actualize a pagina # Week day Monday=Segunda-feira Tuesday=Terça-feira diff --git a/htdocs/langs/pt_PT/margins.lang b/htdocs/langs/pt_PT/margins.lang index 4e3c6f3911a..c62ee64a5f3 100644 --- a/htdocs/langs/pt_PT/margins.lang +++ b/htdocs/langs/pt_PT/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Detalhes da margem - ProductMargins=Margens do produto CustomerMargins=Margens do cliente SalesRepresentativeMargins=Sales representative margins - ProductService=Produto ou Serviço AllProducts=Todos os produtos e serviços ChooseProduct/Service=Escolher produto ou serviço - StartDate=Data de Início EndDate=Data Fim Launch=Iniciar - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=Como um produto UseDiscountAsService=Como um serviço UseDiscountOnTotal=No subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global é tratado como um produto, um serviço, ou apenas no subtotal para cálculo de margem - MARGIN_TYPE=Tipo de margem MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Preço de custo BuyingCost=Preço de custo UnitCharges=Custos unitários Charges=Custos - AgentContactType=Tipo de contacto usado para comissionamento -AgentContactTypeDetails=Defina que tipo de contacto (acoplado na factura) será associado com os agentes comerciais +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/pt_PT/orders.lang index 0b1779d665d..bb19acee7dd 100644 --- a/htdocs/langs/pt_PT/orders.lang +++ b/htdocs/langs/pt_PT/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Um existe um envio DraftOrWaitingApproved=Rascunho aprovado mas ainda não aprovado DraftOrWaitingShipped=Rascunho o validado mas ainda não expedido MenuOrdersToBill=Pedidos por Facturar -MenuOrdersToBill2=Encomendas para faturar +MenuOrdersToBill2=Billable orders SearchOrder=Procurar um Pedido SearchACustomerOrder=Search a customer order ShipProduct=Enviar Produto @@ -65,7 +65,7 @@ ValidateOrder=Confirmar o Pedido UnvalidateOrder=Pedido inválido DeleteOrder=Eliminar o pedido CancelOrder=Anular o Pedido -AddOrder=Criar Pedido +AddOrder=Create order AddToMyOrders=Adicionar os meus Pedidos AddToOtherOrders=Adicionar a outros pedidos AddToDraftOrders=Add to draft order @@ -154,7 +154,6 @@ OrderByPhone=Telefone CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=Sem encomendas para faturar CloseProcessedOrdersAutomatically=Classificar todas as encomendas seleccionadas como "Processadas" -MenuOrdersToBill2=Encomendas para faturar OrderCreation=Order creation Ordered=Encomendado OrderCreated=As suas encomendas foram criadas diff --git a/htdocs/langs/pt_PT/oscommerce.lang b/htdocs/langs/pt_PT/oscommerce.lang deleted file mode 100644 index de6d4d6c866..00000000000 --- a/htdocs/langs/pt_PT/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Configuração do módulo OS Commerce -OSCommerceSetupSaved=Configuração OS Commerce guardada -OSCommerceServer=Nome/IP servidor da base de dados OS commerce -OSCommerceDatabaseName=Nome da base de dados OS Commerce -OSCommercePrefix=Prefixo Tabelas OS Commerce -OSCommerceUser=Utilizador da base de dados OS Commerce diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang index d18c78371ba..6df1475eb17 100644 --- a/htdocs/langs/pt_PT/other.lang +++ b/htdocs/langs/pt_PT/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Código segurança Calendar=Calendario -AddTrip=Criar deslocação Tools=Utilidades ToolsDesc=Esta área é dedicada a ferramentas de grupo não disponíveis em diversos outros itens do menu.

    Essas ferramentas podem ser alcançadas a partir do menu lateral. Birthday=Aniversario @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Criação do projeto Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Número Ficheiros/Documentos anexos TotalSizeOfAttachedFiles=Tamanho Total dos Ficheiros/Documentos anexos MaxSize=Tamanho Máximo @@ -80,6 +80,16 @@ ModifiedBy=Modificado por %s ValidatedBy=Validado por %s CanceledBy=Anulado por %s ClosedBy=Fechado por %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=o Ficheiro foi eliminado DirWasRemoved=A pasta foi eliminada FeatureNotYetAvailableShort=Disponivel numa próxima versão @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Adicionar entrada ao calendario -NewCompanyToDolibarr=Empresa %s inserida em Dolibarr -ContractValidatedInDolibarr=Contrato %s validado em Dolibarr -ContractCanceledInDolibarr=Contrato %s anulado em Dolibarr -ContractClosedInDolibarr=Contracto %s fechado no Dolibarr -PropalClosedSignedInDolibarr=Orçamento %s assinado no Dolibarr -PropalClosedRefusedInDolibarr=Orçamento %s rejeitado no Dolibarr -PropalValidatedInDolibarr=orçamento %s validado em Dolibarr -InvoiceValidatedInDolibarr=Factura %s validada em Dolibarr -InvoicePaidInDolibarr=Factura %s pasada a paga em Dolibarr -InvoiceCanceledInDolibarr=Factura %s anulada em Dolibarr -PaymentDoneInDolibarr=Pagamento %s realizado em Dolibarr -CustomerPaymentDoneInDolibarr=Pagamento de cliente %s em Dolibarr -SupplierPaymentDoneInDolibarr=Pagamento a fornecedor %s em Dolibarr -MemberValidatedInDolibarr=Membro %s validado em Dolibarr -MemberResiliatedInDolibarr=Membro %s dado de baixa em Dolibarr -MemberDeletedInDolibarr=Membro %s eliminado de Dolibarr -MemberSubscriptionAddedInDolibarr=Subscrição do membro % adicionada em Dolibarr -ShipmentValidatedInDolibarr=%s embarque validado em Dolibarr -ShipmentDeletedInDolibarr=Envio %s eliminado do Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Exportação ExportsArea=Área de Exportações diff --git a/htdocs/langs/pt_PT/paybox.lang b/htdocs/langs/pt_PT/paybox.lang index a9829efe980..4a10107089e 100644 --- a/htdocs/langs/pt_PT/paybox.lang +++ b/htdocs/langs/pt_PT/paybox.lang @@ -33,5 +33,8 @@ CSSUrlForPaymentForm=CSS url folha de estilo para forma de pagamento MessageOK=Mensagem na página validado o pagamento de retorno MessageKO=Mensagem na página de pagamento cancelado retorno NewPayboxPaymentReceived=Novo pagamento Paybox recebido -# NewPayboxPaymentFailed=New Paybox payment tried but failed +NewPayboxPaymentFailed=New Paybox payment tried but failed PAYBOX_PAYONLINE_SENDEMAIL=E-mail de notificação após um pagamento (sucesso ou falha) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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..b4f6455d41d --- /dev/null +++ b/htdocs/langs/pt_PT/productbatch.lang @@ -0,0 +1,20 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Gerir lote/série +ProductStatusOnBatch=Gerido +ProductStatusNotOnBatch=Não Gerido +ProductStatusOnBatchShort=Gerido +ProductStatusNotOnBatchShort=Não Gerido +Batch=Lote/Série +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Número de Lote/Série +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Detalhes de Lote/Série +DetailBatchFormat=Lote/Série: %s - E:%s - S: %s (Qt. : %d) +printBatch=Lote: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qt.: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Não Definido +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. 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 new file mode 100644 index 00000000000..18177ed2c6a --- /dev/null +++ b/htdocs/langs/pt_PT/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Recursos +MenuResourceAdd=Novo recurso +MenuResourcePlanning=Resource planning +DeleteResource=Apagar recurso +ConfirmDeleteResourceElement=Confirme apagar o recurso para este elemento +NoResourceInDatabase=Nenhum recurso na base de dados +NoResourceLinked=Nenhum recurso interligado + +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=Recursos interligados ao elemento + +ShowResourcePlanning=Show resource planning +GotoDate=Ir para a data + +ResourceElementPage=Recursos do elemento +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Cartão de recurso +ConfirmDeleteResource=Confirme para apagar este recurso +RessourceSuccessfullyDeleted=Recurso apagado com sucesso +DictionaryResourceType=Tipo de recursos + +SelectResource=Selecione o recurso diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang index 7e5a7276994..5966b69f13b 100644 --- a/htdocs/langs/pt_PT/salaries.lang +++ b/htdocs/langs/pt_PT/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código da contabilidade para pagamentos de salário +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código da contabilidade para movimentos financeiros Salary=Salário Salaries=Salários Employee=Empregado @@ -6,3 +8,5 @@ NewSalaryPayment=Novo Pagamento de Salário SalaryPayment=Pagamento de Salário SalariesPayments=Pagamentos de Salários ShowSalaryPayment=Mostrar pagamento de salário +THM=Preço médio da hora +TJM=Preço médio diário diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang index 4418a84ae42..fa7ca1d6070 100644 --- a/htdocs/langs/pt_PT/sendings.lang +++ b/htdocs/langs/pt_PT/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=A criação de uma nova remessa é efectuada a p RelatedShippings=Envios relacionados ShipmentLine=Shipment line CarrierList=Lista de transportadores +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Capturas por cliente diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang index 12b843005da..df7fffc4016 100644 --- a/htdocs/langs/pt_PT/stocks.lang +++ b/htdocs/langs/pt_PT/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=A etiqueta do armazem é obrigatória CorrectStock=Corrigir Stock ListOfWarehouses=Lista de Armazens ListOfStockMovements=Lista de movimentos de stock -StocksArea=Área stocks +StocksArea=Warehouses area Location=Localização LocationSummary=Nome abreviado da localização NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang index 71a0ea1871d..cc64abc3155 100644 --- a/htdocs/langs/pt_PT/users.lang +++ b/htdocs/langs/pt_PT/users.lang @@ -1,121 +1,122 @@ # Dolibarr language file - Source file is en_US - users -HRMArea=HRM area +HRMArea=Área HRM UserCard=Ficha de Utilizador ContactCard=Ficha de Contacto GroupCard=Ficha de Grupo -NoContactCard=Não existe nenhuma ficha dos contactos +NoContactCard=Não existe nenhuma ficha de contactos Permission=Permissão Permissions=Permissões -EditPassword=Modificar Palavra-Passe -SendNewPassword=Enviar Nova Palavra-Passe -ReinitPassword=Gerar Nova Palavra-Passe -PasswordChangedTo=Palavra-Passe Modificada em: %s -SubjectNewPassword=A sua Palavra-Passe +EditPassword=Editar Palavra-passe +SendNewPassword=Regenerar e Enviar a Palavra-passe +ReinitPassword=Regenerar Palavra-passe +PasswordChangedTo=Palavra-passe alterada em: %s +SubjectNewPassword=A sua nova palavra-passe para o Dolibarr AvailableRights=Permissões Disponiveis OwnedRights=As Minhas Permissões GroupRights=Permissões de Grupo UserRights=Permissões de Utilizador UserGUISetup=Interface Utilizador -DisableUser=Desactivar -DisableAUser=Desactivar um Utilizador -DeleteUser=Eliminar -DeleteAUser=Eliminar um Utilizador -DisableGroup=Desactivar -DisableAGroup=Desactivar um Grupo -EnableAUser=Reactivar um Utilizador -EnableAGroup=Reactivar um Grupo -DeleteGroup=Eliminar -DeleteAGroup=Eliminar um Grupo -ConfirmDisableUser=Deseja mesmo desactivar o utilizador %s ? -ConfirmDisableGroup=Deseja mesmo desactivar o grupo %s ? -ConfirmDeleteUser=Deseja mesmo eliminar o utilizador %s ? -ConfirmDeleteGroup=Deseja mesmo eliminar o grupo %s ? -ConfirmEnableUser=Deseja mesmo reactivar o utilizador %s ? -ConfirmEnableGroup=Deseja mesmo reactivar o grupo %s ? -ConfirmReinitPassword=Deseja mesmo gerar uma nova palavra-passe para o utilizador %s ? -ConfirmSendNewPassword=Deseja mesmo enviar uma nova palavra-passe para o utilizador %s ? +DisableUser=Desativar +DisableAUser=Desativar um Utilizador +DeleteUser=Apagar +DeleteAUser=Apagar um Utilizador +DisableGroup=Desativar +DisableAGroup=Desativar um Grupo +EnableAUser=Ativar um Utilizador +EnableAGroup=Ativar um Grupo +DeleteGroup=Apagar +DeleteAGroup=Apagar um Grupo +ConfirmDisableUser=Deseja desativar o utilizador %s ? +ConfirmDisableGroup=Deseja desativar o grupo %s ? +ConfirmDeleteUser=Deseja apagaro utilizador %s ? +ConfirmDeleteGroup=Deseja apagar o grupo %s ? +ConfirmEnableUser=Deseja ativar o utilizador %s ? +ConfirmEnableGroup=Deseja ativar o grupo %s ? +ConfirmReinitPassword=Deseja gerar uma nova palavra-passe para o utilizador %s ? +ConfirmSendNewPassword=Deseja gerar uma e enviar uma nova palavra-passe para o utilizador %s ? NewUser=Novo Utilizador CreateUser=Criar Utilizador SearchAGroup=Procurar um Grupo SearchAUser=Procurar um Utilizador -LoginNotDefined=O Utilizador não está definido -NameNotDefined=O Nome não está definido +LoginNotDefined=Os dados de sessão não estão definidos +NameNotDefined=O nome não está definido. ListOfUsers=Lista de Utilizadores Administrator=Administrador -SuperAdministrator=Super Administrador -SuperAdministratorDesc=Administrador com todos os direitos -AdministratorDesc=Entidade administrador -DefaultRights=Permissões por Defeito -DefaultRightsDesc=Defina aqui as permissões por defeito: as permissões que se atribuirão automaticamente a um novo utilizador no momento de a sua criação. -DolibarrUsers=Utilizadores -LastName=Apelidos +SuperAdministrator=Administrador Avançado +SuperAdministratorDesc=Administrador Global +AdministratorDesc=Entidade Administrador +DefaultRights=Permissões Predefinidas +DefaultRightsDesc=Defina aqui as permissões predefinidas que são atribuídas automaticamente a um novo utilizador criado (Vá a 'ficha de utilizador' para alterar a permissão de um utilizador existente). +DolibarrUsers=Utilizadores do Dolibarr +LastName=Sobrenome FirstName=Nome ListOfGroups=Lista de Grupos NewGroup=Novo Grupo CreateGroup=Criar Grupo -RemoveFromGroup=Eliminar Grupo -PasswordChangedAndSentTo=Palavra-Passe alterada e enviada a %s. -PasswordChangeRequestSent=Pedido para alterar a palavra-passe para %s enviada a %s. +RemoveFromGroup=Apagar Grupo +PasswordChangedAndSentTo=Palavra-passe alterada e enviada para %s. +PasswordChangeRequestSent=Pedido para alterar a palavra-passe para %s enviada para %s. MenuUsersAndGroups=Utilizadores e Grupos LastGroupsCreated=Os %s últimos grupos criados LastUsersCreated=Os %s últimos utilizadores criados -ShowGroup=Ver grupo -ShowUser=Ver utilizador -NonAffectedUsers=Utilizadores não destinados ao grupo -UserModified=Utilizador correctamente modificado -GroupModified=Grupo %s Modificado -PhotoFile=Fotografia +ShowGroup=Mostrar Grupo +ShowUser=Mostrar Utilizador +NonAffectedUsers=Utilizadores não atribuídos +UserModified=Utilizador modificado com sucesso +PhotoFile=Ficheiro de Fotografia UserWithDolibarrAccess=Utilizador com acesso ao Dolibarr -ListOfUsersInGroup=Lista de Utilizadores deste grupo -ListOfGroupsForUser=Lista de grupos deste utilizador -UsersToAdd=Utilizador a Adicionar a este grupo -GroupsToAdd=Grupos a Adicionar a este utilizador +ListOfUsersInGroup=Lista de Utilizadores neste grupo +ListOfGroupsForUser=Lista de Grupos para este utilizador +UsersToAdd=Utilizador para adicionar a este grupo +GroupsToAdd=Grupos para adicionar a este utilizador NoLogin=Sem Utilizador -LinkToCompanyContact=Link para terceiros / contact -LinkedToDolibarrMember=Link para membro -LinkedToDolibarrUser=Link para o utilizador do Dolibarr -LinkedToDolibarrThirdParty=Link para Dolibarr terceiro -CreateDolibarrLogin=Criar uma Conta +LinkToCompanyContact=Hiperligação para terceiros / contacto +LinkedToDolibarrMember=Hiperligação para membro +LinkedToDolibarrUser=Hiperligação para o utilizador do Dolibarr +LinkedToDolibarrThirdParty=Hiperligação para terceiros do Dolibarr +CreateDolibarrLogin=Criar um Utilizador CreateDolibarrThirdParty=Criar um Terceiro -LoginAccountDisable=A conta está desactivada, indique um novo nome de utilizador para a activar. -LoginAccountDisableInDolibarr=A conta está desactivada no Dolibarr -LoginAccountDisableInLdap=A conta está desactivada ao dominio +LoginAccountDisable=A conta está desativada, indique um novo nome de utilizador para a ativar. +LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr. +LoginAccountDisableInLdap=A conta está desativada no domínio. UsePersonalValue=Utilizar valores personalizados -GuiLanguage=Idioma do Interface +GuiLanguage=Idioma da Interface InternalUser=Utilizador Interno MyInformations=A Minha Informação -ExportDataset_user_1=Utilizadores e Atributos -DomainUser=Utilizador de Domínio -Reactivate=Reactivar +ExportDataset_user_1=Utilizadores e Propriedades do Dolibarr +DomainUser=Utilizador de Domínio %s +Reactivate=Reativar CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. InternalExternalDesc=Um utilizador interno é um utilizador que pertenece à sua Empresa/Instituição.
    Um utilizador externo é um utilizador cliente, fornecedor ou outro.

    Nos 2 casos, as permissões de utilizadores definem os direitos de acesso, mas o utilizador externo pode além disso ter um gestor de menus diferente do utilizador interno (ver Inicio - configuração - visualização) PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertenece o utilizador. Inherited=Herdado -UserWillBeInternalUser=Usuário será criado um usuário interno (porque não ligada a um determinado partido terceiros) -UserWillBeExternalUser=Usuário será criado um usuário externo (porque ligado a um terceiro determinado) -IdPhoneCaller=ID chamador (telefone) +UserWillBeInternalUser=O utilizador criado irá ser um utilizador interno (porque não está interligado com um terceiro em particular) +UserWillBeExternalUser=O utilizador criado irá ser um utilizador externo (porque está interligado com um terceiro em particular) +IdPhoneCaller=Id. do Chamador (telefone) UserLogged=Utilizador %s Conectado UserLogoff=Terminar sessão de %s NewUserCreated=Utilizador %s Criado -NewUserPassword=Palavra-Passe alterada para %s +NewUserPassword=Palavra-passe alterada para %s EventUserModified=Utilizador %s Modificado -UserDisabled=Utilizador %s Desactivado -UserEnabled=Utilizador %s Activado -UserDeleted=Utilizador %s Eliminado +UserDisabled=Utilizador %s Desativado +UserEnabled=Utilizador %s Ativado +UserDeleted=Utilizador %s Removido NewGroupCreated=Grupo %s Criado -GroupModified=Grupo %s Modificado -GroupDeleted=Grupo %s Eliminado -ConfirmCreateContact=Tem a certeza que deseja criar uma conta para este contacto? -ConfirmCreateLogin=Tem a certeza que deseja criar uma conta para este membro? -ConfirmCreateThirdParty=Tem a certeza que deseja criar um terceiro para este membro? -LoginToCreate=Login a Criar +GroupModified=Grupo %s modificado +GroupDeleted=Grupo %s Removido +ConfirmCreateContact=Deseja criar uma conta Dolibarr para este contacto? +ConfirmCreateLogin=Deseja criar uma conta Dolibarr para este membro? +ConfirmCreateThirdParty=Deseja criar um terceiro para este membro? +LoginToCreate=Iniciar a sessão para Criar NameToCreate=Nome do Terceiro a Criar -YourRole=Seus papéis -YourQuotaOfUsersIsReached=A sua quota de utilizadores foi atingida! -NbOfUsers=N º de utilizadores +YourRole=As suas funções +YourQuotaOfUsersIsReached=A sua quota de utilizadores ativos foi atingida! +NbOfUsers=N º de Utilizadores DontDowngradeSuperAdmin=Apenas um superadmin pode desclassificar um superadmin -HierarchicalResponsible=Responsabilidade Hierárquica -HierarchicView=Vista Hierárquica -UseTypeFieldToChange=Use Tipo de Campo para mudar -OpenIDURL=Endereço OpenID -LoginUsingOpenID=Utilizar OpenID para autenticação +HierarchicalResponsible=Supervisor +HierarchicView=Visualização Hierárquica +UseTypeFieldToChange=Utilize o Tipo de Campo para alterar +OpenIDURL=URL de OpenID +LoginUsingOpenID=Utilizar OpenID para iniciar a sessão +WeeklyHours=Horas semanais +ColorUser=Cor do utilizador diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang index 5bc1e42766b..e227553e4c9 100644 --- a/htdocs/langs/pt_PT/withdrawals.lang +++ b/htdocs/langs/pt_PT/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Ordem LastWithdrawalReceipts=As %s últimas ordens de levantamento WithdrawedBills=Facturas de Levantamentos WithdrawalsLines=Linhas de Levantamento -RequestStandingOrderToTreat=Pedidos de Débitos Directos a Tratar -RequestStandingOrderTreated=Pedidos de Débitos Directos Processados +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Débitos Directos de Clientes CustomerStandingOrder=Débito Directo de Cliente NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Método de transmissão Send=Enviar Lines=Linhas StandingOrderReject=Emitir uma rejeição -InvoiceRefused=Factura Cliente, rejeitada WithdrawalRefused=Levantamento rejeitado WithdrawalRefusedConfirm=Tem certeza que quer entrar com uma rejeição de levantamento para a sociedade RefusedData=Data de rejeição RefusedReason=Motivo da rejeição RefusedInvoicing=Faturamento da rejeição NoInvoiceRefused=Sem factura Cliente, rejeitada -InvoiceRefused=Factura Cliente, rejeitada +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Estado StatusUnknown=Desconhecido StatusWaiting=Espera @@ -76,13 +76,14 @@ WithBankUsingRIB=Para contas bancárias usando RIB WithBankUsingBANBIC=Para contas bancárias usando IBAN / BIC / SWIFT BankToReceiveWithdraw=Conta bancária para receber levantamento CreditDate=Crédito em -WithdrawalFileNotCapable=Não foi possível gerar ficheiro de recibo do levantamento +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/pt_PT/workflow.lang b/htdocs/langs/pt_PT/workflow.lang index ffdad765793..fcc2d742259 100644 --- a/htdocs/langs/pt_PT/workflow.lang +++ b/htdocs/langs/pt_PT/workflow.lang @@ -6,6 +6,6 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar um pedido do cliente automaticamente, descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente, após uma proposta comercial ser assinada descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente depois de um contrato ser validado descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente após um pedido do cliente estar fechado -# 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=Classifique a fonte ligada como prposta a cobrança quando a ordem do cliente for definida como paga +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique a fonte ligada como cobrado quando a ordem(s) do cliente for definida como paga +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifique a fonte ligada a ordem(s) de clientes quando a fatura de cliente for validada diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang index 8cab9d2b651..784f5324381 100644 --- a/htdocs/langs/ro_RO/accountancy.lang +++ b/htdocs/langs/ro_RO/accountancy.lang @@ -1,158 +1,158 @@ # Dolibarr language file - en_US - Accounting Expert CHARSET=UTF-8 -Accounting=Accounting -Globalparameters=Global parameters -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years -Menuaccount=Accounting accounts -Menuthirdpartyaccount=Thirdparty accounts -MenuTools=Tools +Accounting=Contabilitate +Globalparameters=Parametri globali +Chartofaccounts=Plan de conturi +Fiscalyear=Ani fiscali +Menuaccount=Conturi contabile +Menuthirdpartyaccount=Conturi terţi +MenuTools=Instrumente -ConfigAccountingExpert=Configuration of the module accounting expert -Journaux=Journals -JournalFinancial=Financial journals -Exports=Exports -Modelcsv=Model of export -Selectmodelcsv=Select a model of export +ConfigAccountingExpert=Configurare modul expert contabil +Journaux=Jurnale +JournalFinancial=Jurnale financiale +Exports=Exporturi +Modelcsv=Model export +Selectmodelcsv=Selectează un model de export Modelcsv_normal=Classic export -Modelcsv_CEGID=Export towards CEGID Expert -BackToChartofaccounts=Return chart of accounts +Modelcsv_CEGID=Export către CEGID Expert +BackToChartofaccounts=Înapi la plan de conturi Back=Return -Definechartofaccounts=Define a chart of accounts -Selectchartofaccounts=Select a chart of accounts -Validate=Validate -Addanaccount=Add an accounting account -AccountAccounting=Accounting account -Ventilation=Ventilation -ToDispatch=To dispatch -Dispatched=Dispatched +Definechartofaccounts=Defineşte un plan de conturi +Selectchartofaccounts=Selectează un plan de conturi +Validate=Validează +Addanaccount=Add un cont contabil +AccountAccounting=Cont contabil +Ventilation=Ventilare +ToDispatch=De ventilat +Dispatched=Ventilat -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers -TradeMargin=Trade margin -Reports=Reports -ByCustomerInvoice=By invoices customers -ByMonth=By Month -NewAccount=New accounting account -Update=Update +CustomersVentilation=Ventilare clienţi +SuppliersVentilation=Ventilare furnizori +TradeMargin=Marjă comercială +Reports=Rapoarte +ByCustomerInvoice=Pe facturi clienţi +ByMonth=Pe lună +NewAccount=Cont contabil nou +Update=Modifică List=List -Create=Create -UpdateAccount=Modification of an accounting account -UpdateMvts=Modification of a movement -WriteBookKeeping=Record accounts in general ledger -Bookkeeping=General ledger -AccountBalanceByMonth=Account balance by month +Create=Crează +UpdateAccount=Modificare cont contabil +UpdateMvts=Modificare mişcare +WriteBookKeeping=Înregistrare contabilă in Cartea Mare +Bookkeeping=Cartea Mare +AccountBalanceByMonth=Sold pe luni -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer -Line=Line +AccountingVentilation=Ventilare contabilă +AccountingVentilationSupplier=Ventilare contabila furnizor +AccountingVentilationCustomer=Ventilare contabila client +Line=Linie -CAHTF=Total purchase supplier HT -InvoiceLines=Lines of invoice to be ventilated -InvoiceLinesDone=Ventilated lines of invoice -IntoAccount=In the accounting account +CAHTF=Total cumpărări furnizor fara taxe +InvoiceLines=Liniile facturii de ventilat +InvoiceLinesDone=Liniile facturii ventilate +IntoAccount=În conturi contabile -Ventilate=Ventilate -VentilationAuto=Automatic ventilation +Ventilate=Ventilează +VentilationAuto=Ventilare automată -Processing=Processing -EndProcessing=The end of processing -AnyLineVentilate=Any lines to ventilate -SelectedLines=Selected lines -Lineofinvoice=Line of invoice -VentilatedinAccount=Ventilated successfully in the accounting account -NotVentilatedinAccount=Not ventilated in the accounting account +Processing=Procesează +EndProcessing=Sfârşitul procesării +AnyLineVentilate=Nicio linie de ventilat +SelectedLines=Linii selectate +Lineofinvoice=Linia facturii +VentilatedinAccount=Ventilare cu succes in conturi contabile +NotVentilatedinAccount=Ne ventilate in conturi contabile ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Numărul de elemente de ventilat afişat pe pagină (maxim recomandat: 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Începe sortarea paginilor ventilate "Trebuie ventilate" începand cu cele mai recente elemente +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Începe sortarea paginilor ventilate "Ventilare" începand cu cele mai recente elemente -AccountLength=Length of the accounting accounts shown in Dolibarr -AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts +AccountLength=Lungimea conturilor contabile afişate în Dolibarr +AccountLengthDesc=Funcția pentru a simula lungirea unui cont contabil prin înlocuirea spatiile libere cu cifra zero. Această funcție afectează numai afişarea , aceasta nu va schimba conturile contabile înregistrate în Dolibarr. Pentru export, această funcţie este necesară să fie compatibil cu unele software-ul +ACCOUNTING_LENGTH_GACCOUNT=Lungimea conturilor generale +ACCOUNTING_LENGTH_AACCOUNT=Lungimea conturilor de terţi -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal -ACCOUNTING_CASH_JOURNAL=Cash journal -ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTING_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Jurnal vânzări +ACCOUNTING_PURCHASE_JOURNAL=Jurnal cumpărări +ACCOUNTING_BANK_JOURNAL=Jurnal bancă +ACCOUNTING_CASH_JOURNAL=Jurnal casă +ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal Diverse +ACCOUNTING_SOCIAL_JOURNAL=Jurnal Asigurări Sociale -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cont transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Cont contabil de aşteptare -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru produsele cumpărate(dacă nu este definit în fişa produsului) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru produsele vândute (dacă nu este definit în fişa produsului) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru serviciile cumpărate(dacă nu este definit în fişa produsului) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru serviciilor vândute(dacă nu este definit în fişa produsului) -Doctype=Type of document -Docdate=Date -Docref=Reference -Numerocompte=Account -Code_tiers=Thirdparty -Labelcompte=Label account +Doctype=Tipul documentului +Docdate=Data +Docref=Referinţă +Numerocompte=Cont +Code_tiers=Terţ +Labelcompte=Etichetă cont Debit=Debit Credit=Credit -Amount=Amount +Amount=Sumă Sens=Sens Codejournal=Journal -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Şterge înregistrări din Cartea Mare -SellsJournal=Sells journal -PurchasesJournal=Purchases journal -DescSellsJournal=Sells journal -DescPurchasesJournal=Purchases journal -BankJournal=Bank journal -DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Cash journal -DescCashJournal=Cash journal including the type of payment cash +SellsJournal=Jurnal Vânzări +PurchasesJournal=Jurnal Cumpărări +DescSellsJournal=Jurnal Vânzări +DescPurchasesJournal=Jurnal Cumpărări +BankJournal=Jurnal Bancă +DescBankJournal=Jurnal Banca inclusiv toate tipurile plaţilor altele decat numerar +CashJournal=Jurnal Casă +DescCashJournal=Jurnal Cash inclusiv tipul plaţii numerar -CashPayment=Cash Payment +CashPayment=Plaţi numerar -SupplierInvoicePayment=Payment of invoice supplier -CustomerInvoicePayment=Payment of invoice customer +SupplierInvoicePayment=Plata factura furnizor +CustomerInvoicePayment=Incasare factura client -ThirdPartyAccount=Thirdparty account +ThirdPartyAccount=Cont terţi -NewAccountingMvt=New movement -NumMvts=Number of movement -ListeMvts=List of the movement -ErrorDebitCredit=Debit and Credit cannot have a value at the same time +NewAccountingMvt=Transfer nou +NumMvts=Numarul transferurilor +ListeMvts=Lista transferurilor +ErrorDebitCredit=Debitul și creditul nu pot avea o valoare, în același timp, -ReportThirdParty=List thirdparty account -DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts +ReportThirdParty=Lista Conturi terţi +DescThirdPartyReport=Consultati aici lista terţilor furnizori și clienţi şi conturile lor contabile -ListAccounts=List of the accounting accounts +ListAccounts=Lista conturilor contabile -Pcgversion=Version of the plan -Pcgtype=Class of account -Pcgsubtype=Under class of account -Accountparent=Root of the account -Active=Statement +Pcgversion=Versiunea planului +Pcgtype=Clasa contului +Pcgsubtype=Sub Clasa contului +Accountparent=Rădăcina contului +Active=Extras -NewFiscalYear=New fiscal year +NewFiscalYear=An fiscal nou -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers -TotalVente=Total turnover HT -TotalMarge=Total sales margin -DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account -DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account -ChangeAccount=Change the accounting account for lines selected by the account: +DescVentilCustomer=Consultati aici ventilarea contabilă anuală a facturilor de clienților ale dvs. +TotalVente=Total Cifră de afaceri fără tva +TotalMarge=Total Marje vânzări +DescVentilDoneCustomer=Consultati aici lista liniilor de facturi client și conturile lor contabile +DescVentilTodoCustomer=Consultati aici lista liniilor de facturi client cu un cont contabil +ChangeAccount=Schimbaţi contul contabil pentru liniile selectate prin contul: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers -DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account -DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account +DescVentilSupplier=Consultati aici ventilarea contabilă anuală a facturilor de furnizori ale dvs. +DescVentilTodoSupplier=Consultati aici lista liniilor de facturi furnizor cu un cont contabil +DescVentilDoneSupplier=Consultati aici lista liniilor de facturi furnizor și conturile lor contabile -ValidateHistory=Validate Automatically +ValidateHistory=Validează automat -ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used +ErrorAccountancyCodeIsAlreadyUse=Eroare, nu puteți șterge acest cont contabil, deoarece este folosit -FicheVentilation=Ventilation card +FicheVentilation=Fişă Ventilare diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index 56532fcc85e..a0d02d59e15 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - admin -Foundation=Fundaţie +Foundation=Fundaţie\n Version=Versiune VersionProgram=Versiune program VersionLastInstall=Versiune iniţial instalată @@ -34,7 +34,7 @@ InternalUsers=Utilizatori interni ExternalUsers=Utilizatori externi GlobalSetup=Setări generale GUISetup=Afişare -SetupArea=Zona Configurare +SetupArea=CONFIGURARE FormToTestFileUploadForm=Formular pentru testarear încărcării de fişiere (în funcţie de configurare) IfModuleEnabled=Notă: Da este eficient numai dacă modul %s este activat RemoveLock=Eliminaţi fişierul %s dacă acesta există, pentru a permite utilizarea instrumentelor de actualizare. @@ -49,13 +49,15 @@ Chartofaccounts=Plan de conturi Fiscalyear=Ani fiscali ErrorReservedTypeSystemSystemAuto=Valorile 'system' și 'systemauto' pentru tip sunt rezervate. Puteți utiliza 'user' ca valoare pentru a adăuga propriile dvs. înregistrări ErrorCodeCantContainZero=Codul nu poate conţine valoarea 0 -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=Dezactivează funcţiile JavaScript si Ajax (Recomandat pentru persoanele oarbe sau browserele text ) ConfirmAjax=Utilizaţi pop-up de confirmare Ajax -UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. +UseSearchToSelectCompanyTooltip= 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. +UseSearchToSelectCompany=Utilizați autocompletarea câmpurilor pentru alegerea terţilor în loc de a folosi o casetă listă. ActivityStateToSelectCompany= Adaugă o opţiune de filtru pentru a afişa / ascunde thirdparties, care sunt în prezent în activitate sau le-a încetat -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). +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 @@ -68,7 +70,7 @@ PreviewNotAvailable=Preview nu este disponibil ThemeCurrentlyActive=Tema activă în prezent CurrentTimeZone=TimeZone PHP (server) MySQLTimeZone=TimeZone MySql (database) -TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). +TZHasNoEffect=Datele sunt stocate și returnate de către serverul de baze de date ca și în cazul în care au fost păstrate ca șiruri transmise. Timezone are efect numai atunci când se utilizează funcția UNIX_TIMESTAMP (care nu ar trebui să fie utilizate de către Dolibarr, astfel TZ al bazei de date ar trebui să aibă nici un efect, chiar dacă sa schimbat după ce a fost introduse date). Space=Spaţiu Table=Tabel Fields=Câmpuri @@ -125,15 +127,15 @@ 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 YouCanEditPHPTZ=Pentru a seta un alt fus orar PHP (nu este obligatoriu), aveți posibilitatea să încercați să adăugați la fișierul .htacces cu o linie de genul acesta"SetEnv TZ Europe/Paris" OSEnv=Mediu SO Box=Căsuţă -Boxes=Căsuţe -MaxNbOfLinesForBoxes=Max numărul de linii pentru căsuţe +Boxes= Casete +MaxNbOfLinesForBoxes=Numărul max de linii pentru casete PositionByDefault=Poziţia implicită Position=Poziţie MenusDesc=Meniuri manageri definesc conţinutul de 2 bare de meniu (bara orizontală şi bară verticală). @@ -143,7 +145,7 @@ LangFile=Fişiere. Lang System=Sistem SystemInfo=Informaţii Sistem SystemTools=Instrumente Sistem -SystemToolsArea=Zona Instrumente Sistem +SystemToolsArea=Instrumente Sistem SystemToolsAreaDesc=Această zonă oferă funcţionalităţi de administrare. Folositi meniul pentru a alege funcţionalitatea pe care o căutaţi. Purge=Curăţenie PurgeAreaDesc=Această pagină vă permite să ştergeţi toate fişierele construit sau stocate de către Dolibarr (fişiere temporare sau toate fişierele în directorul %s). Folosind această facilitate nu este necesar. Este prevăzut pentru utilizatorii ale căror Dolibarr este găzduit de un furnizor care nu oferă permisiuni pentru a şterge fişierele construit de către serverul de web. @@ -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 @@ -199,7 +201,7 @@ No=Nu AutoDetectLang=Autodetect (browser limbă) FeatureDisabledInDemo=Funcţonalitate dezactivată în demo Rights=Permisiuni -BoxesDesc=Căsuţele sunt arii de ecran care arată unele informaţii pe unele pagini. Aveţi posibilitatea să alegeţi afişarea sau nu a căsuţelor, prin selectarea pagini ţintă şi faceţi clic pe "Activaţi", sau făcând clic pe un coş de gunoi pentru al dezactiva. +BoxesDesc=Casetele sunt arii de ecran care arată unele informaţii pe unele pagini. Aveţi posibilitatea să alegeţi afişarea sau nu a casetelor prin selectarea pagini ţintă şi faceţi clic pe "Activaţi", sau făcând clic pe un coş de gunoi pentru al dezactiva. OnlyActiveElementsAreShown=Numai elementele din module activate sunt afişate. ModulesDesc=Dolibarr modulele care definesc funcţia este activată în software-ul. Unele module necesită permisiuni, trebuie să acorde pentru utilizatori, după care să permită modul. ModulesInterfaceDesc=De Dolibarr module de interfaţă vă permite să adăugaţi caracteristici externe, în funcţie de software, sisteme sau servicii. @@ -208,10 +210,11 @@ 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 -BoxesActivated=Căsuţe activate +BoxesAvailable= Casete disponibile +BoxesActivated= Casete activate ActivateOn=Activaţi pe ActiveOn=Activat pe SourceFile=Fişier sursă @@ -219,7 +222,7 @@ AutomaticIfJavascriptDisabled=Automat dacă Javascript este dezactivat AvailableOnlyIfJavascriptNotDisabled=Disponibil numai dacă nu este dezactivat JavaScript AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponibil numai dacă nu este dezactivat JavaScript Required=Solicitat -UsedOnlyWithTypeOption=Used by some agenda option only +UsedOnlyWithTypeOption=Folosit numai de unele optiuni agenda Security=Securitate Passwords=Parolele DoNotStoreClearPassword=Nu stoca parole în mod clar în baza de date @@ -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 @@ -238,7 +241,7 @@ OfficialWebSiteFr=Site-ul web oficial francofon OfficialWiki=Dolibarr Wiki OfficialDemo=Dolibarr demo online OfficialMarketPlace=Oficial loc pe piaţă pentru modulelor externe / addons -OfficialWebHostingService=Referenced web hosting services (Cloud hosting) +OfficialWebHostingService=Referinţă Servicii de web hosting (Cloud hosting) ReferencedPreferredPartners=Parteneri preferati OtherResources=Alte Resurse ForDocumentationSeeWiki=Pentru utilizator sau developer documentaţia (doc, FAQs ...),
    aruncăm o privire la Dolibarr Wiki:
    %s @@ -260,21 +263,21 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-gazdă (Nu este definită în MAIN_MAIL_EMAIL_FROM=Expeditor de e-mail pentru mesajele de poştă electronică automată (în mod implicit în php.ini: %s) MAIN_MAIL_ERRORS_TO=Expeditor de e-mail folosită pentru e-mailurile trimise de eroare se întoarce MAIN_MAIL_AUTOCOPY_TO= Trimite un mod sistematic ascunse carbon copie a tuturor e-mailuri trimise la -MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to -MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to -MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Trimite sistematic un CC ascuns cu ofertele trimise prin e-mail la +MAIN_MAIL_AUTOCOPY_ORDER_TO= Trimite sistematic un CC ascuns cu comenzile trimise prin e-mail la +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Trimite sistematic un CC ascuns cu facturile trimise prin e-mail la MAIN_DISABLE_ALL_MAILS=Dezactivaţi toate e-mail-uri sendings (pentru scopuri de testare sau demo) MAIN_MAIL_SENDMODE=Metoda de a folosi pentru a trimite email-uri 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 @@ -302,7 +305,7 @@ CurrentVersion=Dolibarr versiunea curentă CallUpdatePage=Du-te la pagina care se actualizează datele şi structura bazei de date %s. LastStableVersion=Ultima versiune stabilă GenericMaskCodes=Puteți introduce orice mască de numerotare. În această mască, ar putea fi folosit următoarele etichete:
    {000000} corespunde unui număr care va fi incrementat pe fiecare% s. Introduceți cât mai multe zerouri ca lungimea dorită a contra. Contorul va fi completat cu zerouri la stânga, în scopul de a avea cât mai multe zerouri ca masca.
    {000000} +000 fel ca și anterior, dar o compensare corespunzător cu numărul din dreapta semnului + se aplică începând cu prima% s.
    {000000 @ x} fel ca și anterior, dar contorul este resetat la zero atunci când se ajunge la o lună x (x între 1 și 12, sau 0 pentru a folosi primele luni ale anului fiscal definite în configurația dvs., sau 99 pentru a reseta la zero în fiecare lună ). Dacă această opțiune este folosită și x este 2 sau mai mare, atunci secvența {aa} {mm} sau {AAAA} {mm} este de asemenea necesară.
    {Dd} zi (01 la 31).
    {Mm} luni (01 la 12).
    {AA}, {AAAA} sau {y} an peste 2, 4 sau 1 numere.
    -GenericMaskCodes2={cccc} the client code on n characters
    {cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
    {tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
    +GenericMaskCodes2={Cccc} codul de client pe n caractere
    {Cccc000} codul de client pe n caractere este urmată de un contor dedicat pentru client. Acest contor dedicat clientului este resetat în același timp de contor global.
    {tttt}Tipul codului terţului pe n caractere (a se vedea tipurile dicționarului-terţi).
    GenericMaskCodes3=Toate celelalte caractere în masca va rămâne intactă.
    Spaţiile nu sunt permise.
    GenericMaskCodes4a=Exemplu pe 99th %s de-a treia parte TheCompany făcut 2007-01-31:
    GenericMaskCodes4b=Exemplu de la o terţă parte a creat pe 2007-03-01:
    @@ -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. @@ -349,7 +352,7 @@ SecurityToken=Cheia pentru URL-uri sigure NoSmsEngine=Nu expeditor SMS Manager disponibile. SMS expeditor manager nu sunt instalate implicit cu distribuţia (deoarece depinde de un furnizor extern), dar puteţi găsi unele pe http://www.dolistore.com PDF=PDF PDFDesc=Puteţi seta opţiunile de fiecare globale referitoare la generarea PDF -PDFAddressForging=Reguli de a forma cutii de adrese +PDFAddressForging=Reguli de creare a casetelor adresa HideAnyVATInformationOnPDF=Ascunde toate informaţiile referitoare la TVA-ul pe PDF generate HideDescOnPDF=Ascunde descrierea produselor pe PDF ul generat HideRefOnPDF=Ascunde ref. produs pe PDF ul generat @@ -374,18 +377,18 @@ Boolean=Boolean (Checkbox) ExtrafieldPhone = Telefon ExtrafieldPrice = Preţ ExtrafieldMail = Email -ExtrafieldSelect = Listă Select +ExtrafieldSelect = Select Listă ExtrafieldSelectList = Select din tabel ExtrafieldSeparator=Separator ExtrafieldCheckBox=Checkbox ExtrafieldRadio=Radio buton -ExtrafieldParamHelpselect=Parameters list have to be like key,value

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

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

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

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

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

    In order to have the list depending on another :
    c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpselect=Lista de parametri trebuie să fie ca cheie, valoare

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

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

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

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

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

    În scopul de avea lista depinzând de alta :
    c_typent:libelle:id:parent_list_code|parent_column:filter LibraryToBuildPDF=Librairie utilizată la construirea PDF ului WarningUsingFPDF=Atenție: conf.php contine Directiva dolibarr_pdf_force_fpdf = 1. Acest lucru înseamnă că utilizați biblioteca FPDF pentru a genera fișiere PDF. Această bibliotecă este vechi și nu suportă o mulțime de caracteristici (Unicode, transparența imagine, cu litere chirilice, limbi arabe și asiatice, ...), astfel încât este posibil să apară erori în timpul generație PDF.
    Pentru a rezolva acest lucru și au un suport complet de generare PDF, vă rugăm să descărcați biblioteca TCPDF , atunci comentariu sau elimina linia $ dolibarr_pdf_force_fpdf = 1, și se adaugă în schimb $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' -LocalTaxDesc=Unele țări aplică 2 sau 3 impozitele la fiecare linie de factura. Dacă este cazul, alege tipul de al doilea și al treilea de taxă și ratele lor. Tipuri posibile sunt:
    1: Taxa hoteliera se aplică pe produse și servicii, fără TVA (TVA nu este aplicată la taxa locala)
    2: taxa locala aplica pe produse și servicii fără TVA (TVA-ul este calculat la suma + localtax)
    3: Taxa locală se aplică la produsele fara TVA (TVA nu se aplică la taxa locala)
    4: Taxa locală se aplică la produsele fără TVA (TVA-ul este calculat la suma + localtax)
    5: Taxa locală se aplică pe servicii fara TVA (TVA nu este aplicată la taxa locala)
    6: TTaxa locală se aplică pe servicii fără TVA (TVA-ul este calculat la suma + localtax) +LocalTaxDesc=Unele țări aplică 2 sau 3 impozite la fiecare linie de factura. Dacă este cazul, alege tipul al doilea și al treilea de taxă și ratele lor. Tipuri posibile sunt:
    1: Taxa hoteliera se aplică pe produse și servicii, fără TVA (TVA nu este aplicată la taxa locala)
    2: taxa locala pe produse și servicii fără TVA (TVA-ul este calculat la suma + localtax)
    3: Taxa locală se aplică la produsele fara TVA (TVA nu se aplică la taxa locala)
    4: Taxa locală se aplică la produsele fără TVA (TVA-ul este calculat la suma + localtax)
    5: Taxa locală se aplică pe servicii fara TVA (TVA nu este aplicată la taxa locala)
    6: Taxa locală se aplică pe servicii fără TVA (TVA-ul este calculat la suma + localtax) SMS=SMS LinkToTestClickToDial=Introduceți un număr de telefon pentru a afișa un link de test ClickToDial Url pentru utilizatorul%s RefreshPhoneLink=Refresh link @@ -394,15 +397,15 @@ KeepEmptyToUseDefault=Lasă gol pentru utilizarea valorii implicite DefaultLink=Link implicit ValueOverwrittenByUserSetup=Atenție, această valoare poate fi suprascrisă de setările specifice utilizatorului (fiecare utilizator poate seta propriul url clicktodial) ExternalModule=Modul extern - instalat în directorul %s -BarcodeInitForThirdparties=Mass barcode init for thirdparties -BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services -CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined. -InitEmptyBarCode=Init value for next %s empty records -EraseAllCurrentBarCode=Erase all current barcode values -ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ? -AllBarcodeReset=All barcode values have been removed -NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup. -NoRecordWithoutBarcodeDefined=No record with no barcode value defined. +BarcodeInitForThirdparties=Init cod de bare în masă pentru terţi +BarcodeInitForProductsOrServices=Init sau reset cod de bare în masă pentru produse şi servicii +CurrentlyNWithoutBarCode=În prezent, aveți %s înregistări pe %s %s fără cod de bare definit. +InitEmptyBarCode=Valoare inițializare pentru următoarele %s înregistrări goale +EraseAllCurrentBarCode=Ștergeți toate valorile curente de coduri de bare +ConfirmEraseAllCurrentBarCode=Sunteți sigur că doriți să ștergeți toate valorile curente ale codurilor de bare? +AllBarcodeReset=Toate valorile codurilor de bare au fost eliminate +NoBarcodeNumberingTemplateDefined=Niciun model numeric de cod de bare disponibil in configurarea modulului cod de bare +NoRecordWithoutBarcodeDefined=Nicio înregistrare fără cod de bare definit # Modules Module0Name=Utilizatori & grupuri @@ -413,8 +416,8 @@ Module2Name=Comercial Module2Desc=Management Comercial Module10Name=Contabilitate Module10Desc=Contabilitate simplă de gestiune ( jurnale , cifră afaceri) bazată pe baza de date. Fără ventilare. -Module20Name=Propuneri comerciale -Module20Desc=Managementul Propunerilor Comerciale +Module20Name=Oferte +Module20Desc=Managementul Ofertelor Comerciale Module22Name=Emailing Module22Desc=Managementul trimiterilor de emailuri în masă Module23Name= Energie @@ -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=Contracte -Module54Desc=Managementul Contractele şi service-urilor +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,16 +478,16 @@ Module320Name=Feed RSS Module320Desc=Adauga RSS feed interiorul Dolibarr ecran pagini Module330Name=Marcaje Module330Desc=Marcaje "de gestionare a -Module400Name=Proiecte -Module400Desc=Proiecte de gestionare în interiorul alte module +Module400Name=Proiecte / Oportunitati / Prospecți +Module400Desc=Managementul de proiecte, oportunități sau potențiali. Puteți, apoi, atribui apoi orice element (factură, comandă, ofertă, intervenție, ...), la un proiect și a obține o vedere transversală din punctul de vedere al proiectului. Module410Name=Webcalendar Module410Desc=Webcalendar integrare -Module500Name=Special expenses (tax, social contributions, dividends) -Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries +Module500Name=Cheltuieli speciale( taxe, contributii sociale, dividende) +Module500Desc=Managementul cheltuielilor speciale cum ar fi taxele , contribuţiile sociale, dividendele si salariile Module510Name=Salarii -Module510Desc=Management of employees salaries and payments +Module510Desc=Managementul salariilor angajatilor si a plaţiilor Module600Name=Notificări -Module600Desc=Trimite notificări (prin e-mail) pe Dolibarr de afaceri evenimente +Module600Desc=Trimite notificări prin email la unele evenimente de afaceri Dolibarr la contactele terților (configurare definită pe fiecare terţ) Module700Name=Donatii Module700Desc=MAnagementul Donaţiilor Module1200Name=Mantis @@ -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 @@ -514,42 +521,42 @@ Module5000Name=Multi-societate Module5000Desc=Vă permite să administraţi mai multe companii Module6000Name=Flux de lucru Module6000Desc=Managementul fluxului de lucru -Module20000Name=Concedii -Module20000Desc=Declară şi urmăreşte concediile angajaţilor -Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module20000Name=Managementul cererilor de concedii +Module20000Desc=Declară şi urmăreşte cererile de concedii ale angajaţilor +Module39000Name=Lot Produs +Module39000Desc=Management Număr lot sau număr de serie , data de expirare şi vânzare pentru produse Module50000Name=Paybox Module50000Desc=Modul de a oferi o pagina de plata online prin card de credit cu Paybox Module50100Name=Punct de Vanzare Module50100Desc=Modul Punct de Vanzare -Module50200Name= PayPal -Module50200Desc= Modul de a oferi o pagina de plata online prin card de credit cu Paypal +Module50200Name=PayPal +Module50200Desc=Modul de a oferi o pagina de plata online prin card de credit cu Paypal Module50400Name=Contabilitate (avansat) Module50400Desc=Management Contabilitate (partidă dublă) Module54000Name=Print lP IPrinter -Module54000Desc=Printează prin serviciul Cups cu ajutorul imprimantei IPP -Module55000Name=Open Poll -Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) +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 Module59000Desc=Modul management marje Module60000Name=Comisioane Module60000Desc=Modul management comisioane -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product +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 -Permission21=Citeşte comerciale propuneri -Permission22=Creare / Modificare comerciale propuneri -Permission24=Validate comerciale propuneri -Permission25=Trimite comerciale propuneri -Permission26=Inchide comerciale propuneri -Permission27=Ştergere comerciale propuneri -Permission28=Export comerciale propuneri +Permission21=Citeşte oferte comerciale +Permission22=Creare / Modificare oferte comerciale +Permission24=Oferte comerciale validate +Permission25=Trimite oferte comerciale +Permission26=Inchide oferte comerciale +Permission27=Ştergere oferte comerciale +Permission28=Export oferte comerciale Permission31=Citiţi cu produse / servicii Permission32=Creare / Modificare produse / servicii Permission34=Ştergere produse / servicii @@ -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,15 +613,16 @@ 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=Citeşte contracte -Permission162=Creare / Modificare contracte -Permission163=Activaþi un serviciu de un contract -Permission164=Dezactivare a unui serviciu de un contract -Permission165=Ştergere contracte -Permission171=Citeşte excursii -Permission172=Creare / Modificare excursii -Permission173=Ştergere ordin de deplasare -Permission178=Export excursii +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 +Permission174=Citeşte toate ordinele de deplasare şi cheltuieli +Permission178=Export ordin de deplasare şi cheltuieli Permission180=Citiţi cu furnizorii Permission181=Citeşte furnizor ordinelor Permission182=Creare / Modificare furnizor ordinelor @@ -671,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=Atribui contractul de servicii pentru a +Permission312=Atribuire serviciu / abonament la contract Permission331=Citiţi cu marcaje Permission332=Creare / Modificare marcaje Permission333=Ştergeţi marcaje @@ -697,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=Creare / Modificare stocuri -Permission1003=Ştergere stocuri +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 @@ -749,38 +757,39 @@ Permission50101=Utilizează Point of Sales Permission50201=Citeşte tranzacţii Permission50202=Tranzacţiilor de import Permission54001=Printare -Permission55001=Read polls -Permission55002=Create/modify polls -Permission59001=Read commercial margins -Permission59002=Define commercial margins +Permission55001=Cieşte sondaje +Permission55002=Creare / Modificare sondaje +Permission59001=Citeşte marje comerciale +Permission59002=Defineşte marje comerciale DictionaryCompanyType=Tip Terţ -DictionaryCompanyJuridicalType=Juridical kinds of thirdparties -DictionaryProspectLevel=Prospect potential level +DictionaryCompanyJuridicalType=Tipuri juridice terţi +DictionaryProspectLevel=Nivel potenţial Prospect DictionaryCanton=Stat/Judeţ DictionaryRegion=Regiuni DictionaryCountry=Ţări DictionaryCurrency=Monede DictionaryCivility=Mod adresare -DictionaryActions=Type of agenda events -DictionarySocialContributions=Social contributions types -DictionaryVAT=VAT Rates or Sales Tax Rates -DictionaryRevenueStamp=Amount of revenue stamps +DictionaryActions=Tip evenimente agenda +DictionarySocialContributions=Tipuri Contribuţii sociale +DictionaryVAT=Cote TVA sau Cote Taxe Vanzări +DictionaryRevenueStamp=Valoarea timbrelor fiscale DictionaryPaymentConditions=Conditiile de plata DictionaryPaymentModes=Moduri plată -DictionaryTypeContact=Contact/Address types +DictionaryTypeContact=Tipuri Contact/adresă DictionaryEcotaxe=Ecotax (DEEE) -DictionaryPaperFormat=Paper formats +DictionaryPaperFormat=Formate hârtie DictionaryFees=Tip de taxe -DictionarySendingMethods=Shipping methods +DictionarySendingMethods=Metode Livrare DictionaryStaff=Efectiv -DictionaryAvailability=Delivery delay -DictionaryOrderMethods=Ordering methods -DictionarySource=Origin of proposals/orders +DictionaryAvailability=Livrare întârziere +DictionaryOrderMethods=Metode de comandă +DictionarySource=Originea ofertei / comenzi DictionaryAccountancyplan=Plan de conturi -DictionaryAccountancysystem=Models for chart of accounts +DictionaryAccountancysystem=Model pentru plan de conturi +DictionaryEMailTemplates=Șabloane e-mailuri SetupSaved=Setup salvate BackToModuleList=Inapoi la lista de module -BackToDictionaryList=Back to dictionaries list +BackToDictionaryList=Inapoi la lista de dicţionare VATReceivedOnly=Special rata nu taxat VATManagement=TVA-ul de management VATIsUsedDesc=Rata TVA implicită la crearea de prospecte, facturi, comenzi etc urmeze regula standard de activare:
    În cazul în care vânzătorul nu este supusă TVA-ului, apoi TVA-ul implicit = 0. Sfârșitul regulă.
    În cazul în care (țara de vânzare = cumpărare țară), atunci TVA-ul implicit = TVA a produsului în țara de vânzare. Sfârșitul regulă.
    În cazul în care vânzătorul și cumpărătorul în Comunitatea Europeană și bunuri sunt produse de transport (mașină, navă, avion), implicit TVA = 0 (TVA ar trebui să fie plătite de către cumpărător la customoffice de țara sa și nu la vânzător). Sfârșitul regulă.
    În cazul în care vânzătorul și cumpărătorul în Comunitatea Europeană și cumpărător nu este o companie, atunci TVA-ul implicit = TVA de produs vândut. Sfârșitul regulă.
    În cazul în care vânzătorul și cumpărătorul în Comunitatea Europeană și cumpărător este o companie, atunci TVA-ul implicit = 0. Sfârșitul regulă.
    Altfel propus implicit TVA = 0. Sfârșitul regulă. @@ -815,11 +824,11 @@ LocalTax2IsUsedExampleES= În Spania, liber profesionişti şi specialişti inde LocalTax2IsNotUsedExampleES= În Spania nu sunt afaceri care fac obiectul sistemului de impozitare de module. CalcLocaltax=Rapoarte CalcLocaltax1ES=Vânzări - Cumpârări -CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases +CalcLocaltax1Desc=Rapoarte Taxe Locale este calcult ca diferenţă dintre taxele locale de vanzare şi taxele locale de cumparare CalcLocaltax2ES=Achiziţii -CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases +CalcLocaltax2Desc=Rapoarte Taxe Locale este totalul taxelor locale de cumpărare CalcLocaltax3ES=Vânzări -CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales +CalcLocaltax3Desc=Rapoarte Taxe Locale este totalul taxelor locale de vanzare LabelUsedByDefault=Eticheta utilizat în mod implicit în cazul în care nu poate fi găsit de traducere pentru codul LabelOnDocuments=Eticheta de pe documente NbOfDays=Nr zile @@ -887,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 @@ -913,7 +923,7 @@ DelaysOfToleranceDesc=Acest ecran vă permite să definiţi de tolerat întârzi Delays_MAIN_DELAY_ACTIONS_TODO=Toleranţă întârziere (în zile) înainte de alertă cu privire la acţiunile planificate care nu au fost încă realizat Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Toleranţă întârziere (în zile) înainte de alertă cu privire la ordinele nu a fost încă realizat Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Toleranţă întârziere (în zile) înainte de alertă privind ordinele de furnizori nu au fost încă prelucrate -Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Toleranţă întârziere (în zile) înainte de alertă cu privire la propuneri pentru a închide +Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Întârziere toleranță (în zile) înainte de alertă cu privire la propunerile de a închide Delays_MAIN_DELAY_PROPALS_TO_BILL=Toleranţă întârziere (în zile) înainte de alertă cu privire la propuneri nu facturat Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Toleranta întârziere (în zile) înainte de alertă cu privire la servicii, pentru a activa Delays_MAIN_DELAY_RUNNING_SERVICES=Toleranta întârziere (în zile) înainte de alertă cu privire la serviciile expirat @@ -959,7 +969,7 @@ TriggerDisabledAsModuleDisabled=Declanşările în acest dosar sunt dezactivate TriggerAlwaysActive=Declanşările în acest dosar sunt întotdeauna activ, ce sunt activate Dolibarr module. TriggerActiveAsModuleActive=Declanşările în acest dosar sunt active ca modul %s este activată. GeneratedPasswordDesc=Definiţi aici regulă care doriţi să-l utilizaţi pentru a genera o parolă nouă, dacă vă întrebaţi de a avea auto generate parola -DictionaryDesc=Define here all reference datas. You can complete predefined value with yours. +DictionaryDesc=Definiți aici toate Date de referință. Puteți completa valoarea predefinită cu a dvs. ConstDesc=Această pagină vă permite să editaţi toate alţi parametri care nu sunt disponibile în ultimele pagini. Acestea sunt rezervate pentru parametrii avansat dezvoltatorii sau pentru troubleshouting. OnceSetupFinishedCreateUsers=Atenţie, esti un utilizator Dolibarr administrator. Administrator utilizatori sunt utilizate pentru a instala Dolibarr. Pentru o utilizare obişnuită a Dolibarr, este recomandat să folosiţi un administrator de utilizator creat de utilizatori şi grupuri de meniu. MiscellaneousDesc=Definiţi parametrii de aici toate celelalte legate de securitate. @@ -997,7 +1007,7 @@ SimpleNumRefModelDesc=Întoarce numărul de referinţă cu formatul %syymm-NNNN ShowProfIdInAddress=Arată id professionnal cu adrese pe documente ShowVATIntaInAddress=Ascunde codul TVA Intra cu adresa pe documente TranslationUncomplete=Parţială traducere -SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/. +SomeTranslationAreUncomplete=Unele limbi pot fi traduse parţial sau pot conţine erori. Dacă detectaţi ceva, puteţi rezolva înregistrând fisierele limbă pe http://transifex.com/projects/p/dolibarr/. MenuUseLayout=Asiguraţi-meniu vertical hidable (JavaScript opţiune nu trebuie să fi dezactivat) MAIN_DISABLE_METEO=Dezactivează meteo vedere TestLoginToAPI=Testaţi logati pentru a API @@ -1023,7 +1033,7 @@ ExtraFieldsProject=Atribute complementare (proiecte) ExtraFieldsProjectTask=Atribute complementare (sarcini) ExtraFieldHasWrongValue=Atributul %s are o valoare greşită. AlphaNumOnlyCharsAndNoSpace=numai caractere alfanumerice fără spaţiu -AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space +AlphaNumOnlyLowerCharsAndNoSpace=numai caractere minuscule, alfanumerice fără spaţiu SendingMailSetup=Setup de trimiteri prin e-mail SendmailOptionNotComplete=Atenţie, pe unele sisteme Linux, pentru a trimite e-mail de la e-mail, sendmail configurare execuţie trebuie să conatins optiunea-ba (mail.force_extra_parameters parametri în fişierul php.ini). Dacă nu unor destinatari a primi e-mailuri, încercaţi să editaţi acest parametru PHP cu mail.force_extra_parameters =-BA). PathToDocuments=Cale de acces documente @@ -1038,22 +1048,21 @@ YesInSummer=Da în vară OnlyFollowingModulesAreOpenedToExternalUsers=Notă, doar următoarele module sunt deschise pentru utilizatorii externi (indiferent dacă sunt permisiuni de utilizatori): SuhosinSessionEncrypt=Stocarea sesiune criptată prin Suhosin ConditionIsCurrently=Condiția este momentan %s -TestNotPossibleWithCurrentBrowsers=Detectarea automată nu este posibilă YouUseBestDriver=Utilizaţi driverul %s care este cel mai bun driver disponibil acum. -YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. +YouDoNotUseBestDriver=Utilizaţi driverul %s dar driverul %s este recomandat. NbOfProductIsLowerThanNoPb=Aveți doar % s produse / servicii în baza de date. Aceasta nu necesită nicio optimizare specială. SearchOptim=Optimizare căutare YouHaveXProductUseSearchOptim=Aveți % s produse în baza de date. Ar trebui să adăugați constanta PRODUCT_DONOTSEARCH_ANYWHERE la 1 în Acasă-Setup-Altele, să limitați căutarea la începutul siruri de caractere ţi a face posibil ca baza de date să utilizeze indexul și să obțineți un răspuns imediat. BrowserIsOK=Folosiţi navigatorul web %s. Acest navigator este ok pentru performanţă şi securitate. BrowserIsKO=Folosiţi browser-ul % s. Acest browser-ul pare a fi o alegere proasta pentru securitate, performanță și fiabilitate. Noi recomandam sa folositi Firefox, Chrome, Opera sau Safari. -XDebugInstalled=XDebug is loaded. +XDebugInstalled=XDebug este încărcat. XCacheInstalled=XCache este încărcată. AddRefInList=Afişează referinţele clienţilor şi furnizorilor într-o listă ( selectează lista sau casutele ) si in plus a linkurilor. FieldEdition=Editarea campului %s FixTZ=Fixează TimeZone FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă problemele decalajjului fusului orar sunt cunoscute) -GetBarCode=Get barcode -EmptyNumRefModelDesc=The code is free. This code can be modified at any time. +GetBarCode=Dă codbare +EmptyNumRefModelDesc=Codul este free. Acest cod poat efi modificat in orice moment. ##### Module password generation PasswordGenerationStandard=Întoarceţi-vă o parolă generate în funcţie de interne Dolibarr algoritmul: 8 caractere care conţin numere în comun şi în caractere minuscule. PasswordGenerationNone=Nu sugerează orice generate parola. Parola trebuie să fie de tip în manual. @@ -1074,15 +1083,15 @@ ModuleCompanyCodeAquarium=Întoarceţi-vă un cod de contabilitate construit de ModuleCompanyCodePanicum=Întoarceţi-vă un gol de contabilitate cod. ModuleCompanyCodeDigitaria=Contabilitate cod depinde de o terţă parte de cod. Acest cod este format din caractere "C" în prima poziţie, urmat de primele 5 caractere de-a treia parte de cod. UseNotifications=Utilizaţi notificări -NotificationsDesc=Anunturi caracteristică vă permite să tăcut trimite automat mail, pentru unele Dolibarr evenimente, pentru companii care sunt configurate pentru a +NotificationsDesc=Funcţia E-mailuri cu notificări vă permite să trimiteți în linişte mail automat, pentru unele evenimente Dolibarr. Targetele pot fi definite:
    * Pe contactele terţilor (clienti sau furnizori), un terţ terță o dată
    * Sau prin stabilirea unei adrese target de e-mail globală de la pagina de configurare a modulului. ModelModules=Documente şabloane DocumentModelOdt=Generare din modelele OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…) -WatermarkOnDraft=Watermark pe proiect de document -JSOnPaimentBill=Activate feature to autofill payment lines on payment form +WatermarkOnDraft=Watermark pe schiţa de document +JSOnPaimentBill=Activaţi funcţia de autocompletare a liniilor de plata pe formularul de plată CompanyIdProfChecker=Professional ID unic MustBeUnique=Trebuie să fie unice? -MustBeMandatory=Mandatory to create third parties ? -MustBeInvoiceMandatory=Mandatory to validate invoices ? +MustBeMandatory=Obligatoriu pentru crearea unui terţ ? +MustBeInvoiceMandatory=Obligatoriu pentru validarea facturilor ? Miscellaneous=Diverse ##### Webcal setup ##### WebCalSetup=Webcalendar link-ul de instalare @@ -1096,13 +1105,13 @@ WebCalServer=Server de găzduire de date calendaristice WebCalDatabaseName=Baza de date nume WebCalUser=De utilizator pentru a accesa baza de date WebCalSetupSaved=Webcalendar setup fost salvate cu succes. -WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. +WebCalTestOk=Conectarea la server ' %s' pe bază de date " %s" cu utilizatorul " %s" cu succes. WebCalTestKo1=Conectarea la server ' %s' reuseste, dar baza de date " %s" nu a putut fi atins. WebCalTestKo2=Conectarea la server ' %s' cu utilizatorul " %s" nu a reuşit. WebCalErrorConnectOkButWrongDatabase=Conexiunii la baza de date a reusit, dar nu arata a fi o bază de date Webcalendar. WebCalAddEventOnCreateActions=Adauga eveniment calendaristic cu privire la acţiunile crea WebCalAddEventOnCreateCompany=Adauga eveniment la calendar companii crea -WebCalAddEventOnStatusPropal=Adăugaţi calendar eveniment comercial propuneri cu privire la statutul de schimbare +WebCalAddEventOnStatusPropal=Adaugă eveniment în calendar la schimbarea statusului ofertei comerciale WebCalAddEventOnStatusContract=Adauga eveniment calendaristic privind contractele de stare schimba WebCalAddEventOnStatusBill=Adăugaţi calendar eveniment de pe facturile de schimbare de stare WebCalAddEventOnStatusMember=Adăugaţi calendar eveniment pe membrii schimba starea @@ -1124,28 +1133,30 @@ EnableEditDeleteValidInvoice=Permite posibilitatea de a edita / şterge valabil SuggestPaymentByRIBOnAccount=Propuneţi o plată de către retrage de pe contul SuggestPaymentByChequeToAddress=Propuneţi o plată prin cec la FreeLegalTextOnInvoices=Free text pe facturi -WatermarkOnDraftInvoices=Filigranul pe facturile ciornă (niciunul daca e gol) +WatermarkOnDraftInvoices=Filigranul pe facturile schiţă (niciunul daca e gol) ##### Proposals ##### -PropalSetup=Comerciale propuneri modul de configurare +PropalSetup=Modul configurare Oferte Comerciale CreateForm=Creaţi forme NumberOfProductLines=Numărul de linii de produse -ProposalsNumberingModules=Comerciale propunerea de numerotare module -ProposalsPDFModules=Comerciale propunerea modele de documente +ProposalsNumberingModules=Modele numerotare Oferte Comerciale +ProposalsPDFModules=Modele documente Oferte Comerciale ClassifiedInvoiced=Clasificate facturate -HideTreadedPropal=Ascunde tratate comerciale propuneri în lista +HideTreadedPropal=Ascunde ofertele comerciale tratate în listă AddShippingDateAbility=Adauga data de capacitatea de transport maritim 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) +FreeLegalTextOnProposal=Text liber pe ofertele comerciale +WatermarkOnDraftProposal=Filigranul pe ofertele comerciale schiţă (niciunul daca e gol) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al ofertei ##### Orders ##### OrdersSetup=Ordinele de gestionare setup OrdersNumberingModules=Ordinele de numerotare module OrdersModelModule=Ordinul modele de documente -HideTreadedOrders=Hide the treated or cancelled orders in the list -ValidOrderAfterPropalClosed=Pentru a valida pentru propunerea după mai aproape, face posibil să nu se pas cu provizoriu pentru +HideTreadedOrders=Ascunde comenzile tratate sau anulate în lista +ValidOrderAfterPropalClosed=Pentru a valida comanda după închiderea ofertei, face posibil să nu se pas cu provizoriu pentru FreeLegalTextOnOrders=Free text de pe ordinele de -WatermarkOnDraftOrders=Filigranul pe comenzile ciornă (niciunul daca e gol) +WatermarkOnDraftOrders=Filigranul pe comenzile schiţă (niciunul daca e gol) +ShippableOrderIconInList=Adaugă un icon în lista Comenzilor care indica daca comanda este expediabilă ##### Clicktodial ##### ClickToDialSetup=Click pentru a Dial modul setup ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises
    __PHONETO__ qui sera remplac� par le t�l�phone de l'appel�
    __PHONEFROM__ qui sera remplac� par le t�l�phone de l'appelant (le votre)
    __LOGIN__ qui sera remplac� par votre login clicktodial (d�fini sur votre fiche utilisateur)
    __PASS__ qui sera remplac� par votre mot de passe clicktodial (d�fini sur votre fiche utilisateur). @@ -1155,14 +1166,14 @@ Bookmark4uSetup=Bookmark4u modul de configurare InterventionsSetup=Intervenţii de modul de configurare FreeLegalTextOnInterventions=Textul gratuit pe documente de intervenţie FicheinterNumberingModules=Modulele de intervenţie de numerotare -TemplatePDFInterventions=Carte de modele de documente de intervenţie +TemplatePDFInterventions=Modele documente fişă intervenţie WatermarkOnDraftInterventionCards=Filigranul pe documentele fişelor de intervenţie (niciunul daca e gol) ##### Contracts ##### -ContractsSetup=Contracte de modul de configurare +ContractsSetup=Configurare modul Contracte / Abonamente ContractsNumberingModules=Contracte de numerotare module -TemplatePDFContracts=Contracts documents models -FreeLegalTextOnContracts=Free text on contracts -WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) +TemplatePDFContracts=Modele documente contracte +FreeLegalTextOnContracts=Free text pe contracte +WatermarkOnDraftContractCards=Filigranul pe contractele ciornă (niciunul daca e gol) ##### Members ##### MembersSetup=Membrii modul de configurare MemberMainOptions=Principalele opţiuni @@ -1237,9 +1248,9 @@ LDAPSynchroKO=Eşuare încercare de sincronizare LDAPSynchroKOMayBePermissions=Eşuare încercare de sincronizare. Verificaţi dacă conexiune la serverul este configurat corect şi permite LDAP udpates LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP se conecteze la serverul LDAP de succes (Server= %s, port= %s) LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP se conecteze la serverul LDAP a eşuat (Server= %s, port= %s) -LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindOK=Conectare/Autentificare la serverul LDAP cu succes (Server=%s, Port=%s, Admin=%s, Password=%s) LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=Conectare / Authentificate la serverul LDAP a eşuat (Server= %s, port= %s, %s= admin, parola= %s) -LDAPUnbindSuccessfull=Disconnect successful +LDAPUnbindSuccessfull=Deconectat cu succes LDAPUnbindFailed=Deconectaţi eşuat LDAPConnectToDNSuccessfull=Conexiune au DN ( %s) Russie LDAPConnectToDNFailed=Conexiune au DN ( %s) choue @@ -1267,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 @@ -1296,7 +1307,7 @@ LDAPFieldSidExample=Exemplu: objectsid LDAPFieldEndLastSubscription=Data de sfârşit de abonament LDAPFieldTitle=Post / Funcţia LDAPFieldTitleExample=Examplu: titlu -LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPParametersAreStillHardCoded=Parametrii LDAP sunt încă hardcoded (în clasa de contact) LDAPSetupNotComplete=LDAP setup nu complet (merg pe alţii file) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nr administrator sau parola furnizate. LDAP de acces vor fi anonime şi modul doar în citire. LDAPDescContact=Această pagină vă permite să definiţi numele atribute LDAP LDAP în copac pentru fiecare date găsite pe Dolibarr contact. @@ -1309,9 +1320,9 @@ PerfDolibarr=Raport performanţă setări/optimizări YouMayFindPerfAdviceHere=Veți găsi pe această pagină unele verificări sau sfaturi privind performanţa. NotInstalled=Neinstalat, astfel serverul dvs nu este încetinit de acesta. ApplicativeCache=Cache aplicativ -MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
    More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
    Note that a lot of web hosting provider does not provide such cache server. -MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete. -MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled. +MemcachedNotAvailable=Niciun cache aplicatie găsit. Puteți îmbunătăți performanța prin instalarea unui server de cache memcached și un modul capabil de a utiliza acest server cache.
    Mai multe informatii aici http://wiki.dolibarr.org/index.php/Module_MemCached_EN.\n
    Rețineți că o mulțime de furnizor de web hosting nu oferă astfel de server de cache. +MemcachedModuleAvailableButNotSetup=Modulul memcahed pentru aplicarea cache este găsit dar nu este configurat complet +MemcachedAvailableAndSetup=Modulul Memcached pentru a utiliza serverul memcached este activat. OPCodeCache=Cache OPCode NoOPCodeCacheFound=Niciun cache Opcode găsit. Puteţi să folosiți un alt cache Opcode decât XCache sau eAccelerator (bun), poate nu ai cache Opcode (foarte rău). HTTPCacheStaticResources=HTTP cache pentru resursele statice (CSS, img, javascript) @@ -1322,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=Detectarea automată nu este posibilă +TestNotPossibleWithCurrentBrowsers=O astfel de detectare automată nu este posibilă cu browserele curente ##### Products ##### ProductSetup=Produse modul de configurare ServiceSetup=Servicii de modul de configurare @@ -1332,8 +1343,8 @@ ConfirmDeleteProductLineAbility=Confirmarea de îndepărtare a produce o linie ModifyProductDescAbility=Personalizare de descrieri produse în forme ViewProductDescInFormAbility=Vizualizare descrierile de produs, în forme (de altfel ca popup tooltip) ViewProductDescInThirdpartyLanguageAbility=Vizualizarea de descrieri de produse în limba thirdparty -UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). +UseSearchToSelectProductTooltip=De asemenea, dacă aveți un număr mare produse (> 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. +UseSearchToSelectProduct=Folositi un formular de căutare pentru a alege un produs (mai degrabă decât o listă derulantă). UseEcoTaxeAbility=Suport Eco-Taxe (DEEE) SetDefaultBarcodeTypeProducts=Implicit tip de cod de bare de a utiliza pentru produse SetDefaultBarcodeTypeThirdParties=Implicit tip de cod de bare de a utiliza pentru terţi @@ -1369,7 +1380,7 @@ BarcodeDescC39=Coduri de bare de tip C39 BarcodeDescC128=Coduri de bare de tip C128 GenbarcodeLocation=Coduri de bare generaţie în linie de comandă (utilizat de către phpbarcode motor pentru anumite tipuri de coduri de bare) BarcodeInternalEngine=Motor intern -BarCodeNumberManager=Manager to auto define barcode numbers +BarCodeNumberManager=Manager pentru autodefinire numere coduri bare ##### Prelevements ##### WithdrawalsSetup=Retragere de modul de configurare ##### ExternalRSS ##### @@ -1382,9 +1393,10 @@ MailingSetup=Să trimiteţi un email la modul de instalare MailingEMailFrom=Expeditorul e-mail (la) pentru e-mail-uri trimise prin email-uri de module MailingEMailError=Întoarcere Email (Erori-a) pentru e-mailuri cu erori ##### Notification ##### -NotificationSetup=Email modul de configurare +NotificationSetup=Configurare Modul Notificări Email NotificationEMailFrom=Expeditorul e-mail (la) pentru e-mail-uri trimise pentru notificări -ListOfAvailableNotifications=Lista notificărilor disponibile (Această listă depinde de module activate) +ListOfAvailableNotifications=Listă de evenimente pentru care puteți seta notificări pe, pfiecare terţ (mergi în fişa terţ pentru configurare) sau prin stabilirea unui e-mail fix (Lista depinde de modulele activate) +FixedEmailTarget=Targhet email fixat ##### Sendings ##### SendingsSetup=Trimiterea de modul de configurare SendingsReceiptModel=Trimiterea primirea model @@ -1402,7 +1414,7 @@ AdvancedEditor=Editor avansat ActivateFCKeditor=Activaţi FCKeditor pentru: FCKeditorForCompany=WYSIWIG crearea / editie a companiilor şi de note descriere FCKeditorForProduct=WYSIWIG crearea / editie a produselor / serviciilor "descrierea şi nota -FCKeditorForProductDetails=WYSIWIG crearea / ediţie detalii linii de produse pentru toate entităţile (propuneri, comenzilor, facturilor, etc ..)
    Atenţie: Folosind această opţiune nu este grav recommanded deoarece astfel se pot crea probleme cu caractere speciale şi pagina formating atunci când clădirea fişiere PDF. +FCKeditorForProductDetails=WYSIWIG crearea / ediție a produselor detalii linii pentru toate entitățile (oferte, comenzi, facturi, etc ...) Atenție:. Folosind această opțiune pentru acest caz nu este serios recomandata deoarece poate crea probleme cu caractere speciale și pagina formatări atunci când construirea PDF fișiere. FCKeditorForMailing= WYSIWIG crearea / ediţie de mailing FCKeditorForUserSignature=Creare/editare WYSIWIG a semnăturii utilizatorilor FCKeditorForMail=Creare/editare WYSIWIG a tuturor emailurilor (exceptând Outils->eMailing) @@ -1412,10 +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=Configurarea modulului stoc -UserWarehouse=Utilizaţi utilizator personal stocuri +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 @@ -1448,11 +1461,11 @@ ConfirmDeleteLine=Sunteţi sigur că doriţi să ştergeţi această linie? ##### Tax ##### TaxSetup=Impozite, contribuţii sociale şi dividende de modul de configurare OptionVatMode=Opţiunea de exigibilit de TVA -OptionVATDefault=Cash basis -OptionVATDebitOption=Accrual basis +OptionVATDefault=Bazată pe incasări +OptionVATDebitOption=Bazată pe debit OptionVatDefaultDesc=TVA este datorată:
    - La livrare / plăţile pentru mărfurile
    - Privind plăţile pentru serviciile OptionVatDebitOptionDesc=TVA este datorată:
    - La livrare / plăţile pentru mărfurile
    - Pe factura (de debit) pentru serviciile -SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: +SummaryOfVatExigibilityUsedByDefault=Momentul implicit TVA-ului exigibil pentru opțiunea selectată: OnDelivery=Pe livrare OnPayment=Pe plată OnInvoice=Pe factura @@ -1469,20 +1482,23 @@ AccountancyCodeBuy=Cont cumpărare. cod AgendaSetup=Acţiuni de ordine de zi şi de modul de configurare PasswordTogetVCalExport=Cheia de a autoriza export link PastDelayVCalExport=Nu de export eveniment mai în vârstă decât -AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) -AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view -AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view -AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda +AGENDA_USE_EVENT_TYPE=Utilizați tipurile de evenimente (administrat în Setup -> Dictionary -> Type of agenda events) +AGENDA_DEFAULT_FILTER_TYPE=Setați automat acest tip de eveniment în filtrul de căutare al vederii agenda +AGENDA_DEFAULT_FILTER_STATUS=Setați automat acest statut în filtrul de căutare al vederii agenda +AGENDA_DEFAULT_VIEW=Care tab doriţi să deschideţi când selectaţi meniul Agenda ##### ClickToDial ##### ClickToDialDesc=Acest modul permite să adăugaţi o pictogramă după numărul de telefon de contact Dolibarr. Un clic pe această pictogramă, se va apela un serveur cu un URL particular definiţi mai jos. Acest lucru poate fi utilizat pentru a apela un sistem de call center din Dolibarr care pot apela numărul de telefon pe un sistem de SIP, de exemplu. ##### Point Of Sales (CashDesk) ##### CashDesk=Punctul de vânzare CashDeskSetup=Casierie modul de configurare -CashDeskThirdPartyForSell=Generic terţă parte de a utiliza pentru vinde +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 -CashDeskIdWareHouse=Datawarehous de utilizator pentru a vinde +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. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Şterge an fiscal ConfirmDeleteFiscalYear=Sigur doriţi să ştergeţi acest an fiscal ? Opened=Deschis Closed=Închis - +AlwaysEditable=Permite a fi editat mereu +MAIN_APPLICATION_TITLE=Forțează numele vizibil al aplicare (avertisment: setarea propriul nume aici poate duce la eliminarea facilitaţii de conectare automată atunci când se utilizează aplicația mobilă DoliDroid) +NbMajMin=Numărul minim al caracterelor majuscule +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=Configurare modul salarii +SortOrder=Ordine sortare Format=Format -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +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 256dfc18116..bb09848dbb9 100644 --- a/htdocs/langs/ro_RO/agenda.lang +++ b/htdocs/langs/ro_RO/agenda.lang @@ -1,16 +1,16 @@ # Dolibarr language file - Source file is en_US - agenda IdAgenda=ID eveniment Actions=Evenimente -ActionsArea=Zona evenimente (acțiuni și sarcini) +ActionsArea=Evenimente (acțiuni și sarcini) Agenda=Agenda Agendas=Agende Calendar=Calendar Calendars=Calendare -LocalAgenda=Internal calendar -ActionsOwnedBy=Event owned by +LocalAgenda=Calendar intern +ActionsOwnedBy=Evenimente aparţinând de AffectedTo=Atribuit lui DoneBy=Realizat de -Event=Event +Event=Eveniment Events=Evenimente EventsNb=Număr evenimente MyEvents=Evenimentele mele @@ -23,44 +23,43 @@ MenuToDoActions=Toate evenimentele neterminate MenuDoneActions=Toate evenimentele terminate MenuToDoMyActions=Evenimentele mele neterminate MenuDoneMyActions=Evenimentele mele terminate -ListOfEvents=List of events (internal calendar) +ListOfEvents=Lista evenimentelor ( calendar intern) ActionsAskedBy=Evenimente înregistarte de 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ă ViewCal=Vezi lunar ViewDay=Vezi zilnic ViewWeek=Vezi săptămânal -ViewPerUser=Per user view +ViewPerUser=Vezi pe utilizator ViewWithPredefinedFilters= Vezi cu filtre predefinite AutoActions= Completarea automată AgendaAutoActionDesc= Definiți aici evenimentele pentru care doriți ca Dolibarr să creeze automat un eveniment în agendă. În cazul în care nimic nu este bifat(implicit), doar acțiunile manuale vor fi incluse în agendă. AgendaSetupOtherDesc= Această pagină permite configurarea unor opțiuni pentru exportul de evenimente Dolibarr într-un calendar extern (Thunderbird, Google Calendar, ...) AgendaExtSitesDesc=Această pagină vă permite să declaraţi sursele externe de calendare pentru a vedea evenimentele lor în agenda Dolibarr. -ActionsEvents= Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat -PropalValidatedInDolibarr= Propunerea %s validată -InvoiceValidatedInDolibarr= Factura %s validată -InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul nevalidată +ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat +PropalValidatedInDolibarr=Oferta %s validată +InvoiceValidatedInDolibarr=Factura %s validată +InvoiceValidatedInDolibarrFromPos=Factura %s validată din POS +InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul schiţă InvoiceDeleteDolibarr=Factura %s ştearsă OrderValidatedInDolibarr= Comanda %s validată OrderApprovedInDolibarr=Comanda %s aprobată OrderRefusedInDolibarr=Comanda %s refuzată -OrderBackToDraftInDolibarr=Comanda %s revenită de statutul nevalidată +OrderBackToDraftInDolibarr=Comanda %s revenită de statutul schiţă OrderCanceledInDolibarr=Comanda %s anulată -InterventionValidatedInDolibarr=Intervenţie %s validată -ProposalSentByEMail=Propunerea comercială %s trimisă prin e-mail +ProposalSentByEMail=Oferta comercială %s trimisă prin e-mail OrderSentByEMail=Comanda client %s trimisă prin e-mail InvoiceSentByEMail=Factura client %s trimisă prin e-mail SupplierOrderSentByEMail=Comanda furnizor %s trimisă prin e-mail SupplierInvoiceSentByEMail=Factura furnizor %s trimise prin e-mail ShippingSentByEMail=Avizul de expediţie %s trimis prin e-mail ShippingValidated= Livrarea %s validata -InterventionSentByEMail=Intervenţia %s trimisă prin e-mail -InterventionClassifiedBilled=Intervenția %s clasificat Facturat NewCompanyToDolibarr= Terţ creat DateActionPlannedStart= Data planificată a începerii DateActionPlannedEnd= Data planificată a terminării @@ -70,24 +69,24 @@ DateActionStart= Data începerii DateActionEnd= Data terminării AgendaUrlOptions1=Puteţi, de asemenea, să adăugaţi următorii parametri pentru filtrarea rezultatelor: AgendaUrlOptions2=login=%s ​​pentru a limita exportul de acțiuni create de, atribuite lui sau făcut de utilizatorul% s. -AgendaUrlOptions3=logina=% s ​​pentru a limita exportul de acțiuni create de utilizatorul % s. +AgendaUrlOptions3=logind=%s ​​pentru a limita exportul de acțiuni deţinute de utilizatorul %s AgendaUrlOptions4=logint=% s ​​pentru a limita exportul de acțiuni atribuite utilizatorului % s. -AgendaUrlOptions5=logind=% s ​​pentru a limita exportul de acțiuni efectuate de utilizatorul % s +AgendaUrlOptionsProject=project=PROJECT_ID pentru a limita exportul de acțiuni asociate la proiectul PROJECT_ID. AgendaShowBirthdayEvents=Afişează ziua de naştere a contactelor AgendaHideBirthdayEvents=Ascunde ziua de naştere a contactelor Busy=Ocupat ExportDataset_event1=Lista evenimentelor din agenda -DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) -DefaultWorkingHours=Default working hours in day (Example: 9-18) +DefaultWorkingDays=Rangul zilelor lucrătoare predefinite in săptămână (Examplu:1-5, 1-6) +DefaultWorkingHours=Orele lucrătoare predefinite ale zilei (Examplu: 9-18) # External Sites ical ExportCal=Export calendar ExtSites=Import calendare externe -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesEnableThisTool=Afişează calendarele externe (definite in setup global) în agenda. Nu afectează calendarele externe definite de utilizatori. ExtSitesNbOfAgenda=Număr calendare AgendaExtNb=Calendar nr %s ExtSiteUrlAgenda=URL-ul pentru a accesa fişierul . ical ExtSiteNoLabel=Nici o descriere -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range -AddEvent=Add event -MyAvailability=My availability +WorkingTimeRange=Rang timp muncă +WorkingDaysRange=Rang zile muncă +AddEvent=Creare eveniment +MyAvailability=Disponibilitatea mea diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang index 3032165936b..782a58ab96c 100644 --- a/htdocs/langs/ro_RO/banks.lang +++ b/htdocs/langs/ro_RO/banks.lang @@ -3,7 +3,7 @@ Bank=Banca Banks=Banci MenuBankCash=Banca / Casa MenuSetupBank=Setări Banca / Casa -BankName=Numel bancă +BankName=Nume bancă FinancialAccount=Cont FinancialAccounts=Conturi BankAccount=Cont bancar @@ -41,7 +41,7 @@ AccountStatement=Extras Cont AccountStatementShort=Extras AccountStatements=Extrase Cont LastAccountStatements=Ultimele extrase de cont -Rapprochement=Reconciliate +Rapprochement=Decontate IOMonthlyReporting=Raport Lunar BankAccountDomiciliation=Adresă Cont BankAccountCountry=Tară Cont @@ -66,7 +66,7 @@ BankType0=Cont economii BankType1=Cont curent sau card de credit BankType2=Cont numerar IfBankAccount=Dacă contul bancar -AccountsArea=Zona Conturi +AccountsArea=CONTURI AccountCard=Fişa Cont DeleteAccount=Şterge cont ConfirmDeleteAccount=Sunteţi sigur că doriţi să ştergeţi acest cont? @@ -83,11 +83,11 @@ BankTransactions=Tranzacţii bancare SearchTransaction=Caută tranzacţie ListTransactions=Lista tranzacţiilor ListTransactionsByCategory=Lista tranzacţie / categorie -TransactionsToConciliate=Tranzacţii de conciliat -Conciliable=Conciliabil -Conciliate=Conciliază +TransactionsToConciliate=Tranzacţii de decontat +Conciliable=Decontabil +Conciliate=Deconteaza Conciliation=Conciliere -ConciliationForAccount=Conciliază acest cont +ConciliationForAccount=Deconteaza acest cont IncludeClosedAccount=Includeţi conturile închise OnlyOpenedAccount=Numai conturile deschise AccountToCredit=Cont de credit @@ -101,9 +101,9 @@ EditBankRecord=Editare înregistrare LineRecord=Tranzacţie AddBankRecord=Adaugă tranzacţie AddBankRecordLong=Adaugă tranzacţie manual -ConciliatedBy=Conciliate de -DateConciliating=Data Conciliere -BankLineConciliated=Tranzacţie conciliată +ConciliatedBy=Decontat de +DateConciliating=Data Decontare +BankLineConciliated=Tranzacţie decontata CustomerInvoicePayment=Plată Client CustomerInvoicePaymentBack=Return Plată client SupplierInvoicePayment=Plată Furnizor @@ -145,16 +145,16 @@ BankTransactionLine=Tranzacţie bancă AllAccounts=Toate conturile banca / casa BackToAccount=Inapoi la cont ShowAllAccounts=Arată pentru toate conturile -FutureTransaction=Tranzacţie viitoare. In nici un caz de conciliat. +FutureTransaction=Tranzacţie viitoare. In nici un caz de decontat. SelectChequeTransactionAndGenerate=Selectaţi/ filtraţi cecurile pentru a le include în borderoul de remise şi faceţi clic pe "Crează". InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabile (cum ar fi, YYYYMM) EventualyAddCategory=În cele din urmă, precizează o categorie în care să clasezi înregistrările -ToConciliate=De conciliat ? +ToConciliate=De decontat ? ThenCheckLinesAndConciliate=Apoi, verifică liniile prezente în extrasul de bancă şi click 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 ad456b6fb35..565b654f58f 100644 --- a/htdocs/langs/ro_RO/bills.lang +++ b/htdocs/langs/ro_RO/bills.lang @@ -23,19 +23,19 @@ InvoiceProFormaAsk=Factură Proformă InvoiceProFormaDesc=Factura Proformă este o imagine a adevăratei facturi, dar nu are nici o valoare contabilă. InvoiceReplacement=Factură de Înlocuire InvoiceReplacementAsk=Factură de Înlocuire a altei facturi -InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

    Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. +InvoiceReplacementDesc=;Factură de Înlocuire</b> este utilizată pentru a anula şi înlocui complet o factură fără nicio plată primită .

    Notă: Doar factura fără nicio plată poate fi înlocuită. Dacă nu s-a inchis, acesta va fi închisă în mod automat cu statutul "abandonat". InvoiceAvoir=Nota de credit InvoiceAvoirAsk=Nota de credit pentru a corecta factura InvoiceAvoirDesc=Nota de credit este o factură negativă folosită pentru a rezolva o factură ,fie că are o sumă care diferă de suma de plata (pentru ca clientul a plătit prea mult din eroare, sau nu vor fi platite anumite produse complet ce vor fi returnate, de exemplu). -invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithLines=Creați Credit Note cu linii din factura origine +invoiceAvoirWithPaymentRestAmount=Creați Nota de credit cu valoarea neachitată a facturii de origine +invoiceAvoirLineWithPaymentRestAmount=Notă de credit pentru valoarea rămasă neplătită ReplaceInvoice=Înlocuieşte factura %s 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 @@ -66,7 +66,7 @@ ConfirmConvertToReduc=Vrei sa se transforme aceasta nota de credit în absolută SupplierPayments=Plăţi Furnizori ReceivedPayments=Încasări primite ReceivedCustomersPayments=Încasări Clienţi -PayedSuppliersPayments=Payments payed to suppliers +PayedSuppliersPayments=Plaţi efectuate catre furnizori ReceivedCustomersPaymentsToValid=Încasări Clienţi de validat PaymentsReportsForYear=Rapoarte Plăţi pentru %s PaymentsReports=Rapoarte Plăţi @@ -80,15 +80,15 @@ PaymentAmount=Sumă de plată ValidatePayment=Validează plata PaymentHigherThanReminderToPay=Plată mai mare decât restul de plată HelpPaymentHigherThanReminderToPay=Atentie, valoarea plăţii la una sau mai multe facturi este mai mare decât restul de plată.
    Corectaţi intrarea, altfel confirmaţi si gîndiţivă la crearea unei note de credit pentru fiecare plata în exces. -HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
    Edit your entry, otherwise confirm. +HelpPaymentHigherThanReminderToPaySupplier=Atenție, suma de plată la una sau mai multe facturi este mai mare decât restul de plată.
    Editați intrarea, altfel confirmaţi. ClassifyPaid=Clasează "Platită" ClassifyPaidPartially=Clasează "Platită Parţial" ClassifyCanceled=Clasează "Abandonată" ClassifyClosed=Clasează "Închisă" -ClassifyUnBilled=Classify 'Unbilled' +ClassifyUnBilled=Clasează Nefacturat CreateBill=Crează Factura AddBill=Crează Factura sau Notă de Credit -AddToDraftInvoices=Adaugă la factura nevalidată +AddToDraftInvoices=Adaugă la factura schiţă DeleteBill=Ştergere factura SearchACustomerInvoice=Caută o factură client SearchASupplierInvoice=Caută o factură furnizor @@ -103,7 +103,7 @@ DisabledBecauseRemainderToPayIsZero=Dezactivată pentru că restul de plată es Amount=Valoare PriceBase=Preţul de bază BillStatus=Status Factura -BillStatusDraft=Nevalidată (de validat) +BillStatusDraft=Schiţă (de validat) BillStatusPaid=Platite BillStatusPaidBackOrConverted=Platite sau convertite în reducere BillStatusConverted=Plătită(gata pentru factura finală) @@ -113,7 +113,7 @@ BillStatusStarted=Începută BillStatusNotPaid=Neplătită BillStatusClosedUnpaid=Închisă (neplătită) BillStatusClosedPaidPartially=Platite (parţial) -BillShortStatusDraft=Nevalidată +BillShortStatusDraft=Schiţă BillShortStatusPaid=Platite BillShortStatusPaidBackOrConverted=Prelucrate BillShortStatusConverted=Prelucrate @@ -132,33 +132,31 @@ ErrorInvoiceAlreadyReplaced=Eroare, încercați să validați o factură pentru ErrorDiscountAlreadyUsed=Eroare, reducere este deja atribuită ErrorInvoiceAvoirMustBeNegative=Eroare, factura de corecţie trebuie să aibă o valoare negativă ErrorInvoiceOfThisTypeMustBePositive=Eroare, acest tip de factură trebuie să aibă o valoare pozitivă -ErrorCantCancelIfReplacementInvoiceNotValidated=Eroare, nu se poate anula o factură care a fost înlocuită cu o altă factură, şi care este încă nevalidată +ErrorCantCancelIfReplacementInvoiceNotValidated=Eroare, nu se poate anula o factură care a fost înlocuită cu o altă factură, şi care este încă schiţă BillFrom=De la BillTo=La ActionsOnBill=Evenimente pe factura NewBill=Factură nouă -Prélèvements=Ordin de plată -Prélèvements=Ordin de plată LastBills=Ultimele %s facturi LastCustomersBills=Ultimele %s facturi clienţi LastSuppliersBills=Ultimele %s facturi furnizori AllBills=Toate facturile OtherBills=Alte facturi -DraftBills=Facturi nevalidate -CustomersDraftInvoices=Facturi nevalidate Clienţi -SuppliersDraftInvoices=Facturi nevalidate Furnizori +DraftBills=Facturi schiţă +CustomersDraftInvoices=Facturi schiţă Clienţi +SuppliersDraftInvoices=Facturi schiţă Furnizori Unpaid=Neachitate ConfirmDeleteBill=Sigur doriţi să ştergeţi această factură? ConfirmValidateBill=Sigur doriţi să validaţi această factură cu referinţa%s? -ConfirmUnvalidateBill=Sigur doriţi să schimbaţi factura %sla statusul de nevalidată ? +ConfirmUnvalidateBill=Sigur doriţi să schimbaţi factura %sla statusul de schiţă ? ConfirmClassifyPaidBill=Sigur doriţi să schimbaţi factura %sla statusul plătită ? ConfirmCancelBill=Sigur doriţi să anulaţi factura %s ? ConfirmCancelBillQuestion=De ce vrei să clasezi această factură "abandonată"? ConfirmClassifyPaidPartially=Sigur doriţi să clasaţi factura %sca plătită ? ConfirmClassifyPaidPartiallyQuestion=Această factură nu a fost plătită în întregime. Care sunt motivele tale de a închide această factură? -ConfirmClassifyPaidPartiallyReasonAvoir=Restul de plată ( %s %s) este un discount acordat la plată, pentru că a fost făcută înainte de termen. Am regularizarea TVA-ului, cu o nota de credit. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restul de plată ( %s %s) este un discount acordat la plată, pentru că a fost făcută înainte de termen. Accept piardereaa TVA-ului de pe această reducere. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Restul de plată ( %s %s) este un discount acordat la plată, pentru că a fost făcută înainte de termen. Am recupera TVA-ul de pe această reducere fără o notă de credit. +ConfirmClassifyPaidPartiallyReasonAvoir=Restul de plată ( %s %s) este un discount acordat la plată, pentru că a fost făcută înainte de termen. Regularizarea TVA-ului, cu o nota de credit. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restul de plată ( %s %s) este un discount acordat la plată, pentru că a fost făcută înainte de termen. Accept piarderea a TVA-ului de pe această reducere. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Restul de plată ( %s %s) este un discount acordat la plată, pentru că a fost făcută înainte de termen. Recuperez TVA-ul de pe această reducere fără o notă de credit. ConfirmClassifyPaidPartiallyReasonBadCustomer=Client rău platnic ConfirmClassifyPaidPartiallyReasonProductReturned=Produse parţial returnate ConfirmClassifyPaidPartiallyReasonOther=Creanţă abandonată din alte motive @@ -171,14 +169,14 @@ ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilizaţi această opţiune dacă t ConfirmClassifyAbandonReasonOther=Altele ConfirmClassifyAbandonReasonOtherDesc=Această opţiune va fi folosită în toate celelalte cazuri. De exemplu, dacă ai dori să creezi o factura de inlocuire a facturii. ConfirmCustomerPayment=Confirmaţi introducerea plăţii de %s %s ? -ConfirmSupplierPayment=Do you confirm this payment input for %s %s ? +ConfirmSupplierPayment=Confirmaţi introducerea plăţii de %s %s ? ConfirmValidatePayment=Sunteți sigur că doriți să validaţi această plată? Nici o schimbare poate fi făcută odată ce plata este validată. ValidateBill=Validează factura UnvalidateBill=Devalidează factura NumberOfBills=Nr facturi NumberOfBillsByMonth=Nr facturi pe luni AmountOfBills=Valoare facturi -AmountOfBillsByMonthHT=Valoarea facturilor pe luni (fără taxe) +AmountOfBillsByMonthHT=Valoarea facturilor pe luni (fără tva) ShowSocialContribution=Afisează contribuţiile sociale ShowBill=Afisează factura ShowInvoice=Afisează factura @@ -198,19 +196,19 @@ Rest=Creanţă AmountExpected=Suma reclamată ExcessReceived=Primit în plus EscompteOffered=Discount oferit ( plată înainte de termen) -SendBillRef=Submission of invoice %s -SendReminderBillRef=Submission of invoice %s (reminder) +SendBillRef=Trimitere factura %s +SendReminderBillRef=Trimitere factura %s ( reamintire) StandingOrders=Ordine de plată StandingOrder=Ordin de plată -NoDraftBills=Nici o factură nevalidată -NoOtherDraftBills=Nici o altă factură nevalidată -NoDraftInvoices=Nici o factură nevalidată +NoDraftBills=Nici o factură schiţă +NoOtherDraftBills=Nicio altă factură schiţă +NoDraftInvoices=Nicio factură schiţă RefBill=Ref Factură ToBill=De facturat RemainderToBill=Rest de facturat SendBillByMail=Trimiteţi factura prin email SendReminderBillByMail=Trimite o relansare prin e-mail -RelatedCommercialProposals=Propuneri Comerciale asociate +RelatedCommercialProposals=Oferte comerciale asociate MenuToValid=De validat DateMaxPayment=Data limită a plăţii DateEcheance=Data limită @@ -219,19 +217,18 @@ NoInvoice=Nici o factură ClassifyBill=Clasează factura SupplierBillsToPay=Facturi furnizori de plată CustomerBillsUnpaid=Facturi clienţi neîncasate -DispenseMontantLettres=Facturile nevalidate mecanografic fac excepţie de la ordinea în litere -DispenseMontantLettres=Facturile nevalidate mecanografic fac excepţie de la ordinea în litere +DispenseMontantLettres=Facturile emise prin proceduri mecanographic sunt distribuite prin ordinea alfabetică NonPercuRecuperable=Nerecuperabilă SetConditions=Setează termenii de plata SetMode=Setează modul de plată Billed=Facturat -RepeatableInvoice=Factură Predefinită -RepeatableInvoices=Facturi Predefinite -Repeatable=Predefinit -Repeatables=Predefinite -ChangeIntoRepeatableInvoice=Converteşte în predefinită -CreateRepeatableInvoice=Crează factură predefinită -CreateFromRepeatableInvoice=Crează din factură predefinită +RepeatableInvoice=Model factura +RepeatableInvoices=Modele facturi +Repeatable=Model +Repeatables=Modele +ChangeIntoRepeatableInvoice=Converteşte in model factură +CreateRepeatableInvoice=Crează model factură +CreateFromRepeatableInvoice=Crează din model factură CustomersInvoicesAndInvoiceLines=Facturi Clienţi şi linii facturi CustomersInvoicesAndPayments=Facturi Clienţi şi plăţi ExportDataset_invoice_1=Lista Facturi Clienţi şi linii facturi @@ -282,12 +279,12 @@ InvoiceNote=Notă Factură InvoicePaid=Facturiă plătită PaymentNumber=Număr plata RemoveDiscount=Înlăturaţi discountul -WatermarkOnDraftBill=Filigran pe facturile nevalidate (nimic dacă gol) +WatermarkOnDraftBill=Filigran pe facturile schiţă (nimic dacă gol) InvoiceNotChecked=Nicio factură selectată CloneInvoice=Clonează factura ConfirmCloneInvoice=Sigur doriţi să clonaţi această factură %s? DisabledBecauseReplacedInvoice=Acţiunea dezactivată, pentru că factura a fost înlocuită -DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here. +DescTaxAndDividendsArea=Această zonă prezintă un rezumat al tuturor plăţilor efectuate pentru cheltuieli speciale. Numai înregistrările cu plaţi în cursul anului sunt incluse aici. NbOfPayments=Nr plăţi SplitDiscount=Scindează reducere în două ConfirmSplitDiscount=Sigur doriţi să împărţim această reducere %s %s în 2 mai mici ? @@ -296,8 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Valoarea totală a celor două noi reduceri ConfirmRemoveDiscount=Sigur doriţi să eliminaţi acest discount? RelatedBill=Factură asociată RelatedBills=Facturi asociate -LatestRelatedBill=Latest related invoice -WarningBillExist=Warning, one or more invoice already exist +LatestRelatedBill=Ultima Factură asociată +WarningBillExist=Avertisment, una sau mai multe facturi există deja # PaymentConditions PaymentConditionShortRECEP=Imediat @@ -376,7 +373,7 @@ MenuCheques=Cecuri MenuChequesReceipts=Borderouri cecuri NewChequeDeposit=Depozit nou ChequesReceipts=Borderouri cecuri remise -ChequesArea=Zona Cecuri remise +ChequesArea=CECURI ChequeDeposits=Cecuri remise Cheques=Cecuri CreditNoteConvertedIntoDiscount=Această notă de credit a fost convertită în %s @@ -388,20 +385,20 @@ ValidateInvoice=Validează factura Cash=Numerar Reported=Întârziat DisabledBecausePayments=Nu este posibil, deoarece există unele plăţi -CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid +CantRemovePaymentWithOneInvoicePaid=Nu se poate elimina plata deoarece există cel puțin o factură clasificată plătită ExpectedToPay=Plată prevăzută -PayedByThisPayment=Paid by this payment +PayedByThisPayment=Achitat prin aceasta plată ClosePaidInvoicesAutomatically=Clasează "Platită" toate facturile standard sau de înlocuire în întregime platite. ClosePaidCreditNotesAutomatically=Clasează "Platită" toate credit notele returnate în întregime -AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid". +AllCompletelyPayedInvoiceWillBeClosed=Toate facturile cu rest de plată zero vor fi închise automat cu statusul "Plătită". ToMakePayment=Plăteşte ToMakePaymentBack=Rambursează ListOfYourUnpaidInvoices=Lista facturilor neplătite NoteListOfYourUnpaidInvoices=Notă: Această listă conține numai facturile pentru terții la care sunteţi reprezentant de vânzării. RevenueStamp=Timbru fiscal -YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty +YouMustCreateInvoiceFromThird=Această opțiune este disponibilă numai atunci când se creează factura de la tab-ul "client" al terţului PDFCrabeDescription=Şablon PDF Factura Crabe . Un șablon factură complet (format recomandat) -TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +TerreNumRefModelDesc1=Retrimiteţi numărul sub forma %syymm-nnnn pentru facturile standard și %syymm-nnnn pentru notele de credit unde yy este anul, mm este luna și nnnn este o secvenţă fără nici o pauză și fără revenire la 0 MarsNumRefModelDesc1=Retrimiteţi numărul sub forma %syymm-nnnn pentru facturile standard , %syymm-nnnn pentru facturile de înlocuire, %syymm-nnnn pentru credit note şi %syymm-nnnn pentru credit note unde yy este anul, mm este luna şi nnnn este o secvenţă continuă şi nu revine la 0 TerreNumRefModelError=O factură începând cu $syymm există deja și nu este compatibilă cu acest model de numerotaţie. Înşăturaţi-o sau redenumiți-o pentru a activa acest modul. ##### Types de contacts ##### diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang index 66b804d891e..d1f0c5e6c65 100644 --- a/htdocs/langs/ro_RO/boxes.lang +++ b/htdocs/langs/ro_RO/boxes.lang @@ -2,90 +2,95 @@ BoxLastRssInfos=Rss informaţii BoxLastProducts=Ultimele produse / servicii BoxProductsAlertStock=Alertă produse în stoc -BoxLastProductsInContract=Ultima contractate de produse / servicii -BoxLastSupplierBills=Ultima furnizorului facturi -BoxLastCustomerBills=Ultimul client a facturilor -BoxOldestUnpaidCustomerBills=Primele facturi neachitate clientului -BoxOldestUnpaidSupplierBills=Primele facturi neachitate furnizorului -BoxLastProposals=Ultima comerciale propuneri -BoxLastProspects=Ultima perspectivele -BoxLastCustomers=Ultima clienţi -BoxLastSuppliers=Ultima furnizori -BoxLastCustomerOrders=Ultima client ordinelor -BoxLastBooks=Ultimele cărţi -BoxLastActions=Ultima acţiuni +BoxLastProductsInContract=Ultimele %s produse / servicii contractate +BoxLastSupplierBills=Ultimele facturi furnizori +BoxLastCustomerBills=Ultimele facturi clienţi +BoxOldestUnpaidCustomerBills=Cele mai vechi facturi clienţi neîncasate +BoxOldestUnpaidSupplierBills=Cele mai vechi facturi clienţi neplătite +BoxLastProposals=Ultimele oferte comerciale +BoxLastProspects=Ultimele perspecte modificate +BoxLastCustomers=Ultimii clienţi modificaţi +BoxLastSuppliers=Ultimii furnizori modificaţi +BoxLastCustomerOrders=Ultimele comenzi clienţi +BoxLastValidatedCustomerOrders=Ultimele comenzi clienţi validate +BoxLastBooks=Ultimele marcaje +BoxLastActions=Ultimele acţiuni BoxLastContracts=Ultimele contracte -BoxLastContacts=Ultimele date de contact / adresele -BoxLastMembers=Ultimele membri +BoxLastContacts=Ultimele contacte / adrese +BoxLastMembers=Ultimii membri BoxFicheInter=Ultimele intervenţii -# BoxCurrentAccounts=Opened accounts balance -BoxSalesTurnover=Vanzari cifra de afaceri -BoxTotalUnpaidCustomerBills=Total facturi neachitate clientului -BoxTotalUnpaidSuppliersBills=Total facturi neachitate furnizorului -BoxTitleLastBooks=Ultima %s înregistrate cărţi -BoxTitleNbOfCustomers=Nombre de client -BoxTitleLastRssInfos=Ultimele noutăţi de la %s %s -BoxTitleLastProducts=Ultima %s modificate produse / servicii +BoxCurrentAccounts=Solduri conturi deschise +BoxSalesTurnover=Cifra de afaceri Vânzări +BoxTotalUnpaidCustomerBills=Total facturi clienţi neîncasate +BoxTotalUnpaidSuppliersBills=Total facturi furnizori neplătite +BoxTitleLastBooks=Ultimele %s marcaje înregistrate +BoxTitleNbOfCustomers=Număr clienţi +BoxTitleLastRssInfos=Ultimele %s noutăţi de la %s +BoxTitleLastProducts=Ultimele %s produse / servicii modificate BoxTitleProductsAlertStock=Alertă produse în stoc -BoxTitleLastCustomerOrders=Ultima modificare %s client ordinelor -BoxTitleLastSuppliers=Ultima %s înregistrate de furnizori -BoxTitleLastCustomers=Ultima %s înregistrate de clienţi -BoxTitleLastModifiedSuppliers=%s Ultima modificare furnizori -BoxTitleLastModifiedCustomers=%s Ultima modificare clienţii -BoxTitleLastCustomersOrProspects=Ultima %s înregistrate de clienţi sau de perspectivele -BoxTitleLastPropals=Ultima %s înregistrate propuneri -BoxTitleLastCustomerBills=Ultima %s clientului facturi -BoxTitleLastSupplierBills=Ultima %s furnizorului facturi -BoxTitleLastProspects=Ultima %s înregistrate perspectivele -BoxTitleLastModifiedProspects=%s Ultima modificare perspective -BoxTitleLastProductsInContract=Ultima %s produse / servicii intr-un contract -BoxTitleLastModifiedMembers=%s Ultimele membri modificate +BoxTitleLastCustomerOrders=Ultimele %s comenzi clienți +BoxTitleLastModifiedCustomerOrders=Ultimele %s comenzi clienţi validate +BoxTitleLastSuppliers=Ultimii %s furnizori înregistraţi +BoxTitleLastCustomers=Ultimii %s clienţi înregistraţi +BoxTitleLastModifiedSuppliers=Ultimii %s furnizori modificaţi +BoxTitleLastModifiedCustomers=Ultimii %s clienţi modificaţi +BoxTitleLastCustomersOrProspects=Ultimii %s clienti sau prospecţi +BoxTitleLastPropals=Ultimele %s oferte +BoxTitleLastModifiedPropals=Ultimele %s oferte modificate +BoxTitleLastCustomerBills=Ultimele %s facturi clienţi +BoxTitleLastModifiedCustomerBills=Ultimele %s facturi clienţi modificate +BoxTitleLastSupplierBills=Ultimele %s facturi furnizori +BoxTitleLastModifiedSupplierBills=Ultimele %s facturi clienţi modificate +BoxTitleLastModifiedProspects=Ultimele %s prospecte modificate +BoxTitleLastProductsInContract=Ultimele %s produse / servicii intr-un contract +BoxTitleLastModifiedMembers=Ultimii %s membri BoxTitleLastFicheInter=Ultimele %s intervenţii modificate -BoxTitleOldestUnpaidCustomerBills=Cele mai vechi %s neachitate clientului facturi -BoxTitleOldestUnpaidSupplierBills=Cele mai vechi %s neachitate furnizorului, facturi -# BoxTitleCurrentAccounts=Opened account's balances -BoxTitleSalesTurnover=Vanzari cifra de afaceri -BoxTitleTotalUnpaidCustomerBills=Neachitate clientului facturi -BoxTitleTotalUnpaidSuppliersBills=Furnizorului, facturi neachitate -BoxTitleLastModifiedContacts=%s Ultima modificare contacte / adrese -BoxMyLastBookmarks=Ultima mea %s marcaje -BoxOldestExpiredServices=Cele mai vechi active de servicii a expirat -BoxLastExpiredServices=Ultimele %s mai vechi contacte cu serviciile de active expirate -BoxTitleLastActionsToDo=Ultima %s acţiunile de a face -BoxTitleLastContracts=Ultimele contracte %s -BoxTitleLastModifiedDonations=%s Ultima modificare donaţii -BoxTitleLastModifiedExpenses=%s Ultima modificare cheltuieli +BoxTitleOldestUnpaidCustomerBills=Cele mai vechi %s facturi clienţi neîncasate +BoxTitleOldestUnpaidSupplierBills=Cele mai vechi %s facturi furnizori neplătite +BoxTitleCurrentAccounts=Solduri conturi deschise +BoxTitleSalesTurnover=Cifra de afaceri vânzări +BoxTitleTotalUnpaidCustomerBills=Facturi clienţi neîncasate +BoxTitleTotalUnpaidSuppliersBills=Facturi furnizori neplătite +BoxTitleLastModifiedContacts=Ultimele %s contacte / adrese modificare +BoxMyLastBookmarks=Ultimele mele %s marcaje +BoxOldestExpiredServices=Cele mai vechi servicii active expirate +BoxLastExpiredServices=Cele mai vechi %s contacte cu serviciile active expirate +BoxTitleLastActionsToDo=Ultimele %s acţiuni de realizat +BoxTitleLastContracts=Ultimele %s contracte +BoxTitleLastModifiedDonations=Ultimele %s donaţii modificate +BoxTitleLastModifiedExpenses= Ultimele %s cheltuieli modificare BoxGlobalActivity=Activitate globală ( facturi, oferte, comenzi) -FailedToRefreshDataInfoNotUpToDate=Nu a reuşit să reîmprospătaţi flux RSS. Ultima reuşită a reîmprospăta data: %s -LastRefreshDate=Ultima data de reîmprospătare -NoRecordedBookmarks=No bookmarks defined. Click aici pentru a adăuga marcaje. +FailedToRefreshDataInfoNotUpToDate=Eşec la reîmprospătarea fluxului RSS. Ultima reîmprospătare reuşită la data: %s +LastRefreshDate=Ultima dată reîmprospătare +NoRecordedBookmarks=Niciun marcaj definit. ClickToAdd=Click aici pentru a adăuga. -NoRecordedCustomers=Nu înregistrate de clienţi -NoRecordedContacts=Nu sunt înregistrate date de contact -NoActionsToDo=Nr actiuni pentru a face -NoRecordedOrders=Nu înregistrate clientului ordinelor -NoRecordedProposals=Nu înregistrate propuneri -NoRecordedInvoices=Nu înregistrate clientului facturi -NoUnpaidCustomerBills=Nu neachitate clientului facturi -NoRecordedSupplierInvoices=Nu înregistrate furnizorului facturi -NoUnpaidSupplierBills=Nu facturi neachitate furnizorului -NoModifiedSupplierBills=Nici un furnizor nu a înregistrat facturile -NoRecordedProducts=Nu înregistrate produse / servicii -NoRecordedProspects=Nu înregistrate perspectivele -NoContractedProducts=Nu produse / servicii contractate -NoRecordedContracts=Nr contracte înregistrate -NoRecordedInterventions=Nici o intervenție înregistrată +NoRecordedCustomers=Niciun client înregistrat +NoRecordedContacts=Niciun contact înregistrat +NoActionsToDo=Nicio acţiune de realizat +NoRecordedOrders=Nicio comandă client înregistrată +NoRecordedProposals=Nicio ofertă înregistrată +NoRecordedInvoices=Nicio factură clienţi înregistrată +NoUnpaidCustomerBills=Nicio factură clienţi neîncasată +NoRecordedSupplierInvoices=Nicio factură furnizori înregistrată +NoUnpaidSupplierBills=Nicio factură furnizori neplătită +NoModifiedSupplierBills=Nicio factură furnizori înregistrată +NoRecordedProducts=Niciun produs / serviciu înregistrat +NoRecordedProspects=Niciun prospect înregistrat +NoContractedProducts=Niciun produs / serviciu contractat +NoRecordedContracts=Niciun contract înregistrat +NoRecordedInterventions=Nicio intervenție înregistrată BoxLatestSupplierOrders=Ultimele comenzi furnizori BoxTitleLatestSupplierOrders=Ultimele %s comenzi furnizori +BoxTitleLatestModifiedSupplierOrders=Ultimele %s comenzi clienţi modificate NoSupplierOrder=Nicio comandă furnizor inregistrată -BoxCustomersInvoicesPerMonth=Facturi Clienţi pe lună -BoxSuppliersInvoicesPerMonth=Facturi Furnizori pe lună -BoxCustomersOrdersPerMonth=Comenzi clienţi pe lună -BoxSuppliersOrdersPerMonth=Comenzi furnizori pe lună -BoxProposalsPerMonth=Propuneri pe lună -NoTooLowStockProducts=Niciun produs sub limita minima de stoc +BoxCustomersInvoicesPerMonth=Facturi clienţi pe luni +BoxSuppliersInvoicesPerMonth=Facturi furnizori pe luni +BoxCustomersOrdersPerMonth=Comenzi clienţi pe luni +BoxSuppliersOrdersPerMonth=Comenzi furnizori pe luni +BoxProposalsPerMonth=Oferte pe luni +NoTooLowStockProducts=Niciun produs sub stocul de siguranţă BoxProductDistribution=Distribuţie Produse / Servicii -BoxProductDistributionFor=Distribuţie de %s pentru%s -ForCustomersInvoices=Facturi Clienţi +BoxProductDistributionFor=Distribuţia de %s pe %s +ForCustomersInvoices=Facturi clienţi ForCustomersOrders=Comenzi clienți -ForProposals=Propuneri comerciale +ForProposals=Oferte comerciale diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang index dd4279eaf29..f40aaeae237 100644 --- a/htdocs/langs/ro_RO/cashdesk.lang +++ b/htdocs/langs/ro_RO/cashdesk.lang @@ -1,40 +1,40 @@ # 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 FilterRefOrLabelOrBC=Caută (Ref/Etichetă) -# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. +UserNeedPermissionToEditStockToUsePos=Ca să scadă stocul la crearea facturii utilizatorul care foloseşte POSul trebuie sa aibă permisiunea de a edita stocul. diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang index 4e958bc4cc4..ee71f82dd42 100644 --- a/htdocs/langs/ro_RO/categories.lang +++ b/htdocs/langs/ro_RO/categories.lang @@ -5,18 +5,18 @@ Rubrique=Categorie Rubriques=Categorii categories=categorii TheCategorie=Categoria -NoCategoryYet=Nici o categorie de acest tip creată +NoCategoryYet=Nicio categorie de acest tip creată In=În AddIn=Adăugă în modify=modifică Classify=Clasează -CategoriesArea=Zona Categorii -ProductsCategoriesArea=Zona Categorii Produse / Servicii -SuppliersCategoriesArea=Zona Categorii Furnizori -CustomersCategoriesArea=Zona Categorii Clienţii -ThirdPartyCategoriesArea=Zona Categorii Terţi -MembersCategoriesArea=Zona Categorii Membrii -ContactsCategoriesArea=Zona Categorii Contacte +CategoriesArea=CATEGORII +ProductsCategoriesArea=Categorii Produse / Servicii +SuppliersCategoriesArea=Categorii Furnizori +CustomersCategoriesArea=Categorii Clienţii +ThirdPartyCategoriesArea=Categorii Terţi +MembersCategoriesArea=Categorii Membrii +ContactsCategoriesArea=Categorii Contacte MainCats=Categorii Principale SubCats=Subcategorii CatStatistics=Statistici @@ -66,7 +66,7 @@ ReturnInCompany=Inapoi la Fişa client / prospect ContentsVisibleByAll=Conţinutul va fi vizibil pentru toţi ContentsVisibleByAllShort=Conţinut vizibil de către toţi ContentsNotVisibleByAllShort=Conţinutul nu va fi vizibil pentru toţi -CategoriesTree=Categories tree +CategoriesTree=Arborescenţă Categorii DeleteCategory=Şterge categorie ConfirmDeleteCategory=Sigur doriţi să ştergeţi această categorie? RemoveFromCategory=Eliminaţi link-ul cu Categoria @@ -101,14 +101,12 @@ CatSupLinks=Legături dintre furnizori şi categorii CatCusLinks=Legături dintre clienţi/prospecte şi categorii CatProdLinks=Legături dintre produse/servicii şi categorii CatMemberLinks=Legături dintre membrii şi categorii -CatProdLinks=Legături dintre produse/servicii şi categorii -CatCusLinks=Legături dintre clienţi/prospecte şi categorii -CatSupLinks=Legături dintre furnizori şi categorii DeleteFromCat=Elimină din categorii -DeletePicture=Picture delete -ConfirmDeletePicture=Confirm picture deletion? -ExtraFieldsCategories=Complementary attributes -CategoriesSetup=Categories setup -CategorieRecursiv=Link with parent category automatically -CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory -AddProductServiceIntoCategory=Add the following product/service +DeletePicture=Şterge Foto +ConfirmDeletePicture=Confirmaţi ştergere foto ? +ExtraFieldsCategories=Atribute complementare +CategoriesSetup=Setare Categorii +CategorieRecursiv=Link automat către categoria părinte +CategorieRecursivHelp=Dacă este activat, produsul va fi legat către categoria părinte atunci când este adăugat în subcategorie +AddProductServiceIntoCategory=Add următoarele produseservicii +ShowCategory=Arată categorie diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang index 3b0bcf9bef4..78eb9aecfc7 100644 --- a/htdocs/langs/ro_RO/commercial.lang +++ b/htdocs/langs/ro_RO/commercial.lang @@ -1,17 +1,17 @@ # Dolibarr language file - Source file is en_US - commercial Commercial=Comercial -CommercialArea=Zona Comercial +CommercialArea=Comercial CommercialCard=Fişa Comercial -CustomerArea=Zona Clienţi +CustomerArea=Clienţi Customer=Client Customers=Clienţi Prospect=Prospect Prospects=Prospecte DeleteAction=Ştergeţi o acţiune / sarcină NewAction=Eveniment / sarcină nouă -AddAction=Adaugă eveniment/ sarcină -AddAnAction=Adaugă eveniment / sarcină -AddActionRendezVous=Adaugă un eveniment întălnire +AddAction=Creare Eveniment / sarcină +AddAnAction=Crează un Eveniment / sarcină +AddActionRendezVous=Crează un eveniment întălnire Rendez-Vous=Întâlnire ConfirmDeleteAction=Sunteţi sigur că doriţi să ştergeţi aceast eveniment? CardAction=Fişă Eveniment @@ -44,8 +44,8 @@ DoneActions=Lista evenimentelor realizate DoneActionsFor=Lista evenimentelor realizate pentru %s ToDoActions=Lista evenimentelor incomplete ToDoActionsFor=Lista evenimentelor incomplete pentru %s -SendPropalRef=Trimite propunerea comercială %s -SendOrderRef=Trimite comanda %s +SendPropalRef=Transmitere ofertă comercială %s +SendOrderRef=Transmitere comandă %s StatusNotApplicable=Nu se aplică StatusActionToDo=De realizat StatusActionDone=Realizat @@ -62,16 +62,16 @@ LastProspectContactDone=Prospecte contactate DateActionPlanned=Dată realizare prevăzută DateActionDone=Dată realizare efectivă ActionAskedBy=Eveniment înregistrat de -ActionAffectedTo=Eveniment atribuit la +ActionAffectedTo=Evenimente aparţinând de ActionDoneBy=Eveniment realizat de către ActionUserAsk=Raportat de ErrorStatusCantBeZeroIfStarted=Dacă câmpul "Data reală debut realizare" este completat, acţiunea este începută (sau terminată), astfel câmpul "Status" nu poate fi 0%%. ActionAC_TEL=Apel Telefonic ActionAC_FAX=Trimitere fax -ActionAC_PROP=Trimitere propunere pe mail +ActionAC_PROP=Trimitere ofertă pe mail ActionAC_EMAIL=Trimitere email ActionAC_RDV=Întâlniri -ActionAC_INT=Intervention on site +ActionAC_INT=Intervenţie pe site ActionAC_FAC=Trimitere factura client pe mail ActionAC_REL=Retrimitere factura client (memento) ActionAC_CLO=Închide @@ -91,6 +91,6 @@ MargeOrder=Marje( comenzi validate) RecapAnnee=Sinteza anului NoData=Nu sunt date StatusProsp=Statut Prospect -DraftPropals=Proiectul de propuneri comerciale -SearchPropal=Căutaţi o propunere comercială +DraftPropals=Oferte Comerciale Schiţă +SearchPropal=Căutaţi o ofertă comercială CommercialDashboard=Sinteza comercială diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang index ac08a1819dd..40a002486d0 100644 --- a/htdocs/langs/ro_RO/companies.lang +++ b/htdocs/langs/ro_RO/companies.lang @@ -18,8 +18,8 @@ NewCompany=Societate nouă (prospect, client, furnizor) NewThirdParty=Terţ nou (prospect, client, furnizor) NewSocGroup=Grup nou de societăţi NewPrivateIndividual=Particular nou(prospect, client, furnizor) -CreateDolibarrThirdPartySupplier=Create a third party (supplier) -ProspectionArea=Zona Prospecte +CreateDolibarrThirdPartySupplier=Creare terţ ( furnizor) +ProspectionArea=Prospecte SocGroup=Grup de societăţi IdThirdParty=ID Terţ IdCompany=ID Societate @@ -83,7 +83,7 @@ DefaultLang=Limba implicită VATIsUsed=Utilizează TVA-ul VATIsNotUsed=Nu utilizează TVA-ul CopyAddressFromSoc=Completaţi adresa cu adresa terţului -NoEmailDefined=There is no email defined +NoEmailDefined=Nu există email definit ##### Local Taxes ##### LocalTax1IsUsedES= RE este utilizat LocalTax1IsNotUsedES= RE nu este utilizat @@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF este utilizat LocalTax2IsNotUsedES= IRPF nu este utilizat LocalTax1ES=RE LocalTax2ES=IRPF -TypeLocaltax1ES=RE Type -TypeLocaltax2ES=IRPF Type -TypeES=Type +TypeLocaltax1ES=RE Tip +TypeLocaltax2ES=IRPF Tip +TypeES=Tip ThirdPartyEMail=%s WrongCustomerCode=Cod Client invalid WrongSupplierCode=Cod Furnizor invalid @@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Discounturi Absolute disponibile DiscountNone=Niciunul Supplier=Furnizor CompanyList=Lista Societăţilor -AddContact=Adaugă contact -AddContactAddress=Adaugă contact +AddContact=Creare contact +AddContactAddress=Creare contact/adresă EditContact=Editare contact EditContactAddress=Editează contact Contact=Contact @@ -268,8 +268,8 @@ ContactsAddresses=Contacte NoContactDefinedForThirdParty=Niciun contact definit pentru acest terţ NoContactDefined=Niciun contact definit DefaultContact=Contact Implicit -AddCompany=Adaugă societate -AddThirdParty=Adaugă un terţ +AddCompany=Creare companie +AddThirdParty=Creare terţ DeleteACompany=Şterge o societate PersonalInformations=Informaţii personale AccountancyCode=Cod Contabilitate @@ -298,11 +298,11 @@ ShowContact=Afişeză contact ContactsAllShort=Toate (fără filtru) ContactType=Tip Contact ContactForOrders=Contact Comenzi -ContactForProposals=Contact Propuneri +ContactForProposals=Contact Ofertă ContactForContracts=Contact Contracte ContactForInvoices=Contact Facturi NoContactForAnyOrder=Acest contact nu este contact pentru nici o comanda -NoContactForAnyProposal=AAcest contact nu este contact pentru nici o propunere comercială +NoContactForAnyProposal=Acest contact nu este contact pentru nicio ofertă comercială NoContactForAnyContract=Acest contact nu este contact pentru nici un contract NoContactForAnyInvoice=Acest contact nu este contact pentru nici o factură NewContact=Contact nou @@ -331,7 +331,7 @@ ContactPublic=Partajat ContactVisibility=Vizibilitate OthersNotLinkedToThirdParty=Alţii, nelegate la un terţ ProspectStatus=Statut Prospect -PL_NONE=Nici unul +PL_NONE=Niciunul PL_UNKNOWN=Necunoscut PL_LOW=Scăzut PL_MEDIUM=Mediu @@ -363,14 +363,14 @@ AttachANewFile=Ataşaţi un fişier nou NoRIB=Nici un BAN definit NoParentCompany=Niciunul ExportImport=Import-Export -ExportCardToFormat=Export fişă la format +ExportCardToFormat=Export fişă în format ContactNotLinkedToCompany=Contact nelegat la un terţ DolibarrLogin=Identificator utilizator NoDolibarrAccess=Niciun acces utilizator -ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ExportDataset_company_1=Terţi (societăţi / fundaţii/ persoane fizice) şi atribute ExportDataset_company_2=Contacte şi atribute -ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties -ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes +ImportDataset_company_1=Terţi (societăţi / fundaţii/ persoane fizice) şi atribute +ImportDataset_company_2=Contacte / Adrese(ale terţilor sau nu) şi atribute ImportDataset_company_3=Coordonate bancare PriceLevel=Nivel de Pret DeliveriesAddress=Adrese de livrare @@ -379,8 +379,8 @@ DeliveryAddressLabel=Eticheta Adresei de livrare DeleteDeliveryAddress=Ştergeţi o adresa de livrare ConfirmDeleteDeliveryAddress=Sigur doriţi să ştergeţi această adresă de livrare? NewDeliveryAddress=Adresa de livrare nouă -AddDeliveryAddress=Adaugă adresa -AddAddress=Adaugă adresa +AddDeliveryAddress=Creare adresă +AddAddress=Creare adresă NoOtherDeliveryAddress=Nici o adresa alternativă de livrare definită SupplierCategory=Categorie Furnizor JuridicalStatus200=Independent @@ -397,18 +397,18 @@ YouMustCreateContactFirst=Trebuie să creați e-mailuri de contact pentru terţi ListSuppliersShort=Lista furnizori ListProspectsShort=Lista prospecte ListCustomersShort=Lista clienţi -ThirdPartiesArea=Third parties and contact area +ThirdPartiesArea=Terţi şi Contacte LastModifiedThirdParties=Ultimii %s terţi modificaţi UniqueThirdParties=Total terţi unici InActivity=Deschis ActivityCeased=Închis ActivityStateFilter=Statut Activitate -ProductsIntoElements=List of products into %s +ProductsIntoElements=Lista produselor in %s CurrentOutstandingBill=Facturi in suspensie curente OutstandingBill=Max. pentru facturi in suspensie OutstandingBillReached=Max. atins pentru facturi in suspensie MonkeyNumRefModelDesc=Retrimite numărulcu formatul %syymm-nnnn pentru codul de client și %syymm-nnnn pentru codul de furnizor unde YY este anul, mm este luna și nnnn este o secvență continuă și fără să revină la 0. LeopardNumRefModelDesc=Codul este liber fîrî verificare. Acest cod poate fi modificat în orice moment. -ManagingDirectors=Manager(s) name (CEO, director, president...) -SearchThirdparty=Search thirdparty -SearchContact=Search contact +ManagingDirectors=Nume Manager(i) nume (CEO, director, preşedinte...) +SearchThirdparty=Caută terţ +SearchContact=Caută contact diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang index 99e1ac8f6d3..16f207b90e9 100644 --- a/htdocs/langs/ro_RO/compta.lang +++ b/htdocs/langs/ro_RO/compta.lang @@ -4,7 +4,7 @@ AccountancyCard=Fişă Contabilitate Treasury=Trezoreria MenuFinancial=Financiar TaxModuleSetupToModifyRules=Du-te la Configurare modul Taxe pentru a modifica regulile de calcul -TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation +TaxModuleSetupToModifyRulesLT=Du-te la Companie setup pentru a modifica regulile de calcul OptionMode=Opţiunea pentru ţinerea contabilitate OptionModeTrue=Opţiunea Venituri -Cheltuieli OptionModeVirtual=Opţiunea Creanţe-Datorii @@ -12,7 +12,7 @@ OptionModeTrueDesc=În acest context, se calculează cifra de afaceri de peste d OptionModeVirtualDesc=În acest context, cifra de afaceri se calculează pe facturi (data de validare). Când aceste facturi se datorează, indiferent dacă acestea au fost plătite sau nu, ele sunt enumerate în cifra de afaceri de ieşire. FeatureIsSupportedInInOutModeOnly=Caracteristicã disponibil doar în CREDITE-DEBTS Mod de contabilitate (a se vedea modul de configurare de contabilitate) VATReportBuildWithOptionDefinedInModule=Sumele prezentate aici sunt calculate folosind regulile definite de modul de configurare fiscale. -LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. +LTReportBuildWithOptionDefinedInModule=Sumele prezentate aici sunt calculate folosind regulile definite de modul de configurare Companie. Param=Setări RemainingAmountPayment=Suma rămasă de plată: AmountToBeCharged=Suma totală de plată: @@ -32,40 +32,40 @@ Profit=Profit Balance=Sold Debit=Debit Credit=Credit -Piece=Accounting Doc. +Piece= Doc. contabilitate 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 -LT1SummaryES=RE Balance -VATPaid=Plata TVA-ului -SalaryPaid=Salary paid +VATToPay=TVA vânzări +VATReceived=TVA recuperat +VATToCollect=TVA colectat +VATSummary=Sold TVA +LT2SummaryES=Sold IRPF +LT1SummaryES=RE Sold +VATPaid=TVA plătit +SalaryPaid=Plata salariu LT2PaidES=IRPF plătit -LT1PaidES=RE Paid +LT1PaidES=RE Platit LT2CustomerES=IRPF de vânzări LT2SupplierES=IRPF achiziţii -LT1CustomerES=RE sales -LT1SupplierES=RE purchases +LT1CustomerES=RE vanzări +LT1SupplierES=RE cumpărări VATCollected=TVA colectat ToPay=De plată ToGet=De rambursat -SpecialExpensesArea=Area for all special payments -TaxAndDividendsArea=Zona taxe, contribuţii sociale şi dividende +SpecialExpensesArea=Plăţi speciale +TaxAndDividendsArea=Taxe, Contribuţii Sociale şi Dividende SocialContribution=Contribuţie socială SocialContributions=Contribuţii sociale -MenuSpecialExpenses=Special expenses +MenuSpecialExpenses=Cheltuieli speciale MenuTaxAndDividends=Impozite şi dividende -MenuSalaries=Salaries +MenuSalaries=Salarii MenuSocialContributions=Contribuţii sociale MenuNewSocialContribution=Contribuţie nouă NewSocialContribution=Contribuţie socială nouă ContributionsToPay=Contribuţii de plată -AccountancyTreasuryArea=Zona Contabilitate / Trezorerie +AccountancyTreasuryArea=Contabilitate / Trezorerie AccountancySetup=Setări Contabilitate NewPayment=Plată nouă Payments=Plăţi @@ -73,21 +73,21 @@ PaymentCustomerInvoice=Plată factură client PaymentSupplierInvoice=Plată factură furnizor PaymentSocialContribution=Plată contribuţie socială PaymentVat=Plată TVA -PaymentSalary=Salary payment +PaymentSalary=Plata salariu ListPayment=Listă plăţi ListOfPayments=Lista plăţilor ListOfCustomerPayments=Listă plăţi clienţi ListOfSupplierPayments=Listă plăţi furnizori DatePayment=Data Plata -DateStartPeriod=Date start period -DateEndPeriod=Date end period +DateStartPeriod=Dată început perioadă +DateEndPeriod=Dată sfârşit perioadă NewVATPayment=Plata nouă TVA -newLT2PaymentES=Nou IRPF plată -newLT1PaymentES=New RE payment +newLT2PaymentES=Plată nouă IRPF +newLT1PaymentES=Plată nouă RE LT2PaymentES=IRPF de plata -LT2PaymentsES=IRPF Plăţi -LT1PaymentES=RE Payment -LT1PaymentsES=RE Payments +LT2PaymentsES=Plăţi IRPF +LT1PaymentES=RE Plată +LT1PaymentsES=RE Plăţi VATPayment=Plată TVA VATPayments=Plăţi TVA SocialContributionsPayments=Plăţi contribuţii sociale @@ -99,15 +99,16 @@ 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. CheckReceipt=Borderou de cecuri remise CheckReceiptShort=Borderou cecuri +LastCheckReceiptShort=Ultimele %s cecuri remise NewCheckReceipt=Discount nou NewCheckDeposit=New verifica depozit NewCheckDepositOn=New verifica depozit în contul: %s @@ -123,12 +124,12 @@ CalcModeVATDebt=Mod %s TVA pe baza contabilității de angajament %s. CalcModeVATEngagement=Mod %s TVA pe baza venituri-cheltuieli%s. CalcModeDebt=Mod %sCreanțe-Datorii%s zisă contabilitatea de angajamente CalcModeEngagement=Mod %sVenituri- Cheltuieli%s zisă contabilitatea de casă -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 +CalcModeLT1= Mode %sRE pe facturi clienţi - facturi furnizori %s +CalcModeLT1Debt=Mode %sRE pe facturi clienţi%s +CalcModeLT1Rec= Mode %sRE pe facturi furnizori%s +CalcModeLT2= Mode %sIRPF pe facturi clienţi - facturi furnizori%s +CalcModeLT2Debt=Mode %sIRPF pe facturi clienţi%s +CalcModeLT2Rec= Mode %sIRPF pe facturi furnizori%s AnnualSummaryDueDebtMode=Balanța de venituri și cheltuieli, rezumat anual AnnualSummaryInputOutputMode=Balanța de venituri și cheltuieli, rezumat anual AnnualByCompaniesDueDebtMode=Bilan des recettes et dpenses, dtail par niveluri, en Mod %sCrances-Dettes %s dit comptabilit de angajament. @@ -143,15 +144,15 @@ RulesCAIn=- Ea include toate plăţile efective a facturilor primite de la clien DepositsAreNotIncluded=- Facturile de depozit sunt nici nu sunt incluse DepositsAreIncluded=- Facturile de depozit sunt incluse LT2ReportByCustomersInInputOutputModeES=Raport de terţă parte IRPF -LT1ReportByCustomersInInputOutputModeES=Report by third party RE +LT1ReportByCustomersInInputOutputModeES=Raport pe terţ RE VATReportByCustomersInInputOutputMode=Raport după TVA client colectat și plătit VATReportByCustomersInDueDebtMode=Raport după TVA client colectat și plătit VATReportByQuartersInInputOutputMode=Raport după rata TVA colectată și plătită -LT1ReportByQuartersInInputOutputMode=Report by RE rate -LT2ReportByQuartersInInputOutputMode=Report by IRPF rate +LT1ReportByQuartersInInputOutputMode=Raport pe rată RE +LT2ReportByQuartersInInputOutputMode=Raport pe rată IRPF VATReportByQuartersInDueDebtMode=Raport după rata TVA colectată și plătită -LT1ReportByQuartersInDueDebtMode=Report by RE rate -LT2ReportByQuartersInDueDebtMode=Report by IRPF rate +LT1ReportByQuartersInDueDebtMode=Raport pe rată RE +LT2ReportByQuartersInDueDebtMode=Raport pe rată IRPF SeeVATReportInInputOutputMode=A se vedea raportul %sVAT encasement%s pentru un calcul standard SeeVATReportInDueDebtMode=A se vedea raportul privind %sVAT flow%s pentru un calcul, cu o opţiune de pe fluxul RulesVATInServices=- Pentru servicii, raportul include regularizările de TVA efectiv primite sau emise pe baza datelor plăților. @@ -161,12 +162,12 @@ RulesVATDueProducts=- Pentru activele materiale, aceasta include facturi cu TVA, OptionVatInfoModuleComptabilite=Notă: Pentru bunuri materiale, ar trebui să utilizeze la data livrării să fie mai echitabil. PercentOfInvoice=%%/factura NotUsedForGoods=Nu sunt utilizate pentru cumpărarea de bunuri -ProposalStats=Statistici privind propunerile +ProposalStats=Statistici privind ofertele 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 @@ -175,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 @@ -187,23 +188,19 @@ AccountancyDashboard=Sinteză Contabilitate ByProductsAndServices=După produse şi servicii RefExt=Referinţă externă ToCreateAPredefinedInvoice=Pentru a crea o factură predefinită, creaşi o factură standard, apoi, fără validarea aceasteia, faceți clic pe butonul"Converteşte ca factură predefinită". -LinkedOrder=Link to order +LinkedOrder=Link către comandă ReCalculate=Recalculează -Mode1=Method 1 +Mode1=Metoda 1 Mode2=Metoda 2 CalculationRuleDesc=Pentru a calcula totalul TVA, există două metode:
    Metoda 1 este rotunjirea TVA-ului pe fiecare linie, apoi însumarea lor.
    Metoda 2 este însumarea tututor TVA rilor de pe fiecare linie, apoi rotunjirea rezultatului.
    Rezultatul final poate fi diferit cu câțiva cenți. Modul implicit este %s. CalculationRuleDescSupplier=în funcție de furnizor, alege metoda potrivită pentru a aplica aceeași regulă de calcul și de a obține același rezultat așteptat de către furnizorul dumneavoastră. 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=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 +AccountancyJournal=Jurnal cod contabilitate +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 +ACCOUNTING_ACCOUNT_SUPPLIER=Cont Contabilitate Predefinit pentru terţi Furnizori +CloneTax=Clonaţi o contribuţie socială +ConfirmCloneTax=Confirmaţi Clona contribuţie sociale +CloneTaxForNextMonth=Clonaţi-o pentru luna următoare diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang index 997550f1177..739a7d2f2f8 100644 --- a/htdocs/langs/ro_RO/contracts.lang +++ b/htdocs/langs/ro_RO/contracts.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - contracts -ContractsArea=Zona Contracte +ContractsArea=Contracte ListOfContracts=Lista contracte -LastContracts=Ultimele %s contracte modificare +LastModifiedContracts=Ultimele %s contracte modificare AllContracts=Toate contractele ContractCard=Fişă Contract ContractStatus=Status Contract ContractStatusNotRunning=Fără service ContractStatusRunning=În service -ContractStatusDraft=Nevalidat +ContractStatusDraft=Schiţă ContractStatusValidated=Validat ContractStatusClosed=Închis ServiceStatusInitial=Inactiv @@ -27,7 +27,7 @@ MenuRunningServices=Servicii active MenuExpiredServices=Servicii expirate MenuClosedServices=Servicii închise NewContract=Contract nou -AddContract=Adaugă contract +AddContract=Crează contract SearchAContract=Caută contract DeleteAContract=Şterge contract CloseAContract=Închide 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=Ultimele %s contracte modificare +LastContracts=Ultimele %s contracte LastActivatedServices=Ultimele %s servicii activate LastModifiedServices=Ultimele %s servicii modificate EditServiceLine=Editează linie serviciu @@ -73,7 +73,7 @@ ServicesNomberShort=%s serviciu (ii) RunningServices=Servicii active BoardRunningServices=Servicii active şi expirate ăn contract ServiceStatus=Status serviciu -DraftContracts=Contracte nevalidate +DraftContracts=Contracte schiţă CloseRefusedBecauseOneServiceActive=Contractul nu poate fi închis după cum există cel puţin un serviciu deschis pe ea CloseAllContracts=Închide toateliniile de contracte DeleteContractLine=Şterge o linie de contract @@ -89,8 +89,9 @@ ListOfServicesToExpireWithDuration=Lista servicii care expiră în %s zile ListOfServicesToExpireWithDurationNeg=Lista serviciilor expirate de mai bine de %s zile 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=Standard contracts template -ContactNameAndSignature=For %s, name and signature: +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 c597305e2f9..c774dfce023 100644 --- a/htdocs/langs/ro_RO/cron.lang +++ b/htdocs/langs/ro_RO/cron.lang @@ -1,22 +1,14 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = Despre CronAbout = Despre Cron CronAboutPage = Despre pagina cron - -# # Right -# Permission23101 = Citeste sarcină programată Permission23102 = Creare/Modificare sarcină programată Permission23103 = Ştergeţi o sarcină programată Permission23104 = Execută sarcină programată - -# # Admin -# CronSetup= Setare Managementul joburilor programate URLToLaunchCronJobs=URL-ul pentru a verifica și a lansa joburi cron, dacă este necesar OrToLaunchASpecificJob=Sau pentru a verifica și a lansa un anumit job @@ -24,20 +16,11 @@ KeyForCronAccess=Cheie de securitate pentru URL de lansare a joburilor cron FileToLaunchCronJobs=Linie de comandă pentru lansare joburi cron CronExplainHowToRunUnix=Pe mediul Unix veţi utiliza instrumentul crontab pentru a rula linia de comanda la fiecare minut 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= Lista joburilor actice -CronListInactive= Lista joburilor dezactivate -CronListActive= Lista joburilor actice - - -# +CronListActive=Lista activelor/programatelor joburi +CronListInactive=Lista joburilor dezactivate # Page list -# CronDateLastRun=Ultima rulare CronLastOutput=Ieşirea ultimei rulări CronLastResult=Codul ultimului rezultat @@ -70,10 +53,7 @@ CronLabel=Descriere CronNbRun=Nr. lansări CronEach=Fiecare JobFinished=Job lansat şi terminat - -# #Page card -# CronAdd= Adaugă joburi CronHourStart= Data şi Ora de start a sarcinii CronEvery= Şi execută sarcina la fiecare @@ -95,20 +75,12 @@ CronObjectHelp=Numele obiectului de încărcat.
    De exemplu să aducă metod CronMethodHelp=Metoda obiectului de încărcat.
    De exemplu să aducă metoda de obiect Produs Dolibarr /htdocs/product/class/product.class.php, valoarea metodei este fecth CronArgsHelp=Argumentele metodei .
    De exemplu să aducă metoda obiect ului Produs Dolibarr /htdocs/product/class/product.class.php, valoarea parametrilor pot fi este 0, ProductRef CronCommandHelp=Linia de comandă de sistem pentru a executa. - -# # Info -# CronInfoPage=Informatie - - -# # Common -# CronType=Tip sarcină CronType_method=Apel metodă a Clasei Dolibarr CronType_command=Comandă shell CronMenu=Cron CronCannotLoadClass=Nu pot încărca clasa %s sau obiectul %s - UseMenuModuleToolsToAddCronJobs=Intrați în meniul ''Acasă - Instrumentele modulelor - Lista de job-uri'' pentru a vedea și edita job-urile programate. diff --git a/htdocs/langs/ro_RO/deliveries.lang b/htdocs/langs/ro_RO/deliveries.lang index 9d077cfb5c9..9d28a1b5ce5 100644 --- a/htdocs/langs/ro_RO/deliveries.lang +++ b/htdocs/langs/ro_RO/deliveries.lang @@ -1,21 +1,21 @@ # Dolibarr language file - Source file is en_US - deliveries Delivery=Livrare Deliveries=Livrări -DeliveryCard=Livrarea carte -DeliveryOrder=De livrare pentru -DeliveryOrders=Livrarea comenzilor +DeliveryCard=Fişă Livrarea +DeliveryOrder=Ordin de livrare +DeliveryOrders=Ordine de livrare DeliveryDate=Data de livrare -DeliveryDateShort=Deliv. dată -CreateDeliveryOrder=Generarea de livrare pentru +DeliveryDateShort=Dată livr. +CreateDeliveryOrder=Generare ordine de livrare QtyDelivered=Cantitate livrată SetDeliveryDate=Setaţi data de expediere -ValidateDeliveryReceipt=Validate livrare la primirea -ValidateDeliveryReceiptConfirm=Sunteţi sigur că doriţi pentru a valida acest livrare primire? -DeleteDeliveryReceipt=Ştergeţi confirmare de primire -DeleteDeliveryReceiptConfirm=Sunteţi sigur că doriţi să ştergeţi %s de livrare de primire? +ValidateDeliveryReceipt=Validare recepţie livrare +ValidateDeliveryReceiptConfirm=Sigur doriţi să validaţi această receptie ? +DeleteDeliveryReceipt=Ştergeţi recepţie livrare +DeleteDeliveryReceiptConfirm=Sunteţi sigur că doriţi să ştergeţi recepţia livrării %s ? DeliveryMethod=Metoda de livrare TrackingNumber=Număr de urmărire -DeliveryNotValidated=De livrare nu au fost validate +DeliveryNotValidated=Livrare nevalidată # merou PDF model NameAndSignature=Nume şi Semnătura: ToAndDate=To___________________________________ pe ____ / _____ / __________ @@ -23,4 +23,6 @@ GoodStatusDeclaration=Au primit bunurile în bună stare de mai sus, Deliverer=Eliberator: Sender=Expeditor Recipient=Recipient -# ErrorStockIsNotEnough=There's not enough stock +ErrorStockIsNotEnough=Nu există stoc suficient +Shippable=Livrabil +NonShippable=Nelivrabil diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang index 3a99e656af4..4037e2ffbb7 100644 --- a/htdocs/langs/ro_RO/donations.lang +++ b/htdocs/langs/ro_RO/donations.lang @@ -4,7 +4,7 @@ Donations=Donaţii DonationRef=Ref. Donaţie Donor=Donator Donors=Donatori -AddDonation=Adaugă o donaţie +AddDonation=Crează o donaţie NewDonation=Donaţie nouă ShowDonation=Afişează donaţia DonationPromise=Promisiune Donaţie @@ -14,11 +14,11 @@ DonationsPaid=Donaţii plătite DonationsReceived=Donaţii încasate PublicDonation=Donaţie Publică DonationsNumber=Număr donaţii -DonationsArea=Zona Donaţii -DonationStatusPromiseNotValidated=Promisiune nevalidată +DonationsArea=Donaţii +DonationStatusPromiseNotValidated=Promisiune schiţă DonationStatusPromiseValidated=Promisiune validată DonationStatusPaid=Donatie plătită -DonationStatusPromiseNotValidatedShort=Nevalidată +DonationStatusPromiseNotValidatedShort=Schiţă DonationStatusPromiseValidatedShort=Validată DonationStatusPaidShort=Plătită ValidPromess=Validează promisiune @@ -30,4 +30,9 @@ SearchADonation=Caută o donaţie DonationRecipient=Beneficiar donaţie ThankYou=Vă multumim IConfirmDonationReception=Beneficiarul declară primirea, ca donaţie , a următoarei sume -MinimumAmount=Minimum amount is %s +MinimumAmount=Valoarea minimă este %s +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/ecm.lang b/htdocs/langs/ro_RO/ecm.lang index 08ad4602c0a..28b152a9bf9 100644 --- a/htdocs/langs/ro_RO/ecm.lang +++ b/htdocs/langs/ro_RO/ecm.lang @@ -5,7 +5,7 @@ DocsGenerated=Documente Generate DocsElements=Elemente documente DocsThirdParties=Documente Terţi DocsContracts=Documente Contracte -DocsProposals=Documente Propuneri +DocsProposals=Documente oferte DocsOrders=Documente Comenzi DocsInvoices=Documente Facturi ECMNbOfDocs=Nr documente în director @@ -25,7 +25,7 @@ ECMNbOfFilesInDir=Număr fişiere în director ECMNbOfSubDir=Număr sub-directoare ECMNbOfFilesInSubDir=Număr fișiere în sub-directoare ECMCreationUser=Creator -ECMArea=Zona EDM +ECMArea=EDM ECMAreaDesc=Zona EDM (Electronic Document Management), vă permite să salvați, partajaţi și să căutați rapid tot felul de documente în Dolibarr. ECMAreaDesc2=* Directoarele automate sunt completate în mod automat atunci când se adaugă documentele din fişa acelui element.
    * Directoarele manuale poate fi folosite pentru a salva documente ce nu sunt legate de un anumit element. ECMSectionWasRemoved=Directorul %s a fost ştears. @@ -37,7 +37,7 @@ ECMTypeManual=Manual ECMTypeAuto=Automat ECMDocsBySocialContributions=Documente legate de contribuţiile sociale ECMDocsByThirdParties=Documente legate de terţi -ECMDocsByProposals=Documente legate de propuneri +ECMDocsByProposals=Documente legate de oferte ECMDocsByOrders=Documente legate de comenzi clienţi ECMDocsByContracts=Documente legate de contractele d ECMDocsByInvoices=Documente legate de facturi clienţi diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang index ccec4530505..0f8dbb21b0a 100644 --- a/htdocs/langs/ro_RO/errors.lang +++ b/htdocs/langs/ro_RO/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Sursa obiective şi conturi bancare trebuie să f ErrorBadThirdPartyName=Bad valoarea de terţă parte nume ErrorProdIdIsMandatory=%s este obligatoriu ErrorBadCustomerCodeSyntax=Bad sintaxă pentru codul de client -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad sintaxă pentru furnizor cod ErrorCustomerCodeRequired=Clientul codul necesar ErrorBarCodeRequired=Cod de bare cerut ErrorCustomerCodeAlreadyUsed=Clientul codul folosit deja @@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Furnizor codul necesar ErrorSupplierCodeAlreadyUsed=Furnizor de cod folosit deja ErrorBadParameters=Bad parametrii ErrorBadValueForParameter=Valoarea greşită "%s" incorecte "pentru parametrul de %s -ErrorBadImageFormat=Fişier de imagine nu are un format acceptat +ErrorBadImageFormat=Fișier de imagine nu are un format acceptat (PHP dvs. nu acceptă funcții pentru a converti imagini de acest format) ErrorBadDateFormat="%s" Valoarea are formatul de dată greşit ErrorWrongDate=Data nu este corecta! ErrorFailedToWriteInDir=Nu a reuşit să scrie în directorul %s @@ -65,9 +65,9 @@ ErrorNoValueForCheckBoxType=Completaţi valorile pentru lista checkbox ErrorNoValueForRadioType=Completaţi valorile pentru lista radio ErrorBadFormatValueList=Valorile din lista nu pot aveae mai mult de o virgulă: % s , dar trebuie să aibă cel puțin una: cheie, valoare ErrorFieldCanNotContainSpecialCharacters=Câmp %s trebuie să nu conţine caractere speciale. -ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters. +ErrorFieldCanNotContainSpecialNorUpperCharacters=Câmpul %s nu trebuie să conțină caractere speciale, nici litere mari. ErrorNoAccountancyModuleLoaded=Nu activat modul de contabilitate -ErrorExportDuplicateProfil=This profile name already exists for this export set. +ErrorExportDuplicateProfil=Acest profil nume există deja pentru acest set de export. ErrorLDAPSetupNotComplete=Dolibarr-LDAP de potrivire nu este completă. ErrorLDAPMakeManualTest=A. Ldif fişier a fost generat în directorul %s. Încercaţi să încărcaţi manual de la linia de comandă pentru a avea mai multe informatii cu privire la erori. ErrorCantSaveADoneUserWithZeroPercentage=Nu se poate salva o acţiune cu "statut nu a început" în cazul în domeniu "realizat de către" este, de asemenea, completat. @@ -93,7 +93,7 @@ ErrorBadMaskFailedToLocatePosOfSequence=Eroare, fără a masca numărul de ordin ErrorBadMaskBadRazMonth=Eroare, Bad resetare valoarea ErrorSelectAtLeastOne=Eroare. Selectaţi cel puţin o intrare. ErrorProductWithRefNotExist=Produs cu "%s" de referinţă, nu există -ErrorDeleteNotPossibleLineIsConsolidated=Ştergeţi nu este posibil, deoarece înregistrarea este legat de o bancă, care este transation conciliate +ErrorDeleteNotPossibleLineIsConsolidated=Ştergerea nu este posibilă, deoarece înregistrarea este legată de tranzacţie bancară, care a fost decontată ErrorProdIdAlreadyExist=%s se atribuie o altă treime ErrorFailedToSendPassword=Nu a reuşit să trimită parola ErrorFailedToLoadRSSFile=Nu pentru a obţine RSS feed. Încercaţi să adăugaţi MAIN_SIMPLEXMLLOAD_DEBUG constantă în cazul în care mesajele de eroare nu furnizează suficiente informaţii. @@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User login cu %s nu a putut fi găsit. ErrorLoginHasNoEmail=Acest utilizator nu are nici o adresa de e-mail. Procesul de anulată. ErrorBadValueForCode=Bad valoare tipuri de cod. Încercaţi din nou cu o nouă valoare ... ErrorBothFieldCantBeNegative=%s Domenii şi %s nu poate fi atât negativ +ErrorQtyForCustomerInvoiceCantBeNegative=Cantitatea pentru linia unei facturi client nu poate fi negativa. ErrorWebServerUserHasNotPermission=Contul de utilizator %s folosite pentru a executa serverul de web nu are permisiunea, pentru că ErrorNoActivatedBarcode=Nici un tip de coduri de bare activat ErrUnzipFails=Eşec la dezarhivarea fişierului %s cu ZipArchive @@ -133,10 +134,28 @@ ErrorPHPNeedModule=Eroare, PHP trebuie să aibă modul %s instalat pentru ErrorOpenIDSetupNotComplete=Trebuie setat fișier de configurare Dolibarr pentru a permite autentificarea OpenID, dar URL-ul serviciului OpenID nu este definit în constanta %s ErrorWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere ErrorBadFormat=Format gresit! -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 +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Eroare, acest membru nu este încă legat de nici un terţ. Link Membru catre un terţ ezistent sau creați un nou terţ înainte de crearea abonamentului cu factura. +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 decontată +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 @@ -154,6 +173,6 @@ WarningCloseAlways=Atenţie, închiderea are loc chiar dacă suma diferă. Nu ac WarningUsingThisBoxSlowDown=Atenție, folosind această casetă încetiniţi serios toate paginile ce arată caseta. WarningClickToDialUserSetupNotComplete=Setările informațiilor ClickToDial pentru userul dvs. nu sunt complete (vezi tabul ClickToDial pe fişal dvs. de utilizator). WarningNotRelevant=Operaţiuni irelevante pentru acest 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 +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcţionalitate dezactivată atunci când configurarea de afișare este optimizată pentru nevăzători sau de browsere text . +WarningPaymentDateLowerThanInvoiceDate=Data plăţii(%s) este mai veche decât data facturii (%s) pentru factura %s +WarningTooManyDataPleaseUseMoreFilters=Prea multe date. Folosiţi mai multe filtre diff --git a/htdocs/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang index c02839107b6..0d07957e8a1 100644 --- a/htdocs/langs/ro_RO/exports.lang +++ b/htdocs/langs/ro_RO/exports.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - exports -ExportsArea=Exporturi zona -ImportArea=Import zona +ExportsArea=Export +ImportArea=Import NewExport=New export NewImport=New import ExportableDatas=Exportabil de date @@ -8,25 +8,25 @@ ImportableDatas=Importable de date SelectExportDataSet=Alegeţi de date pe care doriţi să le export ... SelectImportDataSet=Alegeţi de date pe care doriţi să o import ... SelectExportFields=Alegeţi câmpurile pe care doriţi să le de export, sau selectaţi un profil predefinit de export -SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile: -NotImportedFields=Domenii de fişier sursă nu importate +SelectImportFields=Alegeţi câmpurile din fișier sursă pe care doriți să importați și câmpurile lor țintă în baza de date mutând în sus și în jos cu ancora %s sau selectați un profil de import predefinit: +NotImportedFields=Câmpurile fişierului sursă nu importate SaveExportModel=Salvaţi acest profil de export dacă aveţi de gând să-l refolosire mai târziu ... SaveImportModel=Salvaţi acest profil de import dacă aveţi de gând să-l refolosire mai târziu ... ExportModelName=Export profil nume ExportModelSaved=Export profil salvat sub numele %s. -ExportableFields=Exportabil domenii -ExportedFields=Exportate domenii +ExportableFields=Câmpuri exportabile +ExportedFields=Câmpuri exportate ImportModelName=Import profil nume ImportModelSaved=Import profil salvat sub numele %s. -ImportableFields=Importable domenii -ImportedFields=Importate domenii +ImportableFields=Câmpuri importabile +ImportedFields=Câmpuri importate DatasetToExport=De date la export DatasetToImport=De date pentru a importa -NoDiscardedFields=Nici un câmp în fişierul sursă sunt aruncate +NoDiscardedFields=Niciun câmp din fişierul sursă sunt înlăturat Dataset=De date ChooseFieldsOrdersAndTitle=Alegeţi câmpurile pentru ... -FieldsOrder=Domenii pentru -FieldsTitle=Domenii titlu +FieldsOrder=Câmpuri pentru +FieldsTitle=Câmpuri titlu FieldOrder=Pentru domeniul FieldTitle=Domeniul titlu ChooseExportFormat=Alegeţi formatul de export @@ -63,10 +63,10 @@ DownloadEmptyExample=Descărcaţi exemplu de sursă gol fişier ChooseFormatOfFileToImport=Alegeţi formatul de fişier pentru al utiliza ca formatul de fişier de import, făcând clic pe picto %s pentru ao selecta ... ChooseFileToImport=Alegeţi fişier pentru a importa apoi faceţi clic pe picto %s ... SourceFileFormat=Sursa Format fişier -FieldsInSourceFile=Domenii in fişierul sursă +FieldsInSourceFile=Câmpuri in fişierul sursă FieldsInTargetDatabase=Câmpuri-țintă în baza de date Dolibarr (bold = obligatoriu) Field=Câmp -NoFields=Nici un câmp +NoFields=Niciun câmp MoveField=Mutare coloana %s domeniul număr ExampleOfImportFile=Example_of_import_file SaveImportProfile=Salvaţi acest profil de import @@ -81,11 +81,11 @@ DoNotImportFirstLine=Nu de import prima linie a fişierului sursă NbOfSourceLines=Numărul de linii în fişierul sursă NowClickToTestTheImport=Verificaţi parametrii de import aţi definit. Dacă sunt corecte, faceţi clic pe butonul "%s" pentru a lansa o simulare a procesului de import (nu există date va fi schimbat în baza de date, e doar o simulare pentru moment) ... RunSimulateImportFile=Lansarea simulare de import -FieldNeedSource=This field requires data from the source file +FieldNeedSource=Acest câmp cere date din fişierul sursă SomeMandatoryFieldHaveNoSource=Unele câmpuri obligatorii nu au nicio sursă de date de la dosar InformationOnSourceFile=Informaţii privind fişier sursă -InformationOnTargetTables=Informaţii privind domeniile-ţintă -SelectAtLeastOneField=domeniul Switch cel puţin o sursă din coloana de domenii de export +InformationOnTargetTables=Informaţii privind câmpurile ţintă +SelectAtLeastOneField=Comută cel puțin un câmp sursă în coloana de câmpuri de exportat SelectFormat=Alegeţi acest fişier format de import RunImportFile=Lansarea de import dosar NowClickToRunTheImport=Verificaţi rezultat al simulării de import. Daca totul este ok, lansarea de import definitiv. @@ -102,18 +102,18 @@ NbOfLinesImported=Numărul de linii cu succes importate: %s. DataComeFromNoWhere=Valoare pentru a introduce vine de nicăieri în fişierul sursă. DataComeFromFileFieldNb=Valoare pentru a introduce %s vine de la numărul de câmp în fişierul sursă. DataComeFromIdFoundFromRef=Valoare care vine de la %s numărul de câmp de fişier sursă vor fi utilizate pentru a găsi ID-ul de mamă obiectul pentru a utiliza (Deci %s Objet care a ref). Sursă de la dosar trebuie să există în 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=Codul care vine din câmpul numeric %s din fișier sursă va fi utilizat pentru a găsi id obiectului părinte pentru al folosi (Deci codul din fișierul sursă trebuie să existe în dicționarul%s). Rețineți că, dacă știți id ul, îl puteți utiliza, de asemenea în fișierul sursă în loc de cod. Import ar trebui să funcționeze în ambele cazuri. DataIsInsertedInto=Datele provin din fişierul sursă va fi inserat în câmpul de următoarele: DataIDSourceIsInsertedInto=Id-ul de mamă obiect găsit folosind datele din fişierul sursă, vor fi inserate în câmpul următoarele: DataCodeIDSourceIsInsertedInto=ID-ul de linie de la mamă găsit codul, va fi introdus în câmpul următorul text: SourceRequired=valoarea datelor este obligatorie SourceExample=Exemplu de valoare posibilă de date ExampleAnyRefFoundIntoElement=Orice Ref gasit pentru %s element -ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s -CSVFormatDesc=Comma Separated Value formatul de fişier (). Csv.
    Acesta este un format de fişier text în care câmpurile sunt separate prin separatorul [%s]. În cazul în care se găseşte în interiorul separatorului cu un conţinut de domeniu, domeniu este rotunjit cu caracter rotunde [%s]. caracter Escape pentru a scăpa de caractere rundă este [%s]. +ExampleAnyCodeOrIdFoundIntoDictionary=Orice cod (sau id) găsit în dicţionarul %s +CSVFormatDesc=Comma Separated Value format de fișier (csv).
    Acesta este un format de fișier text în care câmpurile sunt separate prin separatorul [%s]. Dacă separator se găsește în interiorul un conținut unui câmp, câmp este încadrat de caractere [%s]. Escape caracter este [%s]. Excel95FormatDesc=Excel format fişier (.xls)
    Acesta este format nativ Excel 95 (BIFF5). Excel2007FormatDesc=Excel format fişier (.xlsx)
    Acesta este format nativ Excel 2007 (SpreadsheetML). -TsvFormatDesc= Tab Separat Valoare format de fișier (. TSV)
    Acesta este un format de fișier text în care câmpurile sunt separate printr-un tabulator [tab]. +TsvFormatDesc= Tab Separat Valoare format de fișier (.tsv)
    Acesta este un format de fișier text în care câmpurile sunt separate printr-un tabulator [tab]. ExportFieldAutomaticallyAdded=Câmpul %s a fost adăugat în mod automat. Se va evita ca linii similare să fie tratate ca înregistrări dublate (cu acest câmp adaugat, toate liniile vor avea propriul lor ID și vor diferi). CsvOptions=Opţiuni Csv Separator=Separator @@ -123,10 +123,10 @@ BankCode=Cod bancă DeskCode=Cod birou BankAccountNumber=Număr cont BankAccountNumberKey=Cheie -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=Cod special +ExportStringFilter=%% permite înlocuirea unuia sau mai multor caractere in text +ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtrează după un an/lună/zi
    YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtrează peste un rang de ani/luni/zile
    > YYYY, > YYYYMM, > YYYYMMDD : filtrează pe toţi următorii ani/luni/zile
    < YYYY, < YYYYMM, < YYYYMMDD : filtrează pe toşi precedenţii ani/luni/zile +ExportNumericFilter='NNNNN' filtrează după o valoare
    'NNNNN+NNNNN' filtrează peste un rang de valori
    '>NNNNN' filtrează după valori mai mici
    '>NNNNN' filtrează după valori mai mari ## filters SelectFilterFields=Dacă doriți să filtrați pe anumite valori, doar introduceţi valorile aici. FilterableFields=Câmpuri filtrabile diff --git a/htdocs/langs/ro_RO/externalsite.lang b/htdocs/langs/ro_RO/externalsite.lang index f0375862b3d..a66dc1f4189 100644 --- a/htdocs/langs/ro_RO/externalsite.lang +++ b/htdocs/langs/ro_RO/externalsite.lang @@ -2,3 +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=Intrare Meniul meu diff --git a/htdocs/langs/ro_RO/ftp.lang b/htdocs/langs/ro_RO/ftp.lang index 8456d842899..b8eb5443990 100644 --- a/htdocs/langs/ro_RO/ftp.lang +++ b/htdocs/langs/ro_RO/ftp.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - ftp FTPClientSetup=Configurarea modulului client FTP NewFTPClient=Creează o nouă conexiune FTP -FTPArea=Aria FTP +FTPArea=FTP FTPAreaDesc=Acest ecran afișează conţinutul unui server FTP SetupOfFTPClientModuleNotComplete=Configurarea clientului FTP pare incompletă FTPFeatureNotSupportedByYourPHP=Versiunea PHP a dvs. nu are suport pentru funcţii FTP diff --git a/htdocs/langs/ro_RO/help.lang b/htdocs/langs/ro_RO/help.lang index 1696a827d78..6254c98c667 100644 --- a/htdocs/langs/ro_RO/help.lang +++ b/htdocs/langs/ro_RO/help.lang @@ -1,28 +1,28 @@ # Dolibarr language file - Source file is en_US - help -CommunitySupport=Forum / wiki sprijin -EMailSupport=E-mail-uri de sprijin -RemoteControlSupport=Online timp real / distanţă de sprijin -OtherSupport=Alte tipuri de sprijin +CommunitySupport=Forum/Wiki suport +EMailSupport=E-mail-uri suport +RemoteControlSupport=Suport în timp real / remote +OtherSupport=Alte tipuri de suport ToSeeListOfAvailableRessources=Pentru a contacta / vezi resurse disponibile: ClickHere=Click aici HelpCenter=Centrul de Ajutor DolibarrHelpCenter=Dolibarr Centrul de Ajutor şi Asistenţă ToGoBackToDolibarr=Altfel, faceţi clic aici pentru a utiliza Dolibarr -TypeOfSupport=Sursa de sprijin -TypeSupportCommunauty=Comunitare (gratuite) -TypeSupportCommercial=Comerciale +TypeOfSupport=Sursa suport +TypeSupportCommunauty=Comunitate (gratuit) +TypeSupportCommercial=Comercial TypeOfHelp=Tip -NeedHelpCenter=Aveţi nevoie de ajutor sau sprijin? +NeedHelpCenter=Aveţi nevoie de ajutor sau suport? Efficiency=Eficienţa TypeHelpOnly=Numai Ajutor TypeHelpDev=Ajutor + Dezvoltare TypeHelpDevForm=Ajutor + Dezvoltare + Formare -ToGetHelpGoOnSparkAngels1=Unele companii pot oferi o repede (cândva imediată) şi mai eficientă asistenţă online, prin luarea de control de pe computer. Aceste ajutoare pot fi găsite pe site-ul %s: -ToGetHelpGoOnSparkAngels3=De asemenea, puteţi să mergeţi la lista de toate disponibile pentru autocare Dolibarr, pentru aceasta, faceţi clic pe butonul -ToGetHelpGoOnSparkAngels2=Uneori, nu există nici o companie disponibile în acest moment pe care le faceţi dumneavoastră de căutare, aşa cred că pentru a schimba filtrul de a căuta "disponibilitatea tuturor". Vi se va putea trimite mai multe cereri. +ToGetHelpGoOnSparkAngels1=Unele companii pot oferi rapid (chiar imediat uneori) şi mai eficient asistenţă online, prin preluarea controlului de pe computer. Aceste ajutoare pot fi găsite pe site-ul : %s +ToGetHelpGoOnSparkAngels3=Puteți merge, de asemenea, la lista tuturor antrenorilor disponibili pentru Dolibarr, pentru aceasta click pe butonul +ToGetHelpGoOnSparkAngels2=Uneori, nu există nicio companie disponibilă în momentul în care faceţi dvs. căutarea, astfel schimbţi filtrul pentru a căuta pe "toți disponibili". Veți putea trimite mai multe cereri. BackToHelpCenter=Altfel, clic aici pentru a merge înapoi la pentru pagina de start a Centrul de Ajutor. -LinkToGoldMember=Aveţi posibilitatea să apelaţi unul dintre antrenor preselected de Dolibarr pentru limba dumneavoastră ( %s), făcând clic pe sale Widget (statutul şi preţul maxim sunt actualizate automat): -PossibleLanguages=Sprijinită de limbi +LinkToGoldMember=Puteți apela unul dintre antrenori preselectati de Dolibarr pentru limba (%s) făcând clic pe balonul Widget (statusul și prețul maxim sunt actualizate automat): +PossibleLanguages=Limbi suportate MakeADonation=Ajută proiectul Dolibarr, faceţi o donaţie SubscribeToFoundation=Ajută proiectul Dolibarr, subscrie la fundație SeeOfficalSupport=Pentru suport oficial Dolibarr în limba dvs:
    %s diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang index abd06541d7a..1e22f40b9b8 100644 --- a/htdocs/langs/ro_RO/holiday.lang +++ b/htdocs/langs/ro_RO/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Leaves -CPTitreMenu=Leaves +Holidays=Concedii +CPTitreMenu=Concedii MenuReportMonth=Situaţia lunară -MenuAddCP=Make a leave request -NotActiveModCP=You must enable the module Leaves to view this page. -NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . -NoCPforUser=You don't have any available day. -AddCP=Make a leave request +MenuAddCP=Crează o cerere de concediu +NotActiveModCP=Trebuie să activaţi modulul de concedii pentru a vedea această pagină. +NotConfigModCP=Trebuie să configuraţi modulul Concedii pentru a vedea această pagină.Pentru aceasta , clic aici . +NoCPforUser=Nu mai aveţi nici o zi disponibilă +AddCP=Crează o cerere de concediu Employe=Angajat DateDebCP=Dată început DateFinCP=Dată sfărşit @@ -18,24 +18,24 @@ ApprovedCP=Aprobat CancelCP=Şters RefuseCP=Refuzat ValidatorCP=Aprobator -ListeCP=List of leaves -ReviewedByCP=Va fi revăzut de +ListeCP=Listă cereri de concedii +ReviewedByCP=Va fi aprobat de DescCP=Descriere -SendRequestCP=Create leave request -DelayToRequestCP=Leave requests must be made at least %s day(s) before them. -MenuConfCP=Edit balance of leaves -UpdateAllCP=Update the leaves -SoldeCPUser=Leaves balance is %s days. +SendRequestCP=Crează o cerere de concediu +DelayToRequestCP=Cererile pentru concediu trebuiesc făcute cu cel puţin %s zi(le) înainte. +MenuConfCP=Editează soldul concediilor +UpdateAllCP=Actualizează concediile +SoldeCPUser=Soldul concediilor este de %s zile. ErrorEndDateCP=Trebuie să selectaţi data de sfârşit mai mare decât data de început. ErrorSQLCreateCP=O eroare SQL întâlnită în timpul creării: -ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ErrorIDFicheCP=O eroare a intervenit, cererea de concediu nu exista ReturnCP=Înapoi la pagina precedentă -ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request +ErrorUserViewCP=Dvs nu aveti dreptul de a citi aceata cerere de concediu. +InfosCP=Informaţii ale cererii de concediu InfosWorkflowCP=Flux de lucru Informatii RequestByCP=Solicitat de -TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed +TitreRequestCP=Cereri de concedii +NbUseDaysCP=Numărul de zile de concediu consumate EditCP=Editare DeleteCP=Ştergere ActionValidCP=Validare @@ -43,26 +43,25 @@ ActionRefuseCP=Refuzare ActionCancelCP=Anulare StatutCP=Status SendToValidationCP=Trimite spre validare -TitleDeleteCP=Delete the leave request -ConfirmDeleteCP=Confirm the deletion of this leave request? -ErrorCantDeleteCP=Error you don't have the right to delete this leave request. -CantCreateCP=You don't have the right to make leave requests. -InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Actualizare -CantUpdate=You cannot update this leave request. +TitleDeleteCP=Şterge cerere de concediu +ConfirmDeleteCP=Confirmaţi ştergerea acestei cereri de concediu? +ErrorCantDeleteCP=Eroare, dvs nu aveti drepturi de stergere acestei cereri de concediu. +CantCreateCP=Nu aveţi drepturile de a face cereri de concediu +InvalidValidatorCP=Dvs trebuie sa alegeti un aprobator pentru cererea dvs de concediu. +CantUpdate=Nu puteţi actualiza această cerere de concediu. NoDateDebut=Trebuie să selectaţi data de debut. NoDateFin=Trebuie să selectaţi data de sfârşit. ErrorDureeCP=Cererea dvs pentru concediu nu conţine zile lucrătoare. -TitleValidCP=Aprobaţi cererile de concediu -ConfirmValidCP=Are you sure you want to approve the leave request? +TitleValidCP=Aprobă cererea de concediu +ConfirmValidCP=Sunteţi sigur că doriţi să aprobaţi această cerere de concediu ? DateValidCP=Data aprobării -TitleToValidCP=Send leave request -ConfirmToValidCP=Are you sure you want to send the leave request? +TitleToValidCP=Trimite cererea de concediu +ConfirmToValidCP=Sunteţi sigur că doriţi să trimiteţi această cerere de concediu? TitleRefuseCP=Refuză cererea de concediu -ConfirmRefuseCP=Are you sure you want to refuse the leave request? +ConfirmRefuseCP=Sunteţi sigur că doriţi să refuzaţi această cerere de concediu? NoMotifRefuseCP=Trebuie să alegeţi un motiv pentru refuzarea cererii. TitleCancelCP=Anulează cererea de concediu -ConfirmCancelCP=Are you sure you want to cancel the leave request? +ConfirmCancelCP=Sunteţi sigur că doriţi să anulaţi cererea de concediu? DetailRefusCP=Motivul refuzului DateRefusCP=Data refuzului DateCancelCP=Data anulării @@ -72,8 +71,8 @@ MotifCP=Motiv UserCP=Utilizator ErrorAddEventToUserCP=O eroare a survenit in timpul adaugarii de concediu exceptional. AddEventToUserOkCP=Adaugarea de concediu exceptional a fost efectuat -MenuLogCP=View logs of leave requests -LogCP=Log of updates of available vacation days +MenuLogCP=Vezi logurile cererilor de concedii +LogCP=Loguri al actualizărilor zilelor de concediu ActionByCP=Realizat de UserUpdateCP=Pentru utilizatorul PrevSoldeCP=Soldul precedent @@ -81,33 +80,33 @@ NewSoldeCP=Soldul nou alreadyCPexist=O cerere de concediu a fost deja făcută pe această perioadă. UserName=Nume Employee=Angajat -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation +FirstDayOfHoliday=Prima zi a concediului +LastDayOfHoliday=Ultima zi a concediului HolidaysMonthlyUpdate=Actualizare lunară ManualUpdate=Actualizare manuală -HolidaysCancelation=Leave request cancelation +HolidaysCancelation=Anulare cerere concediu ## Configuration du Module ## ConfCP=Configurarea modulului concedii DescOptionCP=Descrierea opţiunii ValueOptionCP=Valoare -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Grup cu drepturi de aprobare a concediilor ConfirmConfigCP=Validare configuraţie -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Ultima actualizare automată a concediilor UpdateConfCPOK=Actualizare realizată. ErrorUpdateConfCP=O eroare a apărut în timpul actualizării, încercaţi din nou. -AddCPforUsers=Adaugaţi soldul concediului al utilizatorului la clic aici. -DelayForSubmitCP=Termen maxim de a aplica pentru concediu +AddCPforUsers=Adaugaţi soldul concediului alocat utilizatorului la clic aici. +DelayForSubmitCP=Termen maxim de a face o cerere de concediu AlertapprobatortorDelayCP=Previne aprobatorul daca cerere de concediu nu corespunde cu data limită -AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance -nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month -Module27130Name= Management of leave requests -Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request -TitleOptionEventCP=Settings of leave requets for events +AlertValidatorDelayCP=Preveine aprobatorul dacă cererea de concediu depaseste perioada de anuntare +AlertValidorSoldeCP=Previne aprobatorul daca utilizatorul cere zile de concediu ce depaseste soldul +nbUserCP=Numarul utilizatorilor suportaţi în modulul concedii +nbHolidayDeductedCP=Numărul zilelor de concediu de dedus pe zile de concediu luat +nbHolidayEveryMonthCP=Numar de zile de concediu adaugate în fiecare lună +Module27130Name= Managementul cererilor de concedii +Module27130Desc= Managementul cererilor de concedii +TitleOptionMainCP=Setări principale al cererilor de concedii +TitleOptionEventCP=Setări cereri concedii pentru evenimente ValidEventCP=Vaidare UpdateEventCP=Evenimente actualizate CreateEventCP=Creare @@ -127,23 +126,23 @@ UpdateEventOptionCP=Modifică ErrorMailNotSend=O eroare a intervenit la trimiterea mailului : NoCPforMonth=Niciun concediu această lună. nbJours=Număr zile -TitleAdminCP=Configuration of Leaves +TitleAdminCP=Configurarea modulului concedii #Messages Hello=Salut -HolidaysToValidate=Validate leave requests -HolidaysToValidateBody=Below is a leave request to validate -HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. -HolidaysValidated=Validated leave requests -HolidaysValidatedBody=Your leave request for %s to %s has been validated. -HolidaysRefused=Request denied -HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled leaved request -HolidaysCanceledBody=Your leave request for %s to %s has been canceled. -Permission20000=Read you own leave requests -Permission20001=Create/modify your leave requests -Permission20002=Create/modify leave requests for everybody -Permission20003=Delete leave requests -Permission20004=Setup users available vacation days -Permission20005=Review log of modified leave requests -Permission20006=Read leaves monthly report +HolidaysToValidate=Validează cereri concedii +HolidaysToValidateBody=Mai jos este o cerere de concediu de validat +HolidaysToValidateDelay=Această cerere de concediuva avea loc intr-o perioadă de mai puţin de %s zile. +HolidaysToValidateAlertSolde=Utilizatorul care a făcut această cerere de concediu nu avea destule zile disponibile. +HolidaysValidated=Cereri de concedii validate +HolidaysValidatedBody=Cererea dvs pentru concediu pentru %s la %s a fost validată. +HolidaysRefused=Cerere respinsă +HolidaysRefusedBody=Cererea dvs pentru concediu pentru %s la %s a fost respinsă pentru următoul motiv: +HolidaysCanceled=Cereri Concedii anulate +HolidaysCanceledBody=Cererea dvs pentru concediu pentru %s la %s a fost anulată. +Permission20000=Citeşte cererile de plecare proprii +Permission20001=Crează/modifică cererile tale de concediu +Permission20002=Creaează/modifică toate cererile de concediu +Permission20003=Şterge cererile de concediu +Permission20004=Configurare zile disponibile +Permission20005=Revezi logurile ale cererilor de concedii modificate +Permission20006=Citeşte raport concedii lunare diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang index 1e4ceeea37d..8229522a90d 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) @@ -161,13 +161,13 @@ ShowEditTechnicalParameters=Click aici pentru a vedea / edita parametrii avansa MigrationFixData=Fix pentru date denormalized MigrationOrder=Migrare a datelor pentru comenzile clienţilor MigrationSupplierOrder=Migrare de date pentru comenzi furnizor -MigrationProposal=Migrare de date pentru propuneri de proiecte comerciale +MigrationProposal=Migrare de date pentru oferte comerciale MigrationInvoice=Migrare de date pentru facturile clienţilor 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/interventions.lang b/htdocs/langs/ro_RO/interventions.lang index 9c30de5e36a..2a22b3277cd 100644 --- a/htdocs/langs/ro_RO/interventions.lang +++ b/htdocs/langs/ro_RO/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervenţie Interventions=Intervenţii InterventionCard=Fişă intervenţie NewIntervention=Intervenţie nouă -AddIntervention=Adaugă intervenţie +AddIntervention=Crează intervenţie ListOfInterventions=Lista intervenţii EditIntervention=Editează intervenţie ActionsOnFicheInter=Acţiuni privind intervenţia @@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Nume şi semnătură celui ce a intervenit: NameAndSignatureOfExternalContact=Nume şi semnătură client: DocumentModelStandard=Model standard document de intervenţii InterventionCardsAndInterventionLines=Intervenţii şi linii ale intervenţiilor -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +InterventionClassifyBilled=Clasează Facturat +InterventionClassifyUnBilled=Clasează Nefacturat StatusInterInvoiced=Facturat RelatedInterventions=Intervenţii asociate ShowIntervention=Afişează intervenţie -SendInterventionRef=Submission of intervention %s +SendInterventionRef=Trimiterea intervenţiei %s +SendInterventionByMail=Trimite intervenţie prin Email +InterventionCreatedInDolibarr=Intervenţia %s creată +InterventionValidatedInDolibarr=Intervenţia %s validată +InterventionModifiedInDolibarr=Intervenţia %s modificată +InterventionClassifiedBilledInDolibarr=Intervenţia %s setată ca facturată +InterventionClassifiedUnbilledInDolibarr=Intervenţia %s setată ca nefacturată +InterventionSentByEMail=Intervenţia %s trimisă pe Email +InterventionDeletedInDolibarr=Intervenţia %s ştearsă +SearchAnIntervention=Caută o intervenţie ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Reprezentant urmărire intervenţie TypeContact_fichinter_internal_INTERVENING=Realizator intervenţie diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang index a7770f3b228..9bed1e1f8a3 100644 --- a/htdocs/langs/ro_RO/languages.lang +++ b/htdocs/langs/ro_RO/languages.lang @@ -10,7 +10,7 @@ Language_da_DA=Daneză Language_da_DK=Daneză Language_de_DE=Germană Language_de_AT=Germană (Austria) -Language_de_CH=German (Switzerland) +Language_de_CH=Germană (Elveţia) Language_el_GR=Greacă Language_en_AU=Engleză (Australia) Language_en_GB=Engleză (Marea Britanie) @@ -20,9 +20,9 @@ Language_en_SA=Engleză (Arabia Saudită) Language_en_US=Engleză (Statele Unite) Language_en_ZA=Engleză (Africa de Sud) Language_es_ES=Spaniolă -Language_es_DO=Spanish (Dominican Republic) +Language_es_DO=Spaniolă (Republica Dominicană) Language_es_AR=Spaniolă (Argentina) -Language_es_CL=Spanish (Chile) +Language_es_CL=Spaniolă (Chile) Language_es_HN=Spaniolă (Honduras) Language_es_MX=Spaniolă (Mexic) Language_es_PY=Spaniolă (Paraguay) @@ -40,7 +40,7 @@ Language_fr_NC=Franceză (Noua Caledonie) Language_he_IL=Ebraică Language_hr_HR=Croat Language_hu_HU=Maghiară -Language_id_ID=Indonesian +Language_id_ID=Indoneziană Language_is_IS=Islandeză Language_it_IT=Italiană Language_ja_JP=Japoneză @@ -61,7 +61,7 @@ Language_tr_TR=Turcă Language_sl_SI=Slovenă Language_sv_SV=Suedeză Language_sv_SE=Suedeză -Language_sq_AL=Albanian +Language_sq_AL=Albaneză Language_sk_SK=Slovacă Language_th_TH=Tailandez Language_uk_UA=Ucrainean diff --git a/htdocs/langs/ro_RO/ldap.lang b/htdocs/langs/ro_RO/ldap.lang index f29dc1002fb..2ed7c6a37e3 100644 --- a/htdocs/langs/ro_RO/ldap.lang +++ b/htdocs/langs/ro_RO/ldap.lang @@ -11,7 +11,7 @@ LDAPInformationsForThisGroup=Informaţiile din baza de date LDAP pentru acest gr LDAPInformationsForThisMember=Informaţiile din baza de date LDAP pentru acest stat LDAPAttribute=LDAP atribut LDAPAttributes=LDAP atribute -LDAPCard=LDAP carte +LDAPCard=Fişă LDAP LDAPRecordNotFound=Înregistrarea nu a fost găsit în baza de date LDAP LDAPUsers=Utilizatorii din baza de date LDAP LDAPGroups=Grupuri LDAP în baza de date diff --git a/htdocs/langs/ro_RO/link.lang b/htdocs/langs/ro_RO/link.lang index 8b1efb75ef3..86199835954 100644 --- a/htdocs/langs/ro_RO/link.lang +++ b/htdocs/langs/ro_RO/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=Link fişier/document nou +LinkedFiles=Fişiere şi documente ataşate +NoLinkFound=Niciun link inregistrat +LinkComplete=Fişierul a fost ataşat cu succes +ErrorFileNotLinked=Fişierul nu a putut fi ataşat +LinkRemoved=Linkul %s a fost înlăturat +ErrorFailedToDeleteLink= Eşec la înlăturarea linkului '%s' +ErrorFailedToUpdateLink= Eşec la modificarea linkului '%s' diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang index e5394eeffc5..355cca1880f 100644 --- a/htdocs/langs/ro_RO/mails.lang +++ b/htdocs/langs/ro_RO/mails.lang @@ -4,7 +4,7 @@ EMailing=Email-uri Mailings=EMailings EMailings=EMailings AllEMailings=Toate eMailings -MailCard=Carte de email-uri +MailCard=Fisă email-uri MailTargets=Ţinte MailRecipients=Destinatari MailRecipient=Recipient @@ -34,7 +34,7 @@ MailingResult=Trimiterea de e-mail-uri rezultat TestMailing=Test de email-uri ValidMailing=Valid email-uri ApproveMailing=Aprobaţi email-uri -MailingStatusDraft=Proiect +MailingStatusDraft=Schiţă MailingStatusValidated=Validat MailingStatusApproved=Aprobat MailingStatusSent=Trimis @@ -79,14 +79,14 @@ MailtoEMail=Hyper link către email ActivateCheckRead=Permite utiliyarea linkului "Dezabonare" ActivateCheckReadKey=Utilizaţi cheia pentru a cripta URL-ul folosit pentru funcţiunile "Confirmare de citire" și "Dezabonare" EMailSentToNRecipients=EMail trimis la %s destinatari. -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 +XTargetsAdded=%s destinatari adăugaţi în lista target +EachInvoiceWillBeAttachedToEmail=Un document folosind modelul implicit al documentului va fi creat și atașat la fiecare e-mail. +MailTopicSendRemindUnpaidInvoices=Memento la factura %s (%s) +SendRemind=Trimite memento prin e-mailuri +RemindSent=%s Memento(ri) trimise +AllRecipientSelectedForRemind=Toţi terţii selectaţi ţi dacă un e-mail este setat (rețineți că un email pe factură va fi trimis) +NoRemindSent=Niciun email de relansare trimis +ResultOfMassSending=Rezultatul trimiterii in masa prin email a relansării # Libelle des modules de liste de destinataires mailing MailingModuleDescContactCompanies=De contact ale tuturor părţilor terţe (client, perspectiva, furnizor, ...) @@ -103,7 +103,7 @@ MailingModuleDescContactsByFunction=Date de contact ale terţilor (de poziţie / LineInFile=Linia %s în fişierul RecipientSelectionModules=Definit pentru cererile beneficiarilor de selecţie MailSelectedRecipients=Selectat destinatarii -MailingArea=EMailings zona +MailingArea=EMailings LastMailings=Ultima %s emailings TargetsStatistics=Ţinte statistici NbOfCompaniesContacts=Unic de contact din companii @@ -115,12 +115,12 @@ 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=Notă: Trimiterea online a emailurilor sunt limitate din motive de securitate şi timeout către %s destinatari pe sesiune de trimiterea . +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 NbOfEMailingsReceived=Mass emailings primit -NbOfEMailingsSend=Mass emailings sent +NbOfEMailingsSend=Trimitere emailuri in masa IdRecord=ID-ul de înregistrare DeliveryReceipt=Livrarea Chitanţă YouCanUseCommaSeparatorForSeveralRecipients=Aveţi posibilitatea de a utiliza comma separator pentru a specifica mai mulţi destinatari. @@ -133,6 +133,9 @@ Notifications=Anunturi NoNotificationsWillBeSent=Nu notificări prin email sunt planificate pentru acest eveniment şi a companiei ANotificationsWillBeSent=1 notificarea va fi trimis prin e-mail SomeNotificationsWillBeSent=%s notificări vor fi trimise prin e-mail -AddNewNotification=Activaţi-o nouă notificare cerere -ListOfActiveNotifications=Lista tuturor notificărilor activă a cererilor +AddNewNotification=Activaţi un nou target email notificari +ListOfActiveNotifications=Lista tuturor targetelor emailurilor de notificare ListOfNotificationsDone=Lista toate notificările e-mail trimis +MailSendSetupIs=Configurarea trimiterii e-mail a fost de configurat la '%s'. Acest mod nu poate fi utilizat pentru a trimite email-uri în masă. +MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniu%sHome - Setup - EMails%s pentru a schimba parametrul '%s' de utilizare în modul '%s'. Cu acest mod, puteți introduce configurarea serverului SMTP furnizat de furnizorul de servicii Internet și de a folosi facilitatea Mass email . +MailSendSetupIs3=Daca aveti intrebari cu privire la modul de configurare al serverului SMTP, puteți cere la %s. diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang index d36e70a2bbc..e2932712fd9 100644 --- a/htdocs/langs/ro_RO/main.lang +++ b/htdocs/langs/ro_RO/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Utilizatorul%s negăsit în baza ErrorNoVATRateDefinedForSellerCountry=Eroare, nici o cota de TVA definită pentru ţara '% s'. ErrorNoSocialContributionForSellerCountry=Eroare, nici un tip de contribuții sociale definite pentru țara '% s'. ErrorFailedToSaveFile=Eroare, salvarea fişierului eşuată. -ErrorOnlyPngJpgSupported=Eroare, numai formatele .jpg şi .png sunt acceptate. -ErrorImageFormatNotSupported=PHP dvs nu acceptă funcții pentru a converti imagini de acest format. SetDate=setează data SelectDate=selectează data SeeAlso=Vezi şi %s BackgroundColorByDefault=Culoarea de fundal implicită +FileNotUploaded=Fişierul nu a fost încărcat +FileUploaded=Fişierul a fost încărcat cu succes FileWasNotUploaded=Un fișier este selectat pentru atașament, dar nu a fost încă încărcat. Clic pe "Ataşează fișier" pentru aceasta. NbOfEntries=Nr intrări GoToWikiHelpPage=Citeşte Ajutorul (e nevoie de acces la Internet) @@ -79,9 +79,9 @@ Administrator=Administrator Undefined=Nedefinit PasswordForgotten=Parolă uitată? SeeAbove=Vezi mai sus -HomeArea=Zona Acasă +HomeArea=Acasă LastConnexion=Ultima conexiune -PreviousConnexion=Cconexiunea precedentă +PreviousConnexion=Conexiunea precedentă ConnectedOnMultiCompany=Conectat la entitatea ConnectedSince=Conectat de AuthenticationMode=Mod autentificare @@ -220,13 +220,13 @@ DateStart=Dată început DateEnd=Dată sfârşit DateCreation=Dată creare DateModification=Dată modificarea -DateModificationShort=Datămodif. +DateModificationShort=Dată modif. DateLastModification=Data ultimei modificări DateValidation=Dată validare DateClosing=Dată închidere DateDue=Dată scadenţă -DateValue=Dată evaluare -DateValueShort=Dată evaluare +DateValue=Dată decontare +DateValueShort=Dată decontare DateOperation=Dată operaţie DateOperationShort=Dată ope. DateLimit=Dată limită @@ -266,6 +266,7 @@ Afternoon=După amiază Quadri=Trimestru MonthOfDay=Luna curentă HourShort=H +MinuteShort=mn Rate=Rată UseLocalTax=Include taxa Bytes=Bytes @@ -324,7 +325,7 @@ TotalLT2=Total tax 3 TotalLT1ES=Total RE TotalLT2ES=Total IRPF IncludedVAT=Inclusiv TVA -HT=Net fără taxe +HT=Net fără tva TTC=Inc. taxe VAT=TVA LT1ES=RE @@ -340,11 +341,12 @@ FullList=Lista completă Statistics=Statistici OtherStatistics=Alte statistici Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. furnizor RefPayment=Ref. plată -CommercialProposalsShort=Propuneri Comerciale +CommercialProposalsShort=Oferte Comerciale Comment=Comentează Comments=Comentarii ActionsToDo=Evenimente de făcut @@ -365,6 +367,7 @@ ActionsOnCompany=Evenimente privind acest terţ ActionsOnMember=Evenimente privind acest membru NActions=%s Evenimente NActionsLate=%s întârziat +RequestAlreadyDone=Cerere deja înregistrată Filter=Filtru RemoveFilter=Îndepărtați filtrul ChartGenerated=Grafice generate @@ -375,7 +378,7 @@ Duration=Durata TotalDuration=Durată totală Summary=Sumar MyBookmarks=Paginile mele marcate -OtherInformationsBoxes=Alte cutii de informare +OtherInformationsBoxes=Alte casete de informare DolibarrBoard=Tablou de bord DolibarrStateBoard=Statistici DolibarrWorkBoard=Sarcini Tablou de bord @@ -401,8 +404,8 @@ ResultOk=Succes ResultKo=Eşec Reporting=Raportare Reportings=Rapoarte -Draft=Nevalidat -Drafts=Nevalidate +Draft=Schiţă +Drafts=Schiţe Validated=Validat Opened=Deschis New=Nou @@ -423,8 +426,8 @@ Preview=Previzualizare NextStep=Etapa următoare PreviousStep=Etapa precedentă Datas=Date -None=Niciun -NoneF=Niciun +None=Niciunul +NoneF=Niciunul Late=Întârziat Photo=Foto Photos=Fotografii @@ -577,7 +580,7 @@ PartialMan=Parţial TotalWoman=Total TotalMan=Total NeverReceived=Niciodată primit -Canceled=Anulat +Canceled=Anulată YouCanChangeValuesForThisListFromDictionarySetup=Se pot schimba valorile pentru această listă din meniul setări - dicționar Color=Culoare Documents=Fişiere ataşate @@ -644,8 +647,8 @@ AttributeCode=Cod Atribut OptionalFieldsSetup=Setări atribute suplimentare URLPhoto=Url către foto/logo SetLinkToThirdParty=Link către un alt terţ -CreateDraft=Creareză ciornă -SetToDraft=Inapoi la Draft +CreateDraft=Creareză schiţă +SetToDraft=Inapoi la schiţă ClickToEdit=Clic pentru a edita ObjectDeleted=Obiect %s şters ByCountry=Pe ţară @@ -679,7 +682,7 @@ ViewPrivateNote=Vezi notițe XMoreLines=%s linii(e) ascunse PublicUrl=URL Public AddBox=Adauga box - +SelectElementAndClickRefresh=Selectează un element şi click Refresh # Week day Monday=Luni Tuesday=Marţi diff --git a/htdocs/langs/ro_RO/margins.lang b/htdocs/langs/ro_RO/margins.lang index 11727a96c02..93c5976147a 100644 --- a/htdocs/langs/ro_RO/margins.lang +++ b/htdocs/langs/ro_RO/margins.lang @@ -10,24 +10,18 @@ MarkRate=Rată marcă DisplayMarginRates=Afişează ratele marjă DisplayMarkRates=Afişează rate marcă InputPrice=Preţ intrare - margin=Managementul marje profit margesSetup=Setare Management marje profit - MarginDetails=Detalii Marjă - ProductMargins=Marjă Produs CustomerMargins=Marje Client -SalesRepresentativeMargins=Sales representative margins - +SalesRepresentativeMargins=Marje Reprezentanţi vănzări ProductService=Produs sau serviciu AllProducts=Toate produsele şi serviciile ChooseProduct/Service=Alege produs sau serviciu - StartDate=Dată început EndDate=Dată sfîrşit Launch=Start - ForceBuyingPriceIfNull=Forţează preţul de cumpărare dacă e null ForceBuyingPriceIfNullDetails=daca "ON", marja va fi zero pe linie (pret cumparare= pret vanzare), altfel("OFF"), marja va fi egala cu pretul de vanzare pentru aceasta linie (pret cumparare = 0). MARGIN_METHODE_FOR_DISCOUNT=Metoda marje pentru discounturi globale @@ -35,16 +29,16 @@ UseDiscountAsProduct=Ca produs UseDiscountAsService=Ca serviciu UseDiscountOnTotal=Pe subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiti daca discontul global e tratat ca un produs, serviciu, sau numai pe total la calcularea marjei. - MARGIN_TYPE=Tip Marjă MargeBrute=Marja brută MargeNette=Marja netă MARGIN_TYPE_DETAILS=Marja brută: Preţ vânzare - Preţ cumpărare
    Marja netă : Preţ vânzare - Cost de preţ - CostPrice=Preţ de cost BuyingCost=Preţ de cost UnitCharges=Cheluieli unitare Charges=Cheltuieli - AgentContactType=Tip contact agent comercial -AgentContactTypeDetails=Defineşte ce tip de contact ( legat pe factură) va fi utilizat pentru raportul marjei pe agenţi comerciali +AgentContactTypeDetails=Defineşte ce tip de contact ( legat pe factură) va fi utilizat pentru raportul marjei pe reprezentanti de vânzări +rateMustBeNumeric=Rata trebuie să fie numerică +markRateShouldBeLesserThan100=Rata mîrcii trebuie să fie mai mica de 100 +ShowMarginInfos=Arată informaţii marjă diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang index 95203b0641a..2699157a357 100644 --- a/htdocs/langs/ro_RO/members.lang +++ b/htdocs/langs/ro_RO/members.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - members MembersArea=Membri -PublicMembersArea=Zona Membri publici +PublicMembersArea=Membri publici MemberCard=Fişă Membru SubscriptionCard=Fişă Cotizaţie Member=Membru @@ -24,13 +24,13 @@ SetLinkToUser=Link către un utilizator Dolibarr SetLinkToThirdParty=Link către un terţ Dolibarr MembersCards=Carţi de vizită membri MembersList=Lista de membri -MembersListToValid=Lista membri nevalidaţi (de validat) +MembersListToValid=Lista membri schiţă (de validat) MembersListValid=Lista de membri validaţi MembersListUpToDate=Lista de membri validaţi cu cotizaţia la zi MembersListNotUpToDate=Lista de membri validaţi fără cotizaţia la zi MembersListResiliated=Lista de membri reziliaţi MembersListQualified=Lista de membri calificaţi -MenuMembersToValidate=Membri nevalidaţi +MenuMembersToValidate=Membri schiţă MenuMembersValidated=Membri validaţi MenuMembersUpToDate=Membri cu cotizaţia la zi MenuMembersNotUpToDate=Membri fără cotizaţia la zi @@ -51,8 +51,8 @@ MemberTypeLabel=Etichetă Tip Membru MembersTypes=Tipuri Membri MembersAttributes=Atribute Membri SearchAMember=Caută un membru -MemberStatusDraft=Nevalidat (trebuie să fie validat) -MemberStatusDraftShort=Nevalidat +MemberStatusDraft=Schiţă(trebuie să fie validat) +MemberStatusDraftShort=Schiţă MemberStatusActive=Validat (în aşteptareacotizatiei) MemberStatusActiveShort=Validat MemberStatusActiveLate=Adeziune expirată @@ -61,8 +61,8 @@ MemberStatusPaid=Adeziuni la zi MemberStatusPaidShort=La zi MemberStatusResiliated=Membru reziliat MemberStatusResiliatedShort=Reziliat -MembersStatusToValid=Membri nevalidaţi -MembersStatusToValidShort=Membri nevalidaţi +MembersStatusToValid=Membri schiţă +MembersStatusToValidShort=Membri schiţă MembersStatusValidated=Membri validaţi MembersStatusPaid=Cotiaţia la zi MembersStatusPaidShort=La zi @@ -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/opensurvey.lang b/htdocs/langs/ro_RO/opensurvey.lang index 5d96afed81f..0608e7a0949 100644 --- a/htdocs/langs/ro_RO/opensurvey.lang +++ b/htdocs/langs/ro_RO/opensurvey.lang @@ -1,18 +1,18 @@ # Dolibarr language file - Source file is en_US - opensurvey -# Survey=Poll -# Surveys=Polls -# OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... -# NewSurvey=New poll -# NoSurveysInDatabase=%s poll(s) into database. -# OpenSurveyArea=Polls area -# AddACommentForPoll=You can add a comment into poll... +Survey=Sondaj +Surveys=Sondaje +OrganizeYourMeetingEasily=Organizeaza intalnirile și sondaje dvs cu ușurință. Mai întâi selectați tipul sondajului ... +NewSurvey=Sondaj nou +NoSurveysInDatabase=%s sondaj(e) in baza de date +OpenSurveyArea=Sondaje +AddACommentForPoll=Puteţi adăuga un comentariu în sondaj... AddComment=Adaugă comentariu CreatePoll=Creaţi sondaj PollTitle=Titlu sondaj -# ToReceiveEMailForEachVote=Receive an email for each vote +ToReceiveEMailForEachVote=Primeşte unui email pentru fiecare vot TypeDate=Tip dată TypeClassic=Tip 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=Selectati datele între zilele libere (gri). Zilele selectate sunt în verde Puteți deselecta o zi selectată anterior, făcând clic din nou pe ea RemoveAllDays=Elimină toate zilele CopyHoursOfFirstDay=Copiază orelele ale primei zile RemoveAllHours=Elimină toate orele @@ -20,14 +20,14 @@ SelectedDays=Zile selectate TheBestChoice=CEa mai bună alegere curentă este TheBestChoices=Cea mai bună alegere curentă are with=cu -# OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. +OpenSurveyHowTo=Dacă sunteți de acord să votaţi în acest sondaj, va trebui să vă dați numele, alegeți valorile ce se potrivesc cel mai bine pentru dvs și validați cu butonul plus, de la capătul liniei. CommentsOfVoters=Comentariul voturilor ConfirmRemovalOfPoll=Sunteţi sigur că doriţi să înlăturaţi acest sondaj ( şi toate voturile) RemovePoll=Înlătură sondajul -# UrlForSurvey=URL to communicate to get a direct access to poll -# PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: -# CreateSurveyDate=Create a date poll -# CreateSurveyStandard=Create a standard poll +UrlForSurvey=URL-ul pentru comunicare să obțină acces direct la sondaj +PollOnChoice=Dvs. creaţi un sondaj pentru a face un sondaj multi-alegere . Introduceți mai întâi toate opțiunile posibile pentru sondajul dvs: +CreateSurveyDate=Creare sondaj date +CreateSurveyStandard=Creare sondaj standard CheckBox=Simplu checkbox YesNoList=Listă (goală/da/nu) PourContreList=Listă (goală/pentru/impotrivă) @@ -35,7 +35,7 @@ AddNewColumn=Adaugă coloană nouă TitleChoice=Etichetă Alegere ExportSpreadsheet=Exportă rezultatul în foaie de calcul ExpireDate=Data limită -# NbOfSurveys=Number of polls +NbOfSurveys=Numărul sondajelor NbOfVoters=Nr-ul voturilor SurveyResults=Rezultate PollAdminDesc=Vi se permite să schimbaţi toate liniile de vot ale acestui sondaj cu butonul "Editează". Puteți, de asemenea, elimina o coloană sau o linie cu % s. Puteți adăuga, de asemenea, o nouă coloană cu % s. @@ -53,14 +53,14 @@ AddEndHour=Adaugă o oră de final votes=vot( uri) NoCommentYet=Niciun comentariu nu a fost postat încă pentru acest sondaj CanEditVotes=Puteţi schimba votul altora -# CanComment=Voters can comment in the poll -# CanSeeOthersVote=Voters can see other people's vote +CanComment=Votanţii pot comenta in sondaj +CanSeeOthersVote=Votanţii pot vedea votul celorlarţi SelectDayDesc=Pentru fiecare zi selectată, puteți alege, sau nu, orele întălnirii în următorul format:
    - gol,
    - "8h", "8H" or "8:00" pentru a da ora de start a întâlnirii,
    - "8-11", "8h-11h", "8H-11H" or "8:00-11:00" pentru a da startul și ora finală,
    - ""8h15-11h15", "8H15-11H15" or "8:15-11:15" pentru același lucru, dar cu minute. BackToCurrentMonth=Înapoi la luna curentă -# ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation -# ErrorOpenSurveyOneChoice=Enter at least one choice -# ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD -# ErrorInsertingComment=There was an error while inserting your comment -# MoreChoices=Enter more choices for the voters -# SurveyExpiredInfo=The voting time of this poll has expired. -# EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s +ErrorOpenSurveyFillFirstSection=Nu ati completat prima secțiune a creării sondaj +ErrorOpenSurveyOneChoice=Introduceţi cel puţin o alegere +ErrorOpenSurveyDateFormat=Data trebuie să aiba formatul YYYY-MM-DD +ErrorInsertingComment=Era o eroare când se insera comentariul dvs. +MoreChoices=Introdu mai multe opţiuni pentru votanţi +SurveyExpiredInfo=Timpul pentru votarea acestui sondaj a expirat +EmailSomeoneVoted=%sa completat o linie.\nPuteţi găsi sondajul dvs. la linkul: \n%s diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang index 91d54bc413e..ef95a5c8097 100644 --- a/htdocs/langs/ro_RO/orders.lang +++ b/htdocs/langs/ro_RO/orders.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - orders -OrdersArea=Zona Comenzi Clienţi -SuppliersOrdersArea=Zona Comenzi Furnizori +OrdersArea=Comenzi Clienţi +SuppliersOrdersArea=Comenzi Furnizori OrderCard=Fişă Comandă OrderId=ID Comandă Order=Comandă @@ -50,12 +50,12 @@ StatusOrderRefused=Refuzată StatusOrderReceivedPartially=Parţial recepţionată StatusOrderReceivedAll=Integral recepţionată ShippingExist=O expediţie există -DraftOrWaitingApproved=Comenzi Schiţe sau încă neaprobate -DraftOrWaitingShipped=Comenzi Schiţe sau validate încă neexpediate +DraftOrWaitingApproved=Comenzi Schiţă sau încă neaprobate +DraftOrWaitingShipped=Comenzi Schiţă sau validate încă neexpediate MenuOrdersToBill=Comenzi livrate -MenuOrdersToBill2=Comenzi de facturat +MenuOrdersToBill2=Comenzi facturabile SearchOrder=Caută Comanda -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Caută o comandă client ShipProduct=Expediază produs Discount=Discount CreateOrder=Crează Comanda @@ -65,7 +65,7 @@ ValidateOrder=Validează comanda UnvalidateOrder=Devalidează comandă DeleteOrder=Şterge comada CancelOrder=Anulează comanda -AddOrder=Adaugă comanda +AddOrder=Crează comanda AddToMyOrders=Adaugă la comenzile mele AddToOtherOrders=Adauga la alte comenzi AddToDraftOrders=Adaugă la comanda schiţă @@ -82,7 +82,7 @@ NbOfOrders=Numar comenzi OrdersStatistics=Statistici Comenzi OrdersStatisticsSuppliers=Statistici Comenzi Furnizori NumberOfOrdersByMonth=Numar comenzi pe luni -AmountOfOrdersByMonthHT=Valoarea comenzilor pe luna (net fără taxe) +AmountOfOrdersByMonthHT=Valoarea comenzilor pe luna (net fără tva) ListOfOrders=Lista comenzi CloseOrder=Inchide comanda ConfirmCloseOrder=Sigur doriți să setați această comandă în De Livrat? După ce o comandă este livrată, acesta poate fi setată De Facturat. @@ -96,12 +96,11 @@ GenerateBill=Generează Factură ClassifyShipped=Clasează livrată ClassifyBilled=Clasează facturată ComptaCard=Fişă Contabilitate -DraftOrders=Comenzi Schiţe +DraftOrders=Comenzi schiţă RelatedOrders=Comenzi reatasate OnProcessOrders=Comenzi în curs de tratare RefOrder=Ref. comanda RefCustomerOrder=Ref. Comandă Client -CustomerOrder=Comandă client RefCustomerOrderShort=Ref. Com. Client SendOrderByMail=Trimite comanda prin e-mail ActionsOnOrder=Evenimente pe comanda @@ -132,10 +131,8 @@ Error_COMMANDE_ADDON_NotDefined=Constanta COMMANDE_ADDON nedefinită Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Eşec la încărcarea fișierului modul '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Eşec la încărcarea fișierului modul '%s' Error_OrderNotChecked=Nici o comandă de facturat selectată - - # Sources -OrderSource0=Propunere Comercială +OrderSource0=Ofertă Comercială OrderSource1=Internet OrderSource2=Campanie poştă OrderSource3=Campanie telefon @@ -144,7 +141,6 @@ OrderSource5=Comercial OrderSource6=Magazin QtyOrdered=Cant. comandată AddDeliveryCostLine=Adaugă o linie cost livrare indicând greutatea comenzii - # Documents models PDFEinsteinDescription=Un model complet pentru (logo. ..) PDFEdisonDescription=Un simplu pentru model @@ -155,14 +151,12 @@ OrderByFax=Fax OrderByEMail=Email OrderByWWW=Online OrderByPhone=Telefon - CreateInvoiceForThisCustomer=Comenzi facturate NoOrdersToInvoice=Nici o comandă facturabilă CloseProcessedOrdersAutomatically=Clasează automat "Procesat" toate comenzile selectate. -MenuOrdersToBill2=Comenzi de facturat OrderCreation=Creare comandă Ordered=Comandat OrderCreated=Comenzile dvs au fost generate OrderFail=O eroare întâlnită în timpul creării comezilor dvs CreateOrders=Crează Comenzi -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +ToBillSeveralOrderSelectCustomer=Pentru crearea unei facturi pentru câteva comenzi, click mai întâi pe client apoi alege "%s". diff --git a/htdocs/langs/ro_RO/oscommerce.lang b/htdocs/langs/ro_RO/oscommerce.lang deleted file mode 100644 index ee9094a377d..00000000000 --- a/htdocs/langs/ro_RO/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul de configurare -OSCommerceSetupSaved=OS Commerce setup salvate -OSCommerceServer=Sistem de operare server gazdă Comert / IP -OSCommerceDatabaseName=OS Commerce denumirea de baze de date -OSCommercePrefix=OS Commerce tabele prefix -OSCommerceUser=OS Commerce baza de date de login diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang index 1c7e44a33a6..8e456987b22 100644 --- a/htdocs/langs/ro_RO/other.lang +++ b/htdocs/langs/ro_RO/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Cod de securitate Calendar=Calendar -AddTrip=Adaugă Deplasare Tools=Instrumente ToolsDesc=Aceasta zona este dedicata instrumentele grup nu diverse disponibile în meniul de alte intrări.

    Aceste instrumente se poate ajunge din meniul de pe partea. Birthday=Zi de naştere @@ -16,16 +15,16 @@ Notify_BILL_UNVALIDATE=Factura client nevalidată Notify_ORDER_SUPPLIER_APPROVE=Furnizor pentru a aprobat Notify_ORDER_SUPPLIER_REFUSE=Furnizor pentru a refuzat Notify_ORDER_VALIDATE=Comandă client validată -Notify_PROPAL_VALIDATE=Propunere client validată -Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed -Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_PROPAL_VALIDATE=Ofertă client validată +Notify_PROPAL_CLOSE_SIGNED=Propunere client semnată inchisă +Notify_PROPAL_CLOSE_REFUSED=Propunere client refuzată inchisă Notify_WITHDRAW_TRANSMIT=Transmitere de retragere Notify_WITHDRAW_CREDIT=Credit de retragere Notify_WITHDRAW_EMIT=Isue retragere Notify_ORDER_SENTBYMAIL=Comanda clientului trimise prin poştă Notify_COMPANY_CREATE=Terţ a creat -Notify_COMPANY_SENTBYMAIL=Mails sent from third party card -Notify_PROPAL_SENTBYMAIL=Propunerea comercial trimise prin poştă +Notify_COMPANY_SENTBYMAIL=Emailuri trimise din cardul terţului +Notify_PROPAL_SENTBYMAIL=Ofertă comercială trimisă prin mail Notify_BILL_PAYED=Factura platita clienţilor Notify_BILL_CANCEL=Factura client anulat Notify_BILL_SENTBYMAIL=Factura client trimis prin e-mail @@ -34,20 +33,21 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Pentru furnizorul trimis prin e-mail Notify_BILL_SUPPLIER_VALIDATE=Factura furnizorului validate Notify_BILL_SUPPLIER_PAYED=Factura platita cu furnizorul Notify_BILL_SUPPLIER_SENTBYMAIL=Factura Furnizor trimise prin poştă -Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled +Notify_BILL_SUPPLIER_CANCELED=Factură Furnizor anulată Notify_CONTRACT_VALIDATE=Contract validate Notify_FICHEINTER_VALIDATE=De intervenţie validate Notify_SHIPPING_VALIDATE=Transport validate Notify_SHIPPING_SENTBYMAIL=Transport trimise prin poştă Notify_MEMBER_VALIDATE=Membru validate -Notify_MEMBER_MODIFY=Member modified +Notify_MEMBER_MODIFY=Membru modificat Notify_MEMBER_SUBSCRIPTION=Membru subscris Notify_MEMBER_RESILIATE=Membru reziliat Notify_MEMBER_DELETE=Membre elimină -Notify_PROJECT_CREATE=Project creation -Notify_TASK_CREATE=Task created -Notify_TASK_MODIFY=Task modified -Notify_TASK_DELETE=Task deleted +Notify_PROJECT_CREATE=Creare proiect +Notify_TASK_CREATE=Task creat +Notify_TASK_MODIFY=Task modificat +Notify_TASK_DELETE=Task sters +SeeModuleSetup=Vezi setare modul NbOfAttachedFiles=Numărul de ataşat fişiere / documente TotalSizeOfAttachedFiles=Total marimea ataşat fişiere / documente MaxSize=Mărimea maximă a @@ -57,14 +57,14 @@ Miscellaneous=Diverse NbOfActiveNotifications=Număr de notificări PredefinedMailTest=Acesta este un e-mail de test. \\ NMesajul două linii sunt separate printr-un retur de car. PredefinedMailTestHtml=Acesta este un e-mail de testare (test de cuvânt trebuie să fie în aldine).
    Cele două linii sunt separate printr-un retur de car. -PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Am dori să vă avertizăm că factura __FACREF__ pare a nu fi platită. Deci, vă ataşăm din nou factura, ca un memento. \n\n__PERSONALIZED__ Cu respect \n\n__SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeţi găsi aici oferta comercială__PROPREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ +PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeţi găsi aici comanda __ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYVeţi găsi aici comanda noastră__ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ +PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nVeţi găsi aici livrarea __SHIPPINGREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nVeţi găsi aici intervenţia__FICHINTERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ DemoDesc=Dolibarr este un compact ERP / CRM compus din mai multe module funcţionale. Un demo care include toate modulele nu înseamnă nimic, deoarece aceasta nu se produce. Deci, mai multe demo-profile sunt disponibile. ChooseYourDemoProfil=Alegeţi demo care se potrivesc cu profilul de activitate ... @@ -80,6 +80,16 @@ ModifiedBy=Modificat de %s ValidatedBy=Validate de %s CanceledBy=Anulată de către %s ClosedBy=Închise de %s +CreatedById=Id Utilizator care a creat +ModifiedById=Id Utilizator care a făcut ultima modificare +ValidatedById=Id Utilizator care a validat +CanceledById=Id Utilizator care a anulat +ClosedById=Id Utilizator care a închis +CreatedByLogin=Login Utilizator care a creat +ModifiedByLogin=Login Utilizator care a facut ultima modificare +ValidatedByLogin=Login Utilizator care a validat +CanceledByLogin=Login Utilizator care a anulat +ClosedByLogin=Login Utilizator care a inchis FileWasRemoved=Fişier a fost şters DirWasRemoved=Director a fost eliminat FeatureNotYetAvailableShort=Disponibil într-o versiune viitoare @@ -108,7 +118,7 @@ LengthUnitm=m LengthUnitdm=dm LengthUnitcm=cm LengthUnitmm=mm -Surface=Zonă +Surface=Modul SurfaceUnitm2=m2 SurfaceUnitdm2=dm2 SurfaceUnitcm2=cm2 @@ -144,19 +154,19 @@ ProfIdShortDesc=Prof Id-ul %s este una de informaţii în funcţie de ţa DolibarrDemo=Demo Dolibarr ERP / CRM StatsByNumberOfUnits=Statistica în numărul de unităţi StatsByNumberOfEntities=Statistica în număr de entităţi -NumberOfProposals=Număr propuneri pe ultimele 12 luni +NumberOfProposals=Numărul ofertelor pe ultimele 12 luni NumberOfCustomerOrders=Număr comenzi clienţi pe ultimele 12 luni NumberOfCustomerInvoices=Număr facturi clienţi pe ultimele 12 luni NumberOfSupplierOrders=Număr comenzi furnizor pe ultimele 12 luni NumberOfSupplierInvoices=Număr facturi furnizor pe ultimele 12 luni -NumberOfUnitsProposals=Numărul de unităţi cu privire la propunerile pe ultimele 12 luni +NumberOfUnitsProposals=Numărul de unităţi pe oferte în ultimele 12 luni NumberOfUnitsCustomerOrders=Numărul de unităţi de pe ordinele de client pe ultimele 12 luni NumberOfUnitsCustomerInvoices=Numărul de unităţi de pe facturile de client pe ultimele 12 luni NumberOfUnitsSupplierOrders=Numărul de unităţi de pe comenzile clienţi pe ultimele 12 luni NumberOfUnitsSupplierInvoices=Numărul de unităţi de la furnizor de facturi pe ultimele 12 luni EMailTextInterventionValidated=Intervenţia %s validată EMailTextInvoiceValidated=Factura %s validată -EMailTextProposalValidated=Propunerea %s a fost validată. +EMailTextProposalValidated=Oferta %s a fost validată. EMailTextOrderValidated=Comanda %s a fost validată EMailTextOrderApproved=Comanda %s a fost aprobată EMailTextOrderApprovedBy=Comanda %s aprobată de către %s @@ -193,28 +203,29 @@ ForgetIfNothing=Dacă nu ați solicitat această schimbare, ignoraţi acest e-ma ##### Calendar common ##### AddCalendarEntry=Adăugaţi în calendar intrare %s -NewCompanyToDolibarr=Compania %s adăugat în Dolibarr -ContractValidatedInDolibarr=Contract %s validat în Dolibarr -ContractCanceledInDolibarr=Contract %s anulat în Dolibarr -ContractClosedInDolibarr=Contract %s închis în Dolibarr -PropalClosedSignedInDolibarr=Propunere %s, semnată la Dolibarr -PropalClosedRefusedInDolibarr=Propunere %s refuzată în Dolibarr -PropalValidatedInDolibarr=Propunere %s validată în Dolibarr -InvoiceValidatedInDolibarr=Factura %s validată în Dolibarr -InvoicePaidInDolibarr=Factura %s-a schimbat la plata în Dolibarr -InvoiceCanceledInDolibarr=Factura %s anulată în Dolibarr -PaymentDoneInDolibarr=Plata %s făcut în Dolibarr -CustomerPaymentDoneInDolibarr=Clientul plată %s făcut în Dolibarr -SupplierPaymentDoneInDolibarr=Furnizor de plată %s făcut în Dolibarr -MemberValidatedInDolibarr=Statele %s validat în Dolibarr -MemberResiliatedInDolibarr=Statele %s resiliated în Dolibarr -MemberDeletedInDolibarr=Statele %s elimină din Dolibarr -MemberSubscriptionAddedInDolibarr=Abonamente de stat %s adăugat în Dolibarr -ShipmentValidatedInDolibarr=%s Transport validate în Dolibarr -ShipmentDeletedInDolibarr=Livrarea %s ştearsă din Dolibarr +NewCompanyToDolibarr=Compania %s adăugată +ContractValidatedInDolibarr=Contract %s validat +ContractCanceledInDolibarr=Contract %s anulat +ContractClosedInDolibarr=Contract %s închis +PropalClosedSignedInDolibarr=Oferta %s semnată +PropalClosedRefusedInDolibarr=Oferta %s refuzată +PropalValidatedInDolibarr=Oferta %s validată +PropalClassifiedBilledInDolibarr=Oferta %s clasificată facturată +InvoiceValidatedInDolibarr=Factura %s validată +InvoicePaidInDolibarr=Factura %s schimbată la plată +InvoiceCanceledInDolibarr=Factura %s anulată +PaymentDoneInDolibarr=Plată %s efectuată +CustomerPaymentDoneInDolibarr=Plată client %s efectuată +SupplierPaymentDoneInDolibarr=Plată furnizor %s efectuată +MemberValidatedInDolibarr=Membru %s validat +MemberResiliatedInDolibarr=Membru %s reziliat +MemberDeletedInDolibarr=Membru %s şters +MemberSubscriptionAddedInDolibarr=Înscrierea pentru membrul %s adăugat +ShipmentValidatedInDolibarr=Livrare %s validată +ShipmentDeletedInDolibarr=Livrare %s ştearsă ##### Export ##### Export=Export -ExportsArea=Zona Export +ExportsArea=Export AvailableFormats=Formatele disponibile LibraryUsed=Librarie folosită LibraryVersion=Versiune diff --git a/htdocs/langs/ro_RO/paybox.lang b/htdocs/langs/ro_RO/paybox.lang index 486131b53cf..864c5f70c35 100644 --- a/htdocs/langs/ro_RO/paybox.lang +++ b/htdocs/langs/ro_RO/paybox.lang @@ -35,3 +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=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/paypal.lang b/htdocs/langs/ro_RO/paypal.lang index 79074690235..ad8da61c84b 100644 --- a/htdocs/langs/ro_RO/paypal.lang +++ b/htdocs/langs/ro_RO/paypal.lang @@ -20,6 +20,6 @@ YouAreCurrentlyInSandboxMode=Sunteţi în prezent în "sandbox" modul NewPaypalPaymentReceived=O plată nouă Paypal primită NewPaypalPaymentFailed=O plată nouă Paypal încercată dar eşuată PAYPAL_PAYONLINE_SENDEMAIL=E-mail pentru avertizare după o plată (realizată sau nu) -ReturnURLAfterPayment=Return URL after payment -ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed -PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed +ReturnURLAfterPayment=URL-ul return după plată +ValidationOfPaypalPaymentFailed=Validarea Paypal plată eşuată +PaypalConfirmPaymentPageWasCalledButFailed=Pagina confirmare plata pentru Paypal a aplelată de Paypal dar confirmarea a eşuat 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/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang index 366c9e9a76a..eb7b5a7d622 100644 --- a/htdocs/langs/ro_RO/products.lang +++ b/htdocs/langs/ro_RO/products.lang @@ -13,10 +13,10 @@ NewProduct=Produs nou NewService=Serviciu nou ProductCode=Cod produs ServiceCode=Cod serviciu -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=Modificare TVA în masă +ProductVatMassChangeDesc=Această pagină poate fi folosită pentru a modifica o rată TVA definită la produse sau servicii de la o valoare la alta. Atenție, această schimbare se face în toată baza de date. +MassBarcodeInit=Init cod de bare în masă +MassBarcodeInitDesc=Această pagină poate fi utilizată pentru a inițializa un cod de bare pe obiectele care nu au coduri de bare definit. Verificați înainte dacă modulul cod de bare este complet configurat. ProductAccountancyBuyCode=Cont Contabilitate (cumpărare) ProductAccountancySellCode=Cont Contabilitate (vânzare) ProductOrService=Produs sau serviciu @@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Statistici Produse si Servicii ProductsStatistics=Statistici Produse ProductsOnSell=Produse disponibile ProductsNotOnSell=Produse fără mişcare -ProductsOnSellAndOnBuy=Products not for sale nor purchase +ProductsOnSellAndOnBuy=Produse nesupuse vânzării sau cumpărării ServicesOnSell=Servicii disponibile ServicesNotOnSell=Servicii fără miscare -ServicesOnSellAndOnBuy=Services not for sale nor purchase +ServicesOnSellAndOnBuy=Servicii nesupuse vânzării sau cumpărării InternalRef=Referinţă internă LastRecorded=Ultimele produse / servicii disponibile înregistrate LastRecordedProductsAndServices=Ultimele %s produse / servicii înregistrate @@ -72,29 +72,29 @@ PublicPrice=Preţ Public CurrentPrice=Preţ curent NewPrice=Preţ nou MinPrice=Preţ min. vânzare -MinPriceHT=Minim. selling price (net of tax) -MinPriceTTC=Minim. selling price (inc. tax) -CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (% s fără taxe). Acest mesaj poate apărea, de asemenea, dacă tastați o reducere prea important. +MinPriceHT=Preţ minim vânzare (fără tva) +MinPriceTTC=Preţ minim vânzare (inc. tax) +CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s fără tva). Acest mesaj poate apărea, de asemenea, dacă tastați o reducere prea important. ContractStatus=Status Contract ContractStatusClosed=Închis ContractStatusRunning=În service ContractStatusExpired=expirat ContractStatusOnHold=Fără service -ContractStatusToRun=To get running +ContractStatusToRun=De pus în funcţiune ContractNotRunning=Acest contract nu este în execuţie ErrorProductAlreadyExists=Un produs cu referinţa %s există deja. ErrorProductBadRefOrLabel=Valoare greșită pentru referință sau eticheta. ErrorProductClone=A apărut o problemă în timp ce sw încerca clonarea produsului sau a serviciului. -ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +ErrorPriceCantBeLowerThanMinPrice=Eroare Preţul nu poate fi mai mic decât Preţul Minim Suppliers=Furnizori SupplierRef=Ref. produs furnizor ShowProduct=Afişează produs ShowService=Afişează serviciu -ProductsAndServicesArea=Zona Produse şi Servicii -ProductsArea=Zona Produse -ServicesArea=Zona Servicii -AddToMyProposals=Adaugă la propunerile mele -AddToOtherProposals=Adaugă la alte propuneri +ProductsAndServicesArea=Produse şi Servicii +ProductsArea=Produse +ServicesArea=Servicii +AddToMyProposals=Adaugă la ofertele mele +AddToOtherProposals=Adaugă la alte oferte AddToMyBills=Adăugă la facturile mele AddToOtherBills=Adaugă la alte facturi CorrectStock=Corectează Stocul @@ -111,18 +111,18 @@ BarCode=Coduri de bare BarcodeType=Tip Coduri de bare SetDefaultBarcodeType=Setări tip cod de bare BarcodeValue=Valoarea coduri de bare -NoteNotVisibleOnBill=Notă (nevizibilă pe facturi, propuneri ...) +NoteNotVisibleOnBill=Notă (nevizibilă pe facturi, oferte ...) CreateCopy=Crează o copie ServiceLimitedDuration=Dacă produsul este un serviciu cu durată limitată: -MultiPricesAbility=Several level of prices per product/service +MultiPricesAbility=Câteva nivele ale preţurilor produs/serviciu MultiPricesNumPrices=Numărul de preţ MultiPriceLevelsName=Categorii Preţ -AssociatedProductsAbility=Activează produse virtuale -AssociatedProducts=Produse virtuale -AssociatedProductsNumber=Număr produse ce compun produsul virtual -ParentProductsNumber=Numărul produselor virtuale părinte -IfZeroItIsNotAVirtualProduct=Dacă 0, acest produs nu este un produs virtual -IfZeroItIsNotUsedByVirtualProduct=Dacă 0, acest produs nu este folosit de niciun produs virtual +AssociatedProductsAbility=Activează funcţia pachete virtuale +AssociatedProducts=Pachet produs +AssociatedProductsNumber=Număr produse ce compun acest pachet produse virtual +ParentProductsNumber=Numărul pachetelor produselor părinte +IfZeroItIsNotAVirtualProduct=Dacă 0, acest produs nu este un pachet produs virtual +IfZeroItIsNotUsedByVirtualProduct=Dacă 0, acest produs nu este folosit de niciun pachet produs virtual EditAssociate=Compus ca produs virtual Translation=Traduceri KeywordFilter=Filtru de cuvinte cheie @@ -132,7 +132,7 @@ AddDel=Adăugare / Retrage Quantity=Cantitate NoMatchFound=Nici un rezultat găsit ProductAssociationList=Lista de legate de produse / servicii: nume de produse / servicii (cantitatea afectate) -ProductParentList=Lista de produse / servicii cu acest produs, ca o componentă +ProductParentList=Lista de pachete produse / servicii cu acest produs, ca o componentă ErrorAssociationIsFatherOfThis=Un produs este selectat de părinte cu curent produs DeleteProduct=A şterge un produs / serviciu ConfirmDeleteProduct=Sunteţi sigur că doriţi să ştergeţi acest produs / serviciu? @@ -161,12 +161,12 @@ NoSupplierPriceDefinedForThisProduct=Nu furnizor preţ / Cantitate definite pent RecordedProducts=Produse înregistrate RecordedServices=Servicii înregistrate RecordedProductsAndServices=Produse / servicii înregistrate -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=Produse Predefinite pentru vânzare +PredefinedServicesToSell=Servicii Predefinite pentru vânzare +PredefinedProductsAndServicesToSell=Produse/Servicii Predefinite pentru vânzare +PredefinedProductsToPurchase=Produse Predefinite pentru cumpărare +PredefinedServicesToPurchase=Servicii Predefinite pentru cumpărare +PredefinedProductsAndServicesToPurchase=Produse/Servicii Predefinite pentru cumpărare GenerateThumb=Generaţi thumb ProductCanvasAbility=Utilizaţi speciale "panza" addons ServiceNb=Service # %s @@ -179,18 +179,18 @@ CloneProduct=Clone produs sau un serviciu ConfirmCloneProduct=Sigur doriţi să clonaţi produsul sau serviciul %s ? CloneContentProduct=Clone toate principalele informatii de produs / serviciu ClonePricesProduct=Clone principalele informatii si preturi -CloneCompositionProduct=Clone virtual product/services +CloneCompositionProduct=Clonează pachet produs/serviciu ProductIsUsed=Acest produs este utilizat NewRefForClone=Ref. de produs / serviciu nou CustomerPrices=Preţuri Clienţii SuppliersPrices=Preţuri Furnizori -SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) +SuppliersPricesOfProductsOrServices=Preţuri Furnizori ( al produselor şi serviciilor) CustomCode=Codul vamal CountryOrigin=Ţara de origine HiddenIntoCombo=Ascuns în liste selectaţi Nature=Natura -ProductCodeModel=Product ref template -ServiceCodeModel=Service ref template +ProductCodeModel=Model ref Produs +ServiceCodeModel=Model ref Serviciu AddThisProductCard=Crează Fişă produs HelpAddThisProductCard=Această opţiune vă permite să creaţi sau clonaţi un produs dacă acesta nu există AddThisServiceCard=Crează Fişă Serviciu @@ -214,31 +214,36 @@ CostPmpHT=Net total VWAP ProductUsedForBuild=Autoconsum de producție ProductBuilded=Producţie completată ProductsMultiPrice=Produse preţ multiplu -ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) +ProductsOrServiceMultiPrice=Preţuri Clienti ( al produselor şi serviciilor, multi-preţ) ProductSellByQuarterHT=Cifra de afaceri trimestrială a produselor VWAP ServiceSellByQuarterHT=Cifra de afaceri trimestrială servicii VWAP Quarter1=Trimestru 1. Quarter2=Trimestru 2. Quarter3=Trimestru 3. Quarter4=Trimestru 4. -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 +BarCodePrintsheet=Print cod de bare +PageToGenerateBarCodeSheets=Cu acest instrument, puteți imprima foi de autocolante de coduri de bare. Alegeți formatul de pagina dvs. de autocolant, tipul și valoarea codurilor de bare, apoi faceți clic pe butonul %s. +NumberOfStickers=Numărul de autocolante de printat pe pagina +PrintsheetForOneBarCode=Print câteva autocolante pentru un cod de bare +BuildPageToPrint=Generare pagina pentru imprimantă +FillBarCodeTypeAndValueManually=Completați tip cod de bare și valoarea manual. +FillBarCodeTypeAndValueFromProduct=Completați tip cod de bare și valoareadin codul de bare al produsului. +FillBarCodeTypeAndValueFromThirdParty=Completați tip cod de bare și valoareadin codul de bare al terţului. +DefinitionOfBarCodeForProductNotComplete=Definiția tipului sau valoarea codului de bare nu e completă pentru produsul %s. +DefinitionOfBarCodeForThirdpartyNotComplete=Definiția tipului sau valoarea codului de bare nu e completă pentru terţul %s. +BarCodeDataForProduct=Informaţii cod bare al produsului %s : +BarCodeDataForThirdparty=Informaţii cod bare al terţului %s : +ResetBarcodeForAllRecords=Defineşte valoare coduri de bare pentru toate înregistrările (aceasta va reseta, de asemenea, valorile deja definite, cu valori noi) +PriceByCustomer=Preţ pe client +PriceCatalogue=Preţ unic pe produs/serviciu +PricingRule=Reguli preturi +AddCustomerPrice=Adaugă Preţ pe client +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 6f95e6755ef..7c1260c8c9e 100644 --- a/htdocs/langs/ro_RO/projects.lang +++ b/htdocs/langs/ro_RO/projects.lang @@ -12,9 +12,9 @@ MyTasksDesc=Această vedere este limitată la proiecte sau sarcini pentru care TasksPublicDesc=Această vedere prezintă toate proiectele şi activităţile care sunt permise să le citiţi. TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni de utilizator va acorda permisiunea de a vizualiza totul). Myprojects=Proiectele mele -ProjectsArea=Zona Proiecte +ProjectsArea=Proiecte NewProject=Proiect nou -AddProject=Adaugă proiect +AddProject=Creare proiect DeleteAProject=Şterge proiect DeleteATask=Şterge task ConfirmDeleteAProject=Sunteţi sigur că doriţi să ştergeţi acest proiect? @@ -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 @@ -45,7 +47,7 @@ TaskDateStart=Data start task TaskDateEnd=Data de final task TaskDescription=Descriere task NewTask=Task nou -AddTask=Adaugă Task +AddTask=Creare sarcină AddDuration=Adaugă durată Activity=Activitate Activities=Activităţi / Taskuri @@ -57,7 +59,7 @@ Progress=Progres ProgressDeclared=Progres calculat ProgressCalculated=Progres calculat Time=Timp -ListProposalsAssociatedProject=Lista propuneri comerciale asociate la proiect +ListProposalsAssociatedProject=Lista oferte comerciale asociate la proiect ListOrdersAssociatedProject=Lista comenzi asociate la proiect ListInvoicesAssociatedProject=Lista facturi lasociate la proiect ListPredefinedInvoicesAssociatedProject=Lista facturi clienţi predefinite asociate la proiect @@ -85,13 +87,13 @@ ActionsOnProject=Evenimente pe proiect YouAreNotContactOfProject=Nu sunteţi un contact al acestui proiect privat DeleteATimeSpent=Ştergeţi timpul consumat ConfirmDeleteATimeSpent=Ssigur doriţi să ştergeţi acest timp consumat? -DoNotShowMyTasksOnly=See also tasks not assigned to me -ShowMyTasksOnly=View only tasks assigned to me +DoNotShowMyTasksOnly=Afişează, de asemenea, şi taskurile ce nu sunt atribuite mie +ShowMyTasksOnly=Vezi numai taskurile atribuite mie TaskRessourceLinks=Resurse ProjectsDedicatedToThisThirdParty=Proiecte dedicate acestui terţ NoTasks=Nr sarcini pentru acest proiect LinkedToAnotherCompany=Legat de terţe părţi, alta -TaskIsNotAffectedToYou=Task not assigned to you +TaskIsNotAffectedToYou=Sarcină neatribuită ţie ErrorTimeSpentIsEmpty=Timpul consumat nu este completat ThisWillAlsoRemoveTasks=Această acţiune va şterge, de asemenea, toate taskurile proiectului (%s ) la acest moment şitoţi timpii petrecuţi. IfNeedToUseOhterObjectKeepEmpty=Dacă unele obiecte (facturi, comenzi, ...), care aparţin altui terţ, trebuie să fie legate de proiect, pentru creare, menţine acest gol pentru a avea proiectul fiind multiterţi. @@ -120,13 +122,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Selectați elementul AddElement=Link către element -UnlinkElement=Unlink element +UnlinkElement=Element nelegat # Documents models DocumentModelBaleine=Modelul de rapor al unui proiect complet t (logo. ..) PlannedWorkload = Volum de lucru Planificat WorkloadOccupation= Volum de lucru Procent ProjectReferers=Obiecte asociate SearchAProject=Cauta proiect -ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Proiecte draft -FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi +ProjectDraft=Proiecte schiţă +FirstAddRessourceToAllocateTime=Asociază o resursă la timpul alocat diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang index 46580bc3e24..e0bbcc76543 100644 --- a/htdocs/langs/ro_RO/propal.lang +++ b/htdocs/langs/ro_RO/propal.lang @@ -1,41 +1,41 @@ # Dolibarr language file - Source file is en_US - propal -Proposals=Propuneri Comerciale -Proposal=Propunerea Comercială -ProposalShort=Propunere -ProposalsDraft=Propuneri Comerciale Schiţe -ProposalDraft=Propunere Comercială Schiţă -ProposalsOpened=Deschis comerciale propuneri -Prop=Propuneri Comerciale -CommercialProposal=Propunere Comercială -CommercialProposals=Propuneri Comerciale -ProposalCard=Fişă Propunere -NewProp=Propunere Comercială Nouă -NewProposal=Propunere Comercială Nouă -NewPropal=Propunere Nouă +Proposals=Oferte Comerciale +Proposal=Ofertă Comercială +ProposalShort=Ofertă +ProposalsDraft=Oferte Comerciale schiţă +ProposalDraft=Ofertă Comercială Schiţă +ProposalsOpened=Oferte comerciale deschise +Prop=Oferte Comerciale +CommercialProposal=Ofertă Comercială +CommercialProposals=Oferte Comerciale +ProposalCard=Fişă Ofertă +NewProp=Ofertă Comercială Nouă +NewProposal=Ofertă Comercială Nouă +NewPropal=Ofertă Nouă Prospect=Prospect ProspectList=Listă Prospecte -DeleteProp=Ştergere Propunere Comercială -ValidateProp=Validează Propunere Comercială -AddProp=Adaugă propunere -ConfirmDeleteProp=Sigur doriţi să ştergeţi această propunere comercială ? -ConfirmValidateProp=Sigur doriţi să validaţi această propunere comercială %s? -LastPropals=Ultimele %s propuneri -LastClosedProposals=Ultimele %s propuneri comerciale închise +DeleteProp=Ştergere Ofertă Comercială +ValidateProp=Validează Ofertă Comercială +AddProp=Crează ofertă +ConfirmDeleteProp=Sigur doriţi să ştergeţi această ofertă comercială ? +ConfirmValidateProp=Sigur doriţi să validaţi această ofertă comercială %s? +LastPropals=Ultimele %s oferte +LastClosedProposals=Ultimele %s oferte comerciale închise LastModifiedProposals=Ultimele %s propuneri comerciale modificate -AllPropals=Toate propunerile -LastProposals=Ultimele propuneri -SearchAProposal=Caută o propunere -ProposalsStatistics=Statistici propuneri comerciale +AllPropals=Toate ofertele +LastProposals=Ultimele oferte +SearchAProposal=Caută o ofertă +ProposalsStatistics=Statistici oferte comerciale NumberOfProposalsByMonth=Număr pe luni AmountOfProposalsByMonthHT=Valoarea pe luni (netă) -NbOfProposals=Număr propuneri comerciale -ShowPropal=Afiţează propunerea +NbOfProposals=Număr oferte comerciale +ShowPropal=Afişează oferta PropalsDraft=Schiţe PropalsOpened=Deschise PropalsNotBilled=Închise nefacturate PropalStatusDraft=Schiţă (de validat) -PropalStatusValidated=Validată (propunere deschisă) -PropalStatusOpened=Validată (propunere deschisă) +PropalStatusValidated=Validată (oferta e deschisă) +PropalStatusOpened=Validată (ofertă deschisă) PropalStatusClosed=Închisă PropalStatusSigned=Semnată (de facturat) PropalStatusNotSigned=Nesemnată (inchisă) @@ -47,19 +47,17 @@ PropalStatusClosedShort=Închisă PropalStatusSignedShort=Semnată PropalStatusNotSignedShort=Nesemnată PropalStatusBilledShort=Facturată -PropalsToClose=Propuneri Comerciale de închis -PropalsToBill=Propuneri Comerciale semnate de facturat -ListOfProposals=Lista propuneri comerciale -ActionsOnPropal=Evenimente pe propunerea -NoOpenedPropals=Nu sunt propuneri comerciale deschise -NoOtherOpenedPropals=Nu există alte propuneri comerciale deschise -RefProposal=Ref. Propuneri comerciale -SendPropalByMail=Trimite propunerea comercială pe mail -FileNotUploaded=Fişierul nu a fost încărcat -FileUploaded=Fişierul a fost încărcat cu succes -AssociatedDocuments=Documente asociate la propunere: +PropalsToClose=Oferte Comerciale de închis +PropalsToBill=Oferte Comerciale semnate de facturat +ListOfProposals=Lista ofertelor comerciale +ActionsOnPropal=Evenimente pe ofertă +NoOpenedPropals=Nu sunt oferte comerciale deschise +NoOtherOpenedPropals=Nu există alte oferte comerciale deschise +RefProposal=Ref. Ofertă comercială +SendPropalByMail=Trimite oferta comercială pe mail +AssociatedDocuments=Documente asociate la ofertă: ErrorCantOpenDir=Nu se poate deschide directorul -DatePropal=Dată Propunere +DatePropal=Dată ofertă DateEndPropal=Data valabilităţii DateEndPropalShort=Data de sfârşit ValidityDuration=Durata de valabilitate @@ -69,18 +67,18 @@ BuildBill=Crează factură ErrorPropalNotFound=Propunearea %s nu a fost găsită Estimate=Deviz: EstimateShort=Deviz -OtherPropals=Alte propuneri -AddToDraftProposals=Adaugă propunere schiţă -NoDraftProposals=Nici o propunere schiţă -CopyPropalFrom=Crează propunerea comercială prin copierea uneia existente -CreateEmptyPropal=Crează propunerea comercială/deviz Vierge sau din lista de produse / servicii -DefaultProposalDurationValidity=Durata validării implicite a propunerii(în zile) -UseCustomerContactAsPropalRecipientIfExist=Utilizați adresa de contact a clientului în cazul în care este definită în loc de adresa terţului ca destinatarul propunerii -ClonePropal=Clonează propunere comercială -ConfirmClonePropal=Sunigur doriţi să clonaţi această propunere comercială %s ? -ConfirmReOpenProp=Sigur doriţi să redeschideţi propunere comercială %s ? -ProposalsAndProposalsLines=Propuneri Comerciale si liniilor -ProposalLine=Linie Propunere +OtherPropals=Alte oferte +AddToDraftProposals=Adaugă ofertă schiţă +NoDraftProposals=Nicio ofertă schiţă +CopyPropalFrom=Crează ofertă comercială prin copierea uneia existente +CreateEmptyPropal=Crează ofertă comercială/deviz nouă sau din lista de produse / servicii +DefaultProposalDurationValidity=Durata validării implicite a ofertei (în zile) +UseCustomerContactAsPropalRecipientIfExist=Utilizați adresa de contact a clientului în cazul în care este definită în loc de adresa terţului ca destinatarul ofertei +ClonePropal=Clonează oferta comercială +ConfirmClonePropal=Sigur doriţi să clonaţi această ofertă comercială %s ? +ConfirmReOpenProp=Sigur doriţi să redeschideţi oferta comercială %s ? +ProposalsAndProposalsLines=Oferte Comerciale si linii +ProposalLine=Linie Ofertă AvailabilityPeriod=Disponibilitate Livrare SetAvailability=Setează disponibilitatea livrării AfterOrder=după comandă @@ -91,12 +89,12 @@ AvailabilityTypeAV_2W=2 săptămâni AvailabilityTypeAV_3W=3 săptămâni AvailabilityTypeAV_1M=1 lună ##### Types de contacts ##### -TypeContact_propal_internal_SALESREPFOLL=Reprezentant urmărire propunere +TypeContact_propal_internal_SALESREPFOLL=Reprezentant urmărire ofertă TypeContact_propal_external_BILLING=Contact client facturare propunere -TypeContact_propal_external_CUSTOMER=Contact client urmărire propunere +TypeContact_propal_external_CUSTOMER=Contact client urmărire ofertă # Document models -DocModelAzurDescription=Model de propunerecomercială completă (logo. ..) -DocModelJauneDescription=Model propunere Jaune +DocModelAzurDescription=Model de ofertă comercială completă (logo. ..) +DocModelJauneDescription=Model ofertă Jaune DefaultModelPropalCreate=Crează model implicit -DefaultModelPropalToBill=Model implicit la închiderea unei propuneri comerciale (de facturat) -DefaultModelPropalClosed=Model implicit la închiderea unei propuneri comerciale (nefacturat) +DefaultModelPropalToBill=Model implicit la închiderea unei oferte comerciale (de facturat) +DefaultModelPropalClosed=Model implicit la închiderea unei oferte comerciale (nefacturat) diff --git a/htdocs/langs/ro_RO/resource.lang b/htdocs/langs/ro_RO/resource.lang new file mode 100644 index 00000000000..8a2f531d677 --- /dev/null +++ b/htdocs/langs/ro_RO/resource.lang @@ -0,0 +1,34 @@ + +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=Lista resurse +ResourceSingular=Resursă +ResourceCard=Fişă resursă +AddResource=Crează resursă +ResourceFormLabel_ref=Nume resursă +ResourceType=Tip resursă +ResourceFormLabel_description=Descriere resursă + +ResourcesLinkedToElement=Resurse legate de elementul + +ShowResourcePlanning=Arată planificare resursă +GotoDate=Mergi la data + +ResourceElementPage=Element resurse +ResourceCreatedWithSuccess=Resursă creată +RessourceLineSuccessfullyDeleted=Linie resursă ștearsă +RessourceLineSuccessfullyUpdated=Linie resursă actualizată +ResourceLinkedWithSuccess=Resursă legată cu succes + +TitleResourceCard=Fişă resursă +ConfirmDeleteResource=Confirmaţi ştergerea acestei resurse +RessourceSuccessfullyDeleted=Resursă ştearsă +DictionaryResourceType=Tipuri resurse + +SelectResource=Selectează resursa diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang index 46203a59c29..ac7cdf554b2 100644 --- a/htdocs/langs/ro_RO/sendings.lang +++ b/htdocs/langs/ro_RO/sendings.lang @@ -5,7 +5,7 @@ Sendings=Livrari Shipment=Livrare Shipments=Livrari Receivings=Recepţii -SendingsArea=Zona Livrari +SendingsArea=Livrari ListOfSendings=Lista Livrari SendingMethod=Metodă Livrare SendingReceipt=Borderou Livrare @@ -30,17 +30,17 @@ SendingsForSameOrder=Livrări pentru această comandă SendingsAndReceivingForSameOrder=Livrările şi recepţiile pentru această comandă SendingsToValidate=Livrări de validat StatusSendingCanceled=Anulată -StatusSendingDraft=Nevalidată +StatusSendingDraft=Schiţă StatusSendingValidated=Validată (produse de livrat sau deja livrate) StatusSendingProcessed=Procesată StatusSendingCanceledShort=Anulată -StatusSendingDraftShort=Nevalidată +StatusSendingDraftShort=Schiţă StatusSendingValidatedShort=Validată StatusSendingProcessedShort=Procesată SendingSheet=Borderou de livrare Carriers=Transportatori Carrier=Transportator -CarriersArea=Zona Transportatori +CarriersArea=Transportatori NewCarrier=Transportatori Nou ConfirmDeleteSending=Sigur doriți să ștergeți această livrare ? ConfirmValidateSending=Sigur doriți să valdaţiaceastă livrare cu referinţa %s ? @@ -54,13 +54,15 @@ StatsOnShipmentsOnlyValidated=Statisticil ectuate privind numai livrările valid DateDeliveryPlanned=Data de livrare planificată DateReceived=Data de livrare reală SendShippingByEMail=Trimite dispoziţia de livrare prin e-mail -SendShippingRef=Submission of shipment %s +SendShippingRef=Transmitere livrare %s ActionsOnShipping=Evenimente pe livrare LinkToTrackYourPackage=Link pentru a urmări pachetul dvs ShipmentCreationIsDoneFromOrder=Pentru moment, crearea unei noi livrări se face din fişa comenzii. RelatedShippings=Livrări asociate ShipmentLine=Linie de livrare CarrierList=Lista transportatori +SendingRunning=Produs pentru comanda client deja trimis +SuppliersReceiptRunning=Produs pentru comanda furnizor deja recepţionată # Sending methods SendingMethodCATCH=Colectată de client @@ -74,5 +76,5 @@ SumOfProductVolumes=Volumul total al produselor SumOfProductWeights=Greutatea totală a produselor # warehouse details -DetailWarehouseNumber= Warehouse details -DetailWarehouseFormat= W:%s (Qty : %d) +DetailWarehouseNumber= Detalii Depozit +DetailWarehouseFormat= W:%s (Cant : %d) diff --git a/htdocs/langs/ro_RO/sms.lang b/htdocs/langs/ro_RO/sms.lang index 94fb3035879..c0865411c46 100644 --- a/htdocs/langs/ro_RO/sms.lang +++ b/htdocs/langs/ro_RO/sms.lang @@ -2,7 +2,7 @@ Sms=Sms SmsSetup=Sms de configurare SmsDesc=Această pagină vă permite să definiţi opţiunile de globali de pe caracteristici SMS -SmsCard=SMS Card +SmsCard=Fişă SMS AllSms=Toate SMS campanii de SmsTargets=Ţinte SmsRecipients=Ţinte @@ -27,7 +27,7 @@ SmsResult=Rezultatul de trimiterea de SMS TestSms=Sms de testare ValidSms=Validare Sms ApproveSms=Aprobare Sms -SmsStatusDraft=Proiect +SmsStatusDraft=Schiţă SmsStatusValidated=Validate SmsStatusApproved=Aprobat SmsStatusSent=Trimisa diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang index f9018371052..0f237212e6f 100644 --- a/htdocs/langs/ro_RO/stocks.lang +++ b/htdocs/langs/ro_RO/stocks.lang @@ -2,7 +2,7 @@ WarehouseCard=Fişă Depozit Warehouse=Depozit Warehouses=Depozite -NewWarehouse=Depozit nou +NewWarehouse=Depozit / Stoc Nou WarehouseEdit=Modifică depozit MenuNewWarehouse=Depozit nou WarehouseOpened=Depozit deschis @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Eticheta Depozit este obligatorie CorrectStock=Corectează stoc ListOfWarehouses=Lista depozite ListOfStockMovements=Lista mişcări de stoc -StocksArea=Zona Stocuri +StocksArea=Depozite Location=Locație LocationSummary=Nume scurt locaţie NumberOfDifferentProducts=Numărul de produse diferite @@ -94,8 +94,8 @@ DesiredStock=Stoc dorit StockToBuy=De comandat Replenishment=Reaprovizionare ReplenishmentOrders=Comenzi reaprovizionare -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=Potrivit opțiunilor decreştere/ descreştere , stocul fizic și stocul virtual (fizic + Comenzicurente) pot diferi +UseVirtualStockByDefault=Utilizați stoc virtual implicit, în loc de stoc fizic, pentru facilitatea de reaprovizionare UseVirtualStock=Utilizeaza Stoc Virtual UsePhysicalStock=Utilizeaza Stoc Fizic CurentSelectionMode=Mod selectie curent @@ -107,19 +107,19 @@ AlertOnly= Numai Alerte WarehouseForStockDecrease=Depozitul %s va fi utilizat pentru scăderea stocului WarehouseForStockIncrease=Depozitul %s va fi utilizat pentru creşterea stocului ForThisWarehouse=Pentru acest depozit -ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. +ReplenishmentStatusDesc=Aceasta este lista cu toate produsele având stocul mai mic decât stocul dorit (sau valoarea de alertă dacă casuţa "doar alertă " este bifată) și sugerăm să vă creaţi comenzi furnizor pentru a completa diferența. ReplenishmentOrdersDesc=Aceasta este lista cu toate comenzile furnizor deschise Replenishments=Reaprovizionări NbOfProductBeforePeriod=Cantitatea de produs %s în stoc înainte de perioada selectată (< %s) NbOfProductAfterPeriod=Cantitatea de produs %s în stoc după perioada selectată (> %s) -MassMovement=Mass movement +MassMovement=Mişcare în masă MassStockMovement=Transfer stoc în masă SelectProductInAndOutWareHouse=Selectați un produs, o cantitate, un depozit sursă și un depozit țintă, apoi faceți clic pe"%s". Odată făcut acest lucru pentru toate transferurile cerute, faceți clic pe "%s". RecordMovement=Înregistrare transfer ReceivingForSameOrder=Recepţii pentru această comandă -StockMovementRecorded=Stock movements recorded +StockMovementRecorded=Mişcări stoc înregistrate RuleForStockAvailability=Reguli pentru cereri stoc -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 +StockMustBeEnoughForInvoice=Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul în factură +StockMustBeEnoughForOrder=Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul în comandă +StockMustBeEnoughForShipment= Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul în livrare diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang index cba0bff3e21..b21a884733d 100644 --- a/htdocs/langs/ro_RO/suppliers.lang +++ b/htdocs/langs/ro_RO/suppliers.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Furnizori Supplier=Furnizor -AddSupplier=Adaugă furnizor +AddSupplier=Crează un furnizor SupplierRemoved=Furnizor şters SuppliersInvoice=Factură furnizor NewSupplier=Furnizor nou @@ -22,7 +22,7 @@ ProductHasAlreadyReferenceInThisSupplier=Acest produs are deja o referinţă la ReferenceSupplierIsAlreadyAssociatedWithAProduct=Acest furnizor este deja asociat cu referinta: % s NoRecordedSuppliers=Nici un furnizor înregistrat SupplierPayment=Plată Furnizor -SuppliersArea=Zona Furnizori +SuppliersArea=Furnizori RefSupplierShort=Ref. furnizor Availability=Disponibilitate ExportDataset_fournisseur_1=Facturi furnizori şi linii facturi @@ -40,5 +40,5 @@ AddSupplierInvoice=Crează factură furnizor ListOfSupplierProductForSupplier=Lista produse şi preţuri pentru furnizorul %s NoneOrBatchFileNeverRan=Nici una sau tratate %s ne executate recent SentToSuppliers=Trimite la furnizori -ListOfSupplierOrders=List of supplier orders -MenuOrdersSupplierToBill=Supplier orders to invoice +ListOfSupplierOrders=Lista comenzi furnizori +MenuOrdersSupplierToBill=Comenzi Furnizor de facturat diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang index 2fbe16713ad..a606801617c 100644 --- a/htdocs/langs/ro_RO/trips.lang +++ b/htdocs/langs/ro_RO/trips.lang @@ -1,22 +1,22 @@ # Dolibarr language file - Source file is en_US - trips Trip=Deplasare Trips=Deplasări -TripsAndExpenses=Decont de cheltuieli -TripsAndExpensesStatistics=Statistici Deconturi de cheltuieli -TripCard=Fişă Cheltuieli -AddTrip=Adaugă Decont de cheltuieli -ListOfTrips=Lista cheltuieli +TripsAndExpenses=Deplasări şi cheltuieli +TripsAndExpensesStatistics=Statistici Deplasări şi cheltuieli +TripCard=Fişă Deplasare +AddTrip=Creare deplasare +ListOfTrips=Lista deplasări ListOfFees=Lista note cheltuieli -NewTrip=Decont de cheltuieli nou +NewTrip=Deplasare nouă CompanyVisited=Societatea / Instituţia vizitată Kilometers=Kilometri FeesKilometersOrAmout=Valoarea sau km DeleteTrip=Şterge Deplasare -ConfirmDeleteTrip=Sigur doriţi să ştergeţi acest Decont de Cheltuieli ? +ConfirmDeleteTrip=Sigur doriţi să ştergeţi aceasăt Deplasarei ? TF_OTHER=Altele TF_LUNCH=Prânz TF_TRIP=Deplasare -ListTripsAndExpenses=Lista Deconturi de cheltuieli -ExpensesArea=Zona Deconturi de cheltuieli -SearchATripAndExpense=Caută Decont de cheltuieli -ClassifyRefunded=Classify 'Refunded' +ListTripsAndExpenses=Lista Deplasări şi cheltuieli +ExpensesArea=Deplasări şi cheltuieli +SearchATripAndExpense=Caută o deplasare şi cheltuială +ClassifyRefunded=Clasează "Rambursată" diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang index 8f4120b8092..f68a797e3f1 100644 --- a/htdocs/langs/ro_RO/users.lang +++ b/htdocs/langs/ro_RO/users.lang @@ -1,8 +1,8 @@ # Dolibarr language file - Source file is en_US - users -HRMArea=HRM area -UserCard=Utilizator carte -ContactCard=Contact carte -GroupCard=Grupul de carte +HRMArea=HRM +UserCard=Fişă Utilizator +ContactCard=Fişă Contact +GroupCard=Fişă Grup NoContactCard=Nu carte între persoane de contact Permission=Permission Permissions=Permisiuni @@ -63,7 +63,6 @@ ShowGroup=Arata grup ShowUser=Arata utilizator NonAffectedUsers=Non afectate utilizatori UserModified=Utilizator modificate cu succes -GroupModified=Grupul modificate cu succes PhotoFile=Foto fişier UserWithDolibarrAccess=Utilizator cu acces Dolibarr ListOfUsersInGroup=Lista de utilizatori în acest grup @@ -87,7 +86,7 @@ MyInformations=Mea de date ExportDataset_user_1=Dolibarr utilizatorii şi proprietăţi DomainUser=Domeniu utilizatorul %s Reactivate=Reactivaţi -CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. +CreateInternalUserDesc=Acest formular va permite sa creaţi un utilizator intern al companiei/ fundaţiei dvs . Pentru a crea un utilizator extern (client, furnizor, ...), folosiţi butonul "Creaţi utilizator Dolibarr " din cardul contact al terţului. InternalExternalDesc=Un utilizator intern este un utilizator care este parte a firmei dvs. / Fundaţia.
    Un utilizator extern este un client, furnizor sau de altă parte.

    În ambele cazuri, permissions defineşte drepturile pe Dolibarr, externe, de asemenea, utilizatorul poate avea un alt administrator de meniu decât utilizator intern (a se vedea Home - Setup - Display) PermissionInheritedFromAGroup=Permisiunea acordată deoarece moştenită de la un utilizator al unui grup. Inherited=Moştenit @@ -103,7 +102,7 @@ UserDisabled=User %s cu handicap UserEnabled=User %s activat UserDeleted=User %s eliminat NewGroupCreated=Grupul creat %s -GroupModified=Grupul modificate cu succes +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? @@ -114,8 +113,10 @@ YourRole=Dvs. de roluri YourQuotaOfUsersIsReached=Cota dvs. de utilizatori activi este atins! NbOfUsers=NB de utilizatori DontDowngradeSuperAdmin=Numai un superadmin poate declasa un superadmin -HierarchicalResponsible=Responsabil ierarhic +HierarchicalResponsible=Supervisor HierarchicView=Vedere ierarhică UseTypeFieldToChange=Foloseşte câmpul Tip pentru schimbare OpenIDURL=URL OpenID LoginUsingOpenID=Utilizați OpenID pentru login +WeeklyHours=Ore saptămânale +ColorUser=Culoarea utilizatorului diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang index f9bdf12b34f..a822e29dacf 100644 --- a/htdocs/langs/ro_RO/withdrawals.lang +++ b/htdocs/langs/ro_RO/withdrawals.lang @@ -1,66 +1,66 @@ # Dolibarr language file - Source file is en_US - withdrawals -StandingOrdersArea=Permanent comenzi zona -CustomersStandingOrdersArea=Clienţii ordine de plată zona +StandingOrdersArea=Ordine de plată +CustomersStandingOrdersArea=Ordine de plată clienţi StandingOrders=Ordine de plată StandingOrder=Ordine de plată -NewStandingOrder=New permanent pentru -StandingOrderToProcess=Pentru a procesa -StandingOrderProcessed=Prelucrate +NewStandingOrder=Ordin nou de plată +StandingOrderToProcess=De procesat +StandingOrderProcessed=Procesate Withdrawals=Retrageri Withdrawal=Retragerea -WithdrawalsReceipts=Retragerile încasări -WithdrawalReceipt=Retragere de la primirea +WithdrawalsReceipts=Chitanţe retrageri +WithdrawalReceipt=Chitanţă retrageri WithdrawalReceiptShort=Chitanţă -LastWithdrawalReceipts=Ultima %s retragere încasări +LastWithdrawalReceipts=Ultimele %s chitanţe retrageri WithdrawedBills=Withdrawed facturi -WithdrawalsLines=Retragerile de linii de -RequestStandingOrderToTreat=Cerere de ordine de plată pentru a trata -RequestStandingOrderTreated=Cerere de ordine de plată trataţi +WithdrawalsLines=Linii retrageri +RequestStandingOrderToTreat=Cerere pentru ordine de plată de procesat +RequestStandingOrderTreated=Cerere pentru ordine de plată procesată +NotPossibleForThisStatusOfWithdrawReceiptORLine=Nu a fost încă posibil. Statutul Withdraw trebuie să fie setat la "creditat" înaintea declarării respinge pe liniile specifice. CustomersStandingOrders=Clientul ordine de plată CustomerStandingOrder=Client permanent pentru -NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request -NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information +NbOfInvoiceToWithdraw=Nr. facturii cu retrage cererea +NbOfInvoiceToWithdrawWithInfo=Nr. facturii cu cererea retrage pentru clienții care au informațiile contului bancar definit InvoiceWaitingWithdraw=Factura de aşteptare pentru al retrage AmountToWithdraw=Suma de a se retrage WithdrawsRefused=Retrage refuzat NoInvoiceToWithdraw=Nici un client nu facturii de plată, în modul de "retragere" este în aşteptare. Du-te la "Retrageţi fila" pe factura cardul pentru a face o cerere. ResponsibleUser=Responsabil de utilizator -WithdrawalsSetup=Retragerea setup -WithdrawStatistics=Retrage "statistici +WithdrawalsSetup=Setare retragere +WithdrawStatistics=Statistici Retrageri WithdrawRejectStatistics=Retrageţi respinge "statistici -LastWithdrawalReceipt=Ultima %s retragerea încasări +LastWithdrawalReceipt=Ultimele %s retrageri MakeWithdrawRequest=Face o retragă cererea -ThirdPartyBankCode=Terţă parte de cod bancar -ThirdPartyDeskCode=A treia parte birou cod +ThirdPartyBankCode=Cod terţ bancă +ThirdPartyDeskCode=Cod terţ birou NoInvoiceCouldBeWithdrawed=Nu withdrawed factură cu succes. Verificaţi dacă factura sunt pe companii cu un valide BAN. ClassCredited=Clasifica creditat -ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account? +ClassCreditedConfirm=Sunteţi sigur că doriţi sa clasificaţi această retragere ca creditată pe contul bancar? TransData=Data transmiterii TransMetod=Metoda transmitere Send=Trimite Lines=Linii -StandingOrderReject=Issue a rejection -InvoiceRefused=Încărcaţi respingere la client +StandingOrderReject=Emite o respinge WithdrawalRefused=Retragere refuzată WithdrawalRefusedConfirm=Sunteţi sigur că doriţi să introduceţi un respingere de retragere pentru societate RefusedData=Data respingerii RefusedReason=Motivul respingerii RefusedInvoicing=Facturare respingerea NoInvoiceRefused=Nu încărcaţi respingerea -InvoiceRefused=Încărcaţi respingere la client +InvoiceRefused=Factura refuzată (Încărcați refuzul la client) Status=Status StatusUnknown=Necunoscut StatusWaiting=Aşteptare StatusTrans=Trimis StatusCredited=Creditate -StatusRefused=A refuzat +StatusRefused=Refuzat StatusMotif0=Nespecificat StatusMotif1=Fonduri insuficiente StatusMotif2=Cerere contestată StatusMotif3=Nici o retragere pentru a StatusMotif4=Clientul Ordine StatusMotif5=RIB inutilizabil -StatusMotif6=Cont fără echilibru +StatusMotif6=Cont fără sold StatusMotif7=Hotărâre judecătorească StatusMotif8=Alte motive CreateAll=Retragă toate @@ -76,21 +76,22 @@ WithBankUsingRIB=Pentru conturile bancare folosind RIB WithBankUsingBANBIC=Pentru conturile bancare folosind codul IBAN / BIC / SWIFT BankToReceiveWithdraw=Cont bancar pentru a primi retrage CreditDate=Credit pe -WithdrawalFileNotCapable=Imposibil de a genera primirea fişier de retragere pentru ţara dvs. +WithdrawalFileNotCapable=Imposibil de a genera fișierul chitanţă de retragere pentru țara dvs %s (Țara dvs. nu este acceptată) ShowWithdraw=Arată Retragere -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. +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 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=This will also apply payments to invoices and will classify them as "Paid" +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ă InfoCreditMessage=%s pentru picioare a fost plătit de către bancă
    Datele de plata: %s InfoTransSubject=Transmiterea %s ordine permanente la banca -InfoTransMessage=The standing order %s has been sent to bank by %s %s.

    +InfoTransMessage=Ordinul de plată %s a fost trimis la bancă de %s %s.

    InfoTransData=Suma: %s
    Metoda: %s
    Data: %s InfoFoot=Acesta este un mesaj automat trimis de Dolibarr -InfoRejectSubject=Pentru a refuzat permanent +InfoRejectSubject=Ordin de plată refuzat InfoRejectMessage=Bună ziua,

    ordinul de plata al facturii %s de la societatea %s în valoare de %s a fost refuzat de către bancă.

    --
    %s ModeWarning=Opţiunea pentru modul real, nu a fost stabilit, ne oprim după această simulare diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang index d14dacf619c..54287b2ab5e 100644 --- a/htdocs/langs/ro_RO/workflow.lang +++ b/htdocs/langs/ro_RO/workflow.lang @@ -2,8 +2,8 @@ WorkflowSetup=Configurare Modul Flux de Lucru WorkflowDesc=Acest modul vă permite modificarea comportamentului acțiunilor automate în aplicaţie. În mod implicit, fluxul de lucru este deschis (puteţi face ce doriţi în ordinea dorită). Puteți activa acțiunile\nautomate de care sunteti interesat ThereIsNoWorkflowToModify=Nu există nici un flux de lucru modificabil pentru modulele activate. -descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crează o comandă client automat, după ce o propunere comercială este semnată -descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crează o factură client automat, după ce o propunere comercială este semnată +descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crează o comandă client automat, după ce o ofertă comercială este semnată +descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crează o factură client automat, după ce o ofertă comercială este semnată descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crează o factură client automat, după ce un contract este validat descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crează o factură client automat, după ce o comandă client este închisă descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasează propunere comercială legată ca facturată când comanda client este setată ca plătită diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/ru_RU/accountancy.lang +++ b/htdocs/langs/ru_RU/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index f9ec0b0c210..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=Доступные боксы @@ -437,14 +440,14 @@ Module52Name=Акции Module52Desc=Акции 'управлению продуктами Module53Name=Услуги Module53Desc=Услуги по управлению -Module54Name=Договоры -Module54Desc=Контракты и услуги управления +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Штрих-коды 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=Проекты -Module400Desc=Проекты управления внутри других модулей +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Зарплаты Module510Desc=Management of employees salaries and payments Module600Name=Уведомления -Module600Desc=Отправить уведомления (по электронной почте) о Dolibarr деловых мероприятий +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Пожертвования Module700Desc=Пожертвования управления Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-компании Module5000Desc=Позволяет управлять несколькими компаниями Module6000Name=Бизнес-Процесс Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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=Кассовое Module50100Desc=Кассовое модуль -Module50200Name= Paypal -Module50200Desc= Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с Paypal +Module50200Name=Paypal +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=Управление Бизнес-Процессами Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Наценки @@ -606,15 +613,16 @@ Permission151=Прочитайте Регламент Permission152=Настройка Регламент Permission153=Прочитайте Регламент поступления Permission154=Кредитные / отказаться регламент поступления -Permission161=Читайте контракты -Permission162=Создать / изменить контракты -Permission163=Активировать услугу по контракту -Permission164=Отключить службу контракта -Permission165=Удалить контрактов -Permission171=Читать поездок -Permission172=Создать / изменить экскурсии -Permission173=Удалить поездок -Permission178=Экспорт поездок +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Читать поставщиков Permission181=Читать поставщик заказов Permission182=Создать / изменить поставщика заказы @@ -671,7 +679,7 @@ Permission300=Читать штрих-коды Permission301=Создать / изменить штрих-коды Permission302=Удалить штрих-коды Permission311=Читать услуги -Permission312=Назначить службы на контракт +Permission312=Assign service/subscription to contract Permission331=Читать закладок Permission332=Создать / изменить закладки Permission333=Удаление закладок @@ -701,8 +709,8 @@ Permission701=Читать пожертвований Permission702=Создать / изменить пожертвований Permission703=Удалить пожертвований Permission1001=Читать запасов -Permission1002=Создание / изменение запасов -Permission1003=Удалить запасов +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Читать фондового движения Permission1005=Создать / изменить фондового движения Permission1101=Читать доставка заказов @@ -778,6 +786,7 @@ DictionaryOrderMethods=Ordering methods DictionarySource=Происхождение Коммерческих предложений / Заказов DictionaryAccountancyplan=План счетов DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates SetupSaved=Настройки сохранены BackToModuleList=Вернуться к списку модулей BackToDictionaryList=Назад к списку словарей @@ -887,6 +896,7 @@ PermanentLeftSearchForm=Постоянный поиск формы на лево DefaultLanguage=Язык по умолчанию (код языка) EnableMultilangInterface=Включить многоязычный интерфейс EnableShowLogo=Показать логотип на левом меню +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Система была успешно обновлена CompanyInfo=Информация о Компании / фонде CompanyIds=Компания / фундамент тождествам @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Автоматическое определение невозможно YouUseBestDriver=Вы используете драйвер %s, который на текущий момент является самым подходящим YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=У вас только %s Товаров/Услуг в базе данных. Это не требует никакой оптимизации. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Вернуться бухгалтерские код ModuleCompanyCodePanicum=Возврат порожних бухгалтерские код. ModuleCompanyCodeDigitaria=Бухгалтерия код зависит от третьей стороны кода. Код состоит из символов "С" в первой позиции следуют первые 5 символов сторонних код. UseNotifications=Использование уведомлений -NotificationsDesc=Уведомления функция позволяет отправить молча автоматической почте, для некоторых Dolibarr событий, для компаний, которые настроены на +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Документы шаблоны DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark по проекту документа @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Добавить дату доставки спосо UseOptionLineIfNoQuantity=Соответствие продукта / услуги с нулевой суммой считается вариант FreeLegalTextOnProposal=Свободный текст на коммерческие предложения WatermarkOnDraftProposal=Водяные знаки на черновиках Коммерческих предложений ("Нет" если пусто) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Приказ 'Management Setup OrdersNumberingModules=Приказы нумерации модулей @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Чтобы проверить порядок после предложения ближе, позволяет не шаг за временное распоряжение FreeLegalTextOnOrders=Свободный текст распоряжения WatermarkOnDraftOrders=Водяные знаки на черновиках Заказов ("Нет" если пусто) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Нажмите для набора модуля настройки ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises
    __PHONETO__ qui sera remplacé par le téléphone de l'appelé
    __PHONEFROM__ qui sera remplacé par le téléphone de l'appelant (le votre)
    __LOGIN__ qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)
    __PASS__ qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Вмешательство нумерации мод TemplatePDFInterventions=Вмешательство карту документы моделей WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Контракты модуль установки +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Контракты нумерации модулей TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Кэшируется сервером CacheByClient=Кэшируется броузером CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Автоматическое определение невозможно +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Продукты модуль настройки ServiceSetup=Услуги установки модуля @@ -1382,9 +1393,10 @@ MailingSetup=Отправка модуля настройки MailingEMailFrom=Отправитель EMail (С) по электронной почте было отправлено по электронной почте: модуль MailingEMailError=Вернуться EMail (ошибки-до) для сообщений электронной почты с ошибками ##### Notification ##### -NotificationSetup=Почтовый модуль настройки +NotificationSetup=EMail notification module setup NotificationEMailFrom=Отправитель EMail (С) по электронной почте направил уведомление -ListOfAvailableNotifications=Список доступных уведомлений (Этот список зависит от активированных модулей) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Отправка модуля настройки SendingsReceiptModel=Отправка получения модели @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Соединение с сервером ' %s' на базе ' OSCommerceTestKo1=Соединение с сервером ' %s' успешными, но база данных ' %s' не может быть достигнута. OSCommerceTestKo2=Соединение с сервером ' %s' пользователя ' %s' провалилась. ##### Stock ##### -StockSetup=Конфигурация модуля запас -UserWarehouse=Использование персональных пользователей запасов +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Меню исключить TreeMenu=Дерево меню @@ -1478,11 +1491,14 @@ ClickToDialDesc=Этот модуль позволяет добавлять ик ##### Point Of Sales (CashDesk) ##### CashDesk=Точка продаж CashDeskSetup=Кассовое модуль настройки -CashDeskThirdPartyForSell=Общие третьей стороне для использования на продажу +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Денежные счета, используемого для продает CashDeskBankAccountForCheque= Счет будет использоваться для получения выплат чеком CashDeskBankAccountForCB= Учетной записи для использования на получение денежных выплат по кредитным картам -CashDeskIdWareHouse=Datawarehous для пользователя продает +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. ##### Bookmark ##### BookmarkSetup=Закладка Настройка модуля BookmarkDesc=Этот модуль позволяет управлять закладками. Вы также можете добавить ярлыки для любых Dolibarr страниц или externale веб-сайтов на левом меню. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Формат TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang index 709c39ab119..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=Посмотреть список @@ -41,9 +42,10 @@ AutoActions= Автоматическое заполнение дня AgendaAutoActionDesc= Определить здесь события, для которого вы хотите Dolibarr создать автоматическое действие в повестку дня. Если ничего не будет проверяться (по умолчанию), только вручную действия, будут включены в повестку дня. AgendaSetupOtherDesc= Эта страница позволяет настроить и другие параметры модуля дня. AgendaExtSitesDesc=Эта страница позволяет настроить внешний календарей. -ActionsEvents= События, за которые Dolibarr создадут действий в повестку дня автоматически -PropalValidatedInDolibarr= Предложение проверены -InvoiceValidatedInDolibarr= Счет проверены +ActionsEvents=События, за которые Dolibarr создадут действий в повестку дня автоматически +PropalValidatedInDolibarr=Предложение проверены +InvoiceValidatedInDolibarr=Счет проверены +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Счет %s вернуться к проекту статус InvoiceDeleteDolibarr=Счет-фактура %s удалена OrderValidatedInDolibarr= Заказ %s проверен @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Заказ %s утвержден OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Заказ %s возращен в статус черновик OrderCanceledInDolibarr=Заказ %s отменен -InterventionValidatedInDolibarr=Intervensjon %s validert ProposalSentByEMail=Коммерческое предложение %s отправлены по электронной почте OrderSentByEMail=Заказ покупателя %s отправлен по электронной почте InvoiceSentByEMail=Счет-фактура клиента %s отправлен по электронной почте @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Поставщик порядке %s отправлен SupplierInvoiceSentByEMail=Поставщиком счета %s отправлены по электронной почте ShippingSentByEMail=Доставка %s отправлены по электронной почте ShippingValidated= Shipping %s validated -InterventionSentByEMail=Вмешательство %s отправлены по электронной почте -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Третья группа создала DateActionPlannedStart= Планируемая дата начала DateActionPlannedEnd= Планируемая дата окончания @@ -70,9 +69,9 @@ DateActionStart= Начальная дата DateActionEnd= Конечная дата AgendaUrlOptions1=Можно также добавить следующие параметры для фильтрации вывода: AgendaUrlOptions2=login=логин= %s ограничить выход на действия, созданный, пострадавших или сделали пользователем %s. -AgendaUrlOptions3=logina=logina= %s ограничить выход на действия, созданные пользователем %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=logint= %s ограничить выход на действия пользователя, пострадавших %s. -AgendaUrlOptions5=logind=logind= %s ограничить выход на действия пользователя, проделанной %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Показать рождения контакты AgendaHideBirthdayEvents=Скрыть рождения контакты Busy=Занят @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL для доступа. Ческих файлов ExtSiteNoLabel=Нет описания WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang index f8d7128343b..5d8569d427e 100644 --- a/htdocs/langs/ru_RU/bills.lang +++ b/htdocs/langs/ru_RU/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Кредитовое авизо InvoiceAvoirAsk=Кредитовое авизо для исправления счета-фактуры InvoiceAvoirDesc=Кредитовое авизо - это 'обратный' счет-фактура, который используется для решения проблемы, когда выставлен счета-фактуры в сумме отличной от действительно оплаченной (если клиентом оплатил слишком много по ошибке, или не наоборот - не оплатил счет-фактуру полностью, поскольку он вернулся некоторые продукты, например). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Заменить счет-фактуру %s ReplacementInvoice=Заменяющий счет-фактура ReplacedByInvoice=Заменен счетом-фактурой %s @@ -87,7 +87,7 @@ ClassifyCanceled=Классифицировать как 'Аннулирован ClassifyClosed=Классифицировать как 'Закрыт' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Создать счет-фактуру -AddBill=Добавить счет-фактуру или кредитовое авизо +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Удалить счет-фактуру SearchACustomerInvoice=Поиск счета-фактуры Покупателю @@ -99,7 +99,7 @@ DoPaymentBack=Возвратить платеж ConvertToReduc=Преобразовать в будущую скидку EnterPaymentReceivedFromCustomer=Ввести платеж, полученный от покупателя EnterPaymentDueToCustomer=Произвести платеж за счет Покупателя -DisabledBecauseRemainderToPayIsZero=Неактивно, поскольку напоминание о платеже равно нулю +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Сумма PriceBase=Ценовая база BillStatus=Статус счета-фактуры @@ -137,8 +137,6 @@ BillFrom=Продавец BillTo=Покупатель ActionsOnBill=Действия со счетом-фактурой NewBill=Новый счет-фактура -Prélèvements=Постоянные поручения -Prélèvements=Постоянные поручения LastBills=Последние %s счетов-фактур LastCustomersBills=Последние %s счетов-фактур Покупателям LastSuppliersBills=Последние %s счетов-фактур Поставщиков @@ -156,9 +154,9 @@ ConfirmCancelBill=Вы уверены, что хотите отменить сч ConfirmCancelBillQuestion=Почему вы хотите классифицировать этот счет-фактуру как 'Аннулирован'? ConfirmClassifyPaidPartially=Вы уверены, что хотите изменить статус счет-фактуры %s на 'Оплачен'? ConfirmClassifyPaidPartiallyQuestion=Этот счет-фактура не оплачен полностью. Укажите причины закрытия счета-фактуры? -ConfirmClassifyPaidPartiallyReasonAvoir=Остаток к оплате (%s %s) предоставлен в виде скидки, так как платеж был произведен досрочно. Я отрегулирую НДС при помощи кредитового авизо. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Остаток к оплате (%s %s) предоставлен в виде скидки, так как платеж был произведен досрочно. Я согласен потерять НДС по этой скидке. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Остаток к оплате (%s %s) предоставлен в виде скидки, так как платеж был произведен досрочно. Я восстановлю НДС по этой скидке без кредитового авизо. +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=Плохой Покупатель ConfirmClassifyPaidPartiallyReasonProductReturned=Продукция частично возвращена ConfirmClassifyPaidPartiallyReasonOther=Сумма, аннулированная по другим причинам @@ -191,9 +189,9 @@ AlreadyPaid=Уже оплачен AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Уже оплачен (без кредитовых авизо и взносов) Abandoned=Брошен -RemainderToPay=Остаток к оплате -RemainderToTake=Остаток к получению -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Заявленная сумма ExcessReceived=Полученный излишек @@ -219,19 +217,18 @@ NoInvoice=Нет счетов-фактур ClassifyBill=Классифицировать счет-фактуру SupplierBillsToPay=Счета-фактуры Поставщиков для оплаты CustomerBillsUnpaid=Неоплаченные счета-фактуры Покупателям -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Не подлежащий взысканию SetConditions=Установить условия оплаты SetMode=Установить режим оплаты Billed=Выставлен -RepeatableInvoice=Шаблон счета-фактуры -RepeatableInvoices=Шаблоны счетов-фактур -Repeatable=Шаблон -Repeatables=Шаблоны -ChangeIntoRepeatableInvoice=Преобразовать в шаблон -CreateRepeatableInvoice=Создать шаблон счета-фактуры -CreateFromRepeatableInvoice=Создать по шаблонк счета-фактуры +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Счета-фактуры Покупателям и строки счетов-фактур CustomersInvoicesAndPayments=Счета-фактуры Покупателям и платежи ExportDataset_invoice_1=Счета-фактуры Покупателям и строки счетов-фактур diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang index c9179be2bb4..7def19ba998 100644 --- a/htdocs/langs/ru_RU/categories.lang +++ b/htdocs/langs/ru_RU/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Связи между поставщиками и категория CatCusLinks=Связи между клиентами/потенц. клиентами и категориями CatProdLinks=Связи между Продуктами/Услугами и категориями CatMemberLinks=Связи между участниками и категориями -CatProdLinks=Связи между Продуктами/Услугами и категориями -CatCusLinks=Связи между клиентами/потенц. клиентами и категориями -CatSupLinks=Связи между поставщиками и категориями DeleteFromCat=Удалить из категории DeletePicture=Удалить изображение ConfirmDeletePicture=Подтверждаете удаление изображения? @@ -112,3 +109,4 @@ CategoriesSetup=Настройка категорий CategorieRecursiv=Автоматически связать с родительской категорией CategorieRecursivHelp=Если активировать, то продукт будет связан с родительской категорией при добавлении в подкатегорию AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang index 61902cc19f6..ba15732dac1 100644 --- a/htdocs/langs/ru_RU/compta.lang +++ b/htdocs/langs/ru_RU/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Плохо заказчику бухгалт SuppliersProductsSellSalesTurnover=Генерируемый оборот по продажам поставщиков продукции. CheckReceipt=Проверьте депозит CheckReceiptShort=Проверьте депозит +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Новые скидки NewCheckDeposit=Новая проверка депозит NewCheckDepositOn=Новый депозит проверить на счету: %s @@ -196,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 158bfa2048b..16b0b7d4c85 100644 --- a/htdocs/langs/ru_RU/contracts.lang +++ b/htdocs/langs/ru_RU/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Раздел договоров ListOfContracts=Список договоров -LastContracts=Последние %s измененных договоров +LastModifiedContracts=Last %s modified contracts AllContracts=Все договоры ContractCard=Карточка договора ContractStatus=Статус договора @@ -27,7 +27,7 @@ MenuRunningServices=Запуск служб MenuExpiredServices=Истекшим сроком службы MenuClosedServices=Закрытые услуги NewContract=Новый договор -AddContract=Добавить договор +AddContract=Create contract SearchAContract=Искать договор DeleteAContract=Удалить договор CloseAContract=Закрыть контракта @@ -53,7 +53,7 @@ ListOfRunningContractsLines=Список запуска контракта ли ListOfRunningServices=Список запущенных служб NotActivatedServices=Не активируется услуг (в том числе утверждены контракты) BoardNotActivatedServices=Услуги для активации среди утверждены контракты -LastContracts=Последние %s измененных договоров +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/cron.lang b/htdocs/langs/ru_RU/cron.lang index 00eaed513b6..e99cb254519 100644 --- a/htdocs/langs/ru_RU/cron.lang +++ b/htdocs/langs/ru_RU/cron.lang @@ -18,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes # Menu CronJobs=Запланированные задания -CronListActive= Список активных заданий -CronListInactive= Список неактивных заданий -CronListActive= Список активных заданий +CronListActive=List of active/scheduled jobs +CronListInactive=Список неактивных заданий # Page list CronDateLastRun=Последний раз выполнено CronLastOutput=Last run output diff --git a/htdocs/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang index bb883e3a0d2..e8339fe9701 100644 --- a/htdocs/langs/ru_RU/donations.lang +++ b/htdocs/langs/ru_RU/donations.lang @@ -4,7 +4,7 @@ Donations=Пожертвования DonationRef=Donation ref. Donor=Донор Donors=Доноры -AddDonation=Добавить пожертвование +AddDonation=Create a donation NewDonation=Новое пожертвование ShowDonation=Show donation DonationPromise=Обещание пожертвования @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/ru_RU/externalsite.lang index 98e718918a3..08fbccee1d6 100644 --- a/htdocs/langs/ru_RU/externalsite.lang +++ b/htdocs/langs/ru_RU/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Установка ссылки на внешние веб-сайт ExternalSiteURL=URL внешнего сайта ExternalSiteModuleNotComplete=Модуль ВнешнийСайт не был надлежащим образом настроен. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang index 1018ab82ace..5d133e0bbf7 100644 --- a/htdocs/langs/ru_RU/holiday.lang +++ b/htdocs/langs/ru_RU/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Обновить CantUpdate=You cannot update this leave request. NoDateDebut=Вы должны выбрать начальную дату NoDateFin=Вы должны выбрать конечную дату -ErrorDureeCP=Ваш запрос на выходной не содержит рабочих дней -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Дата утверждена TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Вы должны выбрать причину отказа на запрос о выходных днях -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Причина отказа DateRefusCP=Дата отказа @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=Для пользователя PrevSoldeCP=Предыдущий баланс NewSoldeCP=Новый баланс -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Имя Employee=Сотрудник FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Настройка модуля выходных дней +ConfCP=Configuration of leave request module DescOptionCP=Описание опции ValueOptionCP=Значение -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Проверить конфигурацию -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Обновлено успешно ErrorUpdateConfCP=Во время обновления произошла ошибка. Пожалуйста, попробуйте еще раз. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Проверить UpdateEventCP=Update events diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang index 25c47fa96a5..8e5b1d3c14f 100644 --- a/htdocs/langs/ru_RU/interventions.lang +++ b/htdocs/langs/ru_RU/interventions.lang @@ -3,7 +3,7 @@ Intervention=Вмешательство Interventions=Мероприятия InterventionCard=Вмешательство карту NewIntervention=Новая интервенция -AddIntervention=Добавить вмешательства +AddIntervention=Create intervention ListOfInterventions=Перечень мероприятий EditIntervention=Editer вмешательства ActionsOnFicheInter=Действия по вмешательству @@ -30,6 +30,15 @@ StatusInterInvoiced=Объявленный RelatedInterventions=Связанные с ней мероприятия ShowIntervention=Показать вмешательства SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Представители следующих мер вмешательства TypeContact_fichinter_internal_INTERVENING=Вмешательство diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang index b05271e4bb9..670a7e81b4c 100644 --- a/htdocs/langs/ru_RU/mails.lang +++ b/htdocs/langs/ru_RU/mails.lang @@ -115,7 +115,7 @@ SentBy=Прислал 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=Однако вы можете отправить их в Интернете, добавив параметр MAILING_LIMIT_SENDBYWEB с величиной максимальное количество писем вы хотите отправить на сессии. 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Очистить список ToClearAllRecipientsClickHere=Чтобы очистить получателей список для этого адреса, нажмите кнопку ToAddRecipientsChooseHere=Чтобы добавить адресатов, выберите в этих списках @@ -133,6 +133,9 @@ Notifications=Уведомления NoNotificationsWillBeSent=Нет электронной почте уведомления, планируется к этому мероприятию и компании ANotificationsWillBeSent=1 уведомление будет отправлено по электронной почте SomeNotificationsWillBeSent=%s уведомления будут отправлены по электронной почте -AddNewNotification=Включить новое уведомление запросу -ListOfActiveNotifications=Список всех активных уведомлений запросов +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Список всех уведомлений по электронной почте отправлено +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang index d95bbc81215..bdd90bf67cf 100644 --- a/htdocs/langs/ru_RU/main.lang +++ b/htdocs/langs/ru_RU/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Не удалось найти польз ErrorNoVATRateDefinedForSellerCountry=Ошибка, ставки НДС не установлены для страны '%s'. ErrorNoSocialContributionForSellerCountry=Ошибка, не определен тип социальных взносов для страны %s. ErrorFailedToSaveFile=Ошибка, не удалось сохранить файл. -ErrorOnlyPngJpgSupported=Ошибка, поддерживаются только форматы файлов изображений .PNG и .JPG. -ErrorImageFormatNotSupported=Ваш PHP не поддерживает функции для преобразования изображений в этом формате. SetDate=Установить дату SelectDate=Выбрать дату SeeAlso=Смотрите также %s BackgroundColorByDefault=Цвет фона по умолчанию +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=Файл выбран как вложение, но пока не загружен. Для этого нажмите "Вложить файл". NbOfEntries=Кол-во записей GoToWikiHelpPage=Читать он-лайн помощь (нужен доступ к Интернету) @@ -266,6 +266,7 @@ Afternoon=После полудня Quadri=Квадри MonthOfDay=Месяц дня HourShort=ч +MinuteShort=mn Rate=Курс UseLocalTax=Включить налог Bytes=Байт @@ -340,6 +341,7 @@ FullList=Полный список Statistics=Статистика OtherStatistics=Другие статистические данные Status=Статус +Favorite=Favorite ShortInfo=Инфо Ref=Ref. RefSupplier=Ref. поставщика @@ -365,6 +367,7 @@ ActionsOnCompany=Действия для этого контрагента ActionsOnMember=События об этом члене NActions=%s действий NActionsLate=% с опозданием +RequestAlreadyDone=Request already recorded Filter=Фильтр RemoveFilter=Удалить фильтр ChartGenerated=Диаграмма сгенерирована @@ -645,6 +648,7 @@ OptionalFieldsSetup=Дополнительная настройка атрибу URLPhoto=Адрес фотографии/логотипа SetLinkToThirdParty=Ссылка на другой третьей стороне CreateDraft=Создать проект +SetToDraft=Back to draft ClickToEdit=Нажмите, чтобы изменить ObjectDeleted=Объект удален %s ByCountry=По стране @@ -678,7 +682,7 @@ ViewPrivateNote=Посмотреть заметки XMoreLines=%s строк(и) скрыто PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Понедельник Tuesday=Вторник diff --git a/htdocs/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang index 88f41b1ea28..2c812410598 100644 --- a/htdocs/langs/ru_RU/margins.lang +++ b/htdocs/langs/ru_RU/margins.lang @@ -38,4 +38,7 @@ BuyingCost=Себестоимость UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/ru_RU/orders.lang index c5f655e4781..6d2e03bcbb3 100644 --- a/htdocs/langs/ru_RU/orders.lang +++ b/htdocs/langs/ru_RU/orders.lang @@ -53,7 +53,7 @@ ShippingExist=Отгрузки существует DraftOrWaitingApproved=Проект или утверждены еще не заказал DraftOrWaitingShipped=Проект или подтверждены не отгружен MenuOrdersToBill=Заказы на законопроект -MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Поиск тем SearchACustomerOrder=Search a customer order ShipProduct=Судно продукта @@ -65,7 +65,7 @@ ValidateOrder=Проверка порядка UnvalidateOrder=Unvalidate порядке DeleteOrder=Удалить тему CancelOrder=Отмена порядка -AddOrder=Добавить тему +AddOrder=Create order AddToMyOrders=Добавить в мои заказы AddToOtherOrders=Добавить в других заказов AddToDraftOrders=Add to draft order @@ -154,7 +154,6 @@ OrderByPhone=Телефон CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=No orders billable CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -MenuOrdersToBill2=Orders to bill OrderCreation=Order creation Ordered=Ordered OrderCreated=Your orders have been created diff --git a/htdocs/langs/ru_RU/oscommerce.lang b/htdocs/langs/ru_RU/oscommerce.lang deleted file mode 100644 index 8388024980c..00000000000 --- a/htdocs/langs/ru_RU/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Настройка модуля OS Commerce -OSCommerceSetupSaved=Настройка OS Commerce сохранена -OSCommerceServer=Хост/IP сервера OS Commerce -OSCommerceDatabaseName=Имя базы данных OS Commerce -OSCommercePrefix=Префикс таблиц OS Commerce -OSCommerceUser=Имя пользователя базы данных OS Commerce diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang index e0c8cefb34b..62d309beae8 100644 --- a/htdocs/langs/ru_RU/other.lang +++ b/htdocs/langs/ru_RU/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Защитный код Calendar=Календарь -AddTrip=Добавить поездку Tools=Инструменты ToolsDesc=Эта область посвящена группе разные инструменты не доступны в другие пункты меню.

    Эти инструменты могут быть достигнуты из меню на стороне. Birthday=День рождения @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Количество прикрепленных файлов / документов TotalSizeOfAttachedFiles=Общий размер присоединенных файлов / документы MaxSize=Максимальный размер @@ -80,6 +80,16 @@ ModifiedBy=Модифицированное% по S ValidatedBy=Подтверждено %s CanceledBy=Отменена %s ClosedBy=Закрытые% по S +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Файл был удален DirWasRemoved=Каталог был удален FeatureNotYetAvailableShort=Имеющиеся в следующей версии @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Добавить запись в календаре %s -NewCompanyToDolibarr=Компания S% добавлен в Dolibarr -ContractValidatedInDolibarr=Контракт %s проверены в Dolibarr -ContractCanceledInDolibarr=Контракт %s отменена в Dolibarr -ContractClosedInDolibarr=Контракт% с закрытым в Dolibarr -PropalClosedSignedInDolibarr=Предложение% ы подписали в Dolibarr -PropalClosedRefusedInDolibarr=Предложение %s отказала в Dolibarr -PropalValidatedInDolibarr=Предложение %s проверены в Dolibarr -InvoiceValidatedInDolibarr=Счет %s проверены в Dolibarr -InvoicePaidInDolibarr=Счет %s изменено на выигрыш в Dolibarr -InvoiceCanceledInDolibarr=Счет %s отменена в Dolibarr -PaymentDoneInDolibarr=Оплата %s сделали в Dolibarr -CustomerPaymentDoneInDolibarr=Заказчиком оплаты %s сделали в Dolibarr -SupplierPaymentDoneInDolibarr=Поставщик оплаты %s сделали в Dolibarr -MemberValidatedInDolibarr=Член %s проверены в Dolibarr -MemberResiliatedInDolibarr=Член %s resiliated в Dolibarr -MemberDeletedInDolibarr=Член %s исключить из Dolibarr -MemberSubscriptionAddedInDolibarr=Подписка на члена %s добавили в Dolibarr -ShipmentValidatedInDolibarr=Отгрузка %s подтверждены в Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Экспорт ExportsArea=Экспорт области diff --git a/htdocs/langs/ru_RU/paybox.lang b/htdocs/langs/ru_RU/paybox.lang index 1a971a60055..ffa474a9646 100644 --- a/htdocs/langs/ru_RU/paybox.lang +++ b/htdocs/langs/ru_RU/paybox.lang @@ -32,6 +32,9 @@ VendorName=Имя поставщика CSSUrlForPaymentForm=CSS-стилей URL для оплаты форме MessageOK=Сообщение на странице проверки возвращение оплаты MessageKO=Сообщение на странице отменен возврат оплаты -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/ru_RU/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang index c97f43111a8..d78afdf7338 100644 --- a/htdocs/langs/ru_RU/sendings.lang +++ b/htdocs/langs/ru_RU/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=На данный момент, создание RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch заказчиком diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang index 7634aae0a3b..28174e8f252 100644 --- a/htdocs/langs/ru_RU/stocks.lang +++ b/htdocs/langs/ru_RU/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Склад этикетке необходимо CorrectStock=Правильно запас ListOfWarehouses=Список складов ListOfStockMovements=Список акций движения -StocksArea=Акции области +StocksArea=Warehouses area Location=Вместо LocationSummary=Сокращенное наименование расположение NumberOfDifferentProducts=Кол-во различных продуктов diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang index 8ab8f95e2f9..94c544bc7ea 100644 --- a/htdocs/langs/ru_RU/users.lang +++ b/htdocs/langs/ru_RU/users.lang @@ -63,7 +63,6 @@ ShowGroup=Показать группы ShowUser=Показать пользователей NonAffectedUsers=Расходы пользователей UserModified=Пользователь изменен успешно -GroupModified=Группа успешно изменен PhotoFile=Фото файл UserWithDolibarrAccess=Пользователь с доступом Dolibarr ListOfUsersInGroup=Список пользователей в эту группу @@ -103,7 +102,7 @@ UserDisabled=Пользователь %s-инвалидов UserEnabled=Пользователь %s активированного UserDeleted=Пользователь %s удален NewGroupCreated=Группа создала %s -GroupModified=Группа успешно изменен +GroupModified=Group %s modified GroupDeleted=Группа удалить %s ConfirmCreateContact=Вы уверены, что Ю. хотите создать Dolibarr счета для этого обратиться? ConfirmCreateLogin=Вы уверены, что хотите создать учетную запись для Dolibarr этот член? @@ -114,8 +113,10 @@ YourRole=Ваша роль YourQuotaOfUsersIsReached=Квота активных пользователей будет достигнута! NbOfUsers=Кол-во пользователей DontDowngradeSuperAdmin=Только суперамин может понизить суперамин -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Использовать OpenID для входа +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang index 760ba7a4671..1e27c270b19 100644 --- a/htdocs/langs/ru_RU/withdrawals.lang +++ b/htdocs/langs/ru_RU/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Квитанция LastWithdrawalReceipts=Последнее% с выводом квитанции WithdrawedBills=Withdrawed счетов-фактур WithdrawalsLines=Снятие линии -RequestStandingOrderToTreat=Запрос Регламента для лечения -RequestStandingOrderTreated=Запрос Регламента лечение +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Клиент Регламент CustomerStandingOrder=Для постоянных клиентов NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Метод передачи Send=Отправить Lines=Линии StandingOrderReject=Выпуск отклонить -InvoiceRefused=Зарядка отказа клиента WithdrawalRefused=Выплаты Refuseds WithdrawalRefusedConfirm=Вы уверены, что вы хотите ввести снятия отказа общества RefusedData=Дата отказа RefusedReason=Причина для отказа RefusedInvoicing=Счета отказ NoInvoiceRefused=Не заряжайте отказ -InvoiceRefused=Зарядка отказа клиента +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Статус StatusUnknown=Неизвестный StatusWaiting=Ожидание @@ -76,13 +76,14 @@ WithBankUsingRIB=Для банковских счетов с использов WithBankUsingBANBIC=Для банковских счетов с использованием IBAN / BIC / SWIFT BankToReceiveWithdraw=Банковский счет для получения отзывает CreditDate=Кредит на -WithdrawalFileNotCapable=Невозможно создать файл вывода квитанцию ​​для вашей страны +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/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/sk_SK/accountancy.lang +++ b/htdocs/langs/sk_SK/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index 630d6829374..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 @@ -437,14 +440,14 @@ Module52Name=Zásoby Module52Desc=Skladové hospodárstvo (výrobky) Module53Name=Služby Module53Desc=Správa služieb -Module54Name=Zmluvy -Module54Desc=Zmluva a riadenie služieb +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Čiarové kódy 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=Projekty -Module400Desc=Projektový manažment vo vnútri iných modulov +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Upozornenie -Module600Desc=Zasielať upozornenia e-mailom na niektorých firemných akcií Dolibarr tretích strán kontakty +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Dary Module700Desc=Darovanie riadenie Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-spoločnosť Module5000Desc=Umožňuje spravovať viac spoločností Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Prázdniny -Module20000Desc=Deklarovať a dodržiavať zamestnanci dovolenku +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 Module50100Desc=Mieste predaja modulu -Module50200Name= Paypal -Module50200Desc= Modul ponúknuť on-line platby kreditnou kartou stránku s Paypal +Module50200Name=Paypal +Module50200Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Paypal 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 @@ -606,15 +613,16 @@ Permission151=Prečítajte si trvalé príkazy Permission152=Vytvoriť / upraviť trvalých príkazov žiadosť Permission153=Prevodovka trvalých príkazov príjmy Permission154=Kredit / odmietnuť trvalých príkazov príjmy -Permission161=Čítajte zmluvy -Permission162=Vytvoriť / upraviť zmluvy -Permission163=Aktivácia služby zmluvy -Permission164=Zakázať službu zmluvy -Permission165=Odstrániť zmluvy -Permission171=Prečítajte si výlety -Permission172=Vytvoriť / upraviť výlety -Permission173=Odstrániť výlety -Permission178=Export výlety +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Prečítajte si dodávateľa Permission181=Prečítajte si dodávateľských objednávok Permission182=Vytvoriť / upraviť dodávateľskej objednávky @@ -671,7 +679,7 @@ Permission300=Prečítajte čiarových kódov Permission301=Vytvoriť / upraviť čiarových kódov Permission302=Odstrániť čiarových kódov Permission311=Prečítajte služby -Permission312=Priradiť službu zmluvy +Permission312=Assign service/subscription to contract Permission331=Prečítajte si záložky Permission332=Vytvoriť / upraviť záložky Permission333=Odstránenie záložky @@ -701,8 +709,8 @@ Permission701=Prečítajte si dary Permission702=Vytvoriť / upraviť dary Permission703=Odstrániť dary Permission1001=Prečítajte si zásoby -Permission1002=Vytvoriť / upraviť zásoby -Permission1003=Odstrániť zásoby +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Prečítajte skladové pohyby Permission1005=Vytvoriť / upraviť skladové pohyby Permission1101=Prečítajte si dodacie @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Áno v lete OnlyFollowingModulesAreOpenedToExternalUsers=Na vedomie, že iba nasledujúce moduly otvoril externým používateľom (nech sú povolenia týchto užívateľov): SuhosinSessionEncrypt=Úložisko relácie šifrovaná Suhosin ConditionIsCurrently=Podmienkou je v súčasnej dobe %s -TestNotPossibleWithCurrentBrowsers=Automatická detekcia nie je možné YouUseBestDriver=Pomocou ovládača %s, že je najlepší vodič súčasnej dobe k dispozícii. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=Máte len %s produktov / služieb do databázy. To však nie je nutné žiadne špeciálne optimalizácie. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Vrátiť evidencia kód postavený podľa:
    %s nas ModuleCompanyCodePanicum=Späť prázdny evidencia kód. ModuleCompanyCodeDigitaria=Účtovníctvo kód závisí na kóde tretích strán. Kód sa skladá zo znaku "C" na prvom mieste nasleduje prvých 5 znakov kódu tretích strán. UseNotifications=Použitie oznámenia -NotificationsDesc=E-maily oznámenia vám umožňuje odosielať automatické ticho mail, na niektoré udalosti Dolibarr, tretím stranám (zákazníkov alebo dodávateľov), ktoré sú konfigurované pre. Voľba aktívneho oznámenia a terče kontaktov sa vykonáva jedna tretina strán v čase. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Dokumenty šablóny DocumentModelOdt=Generovanie dokumentov z OpenDocuments šablón (. ODT alebo ODS. Súbory OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Vodoznak na návrhu dokumentu @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Pridať dodacia lehota schopnosť UseOptionLineIfNoQuantity=Rad výrobkov / služieb s nulovej hodnoty je považovaný za možnosť FreeLegalTextOnProposal=Voľný text o obchodných návrhov WatermarkOnDraftProposal=Vodoznak na predlôh návrhov komerčných (none ak prázdny) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Objednať riadenie nastavenia OrdersNumberingModules=Objednávky číslovanie modelov @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Pre potvrdenie objednávky po návrhu užší, umožňuje, aby krok za dočasné poradí FreeLegalTextOnOrders=Voľný text o objednávkach WatermarkOnDraftOrders=Vodoznak na konceptoch objednávok (ak žiadny prázdny) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Kliknite pre Dial Nastavenie modulu ClickToDialUrlDesc=Url volaná, keď sa vykonáva kliknutím na tel Piktogram. Do poľa URL môžete použiť značky
    __PHONETO__ Ktorý bude nahradený s telefónnym číslom osoby volať
    __PHONEFROM__ Ktorý bude nahradený telefónne číslo volajúceho (vaše)
    __LOGIN__ Ktorý bude nahradený s clicktodial prihlásenie (definované na karte užívateľa)
    __PASS__ Ktorý bude nahradený s clicktodial heslo (definované na karte užívateľa). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervenčné číslovanie modely TemplatePDFInterventions=Intervenčné kariet dokumenty modely WatermarkOnDraftInterventionCards=Vodoznak na dokumentoch intervenčných karty (ak žiadny prázdny) ##### Contracts ##### -ContractsSetup=Zákazky modul nastavenia +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Zákazky číslovanie moduly TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Súbory typu %s nekomprimuje servera HTTP CacheByServer=Cache serverom CacheByClient=Cache v prehliadači CompressionOfResources=Kompresia odpovedí HTTP -TestNotPossibleWithCurrentBrowsers=Automatická detekcia nie je možné +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Produkty modul nastavenia ServiceSetup=Služby modul nastavenia @@ -1382,9 +1393,10 @@ MailingSetup=E-mailom Nastavenie modulu MailingEMailFrom=Odosielateľa (From) pre emailov zasielaných e-mailom na modul MailingEMailError=Späť E-mail (chyby-do) e-maily s chybami ##### Notification ##### -NotificationSetup=Oznámenie bu email modul nastavenia +NotificationSetup=EMail notification module setup NotificationEMailFrom=Odosielateľa (From) e-maily zaslané na oznámenia -ListOfAvailableNotifications=Zoznam dostupných oznámenia (Tento zoznam závisí na aktivovaných modulov) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Odoslanie Nastavenie modulu SendingsReceiptModel=Odoslanie potvrdenky modelu @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Pripojenie k serveru "%s" na databázu "%s" OSCommerceTestKo1=Pripojenie k "%s" servera úspešná, ale databáza "%s" by nebolo možné dosiahnuť. OSCommerceTestKo2=Pripojenie k serveru "%s" s užívateľom "%s 'zlyhalo. ##### Stock ##### -StockSetup=Konfigurácia modulu sklad -UserWarehouse=Používajte osobné užívateľské zásoby +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu zmazaný TreeMenu=Strom menu @@ -1478,11 +1491,14 @@ ClickToDialDesc=Tento modul umožňuje pridať ikonu po telefónnych čísel. Kl ##### Point Of Sales (CashDesk) ##### CashDesk=Bod predaja CashDeskSetup=Mieste predaja modulu nastavenie -CashDeskThirdPartyForSell=Generic treťou stranou použiť pre predáva +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Predvolený účet použiť na príjem platieb v hotovosti CashDeskBankAccountForCheque= Predvolený účet použiť pre príjem platieb šekom CashDeskBankAccountForCB= Predvolený účet použiť pre príjem platieb prostredníctvom kreditnej karty -CashDeskIdWareHouse=Sklad použiť pre predáva +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. ##### Bookmark ##### BookmarkSetup=Záložka Nastavenie modulu BookmarkDesc=Tento modul umožňuje spravovať záložky. Môžete tiež pridať skratky pre všetky Dolibarr stránky alebo external webových stránok na vašom ľavom menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang index 109fb062205..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 @@ -41,9 +42,10 @@ AutoActions= Automatické plnenie AgendaAutoActionDesc= Definujte tu udalosti, na ktoré chcete Dolibarr vytvoriť automaticky udalosť v programe. Pokiaľ nie je označená (v predvolenom nastavení), bude iba manuálne činnosti byť zahrnuté do programu rokovania. AgendaSetupOtherDesc= Táto stránka poskytuje možnosti, ako dať export vašich akcií Dolibarr do externého kalendára (thunderbird, Google kalendár, ...) AgendaExtSitesDesc=Táto stránka umožňuje deklarovať externé zdroje kalendárov vidieť svoje akcie do programu Dolibarr. -ActionsEvents= Udalosti, pre ktoré Dolibarr vytvorí akciu v programe automaticky -PropalValidatedInDolibarr= Návrh %s overená -InvoiceValidatedInDolibarr= Faktúra %s overená +ActionsEvents=Udalosti, pre ktoré Dolibarr vytvorí akciu v programe automaticky +PropalValidatedInDolibarr=Návrh %s overená +InvoiceValidatedInDolibarr=Faktúra %s overená +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Faktúra %s vrátiť do stavu návrhu InvoiceDeleteDolibarr=Faktúra %s zmazaná OrderValidatedInDolibarr= Objednať %s overená @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Objednať %s schválený OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Objednať %s vrátiť do stavu návrhu OrderCanceledInDolibarr=Objednať %s zrušený -InterventionValidatedInDolibarr=Intervenčné %s overená ProposalSentByEMail=Komerčné návrh %s zaslaná e-mailom OrderSentByEMail=%s zákazníkov objednávka zaslaná e-mailom InvoiceSentByEMail=%s faktúre Zákazníka zaslaná e-mailom @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=%s Dodávateľ objednávka zaslaná e-mailom SupplierInvoiceSentByEMail=%s dodávateľskej faktúry zasielané e-mailom ShippingSentByEMail=Prepravné %s zaslaná e-mailom ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervenčné %s zaslaná e-mailom -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Tretia strana vytvorená DateActionPlannedStart= Plánovaný dátum začatia DateActionPlannedEnd= Plánovaný dátum ukončenia @@ -70,9 +69,9 @@ DateActionStart= Dátum začatia DateActionEnd= Dátum ukončenia AgendaUrlOptions1=Môžete tiež pridať nasledujúce parametre filtrovania výstupu: AgendaUrlOptions2=login = %s obmedziť výstup na akcie vytvorené, pridelených alebo vykonať užívateľa %s. -AgendaUrlOptions3=Logina = %s obmedziť výstup na akcie vytvorené užívateľom %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint = %s obmedziť výstup na akcie priradených užívateľských %s. -AgendaUrlOptions5=logind = %s obmedziť výstup na akcie vykonané užívateľom %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Zobraziť narodeniny kontaktov AgendaHideBirthdayEvents=Skryť narodeniny kontaktov Busy=Zaneprázdnený @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL pre prístup. Súbor iCal ExtSiteNoLabel=Nie Popis WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang index 08453c7534d..2ac41eb7580 100644 --- a/htdocs/langs/sk_SK/bills.lang +++ b/htdocs/langs/sk_SK/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Dobropis InvoiceAvoirAsk=Dobropis opraviť faktúru InvoiceAvoirDesc=Dobropis je negatívny faktúra slúži na riešenie skutočnosť, že faktúra je množstvo, ktoré sa líšia ako suma skutočne vyplatená (pretože zákazník zaplatil príliš veľa omylom, alebo nebude vyplatená úplne, pretože on sa vrátil niektoré výrobky, napríklad). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Vymeňte faktúry %s ReplacementInvoice=Náhradné faktúra ReplacedByInvoice=Nahradil faktúre %s @@ -87,7 +87,7 @@ ClassifyCanceled=Klasifikovať "Opustené" ClassifyClosed=Klasifikáciu "uzavretým" ClassifyUnBilled=Classify 'Unbilled' CreateBill=Vytvoriť faktúru -AddBill=Pridať faktúru alebo dobropis +AddBill=Create invoice or credit note AddToDraftInvoices=Pridať k návrhu faktúru DeleteBill=Odstrániť faktúru SearchACustomerInvoice=Hľadať zákazníckej faktúre @@ -99,7 +99,7 @@ DoPaymentBack=Do platobnej chrbát ConvertToReduc=Prevod do budúcnosti zľavou EnterPaymentReceivedFromCustomer=Zadajte platby, ktoré obdržal od zákazníka EnterPaymentDueToCustomer=Vykonať platbu zo strany zákazníka -DisabledBecauseRemainderToPayIsZero=Zakázané, pretože zvyšok zaplatiť, je nulová +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Množstvo PriceBase=Cena základnej BillStatus=Stav faktúry @@ -137,8 +137,6 @@ BillFrom=Z BillTo=Na ActionsOnBill=Akcie na faktúre NewBill=Nová faktúra -Prélèvements=Trvalý príkaz -Prélèvements=Trvalý príkaz LastBills=Posledný %s faktúry LastCustomersBills=Posledné %s zákazníkom faktúry LastSuppliersBills=Posledné %s dodávateľov faktúry @@ -156,9 +154,9 @@ ConfirmCancelBill=Ste si istí, že chcete zrušiť faktúry %s? ConfirmCancelBillQuestion=Prečo chcete klasifikovať faktúra "opustený"? ConfirmClassifyPaidPartially=Ste si istí, že chcete zmeniť fakturačnú %s do stavu platené? ConfirmClassifyPaidPartiallyQuestion=Táto faktúra nebola zaplatená úplne. Aké sú dôvody pre vás zavrieť túto faktúru? -ConfirmClassifyPaidPartiallyReasonAvoir=Zvyšok platiť (%s %s) je zľava poskytnutá, pretože platba bola uskutočnená pred horizonte. Aj zjednať DPH s dobropisu. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Zvyšok platiť (%s %s) je zľava poskytnutá, pretože platba bola uskutočnená pred horizonte. Súhlasím stratiť DPH u tejto zľavy. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Zvyšok platiť (%s %s) je zľava poskytnutá, pretože platba bola uskutočnená pred horizonte. Som späť DPH na tejto zľave bez dobropisu. +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 zákazník ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty čiastočne vrátil ConfirmClassifyPaidPartiallyReasonOther=Suma opustená iného dôvodu @@ -191,9 +189,9 @@ AlreadyPaid=Už zaplatené AlreadyPaidBack=Už vráti AlreadyPaidNoCreditNotesNoDeposits=Už zaplatená (bez dobropisov a vklady) Abandoned=Opustený -RemainderToPay=Zvyšok platiť -RemainderToTake=Zvyšná časť, ktorý sa -RemainderToPayBack=Zvyšok splatiť +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Až do AmountExpected=Nárokovanej čiastky ExcessReceived=Nadbytok obdržal @@ -219,19 +217,18 @@ NoInvoice=No faktúra ClassifyBill=Klasifikovať faktúru SupplierBillsToPay=Dodávatelia faktúry platiť CustomerBillsUnpaid=Nezaplatené faktúry zákazníkmi -DispenseMontantLettres=Návrhom zákona o mechanicko sú oslobodení od poradia, v listoch -DispenseMontantLettres=Návrhom zákona o mechanicko sú oslobodení od poradia, v listoch +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Nevratná SetConditions=Nastaviť platobné podmienky SetMode=Nastaviť platobný režim Billed=Účtované -RepeatableInvoice=Prednastavená faktúra -RepeatableInvoices=Preddefinované faktúry -Repeatable=Vopred definované -Repeatables=Vopred definované -ChangeIntoRepeatableInvoice=Prevod do vopred definovanej -CreateRepeatableInvoice=Vytvorte preddefinovanú faktúru -CreateFromRepeatableInvoice=Vytvoriť z preddefinovaných faktúre +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Zákazníkov faktúry a faktúra je vedenie CustomersInvoicesAndPayments=Zákazníkov faktúry a platby ExportDataset_invoice_1=Zákazník faktúry a faktúra je zoznam liniek diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang index 09458668a00..36369689d28 100644 --- a/htdocs/langs/sk_SK/categories.lang +++ b/htdocs/langs/sk_SK/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Väzby medzi dodávateľmi a kategórií CatCusLinks=Väzby medzi zákazníkmi / vyhliadky a kategórií CatProdLinks=Väzby medzi produktov / služieb a kategórií CatMemberLinks=Väzby medzi členmi a kategórií -CatProdLinks=Väzby medzi produktov / služieb a kategórií -CatCusLinks=Väzby medzi zákazníkmi / vyhliadky a kategórií -CatSupLinks=Väzby medzi dodávateľmi a kategórií DeleteFromCat=Odobrať z kategórie DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang index 358e190443c..05c32f0d35a 100644 --- a/htdocs/langs/sk_SK/compta.lang +++ b/htdocs/langs/sk_SK/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad zákazník účtovný kód pre %s SuppliersProductsSellSalesTurnover=Celkový obrat z predaja výrobkov dodávateľa. CheckReceipt=Pozrite sa vklad CheckReceiptShort=Pozrite sa vklad +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Nová zľava NewCheckDeposit=Nová kontrola záloha NewCheckDepositOn=Vytvorte potvrdenie o vklade na účet: %s @@ -196,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 e2db9882421..9ed7ccf7da6 100644 --- a/htdocs/langs/sk_SK/contracts.lang +++ b/htdocs/langs/sk_SK/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Zákazky oblasť ListOfContracts=Prehľad zmlúv -LastContracts=Posledné %s upravenej zmluvy +LastModifiedContracts=Last %s modified contracts AllContracts=Všetky zmluvy ContractCard=Zmluva karty ContractStatus=Stav zmluvy @@ -27,7 +27,7 @@ MenuRunningServices=Spustené služby MenuExpiredServices=Prepadnuté služby MenuClosedServices=Uzavreté služby NewContract=Nová zmluva -AddContract=Pridať zákazku +AddContract=Create contract SearchAContract=Hľadať zmluvu DeleteAContract=Odstránenie zmluvu CloseAContract=Zavrieť zmluvu @@ -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=Posledné %s upravenej zmluvy +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/cron.lang b/htdocs/langs/sk_SK/cron.lang index 70531a3fa7d..2697b304323 100644 --- a/htdocs/langs/sk_SK/cron.lang +++ b/htdocs/langs/sk_SK/cron.lang @@ -1,49 +1,32 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = O CronAbout = O Cron CronAboutPage = Cron o stránke - -# # Right -# Permission23101 = Prečítajte si naplánovaná úloha Permission23102 = Vytvoriť / aktualizovať naplánovanú úlohu Permission23103 = Odstrániť naplánovaná úloha Permission23104 = Vykonať naplánované úlohy, - -# # Admin -# CronSetup= Naplánované úlohy správy Nastavenie -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job KeyForCronAccess=Bezpečnostný kľúč pre URL spustiť cron FileToLaunchCronJobs=Príkazový riadok spustiť cron CronExplainHowToRunUnix=V oblasti životného prostredia Unix, mali by ste použiť crontab spustiť príkazový riadok zakaždým, minút CronExplainHowToRunWin=Na Microsoft (tm) Windows environement môžete použiť naplánovaná úloha nástroja spustiť príkazový riadok zakaždým, minút - - -# # Menu -# CronJobs=Naplánované úlohy -CronListActive= Zoznam aktívnych úloh -CronListInactive= Zoznam postihnutých miest -CronListActive= Zoznam aktívnych úloh - - -# +CronListActive=List of active/scheduled jobs +CronListInactive=Zoznam postihnutých miest # Page list -# CronDateLastRun=Posledný beh CronLastOutput=Posledný beh výstup CronLastResult=Posledný kód výsledku CronListOfCronJobs=Zoznam naplánovaných úloh CronCommand=Príkaz -# CronList=Jobs list +CronList=Jobs list CronDelete= Odstrániť cron CronConfirmDelete= Ste si istí, že chcete zmazať tento cron? CronExecute=Začatie práce @@ -70,10 +53,7 @@ CronLabel=Popis CronNbRun=Nb. začať CronEach=Každý JobFinished=Práca zahájená a dokončená - -# #Page card -# CronAdd= Pridať pracovných miest CronHourStart= Začnite hodinu a dátum úlohy CronEvery= A úloha vykonať každý @@ -95,20 +75,12 @@ CronObjectHelp=Názov objektu načítať.
    Napr načítať metódy objektu v CronMethodHelp=Objekt spôsob štartu.
    Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, hodnota metódy je fecth CronArgsHelp=Metóda argumenty.
    Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, môže byť hodnota paramters byť 0, ProductRef CronCommandHelp=Systém príkazového riadka spustiť. - -# # Info -# CronInfoPage=Informácie - - -# # Common -# CronType=Typ úlohy CronType_method=Volanie metódy triedy Dolibarr CronType_command=Shell príkaz CronMenu=Cron CronCannotLoadClass=Nemožno načítať triedu alebo objekt %s %s - UseMenuModuleToolsToAddCronJobs=Choďte do menu "Home - Moduly náradie - Zoznam úloh" vidieť a upravovať naplánované úlohy. diff --git a/htdocs/langs/sk_SK/donations.lang b/htdocs/langs/sk_SK/donations.lang index 78454eefb8e..4c7165f68d3 100644 --- a/htdocs/langs/sk_SK/donations.lang +++ b/htdocs/langs/sk_SK/donations.lang @@ -4,7 +4,7 @@ Donations=Dary DonationRef=Darovanie čj. Donor=Darca Donors=Darcovia -AddDonation=Pridať dar +AddDonation=Create a donation NewDonation=Nový darcovstvo ShowDonation=Zobraziť dar DonationPromise=Darčekové sľub @@ -31,3 +31,8 @@ DonationRecipient=Darovanie príjemcu ThankYou=Ďakujem IConfirmDonationReception=Príjemca deklarovať príjem, ako dar, tieto sumy MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/sk_SK/externalsite.lang index 85a7a90b45e..fc5548dc148 100644 --- a/htdocs/langs/sk_SK/externalsite.lang +++ b/htdocs/langs/sk_SK/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Nastavenie odkaz na externé webové stránky ExternalSiteURL=Externé URL stránok ExternalSiteModuleNotComplete=Modul ExternalSite nebol správne nakonfigurovaný. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang index 99ce30644eb..3b3b9c6a95f 100644 --- a/htdocs/langs/sk_SK/holiday.lang +++ b/htdocs/langs/sk_SK/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Aktualizovať CantUpdate=You cannot update this leave request. NoDateDebut=Musíte vybrať počiatočný dátum. NoDateFin=Musíte vybrať dátum ukončenia. -ErrorDureeCP=Vaša žiadosť o dovolenku neobsahuje pracovný deň. -TitleValidCP=Žiadosť odsúhlasí dovolenku +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Dátum schválenia TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Žiadosť odmietnuť dovolenku +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Musíte si vybrať dôvod pre odmietnutie žiadosti. -TitleCancelCP=Zrušiť požiadavku dovolenku +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Dôvod odmietnutia DateRefusCP=Dátum odmietnutia @@ -78,7 +77,7 @@ ActionByCP=Účinkujú UserUpdateCP=Pre užívateľa PrevSoldeCP=Predchádzajúci Balance NewSoldeCP=New Balance -alreadyCPexist=Žiadosť o dovolenku už bolo vykonané na toto obdobie. +alreadyCPexist=A leave request has already been done on this period. UserName=Názov Employee=Zamestnanec FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manuálna aktualizácia HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Konfigurácia modulu dovolenku +ConfCP=Configuration of leave request module DescOptionCP=Popis možnosti ValueOptionCP=Hodnota -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Overenie konfigurácie -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Aktualizované úspešne. ErrorUpdateConfCP=Došlo k chybe pri aktualizácii, skúste to prosím znova. -AddCPforUsers=Prosím, pridajte rovnováhu prázdnin užívateľom kliknutím tu . -DelayForSubmitCP=Uzávierka žiadať o dovolenku -AlertapprobatortorDelayCP=Zabráňte approbator ak sviatok žiadosť nezodpovedá lehotu +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Potvrdiť UpdateEventCP=Aktualizácia akcie diff --git a/htdocs/langs/sk_SK/interventions.lang b/htdocs/langs/sk_SK/interventions.lang index 8b72c569161..c118974c8e3 100644 --- a/htdocs/langs/sk_SK/interventions.lang +++ b/htdocs/langs/sk_SK/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervencie Interventions=Intervencie InterventionCard=Intervencie karty NewIntervention=Nový zásah -AddIntervention=Pridať zásah +AddIntervention=Create intervention ListOfInterventions=Zoznam zásahov EditIntervention=Upraviť zásah ActionsOnFicheInter=Akcie zamerané na intervenciu @@ -30,6 +30,15 @@ StatusInterInvoiced=Účtované RelatedInterventions=Súvisiace zákroky ShowIntervention=Zobraziť zásah SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Zástupca nasledujúce-up zásah TypeContact_fichinter_internal_INTERVENING=Zásah diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang index 10915612721..fa0c8ce1506 100644 --- a/htdocs/langs/sk_SK/mails.lang +++ b/htdocs/langs/sk_SK/mails.lang @@ -115,7 +115,7 @@ SentBy=Odosielateľ: MailingNeedCommand=Z bezpečnostných dôvodov, odosielanie e-mailom, je lepšie, keď vykonáva z príkazového riadku. Ak máte jeden, požiadajte správcu servera spustiť nasledujúci príkaz pre odoslanie e-mailom všetkým príjemcom: MailingNeedCommand2=Však môžete zaslať on-line pridaním parametra MAILING_LIMIT_SENDBYWEB s hodnotou max počet e-mailov, ktoré chcete poslať zasadnutí. K tomu, prejdite na doma - Nastavenie - Ostatné. ConfirmSendingEmailing=Ak nemôžete alebo radšej posielať ich s www prehliadača, prosím, potvrdzujete, že ste istí, že chcete poslať e-mailom teraz z vášho prehliadača? -LimitSendingEmailing=Poznámka: V riadku odoslanie emailings sú obmedzené na bezpečnosť a časový limit dôvody k %s príjemcu zaslaním relácie. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Vymazať zoznam ToClearAllRecipientsClickHere=Kliknite tu pre vymazanie zoznamu príjemcov tohto rozosielanie ToAddRecipientsChooseHere=Pridajte príjemcu výberom zo zoznamu @@ -133,6 +133,9 @@ Notifications=Upozornenie NoNotificationsWillBeSent=Žiadne oznámenia e-mailom sú naplánované pre túto udalosť a spoločnosť ANotificationsWillBeSent=1 bude zaslaný e-mailom SomeNotificationsWillBeSent=%s oznámenia bude zaslané e-mailom -AddNewNotification=Aktivácia novej e-mailovej notifikácie žiadosti -ListOfActiveNotifications=Vypísať všetky aktívne požiadavky oznámení e-mailov +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=Vypísať všetky e-maily odosielané oznámenia +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang index 3df16361204..63bdace80bf 100644 --- a/htdocs/langs/sk_SK/main.lang +++ b/htdocs/langs/sk_SK/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Nepodarilo sa nájsť užívateľa %s
    Tieto nástroje sa dostanete z menu na boku. Birthday=Narodeniny @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Počet pripojených súborov / dokumentov TotalSizeOfAttachedFiles=Celková veľkosť pripojených súborov / dokumentov MaxSize=Maximálny rozmer @@ -80,6 +80,16 @@ ModifiedBy=Zmenil %s ValidatedBy=Overená %s CanceledBy=Zrušená %s ClosedBy=Uzavrel %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=Súbor %s bol odstránený DirWasRemoved=Adresár %s bol odstránený FeatureNotYetAvailableShort=K dispozícii v budúcej verzii @@ -193,25 +203,26 @@ ForgetIfNothing=Ak ste o túto zmenu, stačí zabudnúť na tento e-mail. Vaše ##### Calendar common ##### AddCalendarEntry=Pridať záznam do kalendára %s -NewCompanyToDolibarr=Spoločnosť %s pridané do Dolibarr -ContractValidatedInDolibarr=Zmluva %s potvrdené v Dolibarr -ContractCanceledInDolibarr=Zmluva %s zrušených v Dolibarr -ContractClosedInDolibarr=Zmluva %s uzavretá v Dolibarr -PropalClosedSignedInDolibarr=Návrh %s podpísaná v Dolibarr -PropalClosedRefusedInDolibarr=Návrh %s odmietol v Dolibarr -PropalValidatedInDolibarr=Návrh %s potvrdené v Dolibarr -InvoiceValidatedInDolibarr=Faktúra %s potvrdené v Dolibarr -InvoicePaidInDolibarr=Faktúra zmenené %s na platenú v Dolibarr -InvoiceCanceledInDolibarr=Faktúra %s zrušených v Dolibarr -PaymentDoneInDolibarr=Platobné %s vykonáva v Dolibarr -CustomerPaymentDoneInDolibarr=%s o platobnej morálke zákazníkov vykonáva v Dolibarr -SupplierPaymentDoneInDolibarr=%s Dodávateľ platba vykonaná v Dolibarr -MemberValidatedInDolibarr=Členské %s potvrdené v Dolibarr -MemberResiliatedInDolibarr=Členské %s resiliated v Dolibarr -MemberDeletedInDolibarr=Členské %s odstránený z Dolibarr -MemberSubscriptionAddedInDolibarr=Zasielanie noviniek pre členské %s pridaný Dolibarr -ShipmentValidatedInDolibarr=Zásielky %s validované Dolibarr -ShipmentDeletedInDolibarr=Zásielky %s odstránený z Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Vývoz plocha diff --git a/htdocs/langs/sk_SK/paybox.lang b/htdocs/langs/sk_SK/paybox.lang index 55f42d51961..081913f19c8 100644 --- a/htdocs/langs/sk_SK/paybox.lang +++ b/htdocs/langs/sk_SK/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Správa o zrušení strane platobnej návrate NewPayboxPaymentReceived=Nový Paybox prijatej platby NewPayboxPaymentFailed=Nový Paybox platba snažil sa ale prepadal PAYBOX_PAYONLINE_SENDEMAIL=E-mail upozorniť po platbe (úspech alebo zlyhanie) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/sk_SK/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang index 843cc586b96..45310862422 100644 --- a/htdocs/langs/sk_SK/sendings.lang +++ b/htdocs/langs/sk_SK/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Pre túto chvíľu, je vytvorenie novej zásielk RelatedShippings=Súvisiace shippings ShipmentLine=Zásielka linka CarrierList=Zoznam dopravcov +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Chytiť zákazníka diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang index 729d8482509..29234c34891 100644 --- a/htdocs/langs/sk_SK/stocks.lang +++ b/htdocs/langs/sk_SK/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Sklad štítok je nutné CorrectStock=Správne skladom ListOfWarehouses=Zoznam skladov ListOfStockMovements=Zoznam skladových pohybov -StocksArea=Zásoby oblasť +StocksArea=Warehouses area Location=Umiestnenie LocationSummary=Krátky názov umiestnenia NumberOfDifferentProducts=Počet rôznych výrobkov diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang index 1937a91ca35..1d40f6a7f35 100644 --- a/htdocs/langs/sk_SK/users.lang +++ b/htdocs/langs/sk_SK/users.lang @@ -63,7 +63,6 @@ ShowGroup=Zobraziť skupinu ShowUser=Zobraziť užívateľa NonAffectedUsers=Non priradené užívatelia UserModified=Užívateľ bolo úspešne upravené -GroupModified=Skupina úspešne upravené PhotoFile=Súbor s fotografiou UserWithDolibarrAccess=Užívateľ s prístupom Dolibarr ListOfUsersInGroup=Zoznam užívateľov tejto skupiny @@ -103,7 +102,7 @@ UserDisabled=Užívateľ %s zakázané UserEnabled=Užívateľ %s aktivovaná UserDeleted=Užívateľ %s odstránené NewGroupCreated=Skupina vytvorila %s -GroupModified=Skupina úspešne upravené +GroupModified=Group %s modified GroupDeleted=Skupina %s odstránené ConfirmCreateContact=Ste si istí, že chcete vytvoriť účet Dolibarr pre tento kontakt? ConfirmCreateLogin=Ste si istí, že chcete vytvoriť účet Dolibarr pre tohto člena? @@ -114,8 +113,10 @@ YourRole=Vaša rola YourQuotaOfUsersIsReached=Vaša kvóta aktívnych používateľov je dosiahnutý! NbOfUsers=Nb užívateľov DontDowngradeSuperAdmin=Iba superadmin môže downgrade superadmin -HierarchicalResponsible=Hierarchická zodpovednosť +HierarchicalResponsible=Supervisor HierarchicView=Hierarchické zobrazenie UseTypeFieldToChange=Použite typ poľa pre zmenu OpenIDURL=OpenID URL LoginUsingOpenID=Použite OpenID pre prihlásenie +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang index b9e7a958d46..4bb8cdd1569 100644 --- a/htdocs/langs/sk_SK/withdrawals.lang +++ b/htdocs/langs/sk_SK/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Príjem LastWithdrawalReceipts=Posledné príjmy %s stiahnutiu WithdrawedBills=Stiahnuté z faktúry WithdrawalsLines=Abstinenčné linky -RequestStandingOrderToTreat=Žiadosť o trvalých príkazov na liečbu -RequestStandingOrderTreated=Žiadosť o trvalých príkazov liečiť +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Objednávky zákazníkov stojaci CustomerStandingOrder=Zákazník trvalý príkaz NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Odoslať Lines=Riadky StandingOrderReject=Issue a rejection -InvoiceRefused=Faktúra odmietol WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Ste si istí, že chcete zadať stiahnutiu odmietnutie pre spoločnosť RefusedData=Dátum odmietnutia RefusedReason=Dôvod odmietnutia RefusedInvoicing=Fakturácia odmietnutie NoInvoiceRefused=Nenabíjajte odmietnutie -InvoiceRefused=Faktúra odmietol +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Postavenie StatusUnknown=Neznámy StatusWaiting=Čakanie @@ -76,13 +76,14 @@ WithBankUsingRIB=U bankových účtov pomocou RIB WithBankUsingBANBIC=U bankových účtov pomocou IBAN / BIC / SWIFT BankToReceiveWithdraw=Bankový účet pre príjem odstúpi CreditDate=Kredit na -WithdrawalFileNotCapable=Nemožno vytvárať stiahnutiu príjmu súbor pre vašu krajinu +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/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang index 8cab9d2b651..977dcb96f72 100644 --- a/htdocs/langs/sl_SI/accountancy.lang +++ b/htdocs/langs/sl_SI/accountancy.lang @@ -1,158 +1,158 @@ # Dolibarr language file - en_US - Accounting Expert CHARSET=UTF-8 -Accounting=Accounting -Globalparameters=Global parameters -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years -Menuaccount=Accounting accounts -Menuthirdpartyaccount=Thirdparty accounts -MenuTools=Tools +Accounting=Računovodstvo +Globalparameters=Globalni parametri +Chartofaccounts=Kontni plan +Fiscalyear=Fiskalna leta +Menuaccount=Računovodski izkazi +Menuthirdpartyaccount=Thirdparty računi +MenuTools=Orodja -ConfigAccountingExpert=Configuration of the module accounting expert -Journaux=Journals -JournalFinancial=Financial journals -Exports=Exports -Modelcsv=Model of export -Selectmodelcsv=Select a model of export -Modelcsv_normal=Classic export -Modelcsv_CEGID=Export towards CEGID Expert -BackToChartofaccounts=Return chart of accounts +ConfigAccountingExpert=Konfiguracija modula računovodskega strokovnjaka +Journaux=Revije +JournalFinancial=Finančne revije +Exports=Izvoz +Modelcsv=Model izvoza +Selectmodelcsv=Izberite model izvoza +Modelcsv_normal=Classic izvoz +Modelcsv_CEGID=Izvoz v CEGID Expert +BackToChartofaccounts=Prikaz kontnega plana Back=Return -Definechartofaccounts=Define a chart of accounts -Selectchartofaccounts=Select a chart of accounts -Validate=Validate -Addanaccount=Add an accounting account -AccountAccounting=Accounting account -Ventilation=Ventilation -ToDispatch=To dispatch -Dispatched=Dispatched +Definechartofaccounts=Določite kontni plan +Selectchartofaccounts=Izberite kontni plan +Validate=Potrjevanje +Addanaccount=Dodaj računovodskega račun +AccountAccounting=Računovodstvo račun +Ventilation=Pregled +ToDispatch=Odpremo +Dispatched=Odpošlje -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers -TradeMargin=Trade margin -Reports=Reports -ByCustomerInvoice=By invoices customers -ByMonth=By Month -NewAccount=New accounting account +CustomersVentilation=Pregled kupcev +SuppliersVentilation=Pregled dobaviteljev +TradeMargin=Trgovska marža +Reports=Poročila +ByCustomerInvoice=Z računov strank, +ByMonth=Po mesecih +NewAccount=Novi računovodski račun Update=Update -List=List -Create=Create -UpdateAccount=Modification of an accounting account -UpdateMvts=Modification of a movement -WriteBookKeeping=Record accounts in general ledger -Bookkeeping=General ledger -AccountBalanceByMonth=Account balance by month +List=Seznam +Create=Ustvari +UpdateAccount=Sprememba obračunskega računa +UpdateMvts=Sprememba pretoka +WriteBookKeeping=Evidenčnih računov v glavno knjigo +Bookkeeping=Glavna knjiga +AccountBalanceByMonth=Stanje na računu po mesecu -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Pregled računov +AccountingVentilationSupplier=Pregled računov dobaviteljev +AccountingVentilationCustomer=Pregled računov kupcev Line=Line -CAHTF=Total purchase supplier HT -InvoiceLines=Lines of invoice to be ventilated -InvoiceLinesDone=Ventilated lines of invoice -IntoAccount=In the accounting account +CAHTF=Skupaj nakup dobavitelj HT +InvoiceLines=Linije računa, ki se prezračuje +InvoiceLinesDone=Prezračevane linije računa +IntoAccount=Obračunskega računa -Ventilate=Ventilate -VentilationAuto=Automatic ventilation +Ventilate=Prezračiti +VentilationAuto=Avtomatski pregled Processing=Processing -EndProcessing=The end of processing -AnyLineVentilate=Any lines to ventilate -SelectedLines=Selected lines -Lineofinvoice=Line of invoice -VentilatedinAccount=Ventilated successfully in the accounting account -NotVentilatedinAccount=Not ventilated in the accounting account +EndProcessing=Konec obdelave +AnyLineVentilate=Vrsticami prezračiti +SelectedLines=Izbrane vrstice +Lineofinvoice=Line računa +VentilatedinAccount=Uspešno prezračen v obračunskem računu +NotVentilatedinAccount=Ni prezračen v obračunskem računu -ACCOUNTING_SEPARATORCSV=Separator CSV +ACCOUNTING_SEPARATORCSV=Ločilo CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements -AccountLength=Length of the accounting accounts shown in Dolibarr -AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts +AccountLength=Dolžina računovodstva računov prikazan v Dolibarrju +AccountLengthDesc=Funkcija omogoča, da Predstavljati dolžino obračunskega računa z zamenjavo prostorov z ničelno sliki. Ta funkcija se dotakne le zaslon, ne spreminja računovodskih račune registrirane v Dolibarrju. Za izvoz, to funkcijo je potrebno, da so združljivi z določeno programsko opremo. +ACCOUNTING_LENGTH_GACCOUNT=Dolžina glavne knjige +ACCOUNTING_LENGTH_AACCOUNT=Dolžina računih tretjih oseb -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal -ACCOUNTING_CASH_JOURNAL=Cash journal -ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTING_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Prodam revija +ACCOUNTING_PURCHASE_JOURNAL=Nakup revij +ACCOUNTING_BANK_JOURNAL=Bank revija +ACCOUNTING_CASH_JOURNAL=Cash revija +ACCOUNTING_MISCELLANEOUS_JOURNAL=Razno revija +ACCOUNTING_SOCIAL_JOURNAL=Socialna revija -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Račun za prenos +ACCOUNTING_ACCOUNT_SUSPENSE=Račun čakanja -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Računovodstvo račun privzeto za kupljene izdelke (če ni opredeljen v listu izdelkov) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Računovodstvo račun privzeto za prodanih proizvodov (če ni opredeljen v listu izdelkov) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Računovodstvo račun privzeto za kupljene storitve (če to ni opredeljeno v storitvenem stanja) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Računovodstvo račun privzeto za prodanih storitev (če ni opredeljen v storitvenem stanja) -Doctype=Type of document -Docdate=Date +Doctype=Vrsta dokumenta +Docdate=Datum Docref=Reference -Numerocompte=Account +Numerocompte=Račun Code_tiers=Thirdparty -Labelcompte=Label account -Debit=Debit +Labelcompte=Račun Label +Debit=Debetne Credit=Credit -Amount=Amount +Amount=Znesek Sens=Sens -Codejournal=Journal +Codejournal=Revija -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Izbriši zapise v glavno knjigo -SellsJournal=Sells journal -PurchasesJournal=Purchases journal -DescSellsJournal=Sells journal -DescPurchasesJournal=Purchases journal -BankJournal=Bank journal -DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Cash journal -DescCashJournal=Cash journal including the type of payment cash +SellsJournal=Sells revija +PurchasesJournal=Nakupi revija +DescSellsJournal=Sells revija +DescPurchasesJournal=Nakupi revija +BankJournal=Bank revija +DescBankJournal=Bank revija vključno z vsemi vrstami, razen gotovine plačila +CashJournal=Cash revija +DescCashJournal=Cash revija, vključno z načinom plačila gotovine -CashPayment=Cash Payment +CashPayment=Gotovina Plačilo -SupplierInvoicePayment=Payment of invoice supplier -CustomerInvoicePayment=Payment of invoice customer +SupplierInvoicePayment=Plačilo dobavitelju računa +CustomerInvoicePayment=Plačilo računa kupca -ThirdPartyAccount=Thirdparty account +ThirdPartyAccount=Thirdparty račun -NewAccountingMvt=New movement -NumMvts=Number of movement -ListeMvts=List of the movement -ErrorDebitCredit=Debit and Credit cannot have a value at the same time +NewAccountingMvt=Novo gibanje +NumMvts=Število gibanja +ListeMvts=Seznam gibanja +ErrorDebitCredit=Debetne in Credit ne more imeti vrednosti hkrati -ReportThirdParty=List thirdparty account -DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts +ReportThirdParty=Seznam thirdparty račun +DescThirdPartyReport=Posvetujejo tukaj seznam thirdparty kupcev in dobaviteljev in njihovih računovodskih računov -ListAccounts=List of the accounting accounts +ListAccounts=Seznam računovodskih računov -Pcgversion=Version of the plan -Pcgtype=Class of account -Pcgsubtype=Under class of account -Accountparent=Root of the account -Active=Statement +Pcgversion=Različica načrta +Pcgtype=Razred račun +Pcgsubtype=Pod razred račun +Accountparent=Root računa +Active=Izjava -NewFiscalYear=New fiscal year +NewFiscalYear=Novo poslovno leto -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers -TotalVente=Total turnover HT -TotalMarge=Total sales margin -DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account -DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account -ChangeAccount=Change the accounting account for lines selected by the account: +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers +TotalVente=Skupni prihodek HT +TotalMarge=Skupaj prodajna marža +DescVentilDoneCustomer=Posvetujejo tukaj seznam vrstic računov strank in njihovo računovodsko račun +DescVentilTodoCustomer=Prezračite svoje linije računa stranke z računovodsko račun +ChangeAccount=Spremenite računovodsko račun linij, ki jih na račun izbranih: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers -DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account -DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers +DescVentilTodoSupplier=Prezračite svoje linije dobavitelja na računu z računovodsko račun +DescVentilDoneSupplier=Posvetujejo tukaj seznam vrstic računov dobaviteljem in njihovo računovodsko račun -ValidateHistory=Validate Automatically +ValidateHistory=Potrditi Samodejno -ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used +ErrorAccountancyCodeIsAlreadyUse=Napaka, ne morete izbrisati to računovodsko račun, ker se uporablja -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 27fd5033c7c..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=Pogodbe -Module54Desc=Upravljanje pogodb in storitev +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=Projekti -Module400Desc=Upravljanje projektov znotraj drugih modulov +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=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih +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,20 +521,20 @@ Module5000Name=Skupine podjetij Module5000Desc=Omogoča upravljaje skupine podjetij Module6000Name=Potek dela Module6000Desc=Upravljanje poteka dela -Module20000Name=Počitnice -Module20000Desc=Določitev in sledenje dopustov zaposlenih +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 Module50100Desc=Modul za prodajalne -Module50200Name= Paypal -Module50200Desc= Modul za omogočanje strani za spletno plačevanje s kreditno kartico - Paypal +Module50200Name=Paypal +Module50200Desc=Modul za omogočanje strani za spletno plačevanje s kreditno kartico - Paypal 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,15 +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=Branje pogodb -Permission162=Kreiranje/spreminjanje pogodb -Permission163=Aktiviranje pogodbene storitve -Permission164=Onemogočenje pogodbene storitve -Permission165=Brisanje pogodb -Permission171=Branje potnih nalogov -Permission172=Kreiranje/spreminjanje potnih nalogov -Permission173=Brisanje potnih nalogov -Permission178=Izvoz potnih nalogov +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=Izvoz potnih nalogov in stroškov Permission180=Branje dobaviteljev Permission181=Branje naročil pri dobaviteljih Permission182=Kreiranje/spreminjanje naročil pri dobaviteljih @@ -671,7 +679,7 @@ Permission300=Branje črtnih kod Permission301=Kreiranje/spreminjanje črtnih kod Permission302=Brisanje črtnih kod Permission311=Branje storitev -Permission312=Dodelitev storitve pogodbi +Permission312=Dodelitev storitve/naročnine pogodbi Permission331=Branje zaznamkov Permission332=Kreiranje/spreminjanje zaznamkov Permission333=Brisanje zaznamkov @@ -701,8 +709,8 @@ Permission701=Branje donacij Permission702=Kreiranje/spreminjanje donacij Permission703=Delete donacij Permission1001=Branje zalog -Permission1002=Kreiranje/spreminjanje zalog -Permission1003=Brisanje +Permission1002=Kreiranje/spreminjanje skladišč +Permission1003=Brisanje skladišč Permission1004=Branje gibanja zalog Permission1005=Kreiranje/spreminjanje gibanja zalog Permission1101=Branje dobavnic @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Da poleti OnlyFollowingModulesAreOpenedToExternalUsers=Opomba, samo naslednji moduli so odprti za zunanje uporabnike (odvisno od dovoljenje takih uporabnikov): SuhosinSessionEncrypt=Shranjevanje seje kriptirano s Suhosin ConditionIsCurrently=Trenutni pogoj je %s -TestNotPossibleWithCurrentBrowsers=Avtomatska zaznava ni možna YouUseBestDriver=Uporabljate gonilnik %s , ki je najboljši trenutno na voljo YouDoNotUseBestDriver=Uporabljate gonilnik %s, vendar je priporočen gonilnik %s. NbOfProductIsLowerThanNoPb=V bazi je samo %s proizvodov/storitev. Zato ni potrebna posebna optimizacija. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Predlaga računovodsko kodo, sestavljeno iz "401" in k ModuleCompanyCodePanicum=Predlaga prazno računovodsko kodo. ModuleCompanyCodeDigitaria=Računovodska koda je odvisna od kode partnerja. Koda je sestavljena iz črke "C" prvih 5 znakov kode partnerja. UseNotifications=Uporaba sporočil -NotificationsDesc=Funkcija sporočil po E-pošti omogoča tiho pošiljanje avtomatskih e-mailov o nekaterih Dolibarr dogodkih partnerjem (kupcem ali dobavitelljem), ki so tako konfigurirani. Izbira aktivnega obveščanja in ciljnih kontaktov je možna za enega partnerja ob enem času. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Predloge dokumentov DocumentModelOdt=Ustvari dokumente iz predlog OpenDocuments (.ODT ali .ODS datoteke v programih OpenOffice, KOffice, TextEdit ,...) WatermarkOnDraft=Vodni žig na osnutku dokumenta @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Dodaj možen datum dobave UseOptionLineIfNoQuantity=Vrstica proizvoda/storitve z vrednostjo 0 se smatra kot opcija FreeLegalTextOnProposal=Poljubno besedilo na komercialni ponudbi WatermarkOnDraftProposal=Vodni tisk na osnutkih komercialnih ponudb (brez, če je prazno) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Nastavitve upravljanja z naročili OrdersNumberingModules=Moduli za številčenje naročil @@ -1146,6 +1156,7 @@ HideTreadedOrders=Skrij obravnavana ali preklicana naročila na seznamu ValidOrderAfterPropalClosed=Za potrditev naročila po zaključku ponudbe, naj ne bo možno preskočiti začasnega naročila FreeLegalTextOnOrders=Poljubno besedilo na naročilih WatermarkOnDraftOrders=Vodni tisk na osnutkih naročil (brez, če je prazno) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Nastavitve modula za klicanje s klikom ClickToDialUrlDesc=Po kliku na piktogram se izvede klic na Url. Na url lahko uporabite ikono
    __PHONETO__ ki predstavlja telefon klicanega
    __PHONEFROM__ ki predstavlja telefon klicatelja (vaša številka)
    __LOGIN__ ki predstavlja vašo prijavo na klicanje s klikom (določena z vašo uporabniško kodo)
    __PASS__ ki predstavlja vaše geslo za klicanje s klikom (določena z vašo uporabniško kodo). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Moduli za številčenje intervenc TemplatePDFInterventions=Modeli obrazcev intervencijskih kartic WatermarkOnDraftInterventionCards=Vodni tisk na dokumentih intervencijskih kartic (brez, če je prazno) ##### Contracts ##### -ContractsSetup=Nastavitev modula za pogodbe +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Moduli za številčenje pogodb TemplatePDFContracts=Modeli obrazcev pogodb FreeLegalTextOnContracts=Poljubno besedilo na pogodbah @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Datoteke tipa %s niso komprimirane v HTTP strežniku CacheByServer=Predpomnilnik v strežniku CacheByClient=Predpomnilnik v brskalniku CompressionOfResources=Kompresija HTTP odgovorov -TestNotPossibleWithCurrentBrowsers=Avtomatska zaznava ni možna +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Nastavitve modula za proizvode ServiceSetup=Storitve modul nastavitev @@ -1382,9 +1393,10 @@ MailingSetup=Nastavitev E-mail modula MailingEMailFrom=Naslov pošiljatelja (Od) za emaile, ki jih pošlje e-mailing modul MailingEMailError=Naslov za vračilo (Napake-za) emailov z napakami ##### Notification ##### -NotificationSetup=Nastavitev obvestil po elektronski pošti +NotificationSetup=EMail notification module setup NotificationEMailFrom=Naslov pošiljatelja (od) za emaile, ki se pošljejo kot obvestila -ListOfAvailableNotifications=Seznam obvestil, ki so na voljo (ta seznam je odvisen od aktiviranih modulov) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Popravi ciljni email ##### Sendings ##### SendingsSetup=Nastavitev modula za pošiljanje SendingsReceiptModel=Obrazci odpremnic @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Povezava s strežnikom '%s' na bazo podatkov '%s' uporabnika '% OSCommerceTestKo1=Povezava s strežnikom '%s' je bila uspešna, vendar baza podatkov '%s' ni dosegljiva. OSCommerceTestKo2=Povezava s strežnikom '%s' uporabnika '%s' ni uspela. ##### Stock ##### -StockSetup=Konfiguracija modula zaloge -UserWarehouse=Uporabi uporabnikove prilagojene zaloge +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Izbrisan meni TreeMenu=Drevesni meniji @@ -1478,11 +1491,14 @@ ClickToDialDesc=Ta modul omogoča dodajanje ikone za telefonsko številko Doliba ##### Point Of Sales (CashDesk) ##### CashDesk=Prodajalna CashDeskSetup=Nastavitev modula za prodajalno -CashDeskThirdPartyForSell=Generični partner, ki se uporabi za prodajo +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Račun, ki se uporabi za prejem gotovinskih plačil CashDeskBankAccountForCheque= Račun, ki se uporabi za prejem plačil s čeki CashDeskBankAccountForCB= Račun, ki se uporabi za prejem plačil s kreditnimi karticami -CashDeskIdWareHouse=Skladišče, ki se uporabi za prodajo +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. ##### Bookmark ##### BookmarkSetup=Nastavitev modula za zaznamke BookmarkDesc=Ta modul omogoča upravljanje z zaznamki. Lahko tudi dodate bližnjice na katerokoli Dolibarr stran ali zunanjo web stran na vašem levem meniju. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Izbriši fiskalno leto ConfirmDeleteFiscalYear=Ali zares želite izbrisati to fiskalni leto? Opened=Odprt Closed=Zaključeno - +AlwaysEditable=Lahko je vedno urejeno +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Tip plačila stranke, 1:Tip plačila dobavitelju, 2:Tip plačila stranke in dobavitelju diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang index 29e1912e636..db29ff08f42 100644 --- a/htdocs/langs/sl_SI/agenda.lang +++ b/htdocs/langs/sl_SI/agenda.lang @@ -6,8 +6,8 @@ Agenda=Urnik Agendas=Urniki Calendar=Koledar Calendars=Koledarji -LocalAgenda=Internal calendar -ActionsOwnedBy=Event owned by +LocalAgenda=Notranji koledar +ActionsOwnedBy=Zasebni dogodek od AffectedTo=Se nanaša na DoneBy=Izdelal Event=Aktivnost @@ -23,12 +23,13 @@ MenuToDoActions=Vsi nedokončani dogodki MenuDoneActions=Vsi prekinjeni dogodki MenuToDoMyActions=Moji nedokončani dogodki MenuDoneMyActions=Moji prekinjeni dogodki -ListOfEvents=List of events (internal calendar) +ListOfEvents=Seznam dogodkov(notranji koledar) ActionsAskedBy=Dogodek vnesel 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 @@ -41,9 +42,10 @@ AutoActions= Avtomatska izpolnitev AgendaAutoActionDesc= Tukaj definirajte dogodke, za katere želite, da Dolibarr avtomatsko kreira aktivnost v urniku. Če ni označeno ničesar (privzeto), bodo v urnik vključene samo ročno vnesene aktivnosti. AgendaSetupOtherDesc= Ta stran omogoča izvoz Dolibarr dogodkov v zunanji koledar (thunderbird, google koledar, ...) AgendaExtSitesDesc=Ta stran omogoča določitev zunanjih virov koledarjev za ogled njihovih dogodkov v Dolibarr urniku -ActionsEvents= Dogodki, za katere bo Dolibarr avtomatsko kreiral aktivnost v urniku -PropalValidatedInDolibarr= Potrjena ponudba %s -InvoiceValidatedInDolibarr= Potrjen račun %s +ActionsEvents=Dogodki, za katere bo Dolibarr avtomatsko kreiral aktivnost v urniku +PropalValidatedInDolibarr=Potrjena ponudba %s +InvoiceValidatedInDolibarr=Potrjen račun %s +InvoiceValidatedInDolibarrFromPos=Račun %s je potrjen preko POS InvoiceBackToDraftInDolibarr=Račun %s se vrača v status osnutka InvoiceDeleteDolibarr=Račun %s izbrisan OrderValidatedInDolibarr= Potrjeno naročilo %s @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Naročilo %s odobreno OrderRefusedInDolibarr=Naročilo %s zavrnjeno OrderBackToDraftInDolibarr=Naročilo %s se vrača v status osnutka OrderCanceledInDolibarr=Naročilo %s odpovedano -InterventionValidatedInDolibarr=Potrjena intervencija %s ProposalSentByEMail=Komercialna ponudba %s poslana po elektronski pošti OrderSentByEMail=Naročilo kupca %s poslano po elektronski pošti InvoiceSentByEMail=Račun kupcu %s poslan po elektronski pošti @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Naročilo dobavitelju %s poslano po elektronski pošti SupplierInvoiceSentByEMail=Račun odbavitelja %s poslan po elektronski pošti ShippingSentByEMail=Pošiljka %s poslana po EMailu ShippingValidated= Odprema %s potrjena -InterventionSentByEMail=Intervencija %s poslana po EMailu -InterventionClassifiedBilled=Intervencija %s je označena kot "zaračunana" NewCompanyToDolibarr= Kreiran partner DateActionPlannedStart= Planiran začetni datum DateActionPlannedEnd= Planiran končni datum @@ -70,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 za omejitev izhoda na aktivnosti, ki jih je naredil uporabnik %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. -AgendaUrlOptions5=logind=%s za omejitev izhoda na aktivnosti uporabnika %s. +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 @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL za dostop do .ical datoteke ExtSiteNoLabel=Ni opisa WorkingTimeRange=Delovni čas WorkingDaysRange=Delovni dnevi -AddEvent=Add event -MyAvailability=My availability +AddEvent=Ustvari dogodek +MyAvailability=Moja dostopnost diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang index a34dabe20c3..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=Ustvari dobropis s presežnimi zneski plačil iz originalnega računa -invoiceAvoirLineWithPaymentRestAmount=Znesek dobropisa s presežnimi plačili +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 @@ -87,7 +87,7 @@ ClassifyCanceled=Označeno kot 'Opuščeno' ClassifyClosed=Označeno kot 'Zaključeno' ClassifyUnBilled=Označi kot "Nezaračunano" CreateBill=Kreiraj račun -AddBill=Dodaj račun ali dobropis +AddBill=Ustvariti računa ali dobropis AddToDraftInvoices=Dodaj osnutku računa DeleteBill=Izbriši račun SearchACustomerInvoice=Iskanje računa za kupca @@ -99,7 +99,7 @@ DoPaymentBack=Izvrši vračilo ConvertToReduc=Pretvori v bodoči popust EnterPaymentReceivedFromCustomer=Vnesi prejeto plačilo od kupca EnterPaymentDueToCustomer=Vnesi rok plačila za kupca -DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je vrednost za opomin enaka nič +DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je neplačan opomin enako nič Amount=Znesek PriceBase=Osnova cene BillStatus=Status računa @@ -137,8 +137,6 @@ BillFrom=Od BillTo=Račun za ActionsOnBill=Aktivnosti na računu NewBill=Nov račun -Prélèvements=Trajniki -Prélèvements=Trajniki LastBills=Zadnjih %s računov LastCustomersBills=Zadnjih %s računov za kupce LastSuppliersBills=Zadnjih %s računov dobaviteljev @@ -156,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=Na opominu za plačilo (%s %s) je odobren popust, ker je bilo plačilo izvršeno predčasno. DDV je reguliran z dobropisom. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Na opominu za plačilo (%s %s) je odobren popust, ker je bilo plačilo izvršeno predčasno. Strinjam se z izgubo DDV zaradi tega popusta. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Na opominu za plačilo (%s %s) je odobren popust, ker je bilo plačilo izvršeno predčasno. DDV na ta popust bo vrnjen brez dobropisa. +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 @@ -191,9 +189,9 @@ AlreadyPaid=Že plačano AlreadyPaidBack=Že vrnjeno plačilo AlreadyPaidNoCreditNotesNoDeposits=Že plačano (brez dobropisa in avansa) Abandoned=Opuščeno -RemainderToPay=Opomin za plačilo -RemainderToTake=Pripravljeni opomini -RemainderToPayBack=Opomin za vrnitev plačila +RemainderToPay=Neplačan preostanek +RemainderToTake=Preostanek vrednosti za odtegljaj +RemainderToPayBack=Preostanek vrednosti za vrnitev Rest=Na čakanju AmountExpected=Reklamiran znesek ExcessReceived=Prejet presežek @@ -219,19 +217,18 @@ NoInvoice=Ni računa ClassifyBill=Klacificiraj račun SupplierBillsToPay=Računi dobaviteljev za plačilo CustomerBillsUnpaid=Neplačani računi kupcev -DispenseMontantLettres=Računi izpisani na mehanografski način se pošiljajo po vrstnem redu s pismi -DispenseMontantLettres=Računi izpisani na mehanografski način se pošiljajo po vrstnem redu s pismi +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=Vzorec računa -RepeatableInvoices=Vzorci računov -Repeatable=Vzorec -Repeatables=Vzorci -ChangeIntoRepeatableInvoice=Spremeni v vzorec -CreateRepeatableInvoice=Kreiraj vzorec računa -CreateFromRepeatableInvoice=Kreiraj iz vzorca računa +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 6397a1a6905..53f17b73fa9 100644 --- a/htdocs/langs/sl_SI/categories.lang +++ b/htdocs/langs/sl_SI/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Povezave med dobavitelji in kategorijami CatCusLinks=Povezave med kupci/možnimi strankami in kategorijami CatProdLinks=Povezave med proizvodi/storitvami in kategorijami CatMemberLinks=Povezave med člani in kategorijami -CatProdLinks=Povezave med proizvodi/storitvami in kategorijami -CatCusLinks=Povezave med kupci/možnimi strankami in kategorijami -CatSupLinks=Povezave med dobavitelji in kategorijami DeleteFromCat=Odstrani iz kategorije DeletePicture=Izbriši sliko ConfirmDeletePicture=Potrdi izbris slike? @@ -111,4 +108,5 @@ ExtraFieldsCategories=Koplementarni atributi 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=Add the following product/service +AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev +ShowCategory=Prikaži kategorijo diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang index d6b000bbeb9..8d61bb9401a 100644 --- a/htdocs/langs/sl_SI/compta.lang +++ b/htdocs/langs/sl_SI/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Napačna računovodska koda kupca za %s SuppliersProductsSellSalesTurnover=Generiran promet po prodaji dobavljenih proizvodov. CheckReceipt=Kontrola priliva CheckReceiptShort=Kontrola prilivov +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Nov popust NewCheckDeposit=Nova kontrola depozita NewCheckDepositOn=Nova kontrola depozita na račun: %s @@ -196,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 8b0f31b8996..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 -LastContracts=Zadnjih % pogodb +LastModifiedContracts=Zadnjih %s spremenjenih pogodb AllContracts=Vse pogodbe ContractCard=Kartica pogodbe ContractStatus=Status pogodbe @@ -27,7 +27,7 @@ MenuRunningServices=Aktivne storitve MenuExpiredServices=Pretečene storitve MenuClosedServices=Zaključene storitve NewContract=Nova pogodba -AddContract=Dodaj pogodbo +AddContract=Ustvari pogodbo SearchAContract=Išči pogodbo DeleteAContract=Izbriši pogodbo CloseAContract=Zaključi pogodbo @@ -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=Zadnjih % pogodb +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/cron.lang b/htdocs/langs/sl_SI/cron.lang index 7272c4a935e..b307aa07f5e 100644 --- a/htdocs/langs/sl_SI/cron.lang +++ b/htdocs/langs/sl_SI/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = O programu -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=Seznam onemogočenih nalog # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Ukaz +CronList=Seznam nalog +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Zaženi nalogo +CronConfirmExecute= Si prepričan prekiniti to nalogo sedaj +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Dela na čakanju +CronTask=Naloga CronNone= Nič CronDtStart=Začetni datum CronDtEnd=Končni datum -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe CronMethod=Metoda CronModule=Modul -# CronAction=Action +CronAction=Akcija CronStatus=Status CronStatusActive=Omogočen CronStatusInactive=Onemogočen -# CronNoJobs=No jobs registered +CronNoJobs=Nobene naloge niso registrirane CronPriority=Prioriteta CronLabel=Opis -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create +CronAdd= Dodaj naloge +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create CronArgs=Parametri -# CronSaveSucess=Save succesfully +CronSaveSucess=Uspešno shranjeno CronNote=Komentar -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Omogočeno CronStatusInactiveBtn=Onemogoči -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Informacija # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Tip naloge +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/sl_SI/deliveries.lang b/htdocs/langs/sl_SI/deliveries.lang index 158fb6372b9..2f8319850fb 100644 --- a/htdocs/langs/sl_SI/deliveries.lang +++ b/htdocs/langs/sl_SI/deliveries.lang @@ -24,3 +24,5 @@ Deliverer=Dostavil : Sender=Pošiljatelj Recipient=Prejemnik ErrorStockIsNotEnough=Zaloga je premajhna +Shippable=Možna odprema +NonShippable=Ni možna odprema diff --git a/htdocs/langs/sl_SI/dict.lang b/htdocs/langs/sl_SI/dict.lang index 47d74f64774..3a15500a30a 100644 --- a/htdocs/langs/sl_SI/dict.lang +++ b/htdocs/langs/sl_SI/dict.lang @@ -290,6 +290,8 @@ CurrencySingXOF=CFA Franc BCEAO CurrencyXPF=CFP Francs CurrencySingXPF=CFP Franc CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=pais CurrencyThousandthSingTND=tisočina #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet diff --git a/htdocs/langs/sl_SI/donations.lang b/htdocs/langs/sl_SI/donations.lang index dc9f7f2ca26..2a962d2375c 100644 --- a/htdocs/langs/sl_SI/donations.lang +++ b/htdocs/langs/sl_SI/donations.lang @@ -4,7 +4,7 @@ Donations=Donacije DonationRef=Referenca donacije Donor=Donator Donors=Donatorji -AddDonation=Dodaj donacijo +AddDonation=Ustvari donacijo NewDonation=Nova donacija ShowDonation=Prikaži donacijo DonationPromise=Obljuba darila @@ -30,4 +30,9 @@ SearchADonation=Iskanje donacij DonationRecipient=Prejemnik donacije ThankYou=Hvala IConfirmDonationReception=Prejemnik potrjuje prejem donacije v naslednjem znesku -MinimumAmount=Minimum amount is %s +MinimumAmount=Najmanjši znesek je %s +FreeTextOnDonations=Poljubno besedilo v nogi +FrenchOptions=Opcije za Francijo +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/sl_SI/externalsite.lang index f5ec7304a64..f949bf72593 100644 --- a/htdocs/langs/sl_SI/externalsite.lang +++ b/htdocs/langs/sl_SI/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite ExternalSiteSetup=Setup se povezujejo na zunanji strani ExternalSiteURL=Zunanja stran URL -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteModuleNotComplete=Modul za zunanjo stran ni bil konfiguriran pravilno +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang index 9d422c390c5..e79da2ce081 100644 --- a/htdocs/langs/sl_SI/holiday.lang +++ b/htdocs/langs/sl_SI/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Leaves -CPTitreMenu=Leaves +Holidays=Dopusti +CPTitreMenu=Dopusti MenuReportMonth=Mesečno stanje -MenuAddCP=Make a leave request -NotActiveModCP=You must enable the module Leaves to view this page. -NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . -NoCPforUser=You don't have any available day. -AddCP=Make a leave request +MenuAddCP=Izdelaj zahtevek za dopust +NotActiveModCP=Za ogled te strani morate aktivirati modul za dopust +NotConfigModCP=Za ogled te strani morate konfigurirati modul za dopust. To lahko storite s klikom tukaj . +NoCPforUser=Nimate več na voljo nobenega dneva. +AddCP=Izdelaj zahtevek za dopust Employe=Zaposleni DateDebCP=Začetni datum DateFinCP=Končni datum @@ -18,24 +18,24 @@ ApprovedCP=Odobreno CancelCP=Preklicano RefuseCP=Zavrnjeno ValidatorCP=Odobril -ListeCP=List of leaves +ListeCP=Seznam dopustov ReviewedByCP=Pregledal DescCP=Opis -SendRequestCP=Create leave request -DelayToRequestCP=Leave requests must be made at least %s day(s) before them. -MenuConfCP=Edit balance of leaves -UpdateAllCP=Update the leaves -SoldeCPUser=Leaves balance is %s days. +SendRequestCP=Ustvari zahtevek za dopust +DelayToRequestCP=Zahtevek za dopust mora biti vložen vsaj %s dan(dni) prej. +MenuConfCP=Urejanje stanja dopusta +UpdateAllCP=Posodobitev dopustov +SoldeCPUser=Stanje dopusta je %s dni. ErrorEndDateCP=Končni datum mora biti večji od začetnega. ErrorSQLCreateCP=Pri ustvarjanju SQL je prišlo do napake -ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ErrorIDFicheCP=Prišlo je do napake, zahtevek za dopust ne obstaja ReturnCP=Nazaj na prejšnjo stran -ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request +ErrorUserViewCP=Nimate dovoljenja za branje tega zahtevka za dopust +InfosCP=Informacija o zahtevku za dopust InfosWorkflowCP=Pretok informacij RequestByCP=Zahteval -TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed +TitreRequestCP=Zahtevek za dopust +NbUseDaysCP=Število porabljenih dni dopusta EditCP=Uredi DeleteCP=Izbriši ActionValidCP=Potrdi @@ -43,26 +43,25 @@ ActionRefuseCP=Zavrnitev ActionCancelCP=Razveljavi StatutCP=Status SendToValidationCP=Pošlji v potrditev -TitleDeleteCP=Delete the leave request -ConfirmDeleteCP=Confirm the deletion of this leave request? -ErrorCantDeleteCP=Error you don't have the right to delete this leave request. -CantCreateCP=You don't have the right to make leave requests. -InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Posodobi -CantUpdate=You cannot update this leave request. +TitleDeleteCP=Brisanje zahtevka za dopust +ConfirmDeleteCP=Potrditev izbrisa tega zahtevka za dopust? +ErrorCantDeleteCP=Napaka, nimate pravice za brisanje tega zahtevka za dopust. +CantCreateCP=Nimate dovoljenja za izdelavo zahtevka za dopust +InvalidValidatorCP=Izbrati morate osebo, ki bo potrdila vaš zahtevek za dopust. +CantUpdate=Ne morete posodobiti tega zahtevka za dopust. NoDateDebut=Izbrati morate začetni datum. NoDateFin=Izbrati morate končni datum. ErrorDureeCP=Vaš zahtevek za dopust ne vsebuje delovnih dni. TitleValidCP=Odobri zahtevan dopust -ConfirmValidCP=Are you sure you want to approve the leave request? +ConfirmValidCP=Ali zares želite odobriti ta zahtevek za dopust ? DateValidCP=Datum odobritve -TitleToValidCP=Send leave request -ConfirmToValidCP=Are you sure you want to send the leave request? +TitleToValidCP=Pošlji zahtevek za dopust +ConfirmToValidCP=Ali zares želite poslati zahtevek za dopust? TitleRefuseCP=Zavrni zahtevek za dopust -ConfirmRefuseCP=Are you sure you want to refuse the leave request? +ConfirmRefuseCP=Ali zares želite zavrniti zahtevek za dopust? NoMotifRefuseCP=Izbrati morate razlog za zavrnitev zahtevka. TitleCancelCP=Preklic zahtevka za dopust -ConfirmCancelCP=Are you sure you want to cancel the leave request? +ConfirmCancelCP=Ali zares želite preklicati zahtevek za dopust? DetailRefusCP=Razlog za zavrnitev DateRefusCP=Datum zavrnitve DateCancelCP=Datum preklica @@ -72,8 +71,8 @@ MotifCP=Razlog UserCP=Uporabnik ErrorAddEventToUserCP=Prišlo je do napake pri dodajanju izredne odsotnosti. AddEventToUserOkCP=Dodajanje izredne odsotnosti je zaključeno. -MenuLogCP=View logs of leave requests -LogCP=Log of updates of available vacation days +MenuLogCP=Ogled dnevnika zahtevkov za dopust +LogCP=Dnevnik posodobitev dni za dopust, ki so na voljo ActionByCP=Izvajalec UserUpdateCP=Za uporabnika PrevSoldeCP=Prejšnje stanje @@ -81,33 +80,33 @@ NewSoldeCP=Novo stanje alreadyCPexist=Zahtevek za dopust za to obdobje je bil že vložen. UserName=Priimek Employee=Zaposleni -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation +FirstDayOfHoliday=Prvi dan dopusta +LastDayOfHoliday=Zadnji dan dopusta HolidaysMonthlyUpdate=Mesečna posodobitev ManualUpdate=Ročna posodobitev -HolidaysCancelation=Leave request cancelation +HolidaysCancelation=Preklic zahtevka za dopust ## Configuration du Module ## -ConfCP=Konfiguracija modula dopustov +ConfCP=Konfiguracija modula zahtevkov za dopust DescOptionCP=Opis opcij ValueOptionCP=Vrednost -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Skupina z dovoljenjem za odobravanje zahtevkov za dopust ConfirmConfigCP=Potrditev konfiguracije -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Zadnja avtomatska posodobitev odobrenih dopustov UpdateConfCPOK=Uspešno posodobljeno. ErrorUpdateConfCP=Pri posodabljanju je prišlo do napake, prosimo poskusite ponovno. AddCPforUsers=Prosimo dodajte stanje dopustov uporabnikov s klikom tukaj. -DelayForSubmitCP=Zadnji rok za vložitev zahteve za dopust +DelayForSubmitCP=Zadnji rok za izdelavo zahtevka za dopust AlertapprobatortorDelayCP=Opozori, če zahtevek za dopust ni bil vložen pravočasno -AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance -nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month -Module27130Name= Management of leave requests -Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request -TitleOptionEventCP=Settings of leave requets for events +AlertValidatorDelayCP=Opozori, če zahtevek za dopust presega možno trajanje +AlertValidorSoldeCP=Opozori, če zahtevana dolžina dopusta presega stanje dopusta vlagatelja +nbUserCP=Število uporabnikov, ki jih podpira modul za dopuste +nbHolidayDeductedCP=Število dni dopusta, ki se odštejejo za vsak izkoriščen dan +nbHolidayEveryMonthCP=Število dni dopusta, ki se dodajo vsak mesec +Module27130Name= Upravljanje zahtevkov za dopust +Module27130Desc= Upravljanje zahtevkov za dopust +TitleOptionMainCP=Osnovne nastavitve zahtevkov za dopust +TitleOptionEventCP=Nastavitve zahtevkov za dopust za aktivnosti ValidEventCP=Potrdi UpdateEventCP=Posodobitev aktivnosti CreateEventCP=Kreiraj @@ -127,23 +126,23 @@ UpdateEventOptionCP=Posodobi ErrorMailNotSend=Pri pošiljanju e-pošte je prišlo do napake: NoCPforMonth=Ta mesec ni odsotnosti. nbJours=Število dni -TitleAdminCP=Configuration of Leaves +TitleAdminCP=Konfiguracija dopustov #Messages Hello=Pozdravljeni -HolidaysToValidate=Validate leave requests -HolidaysToValidateBody=Below is a leave request to validate -HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. -HolidaysValidated=Validated leave requests -HolidaysValidatedBody=Your leave request for %s to %s has been validated. -HolidaysRefused=Request denied -HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled leaved request -HolidaysCanceledBody=Your leave request for %s to %s has been canceled. -Permission20000=Read you own leave requests -Permission20001=Create/modify your leave requests -Permission20002=Create/modify leave requests for everybody -Permission20003=Delete leave requests -Permission20004=Setup users available vacation days -Permission20005=Review log of modified leave requests -Permission20006=Read leaves monthly report +HolidaysToValidate=Potrdi zahtevke za dopust +HolidaysToValidateBody=Spodaj je zahtevek za potrditev dopustov +HolidaysToValidateDelay=Ta zahtevek za dopust se bo izvedel v obdobju manj kot %s dni. +HolidaysToValidateAlertSolde=Uporabnik, ki je vložil ta zahtevek za dopust, nima na voljo dovolj dni dopusta. +HolidaysValidated=Potrjeni zahtevki za dopust +HolidaysValidatedBody=Vaš zahtevek za dopust od %s do %s je bil potrjen. +HolidaysRefused=Zahtevek je bil zavrnjen +HolidaysRefusedBody=Vaš zahtevek za dopust od %s do %s je bil zavrnjen zaradi naslednjih razlogov : +HolidaysCanceled=Preklican zahtevek za dopust +HolidaysCanceledBody=Vaš zahtevek za dopust od %s do %s je bil preklican. +Permission20000=Branje vaših lastnih zahtevkov za dopust +Permission20001=Kreiranje/spreminjanje vašega zahtevka za dopust +Permission20002=Kreiranje/spreminjanje zahtevkov za dopust za vse +Permission20003=Brisanje zahtevkov za dopust +Permission20004=Nastavitev dni za dopust za uporabnika +Permission20005=Pregled dnevnika spremenjenih zahtevkov za dopust +Permission20006=Branje mesečnega poročila o dopustih diff --git a/htdocs/langs/sl_SI/interventions.lang b/htdocs/langs/sl_SI/interventions.lang index 576fbbc791a..59e00001123 100644 --- a/htdocs/langs/sl_SI/interventions.lang +++ b/htdocs/langs/sl_SI/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervencija Interventions=Intervencije InterventionCard=Kartica intervencije NewIntervention=Nova intervencija -AddIntervention=Dodaj intervencijo +AddIntervention=Create intervention ListOfInterventions=Seznam intervencij EditIntervention=Urejanje intervencije ActionsOnFicheInter=Aktivnost na intervenciji @@ -30,6 +30,15 @@ StatusInterInvoiced=Zaračunano RelatedInterventions=Odvisne intervencije ShowIntervention=Prikaži intervencijo SendInterventionRef=Oddana intervencija %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Referent za nadaljnjo obravnavo intervencije TypeContact_fichinter_internal_INTERVENING=Serviser diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang index 494e459df64..e4700cda0c7 100644 --- a/htdocs/langs/sl_SI/mails.lang +++ b/htdocs/langs/sl_SI/mails.lang @@ -43,10 +43,10 @@ MailingStatusSentCompletely=Poslano v celoti MailingStatusError=Napaka MailingStatusNotSent=Ni poslano MailSuccessfulySent=E-pošta uspešno poslana (od %s za %s) -MailingSuccessfullyValidated=EMailing successfully validated -MailUnsubcribe=Unsubscribe -Unsuscribe=Unsubscribe -MailingStatusNotContact=Don't contact anymore +MailingSuccessfullyValidated=E-pošiljanje uspešno potrjeno +MailUnsubcribe=Odjava +Unsuscribe=Odjava +MailingStatusNotContact=Ne kontaktiraj več ErrorMailRecipientIsEmpty=Prejemnik ni določen WarningNoEMailsAdded=Nobenega novega e-sporočila ni za dodajanje na prejemnikov seznam. ConfirmValidMailing=Ali zares želite potrditi to e-sporočilo ? @@ -73,31 +73,31 @@ DateLastSend=Datum zadnjega pošiljanja DateSending=Datum pošiljanja SentTo=Poslano na %s MailingStatusRead=Preberite -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=Potrditev branja +YourMailUnsubcribeOK=E-pošni naslov %s je uspešno odjavljen s seznama za pošiljanje +MailtoEMail=Hiperovezava na email +ActivateCheckRead=Dovoljena uporaba povezave za "Odjavo" +ActivateCheckReadKey=Podatki za kriptiran URL za funkciji "Potrditev branja" in "Odjava" +EMailSentToNRecipients=E-pošta poslana %s prejemnikom. +XTargetsAdded=%s prejemnikov dodanih na ciljni seznam +EachInvoiceWillBeAttachedToEmail=Ustvarjen bo dokument na osnovi privzete predloge in pripet k vsakemu elektronskemu sporočilu +MailTopicSendRemindUnpaidInvoices=Opomin k računu %s (%s) +SendRemind=Pošlji opomin po E-pošti +RemindSent=%s poslanih opomin(ov) +AllRecipientSelectedForRemind=Izbrani so vsi partnerji in če je nastavljen en e-naslov (opomba: poslano bo eno sporočilo za vsak račun) +NoRemindSent=Noben opomin ni bil poslan po e-pošti +ResultOfMassSending=Rezultat masovnega pošiljanja opominov po e-pošti # Libelle des modules de liste de destinataires mailing MailingModuleDescContactCompanies=Kontakti vseh partnerjev (kupci, možne stranke, dobavitelji, ...) MailingModuleDescDolibarrUsers=Vsi uporabniki Dolibarr z e-naslovom MailingModuleDescFundationMembers=Vsi člani ustanove z e-naslovom MailingModuleDescEmailsFromFile=E-pošta iz tekstovne datoteke (e-naslov;ime;priimek;komentarji) -MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other) +MailingModuleDescEmailsFromUser=E-pošta iz uporabnikovega vnosa (e-naslov;priimek;ime;ostalo) MailingModuleDescContactsCategories=Partnerji z e-naslovi (po kategorijah) MailingModuleDescDolibarrContractsLinesExpired=Partnerji s pretečenimi pogodbami MailingModuleDescContactsByCompanyCategory=Kontakt partnerja (po kategorijah partnerjev) -MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category +MailingModuleDescContactsByCategory=Kontakti/naslovi partnerjev po kategorijah MailingModuleDescMembersCategories=Člani fundacij (po kategorijah) MailingModuleDescContactsByFunction=Kontakti partnerjev (po delovnem mestu/funkciji) LineInFile=%s vrstica v datoteki @@ -112,27 +112,30 @@ SearchAMailing=Iskanje e-pošte SendMailing=Pošiljanje e-pošte SendMail=Pošlji e-pošto SentBy=Poslal -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=Zaradi varnostnih razlogov je pošiljanje e-pošte boljše, če se izvrši iz ukazne vrstice. Če imate to potrebo, prosite vašega administratorja za zagon naslednjega ukaza za pošiljanje e-pošte vsem prejemnikom: MailingNeedCommand2=Lahko jih seveda pošljete tudi »online«, če dodate parameter MAILING_LIMIT_SENDBYWEB z največjim številom e-sporočil, ki jih želite poslati v eni seji. -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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +ConfirmSendingEmailing=Če ne morete, ali jo raje pošiljate preko www brskalnika, prosimo potrdite, da zares želite zdaj poslati pošto iz vašega brskalnika ? +LimitSendingEmailing=Opomba: Pošiljanje e-pošte preko spletnega vmesnika je večkrat izvršeno zaradi varnostnih razlogov in časovnih omejitev, %s prejemnikov naenkrat za vsako pošiljanje. TargetsReset=Prekliči seznam ToClearAllRecipientsClickHere=Kliknite tukaj za preklic seznama prejemnikov te e-pošte ToAddRecipientsChooseHere=Dodajanje prejemnikov z izbiro s seznamov NbOfEMailingsReceived=Število prejetih masovnih e-sporočil -NbOfEMailingsSend=Mass emailings sent +NbOfEMailingsSend=Masovno pošiljanje je izvršeno IdRecord=ID zapis DeliveryReceipt=Potrditev prejema YouCanUseCommaSeparatorForSeveralRecipients=Lahko uporabite vejico kot ločilo pri naštevanju več prejemnikov. -TagCheckMail=Track mail opening -TagUnsubscribe=Unsubscribe link -TagSignature=Signature sending user -TagMailtoEmail=Recipient EMail +TagCheckMail=Odpiranje sledenja pošte +TagUnsubscribe=Povezava za odjavo +TagSignature=Podpis pošiljatelja +TagMailtoEmail=Prejemnik E-pošte # Module Notifications Notifications=Obvestila NoNotificationsWillBeSent=Za ta dogodek in podjetje niso predvidena obvestila po e-pošti ANotificationsWillBeSent=1 obvestilo bo poslano z e-pošto SomeNotificationsWillBeSent=%s obvestil bo poslanih z e-pošto -AddNewNotification=Aktiviraj nov zahtevek za e-poštno obvestilo -ListOfActiveNotifications=Seznam vseh aktivnih zahtev za e-poštna obvestila +AddNewNotification=Aktiviraj nov cilj za e-poštno obvestilo +ListOfActiveNotifications=Seznam vseh aktivnih ciljev za e-poštna obvestila ListOfNotificationsDone=Seznam vseh poslanih e-poštnih obvestil +MailSendSetupIs=Konfiguracij pošiljanja e-pošte je bila nastavljena na '%s'. Ta način ne more biti uporabljen za masovno pošiljanje. +MailSendSetupIs2=Najprej morate kot administrator preko menija %sDomov - Nastavitve - E-pošta%s spremeniti parameter '%s' za uporabo načina '%s'. V tem načinu lahko odprete nastavitve SMTP strežnika, ki vam jih omogoča vaš spletni oprerater in uporabite masovno pošiljanje. +MailSendSetupIs3=Če imate vprašanja o nastavitvi SMTP strežnika, lahko vprašate %s. diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang index 305881c37fa..a3ba9144853 100644 --- a/htdocs/langs/sl_SI/main.lang +++ b/htdocs/langs/sl_SI/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Napaka pri iskanju uporabnika %s v ErrorNoVATRateDefinedForSellerCountry=Napaka, za državo '%s' niso definirane davčna stopnje. ErrorNoSocialContributionForSellerCountry=Napaka, za državo '%s' niso definirani socialni prispevki. ErrorFailedToSaveFile=Napaka, datoteka ni bila shranjena. -ErrorOnlyPngJpgSupported=Napaka, podprta sta samo slikovna formata .png in .jpg. -ErrorImageFormatNotSupported=Vaš PHP ne podpira funkcije pretvarjanja slik tega formata. SetDate=Nastavi datum SelectDate=Izberi datum SeeAlso=Glejte tudi %s BackgroundColorByDefault=Privzeta barva ozadja +FileNotUploaded=Datoteka ni bila naložena +FileUploaded=Datoteka je bila uspešno naložena FileWasNotUploaded=Izbrana je bila datoteka za prilogo, vendar še ni dodana. Kliknite na "Pripni datoteko". NbOfEntries=Število vpisov GoToWikiHelpPage=Preberite online pomoč (potreben je internetni dostop) @@ -266,6 +266,7 @@ Afternoon=Popoldan Quadri=Četrtletje MonthOfDay=Dan v mesecu HourShort=H +MinuteShort=Mn Rate=Stopnja UseLocalTax=Vključi davek Bytes=Byti @@ -340,6 +341,7 @@ FullList=Celoten seznam Statistics=Statistika OtherStatistics=Druga statistika Status=Status +Favorite=Priljubljen ShortInfo=Info. Ref=Ref. RefSupplier=Ref. dobavitelj @@ -365,6 +367,7 @@ ActionsOnCompany=Aktivnosti v zvezi s tem partnerjem ActionsOnMember=Dogodki okoli tega člana NActions=%s aktivnosti NActionsLate=%s zamujenih +RequestAlreadyDone=Zahtevek je bil že zabeležen Filter=Filter RemoveFilter=Odstrani filter ChartGenerated=Grafikon je ustvarjen @@ -645,6 +648,7 @@ OptionalFieldsSetup=Nastavitev posebnih atributov URLPhoto=Url za fotografijo/logotip SetLinkToThirdParty=Povezava na drugo tretjo osebo CreateDraft=Ustvarite osnutek +SetToDraft=Nazaj na osnutek ClickToEdit=Kliknite za urejanje ObjectDeleted=Predmet %s črta ByCountry=Po državah @@ -672,13 +676,13 @@ HelpCopyToClipboard=Uporabi Ctrl+C za kopiranje na odložišče SaveUploadedFileWithMask=Shrani datoteko na strežnik z imenom "%s" (otherwise "%s") OriginFileName=Originalno ime datoteke SetDemandReason=Nastavi vir -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency +SetBankAccount=Določi bančni račun +AccountCurrency=Valuta računa ViewPrivateNote=Glej opombe XMoreLines=%s zasenčena(ih) vrstic PublicUrl=Javni URL -AddBox=Add box - +AddBox=Dodaj okvir +SelectElementAndClickRefresh=Izberi element in klikni osveži # Week day Monday=Ponedeljek Tuesday=Torek diff --git a/htdocs/langs/sl_SI/margins.lang b/htdocs/langs/sl_SI/margins.lang index 68c5cfa67a2..f4ca7d75e7a 100644 --- a/htdocs/langs/sl_SI/margins.lang +++ b/htdocs/langs/sl_SI/margins.lang @@ -1,41 +1,44 @@ # Dolibarr language file - Source file is en_US - marges -Margin=Margin -Margins=Margins -TotalMargin=Total Margin -MarginOnProducts=Margin / Products -MarginOnServices=Margin / Services -MarginRate=Margin rate -MarkRate=Mark rate -DisplayMarginRates=Display margin rates -DisplayMarkRates=Display mark rates -InputPrice=Input price -margin=Profit margins management -margesSetup=Profit margins management setup -MarginDetails=Margin details -ProductMargins=Product margins -CustomerMargins=Customer margins -SalesRepresentativeMargins=Sales representative margins +Margin=Marža +Margins=Marže +TotalMargin=Skupna marža +MarginOnProducts=Marža / proizvod +MarginOnServices=Marža / storitev +MarginRate=Stopnja marže +MarkRate=Ciljna stopnja +DisplayMarginRates=Prikaži stopnje marž +DisplayMarkRates=Prikaži ciljne stopnje +InputPrice=Vhodna cena +margin=Upravljanje profitnih marž +margesSetup=Nastavitve uporavljanja profitnih marž +MarginDetails=Podatki o marži +ProductMargins=Marže proizvoda +CustomerMargins=Marže kupcev +SalesRepresentativeMargins=Marža prodajnega predstavnika ProductService=Proizvod ali storitev -AllProducts=All products and services -ChooseProduct/Service=Choose product or service +AllProducts=Vsi proizvodi in storitve +ChooseProduct/Service=Izberi proizvod ali storitev StartDate=Začetni datum EndDate=Končni datum Launch=Start -ForceBuyingPriceIfNull=Force buying price if null -ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) -MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts -UseDiscountAsProduct=As a product -UseDiscountAsService=As a service -UseDiscountOnTotal=On subtotal -MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. -MARGIN_TYPE=Margin type -MargeBrute=Raw margin -MargeNette=Net margin -MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price -CostPrice=Cost price -BuyingCost=Cost price -UnitCharges=Unit charges -Charges=Charges -AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +ForceBuyingPriceIfNull=Uveljavi nabavno ceno, če je nič +ForceBuyingPriceIfNullDetails=če je "ON", bo marža 0 (nabavna cena = prodajna cena), drugače ("OFF") bo marža enaka prodajni ceni (nabavna cena = 0) +MARGIN_METHODE_FOR_DISCOUNT=Metoda marž pri globalnih popustih +UseDiscountAsProduct=Kot proizvod +UseDiscountAsService=Kot storitev +UseDiscountOnTotal=V delni vsoti +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Določa, če se globalni popust smatra kot proizvod, storitev, ali samo delna vsota pri izračunu marže. +MARGIN_TYPE=Tip marže +MargeBrute=Bruto marža +MargeNette=Neto marža +MARGIN_TYPE_DETAILS=Bruto marža : prodajna cena - nabavna cena
    Neto marža : prodajna cena - stroškovna cena +CostPrice=Stroškovna cena +BuyingCost=Stroškovna cena +UnitCharges=Stroški po enoti +Charges=Stroški +AgentContactType=Tip kontakta komercialnega agenta +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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 9d1de0771ea..4aa5b74d03c 100644 --- a/htdocs/langs/sl_SI/orders.lang +++ b/htdocs/langs/sl_SI/orders.lang @@ -65,7 +65,7 @@ ValidateOrder=Potrdi naročilo UnvalidateOrder=Unvalidate red DeleteOrder=Briši naročilo CancelOrder=Prekliči naročilo -AddOrder=Dodaj naročilo +AddOrder=Ustvari naročilo AddToMyOrders=Dodaj mojim naročilom AddToOtherOrders=Dodaj ostalim naročilom AddToDraftOrders=Dodaj osnutku naročila @@ -154,7 +154,6 @@ OrderByPhone=Telefon CreateInvoiceForThisCustomer=Zaračunaj naročila NoOrdersToInvoice=Ni naročil, ki bi jih lahko zaračunali CloseProcessedOrdersAutomatically=Označi vsa izbrana naročila kot "Procesirano" -MenuOrdersToBill2=Naročila za fakturiranje OrderCreation=Ustvarjanje naročila Ordered=Naročeno OrderCreated=Vaša naročila so bila ustvarjena diff --git a/htdocs/langs/sl_SI/oscommerce.lang b/htdocs/langs/sl_SI/oscommerce.lang deleted file mode 100644 index 27324e176a4..00000000000 --- a/htdocs/langs/sl_SI/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=Nakupovalni voziček -OSCommerceSetup=Nastavitev modula Nakupovalni voziček -OSCommerceSetupSaved=Shranjene nastavitve za Nakupovalni voziček -OSCommerceServer=Gostiteljski strežnik/IP za Nakupovalni voziček -OSCommerceDatabaseName=Ime baze podatkov za Nakupovalni voziček -OSCommercePrefix=Predpone tabel za Nakupovalni voziček -OSCommerceUser=Uporabniško ime za bazo podatkov za Nakupovalni voziček diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang index c75f06f6a2b..bfc24608cb5 100644 --- a/htdocs/langs/sl_SI/other.lang +++ b/htdocs/langs/sl_SI/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Varnostna koda Calendar=Koledar -AddTrip=Dodaj potovanje Tools=Orodja ToolsDesc=To področje je dodeljeno za združen prikaz različnih orodij, ki niso na voljo v drugih menijih.

    Ta orodja so dostopna na stranskem meniju. Birthday=Rojstni dan @@ -10,21 +9,21 @@ DateToBirth=Datum rojstva BirthdayAlertOn= Vklopljeno opozorilo na rojstni dan BirthdayAlertOff= Izklopljeno opozorilo na rojstni dan Notify_FICHINTER_VALIDATE=Potrjena intervencija -Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail +Notify_FICHINTER_SENTBYMAIL=Intervencija poslana po EMailu Notify_BILL_VALIDATE=Potrjen račun -Notify_BILL_UNVALIDATE=Customer invoice unvalidated +Notify_BILL_UNVALIDATE=Račun za kupca ni potrjen Notify_ORDER_SUPPLIER_APPROVE=Odobreno naročilo pri dobavitelju Notify_ORDER_SUPPLIER_REFUSE=Zavrnjeno naročilo pri dobavitelju Notify_ORDER_VALIDATE=Potrjeno naročilo kupca Notify_PROPAL_VALIDATE=Potrjena ponudba kupcu -Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed -Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_PROPAL_CLOSE_SIGNED=Ponudba kupcu zaključena s podpisom +Notify_PROPAL_CLOSE_REFUSED=Ponudba kupcu zaključena z zavrnitvijo Notify_WITHDRAW_TRANSMIT=Nakazilo prenosa Notify_WITHDRAW_CREDIT=Nakazilo kredita Notify_WITHDRAW_EMIT=Nakazilo izdatka Notify_ORDER_SENTBYMAIL=Naročilo po e-pošti Notify_COMPANY_CREATE=Ustvarjen partner -Notify_COMPANY_SENTBYMAIL=Mails sent from third party card +Notify_COMPANY_SENTBYMAIL=Pošta poslana s kartice partnerja Notify_PROPAL_SENTBYMAIL=Komercialna ponudba poslana po e-pošti Notify_BILL_PAYED=Plačan račun kupca Notify_BILL_CANCEL=Preklican račun kupca @@ -34,20 +33,21 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Naročilo pri dobavitelju poslano po pošti Notify_BILL_SUPPLIER_VALIDATE=Potrjen račun dobavitelja Notify_BILL_SUPPLIER_PAYED=Plačan račun dobavitelja Notify_BILL_SUPPLIER_SENTBYMAIL=Račun dobavitelja poslan po pošti -Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled +Notify_BILL_SUPPLIER_CANCELED=Preklican račun dobavitelja Notify_CONTRACT_VALIDATE=Potrjena pogodba Notify_FICHEINTER_VALIDATE=Potrjena intervencija Notify_SHIPPING_VALIDATE=Potrjena odprema Notify_SHIPPING_SENTBYMAIL=Pošiljka poslana po pošti Notify_MEMBER_VALIDATE=Potrjeno članstvo -Notify_MEMBER_MODIFY=Member modified +Notify_MEMBER_MODIFY=Spremenjen član Notify_MEMBER_SUBSCRIPTION=Vpisano članstvo Notify_MEMBER_RESILIATE=Odpoved članstva Notify_MEMBER_DELETE=Izbris iz članstva -Notify_PROJECT_CREATE=Project creation -Notify_TASK_CREATE=Task created -Notify_TASK_MODIFY=Task modified -Notify_TASK_DELETE=Task deleted +Notify_PROJECT_CREATE=Ustvarjanje projekta +Notify_TASK_CREATE=Ustvarjena naloga +Notify_TASK_MODIFY=Spremenjena naloga +Notify_TASK_DELETE=Izbrisana naloga +SeeModuleSetup=See module setup NbOfAttachedFiles=Število pripetih datotek/dokumentov TotalSizeOfAttachedFiles=Skupna velikost pripetih datotek/dokumentov MaxSize=Največja velikost @@ -57,14 +57,14 @@ Miscellaneous=Razno NbOfActiveNotifications=Število sporočil PredefinedMailTest=To je testni mail.\nDve vrstici sta ločeni z carriage return. PredefinedMailTestHtml=To je test mail (beseda test mora biti v krepkem tisku).
    Dve vrstici sta ločeni z carriage return. -PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nŽelimo vas opozoriti, da račun __FACREF__ ni bil poravnan. Zato vam račun še enkrat pošiljamo v prilogi.\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nV prilogi je ponudba __PROPREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ +PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nV prilogi je potrditev naročila __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nV prilogi je naše naročilo __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ +PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nV prilogi je pošiljka __SHIPPINGREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nV prilogi je intervencija __FICHINTERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ DemoDesc=Dolibarr je kompakten ERP/CRM sestavljen iz več funkcionalnih modulov. Demo z vsemi moduli nima pomena, ker se kot tak nikoli ne pojavi. Zato je na voljo več demo profilov. ChooseYourDemoProfil=Izberite demo profil, ki ustreza vaši aktivnosti... @@ -80,6 +80,16 @@ ModifiedBy=Spremenil %s ValidatedBy=Potrdil %s CanceledBy=Preklical %s ClosedBy=Zaključil %s +CreatedById=ID uporabnika, ki je ustvaril +ModifiedById=ID uporabnika, ki je nazadnje spremenil +ValidatedById=ID uporabnika, ki je potrdil +CanceledById=ID uporabnika, ki je preklical +ClosedById=ID uporabnika, ki je zaključil +CreatedByLogin=Ime uporabika, ki je ustvaril +ModifiedByLogin=Ime uporabnika, ki je nazadnje spremenil +ValidatedByLogin=Ime uporabnika, ki je potrdil +CanceledByLogin=Ime uporabnika, ki je preklical +ClosedByLogin=Ime uporabnika, ki je zaključil FileWasRemoved=Datoteka je bila izbrisana DirWasRemoved=Mapa je bila odstranjena FeatureNotYetAvailableShort=Na voljo v naslednji različici @@ -133,7 +143,7 @@ SizeUnitcm=cm SizeUnitmm=mm SizeUnitinch=inč SizeUnitfoot=čevelj -SizeUnitpoint=point +SizeUnitpoint=točka BugTracker=Sledenje hrošču SendNewPasswordDesc=S tem obrazcem zahtevate novo geslo. Poslano bo na vaš email naslov.
    Sprememba bo učinkovala šele po kliku na potrditveni link v tem emailu.
    Preverite vaš poštni program. BackToLoginPage=Nazaj na stran za prijavo @@ -147,12 +157,12 @@ StatsByNumberOfEntities=Statistika o številu povezanih entitet NumberOfProposals=Število ponudb v zadnjih 12 mesecih NumberOfCustomerOrders=Število naročil kupcev v zadnjih 12 mesecih NumberOfCustomerInvoices=Število računov kupcem v zadnjih 12 mesecih -NumberOfSupplierOrders=Number of supplier orders on last 12 month +NumberOfSupplierOrders=Število naročil pri dobavitelju v zadnjih 12 mesecih NumberOfSupplierInvoices=Število računov dobaviteljev v zadnjih 12 mesecih NumberOfUnitsProposals=Število enot na ponudbah v zadnjih 12 mesecih NumberOfUnitsCustomerOrders=Število enot na naročilih kupcev v zadnjih 12 mesecih NumberOfUnitsCustomerInvoices=Število enot na računih za kupce v zadnjih 12 mesecih -NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month +NumberOfUnitsSupplierOrders=Število enot na naročilih pri dobavitelju v zadnjih 12 mesecih NumberOfUnitsSupplierInvoices=Število enot na računih dobaviteljev v zadnjih 12 mesecih EMailTextInterventionValidated=Potrjena intervencija %s EMailTextInvoiceValidated=Potrjen račun %s @@ -162,7 +172,7 @@ EMailTextOrderApproved=Odobreno naročilo %s EMailTextOrderApprovedBy=Naročilo %s odobril %s EMailTextOrderRefused=Zavrnjeno naročilo %s EMailTextOrderRefusedBy=Naročilo %s zavrnil %s -EMailTextExpeditionValidated=The shipping %s has been validated. +EMailTextExpeditionValidated=Odprema %s je bila potrjena ImportedWithSet=Nabor podatkov za uvoz DolibarrNotification=Avtomatsko obvestilo ResizeDesc=Vnesite novo širino ALI novo višino. Razmerje se bo med spreminjanjem velikosti ohranilo... @@ -184,34 +194,35 @@ StartUpload=Zaženi prenos CancelUpload=Prekliči prenos FileIsTooBig=Datoteke so prevelike PleaseBePatient=Prosim, bodite potrpežljivi... -RequestToResetPasswordReceived=A request to change your Dolibarr password has been received -NewKeyIs=This is your new keys to login -NewKeyWillBe=Your new key to login to software will be -ClickHereToGoTo=Click here to go to %s -YouMustClickToChange=You must however first click on the following link to validate this password change -ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe. +RequestToResetPasswordReceived=Prejet je bil zahtevek za spremembo vašega Dolibarr gesla +NewKeyIs=To so vaši novi podatki za prijavo +NewKeyWillBe=Vaši novi podatki za prijavo v program bodo +ClickHereToGoTo=K.iknite tukaj za vstop v %s +YouMustClickToChange=Vendar morate najprej klikniti na naslednji link za potrditev spremembe gesla +ForgetIfNothing=Če niste zahtevali te spremembe, enostavno pozabite na ta email. Vaši prijavni podatki so varno shranjeni. ##### Calendar common ##### AddCalendarEntry=Dodaj vnos v koledar %s -NewCompanyToDolibarr=Podjetje %s dodano v Dolibarr -ContractValidatedInDolibarr=Pogodba %s potrjena v Dolibarrju -ContractCanceledInDolibarr=Pogodba %s preklicana v Dolibarrju -ContractClosedInDolibarr=Pogodba %s zaključena v Dolibarrju -PropalClosedSignedInDolibarr=Ponudba %s podpisana v Dolibarrju -PropalClosedRefusedInDolibarr=Ponudba %s zavrnjena v Dolibarrju -PropalValidatedInDolibarr=Ponudba %s potrjena v Dolibarrju -InvoiceValidatedInDolibarr=Račun %s potrjen v Dolibarrju -InvoicePaidInDolibarr=Račun %s spremenjen v 'plačano' v Dolibarrju -InvoiceCanceledInDolibarr=Račun %s preklican v Dolibarrju -PaymentDoneInDolibarr=Plačilo %s izvršeno v Dolibarrju -CustomerPaymentDoneInDolibarr=Plačilo kupca %s izvršeno v Dolibarrju -SupplierPaymentDoneInDolibarr=Plačilo dobavitelju %s izvršeno v Dolibarrju -MemberValidatedInDolibarr=Član %s potrjen v Dolibarrju -MemberResiliatedInDolibarr=Član %s blokiran v Dolibarrju -MemberDeletedInDolibarr=Član %s izbrisan iz Dolibarrja -MemberSubscriptionAddedInDolibarr=Naročnina za člana %s dodana v Dolibarr -ShipmentValidatedInDolibarr=Pošiljka %s potrjena v Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Izvoz ExportsArea=Področje izvoza diff --git a/htdocs/langs/sl_SI/paybox.lang b/htdocs/langs/sl_SI/paybox.lang index d3c604917b8..00476aa7811 100644 --- a/htdocs/langs/sl_SI/paybox.lang +++ b/htdocs/langs/sl_SI/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Sporočilo na strani za preklic plačila NewPayboxPaymentReceived=Novo Paybox plačilo prejeto NewPayboxPaymentFailed=Zavrnjen poskus novega Paybox plačila PAYBOX_PAYONLINE_SENDEMAIL=E-poštno opozorilo po plačilu (uspešno ali zavrnjeno) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/sl_SI/printipp.lang b/htdocs/langs/sl_SI/printipp.lang new file mode 100644 index 00000000000..741b5f6666c --- /dev/null +++ b/htdocs/langs/sl_SI/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Nastavitev modula za direktno tiskanje +PrintIPPDesc=Ta modul doda gumb za direktno pošiljanje dokumenta na tiskalnik. Zahteva nameščen sistem Linux z CUPS +PRINTIPP_ENABLED=Prikaži ikono za "Direktno tiskanje" na seznamu dokumentov +PRINTIPP_HOST=Tiskalniški strežnik +PRINTIPP_PORT=Vrata +PRINTIPP_USER=Uporabniško ime +PRINTIPP_PASSWORD=Geslo +NoPrinterFound=Ni najden noben tiskalnik (preveri nastavitve CUPS) +FileWasSentToPrinter=Datoteka %s je bila poslana na tiskalnik +NoDefaultPrinterDefined=Ni izbran privzet tiskalnik +DefaultPrinter=Privzet tiskalnik +Printer=Tiskalnik +CupsServer=CUPS Strežnik 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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/sl_SI/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang index 2602c7c01eb..d36f18d27ac 100644 --- a/htdocs/langs/sl_SI/sendings.lang +++ b/htdocs/langs/sl_SI/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Za trenutek je oblikovanje nove pošiljke opravi RelatedShippings=Povezane pošiljke ShipmentLine=Vrstica na odpremnici CarrierList=Seznam prevoznikov +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Lasten prevzem kupca diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang index d979328a2bc..79ebbecc62d 100644 --- a/htdocs/langs/sl_SI/stocks.lang +++ b/htdocs/langs/sl_SI/stocks.lang @@ -8,8 +8,8 @@ MenuNewWarehouse=Novo skladišče WarehouseOpened=Skladišče odprto WarehouseClosed=Skladišče zaprto WarehouseSource=Izvorno skladišče -WarehouseSourceNotDefined=No warehouse defined, -AddOne=Add one +WarehouseSourceNotDefined=Ni definirano skladišče, +AddOne=dodajte ga WarehouseTarget=Ciljno skladišče ValidateSending=Potrdi pošiljko CancelSending=Prekliči pošiljko @@ -23,25 +23,25 @@ ErrorWarehouseLabelRequired=Obvezen je naziv skladišča CorrectStock=Popravi zalogo ListOfWarehouses=Spisek skladišč ListOfStockMovements=Seznam gibanja zaloge -StocksArea=Področje zalog +StocksArea=Področje skladišč Location=Lokacija LocationSummary=Kratko ime lokacije -NumberOfDifferentProducts=Number of different products +NumberOfDifferentProducts=Število različnih proizvodov NumberOfProducts=Skupno število proizvodov LastMovement=Zadnja sprememba LastMovements=Zadnje spremembe Units=Enote Unit=Enota StockCorrection=Popravek zaloge -StockTransfer=Stock transfer +StockTransfer=Prenos zaloge StockMovement=Prenos StockMovements=Prenosi zaloge -LabelMovement=Movement label +LabelMovement=Označitev premika NumberOfUnit=Število enot -UnitPurchaseValue=Unit purchase price +UnitPurchaseValue=Nabavna cena enote TotalStock=Skupaj na zalogi StockTooLow=Zaloga je prenizka -StockLowerThanLimit=Stock lower than alert limit +StockLowerThanLimit=Zaloga je nižja od opozorilne vrednosti EnhancedValue=Vrednost PMPValue=Uravnotežena povprečna cena PMPValueShort=UPC @@ -57,13 +57,13 @@ DeStockOnShipment=Zmanjšanje dejanske zaloge po potrditvi odpreme (priporočeno ReStockOnBill=Povečanje dejanske zaloge po potrditvi fakture/dobropisa (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1) ReStockOnValidateOrder=Povečanje dejanske zaloge po potrditvi naročila (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1) ReStockOnDispatchOrder=Povečanje dejanske zaloge po ročnem vnosu v skladišče, po prejemu naročila od dobavitelja -ReStockOnDeleteInvoice=Increase real stocks on invoice deletion +ReStockOnDeleteInvoice=Povečaj dejansko zalogo ob brisanju računa OrderStatusNotReadyToDispatch=Naročilo še nima ali nima več statusa, ki omogoča odpremo proizvoda iz skladišča. StockDiffPhysicTeoric=Razlog za razliko med knjižno in dejansko zalogo NoPredefinedProductToDispatch=Za ta objekt ni preddefiniranih proizvodov. Zato ni potrebna odprema iz skladišča. DispatchVerb=Odprema -StockLimitShort=Limit for alert -StockLimit=Stock limit for alert +StockLimitShort=Omejitev za opozorilo +StockLimit=Omejitev zaloge za opozorilo PhysicalStock=Fizična zaloga RealStock=Dejanska zaloga VirtualStock=Virtualna zaloga @@ -88,38 +88,38 @@ PersonalStock=Osebna zaloga %s ThisWarehouseIsPersonalStock=To skladišče predstavlja osebno zalogo %s %s SelectWarehouseForStockDecrease=Izberite skladišče uporabiti za zmanjšanje zalog SelectWarehouseForStockIncrease=Izberite skladišče uporabiti za povečanje zalog -NoStockAction=No stock action -LastWaitingSupplierOrders=Orders waiting for receptions -DesiredStock=Desired stock -StockToBuy=To order -Replenishment=Replenishment -ReplenishmentOrders=Replenishment orders -VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs -UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature -UseVirtualStock=Use virtual stock -UsePhysicalStock=Use physical stock -CurentSelectionMode=Curent selection mode -CurentlyUsingVirtualStock=Virtual stock -CurentlyUsingPhysicalStock=Physical stock -RuleForStockReplenishment=Rule for stocks replenishment -SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier -AlertOnly= Alerts only -WarehouseForStockDecrease=The warehouse %s will be used for stock decrease -WarehouseForStockIncrease=The warehouse %s will be used for stock increase -ForThisWarehouse=For this warehouse -ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders -Replenishments=Replenishments -NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) -NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) -MassMovement=Mass movement -MassStockMovement=Mass stock movement -SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". -RecordMovement=Record transfert -ReceivingForSameOrder=Receivings for this order -StockMovementRecorded=Stock movements recorded -RuleForStockAvailability=Rules on stock requirements -StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice -StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order -StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment +NoStockAction=Ni aktivnosti zaloge +LastWaitingSupplierOrders=Naročila, ki čakajo na prevzem +DesiredStock=Želena zaloga +StockToBuy=Za naročiti +Replenishment=Obnavljanje +ReplenishmentOrders=Naročila za obnavljanje +VirtualDiffersFromPhysical=Glede na opcije povečanja/zmanjšanja zaloge, se lahko fizična in virtualna zaloga (fizična + trenutna naročila) razlikujeta +UseVirtualStockByDefault=Privzeto uporabljaj virtualno zalogo namesto fizične za funkcijo obnovitve zaloge +UseVirtualStock=Uporabi virtualno zalogo +UsePhysicalStock=Uporabi fizično zalogo +CurentSelectionMode=Trenutno izbran način +CurentlyUsingVirtualStock=Virtualna zaloga +CurentlyUsingPhysicalStock=Fizična zaloga +RuleForStockReplenishment=Pravilo za obnavljanje zalog +SelectProductWithNotNullQty=Izberite najmanj en proizvod, katerega stanje ni enako nič in ima dobavitelja +AlertOnly= Samo opozorila +WarehouseForStockDecrease=Skladiščee %s bo uporabljeno za zmanjšanje zaloge +WarehouseForStockIncrease=Skladišče %s bo uporabljeno za povečanje zaloge +ForThisWarehouse=Za to skladišče +ReplenishmentStatusDesc=Seznam vseh proizvodov, ki imajo nižje stanje zaloge od želenega (ali nižje od opozorilne vrednosti, če je kvadratek "samo opozorilo" odkljukan) in predlog za kreiranje naročila pri dobavitelju za dopolnitev razlike. +ReplenishmentOrdersDesc=To je seznam vseh odprtih naročil pri dobavitelju +Replenishments=Obnovitve +NbOfProductBeforePeriod=Količina proizvoda %s na zalogi pred izbranim obdobjem (< %s) +NbOfProductAfterPeriod=Količina proizvoda %s na zalogi po izbranem obdobju (> %s) +MassMovement=Masovni premik +MassStockMovement=Masovni premik zaloge +SelectProductInAndOutWareHouse=Izberi proizvod, količino, izvorno skladišče in ciljno skladišče, nato klikni "%s". Ko je to narejeno za vse zahtevane premike, klikni na "%s". +RecordMovement=Zapis prenešen +ReceivingForSameOrder=Prejemnice za to naročilo +StockMovementRecorded=Zapisan premik zaloge +RuleForStockAvailability=Pravila za zahtevane zaloge +StockMustBeEnoughForInvoice=Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na račun +StockMustBeEnoughForOrder=Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na naročilo +StockMustBeEnoughForShipment= Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na odpremnico diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang index d18cf255023..1f41a6282af 100644 --- a/htdocs/langs/sl_SI/users.lang +++ b/htdocs/langs/sl_SI/users.lang @@ -63,7 +63,6 @@ ShowGroup=Prikaži skupino ShowUser=Prikaži uporabnika NonAffectedUsers=Nevključeni uporabniki UserModified=Uporabnik uspešno spremenjen -GroupModified=Skupina %s je spremenjena PhotoFile=Datoteka s fotografijo UserWithDolibarrAccess=Uporabnik z dostopom do Dolibarrja ListOfUsersInGroup=Seznam uporabnikov v tej skupini @@ -114,8 +113,10 @@ YourRole=Vaše vloge YourQuotaOfUsersIsReached=Dosežena je vaša kvota aktivnih uporabnikov ! NbOfUsers=Število uporabnikov DontDowngradeSuperAdmin=Samo superadmin lahko degradira samo superadmin -HierarchicalResponsible=Hierarhična odgovornost +HierarchicalResponsible=Nadzornik HierarchicView=Hierarhični pogled UseTypeFieldToChange=Uporabi polje "Vnos" za spremembo OpenIDURL=Spletni naslov OpenID LoginUsingOpenID=Uporabi OpenID za prijavo +WeeklyHours=Tedenske ure +ColorUser=Barve uporabnika diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang index 16128d0b7ac..2e32208fc92 100644 --- a/htdocs/langs/sl_SI/withdrawals.lang +++ b/htdocs/langs/sl_SI/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Potrdilo LastWithdrawalReceipts=Zadnjih %s potrdil o nakazilih WithdrawedBills=Nakazila po računih WithdrawalsLines=Nakazane postavke -RequestStandingOrderToTreat=Zahtevek po izvršitvi trajnikov -RequestStandingOrderTreated=Zahtevek po izvršenih trajnikih +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Trajniki kupcev CustomerStandingOrder=Trajnik kupca NbOfInvoiceToWithdraw=Št. računov z zahtevkom za nakazilo @@ -40,14 +41,13 @@ TransMetod=Metoda prenosa Send=Pošlji Lines=Vrstice StandingOrderReject=Izdaja zavrnitve -InvoiceRefused=Zaračunaj zavrnitev kupcu WithdrawalRefused=Zavrnjena nakazila WithdrawalRefusedConfirm=Ali zares želite vnesti zavrnitev nakazila za družbo RefusedData=Datum zavrnitve RefusedReason=Razlog za zavrnitev RefusedInvoicing=Zaračunavanje zavrnitev NoInvoiceRefused=Ne zaračunaj zavrnitve -InvoiceRefused=Zaračunaj zavrnitev kupcu +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Neznano StatusWaiting=Na čakanju @@ -76,13 +76,14 @@ WithBankUsingRIB=Za bančne račune, ki uporabljajo RIB WithBankUsingBANBIC=Za bančne račune, ki uporabljajo IBAN/BIC/SWIFT BankToReceiveWithdraw=Informacija o vašem bančnem računu za prejem nakazil CreditDate=Datum kredita -WithdrawalFileNotCapable=Ni možno generirati datoteke za prejem nakazil za vašo državo +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/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/sq_AL/accountancy.lang +++ b/htdocs/langs/sq_AL/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang index e3e30f01dd4..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 @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Stock management (products) Module53Name=Services Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +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 -Module400Desc=Project management inside other modules +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=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 @@ -606,15 +613,16 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -701,8 +709,8 @@ Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Read stock movements Permission1005=Create/modify stock movements Permission1101=Read delivery orders @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Products module setup ServiceSetup=Services module setup @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang index 9b3efc07dab..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 @@ -41,9 +42,10 @@ AutoActions= Automatic filling AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Invoice %s validated +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Order %s validated @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status OrderCanceledInDolibarr=Order %s canceled -InterventionValidatedInDolibarr=Intervention %s validated ProposalSentByEMail=Commercial proposal %s sent by EMail OrderSentByEMail=Customer order %s sent by EMail InvoiceSentByEMail=Customer invoice %s sent by EMail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail ShippingSentByEMail=Shipping %s sent by EMail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sent by EMail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date DateActionPlannedEnd= Planned end date @@ -70,9 +69,9 @@ DateActionStart= Start date DateActionEnd= End date AgendaUrlOptions1=You can also add following parameters to filter output: AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. -AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Show birthday's contacts AgendaHideBirthdayEvents=Hide birthday's contacts Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang index 1edd7213076..81b7515a8b8 100644 --- a/htdocs/langs/sq_AL/bills.lang +++ b/htdocs/langs/sq_AL/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit note InvoiceAvoirAsk=Credit note to correct invoice InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Replace invoice %s ReplacementInvoice=Replacement invoice ReplacedByInvoice=Replaced by invoice %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned' ClassifyClosed=Classify 'Closed' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Create Invoice -AddBill=Add invoice or credit note +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice @@ -99,7 +99,7 @@ DoPaymentBack=Do payment back ConvertToReduc=Convert into future discount EnterPaymentReceivedFromCustomer=Enter payment received from customer EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Amount PriceBase=Price base BillStatus=Invoice status @@ -137,8 +137,6 @@ BillFrom=From BillTo=To ActionsOnBill=Actions on invoice NewBill=New invoice -Prélèvements=Standing order -Prélèvements=Standing order LastBills=Last %s invoices LastCustomersBills=Last %s customers invoices LastSuppliersBills=Last %s suppliers invoices @@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice %s ? ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason @@ -191,9 +189,9 @@ AlreadyPaid=Already paid AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Abandoned -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received @@ -219,19 +217,18 @@ NoInvoice=No invoice ClassifyBill=Classify invoice SupplierBillsToPay=Suppliers invoices to pay CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms SetMode=Set payment mode Billed=Billed -RepeatableInvoice=Pre-defined invoice -RepeatableInvoices=Pre-defined invoices -Repeatable=Pre-defined -Repeatables=Pre-defined -ChangeIntoRepeatableInvoice=Convert into pre-defined -CreateRepeatableInvoice=Create pre-defined invoice -CreateFromRepeatableInvoice=Create from pre-defined invoice +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Customer invoices and payments ExportDataset_invoice_1=Customer invoices list and invoice's lines diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang index ed61bfc08a6..22914931db1 100644 --- a/htdocs/langs/sq_AL/categories.lang +++ b/htdocs/langs/sq_AL/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang index 3929cfde036..878eb49b3c9 100644 --- a/htdocs/langs/sq_AL/compta.lang +++ b/htdocs/langs/sq_AL/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 e5ad112b222..57ba3bb15d8 100644 --- a/htdocs/langs/sq_AL/contracts.lang +++ b/htdocs/langs/sq_AL/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastContracts=Last %s modified contracts +LastModifiedContracts=Last %s modified contracts AllContracts=All contracts ContractCard=Contract card ContractStatus=Contract status @@ -27,7 +27,7 @@ MenuRunningServices=Running services MenuExpiredServices=Expired services MenuClosedServices=Closed services NewContract=New contract -AddContract=Add contract +AddContract=Create contract SearchAContract=Search a contract DeleteAContract=Delete a contract CloseAContract=Close a contract @@ -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 %s modified 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/cron.lang b/htdocs/langs/sq_AL/cron.lang index 768cd012384..195ad43c87c 100644 --- a/htdocs/langs/sq_AL/cron.lang +++ b/htdocs/langs/sq_AL/cron.lang @@ -1,10 +1,8 @@ # Dolibarr language file - Source file is en_US - cron -# # About page About = About CronAbout = About Cron CronAboutPage = Cron about page - # Right Permission23101 = Read Scheduled task Permission23102 = Create/update Scheduled task @@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman 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 jobs -CronListInactive= List of disabled jobs -CronListActive= List of active jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list CronDateLastRun=Last run CronLastOutput=Last run output diff --git a/htdocs/langs/sq_AL/donations.lang b/htdocs/langs/sq_AL/donations.lang index 66ddea95a5c..f7aed91cf81 100644 --- a/htdocs/langs/sq_AL/donations.lang +++ b/htdocs/langs/sq_AL/donations.lang @@ -4,7 +4,7 @@ Donations=Donations DonationRef=Donation ref. Donor=Donor Donors=Donors -AddDonation=Add a donation +AddDonation=Create a donation NewDonation=New donation ShowDonation=Show donation DonationPromise=Gift promise @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/sq_AL/externalsite.lang index 62da68c045d..da4853df0df 100644 --- a/htdocs/langs/sq_AL/externalsite.lang +++ b/htdocs/langs/sq_AL/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Setup link to external website ExternalSiteURL=External Site URL ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang index c25abf6449c..f5b87fefb08 100644 --- a/htdocs/langs/sq_AL/holiday.lang +++ b/htdocs/langs/sq_AL/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Name Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang index 17641a0ab3e..c79da05364e 100644 --- a/htdocs/langs/sq_AL/interventions.lang +++ b/htdocs/langs/sq_AL/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Interventions InterventionCard=Intervention card NewIntervention=New intervention -AddIntervention=Add intervention +AddIntervention=Create intervention ListOfInterventions=List of interventions EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang index 98e6dc335ee..7a211198822 100644 --- a/htdocs/langs/sq_AL/mails.lang +++ b/htdocs/langs/sq_AL/mails.lang @@ -115,7 +115,7 @@ SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -133,6 +133,9 @@ Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang index 01b94adb1fa..c8d1df78ea1 100644 --- a/htdocs/langs/sq_AL/main.lang +++ b/htdocs/langs/sq_AL/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries GoToWikiHelpPage=Read online help (need Internet access) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier @@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events NActionsLate=%s late +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Remove filter ChartGenerated=Chart generated @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToThirdParty=Link to another third party CreateDraft=Create draft +SetToDraft=Back to draft ClickToEdit=Click to edit ObjectDeleted=Object %s deleted ByCountry=By country @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/sq_AL/margins.lang b/htdocs/langs/sq_AL/margins.lang index 3fca6d7a644..606d5e5053a 100644 --- a/htdocs/langs/sq_AL/margins.lang +++ b/htdocs/langs/sq_AL/margins.lang @@ -38,4 +38,7 @@ BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/sq_AL/orders.lang index 3d530012154..6ee9c19fa95 100644 --- a/htdocs/langs/sq_AL/orders.lang +++ b/htdocs/langs/sq_AL/orders.lang @@ -53,7 +53,7 @@ ShippingExist=A shipment exists DraftOrWaitingApproved=Draft or approved not yet ordered DraftOrWaitingShipped=Draft or validated not yet shipped MenuOrdersToBill=Orders delivered -MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order ShipProduct=Ship product @@ -65,7 +65,7 @@ ValidateOrder=Validate order UnvalidateOrder=Unvalidate order DeleteOrder=Delete order CancelOrder=Cancel order -AddOrder=Add order +AddOrder=Create order AddToMyOrders=Add to my orders AddToOtherOrders=Add to other orders AddToDraftOrders=Add to draft order @@ -154,7 +154,6 @@ OrderByPhone=Phone CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=No orders billable CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -MenuOrdersToBill2=Orders to bill OrderCreation=Order creation Ordered=Ordered OrderCreated=Your orders have been created diff --git a/htdocs/langs/sq_AL/oscommerce.lang b/htdocs/langs/sq_AL/oscommerce.lang deleted file mode 100644 index 3ff9108ead4..00000000000 --- a/htdocs/langs/sq_AL/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang index b56ef294495..88991888183 100644 --- a/htdocs/langs/sq_AL/other.lang +++ b/htdocs/langs/sq_AL/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/sq_AL/paybox.lang b/htdocs/langs/sq_AL/paybox.lang index f937768240c..aced32a4944 100644 --- a/htdocs/langs/sq_AL/paybox.lang +++ b/htdocs/langs/sq_AL/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page NewPayboxPaymentReceived=New Paybox payment received NewPayboxPaymentFailed=New Paybox payment tried but failed PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/sq_AL/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang index 2ae43f39766..f6111bac684 100644 --- a/htdocs/langs/sq_AL/sendings.lang +++ b/htdocs/langs/sq_AL/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang index 5d11b0fd7a0..06c502504e9 100644 --- a/htdocs/langs/sq_AL/stocks.lang +++ b/htdocs/langs/sq_AL/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=Location LocationSummary=Short name location NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang index 0afaab6ad7f..baf209f9d1c 100644 --- a/htdocs/langs/sq_AL/users.lang +++ b/htdocs/langs/sq_AL/users.lang @@ -63,7 +63,6 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group modified successfully +GroupModified=Group %s modified GroupDeleted=Group %s removed ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? @@ -114,8 +113,10 @@ YourRole=Your roles YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb of users DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang index 58ac3e252ec..ea32511fefb 100644 --- a/htdocs/langs/sq_AL/withdrawals.lang +++ b/htdocs/langs/sq_AL/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Unknown StatusWaiting=Waiting @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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 83602dd0bab..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=Ventilation +Ventilation=Fördelning ToDispatch=Avsändandet Dispatched=Levereras -CustomersVentilation=Ventilationskunder -SuppliersVentilation=Ventilations leverantörer +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=Redovisning ventilation -AccountingVentilationSupplier=Redovisning ventilations leverantör -AccountingVentilationCustomer=Redovisning ventilations kund +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=Automatisk ventilation +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=Antal element som skall ventil visas av sidan (max rekommenderad: 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sorteringen av sidorna i ventilations "Måste ventilera" av de senaste delarna -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Börja sorteringen av sidorna i ventilation "Ventilerade" av de senaste delarna +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=Rådgör här den årliga redovisningen ventilation av dina fakturor kunder +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=Rådgör här den årliga redovisningen ventilation av dina fakturor leverantörer +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=Ventilation kort +FicheVentilation=Uppdelning kort diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index b67c53cc77e..22a9c532922 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - admin Foundation=Stiftelse Version=Version -VersionProgram=Version program +VersionProgram=Programversion VersionLastInstall=Version ursprungliga installationen VersionLastUpgrade=Version senaste uppgraderingen VersionExperimental=Experimentell @@ -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=Vänta du trycker på en tangent innan lastning innehåll thirdparties combo listan (Detta kan öka prestandan om du har ett stort antal thirdparties) +DelaiedFullListToSelectContact=Vänta du trycker på en tangent innan lastning innehållet i kontakt combo listan (Detta kan öka prestandan om du har ett stort antal kontakter) 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=Lista med några företag som kan ge / utveckla on-demand-moduler eller funktioner (Notera: någon Open Source företag knowning PHP kan ge dig specifik utveckling) 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=Kontrakt -Module54Desc=Kontraktets och service ledning +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=Stående order och återkallande hantering. Inkluderar även generation SEPA-fil för europeiska länder. 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=Projekt -Module400Desc=Projektets ledning innanför andra moduler +Module400Name=Projekt / Möjligheter / Leads +Module400Desc=Förvaltning av projekt, möjligheter eller leads. Du kan sedan tilldela varje element (faktura, beställning, förslag, ingripande, ...) till ett projekt och få ett övergripande vy från projekt vyn. 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=Dynamiska priser +Module2200Desc=Aktivera användningen av matematiska uttryck för priser 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 (klient) +Module2650Desc=Aktivera Dolibarr webbtjänster klient (Kan användas för att driva data / ansökningar till externa servrar. Leverantörs order stöds bara för stunden) 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 eller serienummer, äter-by och bäst före-datum hantering på produkter 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=Direktutskrift (utan att öppna dokumenten) använder Cups IPP-gränssnitt (skrivare måste vara synlig från servern, och CUPS måste vara installerad på servern). 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=Läs kontrakt -Permission162=Skapa / ändra avtal -Permission163=Aktivera en tjänst av ett kontrakt -Permission164=Inaktivera en tjänst av ett kontrakt -Permission165=Radera kontrakt +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=Tilldela tjänster att ingå avtal +Permission312=Tilldela tjänst / abonnemang att ingå avtal Permission331=Läs bokmärken Permission332=Skapa / ändra bokmärken Permission333=Ta bort bokmärken @@ -703,7 +710,7 @@ Permission702=Skapa / ändra donationer Permission703=Ta bort donationer Permission1001=Läs lager Permission1002=Skapa / ändra lager -Permission1003=Ta bort 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=E-postmeddelanden mallar 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=Aktivera HTML5 (Develope - Endast tillgängligt på Eldy mall) SystemSuccessfulyUpdated=Att ditt system har uppdaterats CompanyInfo=Företag / stiftelse information CompanyIds=Företag / stiftelse identiteter @@ -1039,7 +1048,6 @@ YesInSummer=Ja, under sommaren OnlyFollowingModulesAreOpenedToExternalUsers=Obs, endast följande moduler öppnas för externa användare (oavsett är tillstånd från sådana användare): SuhosinSessionEncrypt=Session lagring krypteras av Suhosin ConditionIsCurrently=Condition är för närvarande% s -TestNotPossibleWithCurrentBrowsers=Automatisk identifiering inte är möjlig YouUseBestDriver=Du använder drivrutinen %s som är bäst drivrutin tillgänglig för tillfället. YouDoNotUseBestDriver=Du använder enhet %s men förar %s rekommenderas. NbOfProductIsLowerThanNoPb=Du har bara %s produkter / tjänster i databasen. Detta innebär inte behövs någon särskild optimering. @@ -1139,6 +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=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=Kontrakt modul konfiguration +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=Automatisk identifiering inte är möjlig +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,8 +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=Inställningsmodul lager -UserWarehouse=Använd användarens personliga lager +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 @@ -1481,11 +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=Generic tredje part att använda för säljer +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 -CashDeskIdWareHouse=Lager som ska användas för säljer +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. @@ -1539,6 +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=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 0051929cd9d..b9c1c0343b4 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=Händelse delad AllMyActions= Alla mina handlingar och uppgifter AllActions= Alla åtgärder / uppgifter ViewList=Visa lista @@ -41,9 +42,10 @@ AutoActions= Automatisk fyllning av dagordning AgendaAutoActionDesc= Här definierar du händelser som du vill Dolibarr att automatiskt skapa en talan i dagordningen. Om ingenting är markerad (som standard), kommer endast manuella, skall ingå i dagordningen. AgendaSetupOtherDesc= Denna sida tillåter dig att ändra andra parametrar i dagordningen modul. AgendaExtSitesDesc=Den här sidan gör det möjligt att deklarera externa kalendrar för att se sina evenemang i Dolibarr agenda. -ActionsEvents= Händelser som Dolibarr kommer att skapa en talan i agenda automatiskt -PropalValidatedInDolibarr= Förslag %s validerade -InvoiceValidatedInDolibarr= Faktura %s validerade +ActionsEvents=Händelser som Dolibarr kommer att skapa en talan i agenda automatiskt +PropalValidatedInDolibarr=Förslag %s validerade +InvoiceValidatedInDolibarr=Faktura %s validerade +InvoiceValidatedInDolibarrFromPos=Faktura %s validerats från POS InvoiceBackToDraftInDolibarr=Faktura %s gå tillbaka till förslaget status InvoiceDeleteDolibarr=Faktura %s raderas OrderValidatedInDolibarr= Beställ %s validerade @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Ordningens %s godkänd OrderRefusedInDolibarr=Order %s vägrade OrderBackToDraftInDolibarr=Beställ %s gå tillbaka till förslaget status OrderCanceledInDolibarr=Beställ %s avbryts -InterventionValidatedInDolibarr=Intervention %s validerade ProposalSentByEMail=Kommersiella förslag %s via e-post OrderSentByEMail=Kundorderprojekt %s via e-post InvoiceSentByEMail=Kundfaktura %s via e-post @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Leverantör beställa %s via e-post SupplierInvoiceSentByEMail=Leverantörsfaktura %s via e-post ShippingSentByEMail=Frakt %s via e-post ShippingValidated= Frakt %s validerade -InterventionSentByEMail=Intervention %s via e-post -InterventionClassifiedBilled=Intervention %s sekretessbelagda som fakturerad NewCompanyToDolibarr= Tredje part har skapats DateActionPlannedStart= Planerat startdatum DateActionPlannedEnd= Planerat slutdatum 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 b90a2d0faa2..46d04601dc3 100644 --- a/htdocs/langs/sv_SE/bills.lang +++ b/htdocs/langs/sv_SE/bills.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - bills Bill=Faktura Bills=Fakturor -BillsCustomers=Kundens fakturor +BillsCustomers=Kundfakturor BillsCustomer=Kundens faktura BillsSuppliers=Leverantörens fakturor BillsCustomersUnpaid=Obetalda kundens fakturor @@ -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,34 +111,32 @@ 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 -Prélèvements=Stående order -Prélèvements=Stående order LastBills=Senaste %s fakturor LastCustomersBills=Senaste %s kunder fakturor LastSuppliersBills=Senaste %s leverantörer fakturor @@ -159,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») @@ -174,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 @@ -207,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 @@ -219,8 +217,7 @@ NoInvoice=Ingen faktura ClassifyBill=Klassificera faktura SupplierBillsToPay=Leverantörer fakturor att betala CustomerBillsUnpaid=Obetalda kunder fakturor -DispenseMontantLettres=Det lagförslag som utarbetats av mekanisk undantas från beslutet i skrivelser -DispenseMontantLettres=Det lagförslag som utarbetats av mekanisk undantas från beslutet i skrivelser +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 @@ -393,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 42ef6bd5d47..8d653226bc1 100644 --- a/htdocs/langs/sv_SE/categories.lang +++ b/htdocs/langs/sv_SE/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Länkar mellan leverantörer och kategorier CatCusLinks=Länkar mellan kunder / möjliga kunder och kategorier CatProdLinks=Länkar mellan produkter / tjänster och kategorier CatMemberLinks=Länkar mellan medlemmar och kategorier -CatProdLinks=Länkar mellan produkter / tjänster och kategorier -CatCusLinks=Länkar mellan kunder / möjliga kunder och kategorier -CatSupLinks=Länkar mellan leverantörer och kategorier DeleteFromCat=Ta bort från kategori DeletePicture=Ta bort bild ConfirmDeletePicture=Bekräfta ta bort bild? @@ -112,3 +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=Visa kategori diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang index 7f4af42e889..d51e041b7e2 100644 --- a/htdocs/langs/sv_SE/compta.lang +++ b/htdocs/langs/sv_SE/compta.lang @@ -1,10 +1,10 @@ # Dolibarr language file - Source file is en_US - compta Accountancy=Bokföring -AccountancyCard=Bokföring kort +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 @@ -100,14 +100,15 @@ AccountNumberShort=Kontonummer AccountNumber=Kontonummer NewAccount=Nytt konto SalesTurnover=Omsättningen -SalesTurnoverMinimum=Minimum sales turnover -ByThirdParties=Bu tredje part +SalesTurnoverMinimum=Minsta omsättning +ByThirdParties=Av tredje part ByUserAuthorOfInvoice=Mot faktura författare AccountancyExport=Bokföring export 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=Senaste% s check kvitton NewCheckReceipt=Ny rabatt NewCheckDeposit=Nya kontrollera insättning NewCheckDepositOn=Skapa kvitto för insättning på konto: %s @@ -119,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. @@ -177,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 9329c9a9701..8fc4e33c6e3 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 -LastContracts=Senast %s ändrat avtal +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=Senast %s ändrat avtal +LastContracts=Senaste %s kontrakt 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=Endast rader med typ "Service" kommer att klonas. ##### 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 0857c695597..cf4ed34e6ae 100644 --- a/htdocs/langs/sv_SE/cron.lang +++ b/htdocs/langs/sv_SE/cron.lang @@ -18,9 +18,8 @@ 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= Lista över aktiva jobb -CronListInactive= Lista över handikappade jobb -CronListActive= Lista över aktiva jobb +CronListActive=Lista över aktiva / schemalagda jobb +CronListInactive=Lista över handikappade jobb # Page list CronDateLastRun=Senaste körning CronLastOutput=Sista loppet utgång diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang index de829e62d03..a66b54ae5af 100644 --- a/htdocs/langs/sv_SE/donations.lang +++ b/htdocs/langs/sv_SE/donations.lang @@ -31,3 +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=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/ecm.lang b/htdocs/langs/sv_SE/ecm.lang index 7010cddbf8d..0fd6be84a25 100644 --- a/htdocs/langs/sv_SE/ecm.lang +++ b/htdocs/langs/sv_SE/ecm.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - ecm MenuECM=Dokument DocsMine=Mina dokument -DocsGenerated=Skapad dokument +DocsGenerated=Skapade dokument DocsElements=Elements dokument -DocsThirdParties=Handlingar tredje part -DocsContracts=Dokument kontrakt -DocsProposals=Dokument förslag +DocsThirdParties=Tredjepartshandlingar +DocsContracts=Kontraktsdokument +DocsProposals=Förslagsdokument DocsOrders=Dokument order DocsInvoices=Dokument fakturor ECMNbOfDocs=Nb av dokument i katalogen diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang index 230f6f74889..c3346d18dfa 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=Kan inte tilldela till konstant '%s' +ErrorPriceExpression2=Kan inte omdefiniera inbyggd funktion %s +ErrorPriceExpression3=Odefinierad variabel '%s' i funktionsdefinition +ErrorPriceExpression4=Otillåten karaktär "%s ' +ErrorPriceExpression5=Oväntad '%s' +ErrorPriceExpression6=Fel antal argument (%s givet, %s förväntades) +ErrorPriceExpression8=Oväntad operatör '%s' +ErrorPriceExpression9=Ett oväntat fel uppstod +ErrorPriceExpression10=Iperator %s saknar operand +ErrorPriceExpression11=Förväntar '%s' +ErrorPriceExpression14=Division med noll +ErrorPriceExpression17=Odefinierad variabel '%s' +ErrorPriceExpression19=Expression hittades inte +ErrorPriceExpression20=Tomma uttryck +ErrorPriceExpression21=Tomt resultat '%s' +ErrorPriceExpression22=Negativt resultat '%s' +ErrorPriceExpressionInternal=Internt fel '%s' +ErrorPriceExpressionUnknown=Okänt fel '%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 2d3c1384542..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). -CsvOptions=Csv Options -Separator=Separator -Enclosure=Enclosure -SuppliersProducts=Suppliers Products +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=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 9c74706c846..e8162ce8502 100644 --- a/htdocs/langs/sv_SE/externalsite.lang +++ b/htdocs/langs/sv_SE/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Setup länk till extern webbplats ExternalSiteURL=Extern webbplats URL ExternalSiteModuleNotComplete=Modul ExternalSite var inte korrekt konfigurerad. +ExampleMyMenuEntry=Min meny posten diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang index b28cbbb5fbb..2c04b219b95 100644 --- a/htdocs/langs/sv_SE/holiday.lang +++ b/htdocs/langs/sv_SE/holiday.lang @@ -48,7 +48,6 @@ ConfirmDeleteCP=Bekräfta raderingen av denna ledighet förfrågan? ErrorCantDeleteCP=Fel att du inte har rätt att ta bort denna ledighet begäran. CantCreateCP=Du har inte rätt att göra ledighet förfrågningar. InvalidValidatorCP=Du måste välja en approbator till din ledighet förfrågan. -UpdateButtonCP=Uppdatera CantUpdate=Du kan inte uppdatera denna ledighet begäran. NoDateDebut=Du måste välja ett startdatum. NoDateFin=Du måste välja ett slutdatum. diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang index d99110f8bfb..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=Lägg till intervention +AddIntervention=Skapa ingripande ListOfInterventions=Förteckning över åtgärder EditIntervention=Redigera ingripande ActionsOnFicheInter=Åtgärder för ingripande @@ -23,13 +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 +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 @@ -40,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 7e607f65742..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,27 +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: On line sending of emailings are limited for security and timeout reasons to %s recipients by 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=Aktivera en ny e-post meddelande begära -ListOfActiveNotifications=Lista alla aktiva e ansökningsmeddelanden +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=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 968cc1fc3d8..facd4e8651d 100644 --- a/htdocs/langs/sv_SE/main.lang +++ b/htdocs/langs/sv_SE/main.lang @@ -38,7 +38,7 @@ ErrorUnknown=Okänt fel ErrorSQL=SQL-fel ErrorLogoFileNotFound=Logo fil '%s' hittades inte ErrorGoToGlobalSetup=Gå till 'bolaget / stiftelsen' setup för att åtgärda detta -ErrorGoToModuleSetup=Gå till modul setup att åtgärda detta +ErrorGoToModuleSetup=Gå till modul inställningarna för att åtgärda detta ErrorFailedToSendMail=Det gick inte att skicka e-post (avsändare = %s, mottagare = %s) ErrorAttachedFilesDisabled=Bifoga fil har inaktiverats på denna server ErrorFileNotUploaded=Filen har inte laddats upp. Kontrollera att storleken inte överskrider högsta tillåtna, att det finns plats på disken och att det inte redan finns en fil med samma namn i den här katalogen. @@ -77,7 +77,7 @@ IsNotDefined=odefinierad DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr autentiseringsläge är inställd för att %s i konfigurationsfilen conf.php.
    Det innebär att lösenords databasen är extern till Dolibarr, så förändringar av detta fält kan vara utan effekt. Administrator=Administratör Undefined=Odefinierad -PasswordForgotten=Har du glömt lösenordet? +PasswordForgotten=Glömt lösenordet? SeeAbove=Se ovan HomeArea=Hem område LastConnexion=Senaste anslutningen @@ -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,6 +367,7 @@ ActionsOnCompany=Åtgärder om denna tredje part ActionsOnMember=Händelser om denna medlem NActions=%s åtgärder NActionsLate=%s sent +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 a5639a012ac..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,19 +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=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +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..3fb67836367 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=Produkten används för beställnings linje i fakturan: %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 892578e5a6c..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=Order till faktura +MenuOrdersToBill2=Fakturerbara order SearchOrder=Sök ordning SearchACustomerOrder=Sök en kundorder ShipProduct=Ship produkt @@ -154,7 +154,6 @@ OrderByPhone=Telefonen CreateInvoiceForThisCustomer=Faktura order NoOrdersToInvoice=Inga order fakturerbar CloseProcessedOrdersAutomatically=Klassificera "bearbetade" alla valda order. -MenuOrdersToBill2=Order till faktura OrderCreation=Order skapning Ordered=Beställt OrderCreated=Din order har skapats diff --git a/htdocs/langs/sv_SE/oscommerce.lang b/htdocs/langs/sv_SE/oscommerce.lang deleted file mode 100644 index 1e2ef91e7f2..00000000000 --- a/htdocs/langs/sv_SE/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul setup -OSCommerceSetupSaved=OS Commerce setup sparas -OSCommerceServer=OS Commerce Server värd / ip -OSCommerceDatabaseName=OS Commerce databasnamn -OSCommercePrefix=OS Commerce tabeller prefix -OSCommerceUser=OS Commerce databas login diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang index 5b39504e935..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,25 +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=Företag %s la till Dolibarr -ContractValidatedInDolibarr=Kontrakt %s validerats i Dolibarr -ContractCanceledInDolibarr=Kontrakt %s annulleras i Dolibarr -ContractClosedInDolibarr=Kontrakt %s stängdes Dolibarr -PropalClosedSignedInDolibarr=Förslag %s undertecknades i Dolibarr -PropalClosedRefusedInDolibarr=Förslag %s avslås Dolibarr -PropalValidatedInDolibarr=Förslag %s validerats i Dolibarr -InvoiceValidatedInDolibarr=Faktura %s validerats i Dolibarr -InvoicePaidInDolibarr=Faktura %s ändras till betalas i Dolibarr -InvoiceCanceledInDolibarr=Faktura %s annulleras i Dolibarr -PaymentDoneInDolibarr=Betalning %s gjort i Dolibarr -CustomerPaymentDoneInDolibarr=Kundbetalning %s gjort i Dolibarr -SupplierPaymentDoneInDolibarr=Leverantör betalning %s gjort i Dolibarr -MemberValidatedInDolibarr=Medlem %s validerats i Dolibarr -MemberResiliatedInDolibarr=Medlem %s resiliated i Dolibarr -MemberDeletedInDolibarr=Medlem %s bort från Dolibarr -MemberSubscriptionAddedInDolibarr=Teckning av medlem %s till i Dolibarr -ShipmentValidatedInDolibarr=Transport %s validerats i Dolibarr -ShipmentDeletedInDolibarr=Leverans %s har raderats från Dolibarr +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 8677724f600..bbef3fa717e 100644 --- a/htdocs/langs/sv_SE/paybox.lang +++ b/htdocs/langs/sv_SE/paybox.lang @@ -32,6 +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) +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/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/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang index d0d98e3e1f9..51817febe22 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=Pris uttryck redigerare +PriceExpressionSelected=Valda pris uttryck +PriceExpressionEditorHelp="pris = 2 + 2" eller "2 + 2" för det pris
    ExtraFields är variabler som "# options_myextrafieldkey # * 2"
    Det finns speciella variabler som # mängd # och # tva_tx #
    Använd ; att separera uttryck +PriceMode=Prisläge +PriceNumeric=Nummer diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang index d5d0379b62f..ad639b44769 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=Uppgifter om öppnade projekt +WorkloadNotDefined=Arbetsbelastning inte definierad 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 new file mode 100644 index 00000000000..38588c87528 --- /dev/null +++ b/htdocs/langs/sv_SE/resource.lang @@ -0,0 +1,34 @@ + +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=Listan över resurser +ResourceSingular=Resurs +ResourceCard=Resurs kort +AddResource=Skapa en resurs +ResourceFormLabel_ref=Resursnamn +ResourceType=Resurs typ +ResourceFormLabel_description=Resursbeskrivning + +ResourcesLinkedToElement=Resurser kopplade till elementet + +ShowResourcePlanning=Visa resursplanering +GotoDate=Gå till datum + +ResourceElementPage=Element resurser +ResourceCreatedWithSuccess=Resursen har skapats +RessourceLineSuccessfullyDeleted=Resurslinje har tagits bort +RessourceLineSuccessfullyUpdated=Resurs linje har uppdaterats +ResourceLinkedWithSuccess=Resurs kopplat med framgång + +TitleResourceCard=Resurs kort +ConfirmDeleteResource=Bekräfta radera denna resurs +RessourceSuccessfullyDeleted=Resurs tagits bort +DictionaryResourceType=Typ av resurser + +SelectResource=Välj resurs diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang index fdb12324479..5c4e735ad88 100644 --- a/htdocs/langs/sv_SE/sendings.lang +++ b/htdocs/langs/sv_SE/sendings.lang @@ -61,6 +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=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 92b0bda1f1b..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=Lagerområde +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 bab31f48921..34a10699b5c 100644 --- a/htdocs/langs/sv_SE/users.lang +++ b/htdocs/langs/sv_SE/users.lang @@ -63,7 +63,6 @@ ShowGroup=Visa grupp ShowUser=Visa användare NonAffectedUsers=Icke drabbade användare UserModified=Användare ändrades korrekt -GroupModified=Grupp ändrades korrekt PhotoFile=Bildfilen UserWithDolibarrAccess=Användaren med Dolibarr tillgång ListOfUsersInGroup=Lista över användare i denna grupp @@ -103,7 +102,7 @@ UserDisabled=Användare %s funktionshindrade UserEnabled=Användare %s aktiverad UserDeleted=Användare %s bort NewGroupCreated=Grupp %s skapade -GroupModified=Grupp ändrades korrekt +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 9a9b38c0b5c..3c34fb7a2c1 100644 --- a/htdocs/langs/sv_SE/withdrawals.lang +++ b/htdocs/langs/sv_SE/withdrawals.lang @@ -14,12 +14,13 @@ WithdrawalReceiptShort=Kvitto LastWithdrawalReceipts=Senaste %s tillbakadragande kvitton WithdrawedBills=Indragna fakturor WithdrawalsLines=Återkallelse linjer -RequestStandingOrderToTreat=Begäran om stående order att behandla -RequestStandingOrderTreated=Begäran om stående behandlas order +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 @@ -40,14 +41,13 @@ TransMetod=Metod Transmission Send=Skicka Lines=Linjer StandingOrderReject=Utfärda ett förkasta -InvoiceRefused=Ladda avvisande till kund WithdrawalRefused=Uttag Refuseds WithdrawalRefusedConfirm=Är du säker på att du vill ange ett tillbakadragande avslag för samhället RefusedData=Datum för avslag RefusedReason=Orsak till avslag RefusedInvoicing=Fakturering avslaget NoInvoiceRefused=Ladda inte avslaget -InvoiceRefused=Ladda avvisande till kund +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=Det går inte att skapa filen uttag kvitto för ditt land +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=Denna flik tillåter dig att begära en stående beställning. När gjort, gå in på menyn Bank-> Återkallande att hantera den stående beställningen. När stående order är stängd, kommer betalningen på faktura automatiskt registreras, och fakturan stängs om resten att betala är 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=Statistik efter status linjer ### 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/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/th_TH/accountancy.lang +++ b/htdocs/langs/th_TH/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index c3d3acf451c..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 @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Stock management (products) Module53Name=Services Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +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 -Module400Desc=Project management inside other modules +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=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 @@ -606,15 +613,16 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -701,8 +709,8 @@ Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Read stock movements Permission1005=Create/modify stock movements Permission1101=Read delivery orders @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Products module setup ServiceSetup=Services module setup @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang index 9b3efc07dab..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 @@ -41,9 +42,10 @@ AutoActions= Automatic filling AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Invoice %s validated +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Order %s validated @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status OrderCanceledInDolibarr=Order %s canceled -InterventionValidatedInDolibarr=Intervention %s validated ProposalSentByEMail=Commercial proposal %s sent by EMail OrderSentByEMail=Customer order %s sent by EMail InvoiceSentByEMail=Customer invoice %s sent by EMail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail ShippingSentByEMail=Shipping %s sent by EMail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sent by EMail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date DateActionPlannedEnd= Planned end date @@ -70,9 +69,9 @@ DateActionStart= Start date DateActionEnd= End date AgendaUrlOptions1=You can also add following parameters to filter output: AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. -AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Show birthday's contacts AgendaHideBirthdayEvents=Hide birthday's contacts Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang index 1edd7213076..81b7515a8b8 100644 --- a/htdocs/langs/th_TH/bills.lang +++ b/htdocs/langs/th_TH/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit note InvoiceAvoirAsk=Credit note to correct invoice InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Replace invoice %s ReplacementInvoice=Replacement invoice ReplacedByInvoice=Replaced by invoice %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned' ClassifyClosed=Classify 'Closed' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Create Invoice -AddBill=Add invoice or credit note +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice @@ -99,7 +99,7 @@ DoPaymentBack=Do payment back ConvertToReduc=Convert into future discount EnterPaymentReceivedFromCustomer=Enter payment received from customer EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Amount PriceBase=Price base BillStatus=Invoice status @@ -137,8 +137,6 @@ BillFrom=From BillTo=To ActionsOnBill=Actions on invoice NewBill=New invoice -Prélèvements=Standing order -Prélèvements=Standing order LastBills=Last %s invoices LastCustomersBills=Last %s customers invoices LastSuppliersBills=Last %s suppliers invoices @@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice %s ? ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason @@ -191,9 +189,9 @@ AlreadyPaid=Already paid AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Abandoned -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received @@ -219,19 +217,18 @@ NoInvoice=No invoice ClassifyBill=Classify invoice SupplierBillsToPay=Suppliers invoices to pay CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms SetMode=Set payment mode Billed=Billed -RepeatableInvoice=Pre-defined invoice -RepeatableInvoices=Pre-defined invoices -Repeatable=Pre-defined -Repeatables=Pre-defined -ChangeIntoRepeatableInvoice=Convert into pre-defined -CreateRepeatableInvoice=Create pre-defined invoice -CreateFromRepeatableInvoice=Create from pre-defined invoice +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Customer invoices and payments ExportDataset_invoice_1=Customer invoices list and invoice's lines diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang index ed61bfc08a6..22914931db1 100644 --- a/htdocs/langs/th_TH/categories.lang +++ b/htdocs/langs/th_TH/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang index 3929cfde036..878eb49b3c9 100644 --- a/htdocs/langs/th_TH/compta.lang +++ b/htdocs/langs/th_TH/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 e5ad112b222..57ba3bb15d8 100644 --- a/htdocs/langs/th_TH/contracts.lang +++ b/htdocs/langs/th_TH/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastContracts=Last %s modified contracts +LastModifiedContracts=Last %s modified contracts AllContracts=All contracts ContractCard=Contract card ContractStatus=Contract status @@ -27,7 +27,7 @@ MenuRunningServices=Running services MenuExpiredServices=Expired services MenuClosedServices=Closed services NewContract=New contract -AddContract=Add contract +AddContract=Create contract SearchAContract=Search a contract DeleteAContract=Delete a contract CloseAContract=Close a contract @@ -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 %s modified 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/cron.lang b/htdocs/langs/th_TH/cron.lang index 768cd012384..195ad43c87c 100644 --- a/htdocs/langs/th_TH/cron.lang +++ b/htdocs/langs/th_TH/cron.lang @@ -1,10 +1,8 @@ # Dolibarr language file - Source file is en_US - cron -# # About page About = About CronAbout = About Cron CronAboutPage = Cron about page - # Right Permission23101 = Read Scheduled task Permission23102 = Create/update Scheduled task @@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman 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 jobs -CronListInactive= List of disabled jobs -CronListActive= List of active jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list CronDateLastRun=Last run CronLastOutput=Last run output diff --git a/htdocs/langs/th_TH/donations.lang b/htdocs/langs/th_TH/donations.lang index 66ddea95a5c..f7aed91cf81 100644 --- a/htdocs/langs/th_TH/donations.lang +++ b/htdocs/langs/th_TH/donations.lang @@ -4,7 +4,7 @@ Donations=Donations DonationRef=Donation ref. Donor=Donor Donors=Donors -AddDonation=Add a donation +AddDonation=Create a donation NewDonation=New donation ShowDonation=Show donation DonationPromise=Gift promise @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/th_TH/externalsite.lang index 62da68c045d..da4853df0df 100644 --- a/htdocs/langs/th_TH/externalsite.lang +++ b/htdocs/langs/th_TH/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Setup link to external website ExternalSiteURL=External Site URL ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang index c25abf6449c..f5b87fefb08 100644 --- a/htdocs/langs/th_TH/holiday.lang +++ b/htdocs/langs/th_TH/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Name Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang index 17641a0ab3e..c79da05364e 100644 --- a/htdocs/langs/th_TH/interventions.lang +++ b/htdocs/langs/th_TH/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Interventions InterventionCard=Intervention card NewIntervention=New intervention -AddIntervention=Add intervention +AddIntervention=Create intervention ListOfInterventions=List of interventions EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang index 98e6dc335ee..7a211198822 100644 --- a/htdocs/langs/th_TH/mails.lang +++ b/htdocs/langs/th_TH/mails.lang @@ -115,7 +115,7 @@ SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -133,6 +133,9 @@ Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang index be165e49fd8..6258c9fe83a 100644 --- a/htdocs/langs/th_TH/main.lang +++ b/htdocs/langs/th_TH/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries GoToWikiHelpPage=Read online help (need Internet access) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier @@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events NActionsLate=%s late +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Remove filter ChartGenerated=Chart generated @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToThirdParty=Link to another third party CreateDraft=Create draft +SetToDraft=Back to draft ClickToEdit=Click to edit ObjectDeleted=Object %s deleted ByCountry=By country @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/th_TH/margins.lang b/htdocs/langs/th_TH/margins.lang index 3fca6d7a644..606d5e5053a 100644 --- a/htdocs/langs/th_TH/margins.lang +++ b/htdocs/langs/th_TH/margins.lang @@ -38,4 +38,7 @@ BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/th_TH/orders.lang index 3d530012154..6ee9c19fa95 100644 --- a/htdocs/langs/th_TH/orders.lang +++ b/htdocs/langs/th_TH/orders.lang @@ -53,7 +53,7 @@ ShippingExist=A shipment exists DraftOrWaitingApproved=Draft or approved not yet ordered DraftOrWaitingShipped=Draft or validated not yet shipped MenuOrdersToBill=Orders delivered -MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order ShipProduct=Ship product @@ -65,7 +65,7 @@ ValidateOrder=Validate order UnvalidateOrder=Unvalidate order DeleteOrder=Delete order CancelOrder=Cancel order -AddOrder=Add order +AddOrder=Create order AddToMyOrders=Add to my orders AddToOtherOrders=Add to other orders AddToDraftOrders=Add to draft order @@ -154,7 +154,6 @@ OrderByPhone=Phone CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=No orders billable CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -MenuOrdersToBill2=Orders to bill OrderCreation=Order creation Ordered=Ordered OrderCreated=Your orders have been created diff --git a/htdocs/langs/th_TH/oscommerce.lang b/htdocs/langs/th_TH/oscommerce.lang deleted file mode 100644 index 3ff9108ead4..00000000000 --- a/htdocs/langs/th_TH/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang index b56ef294495..88991888183 100644 --- a/htdocs/langs/th_TH/other.lang +++ b/htdocs/langs/th_TH/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/th_TH/paybox.lang b/htdocs/langs/th_TH/paybox.lang index f937768240c..aced32a4944 100644 --- a/htdocs/langs/th_TH/paybox.lang +++ b/htdocs/langs/th_TH/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page NewPayboxPaymentReceived=New Paybox payment received NewPayboxPaymentFailed=New Paybox payment tried but failed PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/th_TH/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang index 2ae43f39766..f6111bac684 100644 --- a/htdocs/langs/th_TH/sendings.lang +++ b/htdocs/langs/th_TH/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang index 5d11b0fd7a0..06c502504e9 100644 --- a/htdocs/langs/th_TH/stocks.lang +++ b/htdocs/langs/th_TH/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=Location LocationSummary=Short name location NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang index 0afaab6ad7f..baf209f9d1c 100644 --- a/htdocs/langs/th_TH/users.lang +++ b/htdocs/langs/th_TH/users.lang @@ -63,7 +63,6 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group modified successfully +GroupModified=Group %s modified GroupDeleted=Group %s removed ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? @@ -114,8 +113,10 @@ YourRole=Your roles YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb of users DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang index 58ac3e252ec..ea32511fefb 100644 --- a/htdocs/langs/th_TH/withdrawals.lang +++ b/htdocs/langs/th_TH/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Unknown StatusWaiting=Waiting @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang index c6d4a634560..5af51d0e2ba 100644 --- a/htdocs/langs/tr_TR/accountancy.lang +++ b/htdocs/langs/tr_TR/accountancy.lang @@ -17,8 +17,8 @@ Modelcsv=Dışaaktarım modeli Selectmodelcsv=Bir dışaaktarım modeli seç Modelcsv_normal=Klasik dışaaktarım Modelcsv_CEGID=CEGID Uzmanına yönelik dışaaktarım -BackToChartofaccounts=Hesap planı geliri -Back=Gelir +BackToChartofaccounts=Hesap planı cirosu +Back=Ciro Definechartofaccounts=Hesap planı tanımla Selectchartofaccounts=Hesap planı seç @@ -30,8 +30,8 @@ ToDispatch=Gönderilecek Dispatched=Gönderilmiş CustomersVentilation=Müşteri analizi -SuppliersVentilation=Tedarikçi analizi -TradeMargin=Ticaret marjı +SuppliersVentilation=Tedarikç analizi +TradeMargin=Ticaret oranı Reports=Raporlar ByCustomerInvoice=Müşteri faturalarına göre ByMonth=Aya göre @@ -46,7 +46,7 @@ Bookkeeping=Büyük Defter AccountBalanceByMonth=Aylık hesap bakiyesi AccountingVentilation=Analiz muhasebesi -AccountingVentilationSupplier=Teadrikçi hesabı analizi +AccountingVentilationSupplier=Tedarikçi hesabı analizi AccountingVentilationCustomer=Müşteri hesabı analizi Line=Satır @@ -68,9 +68,9 @@ NotVentilatedinAccount=Muhasebe hesabında analiz edilmedi. ACCOUNTING_SEPARATORCSV=CSV Ayırıcı -ACCOUNTING_LIMIT_LIST_VENTILATION=Bir sayfada gösterilecek analiz edilen öğe sayısı (önerilen ençok:50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO="Analizlenecek" analiz sayfalarının sıralamasını son öğelerden başlat -ACCOUNTING_LIST_SORT_VENTILATION_DONE="Analizlenen" analiz sayfalarının sıralamasını son öğelerden başlat +ACCOUNTING_LIMIT_LIST_VENTILATION=Analiz syfasında gösterilecek öğe sayısı (önerilen ençok:50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Analiz sayfalarında "Analiz edileceklerin" sıralandırılmasını en son öğelerden göre başlatın +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Analiz sayfalarında "Analiz edilmişlerin" sıralandırılmasını en son öğelerden göre başlatın AccountLength=Dolibarr'da gösterilen muhasebe hesapları uzunluğu AccountLengthDesc=Boşlukların sıfır figürü ile değiştirilmesiyle muhasebe hesap uzunluğunun uydurulmasını sağlayan işlevdir. Bu işlev yalnızca görüntüyü değiştirir, Dolibarr'da kayıtlı muhasebe hesaplarını değiştirmez. Dışaaktarma için bu fonksiyonun belirli yazılımla uyumlu olması gerekir. @@ -111,7 +111,7 @@ PurchasesJournal=Satınalma günlüğü DescSellsJournal=Satış günlüğü DescPurchasesJournal=Satınalma günlüğü BankJournal=Banka günlüğü -DescBankJournal=Nakitten dışında her türlü ödemeyi içeren banka günlüğü +DescBankJournal=Nakit dışında her türlü ödemeyi içeren banka günlüğü CashJournal=Kasa günlüğü DescCashJournal=Nakit ödeme türünü içeren kasa günlüğü @@ -140,14 +140,14 @@ Active=Hesap özeti NewFiscalYear=Yeni mali yıl -DescVentilCustomer=Burada müşteri faturalarınızın yıllık hesap analizine bakın +DescVentilCustomer=Müşteri faturalarınızın yıllık hesap analizi için buraya danışın TotalVente=Toplam ciro HT TotalMarge=Toplam satışlar oranı DescVentilDoneCustomer=Burada müşteri faturaları satırlarına ve onların muhasebe hesaplarının listesine bakın. DescVentilTodoCustomer=Bir muhasebe hesabıyla müşteri faturanızın kalemlerini analiz edin ChangeAccount=Muhasebe hesabını, hesap tarafından seçilen satırlar için değiştirin: Vide=- -DescVentilSupplier=Burada tedarikçi faturalarınızın yıllık hesap analizine bakın +DescVentilSupplier=Tedarikçi faturalarınızın yıllık hesap analizi için buraya danışın DescVentilTodoSupplier=Bir muhasebe hesabıyla tedarikçi faturanızın kalemlerini analiz edin DescVentilDoneSupplier=Burada tedarikçi faturaları ve muhasebe hesapları satırları listesine başvurun @@ -155,4 +155,4 @@ ValidateHistory=Otomatikman doğrula ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz -FicheVentilation=Havalandırma kartı +FicheVentilation=Analiz kartı diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index d1ee8c4ac6e..082c6c9cd44 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. @@ -35,20 +35,20 @@ ExternalUsers=Dış kullanıcılar GlobalSetup=Genel Ayarlar GUISetup=Görünüm SetupArea=Ayarlar alanı -FormToTestFileUploadForm=Dosya yükleme deneme formu (kuruluma göre) -IfModuleEnabled=Not: evet yalnızca %s modülü etkinse etkilidir. -RemoveLock=%s dosyasını, güncelleme aracının kullanımına izin vermek için belirmişse kaldırın. -RestoreLock=%s dosyasını, güncelleme aracının her hangi bir kullanımını engellemek için, yalnızca okuma izniyle değiştirin. +FormToTestFileUploadForm=Dosya yükleme deneme formu (ayarlara göre) +IfModuleEnabled=Not: yalnızca %s modülü etkinse evet etkilidir. +RemoveLock=Bu dosyayı %s eğer güncelleme aracının kullanımına izin vermek için belirmişse kaldırın. +RestoreLock=Bu dosyayı %s eğer güncelleme aracının her hangi bir kullanımını engellemek için, yalnızca okuma izniyle değiştirin. SecuritySetup=Güvenlik ayarları ErrorModuleRequirePHPVersion=Hata, bu modül %s veya daha yüksek PHP sürümü gerektirir. ErrorModuleRequireDolibarrVersion=Hata, bu modül %s veya daha yüksek Dolibarr sürümü gerektirir. -ErrorDecimalLargerThanAreForbidden=Hata, %s den daha yüksek hassasiyet desteklenmez. +ErrorDecimalLargerThanAreForbidden=Hata, %s den daha yüksek doğruluk desteklenmez. DictionarySetup=Sözlük ayarları Dictionary=Sözlükler Chartofaccounts=Hesap planı Fiscalyear=Mali yıllar ErrorReservedTypeSystemSystemAuto='system' ve 'systemauto' değerleri tür için ayrılmıştır. 'kullanıcı'yı kendi kayıtlarınıza eklemek için değer olarak kullanabilirsiniz -ErrorCodeCantContainZero=Kod 0 değeri içeremez +ErrorCodeCantContainZero=Kod 0 değerini içeremez DisableJavascript=Javascript ve Ajax fonksiyonlarını engelle (Görme engelli kişiler ve metin tarayıcılar için önerilir) ConfirmAjax=Açılır Ajax onay pencereleri kullanın UseSearchToSelectCompanyTooltip=Ayrıca çok fazla sayıda üçüncü partiniz varsa (>100 000), Kurulum->Diğer den COMPANY_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır. @@ -56,9 +56,11 @@ 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=Üçüncü parti içeriği açılır listesini yüklemek için bir düğmeye basmadan önce bekleyin (Çok sayıda üçüncü parti varsa, beklemek performansı arttıracaktır) +DelaiedFullListToSelectContact=Açılır liste içeriğini yüklemek için bir düğmeye basmadan önce bekleyin (Çok sayıda üçüncü parti varsa, beklemek performansı arttıracaktır) SearchFilter=Arama süzgeçi seçenekleri NumberOfKeyToSearch=Aramayı başlatacak karakter sayısı: %s -ViewFullDateActions=Üçüncü sayfada tam gün eylemlerini göster +ViewFullDateActions=Üçüncü sayfada tam gün etkinliklerini göster NotAvailableWhenAjaxDisabled=Ajax devre dışı olduğunda kullanılamaz JavascriptDisabled=JavaScript devre dışı UsePopupCalendar=Tarih girişi için açılır pencere kullan @@ -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 @@ -120,17 +122,17 @@ LanguageBrowserParameter=Parametre %s LocalisationDolibarrParameters=Yerelleştirme parametreleri ClientTZ=İstemci Zaman Dilimi (kullanıcı) ClientHour=İstemci zamanı (kullanıcı) -OSTZ=Sunucu OS Zaman Dilimi +OSTZ=Sunucu İşletim Siztemi Zaman Dilimi PHPTZ=PHP Saat Dilimi (sunucu) PHPServerOffsetWithGreenwich=PHP sunucusu Greenwich genişlik sapması (saniye) ClientOffsetWithGreenwich=İstemci/Tarayıcı Greenwich genişlik sapması (saniye) -DaylingSavingTime=Yaz saati +DaylingSavingTime=Yaz saati uygulaması CurrentHour=PHP saati (sunucu) CompanyTZ=Firma Saat Dilimi (ana firma) CompanyHour=Firma saati (ana firma) CurrentSessionTimeOut=Geçerli oturumun zaman aşımı YouCanEditPHPTZ=Farklı bir PHP saat dilimi (gerekli değildir) ayarlamak için "SetEnv TZ Europe/Paris" gibi bir satır içeren .htacces dosyası eklemeyi deneyin -OSEnv=OS Ortamı +OSEnv=İşletim Sistemi Ortamı Box=Kutu Boxes=Kutular MaxNbOfLinesForBoxes=Kutulardaki ençok satır sayısı @@ -159,35 +161,35 @@ NewBackup=Yeni yedekleme GenerateBackup=Yedekleme oluştur Backup=Yedekleme Restore=Geri yükleme -RunCommandSummary=Yedekleme aşağıdaki komutla başlatılacaktır +RunCommandSummary=Yedekleme aşağıdaki komut ile başlatılmıştır RunCommandSummaryToLaunch=Yedekleme aşağıdaki komut ile başlatılabilir WebServerMustHavePermissionForCommand=Web sunucunuz bu gibi komutları çalıştırmak için gereken izne sahip olmalı BackupResult=Yedekleme sonucu BackupFileSuccessfullyCreated=Yedekleme dosyası başarıyla oluşturuldu -YouCanDownloadBackupFile=Oluşturulan dosyaları artık indirilebilir +YouCanDownloadBackupFile=Oluşturulan dosyalar artık indirilebilir NoBackupFileAvailable=Hiç yedekleme dosyası yok. ExportMethod=Dışaaktarma yöntemi ImportMethod=İçeaktarma yöntemi ToBuildBackupFileClickHere=Bir yedekleme dosyası oluşturmak için buraya ya tıklayın. -ImportMySqlDesc=Bir yedekleme dosyası almak için, komut satırında mysql komutu kullanmalısınız: -ImportPostgreSqlDesc=Bir yedekleme dosyası almak için, komut satırınd pg_restore komutu kullanmalısınız: +ImportMySqlDesc=Bir yedekleme dosyası içeaktarmak için, komut satırında mysql komutu kullanmalısınız: +ImportPostgreSqlDesc=Bir yedekleme dosyası içeaktarmak için, komut satırınd pg_restore komutu kullanmalısınız: ImportMySqlCommand=%s %s < mybackupfile.sql ImportPostgreSqlCommand=%s %s mybackupfile.sql FileNameToGenerate=Oluşturulacak dosya adı Compression=Sıkıştırma CommandsToDisableForeignKeysForImport=İçeaktarmada devre dışı bırakılacak yabancı komut tuşları -CommandsToDisableForeignKeysForImportWarning=SQL dökümünü daha sonra geri yükleyebilmeyi isterseniz zorunludur -ExportCompatibility=Oluşturulan verme dosyasının uyumluluğu -MySqlExportParameters=MySQL verme parametreleri -PostgreSqlExportParameters= PostgreSQL dışaaktarım parametreleri +CommandsToDisableForeignKeysForImportWarning=SQL dökümünü daha sonra geri yükleyebilmek isterseniz zorunludur +ExportCompatibility=Oluşturulan dışaaktarma dosyasının uyumluluğu +MySqlExportParameters=MySQL dışaaktarma parametreleri +PostgreSqlExportParameters= PostgreSQL dışaaktarma parametreleri UseTransactionnalMode=İşlem modunu kullanın -FullPathToMysqldumpCommand=mysqldump komutu için tam yol -FullPathToPostgreSQLdumpCommand=pg_dump komutunun tam yolu -ExportOptions=Verme seçenekleri +FullPathToMysqldumpCommand=mysqldump Komutunun için tam yol +FullPathToPostgreSQLdumpCommand=pg_dump Komutunun tam yolu +ExportOptions=Dışaaktarma seçenekleri AddDropDatabase=DROP VERİTABANI komutu ekle AddDropTable=DROP TABLOSU komutu ekle ExportStructure=Yapısı -Datas=Veriler +Datas=Veri NameColumn=Sütunları adlandır ExtendedInsert=Genişletilmiş ARAYAEKLE NoLockBeforeInsert=ARAYAEKLE yanında kilitle komutu olmaz @@ -197,7 +199,7 @@ IgnoreDuplicateRecords=Çifte kayıt hatalarını gözardı et (GÖZARDI ET EKLE Yes=Evet No=Hayır AutoDetectLang=Otoalgıla (tarayıcı dili) -FeatureDisabledInDemo=Demoda özellik devre dışıdır +FeatureDisabledInDemo=Özellik demoda devre dışıdır Rights=İzinler BoxesDesc=Kutular, bazı pencerelerde bilgi parçaları gösteren ekran alanlarıdır. Kutunun gösterilmesi ya da gösterilmemesi arasında seçim yapmak için hedef sayfayı seçerek ‘Etkinleştir’ e tıklayın veya çöpkutusuna tıklayarak devre dışı bırakın. OnlyActiveElementsAreShown=Yalnızca etkinleştirilmiş modüllerin öğeleri gösterilmiştir. @@ -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=İstek üzerine modül ve özellik yapan/geliştiren bazı firmaların listesi. (Not: Açık kaynak kullanan PHP bilen herhangi bir firma size özel geliştirme hizmetleri sağlayabilir) WebSiteDesc=Daha çok modül arayabileceğiniz Web sitesi sağlayıcıları... URL=Bağlantı BoxesAvailable=Kutular mevcut @@ -320,11 +323,11 @@ 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ışı -ModuleDisabledSoNoEvent=Modül engellenmiş olduğundan olay asla oluşturulmaz +ModuleDisabledSoNoEvent=Modül engellenmiş olduğundan etkinlik asla oluşturulmaz ConfirmPurge=Bu temizleme işlemini çalıştırmak istediğinizden emin misiniz?
    Bu işlem tüm veri dosyalarınızı bir daha geri alınamayacak şekilde tamamen silecektir (ECM dosyaları, ekli dosyalar…). MinLength=Enaz uzunluk LanguageFilesCachedIntoShmopSharedMemory=.lang dosyaları paylaşılan hafızaya yüklendi. @@ -356,7 +359,7 @@ HideRefOnPDF=Oluşturulan PDF te ürün ref. ini gizle HideDetailsOnPDF=Oluşturulan PDF te ürün satır ayrıntılarını gizle Library=Kütüphane UrlGenerationParameters=URL güvenliği için parametreler -SecurityTokenIsUnique=Her URL için eşsiz bir güvenlik anahtarı kullan +SecurityTokenIsUnique=Her URL için benzersiz bir güvenlik anahtarı kullan EnterRefToBuildUrl=Nesen %s için hata referansı GetSecuredUrl=Hesaplanan URL al ButtonHideUnauthorized=Yetkisiz işlemler için düğmeleri engelli göstermek yerine gizleHide buttons for unauthorized actions instead of showing disabled buttons @@ -369,7 +372,7 @@ TextLong=Uzun metin Int=Tam sayı Float=Kayan DateAndTime=Tarih ve saat -Unique=Eşsiz +Unique=Benzersiz Boolean=Matıksal (Onay kutusu) ExtrafieldPhone = Telefon ExtrafieldPrice = Fiyat @@ -412,7 +415,7 @@ Module1Desc=Firma ve kişi yönetimi (müşteriler, adaylar…) Module2Name=Ticaret Module2Desc=Ticaret yönetimi Module10Name=Muhasebe -Module10Desc=Basit muhasebe yönetimi (fatura ve ödeme yapma) +Module10Desc=Veritabanı içeriğine bağlı basit muhasebe raporları (günlükler, ciro). Gönderilmez. Module20Name=Teklifler Module20Desc=Teklif yönetimi Module22Name=Toplu E-postalar @@ -437,14 +440,14 @@ Module52Name=Stoklar Module52Desc=Stok yönetimi (ürünler) Module53Name=Hizmetler Module53Desc=Hizmet yönetimi -Module54Name=Sözleşmeler -Module54Desc=Sözleşme ve hizmet yönetimi +Module54Name=Sözleşmeler/Abonelikler +Module54Desc=Sözleşmelerin yönetimi (hizmetler ya da yinelenen abonelikler) Module55Name=Barkodlar Module55Desc=Barkod yönetimi Module56Name=Telefon Module56Desc=Telefon entegrasyonu Module57Name=Ödeme talimatları -Module57Desc=Ödeme talimatları ve para çekme yönetimi +Module57Desc=Ödeme talimatları ve para çekme yönetimi. Aynı zamanda Avrupa ülkeleri için SEPA belgelerinin oluşturulmasını da içerir. 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=Projeler -Module400Desc=Diğer modüller içerisinden proje yönetimi +Module400Name=Projeler/Fırsatlar/Adaylar +Module400Desc=Projlerin, fırsatların ve adayların yönetimi. Daha sonra bir projeye herhangi bir unsur (fatura, sipariş, teklif, müdahale, ...) atayabilirsiniz ve proje görünümünde bir çapraz bir görünüm elde edebilirsiniz. Module410Name=Web Takvimi Module410Desc=WebT akvimi entegrasyonu Module500Name=Özel giderler (vergi, sosyal katkı payları, temettüler) @@ -495,14 +498,18 @@ 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 -Module2400Desc=Eylemler/görevler ve gündem yönetimi +Module2400Desc=Etkinlikler/görevler ve gündem yönetimi 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=Sözleşme oku -Permission162=Sözleşme oluştur/değiştir -Permission163=Bir sözleşme hizmetini etkinleştir -Permission164=Bir sözleşme hizmetini engelle -Permission165=Sözleşme sil +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=Sözleşmeye hizmet ata +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=Stok oluştur/değiştir -Permission1003=Stok sil +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 @@ -734,12 +741,12 @@ Permission23001 = Planlı görev oku Permission23002 = Planlı görev oluştur/güncelle Permission23003 = Planlı görev sil Permission23004 = Planlı görev yürüt -Permission2401=Onun hesabına bağlı eylemleri (olayları veya görevleri) oku -Permission2402=Onun hesabına bağlı eylemler (olaylar veya görevler) oluştur/değiştir -Permission2403=Onun hesabına bağlı eylemleri (olayları veya görevleri)sil -Permission2411=Başkalarının eylemlerini (olaylarını veya görevlerini) oku -Permission2412=Başkalarının eylemlerini (olaylarını veya görevlerini) oluştur/değiştir -Permission2413=Başkalarının eylemlerini (olaylarını veya görevlerini) sil +Permission2401=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) oku +Permission2402=Onun hesabına bağlı eylemler (etkinlikler veya görevler) oluştur/değiştir +Permission2403=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) sil +Permission2411=Başkalarının eylemlerini (etkinliklerini veya görevlerini) oku +Permission2412=Başkalarının eylemlerini (etkinliklerini veya görevlerini) oluştur/değiştir +Permission2413=Başkalarının eylemlerini (etkinliklerini veya görevlerini) sil Permission2501=Belge oku/indir Permission2502=Belge indir Permission2503=Belge gönder ya da sil @@ -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=Html5 i etkinleştir (Geliştirme - Yalnızca Eldy şablonunda mevcut) SystemSuccessfulyUpdated=Sisteminiz başarıyla güncellendi CompanyInfo=Firma/dernek bilgileri CompanyIds=Firma/dernek kimlikleri @@ -911,7 +920,7 @@ DelayBeforeWarning=Uyarıdan öncesi süre DelaysBeforeWarning=Uyarı öncesi süreler DelaysOfToleranceBeforeWarning=Uyarı öncesi süre toleransları DelaysOfToleranceDesc=Bu ekran, ekranda %s resmi ile bir uyarı bildirilmeden önce tolere edilebilecek süreleri tanımlamanızı sağlar. -Delays_MAIN_DELAY_ACTIONS_TODO=Henüz gerçekleşmemiş planlı eylemler için uyarı yapılmadan önceki süre toleransı (gün olarak). +Delays_MAIN_DELAY_ACTIONS_TODO=Henüz gerçekleşmemiş planlı etkinlikler için uyarı yapılmadan önceki süre toleransı (gün olarak). Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Henüz işleme konulmamış siparişler öncesi uyarı yapılmadan önceki süre toleransı (gün olarak). Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Henüz işleme konulmamış müşteri siparişleri öncesi uyarı yapılmadan önceki süre toleransı (gün olarak). Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Henüz kapatılmamış teklifler öncesi uyarı yapılmadan önceki süre toleransı (gün olarak). @@ -923,13 +932,13 @@ Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Ödenmemiş müşteri faturaları uyar Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Bekleyen banka uzlaşmaları uyarısı öncesi süre toleransı (gün olarak) Delays_MAIN_DELAY_MEMBERS=Gecikmiş üyelik ücreti uyarısı öncesi süre toleransı (gün olarak) Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Çek ödemesi uyarısı öncesi süre tolerans (gün olarak) -SetupDescription1=Dolibarr’ı kullanmaya başlamadan önce kurulumunun yapılması gereken bütün parametreler ayarlar alanındadır. -SetupDescription2=2 en önemli ayarlama adımları sol ayarlar menüsündeki ilk 2 adımdır, bu demektir ki Firma/dernek ayarla sayfası ve Modül kurulum sayfası: +SetupDescription1=Kullanmaya başlamadan önce Dolibarr'ı kurmanızı sağlayacak bütün parametreler ayarlar alanındadır. +SetupDescription2=En önemli 2 ayarlama adımı sol ayarlar menüsündeki ilk 2 adımdır, bu demektir ki Firma/dernek ayarlar sayfası ve Modül kurulumu sayfası: SetupDescription3=Ayarlar->Firma/dernek menüsündeki parametreler gereklidir, çünkü giriş bilgileri Dolibarr ekranlarında ve Dolibarr’ın davranışlarını değiştirmek üzere kullanılır (örneğin ülkenizle ilgili özellikler). SetupDescription4=Ayarlar->Modüller menüsündeki parametreler gereklidir, çünkü Dolibarr sabit bir ERP/CRM olmayıp bir çok modülden oluşan, daha çoğuna ya da daha azına bağımlıdır. Ancak istediğiniz modülleri etkinleştirdikten sonra özellikleri menülerde görebilirsiniz. SetupDescription5=Diğer menü girişleri ile isteğe bağlı parametreleri yönetebilirsiniz. -EventsSetup=Eylem günlükleri kurulumu -LogEvents=Güvenlik denetimi eylemleri +EventsSetup=Etkinlik günlükleri kurulumu +LogEvents=Güvenlik denetimi etkinlikleri Audit=Denetim InfoDolibarr=Dolibarr bilgileri InfoBrowser=Tarayıcı bilgileri @@ -940,10 +949,10 @@ InfoPHP=PHP bilgileri InfoPerf=Bilgi performansları BrowserName=Tarayıcı adı BrowserOS=Tarayıcı OS -ListEvents=Denetim eylemleri -ListOfSecurityEvents=Dolibarr güvenlik eylemleri listesi -SecurityEventsPurged=Güvenlik eylemleri temizlendi -LogEventDesc=Burada Dolibarr güvenlik eylemleri için günlük etkinleştirebilirsiniz. Yöneticiler sonra Sistem araçları->Denetim menüsünden içeriği görebilir. Uyarı, bu özellik veritabanında büyük miktarda veri tüketebilir. +ListEvents=Denetim etkinlikler +ListOfSecurityEvents=Dolibarr güvenlik etkinlikleri listesi +SecurityEventsPurged=Güvenlik etkinlikleri temizlendi +LogEventDesc=Burada Dolibarr güvenlik etkinlikleri için günlük etkinleştirebilirsiniz. Yöneticiler sonra Sistem araçları->Denetim menüsünden içeriği görebilir. Uyarı, bu özellik veritabanında büyük miktarda veri tüketebilir. AreaForAdminOnly=Bu özellikler yalnız yönetici kullanıcılar tarafından kullanılabilir. SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir. SystemAreaForAdminOnly=Bu alan yalnız yönetici kullanıcılar için kullanılabilir. Hiçbir Dolibarr izini bu sınırı azaltamaz. @@ -954,7 +963,7 @@ ToActivateModule=Modülleri etkinleştirmek için, ayarlar alanına gidin (Giri SessionTimeOut=Oturum için zaman aşımı SessionExplanation=Bu sayı oturumun bu gecikmeden önce asla sona ermeyeceğini garanti eder. Ama PHP oturum yönetimi, oturumun her zaman bu gecikmeden sonra sona ereceğini garanti etmez: Bu önbellek temizleme oturumu çalışıyor ise meydana gelir.
    Not: hiçbir belirli sistem ile iç PHP süreci her %s erişiminde oturumu temizlemeyecektir ancak erişim diğer oturumlar tarafından yapılan yapılırsa temizlenir. TriggersAvailable=Mevcut tetikleyiciler -TriggersDesc=Tetikleyiciler htdocs/core/triggers dizinine kopyalandığında Dolibarr’ın iş akışının davranışlarını değiştirecek dosyalardır. Dolibarr eylemlerinde etkinleştirilen (yeni firma oluşturma, fatura doğrulaması,…) yeni eylemleri gerçekleştirir. +TriggersDesc=Tetikleyiciler htdocs/core/triggers dizinine kopyalandığında Dolibarr’ın iş akışının davranışlarını değiştirecek dosyalardır. Dolibarr etkinliklerinde etkinleştirilen (yeni firma oluşturma, fatura doğrulaması,…) yeni eylemleri gerçekleştirir. TriggerDisabledByName=Bu dosyadaki tetikleyiciler adlarındaki -NORUN soneki tarafından devre dışı bırakılır. TriggerDisabledAsModuleDisabled=Bu dosyadaki tetikleyiciler %s modülü devre dışı bırakıldığında devre dışı kalır. TriggerAlwaysActive=Bu dosyadaki tetikleyiciler, etkin Dolibarr modülleri ne olursa olsun her zaman etkindir. @@ -974,8 +983,8 @@ MAIN_ROUNDING_RULE_TOT= Yuvarlama aralığı Boyutu (nadir ülkelerde 10 tabanı UnitPriceOfProduct=Bir ürünün net birim fiyatı TotalPriceAfterRounding=Yuvarlama sonrası toplam fiyat (net/KDV/vergi dahil) ParameterActiveForNextInputOnly=Yalnız sonraki giriş için etkili Parametre -NoEventOrNoAuditSetup=Hiçbir güvenlik eylemi henüz kaydedilmedi. Eğer “kurulum - güvenlik – denetim” sayfasında denetim etkinleştirilmemiş ise bu normal olabilir. -NoEventFoundWithCriteria=Bu arama kriteri için herhangi bir güvenlik eylemi bulunamadı. +NoEventOrNoAuditSetup=Hiçbir güvenlik etkinliği henüz kaydedilmedi. Eğer “kurulum - güvenlik – denetim” sayfasında denetim etkinleştirilmemiş ise bu normal olabilir. +NoEventFoundWithCriteria=Bu arama kriteri için herhangi bir güvenlik etkinliği bulunamadı. SeeLocalSendMailSetup=Yerel postagönder kurulumunuza bakın BackupDesc=Tam bir Dolibarr yedeklemesi için şunları yapmalısınız: BackupDesc2=* Gönderilen ve oluşturulan dosyaları içeren (%s) belge dizinin içeriğini kaydedin(örneğin bir zip dosyası yapabilirsiniz). @@ -985,23 +994,23 @@ 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 ShowProfIdInAddress=Belgelerde uzmanlık kimliğini adresleri ile birlikte göster ShowVATIntaInAddress=Belgelerde adresli KDV Intra numaralarını gizle TranslationUncomplete=Kısmi çeviri -SomeTranslationAreUncomplete=Bazı diller kısmi olarak çevrilebilir ya da hatalar içeriyor olabilir. Eğer bazılarını belirlerseniz, dil dosyalarını buraya kayıt ederek düzeltebilirsiniz http://transifex.com/projects/p/dolibarr/. +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) @@ -1039,7 +1048,6 @@ YesInSummer=Yazın evet OnlyFollowingModulesAreOpenedToExternalUsers=Not, yalnızca aşağıdaki modüller dış kullanıcılara açıktır (bu tür kullanıcıların izinleri ne olursa olsun): SuhosinSessionEncrypt=Oturum depolaması Suhosin tarafından şifrelendi ConditionIsCurrently=Koşul şu anda %s durumunda -TestNotPossibleWithCurrentBrowsers=\t\nOtomatik algılama olası değil YouUseBestDriver=Kullandığınız sürücü %s şu anda en iyi sürücüdür. YouDoNotUseBestDriver=Kullandığınız %s sürücüsüdür, %s sürücüsü önerilir. NbOfProductIsLowerThanNoPb=Veritabanında yalnızca %s ürün/hizmet var. Bu, herhangi bir optimizasyon gerektirmez. @@ -1064,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 ##### @@ -1139,6 +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=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=Sözleşme modülü kurulumu +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=\t\nOtomatik algılama olası değil +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 @@ -1373,7 +1382,7 @@ GenbarcodeLocation=Bar kod oluşturma komut satırı aracı (phpbarcode motoru t BarcodeInternalEngine=İç motor BarCodeNumberManager=Barkod sayılarını otomatik olarak tanımlayacak yönetici ##### Prelevements ##### -WithdrawalsSetup=Çekme modülü kurulumu +WithdrawalsSetup=Para çekme modülü kurulumu ##### ExternalRSS ##### ExternalRSSSetup=Dışardan RSS alma kurulumu NewRSS=Yeni RSS beslemesi @@ -1415,8 +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=Yapılandırma modülü stoğu -UserWarehouse=Kullanıcı personel stoğu kullan +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 @@ -1469,9 +1479,9 @@ AccountancyCode=Muhasebe Kodu AccountancyCodeSell=Satış hesap. kodu AccountancyCodeBuy=Alış hesap. kodu ##### Agenda ##### -AgendaSetup=Eylem ve gündem modülü kurulumu -PasswordTogetVCalExport=Verme bağlantısı yetki anahtarı -PastDelayVCalExport=Daha büyük eylemi dışaaktarma +AgendaSetup=Etkinlik ve gündem modülü kurulumu +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 AGENDA_DEFAULT_FILTER_STATUS=Gündem görünümü arama süzgeçinde, etkinlikler için otomatik olarak bu durum türünü ayarlar @@ -1481,11 +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=Satışlar için kullanılan genel bir üçüncü parti +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 -CashDeskIdWareHouse=Satışlar için kullanılan depo +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. @@ -1539,6 +1552,13 @@ ConfirmDeleteFiscalYear=Bu mali yılın silmek istediğinizden emin misiniz? Opened=Açık Closed=Kapalı AlwaysEditable=Her zaman düzenlenebilir - +MAIN_APPLICATION_TITLE=Uygulamanın görünür adına zorla (uyarı: burada kendi adınızı ayarlamanız, DoliDoid mobil uygulamasını kullanırken, kullanıcı adını oto doldur özelliğini durdurabilir) +NbMajMin=Enaz sayıdaki büyük harf karakteri +NbNumMin=Enaz sayıdaki sayısal karakterler +NbSpeMin=Enaz sayıdaki özel karakterler +NbIteConsecutive=Ençok sayıdaki tekrarlanan aynı karakter +NoAmbiCaracAutoGeneration=Otomatik oluşturma için belirsiz karakter ("1","l","i","|","0","O") kullanmayın +SalariesSetup=Ücretler Modülü Ayarları +SortOrder=Sıralama düzeni Format=Biçim TypePaymentDesc=0:Müşteri ödeme türü, 1:Tedarikçi ödeme türü, 2:Hem müşteri hem de tedarikçi ödeme türü diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang index 93514fcc242..6ba800e4820 100644 --- a/htdocs/langs/tr_TR/agenda.lang +++ b/htdocs/langs/tr_TR/agenda.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - agenda IdAgenda=Etkinlik kimliği -Actions=Eylemler -ActionsArea=Eylem alanı (Olaylar ve görevler) +Actions=Etkinlikler +ActionsArea=Etkinlik alanı (Olaylar ve görevler) Agenda=Gündem Agendas=Gündemler Calendar=Takvim @@ -18,19 +18,20 @@ OtherEvents=Diğer etkinlikler ListOfActions=Etkinlik listesi Location=Konum EventOnFullDay=Tam gün etkinliği -SearchAnAction= Bir eylem/görev ara -MenuToDoActions=Tüm sonlanmayan eylemler -MenuDoneActions=Tüm sonlanan eylemler -MenuToDoMyActions=Sonlanmayan eylemlerim -MenuDoneMyActions=Sonlanan eylemlerim +SearchAnAction= Bir etkinlik/görev ara +MenuToDoActions=Tüm sonlanmayan etkinlikler +MenuDoneActions=Tüm sonlanan etkinlikler +MenuToDoMyActions=Sonlanmayan etkinliklerim +MenuDoneMyActions=Sonlanan etkinliklerim ListOfEvents=Etkinlik listesi (iç takvim) -ActionsAskedBy=Eylemi bildiren -ActionsToDoBy=Eylemden etkilenen -ActionsDoneBy=Eylemi yapan -ActionsForUser=Kullanıcı eylemleri -ActionsForUsersGroup=Grupun tüm üyelerine ait eylemler -AllMyActions= Tüm eylemlerim/görevlerim -AllActions= Tüm eylemler/görevler +ActionsAskedBy=Etkinliği bildiren +ActionsToDoBy=Etkinlikten etkilenen +ActionsDoneBy=Etkinliği yapan +ActionsForUser=Kullanıcı etkinlikleri +ActionsForUsersGroup=Grupun tüm üyelerine ait etkinlikler +ActionAssignedTo=Etkinlik için görevlendirilen +AllMyActions= Tüm etkinliklerim/görevlerim +AllActions= Tüm etkinlikler/görevler ViewList=Liste görünümü ViewCal=Ay görünümü ViewDay=Gün görünümü @@ -38,12 +39,13 @@ ViewWeek=Hafta görünümü ViewPerUser=Kullanıcı görünümü başına ViewWithPredefinedFilters= Öntanımlı süzgeçler ile görünüm AutoActions= Gündemin otomatik doldurulması -AgendaAutoActionDesc= Burada Dolibarr'ın otomatik olarak gündemde oluşturmasını istediğiniz olayları tanımlayın. İşaretli bir şey yoksa (varsayılan olarak) sadece el ile girilen eylemler gündeme dahil edilecektir. -AgendaSetupOtherDesc= Bu sayfa Dolibarr eylemlerinin dış bir takvime aktarılması için seçenekler sağlar. (thunderbird, google calendar, ...) +AgendaAutoActionDesc= Burada Dolibarr'ın otomatik olarak gündemde oluşturmasını istediğiniz etkinlikleri tanımlayın. İşaretli bir şey yoksa (varsayılan olarak) sadece el ile girilen etkinlikler gündeme dahil edilecektir. +AgendaSetupOtherDesc= Bu sayfa Dolibarr etkinliklerinin dış bir takvime aktarılması için seçenekler sağlar. (thunderbird, google calendar, ...) AgendaExtSitesDesc=Bu sayfa takvimlerin dış kaynaklarında Dolibarr gündemindeki etkinliklerinin görünmesini sağlar. -ActionsEvents= Dolibarr'ın otomatik olarak gündemde bir etkinlik oluşturacağı eylemler -PropalValidatedInDolibarr= %s Teklifi doğrulandı -InvoiceValidatedInDolibarr= %s Faturası doğrulandı +ActionsEvents=Dolibarr'ın otomatik olarak gündemde bir etkinlik oluşturacağı eylemler +PropalValidatedInDolibarr=%s Teklifi doğrulandı +InvoiceValidatedInDolibarr=%s Faturası doğrulandı +InvoiceValidatedInDolibarrFromPos=POS tan doğrulanan fatura %s InvoiceBackToDraftInDolibarr=%s Faturasını taslak durumuna geri götür InvoiceDeleteDolibarr=%s faturası silindi OrderValidatedInDolibarr= %s Siparişi doğrulandı @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=%s Siparişi onayladı OrderRefusedInDolibarr=Reddedilen teklif %s OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür OrderCanceledInDolibarr=%s Siparişi iptal edildi -InterventionValidatedInDolibarr=%s Müdahalesi doğrulandı ProposalSentByEMail=%s Teklifi Eposta ile gönderildi OrderSentByEMail=%s Müşteri siparişi Eposta ile gönderildi InvoiceSentByEMail=%s Müşteri faturası Eposta ile gönderildi @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=%s Tedarikçi siparişi Eposta ile gönderildi SupplierInvoiceSentByEMail=%s Tedarikçi faturası Eposta ile gönderildi ShippingSentByEMail=%s Sevkiyatı Eposta ile gönderildi ShippingValidated= Nakliyat %s doğrulandı -InterventionSentByEMail=%s Müdahalesi Eposta ile gönderildi -InterventionClassifiedBilled=Müdahale %s Faturalandı olarak sınıflandırıldı NewCompanyToDolibarr= Üçüncü parti oluşturuldu DateActionPlannedStart= Planlanan başlangıç tarihi DateActionPlannedEnd= Planlanan bitiş tarihi @@ -69,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 @@ -80,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 47682da9ab2..643815b8abe 100644 --- a/htdocs/langs/tr_TR/bills.lang +++ b/htdocs/langs/tr_TR/bills.lang @@ -137,8 +137,6 @@ BillFrom=Kimden BillTo=Kime ActionsOnBill=Fatura üzerindeki eylemler NewBill=Yeni fatura -Prélèvements=Ödeme talimatı -Prélèvements=Ödeme talimatı LastBills=Son %s fatura LastCustomersBills=Son %s müşteri faturası LastSuppliersBills=Son %s tedarikçi faturası @@ -219,8 +217,7 @@ NoInvoice=Fatura yok ClassifyBill=Fatura sınıflandır SupplierBillsToPay=Ödenecek tedarikçi faturaları CustomerBillsUnpaid=Ödenmemiş müşteri faturaları -DispenseMontantLettres=Mekanografik olarak tasarlanan fatura harf sırasının dışında tutulur -DispenseMontantLettres=Mekanografik olarak tasarlanan fatura harf sırasının dışında tutulur +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/categories.lang b/htdocs/langs/tr_TR/categories.lang index 1a4a2cce4e5..e440ab7c4f4 100644 --- a/htdocs/langs/tr_TR/categories.lang +++ b/htdocs/langs/tr_TR/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Tedarikçiler ve kategoriler arasındaki bağlantılar CatCusLinks=Müşteriler/adaylar ve kategoriler arasındaki bağlantılar CatProdLinks=Ürünler/hizmetler ve kategoriler arasındaki bağlantılar CatMemberLinks=Üyeler ve kategoriler arasındaki bağlantılar -CatProdLinks=Ürünler/hizmetler ve kategoriler arasındaki bağlantılar -CatCusLinks=Müşteriler/adaylar ve kategoriler arasındaki bağlantılar -CatSupLinks=Tedarikçiler ve kategoriler arasındaki bağlantılar DeleteFromCat=Kategoriden kaldır DeletePicture=Resim silindi ConfirmDeletePicture=Resim silmeyi onayla @@ -112,3 +109,4 @@ CategoriesSetup=Kategori ayarları CategorieRecursiv=Ana kategoriyle otomatik bağlantılı CategorieRecursivHelp=Etkinse, ürün bir alt kategoriye eklenirken aynı zamanda ana kategoriye de eklenecektir AddProductServiceIntoCategory=Aşağıdaki ürünü/hizmeti ekle +ShowCategory=Kategori göster 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 7101f169e35..20a21a9f512 100644 --- a/htdocs/langs/tr_TR/compta.lang +++ b/htdocs/langs/tr_TR/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=%s için hatalı müşteri muhasebe kodu SuppliersProductsSellSalesTurnover=Tedarikçi ürünlerinin satışından oluşan ciro. CheckReceipt=Çek hesabı CheckReceiptShort=Çek hesabı +LastCheckReceiptShort=Son %s çek makbuzu NewCheckReceipt=Yeni indirim NewCheckDeposit=Yeni çek hesabı NewCheckDepositOn=Bu hesap için makbuz oluştur: %s @@ -196,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 fcc10813061..69cb8b4606c 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 -LastContracts=Değiştirilen son %s sözleşme +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 @@ -28,7 +28,7 @@ MenuExpiredServices=Süresi dolmuş hizmetler MenuClosedServices=Kapalı hizmetler NewContract=Yeni sözleşme AddContract=Sözleşme oluştur -SearchAContract=Bir sözleşme ara +SearchAContract=Sözleşme ara DeleteAContract=Bir sözleşme sil CloseAContract=Bir sözleşme kapat ConfirmDeleteAContract=Bu sözleşme ve bütün hizmetlerini silmek istediğinize emin misiniz? @@ -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=Değiştirilen son %s sözleşme +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=Yalnızca "Hizmet" türündeki satırlar klonlanacaktır. ##### 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 0a6fe0bcc53..2e5755e83e9 100644 --- a/htdocs/langs/tr_TR/cron.lang +++ b/htdocs/langs/tr_TR/cron.lang @@ -18,9 +18,8 @@ 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= Etkin işler listesi -CronListInactive= Etkin olmayan işler listesi -CronListActive= Etkin işler listesi +CronListActive=Etkin/programlı işler listesi +CronListInactive=Etkin olmayan işler listesi # Page list CronDateLastRun=Son çalıştırma CronLastOutput=Son çalıştırma çıktısı diff --git a/htdocs/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang index 0740b8dcd07..234a7e4c859 100644 --- a/htdocs/langs/tr_TR/donations.lang +++ b/htdocs/langs/tr_TR/donations.lang @@ -31,3 +31,8 @@ DonationRecipient=Bağış alıcısı ThankYou=Teşekkürler IConfirmDonationReception=Alıcı, bağış olarak aşağıdaki tutarı aldığını belirtir MinimumAmount=Enaz miktar %s +FreeTextOnDonations=Sayfa altında gösterilecek serbest metin +FrenchOptions=Fransa için seçenekler +DONATION_ART200=Eğer ilgileniyorsanız CGI den 200 öğe göster +DONATION_ART238=Eğer ilgileniyorsanız CGI den 238 öğe göster +DONATION_ART885=Show article 885 from CGI if you are concerned 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/externalsite.lang b/htdocs/langs/tr_TR/externalsite.lang index 26f99f18a75..9fa0dc6fbab 100644 --- a/htdocs/langs/tr_TR/externalsite.lang +++ b/htdocs/langs/tr_TR/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Dış Web Sitesi ayarları ExternalSiteURL=Dış Web Sitesi URL si ExternalSiteModuleNotComplete=Dış Web Sitesi modülü doğru yapılandırılmamış. +ExampleMyMenuEntry=Menüme giriş diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang index 0d918690ab6..7dbeba5d859 100644 --- a/htdocs/langs/tr_TR/holiday.lang +++ b/htdocs/langs/tr_TR/holiday.lang @@ -48,7 +48,6 @@ ConfirmDeleteCP=Bu izin isteğinin silinmesini onaylıyor musunuz? ErrorCantDeleteCP=Hata, bu izin isteğini silmek için yetkiniz yok. CantCreateCP=İzin isteği yapmak için yetkiniz yok. InvalidValidatorCP=İzin isteğiniz için bir onaylayıcı seçmelisiniz. -UpdateButtonCP=Güncelle CantUpdate=Bu izin isteğini güncelleyemezsiniz. NoDateDebut=Bir başlama tarihi seçmelisiniz. NoDateFin=Bir bitiş tarihi seçmelisiniz. @@ -112,7 +111,7 @@ ValidEventCP=Doğrula UpdateEventCP=Etkinlikleri güncelle CreateEventCP=Oluştur NameEventCP=Etkinlik adı -OkCreateEventCP=The addition of the event went well. +OkCreateEventCP=Etkinlik eklemesi başarılı oldu. ErrorCreateEventCP=Etkinlik oluştururken hata. UpdateEventOkCP=Etkinlik güncellemesi iyi gitti. ErrorUpdateEventCP=Etkinlik güncellenirken hata oluştu. diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang index 3fd1d2086a0..0202aa11bfd 100644 --- a/htdocs/langs/tr_TR/interventions.lang +++ b/htdocs/langs/tr_TR/interventions.lang @@ -3,7 +3,7 @@ Intervention=Müdahale Interventions=Müdahaleler InterventionCard=Müdahale kartı NewIntervention=Yeni müdahale -AddIntervention=Müdahale ekle +AddIntervention=Müdahale oluştur ListOfInterventions=Müdahaleler listesi EditIntervention=Müdahale düzenle ActionsOnFicheInter=Müdahale eylemleri @@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Müdahilin adı ve imzası : NameAndSignatureOfExternalContact=Müşterinin adı ve imzası : DocumentModelStandard=Müdahaleler için standart belge modeli InterventionCardsAndInterventionLines=Müdahalelere ait müdahaleler ve satırları -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +InterventionClassifyBilled=Sınıflandırma "Faturalandı" +InterventionClassifyUnBilled=Sınıflandırma "Faturalanmadı" StatusInterInvoiced=Faturalanmış RelatedInterventions=İlgili müdahaleler ShowIntervention=Müdahale göster SendInterventionRef=%s müdahalesinin sunulması +SendInterventionByMail=Müdahaleyi Eposta ile gönder +InterventionCreatedInDolibarr=Oluşturulan müdahale %s +InterventionValidatedInDolibarr=Doğrulanan müdahale %s +InterventionModifiedInDolibarr=Değiştirilen müdahale %s +InterventionClassifiedBilledInDolibarr=Faturalandı olarak ayarlanan müdahale %s +InterventionClassifiedUnbilledInDolibarr=Faturalanmadı olarak ayarlanan müdahale %s +InterventionSentByEMail=Eposta ile gönderilen müdahale %s +InterventionDeletedInDolibarr=Silinen müdahale %s +SearchAnIntervention=Müdahale ara ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Müdahale izleme temsilcisi TypeContact_fichinter_internal_INTERVENING=Müdahalede diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang index a6086f765c2..128034c94d7 100644 --- a/htdocs/langs/tr_TR/mails.lang +++ b/htdocs/langs/tr_TR/mails.lang @@ -53,7 +53,7 @@ ConfirmValidMailing=Bu epostayı doğrulamak istediğinizden emin misiniz? ConfirmResetMailing=Uyarı, Bu %s Epostasını yeniden başlatarak, bu Epostanın toplu gönderiminin başka bir zaman yapılmasını sağlarsınız. Bunu yapmak istediğinizden emin misiniz? ConfirmDeleteMailing=Bu Epostayı silmek istediğinizden emin misiniz? NbOfRecipients=Alıcı sayısı -NbOfUniqueEMails=Eşsiz e-posta sayısı +NbOfUniqueEMails=Benzersiz eposta sayısı NbOfEMails=Eposta sayısı TotalNbOfDistinctRecipients=Farklı alıcıların sayısı NoTargetYet=Henüz hiç bir alıcı tanımlanmadı (‘Alıcılar’ sekmesine gidin) @@ -106,7 +106,7 @@ MailSelectedRecipients=Seçilen alıcılar MailingArea=Eposta alanı LastMailings=Son %s eposta TargetsStatistics=Hedef istatistikleri -NbOfCompaniesContacts=Şirketlerin eşsiz kişileri +NbOfCompaniesContacts=Benzersiz kişiler/adresler MailNoChangePossible=Doğrulanmış epostaların alıcıları değiştirilemez SearchAMailing=Eposta ara SendMailing=E-posta gönder @@ -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=Not: Epostaların çevrimiçi gönderimi güvenlik ve süre aşımı nedenleriyle gönderme oturumu tarafından %s kadar alıcıyla sınırlandırılmıştır. +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 @@ -130,9 +130,12 @@ TagSignature=Gönderen kullanıcı imzası TagMailtoEmail=Alıcı epostası # Module Notifications Notifications=Bildirimler -NoNotificationsWillBeSent=Bu eylem ve firma için hiçbir Eposta bildirimi planlanmamış +NoNotificationsWillBeSent=Bu etkinlik ve firma için hiçbir Eposta bildirimi planlanmamış ANotificationsWillBeSent=Eposta ile 1 bildirim gönderilecektir 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=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 87b19cf7d91..d5e3a2636d5 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -7,7 +7,7 @@ DIRECTION=ltr FONTFORPDF=DejaVuSans FONTSIZEFORPDF=8 SeparatorDecimal=, -SeparatorThousand=, +SeparatorThousand=. FormatDateShort=%d/%m/%Y FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy @@ -60,7 +60,7 @@ ErrorNoSocialContributionForSellerCountry=Hata, ülke %s için herhangi bir sosy ErrorFailedToSaveFile=Hata, dosya kaydedilemedi. SetDate=Ayar tarihi SelectDate=Bir tarih seç -SeeAlso=See also %s +SeeAlso=Buna da bakın %s BackgroundColorByDefault=Varsayılan arkaplan rengi FileNotUploaded=Dosya yüklenmemiş FileUploaded=Dosya yüklemesi başarılı @@ -74,7 +74,7 @@ LevelOfFeature=Özellik düzeyleri NotDefined=Tanımlanmamış DefinedAndHasThisValue=Tanımlanmış ve şuna değer atanmıştır IsNotDefined=tanımlanmamış -DolibarrInHttpAuthenticationSoPasswordUseless=Yapılandırma dosyası conf.phpda Dolibarr kimlik doğrulama modu %s a ayarlanmıştır.
    Bu demektir ki; veritabanı parolası Dolibarr dışıdır, yani bu alanı değiştirmek hiçbir etki yaratmaz. +DolibarrInHttpAuthenticationSoPasswordUseless=Yapılandırma dosyası conf.php içinde Dolibarr kimlik doğrulama modu buna %s ayarlanmıştır.
    Bu demektir ki; veritabanı parolası Dolibarr dışıdır, yani bu alanı değiştirmek hiçbir etki yaratmaz. Administrator=Yönetici Undefined=Tanımlanmamış PasswordForgotten=Parolanızı mı unuttunuz? @@ -126,12 +126,12 @@ Disabled=Engelli Add=Ekle AddLink=Bağlantı ekle Update=Güncelle -AddActionToDo=Yapılacak eylem ekle -AddActionDone=Bitmiş eylem ekle +AddActionToDo=Yapılacak etkinlik ekle +AddActionDone=Bitmiş etkinlik ekle Close=Kapat Close2=Kapat Confirm=Onayla -ConfirmSendCardByMail=Gerçekten bu kartı posta ile %s a 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 @@ -349,8 +349,8 @@ RefPayment=Ref. ödeme CommercialProposalsShort=Teklifler Comment=Açıklama Comments=Açıklamalar -ActionsToDo=Yapılacak eylemler -ActionsDone=Biten eylemler +ActionsToDo=Yapılacak etkinlikler +ActionsDone=Biten etkinlikler ActionsToDoShort=Yapılacaklar ActionsRunningshort=Başladı ActionsDoneShort=Yapıldı @@ -363,10 +363,11 @@ CompanyFoundation=Firma/Dernek ContactsForCompany=Bu üçüncü partinin kişileri ContactsAddressesForCompany=Bu üçüncü partinin kişleri/adresleri AddressesForCompany=Bu üçüncü partinin adresleri -ActionsOnCompany=Bu üçüncü parti hakkındaki eylemler -ActionsOnMember=Bu üye hakkındaki eylemler -NActions=%s eylemleri +ActionsOnCompany=Bu üçüncü parti hakkındaki etkinlikler +ActionsOnMember=Bu üye hakkındaki etkinlikler +NActions=%s etkinlikleri NActionsLate=%s son +RequestAlreadyDone=İstek zaten kayıtlı Filter=Süzgeç RemoveFilter=Süzgeç kaldır ChartGenerated=Grafik oluşturuldu @@ -672,7 +673,7 @@ from=itibaren toward=yönünde Access=Erişim HelpCopyToClipboard=Panoya kopyalamak için Crtl+C -SaveUploadedFileWithMask=Dosyayı sunucuya "%s" (aksi durumda "%s") adıyla kaydedin +SaveUploadedFileWithMask=Dosyayı "%s" adlı sunucuya kaydedin (aksi durumda "%s") OriginFileName=Özgün dosya adı SetDemandReason=Kaynağı ayarlayın SetBankAccount=Banka Hesabı Tanımla diff --git a/htdocs/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang index f8b7865faf4..26da20b82a5 100644 --- a/htdocs/langs/tr_TR/margins.lang +++ b/htdocs/langs/tr_TR/margins.lang @@ -41,3 +41,4 @@ AgentContactType=Ticari temsilci ilgili tipi AgentContactTypeDetails=Satış temsilcisine göre oran raporu için kullanılacak kişi türünü (faturala bağlantılı) tanımla rateMustBeNumeric=Oran sayısal bir değer olmalı markRateShouldBeLesserThan100=İşaretli oran 100 den daha düşük olmalı +ShowMarginInfos=Oran bilgisi göster 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 5e2770ce8e7..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=Faturalanacak siparişler +MenuOrdersToBill2=Faturalanabilir siparişler SearchOrder=Sipariş ara SearchACustomerOrder=Müşteri siparişi ara ShipProduct=Ürünü sevket @@ -96,14 +96,14 @@ GenerateBill=Fatura oluştur ClassifyShipped=Teslim edildi sınıflandır ClassifyBilled=Faturalı olarak sınıflandır ComptaCard=Muhasebe kartı -DraftOrders=Taslak sipariş +DraftOrders=Taslak siparişler RelatedOrders=İlgili siparişler OnProcessOrders=İşlemdeki siparişler RefOrder=Sipariş ref. RefCustomerOrder=Müşteri sipariş ref. RefCustomerOrderShort=Müşt. Sipariş ref. SendOrderByMail=Siparişi postayla gönder -ActionsOnOrder=Sipariş eylemleri +ActionsOnOrder=Sipariş etkinlikleri NoArticleOfTypeProduct='ürün' türünde herhangi bir madde olmadığından bu sipariş için sevkedilebilir madde yok OrderMode=Sipariş yöntemi AuthorRequest=Siparişi yazan @@ -154,7 +154,6 @@ OrderByPhone=Telefon CreateInvoiceForThisCustomer=Sipariş Faturala NoOrdersToInvoice=Faturalanabilir sipariş yok CloseProcessedOrdersAutomatically=Seçilen tüm siparişleri "İşlendi" olarak sınıflandır. -MenuOrdersToBill2=Faturalanacak siparişler OrderCreation=Sipariş oluşturma Ordered=Sipariş verildi OrderCreated=Siparişleriniz oluşturulmuştur diff --git a/htdocs/langs/tr_TR/oscommerce.lang b/htdocs/langs/tr_TR/oscommerce.lang deleted file mode 100644 index a4a6a26a390..00000000000 --- a/htdocs/langs/tr_TR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Ticaret modülü kurulumu -OSCommerceSetupSaved=OS Ticaret kurulumu kaydedildi -OSCommerceServer=OS Ticaret Sunucusu host/ip -OSCommerceDatabaseName=OS Ticaret veritabanı adı -OSCommercePrefix=OS Ticaret tablo öneki -OSCommerceUser=OS Ticaret veritabanı kullanıcı girişi diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang index d0d2a5d3b2c..bb3087d5a36 100644 --- a/htdocs/langs/tr_TR/other.lang +++ b/htdocs/langs/tr_TR/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Güvenlik kodu Calendar=Takvim -AddTrip=Gezi ekle Tools=Araçlar ToolsDesc=Bu alan diğer menü girişlerinde bulunmayan çeşitli araçların gruplandırılmasına ayrılmıştır.

    O araçlara kenardaki menüden ulaşılabilir. Birthday=Doğumgünü @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Proje oluşturma Notify_TASK_CREATE=Görev oluşturuldu Notify_TASK_MODIFY=Görev bilgileri değiştirildi Notify_TASK_DELETE=Görev silindi +SeeModuleSetup=Modül kurulumuna bak NbOfAttachedFiles=Eklenen dosya/belge sayısı TotalSizeOfAttachedFiles=Eklenen dosyaların/belgelerin toplam boyutu MaxSize=Ençok boyut @@ -182,8 +182,8 @@ NewSizeAfterCropping=Kırpmadan sonraki yeni boyut DefineNewAreaToPick=Alınacak görüntü üzerinde yeni alan tanımla (görüntü üzerine sol klikle sonra karşı köşeye ulaşana kadar sürükle) CurrentInformationOnImage=Bu araç bir görüntüyü yeniden boyutlandırmanızı veya kırpmanızı sağlar. Bu, düzenlenmiş güncel görüntünün bilgisidir ImageEditor=Görüntü düzenleyici -YouReceiveMailBecauseOfNotification=Bu mesajı aldınız çünkü epostanız %s e ait %s yazılımında belirli olaylar hakkında bilgilendirilecekler listesine eklenmiştir. -YouReceiveMailBecauseOfNotification2=Bu olay aşağıdadır: +YouReceiveMailBecauseOfNotification=Bu mesajı aldınız çünkü epostanız %s e ait %s yazılımında belirli etkinlikler hakkında bilgilendirilecekler listesine eklenmiştir. +YouReceiveMailBecauseOfNotification2=Bu etkinlik şudur: ThisIsListOfModules=Bu, bu demo profili tarafından önceden seçili modüllerin listesidir (yalnızca en çok kullanılan modüller görünür bu demoda). Daha kişiselleştirilmiş bir demo için bunu düzenleyin ve “Başla” ya tıklayın. ClickHere=Buraya tıkla UseAdvancedPerms=Bazı modüllerin gelişmiş izinlerini kullan @@ -203,25 +203,26 @@ ForgetIfNothing=Bu değiştirmeyi istemediyseniz, bu epostayı unutun. Kimlik bi ##### Calendar common ##### AddCalendarEntry=% Takvimine giriş ekleyin -NewCompanyToDolibarr=%s Firması Dolibarr’a eklenmiştir -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=%s Teklifi Dolibarr’da imzalanmıştır -PropalClosedRefusedInDolibarr=%s Teklifi Dolibarr’da reddedilmiştir -PropalValidatedInDolibarr=%s Teklifi Dolibarr’da doğrulanmıştır -InvoiceValidatedInDolibarr=%s Faturası Dolibarr’da doğrulanmıştır -InvoicePaidInDolibarr=%s Faturası Dolibarr’da ödendi olarak değiştirilmiştir -InvoiceCanceledInDolibarr=%s Faturası Dolibarr’da iptal edilmiştir -PaymentDoneInDolibarr=%s Ödemesi Dolibarr’da yapılmıştır -CustomerPaymentDoneInDolibarr=%s Müşteri ödemesi Dolibarr’da yapılmıştır -SupplierPaymentDoneInDolibarr=%s Tedarikçi ödemesi Dolibarr’da yapılmıştır -MemberValidatedInDolibarr=%s Üyesi Dolibarr’da doğrulanmıştır -MemberResiliatedInDolibarr=%s Üyeliği Dolibarr’da bitirilmiştir -MemberDeletedInDolibarr=%s Üyesi Dolibarr’dan tarafından silinmiştir -MemberSubscriptionAddedInDolibarr=%s Üyesinin aboneliği Dolibarr’a eklenmiştir -ShipmentValidatedInDolibarr=%s Sevkiyatı Dolibarr’da doğrulanmıştır -ShipmentDeletedInDolibarr=%s sevkiyatı Dolibarr üzerinden silindi +NewCompanyToDolibarr=Eklenen firma %s +ContractValidatedInDolibarr=Doğrulanan firma %s +ContractCanceledInDolibarr=İptal edilen sözleşme %s +ContractClosedInDolibarr=Kapatılan sözleşme %s +PropalClosedSignedInDolibarr=İmzalan teklif %s +PropalClosedRefusedInDolibarr=Reddedilen teklif %s +PropalValidatedInDolibarr=Doğrulanan teklif %s +PropalClassifiedBilledInDolibarr=Faturalandı olarak sınıflandırılan teklif %s +InvoiceValidatedInDolibarr=Doğrulanan fatura %s +InvoicePaidInDolibarr=Ödemeye değiştirilen fatura %s +InvoiceCanceledInDolibarr=İptal edilen fatura %s +PaymentDoneInDolibarr=Yapılan ödeme %s +CustomerPaymentDoneInDolibarr=Yapılan müşteri ödemesi %s +SupplierPaymentDoneInDolibarr=Yapılan tedarikçi ödemesi %s +MemberValidatedInDolibarr=Doğrulanan üye %s +MemberResiliatedInDolibarr=Bitirilen üyelik %s +MemberDeletedInDolibarr=Silinen üyelik %s +MemberSubscriptionAddedInDolibarr=Abonelik eklenen üye %s +ShipmentValidatedInDolibarr=Doğrulanan sevkiyat %s +ShipmentDeletedInDolibarr=Silinen sevkiyat %s ##### Export ##### Export=Dışaaktar ExportsArea=Dışaaktar alanı diff --git a/htdocs/langs/tr_TR/paybox.lang b/htdocs/langs/tr_TR/paybox.lang index fc5d30d1a84..4f8e6ac5f3a 100644 --- a/htdocs/langs/tr_TR/paybox.lang +++ b/htdocs/langs/tr_TR/paybox.lang @@ -35,3 +35,6 @@ MessageKO=İptal edilen ödeme sayfası mesajı NewPayboxPaymentReceived=Yeni Paybox ödemesi alındı NewPayboxPaymentFailed=Yeni Paybox ödemesi denendi ama başarısız oldu PAYBOX_PAYONLINE_SENDEMAIL=Ödeme sonrası uyarı Epostası (başarılı ya da başarısız) +PAYBOX_PBX_SITE=PBX SITE için değer +PAYBOX_PBX_RANG=PBX Rang için değer +PAYBOX_PBX_IDENTIFIANT=PBX ID için değer 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/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/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 new file mode 100644 index 00000000000..f593c7e0fe4 --- /dev/null +++ b/htdocs/langs/tr_TR/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Kaynaklar +MenuResourceAdd=Yeni kaynaklar +MenuResourcePlanning=Kaynak planlama +DeleteResource=Kaynak sil +ConfirmDeleteResourceElement=Bu öğe için kaynağı silmeyi onayla +NoResourceInDatabase=Veritabanında kaynak yok +NoResourceLinked=Bağlantılı kaynak yok + +ResourcePageIndex=Kaynak listesi +ResourceSingular=Kaynak +ResourceCard=Kaynak kartı +AddResource=Bir kaynak oluştur +ResourceFormLabel_ref=Kaynak adı +ResourceType=Kaynak türü +ResourceFormLabel_description=Kaynak açıklaması + +ResourcesLinkedToElement=Öğeye bağlantılı kaynaklar + +ShowResourcePlanning=Kaynak planlama göster +GotoDate=Tarihe git + +ResourceElementPage=Öğe kaynağı +ResourceCreatedWithSuccess=Kaynak oluşturma başarılı +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ı +ConfirmDeleteResource=Bu kaynağı silmeyi onayla +RessourceSuccessfullyDeleted=Kaynak silme başarılı +DictionaryResourceType=Kaynak türleri + +SelectResource=Kaynak seç diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang index 3419729b7c3..ea8adf02c7f 100644 --- a/htdocs/langs/tr_TR/sendings.lang +++ b/htdocs/langs/tr_TR/sendings.lang @@ -55,12 +55,14 @@ DateDeliveryPlanned=Planlanan teslim tarihi DateReceived=Teslim alınan tarih SendShippingByEMail=Sevkiyatı EPostayla gönder SendShippingRef=% Nakliyatının yapılması -ActionsOnShipping=Sevkiyat eylemleri +ActionsOnShipping=Sevkiyat etkinlikleri LinkToTrackYourPackage=Paketinizi izleyeceğiniz bağlantı ShipmentCreationIsDoneFromOrder=Şu an için, yeni bir sevkiyatın oluşturulması sipariş kartından yapılmıştır. RelatedShippings=İlgili sevkiyatlar ShipmentLine=Sevkiyat kalemi CarrierList=Taşımacı listesi +SendingRunning=Müşteri siparişindeki ürün zaten gönderildi +SuppliersReceiptRunning=Tedarikçi siparişindeki ürün zaten alındı # Sending methods SendingMethodCATCH=Müşteri tarafından diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang index 967a8a811fb..85a354f5c48 100644 --- a/htdocs/langs/tr_TR/stocks.lang +++ b/htdocs/langs/tr_TR/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Depo etiketi gereklidir CorrectStock=Stok düzelt ListOfWarehouses=Depo listesi ListOfStockMovements=Stok hareketleri listesi -StocksArea=Stok alanı +StocksArea=Depo alanı Location=Konum LocationSummary=Kısa konum adı NumberOfDifferentProducts=Farklı ürün sayısı diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang index 84c9b09f57a..b160e4cc1c7 100644 --- a/htdocs/langs/tr_TR/users.lang +++ b/htdocs/langs/tr_TR/users.lang @@ -63,7 +63,6 @@ ShowGroup=Grubu göster ShowUser=Kullanıcıyı göster NonAffectedUsers=Etkilenmemiş kullanıcılar UserModified=Kullanıcı başarıyla değiştirildi -GroupModified=Grup başarıyla değiştirildi PhotoFile=Fotoğraf dosyası UserWithDolibarrAccess=Dolibarr erişimli kullanıcı ListOfUsersInGroup=Bu gruptaki kullanıcıların listesi @@ -103,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=Grup başarıyla değiştirildi +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 857baa3f521..ce113a437a0 100644 --- a/htdocs/langs/tr_TR/withdrawals.lang +++ b/htdocs/langs/tr_TR/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Makbuz LastWithdrawalReceipts=Son %s para çekme makbuzu WithdrawedBills=Parası çekilmiş faturalar WithdrawalsLines=Para çekme satırları -RequestStandingOrderToTreat=Ödeme talimatları işleme isteği -RequestStandingOrderTreated=Ödeme talimatlarının işlenmesi isteği isteği +RequestStandingOrderToTreat=İşlenecek ödeme talimatı isteği +RequestStandingOrderTreated=İşlenemiş ödeme talimatı isteği +NotPossibleForThisStatusOfWithdrawReceiptORLine=Henüz olası değil. Özel satırlarda reddedildi olarak bildirilmeden önce paraçekme durumu 'alacaklandırıldı' olarak ayarlkanmalıdır. CustomersStandingOrders=Müşteri ödeme talimatları CustomerStandingOrder=Müşteri ödeme talimatı NbOfInvoiceToWithdraw=Para çekme istekli fatura sayısı @@ -40,14 +41,13 @@ TransMetod=Havale yöntemi Send=Gönder Lines=Satırlar StandingOrderReject=Bir ret düzenle -InvoiceRefused=Fatura reddedildi WithdrawalRefused=Para çekme reddedildi WithdrawalRefusedConfirm=Dernek için bir para çekme reddedilme işlemi girmek istediğinizden emin misiniz RefusedData=Ret Tarihi RefusedReason=Ret nedeni RefusedInvoicing=Rettin faturalandırılması NoInvoiceRefused=Reddi borç yazmayın -InvoiceRefused=Fatura reddedildi +InvoiceRefused=Fatura reddedildi (Reddedileni müşterinin hesabına yaz) Status=Durum StatusUnknown=Bilinmeyen StatusWaiting=Bekliyor @@ -76,13 +76,14 @@ WithBankUsingRIB=RIB kullanan banka hesapları için WithBankUsingBANBIC=IBAN/BIC/SWIFT kullanan banka hesapları için BankToReceiveWithdraw=Para çekilecek banka hesabı CreditDate=Alacak tarihi -WithdrawalFileNotCapable=Ülkeniz için para çekme makbuzu dosyası oluşturulamıyor +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=Bu sekme bir ödeme talimatı isteği yapmanızı sağlar. Yaptıktan sonra, ödeme talimatı yönetimi için Banka->Para çekme menüsüne gidin. Ödeme talimatı kapatıldıktan sonra, fatura ödemesi otomatik olarak kaydedilecek ve eğer bakiye sıfırsa fatura kapatılacaktır. 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=Durum satırlarına göre istatistkler ### Notifications InfoCreditSubject=Banka tarafından ödenen %s ödeme talimatı diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/uk_UA/accountancy.lang +++ b/htdocs/langs/uk_UA/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang index d0a47c3bcf5..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 @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Stock management (products) Module53Name=Services Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +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 -Module400Desc=Project management inside other modules +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=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 @@ -606,15 +613,16 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -701,8 +709,8 @@ Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Read stock movements Permission1005=Create/modify stock movements Permission1101=Read delivery orders @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Products module setup ServiceSetup=Services module setup @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang index b279f5aa92c..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 @@ -41,9 +42,10 @@ AutoActions= Automatic filling AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Invoice %s validated +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Order %s validated @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status OrderCanceledInDolibarr=Order %s canceled -InterventionValidatedInDolibarr=Intervention %s validated ProposalSentByEMail=Commercial proposal %s sent by EMail OrderSentByEMail=Customer order %s sent by EMail InvoiceSentByEMail=Customer invoice %s sent by EMail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail ShippingSentByEMail=Shipping %s sent by EMail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sent by EMail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date DateActionPlannedEnd= Planned end date @@ -70,9 +69,9 @@ DateActionStart= Start date DateActionEnd= End date AgendaUrlOptions1=You can also add following parameters to filter output: AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. -AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Show birthday's contacts AgendaHideBirthdayEvents=Hide birthday's contacts Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang index 1edd7213076..81b7515a8b8 100644 --- a/htdocs/langs/uk_UA/bills.lang +++ b/htdocs/langs/uk_UA/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit note InvoiceAvoirAsk=Credit note to correct invoice InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Replace invoice %s ReplacementInvoice=Replacement invoice ReplacedByInvoice=Replaced by invoice %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned' ClassifyClosed=Classify 'Closed' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Create Invoice -AddBill=Add invoice or credit note +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice @@ -99,7 +99,7 @@ DoPaymentBack=Do payment back ConvertToReduc=Convert into future discount EnterPaymentReceivedFromCustomer=Enter payment received from customer EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Amount PriceBase=Price base BillStatus=Invoice status @@ -137,8 +137,6 @@ BillFrom=From BillTo=To ActionsOnBill=Actions on invoice NewBill=New invoice -Prélèvements=Standing order -Prélèvements=Standing order LastBills=Last %s invoices LastCustomersBills=Last %s customers invoices LastSuppliersBills=Last %s suppliers invoices @@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice %s ? ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason @@ -191,9 +189,9 @@ AlreadyPaid=Already paid AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Abandoned -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received @@ -219,19 +217,18 @@ NoInvoice=No invoice ClassifyBill=Classify invoice SupplierBillsToPay=Suppliers invoices to pay CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms SetMode=Set payment mode Billed=Billed -RepeatableInvoice=Pre-defined invoice -RepeatableInvoices=Pre-defined invoices -Repeatable=Pre-defined -Repeatables=Pre-defined -ChangeIntoRepeatableInvoice=Convert into pre-defined -CreateRepeatableInvoice=Create pre-defined invoice -CreateFromRepeatableInvoice=Create from pre-defined invoice +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Customer invoices and payments ExportDataset_invoice_1=Customer invoices list and invoice's lines diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang index ed61bfc08a6..22914931db1 100644 --- a/htdocs/langs/uk_UA/categories.lang +++ b/htdocs/langs/uk_UA/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang index 3929cfde036..878eb49b3c9 100644 --- a/htdocs/langs/uk_UA/compta.lang +++ b/htdocs/langs/uk_UA/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 e5ad112b222..57ba3bb15d8 100644 --- a/htdocs/langs/uk_UA/contracts.lang +++ b/htdocs/langs/uk_UA/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastContracts=Last %s modified contracts +LastModifiedContracts=Last %s modified contracts AllContracts=All contracts ContractCard=Contract card ContractStatus=Contract status @@ -27,7 +27,7 @@ MenuRunningServices=Running services MenuExpiredServices=Expired services MenuClosedServices=Closed services NewContract=New contract -AddContract=Add contract +AddContract=Create contract SearchAContract=Search a contract DeleteAContract=Delete a contract CloseAContract=Close a contract @@ -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 %s modified 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/cron.lang b/htdocs/langs/uk_UA/cron.lang index 768cd012384..195ad43c87c 100644 --- a/htdocs/langs/uk_UA/cron.lang +++ b/htdocs/langs/uk_UA/cron.lang @@ -1,10 +1,8 @@ # Dolibarr language file - Source file is en_US - cron -# # About page About = About CronAbout = About Cron CronAboutPage = Cron about page - # Right Permission23101 = Read Scheduled task Permission23102 = Create/update Scheduled task @@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman 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 jobs -CronListInactive= List of disabled jobs -CronListActive= List of active jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list CronDateLastRun=Last run CronLastOutput=Last run output diff --git a/htdocs/langs/uk_UA/donations.lang b/htdocs/langs/uk_UA/donations.lang index 66ddea95a5c..f7aed91cf81 100644 --- a/htdocs/langs/uk_UA/donations.lang +++ b/htdocs/langs/uk_UA/donations.lang @@ -4,7 +4,7 @@ Donations=Donations DonationRef=Donation ref. Donor=Donor Donors=Donors -AddDonation=Add a donation +AddDonation=Create a donation NewDonation=New donation ShowDonation=Show donation DonationPromise=Gift promise @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/uk_UA/externalsite.lang index 62da68c045d..da4853df0df 100644 --- a/htdocs/langs/uk_UA/externalsite.lang +++ b/htdocs/langs/uk_UA/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Setup link to external website ExternalSiteURL=External Site URL ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang index c25abf6449c..f5b87fefb08 100644 --- a/htdocs/langs/uk_UA/holiday.lang +++ b/htdocs/langs/uk_UA/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Name Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang index 17641a0ab3e..c79da05364e 100644 --- a/htdocs/langs/uk_UA/interventions.lang +++ b/htdocs/langs/uk_UA/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Interventions InterventionCard=Intervention card NewIntervention=New intervention -AddIntervention=Add intervention +AddIntervention=Create intervention ListOfInterventions=List of interventions EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang index 98e6dc335ee..7a211198822 100644 --- a/htdocs/langs/uk_UA/mails.lang +++ b/htdocs/langs/uk_UA/mails.lang @@ -115,7 +115,7 @@ SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -133,6 +133,9 @@ Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang index aedae0c8a6e..120e6bf0544 100644 --- a/htdocs/langs/uk_UA/main.lang +++ b/htdocs/langs/uk_UA/main.lang @@ -22,21 +22,21 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%b %d, %Y, %I:%M %p FormatDateHourText=%B %d, %Y, %I:%M %p -DatabaseConnection=Database connection -NoTranslation=No translation -NoRecordFound=No record found -NoError=No error -Error=Error -ErrorFieldRequired=Field '%s' is required -ErrorFieldFormat=Field '%s' has a bad value -ErrorFileDoesNotExists=File %s does not exist -ErrorFailedToOpenFile=Failed to open file %s -ErrorCanNotCreateDir=Can not create dir %s -ErrorCanNotReadDir=Can not read dir %s -ErrorConstantNotDefined=Parameter %s not defined -ErrorUnknown=Unknown error -ErrorSQL=SQL Error -ErrorLogoFileNotFound=Logo file '%s' was not found +DatabaseConnection=Підключеня до Бази Данних +NoTranslation=Немає перекладу +NoRecordFound=Записів не знайдено +NoError=Немає помилок +Error=Помилка +ErrorFieldRequired=Поле '%s' є обов'язковим +ErrorFieldFormat=Поле '%s' містить помилкове значення +ErrorFileDoesNotExists=Файл %s не існує +ErrorFailedToOpenFile=Неможливо відкрити файл %s +ErrorCanNotCreateDir=Неможливо створити каталог %s +ErrorCanNotReadDir=Неможливо прочитати каталог %s +ErrorConstantNotDefined=Параметр %s не було визначено +ErrorUnknown=Невідома помилка +ErrorSQL=Помилка SQL +ErrorLogoFileNotFound=Файл логотипу '%s' не знайдено ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this ErrorGoToModuleSetup=Go to Module setup to fix this ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s) @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries GoToWikiHelpPage=Read online help (need Internet access) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier @@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events NActionsLate=%s late +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Remove filter ChartGenerated=Chart generated @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToThirdParty=Link to another third party CreateDraft=Create draft +SetToDraft=Back to draft ClickToEdit=Click to edit ObjectDeleted=Object %s deleted ByCountry=By country @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/uk_UA/margins.lang b/htdocs/langs/uk_UA/margins.lang index 3fca6d7a644..606d5e5053a 100644 --- a/htdocs/langs/uk_UA/margins.lang +++ b/htdocs/langs/uk_UA/margins.lang @@ -38,4 +38,7 @@ BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/uk_UA/orders.lang index 3d530012154..6ee9c19fa95 100644 --- a/htdocs/langs/uk_UA/orders.lang +++ b/htdocs/langs/uk_UA/orders.lang @@ -53,7 +53,7 @@ ShippingExist=A shipment exists DraftOrWaitingApproved=Draft or approved not yet ordered DraftOrWaitingShipped=Draft or validated not yet shipped MenuOrdersToBill=Orders delivered -MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order ShipProduct=Ship product @@ -65,7 +65,7 @@ ValidateOrder=Validate order UnvalidateOrder=Unvalidate order DeleteOrder=Delete order CancelOrder=Cancel order -AddOrder=Add order +AddOrder=Create order AddToMyOrders=Add to my orders AddToOtherOrders=Add to other orders AddToDraftOrders=Add to draft order @@ -154,7 +154,6 @@ OrderByPhone=Phone CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=No orders billable CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -MenuOrdersToBill2=Orders to bill OrderCreation=Order creation Ordered=Ordered OrderCreated=Your orders have been created diff --git a/htdocs/langs/uk_UA/oscommerce.lang b/htdocs/langs/uk_UA/oscommerce.lang deleted file mode 100644 index 3ff9108ead4..00000000000 --- a/htdocs/langs/uk_UA/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang index b56ef294495..88991888183 100644 --- a/htdocs/langs/uk_UA/other.lang +++ b/htdocs/langs/uk_UA/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/uk_UA/paybox.lang b/htdocs/langs/uk_UA/paybox.lang index f937768240c..aced32a4944 100644 --- a/htdocs/langs/uk_UA/paybox.lang +++ b/htdocs/langs/uk_UA/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page NewPayboxPaymentReceived=New Paybox payment received NewPayboxPaymentFailed=New Paybox payment tried but failed PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/uk_UA/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang index 2ae43f39766..f6111bac684 100644 --- a/htdocs/langs/uk_UA/sendings.lang +++ b/htdocs/langs/uk_UA/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang index 5d11b0fd7a0..06c502504e9 100644 --- a/htdocs/langs/uk_UA/stocks.lang +++ b/htdocs/langs/uk_UA/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=Location LocationSummary=Short name location NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang index 0afaab6ad7f..baf209f9d1c 100644 --- a/htdocs/langs/uk_UA/users.lang +++ b/htdocs/langs/uk_UA/users.lang @@ -63,7 +63,6 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group modified successfully +GroupModified=Group %s modified GroupDeleted=Group %s removed ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? @@ -114,8 +113,10 @@ YourRole=Your roles YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb of users DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang index 58ac3e252ec..ea32511fefb 100644 --- a/htdocs/langs/uk_UA/withdrawals.lang +++ b/htdocs/langs/uk_UA/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Unknown StatusWaiting=Waiting @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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 e3e30f01dd4..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 @@ -437,14 +440,14 @@ Module52Name=Stocks Module52Desc=Stock management (products) Module53Name=Services Module53Desc=Service management -Module54Name=Contracts -Module54Desc=Contract and service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Standing orders -Module57Desc=Standing orders and withdrawal management +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 -Module400Desc=Project management inside other modules +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=Notifications -Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management Module1200Name=Mantis @@ -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 @@ -514,20 +521,20 @@ Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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 Module50100Desc=Point of sales module -Module50200Name= Paypal -Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP -Module54000Desc=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 @@ -606,15 +613,16 @@ Permission151=Read standing orders Permission152=Create/modify a standing orders request Permission153=Transmission standing orders receipts Permission154=Credit/refuse standing orders receipts -Permission161=Read contracts -Permission162=Create/modify contracts -Permission163=Activate a service of a contract -Permission164=Disable a service of a contract -Permission165=Delete contracts -Permission171=Read trips -Permission172=Create/modify trips -Permission173=Delete trips -Permission178=Export trips +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=Read suppliers Permission181=Read supplier orders Permission182=Create/modify supplier orders @@ -671,7 +679,7 @@ Permission300=Read bar codes Permission301=Create/modify bar codes Permission302=Delete bar codes Permission311=Read services -Permission312=Assign service to contract +Permission312=Assign service/subscription to contract Permission331=Read bookmarks Permission332=Create/modify bookmarks Permission333=Delete bookmarks @@ -701,8 +709,8 @@ Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations Permission1001=Read stocks -Permission1002=Create/modify stocks -Permission1003=Delete stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=Read stock movements Permission1005=Create/modify stock movements Permission1101=Read delivery orders @@ -778,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 @@ -887,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 @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=Free text on orders WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models TemplatePDFInterventions=Intervention card documents models WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts module setup +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Contracts numbering modules TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Products module setup ServiceSetup=Services module setup @@ -1382,9 +1393,10 @@ MailingSetup=EMailing module setup MailingEMailFrom=Sender EMail (From) for emails sent by emailing module MailingEMailError=Return EMail (Errors-to) for emails with errors ##### Notification ##### -NotificationSetup=Notification bu email module setup +NotificationSetup=EMail notification module setup NotificationEMailFrom=Sender EMail (From) for emails sent for notifications -ListOfAvailableNotifications=List of available notifications (This list depends on activated modules) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model @@ -1412,8 +1424,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### -StockSetup=Configuration module stock -UserWarehouse=Use user personal stocks +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Menu deleted TreeMenu=Tree menus @@ -1478,11 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup -CashDeskThirdPartyForSell=Generic third party to use for sells +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskIdWareHouse=Warehouse to use for sells +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. ##### Bookmark ##### BookmarkSetup=Bookmark module setup BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang index 9b3efc07dab..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 @@ -41,9 +42,10 @@ AutoActions= Automatic filling AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. -ActionsEvents= Events for which Dolibarr will create an action in agenda automatically -PropalValidatedInDolibarr= Proposal %s validated -InvoiceValidatedInDolibarr= Invoice %s validated +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= Order %s validated @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status OrderCanceledInDolibarr=Order %s canceled -InterventionValidatedInDolibarr=Intervention %s validated ProposalSentByEMail=Commercial proposal %s sent by EMail OrderSentByEMail=Customer order %s sent by EMail InvoiceSentByEMail=Customer invoice %s sent by EMail @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail ShippingSentByEMail=Shipping %s sent by EMail ShippingValidated= Shipping %s validated -InterventionSentByEMail=Intervention %s sent by EMail -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date DateActionPlannedEnd= Planned end date @@ -70,9 +69,9 @@ DateActionStart= Start date DateActionEnd= End date AgendaUrlOptions1=You can also add following parameters to filter output: AgendaUrlOptions2=login=%s to restrict output to actions created by, assigned to or done by user %s. -AgendaUrlOptions3=logina=%s to restrict output to actions created by user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. -AgendaUrlOptions5=logind=%s to restrict output to actions done by user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Show birthday's contacts AgendaHideBirthdayEvents=Hide birthday's contacts Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file ExtSiteNoLabel=No Description WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang index 1edd7213076..81b7515a8b8 100644 --- a/htdocs/langs/uz_UZ/bills.lang +++ b/htdocs/langs/uz_UZ/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=Credit note InvoiceAvoirAsk=Credit note to correct invoice InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=Replace invoice %s ReplacementInvoice=Replacement invoice ReplacedByInvoice=Replaced by invoice %s @@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned' ClassifyClosed=Classify 'Closed' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Create Invoice -AddBill=Add invoice or credit note +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice @@ -99,7 +99,7 @@ DoPaymentBack=Do payment back ConvertToReduc=Convert into future discount EnterPaymentReceivedFromCustomer=Enter payment received from customer EnterPaymentDueToCustomer=Make payment due to customer -DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=Amount PriceBase=Price base BillStatus=Invoice status @@ -137,8 +137,6 @@ BillFrom=From BillTo=To ActionsOnBill=Actions on invoice NewBill=New invoice -Prélèvements=Standing order -Prélèvements=Standing order LastBills=Last %s invoices LastCustomersBills=Last %s customers invoices LastSuppliersBills=Last %s suppliers invoices @@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice %s ? ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? -ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason @@ -191,9 +189,9 @@ AlreadyPaid=Already paid AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) Abandoned=Abandoned -RemainderToPay=Remainder to pay -RemainderToTake=Remainder to take -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received @@ -219,19 +217,18 @@ NoInvoice=No invoice ClassifyBill=Classify invoice SupplierBillsToPay=Suppliers invoices to pay CustomerBillsUnpaid=Unpaid customers invoices -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters -DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms SetMode=Set payment mode Billed=Billed -RepeatableInvoice=Pre-defined invoice -RepeatableInvoices=Pre-defined invoices -Repeatable=Pre-defined -Repeatables=Pre-defined -ChangeIntoRepeatableInvoice=Convert into pre-defined -CreateRepeatableInvoice=Create pre-defined invoice -CreateFromRepeatableInvoice=Create from pre-defined invoice +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines CustomersInvoicesAndPayments=Customer invoices and payments ExportDataset_invoice_1=Customer invoices list and invoice's lines diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang index ed61bfc08a6..22914931db1 100644 --- a/htdocs/langs/uz_UZ/categories.lang +++ b/htdocs/langs/uz_UZ/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang index 3929cfde036..878eb49b3c9 100644 --- a/htdocs/langs/uz_UZ/compta.lang +++ b/htdocs/langs/uz_UZ/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. CheckReceipt=Check deposit CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=New discount NewCheckDeposit=New check deposit NewCheckDepositOn=Create receipt for deposit on account: %s @@ -196,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 e5ad112b222..57ba3bb15d8 100644 --- a/htdocs/langs/uz_UZ/contracts.lang +++ b/htdocs/langs/uz_UZ/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contracts area ListOfContracts=List of contracts -LastContracts=Last %s modified contracts +LastModifiedContracts=Last %s modified contracts AllContracts=All contracts ContractCard=Contract card ContractStatus=Contract status @@ -27,7 +27,7 @@ MenuRunningServices=Running services MenuExpiredServices=Expired services MenuClosedServices=Closed services NewContract=New contract -AddContract=Add contract +AddContract=Create contract SearchAContract=Search a contract DeleteAContract=Delete a contract CloseAContract=Close a contract @@ -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 %s modified 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/cron.lang b/htdocs/langs/uz_UZ/cron.lang index 768cd012384..195ad43c87c 100644 --- a/htdocs/langs/uz_UZ/cron.lang +++ b/htdocs/langs/uz_UZ/cron.lang @@ -1,10 +1,8 @@ # Dolibarr language file - Source file is en_US - cron -# # About page About = About CronAbout = About Cron CronAboutPage = Cron about page - # Right Permission23101 = Read Scheduled task Permission23102 = Create/update Scheduled task @@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman 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 jobs -CronListInactive= List of disabled jobs -CronListActive= List of active jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list CronDateLastRun=Last run CronLastOutput=Last run output diff --git a/htdocs/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang index 66ddea95a5c..f7aed91cf81 100644 --- a/htdocs/langs/uz_UZ/donations.lang +++ b/htdocs/langs/uz_UZ/donations.lang @@ -4,7 +4,7 @@ Donations=Donations DonationRef=Donation ref. Donor=Donor Donors=Donors -AddDonation=Add a donation +AddDonation=Create a donation NewDonation=New donation ShowDonation=Show donation DonationPromise=Gift promise @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/uz_UZ/externalsite.lang index 62da68c045d..da4853df0df 100644 --- a/htdocs/langs/uz_UZ/externalsite.lang +++ b/htdocs/langs/uz_UZ/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Setup link to external website ExternalSiteURL=External Site URL ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang index c25abf6449c..f5b87fefb08 100644 --- a/htdocs/langs/uz_UZ/holiday.lang +++ b/htdocs/langs/uz_UZ/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Update CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=Name Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=Value -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=Validate UpdateEventCP=Update events diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang index 17641a0ab3e..c79da05364e 100644 --- a/htdocs/langs/uz_UZ/interventions.lang +++ b/htdocs/langs/uz_UZ/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervention Interventions=Interventions InterventionCard=Intervention card NewIntervention=New intervention -AddIntervention=Add intervention +AddIntervention=Create intervention ListOfInterventions=List of interventions EditIntervention=Edit intervention ActionsOnFicheInter=Actions on intervention @@ -30,6 +30,15 @@ StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang index 98e6dc335ee..7a211198822 100644 --- a/htdocs/langs/uz_UZ/mails.lang +++ b/htdocs/langs/uz_UZ/mails.lang @@ -115,7 +115,7 @@ SentBy=Sent by MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists @@ -133,6 +133,9 @@ Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company ANotificationsWillBeSent=1 notification will be sent by email SomeNotificationsWillBeSent=%s notifications will be sent by email -AddNewNotification=Activate a new email notification request -ListOfActiveNotifications=List all active email notification requests +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang index 21d3458532d..b586bf4ea5a 100644 --- a/htdocs/langs/uz_UZ/main.lang +++ b/htdocs/langs/uz_UZ/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. ErrorFailedToSaveFile=Error, failed to save file. -ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported. -ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format. SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. NbOfEntries=Nb of entries GoToWikiHelpPage=Read online help (need Internet access) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day HourShort=H +MinuteShort=mn Rate=Rate UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Full list Statistics=Statistics OtherStatistics=Other statistics Status=Status +Favorite=Favorite ShortInfo=Info. Ref=Ref. RefSupplier=Ref. supplier @@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party ActionsOnMember=Events about this member NActions=%s events NActionsLate=%s late +RequestAlreadyDone=Request already recorded Filter=Filter RemoveFilter=Remove filter ChartGenerated=Chart generated @@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup URLPhoto=URL of photo/logo SetLinkToThirdParty=Link to another third party CreateDraft=Create draft +SetToDraft=Back to draft ClickToEdit=Click to edit ObjectDeleted=Object %s deleted ByCountry=By country @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang index 3fca6d7a644..606d5e5053a 100644 --- a/htdocs/langs/uz_UZ/margins.lang +++ b/htdocs/langs/uz_UZ/margins.lang @@ -38,4 +38,7 @@ BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/uz_UZ/orders.lang index 3d530012154..6ee9c19fa95 100644 --- a/htdocs/langs/uz_UZ/orders.lang +++ b/htdocs/langs/uz_UZ/orders.lang @@ -53,7 +53,7 @@ ShippingExist=A shipment exists DraftOrWaitingApproved=Draft or approved not yet ordered DraftOrWaitingShipped=Draft or validated not yet shipped MenuOrdersToBill=Orders delivered -MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order ShipProduct=Ship product @@ -65,7 +65,7 @@ ValidateOrder=Validate order UnvalidateOrder=Unvalidate order DeleteOrder=Delete order CancelOrder=Cancel order -AddOrder=Add order +AddOrder=Create order AddToMyOrders=Add to my orders AddToOtherOrders=Add to other orders AddToDraftOrders=Add to draft order @@ -154,7 +154,6 @@ OrderByPhone=Phone CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=No orders billable CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -MenuOrdersToBill2=Orders to bill OrderCreation=Order creation Ordered=Ordered OrderCreated=Your orders have been created diff --git a/htdocs/langs/uz_UZ/oscommerce.lang b/htdocs/langs/uz_UZ/oscommerce.lang deleted file mode 100644 index 3ff9108ead4..00000000000 --- a/htdocs/langs/uz_UZ/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang index b56ef294495..88991888183 100644 --- a/htdocs/langs/uz_UZ/other.lang +++ b/htdocs/langs/uz_UZ/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Security code Calendar=Calendar -AddTrip=Add trip Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

    Those tools can be reached from menu on the side. Birthday=Birthday @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size @@ -80,6 +80,16 @@ ModifiedBy=Modified by %s ValidatedBy=Validated by %s CanceledBy=Canceled by %s ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=File %s was removed DirWasRemoved=Directory %s was removed FeatureNotYetAvailableShort=Available in a next version @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s -NewCompanyToDolibarr=Company %s added into Dolibarr -ContractValidatedInDolibarr=Contract %s validated in Dolibarr -ContractCanceledInDolibarr=Contract %s canceled in Dolibarr -ContractClosedInDolibarr=Contract %s closed in Dolibarr -PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr -PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr -PropalValidatedInDolibarr=Proposal %s validated in Dolibarr -InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr -InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr -InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr -PaymentDoneInDolibarr=Payment %s done in Dolibarr -CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr -SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr -MemberValidatedInDolibarr=Member %s validated in Dolibarr -MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr -MemberDeletedInDolibarr=Member %s deleted from Dolibarr -MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr -ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Export ExportsArea=Exports area diff --git a/htdocs/langs/uz_UZ/paybox.lang b/htdocs/langs/uz_UZ/paybox.lang index f937768240c..aced32a4944 100644 --- a/htdocs/langs/uz_UZ/paybox.lang +++ b/htdocs/langs/uz_UZ/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page NewPayboxPaymentReceived=New Paybox payment received NewPayboxPaymentFailed=New Paybox payment tried but failed PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang index 2ae43f39766..f6111bac684 100644 --- a/htdocs/langs/uz_UZ/sendings.lang +++ b/htdocs/langs/uz_UZ/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shippings ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang index 5d11b0fd7a0..06c502504e9 100644 --- a/htdocs/langs/uz_UZ/stocks.lang +++ b/htdocs/langs/uz_UZ/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required CorrectStock=Correct stock ListOfWarehouses=List of warehouses ListOfStockMovements=List of stock movements -StocksArea=Stocks area +StocksArea=Warehouses area Location=Location LocationSummary=Short name location NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang index 0afaab6ad7f..baf209f9d1c 100644 --- a/htdocs/langs/uz_UZ/users.lang +++ b/htdocs/langs/uz_UZ/users.lang @@ -63,7 +63,6 @@ ShowGroup=Show group ShowUser=Show user NonAffectedUsers=Non assigned users UserModified=User modified successfully -GroupModified=Group modified successfully PhotoFile=Photo file UserWithDolibarrAccess=User with Dolibarr access ListOfUsersInGroup=List of users in this group @@ -103,7 +102,7 @@ UserDisabled=User %s disabled UserEnabled=User %s activated UserDeleted=User %s removed NewGroupCreated=Group %s created -GroupModified=Group modified successfully +GroupModified=Group %s modified GroupDeleted=Group %s removed ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? @@ -114,8 +113,10 @@ YourRole=Your roles YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb of users DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang index 58ac3e252ec..ea32511fefb 100644 --- a/htdocs/langs/uz_UZ/withdrawals.lang +++ b/htdocs/langs/uz_UZ/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt LastWithdrawalReceipts=Last %s withdrawal receipts WithdrawedBills=Withdrawn invoices WithdrawalsLines=Withdrawal lines -RequestStandingOrderToTreat=Request for standing orders to treat -RequestStandingOrderTreated=Request for standing orders treated +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=Transmission method Send=Send Lines=Lines StandingOrderReject=Issue a rejection -InvoiceRefused=Invoice refused WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection -InvoiceRefused=Invoice refused +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Status StatusUnknown=Unknown StatusWaiting=Waiting @@ -76,13 +76,14 @@ WithBankUsingRIB=For bank accounts using RIB WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country +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/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang index 2d2bda8acb2..8eba08cd1d6 100644 --- a/htdocs/langs/vi_VN/accountancy.lang +++ b/htdocs/langs/vi_VN/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Chọn một biểu đồ của tài khoản Validate=Xác nhận Addanaccount=Thêm một tài khoản kế toán AccountAccounting=Tài khoản kế toán -Ventilation=Thông gió -ToDispatch=Cử -Dispatched=Cử +Ventilation=Breakdown +ToDispatch=Gửi đi +Dispatched=Đã gửi đi -CustomersVentilation=Khách hàng thông gió -SuppliersVentilation=Các nhà cung cấp hệ thống thông gió +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Lợi nhuận thương mại Reports=Báo cáo ByCustomerInvoice=Hoá đơn cho khách hàng @@ -40,57 +40,57 @@ Update=Cập nhật List=Danh sách Create=Tạo UpdateAccount=Sự biến đổi của một tài khoản kế toán -UpdateMvts=Sửa đổi của một phong trào +UpdateMvts=Sửa đổi của một thay đổi WriteBookKeeping=Tài khoản ghi trong sổ kế toán tổng Bookkeeping=Sổ cái tổng hợp AccountBalanceByMonth=Số dư tài khoản theo tháng -AccountingVentilation=Thông gió Kế toán -AccountingVentilationSupplier=Nhà cung cấp hệ thống thông gió Kế toán -AccountingVentilationCustomer=Kế toán thông gió khách hàng +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Dòng CAHTF=Tổng số nhà cung cấp mua HT -InvoiceLines=Dòng hoá đơn được thông gió -InvoiceLinesDone=Đường thông gió hóa đơn +InvoiceLines=Dòng hoá đơn được ventilation +InvoiceLinesDone=Đường ventilation hóa đơn IntoAccount=Trong tài khoản kế toán -Ventilate=Thông gió -VentilationAuto=Thông gió tự động +Ventilate=Ventilation +VentilationAuto=Automatic breakdown Processing=Chế biến EndProcessing=Sự kết thúc của chế biến -AnyLineVentilate=Bất kỳ dòng để thông gió +AnyLineVentilate=Bất kỳ dòng để ventilation SelectedLines=Đường lựa chọn Lineofinvoice=Dòng của hóa đơn -VentilatedinAccount=Thông gió thành công trong các tài khoản kế toán -NotVentilatedinAccount=Không thông gió trong tài khoản kế toán +VentilatedinAccount=Ventilation thành công trong các tài khoản kế toán +NotVentilatedinAccount=Không ventilation trong tài khoản kế toán ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Chiều dài của kế toán tài khoản thể hiện trong Dolibarr AccountLengthDesc=Chức năng cho phép để giả vờ chiều dài của tài khoản kế toán bằng cách thay thế không gian bởi các con số không. Chức năng này chỉ chạm vào màn hình, nó không sửa đổi các tài khoản kế toán đăng ký tại Dolibarr. Đối với xuất khẩu, chức năng này là cần thiết để tương thích với phần mềm nhất định. -ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts +ACCOUNTING_LENGTH_GACCOUNT=Chiều dài của các tài khoản tổng hợp +ACCOUNTING_LENGTH_AACCOUNT=Chiều dài của các tài khoản của bên thứ ba -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal -ACCOUNTING_CASH_JOURNAL=Cash journal -ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTING_SOCIAL_JOURNAL=Social journal +ACCOUNTING_SELL_JOURNAL=Bán tạp chí +ACCOUNTING_PURCHASE_JOURNAL=Mua tạp chí +ACCOUNTING_BANK_JOURNAL=Tạp chí Ngân hàng +ACCOUNTING_CASH_JOURNAL=Tạp chí tiền mặt +ACCOUNTING_MISCELLANEOUS_JOURNAL=Linh tinh tạp chí +ACCOUNTING_SOCIAL_JOURNAL=Tạp chí Xã hội -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Tài khoản chuyển nhượng +ACCOUNTING_ACCOUNT_SUSPENSE=Tài khoản của chờ đợi -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Kế toán tài khoản mặc định cho các sản phẩm đã mua (nếu không quy định trong bảng sản phẩm) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Kế toán tài khoản mặc định cho các sản phẩm bán ra (nếu không quy định trong bảng sản phẩm) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Kế toán tài khoản mặc định cho các dịch vụ mua (nếu không quy định trong bảng dịch vụ) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Kế toán tài khoản mặc định cho các dịch vụ bán ra (nếu không quy định trong bảng dịch vụ) Doctype=Loại văn bản Docdate=Ngày @@ -122,9 +122,9 @@ CustomerInvoicePayment=Thanh toán hóa đơn của khách hàng ThirdPartyAccount=Tài khoản của bên thứ ba -NewAccountingMvt=Phong trào mới -NumMvts=Số phong trào -ListeMvts=Danh sách của phong trào +NewAccountingMvt=Thay đổi mới +NumMvts=Số thay đổi +ListeMvts=Danh sách của thay đổi ErrorDebitCredit=Thẻ ghi nợ và tín dụng không thể có một giá trị cùng một lúc ReportThirdParty=Danh sách tài khoản của bên thứ ba @@ -140,19 +140,19 @@ Active=Trữ NewFiscalYear=Năm tài chính mới -DescVentilCustomer=Tham khảo ý kiến ​​ở đây thông gió kế toán năm của hoá đơn khách hàng của bạn +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Tổng kim ngạch HT TotalMarge=Lợi nhuận tổng doanh thu DescVentilDoneCustomer=Tham khảo ý kiến ​​ở đây là danh sách các dòng hoá đơn cho khách hàng và tài khoản kế toán -DescVentilTodoCustomer=Thông gió cho đường dây của bạn hóa đơn của khách hàng với một tài khoản kế toán +DescVentilTodoCustomer=Ventilation cho đường dây của bạn hóa đơn của khách hàng với một tài khoản kế toán ChangeAccount=Thay đổi tài khoản kế toán cho dòng lựa chọn tài khoản: Vide=- -DescVentilSupplier=Tham khảo ý kiến ​​ở đây thông gió kế toán năm của các nhà cung cấp hoá đơn của bạn -DescVentilTodoSupplier=Thông gió cho đường dây của nhà cung cấp hóa đơn với một tài khoản kế toán +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers +DescVentilTodoSupplier=Ventilation cho đường dây của nhà cung cấp hóa đơn với một tài khoản kế toán DescVentilDoneSupplier=Tham khảo ý kiến ​​ở đây là danh sách các dòng nhà cung cấp hoá đơn, tài khoản kế toán ValidateHistory=Tự động xác nhận ErrorAccountancyCodeIsAlreadyUse=Lỗi, bạn không thể xóa tài khoản kế toán này bởi vì nó được sử dụng -FicheVentilation=Thẻ thông gió +FicheVentilation=Breakdown card diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index 1e13448338f..52535054170 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -15,7 +15,7 @@ PurgeSessions=Cập nhật phiên làm việc ConfirmPurgeSessions=Bạn có muốn xóa sạch các phiên làm việc? Điều này sẽ ngắt kết nối với tất cả người dùng (ngoại trừ bạn). NoSessionListWithThisHandler=Phần quản lý lưu trữ phiên làm việc được tùy chỉnh trong PHP của bạn không được phép liệt kê các phiên làm việc hiện có. LockNewSessions=Khóa kết nối mới -ConfirmLockNewSessions=Bạn có chắc về việc hạn chế bất kỳ kết nối mới nào được tạo bởi Dolibarr hay không. Chỉ người dùng %s mới cs thể kết nối sau đó. +ConfirmLockNewSessions=Bạn có chắc về việc hạn chế bất kỳ kết nối mới nào được tạo bởi Dolibarr hay không. Chỉ người dùng %s mới có thể kết nối sau đó. UnlockNewSessions=Bỏ việc khóa kết nôi YourSession=Phiên làm việc của bạn Sessions=Phiên làm việc của người dùng @@ -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 @@ -149,10 +151,10 @@ Purge=Thanh lọc PurgeAreaDesc=Trang này cho phép bạn xóa toàn bộ các tập tin đã được xây dựng hoặc trữ bở Dolibarr (các tập tin tạm hoặc tất cả các tập tin trong thư mục %s). Không cần thiết phải sử dụng tính năng này. Phần này được cung cấp cho những người dùng Dolibarr mà phần hosting được cung cấp bởi một nhà cung cấp không cung cấp tính năng xóa các tập tin được xây dựng trên web server đó. PurgeDeleteLogFile=Xóa tập tin nhật trình %s được tạo bởi module Syslog (không gây nguy hiểm cho việc mất mát dữ liệu) PurgeDeleteTemporaryFiles=Xóa toàn bộ các tập tin tạm (không gây nguy hiểm cho việc thất thoát dữ liệu) -PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các file trong thư mục% s. Tập tin tạm thời mà còn sao lưu cơ sở dữ liệu bãi, tập tin đính kèm với các yếu tố (các bên thứ ba, hóa đơn, ...) và tải lên vào module ECM sẽ bị xóa. +PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các file trong thư mục %s. Tập tin tạm thời mà còn sao lưu cơ sở dữ liệu bãi, tập tin đính kèm với các yếu tố (các bên thứ ba, hóa đơn, ...) và tải lên vào module ECM sẽ bị xóa. PurgeRunNow=Tẩy giờ PurgeNothingToDelete=Không có thư mục hoặc tập tin để xóa. -PurgeNDirectoriesDeleted=% Của các tập tin hoặc thư mục bị xóa. +PurgeNDirectoriesDeleted=% các tập tin hoặc thư mục bị xóa. PurgeAuditEvents=Thanh trừng tất cả các sự kiện an ninh ConfirmPurgeAuditEvents=Bạn Bạn có chắc chắn muốn thanh trừng tất cả các sự kiện an ninh? Tất cả các nhật bảo mật sẽ bị xóa, không có dữ liệu khác sẽ bị xóa. NewBackup=Sao lưu mới @@ -171,8 +173,8 @@ ImportMethod=Phương pháp nhập khẩu ToBuildBackupFileClickHere=Để xây dựng một tập tin sao lưu, nhấn vào đây . ImportMySqlDesc=Để nhập một tập tin sao lưu, bạn phải sử dụng lệnh mysql từ dòng lệnh: ImportPostgreSqlDesc=Để nhập một tập tin sao lưu, bạn phải sử dụng lệnh pg_restore từ dòng lệnh: -ImportMySqlCommand=% S% s conf.php,     thay thế dòng
    $ Dolibarr_main_db_pass = "..."
    bởi
    $ Dolibarr_main_db_pass = "crypted:% s" -InstrucToClearPass=Để có mật khẩu giải mã (làm sạch) vào tập tin conf.php, thay thế dòng
    $ Dolibarr_main_db_pass = "crypted: ..."
    bởi
    $ Dolibarr_main_db_pass = "% s" +InstrucToEncodePass=Để có mật khẩu mã hóa vào tập tin conf.php, thay thế dòng
    $dolibarr_main_db_pass="..."
    bởi
    $dolibarr_main_db_pass="crypted:%s" +InstrucToClearPass=Để có mật khẩu giải mã (làm sạch) vào tập tin conf.php, thay thế dòng
    $dolibarr_main_db_pass="crypted:..."
    bởi
    $dolibarr_main_db_pass="%s" ProtectAndEncryptPdfFiles=Bảo vệ các tập tin pdf được tạo ra (hoạt không được khuyến khích, phá vỡ hệ pdf khối lượng) ProtectAndEncryptPdfFilesDesc=Bảo vệ tài liệu PDF giữ cho nó có sẵn để đọc và in với bất kỳ trình duyệt PDF. Tuy nhiên, chỉnh sửa và sao chép là không thể nữa. Lưu ý rằng việc sử dụng tính năng này làm cho xây dựng một tích lũy pdf toàn cầu không làm việc (như hóa đơn chưa thanh toán). Feature=Tính năng @@ -241,23 +244,23 @@ OfficialMarketPlace=Thị trường chính thức cho các module bên ngoài / OfficialWebHostingService=Dịch vụ lưu trữ web tham chiếu (Cloud lưu trữ) ReferencedPreferredPartners=Đối tác ưa thích OtherResources=Autres nguồn tài -ForDocumentationSeeWiki=Đối với người dùng hay tài liệu hướng dẫn phát triển (tài liệu, Hỏi đáp về ...),
    hãy xem các Dolibarr Wiki:
    % S -ForAnswersSeeForum=Đối với bất kỳ câu hỏi khác / giúp đỡ, bạn có thể sử dụng diễn đàn Dolibarr:
    % S +ForDocumentationSeeWiki=Đối với người dùng hay tài liệu hướng dẫn phát triển (tài liệu, Hỏi đáp về ...),
    hãy xem các Dolibarr Wiki:
    %s +ForAnswersSeeForum=Đối với bất kỳ câu hỏi khác / giúp đỡ, bạn có thể sử dụng diễn đàn Dolibarr:
    %s HelpCenterDesc1=Khu vực này có thể giúp bạn để có được một dịch vụ hỗ trợ giúp về Dolibarr. -HelpCenterDesc2=Một số phần của dịch vụ này chỉ có sẵn trong tiếng Anh. -CurrentTopMenuHandler=Hiện xử lý đơn hàng đầu +HelpCenterDesc2=Một số phần của dịch vụ này có sẵn chỉ trong tiếng Anh. +CurrentTopMenuHandler=Xử lý menu trên cùng hiện tại CurrentLeftMenuHandler=Xử lý menu bên trái hiện tại -CurrentMenuHandler=Xử lý đơn hiện tại -CurrentSmartphoneMenuHandler=Xử lý đơn điện thoại thông minh hiện nay +CurrentMenuHandler=Xử lý menu hiện tại +CurrentSmartphoneMenuHandler=Xử lý menu điện thoại thông minh hiện tại MeasuringUnit=Đơn vị đo Emails=E-mail EMailsSetup=E-mail cài đặt EMailsDesc=Trang này cho phép bạn ghi đè lên các thông số PHP của bạn cho e-mail gửi. Trong hầu hết các trường hợp trên Unix / Linux hệ điều hành, thiết lập PHP của bạn là chính xác và các thông số này là vô ích. -MAIN_MAIL_SMTP_PORT=SMTP / SMTPS Port (Theo mặc định trong php.ini:% s) -MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (Theo mặc định trong php.ini:% s) +MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (Theo mặc định trong php.ini: %s) +MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (Theo mặc định trong php.ini: %s) MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (Không xác định vào PHP trên Unix như hệ thống) MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (Không xác định vào PHP trên Unix như hệ thống) -MAIN_MAIL_EMAIL_FROM=Tên người gửi e-mail cho các email tự động (theo mặc định trong php.ini:% s) +MAIN_MAIL_EMAIL_FROM=Tên người gửi e-mail cho các email tự động (theo mặc định trong php.ini: %s) MAIN_MAIL_ERRORS_TO=Tên người gửi e-mail được sử dụng cho các lỗi trả về email được gửi MAIN_MAIL_AUTOCOPY_TO= Gửi một cách có hệ thống ẩn carbon bản sao của tất cả các email gửi tới MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Gửi một cách có hệ thống ẩn carbon bản sao của kiến ​​nghị gửi qua email @@ -272,7 +275,7 @@ MAIN_DISABLE_ALL_SMS=Vô hiệu hoá tất cả sendings SMS (cho mục đích t MAIN_SMS_SENDMODE=Phương pháp sử dụng để gửi tin nhắn SMS MAIN_MAIL_SMS_FROM=Số điện thoại mặc định cho người gửi SMS gửi FeatureNotAvailableOnLinux=Tính năng không có sẵn trên Unix như hệ thống. Kiểm tra chương trình sendmail của bạn tại địa phương. -SubmitTranslation=Nếu dịch cho ngôn ngữ này không phải là hoàn toàn hoặc bạn tìm thấy lỗi, bạn có thể khắc phục điều này bằng cách chỉnh sửa tập tin vào thư mục langs /% s và nộp hồ sơ sửa www.dolibarr.org diễn đàn. +SubmitTranslation=Nếu dịch cho ngôn ngữ này không phải là hoàn toàn hoặc bạn tìm thấy lỗi, bạn có thể khắc phục điều này bằng cách chỉnh sửa tập tin vào thư mục langs/%s và submit file đã chỉnh sửa trên diễn đàn www.dolibarr.org. ModuleSetup=Thiết lập mô-đun ModulesSetup=Các mô-đun cài đặt ModuleFamilyBase=Hệ thống @@ -289,39 +292,39 @@ MenuHandlers=Xử lý đơn MenuAdmin=Biên tập đơn DoNotUseInProduction=Không sử dụng trong sản xuất ThisIsProcessToFollow=Đây là thiết lập để quá trình: -StepNb=Bước% s -FindPackageFromWebSite=Tìm một gói phần mềm cung cấp các tính năng mà bạn muốn (ví dụ như trên trang web chính thức% s). +StepNb=Bước%s +FindPackageFromWebSite=Tìm một gói phần mềm cung cấp các tính năng mà bạn muốn (ví dụ như trên trang web chính thức %s). DownloadPackageFromWebSite=Tải về gói. -UnpackPackageInDolibarrRoot=Tập tin gói giải nén vào thư mục gốc của Dolibarr% s +UnpackPackageInDolibarrRoot=Tập tin gói giải nén vào thư mục gốc của Dolibarr %s SetupIsReadyForUse=Cài đặt xong và Dolibarr đã sẵn sàng để sử dụng với thành phần mới này. NotExistsDirect=Các thư mục gốc thay thế không được định nghĩa.
    InfDirAlt=Kể từ phiên bản 3 có thể xác định một directory.This gốc thay thế cho phép bạn lưu trữ, cùng một vị trí, plug-in và các mẫu tùy chỉnh.
    Chỉ cần tạo một thư mục trong thư mục gốc của Dolibarr (ví dụ như: tùy chỉnh).
    -InfDirExample=
    Sau đó khai báo trong tập tin conf.php
    $ Dolibarr_main_url_root_alt = 'http: // myserver / tùy chỉnh'
    $ Dolibarr_main_document_root_alt = '/ path / of / dolibarr / htdocs / tùy chỉnh'
    * Những dòng này được nhận xét với "#", để bỏ ghi chú chỉ loại bỏ các nhân vật. +InfDirExample=
    Sau đó khai báo trong tập tin conf.php
    $dolibarr_main_url_root_alt='http://myserver/custom'
    $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
    * Những dòng này được nhận xét với "#", để bỏ ghi chú chỉ loại bỏ các nhân vật. YouCanSubmitFile=Chọn mô-đun: CurrentVersion=Phiên bản hiện tại Dolibarr CallUpdatePage=Tới trang đó cập nhật các cấu trúc cơ sở dữ liệu và dữ liệu:% s. LastStableVersion=Cuối phiên bản ổn định -GenericMaskCodes=Bạn có thể nhập bất kỳ số mặt nạ. Trong mặt nạ này, các thẻ sau đây có thể được sử dụng:
    {000000} tương ứng với một số trong đó sẽ được phát triển trên mỗi% s. Nhập càng nhiều số không như độ dài mong muốn của các truy cập. Truy cập sẽ được hoàn thành vào số không trên bên trái để có nhiều số không như mặt nạ.
    {000000 + 000} giống như trước nhưng một bù đắp tương ứng với số bên phải dấu + là đã áp dụng bắt đầu từ ngày đầu tiên% s.
    {000000 @ x} giống như trước, nhưng truy cập được thiết lập lại để không khi tháng x đạt được (x từ 1 đến 12, hoặc từ 0 đến sử dụng những tháng đầu của năm tài chính được xác định trong cấu hình của bạn, hoặc 99 để thiết lập lại bằng không mỗi tháng ). Nếu tùy chọn này được sử dụng và x là 2 hoặc cao hơn, sau đó tự yy {} {mm} hoặc {yyyy} {mm} cũng được yêu cầu.
    {Đ} ngày (01-31).
    {Mm} tháng (01 đến 12).
    {Yyyy}, {yyyy} hoặc {y} năm trong 2, 4 hoặc 1 con số.
    -GenericMaskCodes2={} Cccc mã khách hàng về n ký tự
    {} Cccc000 mã khách hàng về n ký tự tiếp theo là một truy cập dành riêng cho khách hàng. Truy cập này dành riêng cho khách hàng được thiết lập lại tại cùng một thời gian hơn truy cập toàn cầu.
    {Tttt} Đoạn mã của loại của bên thứ ba trên n ký tự (xem các loại từ điển của bên thứ ba).
    -GenericMaskCodes3=Tất cả các nhân vật khác trong mặt nạ sẽ vẫn còn nguyên vẹn.
    Không gian không được phép.
    -GenericMaskCodes4a=Ví dụ trên% s thứ 99 của TheCompany bên thứ ba thực hiện 2007-01-31:
    -GenericMaskCodes4b=Ví dụ về bên thứ ba tạo ra trên 2007/03/01:
    -GenericMaskCodes4c=Ví dụ về sản phẩm tạo ra trên 2007/03/01:
    -GenericMaskCodes5=ABC {yy} {mm} - {000000} sẽ cung cấp cho ABC0701-000099
    {0000 + 100 @ 1} -ZZZ / đ {} / XXX sẽ cung cấp cho 0.199-ZZZ / 31 / XXX +GenericMaskCodes=Bạn có thể nhập bất kỳ số mặt nạ. Trong mặt nạ này, các thẻ sau đây có thể được sử dụng:
    {000000} tương ứng với một số trong đó sẽ được phát triển trên mỗi%s. Nhập càng nhiều số không như độ dài mong muốn của các truy cập. Truy cập sẽ được hoàn thành vào số không trên bên trái để có nhiều số không như mặt nạ.
    {000000+000} giống như trước nhưng một bù đắp tương ứng với số bên phải dấu + là đã áp dụng bắt đầu từ ngày đầu tiên %s.
    {000000@x} giống như trước, nhưng truy cập được thiết lập lại để không khi tháng x đạt được (x từ 1 đến 12, hoặc từ 0 đến sử dụng những tháng đầu của năm tài chính được xác định trong cấu hình của bạn, hoặc 99 để thiết lập lại bằng không mỗi tháng ). Nếu tùy chọn này được sử dụng và x là 2 hoặc cao hơn, sau đó tự {yy}{mm} hoặc {yyyy}{mm} cũng được yêu cầu.
    {dd} ngày (01 đến 31).
    {mm} tháng (01 đến 12).
    {yy}, {yyyy} hoặc {y} năm trên 2, 4 hoặc 1 con số.
    +GenericMaskCodes2={cccc} mã khách hàng về n ký tự
    {cccc000} mã khách hàng về n ký tự tiếp theo là một truy cập dành riêng cho khách hàng. Truy cập này dành riêng cho khách hàng được thiết lập lại tại cùng một thời gian hơn truy cập toàn cầu.
    {tttt} Đoạn mã của loại của bên thứ ba trên n ký tự (xem các loại từ điển của bên thứ ba).
    +GenericMaskCodes3=Tất cả các nhân vật khác trong mặt nạ sẽ vẫn còn nguyên vẹn.
    Khoảng trống không được phép.
    +GenericMaskCodes4a=Ví dụ trên %s thứ 99 của bên thứ ba TheCompany đã hoàn thành 2007-01-31:
    +GenericMaskCodes4b=Ví dụ về bên thứ ba tạo ra trên 2007-03-01:
    +GenericMaskCodes4c=Ví dụ về sản phẩm tạo ra trên 2007-03-01:
    +GenericMaskCodes5=b>ABC{yy}{mm}-{000000}     sẽ gửi cho ABC0701-000099
    {0000+100@1}-ZZZ/{dd}/XXX sẽ gửi cho 0199-ZZZ/31/XXX GenericNumRefModelDesc=Trả về một số tùy biến theo một mặt nạ được xác định. -ServerAvailableOnIPOrPort=Máy chủ có sẵn tại địa chỉ% s trên cổng% s -ServerNotAvailableOnIPOrPort=Máy chủ không có sẵn tại địa chỉ% s trên cổng% s +ServerAvailableOnIPOrPort=Máy chủ có sẵn tại địa chỉ %s trêncổng %s +ServerNotAvailableOnIPOrPort=Máy chủ không có sẵn tại địa chỉ %s trên cổng %s DoTestServerAvailability=Kết nối máy chủ thử nghiệm DoTestSend=Kiểm tra gửi DoTestSendHTML=Kiểm tra gửi HTML -ErrorCantUseRazIfNoYearInMask=Lỗi, không thể sử dụng tùy chọn @ để thiết lập lại truy cập mỗi năm nếu chuỗi {} hoặc {yy yyyy} không có trong mặt nạ. -ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Lỗi, không thể sử dụng tùy chọn @ nếu chuỗi {yy} {mm} hoặc {yyyy} {mm} không có trong mặt nạ. +ErrorCantUseRazIfNoYearInMask=Lỗi, không thể sử dụng tùy chọn @ để thiết lập lại truy cập mỗi năm nếu chuỗi {yy} hoặc {yyyy} không có trong mặt nạ. +ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Lỗi, không thể sử dụng tùy chọn @ nếu chuỗi {yy}{mm} hoặc {yyyy}{mm} không có trong mặt nạ. UMask=Umask tham số cho các tập tin mới trên hệ thống tập tin Unix / Linux / BSD / Mac. UMaskExplanation=Thông số này cho phép bạn xác định quyền truy cập thiết lập mặc định trên các tập tin được tạo ra bởi Dolibarr trên máy chủ (khi tải ví dụ).
    Nó phải là giá trị bát phân (ví dụ, 0666 có nghĩa là đọc và viết cho tất cả mọi người).
    Tham số này là vô dụng trên một máy chủ Windows. SeeWikiForAllTeam=Hãy xem các trang wiki cho danh sách đầy đủ của tất cả các diễn viên và các tổ chức của họ UseACacheDelay= Delay cho xuất khẩu đáp ứng bộ nhớ đệm trong vài giây (0 hoặc trống rỗng không có bộ nhớ cache) DisableLinkToHelpCenter=Ẩn liên kết "Cần giúp đỡ hoặc hỗ trợ" trên trang đăng nhập -DisableLinkToHelp=Ẩn liên kết "% s Hỗ trợ trực tuyến" trên menu bên trái +DisableLinkToHelp=Ẩn liên kết "%s Hỗ trợ trực tuyến" trên menu bên trái AddCRIfTooLong=Không có gói tự động, do đó, nếu dòng là ra khỏi trang trên các tài liệu bởi vì quá dài, bạn phải thêm mình xuống dòng trong khung văn bản. ModuleDisabled=Mô-đun bị vô hiệu hóa ModuleDisabledSoNoEvent=Mô-đun để vô hiệu hóa sự kiện không bao giờ tạo ra @@ -330,9 +333,9 @@ MinLength=Chiều dài tối thiểu LanguageFilesCachedIntoShmopSharedMemory=Tập tin .lang nạp vào bộ nhớ chia sẻ ExamplesWithCurrentSetup=Ví dụ với các thiết lập đang chạy ListOfDirectories=Danh sách các mẫu tài liệu mở thư mục -ListOfDirectoriesForModelGenODT=Danh sách các thư mục chứa tập tin mẫu với các định dạng tài liệu mở.

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

    File trong thư mục phải kết thúc với .odt. +ListOfDirectoriesForModelGenODT=Danh sách các thư mục chứa tập tin mẫu với các định dạng tài liệu mở.

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

    File trong thư mục phải kết thúc với .odt NumberOfModelFilesFound=Số ODT / tập tin mẫu ODS tìm thấy trong các thư mục -ExampleOfDirectoriesForModelGen=Ví dụ về các cú pháp:
    c: \\ mydir
    / Home / mydir
    DOL_DATA_ROOT / ECM / ecmdir +ExampleOfDirectoriesForModelGen=Ví dụ về các cú pháp:
    c:\\mydir
    /home/mydir
    DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
    Để biết làm thế nào để tạo ra odt mẫu tài liệu của bạn, trước khi lưu trữ chúng trong các thư mục, đọc tài liệu wiki: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Chức vụ Tên / LastName @@ -344,9 +347,9 @@ ThemeDir=Skins thư mục ConnectionTimeout=Connexion thời gian chờ ResponseTimeout=Đáp ứng thời gian chờ SmsTestMessage=Tin nhắn kiểm tra từ __PHONEFROM__ để __PHONETO__ -ModuleMustBeEnabledFirst=Mô-đun% s phải được kích hoạt trước khi sử dụng tính năng này. +ModuleMustBeEnabledFirst=Mô-đun%s phải được kích hoạt trước khi sử dụng tính năng này. SecurityToken=Chìa khóa để đảm bảo URL -NoSmsEngine=Không quản lý người gửi tin nhắn SMS có sẵn. Quản lý người gửi tin nhắn SMS không được cài đặt mặc định với phân phối (vì họ phụ thuộc vào một nhà cung cấp bên ngoài) nhưng bạn có thể tìm thấy một số trên% s +NoSmsEngine=Không quản lý người gửi tin nhắn SMS có sẵn. Quản lý người gửi tin nhắn SMS không được cài đặt mặc định với phân phối (vì họ phụ thuộc vào một nhà cung cấp bên ngoài) nhưng bạn có thể tìm thấy một số trên%s PDF=PDF PDFDesc=Bạn có thể thiết lập cho mỗi tùy chọn toàn cầu liên quan đến các thế hệ PDF PDFAddressForging=Quy định giả mạo địa chỉ hộp @@ -357,7 +360,7 @@ HideDetailsOnPDF=Ẩn dòng sản phẩm chi tiết về PDF được tạo ra Library=Thư viện UrlGenerationParameters=Các thông số để đảm bảo URL SecurityTokenIsUnique=Sử dụng một tham số securekey duy nhất cho mỗi URL -EnterRefToBuildUrl=Nhập tham chiếu cho đối tượng% s +EnterRefToBuildUrl=Nhập tham chiếu cho đối tượng %s GetSecuredUrl=Nhận URL tính ButtonHideUnauthorized=Ẩn nút cho các hành động trái phép, thay vì hiển thị các nút khuyết tật OldVATRates=Thuế suất thuế GTGT cũ @@ -384,20 +387,20 @@ ExtrafieldParamHelpcheckbox=Danh sách các thông số phải như quan trọng ExtrafieldParamHelpradio=Danh sách các thông số phải như quan trọng, giá trị

    ví dụ:
    1, value1
    2, value2
    3, value3
    ... ExtrafieldParamHelpsellist=Danh sách các thông số xuất phát từ một bảng
    Cú pháp: tên_bảng: label_field: id_field :: lọc
    Ví dụ: c_typent: libelle: id :: lọc

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

    Để có danh sách tùy thuộc vào khác:
    c_typent: libelle: id: parent_list_code | parent_column: bộ lọc LibraryToBuildPDF=Thư viện được sử dụng để xây dựng PDF -WarningUsingFPDF=Cảnh báo: conf.php của bạn có chứa dolibarr_pdf_force_fpdf chỉ = 1. Điều này có nghĩa là bạn sử dụng thư viện FPDF để tạo ra các tập tin PDF. Thư viện này là cũ và không hỗ trợ rất nhiều tính năng (Unicode, minh bạch, hình ảnh, ngôn ngữ Cyrillic, Arab và châu Á, ...), vì vậy bạn có thể gặp một số lỗi trong hệ PDF.
    Để giải quyết điều này và có một sự hỗ trợ đầy đủ các thế hệ PDF, xin vui lòng tải thư viện TCPDF , sau đó bình luận hoặc loại bỏ các dòng $ dolibarr_pdf_force_fpdf = 1, và thêm thay vì $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' +WarningUsingFPDF=Cảnh báo: conf.php của bạn có chứa trực tiếp dolibarr_pdf_force_fpdf=1.     Điều này có nghĩa là bạn sử dụng thư viện FPDF để tạo ra các tập tin PDF. Thư viện này là cũ và không hỗ trợ rất nhiều tính năng (Unicode, minh bạch, hình ảnh, ngôn ngữ Cyrillic, Arab và châu Á, ...), vì vậy bạn có thể gặp một số lỗi trong hệ PDF.
    Để giải quyết điều này và có một sự hỗ trợ đầy đủ các thế hệ PDF, xin vui lòng tải TCPDF library, sau đó bình luận hoặc loại bỏ các dòng $dolibarr_pdf_force_fpdf=1, và thêm thay vì $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' LocalTaxDesc=Một số quốc gia áp dụng 2 hoặc 3 loại thuế trên mỗi dòng hóa đơn. Nếu đây là trường hợp, chọn loại thuế thứ hai và thứ ba và tỷ lệ của nó. Loại có thể là:
    1: thuế địa phương áp dụng trên các sản phẩm và dịch vụ mà không có thùng (thùng không được áp dụng thuế địa phương)
    2: thuế địa phương áp dụng trên các sản phẩm và dịch vụ trước khi thùng (thùng được tính trên số tiền + localtax)
    3: thuế địa phương áp dụng vào các sản phẩm mà không có thùng (thùng không được áp dụng thuế địa phương)
    4: thuế địa phương áp dụng trên các sản phẩm trước khi thùng (thùng được tính trên số tiền + localtax)
    5: thuế địa phương áp dụng vào các dịch vụ mà không có thùng (thùng không được áp dụng thuế địa phương)
    6: thuế địa phương áp dụng vào các dịch vụ trước khi thùng (thùng được tính trên số tiền + localtax) SMS=SMS -LinkToTestClickToDial=Nhập số điện thoại để gọi cho thấy một liên kết để kiểm tra url ClickToDial cho người dùng% s +LinkToTestClickToDial=Nhập số điện thoại để gọi cho thấy một liên kết để kiểm tra url ClickToDial cho người dùng %s RefreshPhoneLink=Làm mới liên kết -LinkToTest=Liên kết có thể click được tạo ra cho người dùng% s (bấm số điện thoại để kiểm tra) +LinkToTest=Liên kết có thể click được tạo ra cho người dùng %s (bấm số điện thoại để kiểm tra) KeepEmptyToUseDefault=Giữ trống để sử dụng giá trị mặc định DefaultLink=Liên kết mặc định ValueOverwrittenByUserSetup=Cảnh báo, giá trị này có thể được ghi đè bởi các thiết lập cụ thể người sử dụng (mỗi người dùng có thể thiết lập url clicktodial riêng của mình) -ExternalModule=Bên ngoài mô-đun - cài đặt vào thư mục% s +ExternalModule=Bên ngoài mô-đun - cài đặt vào thư mục%s BarcodeInitForThirdparties=Init mã vạch hàng loạt cho thirdparties BarcodeInitForProductsOrServices=Init mã vạch khối lượng hoặc thiết lập lại các sản phẩm hoặc dịch vụ -CurrentlyNWithoutBarCode=Hiện tại, bạn có% s biên bản% s% s không có mã vạch xác định. -InitEmptyBarCode=Giá trị init cho các hồ sơ có sản phẩm nào tiếp theo% s +CurrentlyNWithoutBarCode=Hiện tại, bạn có %s biên bản %s %s không có mã vạch xác định. +InitEmptyBarCode=Giá trị init cho các hồ sơ có sản phẩm nào tiếp theo%s EraseAllCurrentBarCode=Xóa tất cả các giá trị hiện tại của mã vạch ConfirmEraseAllCurrentBarCode=Bạn Bạn có chắc chắn muốn xóa tất cả các giá trị mã vạch hiện nay? AllBarcodeReset=Tất cả giá trị mã vạch đã được loại bỏ @@ -415,14 +418,14 @@ Module10Name=Kế toán Module10Desc=Báo cáo kế toán đơn giản (các tạp chí, kim ngạch) dựa vào nội dung cơ sở dữ liệu. Không có điều phối. Module20Name=Đề xuất Module20Desc=Quản lý đề nghị thương mại -Module22Name=Thánh Lễ E-thư -Module22Desc=Thánh Lễ E-mail quản lý +Module22Name=Gửi Email hàng loạt +Module22Desc=Quản lý gửi Email hàng loạt Module23Name= Năng lượng Module23Desc= Giám sát việc tiêu thụ năng lượng Module25Name=Đơn đặt hàng của khách hàng Module25Desc=Quản lý đơn đặt hàng Module30Name=Hoá đơn -Module30Desc=Hóa đơn và lưu ý quản lý tín dụng cho khách hàng. Quản lý hóa đơn cho các nhà cung cấp +Module30Desc=Quản lý hóa đơn và phiếu ghi nợ cho khách hàng. Quản lý hóa đơn cho các nhà cung cấp Module40Name=Nhà cung cấp Module40Desc=Quản lý nhà cung cấp và mua (đơn đặt hàng và hoá đơn) Module42Name=Bản ghi @@ -431,33 +434,33 @@ Module49Name=Biên tập Module49Desc=Quản lý biên tập Module50Name=Sản phẩm Module50Desc=Quản lý sản phẩm -Module51Name=Thư hàng loạt -Module51Desc=Khối quản lý gửi thư giấy -Module52Name=Cổ phiếu +Module51Name=Gửi email hàng loạt +Module51Desc=Quản lý gửi thư giấy hàng loạt +Module52Name=Tồn kho Module52Desc=Quản lý tồn kho (sản phẩm) Module53Name=Dịch vụ Module53Desc=Quản lý dịch vụ -Module54Name=Hợp đồng -Module54Desc=Hợp đồng dịch vụ quản lý +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Mã vạch Module55Desc=Quản lý mã vạch Module56Name=Điện thoại Module56Desc=Tích hợp điện thoại -Module57Name=Đứng đơn đặt hàng -Module57Desc=Đơn đặt hàng thường trực và quản lý thu hồi +Module57Name=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 Module59Desc=Thêm chức năng để tạo ra tài khoản Bookmark4u từ một tài khoản Dolibarr Module70Name=Các can thiệp Module70Desc=Quản lý can thiệp -Module75Name=Chi phí chuyến đi và ghi chú -Module75Desc=Chi phí chuyến đi và ghi chú quản lý -Module80Name=Lô hàng -Module80Desc=Vận chuyển và quản lý trật tự giao hàng +Module75Name=Phiếu công tác phí +Module75Desc=Quản lý phiếu công tác phí +Module80Name=Vận chuyển +Module80Desc=Quản lý đơn giao hàng và vận chuyển Module85Name=Các ngân hàng và tiền mặt Module85Desc=Quản lý tài khoản ngân hàng hoặc tiền mặt -Module100Name=Trang web bên ngoài +Module100Name=External site Module100Desc=Module này bao gồm một trang web bên ngoài hoặc trang vào menu Dolibarr và xem nó vào một khung Dolibarr Module105Name=Mailman và SPIP Module105Desc=Giao diện Mailman hoặc SPIP cho mô-đun thành viên @@ -467,30 +470,26 @@ Module210Name=PostNuke Module210Desc=PostNuke hội nhập Module240Name=Xuất khẩu dữ liệu Module240Desc=Công cụ để xuất khẩu Dolibarr dữ liệu ngay (với các trợ lý) -Module250Name=Nhập khẩu dữ liệu -Module250Desc=Công cụ để nhập dữ liệu ngay trong Dolibarr (với trợ lý) +Module250Name=Import dữ liệu +Module250Desc=Công cụ để import dữ liệu ngay trong Dolibarr (với trợ lý) Module310Name=Thành viên -Module310Desc=Tổ chức quản lý thành viên +Module310Desc=Quản lý thành viên công ty 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=Các dự án -Module400Desc=Quản lý dự án bên trong mô-đun khác +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 hội nhập +Module410Desc=Webcalendar tích hợp Module500Name=Chi phí đặc biệt (thuế, đóng góp xã hội, cổ tức) Module500Desc=Quản lý chi phí đặc biệt như thuế, đóng góp xã hội, cổ tức và tiền lương Module510Name=Tiền lương Module510Desc=Quản lý lao động tiền lương và các khoản thanh toán Module600Name=Thông báo -Module600Desc=Gửi thông báo bằng thư điện tử trên một số sự kiện kinh doanh Dolibarr để liên lạc với bên thứ ba -Module700Name=Đóng góp +Module600Desc=Gửi thông báo EMail trên một số sự kiện kinh doanh Dolibarr để liên hệ của bên thứ ba (thiết lập được xác định trên mỗi thirdparty) +Module700Name=Tài trợ Module700Desc=Quản lý tài trợ -Module800Name=OsCommerce bởi truy cập cơ sở dữ liệu trực tiếp -Module800Desc=Giao diện hiển thị một cửa hàng osCommerce hoặc OSCSS thông qua truy cập cơ sở dữ liệu trực tiếp -Module900Name=OsCommerce bởi WS -Module900Desc=Giao diện hiển thị một cửa hàng osCommerce thông qua các dịch vụ Web. Module này requiere bạn cài đặt các thành phần từ / oscommerce_ws / ws_server vào máy chủ osCommerce của bạn. Xem tập tin README trong / oscommerce_ws / ws_server. Module1200Name=Mantis Module1200Desc=Mantis hội nhập Module1400Name=Kế toán @@ -499,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ự @@ -507,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 @@ -518,20 +521,20 @@ Module5000Name=Nhiều công ty Module5000Desc=Cho phép bạn quản lý nhiều công ty Module6000Name=Quy trình làm việc Module6000Desc=Quản lý công việc -Module20000Name=Ngày lễ -Module20000Desc=Kê khai, theo nhân viên lễ +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 Module50100Desc=Quan điểm của mô-đun bán hàng -Module50200Name= Paypal -Module50200Desc= Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với Paypal +Module50200Name=Paypal +Module50200Desc=Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với Paypal Module50400Name=Kế toán (nâng cao) Module50400Desc=Kế toán quản trị (đôi bên) 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 @@ -558,7 +561,7 @@ Permission31=Ðọc sản phẩm Permission32=Tạo / chỉnh sửa sản phẩm Permission34=Xóa sản phẩm Permission36=Xem / quản lý sản phẩm ẩn -Permission38=Sản phẩm xuất khẩu +Permission38=Export products Permission41=Đọc các dự án (dự án được chia sẻ và các dự án tôi liên lạc) Permission42=Tạo / sửa đổi dự án (dự án chung và các dự án tôi liên lạc) Permission44=Xóa dự án (dự án chung và các dự án tôi liên lạc) @@ -570,11 +573,11 @@ Permission71=Thành viên đã đọc Permission72=Tạo / thay đổi thành viên Permission74=Xóa thành viên Permission75=Thiết lập các loại và các thuộc tính cho các thành viên -Permission76=Xuất dữ liệu ngay +Permission76=Export datas Permission78=Đọc đăng ký Permission79=Tạo / sửa đổi đăng ký -Permission81=Khách hàng đã đọc đơn đặt hàng -Permission82=Tạo / sửa đổi khách hàng đơn đặt hàng +Permission81=Xem đơn đặt hàng của khách hàng +Permission82=Tạo / sửa đổi đơn đặt hàng của khách hàng Permission84=Xác nhận đơn đặt hàng cho khách hàng Permission86=Gửi đơn đặt hàng cho khách hàng Permission87=Đóng khách hàng đơn đặt hàng @@ -596,29 +599,30 @@ Permission113=Thiết lập tài khoản financiel (tạo, quản lý danh mục Permission114=Củng cố giao dịch Permission115=Các giao dịch xuất khẩu, báo cáo tài khoản Permission116=Chuyển giữa các tài khoản -Permission117=Quản lý kiểm tra cử +Permission117=Quản lý việc gửi séc Permission121=Đọc các bên thứ ba liên quan đến người sử dụng Permission122=Tạo / chỉnh sửa các bên thứ ba liên quan đến người sử dụng Permission125=Xóa các bên thứ ba liên quan đến người sử dụng -Permission126=Các bên thứ ba xuất khẩu +Permission126=Export third parties Permission141=Đọc các dự án (cũng tin tôi không liên lạc với) Permission142=Tạo / sửa đổi dự án (cũng tin tôi không liên lạc với) Permission144=Xóa dự án (cũng tin tôi không liên lạc với) -Permission146=Đọc cung cấp +Permission146=Xem nhà cung cấp Permission147=Đọc số liệu thống kê Permission151=Đọc lệnh đứng Permission152=Tạo / sửa đổi một yêu cầu đơn đặt hàng thường trực Permission153=Đơn đặt hàng đứng truyền thu Permission154=Tín dụng / từ chối đứng đơn đặt hàng biên lai -Permission161=Đọc hợp đồng -Permission162=Tạo / sửa đổi hợp đồng -Permission163=Kích hoạt dịch vụ của hợp đồng -Permission164=Vô hiệu hoá một dịch vụ của hợp đồng -Permission165=Xóa hợp đồng -Permission171=Đọc đi -Permission172=Tạo / sửa đổi các chuyến đi -Permission173=Xóa các chuyến đi -Permission178=Các chuyến đi xuất khẩu +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Đọc các chuyến đi và các chi phí (riêng và cấp dưới của mình) +Permission172=Tạo / chỉnh sửa các chuyến đi và các chi phí +Permission173=Xóa các chuyến đi và các chi phí +Permission174=Đọc tất cả các chuyến đi và các chi phí +Permission178=Xuất dữ liệu chuyến đi và chi phí Permission180=Đọc cung cấp Permission181=Đọc đơn đặt hàng nhà cung cấp Permission182=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp @@ -675,7 +679,7 @@ Permission300=Đọc mã vạch Permission301=Tạo / chỉnh sửa mã vạch Permission302=Xóa mã vạch Permission311=Đọc dịch vụ -Permission312=Chỉ định dịch vụ ký hợp đồng +Permission312=Assign service/subscription to contract Permission331=Đánh dấu đã đọc Permission332=Tạo / chỉnh sửa bookmark Permission333=Xóa dấu trang @@ -683,12 +687,12 @@ Permission341=Đọc các điều khoản riêng của mình Permission342=Tạo / chỉnh sửa thông tin người dùng của mình Permission343=Thay đổi mật khẩu của mình Permission344=Sửa đổi điều khoản riêng của mình -Permission351=Nhóm đọc -Permission352=Đọc các nhóm quyền +Permission351=Đọc thông tin nhóm +Permission352=Đọc thông tin về quyền của nhóm Permission353=Tạo / sửa đổi nhóm Permission354=Xóa hoặc vô hiệu hóa các nhóm -Permission358=Người sử dụng xuất khẩu -Permission401=Ðọc giảm giá +Permission358=Xuất dữ liệu người dùng +Permission401=Ðọc thông tin giảm giá Permission402=Tạo / sửa đổi giảm giá Permission403=Xác nhận giảm giá Permission404=Xóa giảm giá @@ -696,24 +700,24 @@ Permission510=Đọc Lương Permission512=Tạo / sửa đổi tiền lương Permission514=Xóa lương Permission517=Xuất khẩu lương -Permission531=Đọc dịch vụ +Permission531=Đọc thông tin dịch vụ Permission532=Tạo / thay đổi các dịch vụ Permission534=Xóa dịch vụ Permission536=Xem / quản lý dịch vụ ẩn -Permission538=Dịch vụ xuất khẩu -Permission701=Đọc đóng góp +Permission538=Xuất dữ liệu Dịch vụ +Permission701=Đọc thông tin Tài trợ Permission702=Tạo / sửa đổi hiến Permission703=Xóa tài trợ -Permission1001=Đọc cổ phiếu -Permission1002=Tạo / sửa đổi cổ phiếu -Permission1003=Xóa cổ phiếu -Permission1004=Đọc chuyển động chứng khoán -Permission1005=Tạo / sửa đổi chuyển động chứng khoán +Permission1001=Đọc tồn kho +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses +Permission1004=Đọc chuyển động tồn kho +Permission1005=Tạo / sửa đổi chuyển động tồn kho Permission1101=Đọc lệnh giao hàng Permission1102=Tạo / chỉnh sửa lệnh giao hàng Permission1104=Xác nhận lệnh giao hàng Permission1109=Xóa lệnh giao hàng -Permission1181=Đọc cung cấp +Permission1181=Đọc thông tin Nhà cung cấp Permission1182=Đọc đơn đặt hàng nhà cung cấp Permission1183=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp Permission1184=Xác nhận đơn đặt hàng nhà cung cấp @@ -731,18 +735,18 @@ Permission1235=Gửi hóa đơn nhà cung cấp qua email Permission1236=Nhà cung cấp xuất hóa đơn, thuộc tính và thanh toán Permission1237=Đơn đặt hàng nhà cung cấp xuất khẩu và chi tiết của họ Permission1251=Chạy nhập khẩu khối lượng của dữ liệu bên ngoài vào cơ sở dữ liệu (tải dữ liệu) -Permission1321=Hóa đơn xuất khẩu của khách hàng, các thuộc tính và thanh toán -Permission1421=Đơn đặt hàng xuất khẩu và các thuộc tính -Permission23001 = Đọc nhiệm vụ theo lịch trình +Permission1321=Xuất dữ liệu Hóa đơn của khách hàng, các thuộc tính và thanh toán +Permission1421=Xuất dữ liệu Đơn đặt hàng và các thuộc tính +Permission23001 = Đọc thông tin Lịch trình công việc Permission23002 = Tạo / cập nhật theo lịch trình công việc -Permission23003 = Xóa nhiệm vụ theo lịch trình -Permission23004 = Thực hiện nhiệm vụ theo lịch trình -Permission2401=Đọc hành động (sự kiện hay nhiệm vụ) liên quan đến tài khoản của mình -Permission2402=Tạo / sửa đổi các hành động (sự kiện hay nhiệm vụ) liên quan đến tài khoản của mình -Permission2403=Xóa hành động (sự kiện hay nhiệm vụ) liên quan đến tài khoản của mình -Permission2411=Đọc hành động (sự kiện hay nhiệm vụ) của người khác -Permission2412=Tạo / sửa đổi các hành động (sự kiện hay nhiệm vụ) của người khác -Permission2413=Xóa hành động (sự kiện hay nhiệm vụ) của người khác +Permission23003 = Xóa Lịch trình công việc +Permission23004 = Thực hiện Lịch trình công việc +Permission2401=Đọc hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình +Permission2402=Tạo / sửa đổi các hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình +Permission2403=Xóa hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình +Permission2411=Đọc hành động (sự kiện hay tác vụ) của người khác +Permission2412=Tạo / sửa đổi các hành động (sự kiện hay tác vụ) của người khác +Permission2413=Xóa hành động (sự kiện hay tác vụ) của người khác Permission2501=Đọc / Tải tài liệu Permission2502=Tải về tài liệu Permission2503=Nộp hoặc xóa tài liệu @@ -764,12 +768,12 @@ DictionaryCanton=Nhà nước / Cantons DictionaryRegion=Khu vực DictionaryCountry=Nước DictionaryCurrency=Đơn vị tiền tệ -DictionaryCivility=Danh hiệu văn minh +DictionaryCivility=Tiêu đề lịch sự DictionaryActions=Loại sự kiện chương trình nghị sự DictionarySocialContributions=Các loại đóng góp xã hội DictionaryVAT=Giá thuế GTGT, thuế tiêu thụ giá DictionaryRevenueStamp=Số tiền tem doanh thu -DictionaryPaymentConditions=Phương thức thanh toán +DictionaryPaymentConditions=Điều khoản thanh toán DictionaryPaymentModes=Phương thức thanh toán DictionaryTypeContact=Liên hệ / loại Địa chỉ DictionaryEcotaxe=Ecotax (WEEE) @@ -782,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 @@ -854,7 +859,7 @@ Database=Cơ sở dữ liệu DatabaseServer=Máy chủ cơ sở dữ liệu DatabaseName=Tên cơ sở dữ liệu DatabasePort=Cổng cơ sở dữ liệu -DatabaseUser=Sử dụng cơ sở dữ liệu +DatabaseUser=Cơ sở dữ liệu người dùng DatabasePassword=Cơ sở dữ liệu mật khẩu DatabaseConfiguration=Thiết lập cơ sở dữ liệu Tables=Bàn @@ -873,14 +878,14 @@ SystemUpdate=Cập nhật hệ thống SystemSuccessfulyUpdate=Hệ thống của bạn đã được cập nhật successfuly MenuCompanySetup=Công ty / cơ sở MenuNewUser=Người dùng mới -MenuTopManager=Quản lý đơn hàng đầu +MenuTopManager=Quản lý menu phía trên MenuLeftManager=Quản lý menu bên trái -MenuManager=Quản lý đơn +MenuManager=Quản lý menu MenuSmartphoneManager=Quản lý đơn điện thoại thông minh -DefaultMenuTopManager=Quản lý đơn hàng đầu +DefaultMenuTopManager=Quản lý menu phía trên DefaultMenuLeftManager=Quản lý menu bên trái -DefaultMenuManager= Quản lý đơn tiêu chuẩn -DefaultMenuSmartphoneManager=Quản lý đơn điện thoại thông minh +DefaultMenuManager= Quản lý menu chuẩn +DefaultMenuSmartphoneManager=Quản lý menu điện thoại thông minh Skin=Skin chủ đề DefaultSkin=Giao diện mặc định da MaxSizeList=Max length cho danh sách @@ -891,9 +896,10 @@ 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=Công ty / thông tin nền tảng -CompanyIds=Bản sắc công ty / cơ sở +CompanyInfo=Thông tin Công ty / cơ sở +CompanyIds=Xác định Công ty/ Cơ sở CompanyName=Tên CompanyAddress=Địa chỉ CompanyZip=Zip @@ -904,7 +910,7 @@ Logo=Logo DoNotShow=Không hiển thị DoNotSuggestPaymentMode=Không đề nghị NoActiveBankAccountDefined=Không có tài khoản ngân hàng hoạt động được xác định -OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng% s +OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng%s BankModuleNotActive=Ngân hàng mô-đun tài khoản chưa được kích hoạt ShowBugTrackLink=Hiển thị liên kết "Báo cáo một lỗi" ShowWorkBoard=Xem "bàn làm việc" trên trang chủ @@ -913,7 +919,7 @@ Delays=Sự chậm trễ DelayBeforeWarning=Chậm trễ trước khi cảnh báo DelaysBeforeWarning=Sự chậm trễ trước khi cảnh báo DelaysOfToleranceBeforeWarning=Sự chậm trễ khoan dung trước khi cảnh báo -DelaysOfToleranceDesc=Màn hình này cho phép bạn xác định sự chậm trễ trước khi chấp nhận một cảnh báo được báo cáo trên màn hình với Picto% s cho mỗi phần tử cuối. +DelaysOfToleranceDesc=Màn hình này cho phép bạn xác định sự chậm trễ trước khi chấp nhận một cảnh báo được báo cáo trên màn hình với Picto%s cho mỗi phần tử cuối. Delays_MAIN_DELAY_ACTIONS_TODO=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các sự kiện theo kế hoạch chưa thực hiện Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về đơn đặt hàng chưa qua chế biến Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo các nhà cung cấp đơn đặt hàng chưa qua chế biến @@ -955,13 +961,13 @@ DisplayDesc=Bạn có thể chọn từng thông số liên quan đến Dolibarr AvailableModules=Các mô-đun có sẵn ToActivateModule=Để kích hoạt mô-đun, đi vào thiết lập trong khu vực (chủ-> Setup-> Modules). SessionTimeOut=Thời gian cho phiên -SessionExplanation=Bảo lãnh này con số đó sẽ không bao giờ hết hạn phiên trước sự chậm trễ này, nếu phiên sạch được thực hiện bằng nội PHP phiên sạch hơn (và không có gì khác). Nội phiên PHP sạch hơn không làm bảo lãnh rằng phiên sẽ hết hiệu lực ngay sau khi sự chậm trễ này. Nó sẽ hết hạn, sau khi sự chậm trễ này, và khi phiên sạch hơn là chạy, vì vậy mỗi% s /% s truy cập, nhưng chỉ trong thời gian truy cập được thực hiện bởi các phần khác.
    Lưu ý: trên một số máy chủ với một cơ chế phiên làm sạch bên ngoài (cron dưới Debian, Ubuntu ...), các phiên giao dịch có thể bị phá hủy sau một thời gian được xác định bởi session.gc_maxlifetime mặc định, không có vấn đề gì giá trị nhập ở đây. +SessionExplanation=Bảo lãnh này con số đó sẽ không bao giờ hết hạn phiên trước sự chậm trễ này, nếu phiên sạch được thực hiện bằng nội PHP phiên sạch hơn (và không có gì khác). Nội phiên PHP sạch hơn không làm bảo lãnh rằng phiên sẽ hết hiệu lực ngay sau khi sự chậm trễ này. Nó sẽ hết hạn, sau khi sự chậm trễ này, và khi phiên sạch hơn là chạy, vì vậy mỗi%s /% s truy cập, nhưng chỉ trong thời gian truy cập được thực hiện bởi các phần khác.
    Lưu ý: trên một số máy chủ với một cơ chế phiên làm sạch bên ngoài (cron dưới Debian, Ubuntu ...), các phiên giao dịch có thể bị phá hủy sau một thời gian được xác định bởi session.gc_maxlifetime mặc định, không có vấn đề gì giá trị nhập ở đây. TriggersAvailable=Kích hoạt sẵn TriggersDesc=Gây nên là các tập tin mà sẽ thay đổi hành vi của Dolibarr quy trình làm việc một lần sao chép vào thư mục htdocs / core / gây nên. Họ nhận ra những hành động mới, kích hoạt các sự kiện Dolibarr (công ty mới thành lập, xác nhận hóa đơn, ...). TriggerDisabledByName=Gây ra trong tập tin này đang bị vô hiệu hóa bởi các hậu tố -NORUN trong tên của họ. -TriggerDisabledAsModuleDisabled=Gây ra trong tập tin này bị vô hiệu hóa như mô-đun% s bị vô hiệu hóa. +TriggerDisabledAsModuleDisabled=Gây ra trong tập tin này bị vô hiệu hóa như mô-đun%s bị vô hiệu hóa. TriggerAlwaysActive=Gây ra trong tập tin này luôn hoạt động, nào là các mô-đun Dolibarr kích hoạt. -TriggerActiveAsModuleActive=Triggers trong tập tin này đang hoạt động như mô-đun% s được kích hoạt. +TriggerActiveAsModuleActive=Triggers trong tập tin này đang hoạt động như mô-đun%s được kích hoạt. GeneratedPasswordDesc=Xác định đây mà cai trị mà bạn muốn sử dụng để tạo mật khẩu mới nếu bạn hỏi có tự động tạo ra mật khẩu DictionaryDesc=Xác định đây tất cả dữ liệu ngay tài liệu tham khảo. Bạn có thể hoàn thành được xác định trước giá trị với bạn. ConstDesc=Trang này cho phép bạn chỉnh sửa tất cả các thông số khác không có sẵn trong các trang trước đó. Họ được dành riêng cho các nhà phát triển các thông số cao cấp hoặc cho troubleshouting. @@ -990,11 +996,11 @@ RestoreDesc=Để khôi phục lại một bản sao lưu Dolibarr, bạn phải RestoreDesc2=* Khôi phục tập tin lưu trữ (file zip ví dụ) các tài liệu thư mục để trích xuất các tập tin trong cây thư mục tài liệu của một cài đặt Dolibarr mới hoặc vào văn bản hiện hành này directoy (% s). RestoreDesc3=* Khôi phục dữ liệu từ một tập tin dump sao lưu, vào cơ sở dữ liệu cài đặt Dolibarr mới hoặc vào cơ sở dữ liệu cài đặt hiện tại này. Cảnh báo, một khi khôi phục xong, bạn phải sử dụng một tên đăng nhập / mật khẩu, đã tồn tại khi sao lưu đã được thực hiện, để kết nối lại. Để khôi phục lại cơ sở dữ liệu sao lưu vào cài đặt hiện tại, bạn có thể làm theo trợ lý này. RestoreMySQL=MySQL nhập khẩu -ForcedToByAModule= Quy luật này buộc phải% s bởi một mô-đun kích hoạt +ForcedToByAModule= Quy luật này buộc phải%s bởi một mô-đun kích hoạt PreviousDumpFiles=Sao lưu cơ sở dữ liệu tập tin dump có sẵn WeekStartOnDay=Ngày đầu tiên của tuần -RunningUpdateProcessMayBeRequired=Chạy quá trình nâng cấp dường như được yêu cầu (Chương trình phiên bản% s khác với phiên bản cơ sở dữ liệu% s) -YouMustRunCommandFromCommandLineAfterLoginToUser=Bạn phải chạy lệnh này từ dòng lệnh sau khi đăng nhập vào một vỏ với người sử dụng% s hoặc bạn phải thêm tùy chọn -W ở cuối dòng lệnh để cung cấp% s mật khẩu. +RunningUpdateProcessMayBeRequired=Chạy quá trình nâng cấp dường như được yêu cầu (Chương trình phiên bản%s khác với phiên bản cơ sở dữ liệu%s) +YouMustRunCommandFromCommandLineAfterLoginToUser=Bạn phải chạy lệnh này từ dòng lệnh sau khi đăng nhập vào một vỏ với người sử dụng%s hoặc bạn phải thêm tùy chọn -W ở cuối dòng lệnh để cung cấp%s mật khẩu. YourPHPDoesNotHaveSSLSupport=Chức năng SSL không có sẵn trong chương trình PHP DownloadMoreSkins=Nhiều giao diện để tải về SimpleNumRefModelDesc=Trả về số tài liệu tham khảo với các định dạng% syymm-nnnn nơi yyyy là năm, mm là tháng và NNNN là một chuỗi không có lỗ và không có thiết lập lại @@ -1012,7 +1018,7 @@ MAIN_PROXY_HOST=Tên / Địa chỉ của máy chủ proxy MAIN_PROXY_PORT=Cổng của máy chủ proxy MAIN_PROXY_USER=Đăng nhập để sử dụng máy chủ proxy MAIN_PROXY_PASS=Mật khẩu để sử dụng máy chủ proxy -DefineHereComplementaryAttributes=Xác định đây tất cả các thuộc tính, không phải đã có sẵn theo mặc định, và bạn muốn được hỗ trợ cho% s. +DefineHereComplementaryAttributes=Xác định đây tất cả các thuộc tính, không phải đã có sẵn theo mặc định, và bạn muốn được hỗ trợ cho%s. ExtraFields=Thuộc tính bổ sung ExtraFieldsLines=Thuộc tính bổ sung (dòng) ExtraFieldsThirdParties=Thuộc tính bổ sung (của bên thứ ba) @@ -1025,7 +1031,7 @@ ExtraFieldsSupplierOrders=Thuộc tính bổ sung (đơn đặt hàng) ExtraFieldsSupplierInvoices=Thuộc tính bổ sung (hoá đơn) ExtraFieldsProject=Thuộc tính bổ sung (dự án) ExtraFieldsProjectTask=Thuộc tính bổ sung (nhiệm vụ) -ExtraFieldHasWrongValue=Thuộc tính% s có giá trị sai. +ExtraFieldHasWrongValue=Thuộc tính%s có giá trị sai. AlphaNumOnlyCharsAndNoSpace=chỉ alphanumericals ký tự không có không gian AlphaNumOnlyLowerCharsAndNoSpace=chỉ alphanumericals và ký tự chữ thường không có không gian SendingMailSetup=Thiết lập sendings qua email @@ -1035,25 +1041,24 @@ PathDirectory=Thư mục SendmailOptionMayHurtBuggedMTA=Tính năng gửi mail sử dụng phương pháp "PHP thư trực tiếp" sẽ tạo ra một tin nhắn qua thư có thể được phân tích cú pháp không chính xác bởi một số máy chủ email nhận được. Kết quả là một số mail không thể được đọc bởi những người tổ chức bởi thoose nền tảng nghe trộm. Đó là trường hợp đối với một số nhà cung cấp Internet (Ví dụ: Orange tại Pháp). Đây không phải là một vấn đề vào Dolibarr cũng không vào PHP nhưng nhận được vào máy chủ mail. Tuy nhiên bạn có thể thêm tùy chọn MAIN_FIX_FOR_BUGGED_MTA tới 1 vào thiết lập - khác để sửa đổi Dolibarr để tránh điều này. Tuy nhiên, bạn có thể gặp vấn đề với các máy chủ khác mà triệt để tôn trọng các tiêu chuẩn SMTP. Các giải pháp khác (recommanded) là sử dụng phương pháp "ổ cắm SMTP thư viện" mà không có nhược điểm. TranslationSetup=Cấu hình de la Traduction TranslationDesc=Lựa chọn ngôn ngữ hiển thị trên màn hình có thể được chỉnh sửa:
    * Trên toàn cầu từ menu Home - Cài đặt - Hiển thị
    * Đối với người dùng chỉ từ tab hiển thị tài khoản của người sử dụng thẻ (click vào đăng nhập trên đầu trang của màn hình). -TotalNumberOfActivatedModules=Tổng số các module tính năng kích hoạt:% s +TotalNumberOfActivatedModules=Tổng số các module tính năng kích hoạt: %s YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép -ClassNotFoundIntoPathWarning=Lớp% s không tìm thấy con đường vào PHP +ClassNotFoundIntoPathWarning=Lớp%s không tìm thấy con đường vào PHP YesInSummer=Có trong mùa hè OnlyFollowingModulesAreOpenedToExternalUsers=Lưu ý, các mô-đun chỉ sau đây được mở cho người dùng bên ngoài (bất cứ điều gì là sự cho phép của người dùng như vậy): SuhosinSessionEncrypt=Lưu trữ phiên mã hóa bằng Suhosin -ConditionIsCurrently=Điều kiện hiện nay là% s -TestNotPossibleWithCurrentBrowsers=Tự động phát hiện không thể -YouUseBestDriver=Bạn sử dụng trình điều khiển% s đó là điều khiển tốt nhất có sẵn hiện nay. -YouDoNotUseBestDriver=Bạn sử dụng ổ đĩa% s% s, nhưng lái xe được khuyến khích. -NbOfProductIsLowerThanNoPb=Bạn chỉ có% s sản phẩm / dịch vụ vào cơ sở dữ liệu. Điều này không yêu cầu bất kỳ tối ưu hóa đặc biệt. +ConditionIsCurrently=Điều kiện hiện nay là %s +YouUseBestDriver=Bạn sử dụng trình điều khiển%s đó là điều khiển tốt nhất có sẵn hiện nay. +YouDoNotUseBestDriver=Bạn sử dụng ổ đĩa%s%s, nhưng lái xe được khuyến khích. +NbOfProductIsLowerThanNoPb=Bạn chỉ có%s sản phẩm / dịch vụ vào cơ sở dữ liệu. Điều này không yêu cầu bất kỳ tối ưu hóa đặc biệt. SearchOptim=Tối ưu hóa tìm kiếm -YouHaveXProductUseSearchOptim=Bạn có sản phẩm% s vào cơ sở dữ liệu. Bạn nên thêm PRODUCT_DONOTSEARCH_ANYWHERE liên tục tới 1 vào Home-Setup khác, bạn giới hạn tìm kiếm với đầu dây làm cho cơ sở dữ liệu có thể sử dụng chỉ số và bạn sẽ nhận được một phản ứng ngay lập tức. -BrowserIsOK=Bạn đang sử dụng trình duyệt web% s. Trình duyệt này là ok cho bảo mật và hiệu suất. -BrowserIsKO=Bạn đang sử dụng trình duyệt web% s. Trình duyệt này được biết đến là một lựa chọn tốt cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi recommand bạn sử dụng Firefox, Chrome, Opera hay Safari. +YouHaveXProductUseSearchOptim=Bạn có sản phẩm%s vào cơ sở dữ liệu. Bạn nên thêm PRODUCT_DONOTSEARCH_ANYWHERE liên tục tới 1 vào Home-Setup khác, bạn giới hạn tìm kiếm với đầu dây làm cho cơ sở dữ liệu có thể sử dụng chỉ số và bạn sẽ nhận được một phản ứng ngay lập tức. +BrowserIsOK=Bạn đang sử dụng trình duyệt web%s. Trình duyệt này là ok cho bảo mật và hiệu suất. +BrowserIsKO=Bạn đang sử dụng trình duyệt web%s. Trình duyệt này được biết đến là một lựa chọn tốt cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi recommand bạn sử dụng Firefox, Chrome, Opera hay Safari. XDebugInstalled=XDebug được tải. XCacheInstalled=XCache được tải. AddRefInList=Hiển thị khách hàng / nhà cung cấp ref vào danh sách (chọn danh sách hoặc combobox) và hầu hết các siêu liên kết -FieldEdition=Edition của trường% s +FieldEdition=Edition của trường%s FixTZ=Sửa chữa TimeZone FillThisOnlyIfRequired=Ví dụ: 2 (chỉ điền nếu múi giờ bù đắp vấn đề có nhiều kinh nghiệm) GetBarCode=Nhận mã vạch @@ -1074,11 +1079,11 @@ UserMailRequired=Email cần thiết để tạo một người dùng mới CompanySetup=Thiết lập các công ty mô-đun CompanyCodeChecker=Module cho thế hệ thứ ba bên mã và kiểm tra (khách hàng hoặc nhà cung cấp) AccountCodeManager=Module cho hệ mã kế toán (khách hàng hoặc nhà cung cấp) -ModuleCompanyCodeAquarium=Quay trở lại một mã số kế toán được xây dựng bởi:
    % S tiếp theo là mã nhà cung cấp bên thứ ba cho một mã nhà cung cấp kế toán,
    % S tiếp theo là mã khách hàng của bên thứ ba cho một mã số kế toán của khách hàng. +ModuleCompanyCodeAquarium=Quay trở lại một mã số kế toán được xây dựng bởi:
    %s tiếp theo là mã nhà cung cấp bên thứ ba cho một mã nhà cung cấp kế toán,
    %s tiếp theo là mã khách hàng của bên thứ ba cho một mã số kế toán của khách hàng. ModuleCompanyCodePanicum=Trả lại một mã kế toán sản phẩm nào. ModuleCompanyCodeDigitaria=Kế toán đang phụ thuộc vào mã của bên thứ ba. Các mã được bao gồm các ký tự "C" ở vị trí đầu tiên theo sau là 5 ký tự đầu tiên của mã của bên thứ ba. UseNotifications=Sử dụng thông báo -NotificationsDesc=Email thông báo tính năng cho phép bạn để âm thầm gửi thư tự động, đối với một số sự kiện Dolibarr, cho bên thứ ba (khách hàng hoặc nhà cung cấp) được cấu hình để. Lựa chọn các địa chỉ liên lạc thông báo và mục tiêu hoạt động được thực hiện một bên thứ ba lúc. +NotificationsDesc=Email thông báo tính năng cho phép bạn để âm thầm gửi mail tự động, cho một số sự kiện Dolibarr. Mục tiêu của thông báo có thể được định nghĩa:
    * Mỗi các bên thứ ba liên hệ (khách hàng hoặc nhà cung cấp), một bên thứ ba tại thời gian.
    * Hoặc bằng cách thiết lập một địa chỉ email mục tiêu toàn cầu về trang thiết lập mô-đun. ModelModules=Tài liệu mẫu DocumentModelOdt=Tạo tài liệu từ OpenDocuments mẫu (.odt hoặc .ods tập tin cho OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Watermark vào dự thảo văn bản @@ -1100,9 +1105,9 @@ WebCalServer=Máy chủ cơ sở dữ liệu lưu trữ lịch WebCalDatabaseName=Tên cơ sở dữ liệu WebCalUser=Người sử dụng cơ sở dữ liệu truy cập WebCalSetupSaved=Thiết lập Webcalendar lưu thành công. -WebCalTestOk=Kết nối với máy chủ '% s' vào cơ sở dữ liệu '% s' với người sử dụng '% s' thành công. -WebCalTestKo1=Kết nối với máy chủ '% s' thành công nhưng cơ sở dữ liệu '% s' không thể đạt được. -WebCalTestKo2=Kết nối với máy chủ '% s' với người dùng% s 'thất bại. +WebCalTestOk=Kết nối với máy chủ '%s' vào cơ sở dữ liệu '%s' với người sử dụng '%s' thành công. +WebCalTestKo1=Kết nối với máy chủ '%s' thành công nhưng cơ sở dữ liệu '%s' không thể đạt được. +WebCalTestKo2=Kết nối với máy chủ '%s' với người dùng '%s' thất bại. WebCalErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu Webcalendar. WebCalAddEventOnCreateActions=Thêm sự kiện lịch về các hoạt động tạo ra WebCalAddEventOnCreateCompany=Thêm sự kiện lịch trên các công ty tạo ra @@ -1110,7 +1115,7 @@ WebCalAddEventOnStatusPropal=Thêm sự kiện lịch trên đề xuất thươn WebCalAddEventOnStatusContract=Thêm sự kiện lịch trên hợp đồng thay đổi trạng thái WebCalAddEventOnStatusBill=Thêm sự kiện lịch trên hóa đơn thay đổi trạng thái WebCalAddEventOnStatusMember=Thêm sự kiện lịch trên các thành viên thay đổi trạng thái -WebCalUrlForVCalExport=Một liên kết xuất khẩu sang định dạng% s có sẵn tại liên kết sau đây:% s +WebCalUrlForVCalExport=Một liên kết xuất khẩu sang định dạng %s có sẵn tại liên kết sau đây: %s WebCalCheckWebcalSetup=Có thể thiết lập mô-đun Webcal là không đúng. ##### Invoices ##### BillsSetup=Thiết lập mô-đun hóa đơn @@ -1142,14 +1147,16 @@ AddDeliveryAddressAbility=Thêm khả năng ngày giao hàng UseOptionLineIfNoQuantity=Một dòng sản phẩm / dịch vụ với một số lượng không được coi là một lựa chọn FreeLegalTextOnProposal=Miễn phí văn bản trên đề xuất thương mại WatermarkOnDraftProposal=Watermark về dự thảo đề xuất thương mại (nếu không có sản phẩm nào) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### -OrdersSetup=Thiết lập trật tự quản lý -OrdersNumberingModules=Đơn đặt hàng đánh số mô hình -OrdersModelModule=Tài liệu để mô hình +OrdersSetup=Thiết lập quản lý đơn hàng +OrdersNumberingModules=Mô hình đánh số đơn hàng +OrdersModelModule=Mô hình tài liệu về đơn hàng HideTreadedOrders=Ẩn các đơn đặt hàng được xử lý hoặc hủy bỏ trong danh sách ValidOrderAfterPropalClosed=Để xác nhận đơn đặt hàng sau khi đề xuất gần hơn, làm cho nó có thể không bước theo lệnh tạm thời FreeLegalTextOnOrders=Miễn phí văn bản trên đơn đặt hàng WatermarkOnDraftOrders=Watermark về dự thảo đơn đặt hàng (nếu không có sản phẩm nào) +ShippableOrderIconInList=Thêm một biểu tượng trong danh sách đơn đặt hàng lớn cho biết nếu thứ tự là shippable ##### Clicktodial ##### ClickToDialSetup=Nhấn vào đây để quay số thiết lập mô-đun ClickToDialUrlDesc=Url gọi khi một nhấp chuột trên điện thoại Picto được thực hiện. Trong URL, bạn có thể sử dụng các thẻ
    __PHONETO__ Sẽ được thay thế bằng số điện thoại của người gọi
    __PHONEFROM__ Sẽ được thay thế bằng số điện thoại của người gọi (của bạn)
    __LOGIN__ Sẽ được thay thế bằng đăng nhập clicktodial của bạn (xác định trên thẻ người dùng của bạn)
    __PASS__ Sẽ được thay thế bằng mật khẩu clicktodial của bạn (xác định trên thẻ người dùng của bạn). @@ -1162,7 +1169,7 @@ FicheinterNumberingModules=Mô hình can thiệp đánh số TemplatePDFInterventions=Tài liệu mô hình can thiệp thẻ WatermarkOnDraftInterventionCards=Watermark vào tài liệu thẻ can thiệp (nếu không có sản phẩm nào) ##### Contracts ##### -ContractsSetup=Thiết lập hợp đồng mô-đun +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=Hợp đồng đánh số module TemplatePDFContracts=Hợp đồng tài liệu mô hình FreeLegalTextOnContracts=Miễn phí văn bản về hợp đồng @@ -1239,14 +1246,14 @@ LDAPTestSearch= Kiểm tra một tìm kiếm LDAP LDAPSynchroOK=Kiểm tra đồng bộ thành công LDAPSynchroKO=Kiểm tra đồng bộ hóa thất bại LDAPSynchroKOMayBePermissions=Kiểm tra đồng bộ hóa thất bại. Kiểm tra xem xui đến máy chủ được cấu hình đúng và cho phép udpates LDAP -LDAPTCPConnectOK=TCP kết nối với máy chủ LDAP thành công (Server =% s, Port =% s) -LDAPTCPConnectKO=TCP kết nối với máy chủ LDAP thất bại (Server =% s, Port =% s) -LDAPBindOK=Kết nối / Authentificate đến máy chủ LDAP thành công (Server =% s, Port =% s, Admin =% s, mật khẩu =% s) -LDAPBindKO=Kết nối / Authentificate đến máy chủ LDAP thất bại (Server =% s, Port =% s, Admin =% s, mật khẩu =% s) +LDAPTCPConnectOK=TCP kết nối với máy chủ LDAP thành công (Server =%s, Port =%s) +LDAPTCPConnectKO=TCP kết nối với máy chủ LDAP thất bại (Server =%s, Port =%s) +LDAPBindOK=Kết nối / Authentificate đến máy chủ LDAP thành công (Server =%s, Port =%s, Admin =%s, mật khẩu =%s) +LDAPBindKO=Kết nối / Authentificate đến máy chủ LDAP thất bại (Server =%s, Port =%s, Admin =%s, mật khẩu =%s) LDAPUnbindSuccessfull=Ngắt kết nối thành công LDAPUnbindFailed=Ngắt kết nối thất bại -LDAPConnectToDNSuccessfull=Kết nối với DN (% s) thành công -LDAPConnectToDNFailed=Kết nối với DN (% s) không thành công +LDAPConnectToDNSuccessfull=Kết nối với DN (%s) thành công +LDAPConnectToDNFailed=Kết nối với DN (%s) không thành công LDAPSetupForVersion3=Máy chủ LDAP cấu hình cho phiên bản 3 LDAPSetupForVersion2=Máy chủ LDAP cấu hình của phiên bản 2 LDAPDolibarrMapping=Dolibarr bản đồ @@ -1254,7 +1261,7 @@ LDAPLdapMapping=LDAP bản đồ LDAPFieldLoginUnix=Đăng nhập (Unix) LDAPFieldLoginExample=Ví dụ: uid LDAPFilterConnection=Bộ lọc tìm kiếm -LDAPFilterConnectionExample=Ví dụ: & (objectClass = inetOrgPerson) +LDAPFilterConnectionExample=Ví dụ: &(objectClass = inetOrgPerson) LDAPFieldLoginSamba=Đăng nhập (samba, ActiveDirectory) LDAPFieldLoginSambaExample=Ví dụ: sAMAccountName LDAPFieldFullname=Họ và tên @@ -1319,18 +1326,18 @@ MemcachedAvailableAndSetup=Memcached mô-đun dành riêng cho sử dụng máy OPCodeCache=Bộ nhớ cache opcode NoOPCodeCacheFound=Không có bộ nhớ cache opcode được tìm thấy. Có thể là bạn sử dụng một bộ nhớ cache opcode hơn XCache hoặc eAccelerator (tốt), có thể bạn không có bộ nhớ cache opcode (rất xấu). HTTPCacheStaticResources=Bộ nhớ cache HTTP cho tài nguyên tĩnh (css, img, javascript) -FilesOfTypeCached=Files of type% s được lưu trữ bởi máy chủ HTTP -FilesOfTypeNotCached=Files of type% s không được lưu trữ bởi máy chủ HTTP -FilesOfTypeCompressed=Files of type% s được nén bởi máy chủ HTTP -FilesOfTypeNotCompressed=Files of type% s không bị nén bởi máy chủ HTTP +FilesOfTypeCached=Files of type%s được lưu trữ bởi máy chủ HTTP +FilesOfTypeNotCached=Files of type%s không được lưu trữ bởi máy chủ HTTP +FilesOfTypeCompressed=Files of type%s được nén bởi máy chủ HTTP +FilesOfTypeNotCompressed=Files of type%s không bị nén bởi máy chủ HTTP CacheByServer=Bộ nhớ cache của máy chủ CacheByClient=Bộ nhớ cache của trình duyệt CompressionOfResources=Nén các phản hồi HTTP -TestNotPossibleWithCurrentBrowsers=Tự động phát hiện không thể +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### -ProductSetup=Thiết lập các sản phẩm mô-đun +ProductSetup=Thiết lập mô-đun sản phẩm ServiceSetup=Thiết lập mô-đun dịch vụ -ProductServiceSetup=Sản phẩm và dịch vụ thiết lập các mô-đun +ProductServiceSetup=Thiết lập mô-đun sản phẩm và dịch vụ NumberOfProductShowInSelect=Số lượng tối đa của sản phẩm trong danh sách combo chọn (0 = không giới hạn) ConfirmDeleteProductLineAbility=Xác nhận khi loại bỏ các dòng sản phẩm trong các hình thức ModifyProductDescAbility=Cá nhân mô tả sản phẩm dưới nhiều hình thức @@ -1352,7 +1359,7 @@ SyslogLevel=Cấp SyslogSimpleFile=Tập tin SyslogFilename=Tên tập tin và đường dẫn YouCanUseDOL_DATA_ROOT=Bạn có thể sử dụng DOL_DATA_ROOT / dolibarr.log cho một tập tin đăng nhập Dolibarr "tài liệu" thư mục. Bạn có thể thiết lập một con đường khác nhau để lưu trữ các tập tin này. -ErrorUnknownSyslogConstant=Liên tục% s không phải là một hằng số Syslog biết +ErrorUnknownSyslogConstant=Liên tục%s không phải là một hằng số Syslog biết OnlyWindowsLOG_USER=Windows chỉ hỗ trợ LOG_USER ##### Donations ##### DonationsSetup=Thiết lập mô-đun tặng @@ -1386,9 +1393,10 @@ MailingSetup=Gửi email cài đặt mô-đun MailingEMailFrom=Tên người gửi thư điện tử (Từ) cho email được gửi bằng cách gửi email mô-đun MailingEMailError=Quay trở lại thư điện tử (lỗi-to) cho email với các lỗi ##### Notification ##### -NotificationSetup=Bu thông báo thiết lập mô-đun email +NotificationSetup=Thư điện tử của thiết lập mô-đun thông báo NotificationEMailFrom=Tên người gửi thư điện tử (Từ) cho các email gửi đi thông báo -ListOfAvailableNotifications=Danh sách thông báo có sẵn (danh sách này phụ thuộc vào các mô-đun kích hoạt) +ListOfAvailableNotifications=Danh sách các sự kiện mà bạn có thể thiết lập thông báo trên, cho mỗi của bên thứ ba (đi vào thẻ của bên thứ ba để thiết lập) hoặc bằng cách thiết lập một email cố định (Danh sách phụ thuộc vào mô-đun kích hoạt) +FixedEmailTarget=Mục tiêu email cố định ##### Sendings ##### SendingsSetup=Gửi thiết lập mô-đun SendingsReceiptModel=Gửi mô hình nhận @@ -1411,13 +1419,14 @@ FCKeditorForMailing= WYSIWIG tạo / phiên bản cho eMailings khối (Tools> g FCKeditorForUserSignature=WYSIWIG tạo / phiên bản của chữ ký người sử dụng FCKeditorForMail=WYSIWIG tạo / phiên bản cho tất cả thư (trừ Outils-> gửi email) ##### OSCommerce 1 ##### -OSCommerceErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu osCommerce (% s chính không tìm thấy trong bảng% s). -OSCommerceTestOk=Kết nối với máy chủ '% s' vào cơ sở dữ liệu '% s' với người sử dụng '% s' thành công. -OSCommerceTestKo1=Kết nối với máy chủ '% s' thành công nhưng cơ sở dữ liệu '% s' không thể đạt được. -OSCommerceTestKo2=Kết nối với máy chủ '% s' với người dùng% s 'thất bại. +OSCommerceErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu osCommerce (%s chính không tìm thấy trong bảng %s). +OSCommerceTestOk=Kết nối với máy chủ '%s' vào cơ sở dữ liệu '%s' với người sử dụng '%s' thành công. +OSCommerceTestKo1=Kết nối với máy chủ '%s' thành công nhưng cơ sở dữ liệu '%s' không thể đạt được. +OSCommerceTestKo2=Kết nối với máy chủ '%s' với người dùng '%s' thất bại. ##### Stock ##### -StockSetup=Cấu hình chứng khoán mô-đun -UserWarehouse=Cổ phiếu cá nhân sử dụng người dùng +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=Đơn bị xóa TreeMenu=Menu cây @@ -1446,7 +1455,7 @@ DetailTarget=Mục tiêu cho các liên kết (_blank đầu mở một cửa s DetailLevel=Cấp (-1: menu trên cùng, 0: đơn tiêu đề,> 0 menu và menu phụ) ModifMenu=Thực đơn thay đổi DeleteMenu=Xóa mục trình đơn -ConfirmDeleteMenu=Bạn có chắc chắn muốn xóa mục trình đơn% s? +ConfirmDeleteMenu=Bạn có chắc chắn muốn xóa mục trình đơn %s ? DeleteLine=Xóa dòng ConfirmDeleteLine=Bạn Bạn có chắc chắn muốn xóa dòng này? ##### Tax ##### @@ -1471,8 +1480,8 @@ AccountancyCodeSell=Tài khoản bán hàng. Mã AccountancyCodeBuy=Mua tài khoản. Mã ##### Agenda ##### AgendaSetup=Sự kiện và thiết lập mô-đun chương trình nghị sự -PasswordTogetVCalExport=Key cho phép liên kết xuất khẩu -PastDelayVCalExport=Không xuất sự kiện lớn hơn +PasswordTogetVCalExport=Key cho phép xuất liên kết +PastDelayVCalExport=Không xuất dữ liệu sự kiện cũ hơn AGENDA_USE_EVENT_TYPE=Loại hình sử dụng sự kiện (quản lý vào menu Setup -> từ điển -> Loại sự kiện chương trình) AGENDA_DEFAULT_FILTER_TYPE=Thiết lập tự động loại sự kiện vào bộ lọc tìm kiếm xem chương trình nghị sự AGENDA_DEFAULT_FILTER_STATUS=Tự động thiết lập trạng thái này cho các sự kiện vào bộ lọc tìm kiếm xem chương trình nghị sự @@ -1481,12 +1490,15 @@ AGENDA_DEFAULT_VIEW=Tab mà bạn muốn mở mặc định khi lựa chọn ch ClickToDialDesc=Module này cho phép để thêm một biểu tượng sau khi số điện thoại. Một nhấp chuột vào biểu tượng này sẽ gọi một máy chủ với một địa chỉ URL đặc biệt bạn xác định dưới đây. Điều này có thể được sử dụng để gọi một hệ thống trung tâm cuộc gọi từ Dolibarr có thể gọi số điện thoại trên một hệ thống SIP ví dụ. ##### Point Of Sales (CashDesk) ##### CashDesk=Điểm bán hàng -CashDeskSetup=Quan điểm của thiết lập mô-đun bán hàng -CashDeskThirdPartyForSell=Bên thứ ba chung để sử dụng cho bán +CashDeskSetup=Thiết lập mô-đun Điểm bán hàng +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Tài khoản mặc định để sử dụng để nhận thanh toán bằng tiền mặt CashDeskBankAccountForCheque= Tài khoản mặc định để sử dụng để nhận thanh toán bằng séc CashDeskBankAccountForCB= Tài khoản mặc định để sử dụng để nhận thanh toán bằng thẻ tín dụng -CashDeskIdWareHouse=Kho để sử dụng cho bán +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. ##### Bookmark ##### BookmarkSetup=Thiết lập mô-đun Bookmark BookmarkDesc=Module này cho phép bạn quản lý bookmark. Bạn cũng có thể thêm các phím tắt cho bất kỳ trang Dolibarr hoặc các trang web externale trên menu bên trái của bạn. @@ -1515,8 +1527,8 @@ SuppliersInvoiceNumberingModel=Nhà cung cấp hoá đơn đánh số mô hình GeoIPMaxmindSetup=Thiết lập mô-đun GeoIP MaxMind PathToGeoIPMaxmindCountryDataFile=Đường dẫn đến tập tin có chứa MaxMind ip dịch nước.
    Ví dụ:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat NoteOnPathLocation=Lưu ý rằng chỉ IP của bạn để đất nước tập tin dữ liệu phải được bên trong một thư mục PHP của bạn có thể đọc (Kiểm tra PHP open_basedir cho phép cài đặt và hệ thống tập tin). -YouCanDownloadFreeDatFileTo=Bạn có thể tải về một phiên bản demo miễn phí của tập tin nước MaxMind GeoIP tại% s. -YouCanDownloadAdvancedDatFileTo=Bạn cũng có thể tải về một phiên bản hoàn thiện hơn, với bản cập nhật, các tập tin nước MaxMind GeoIP tại% s. +YouCanDownloadFreeDatFileTo=Bạn có thể tải về một phiên bản demo miễn phí của tập tin nước MaxMind GeoIP tại%s. +YouCanDownloadAdvancedDatFileTo=Bạn cũng có thể tải về một phiên bản hoàn thiện hơn, với bản cập nhật, các tập tin nước MaxMind GeoIP tại%s. TestGeoIPResult=Thử nghiệm của một IP chuyển đổi -> nước ##### Projects ##### ProjectsNumberingModules=Dự án đánh số mô-đun @@ -1539,6 +1551,14 @@ DeleteFiscalYear=Xóa năm tài chính ConfirmDeleteFiscalYear=Bạn chắc chắn muốn xóa năm tài chính này? Opened=Mở Closed=Đóng - +AlwaysEditable=Luôn luôn có thể được chỉnh sửa +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Định dạng TypePaymentDesc=0: Loại khách hàng thanh toán 1: Nhà cung cấp phương thức thanh toán, 2: Cả hai khách hàng và nhà cung cấp loại hình thanh toán diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang index aa55936b5ec..d382aef3a06 100644 --- a/htdocs/langs/vi_VN/agenda.lang +++ b/htdocs/langs/vi_VN/agenda.lang @@ -2,12 +2,12 @@ IdAgenda=ID sự kiện Actions=Sự kiện ActionsArea=Khu vực sự kiện (hành động và nhiệm vụ) -Agenda=Chương trình nghị sự -Agendas=Chương trình nghị sự +Agenda=Lịch làm việc +Agendas=Lịch làm việc Calendar=Lịch Calendars=Lịch LocalAgenda=Lịch nội bộ -ActionsOwnedBy=Event owned by +ActionsOwnedBy=Tổ chức sự kiện thuộc sở hữu của AffectedTo=Giao cho DoneBy=Thực hiện bằng cách Event=Sự kiện @@ -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 @@ -41,26 +42,24 @@ AutoActions= Tự động điền AgendaAutoActionDesc= Xác định đây sự kiện mà bạn muốn Dolibarr để tạo ra tự động một sự kiện trong chương trình nghị sự. Nếu không có gì được kiểm tra (theo mặc định), chỉ có hành động thủ công sẽ được đưa vào chương trình nghị sự. AgendaSetupOtherDesc= Trang này cung cấp tùy chọn để cho phép xuất khẩu các sự kiện Dolibarr của bạn thành một lịch bên ngoài (thunderbird, google lịch, ...) AgendaExtSitesDesc=Trang này cho phép khai báo các nguồn bên ngoài lịch để xem các sự kiện của họ vào chương trình nghị sự Dolibarr. -ActionsEvents= Sự kiện mà Dolibarr sẽ tạo ra một hành động trong chương trình nghị sự tự động -PropalValidatedInDolibarr= Đề nghị xác nhận% s -InvoiceValidatedInDolibarr= Hoá đơn% s xác nhận -InvoiceBackToDraftInDolibarr=Hoá đơn% s trở lại trạng thái soạn thảo -InvoiceDeleteDolibarr=Hoá đơn% s bị xóa -OrderValidatedInDolibarr= Thứ tự% s xác nhận -OrderApprovedInDolibarr=Thứ tự% s đã được phê duyệt -OrderRefusedInDolibarr=Thứ tự% s từ chối -OrderBackToDraftInDolibarr=Thứ tự% s trở lại trạng thái soạn thảo -OrderCanceledInDolibarr=Thứ tự% s hủy bỏ -InterventionValidatedInDolibarr=Can thiệp% s xác nhận -ProposalSentByEMail=Đề nghị thương mại% s gửi bằng thư điện tử -OrderSentByEMail=Đơn đặt hàng% s gửi Thư điện tử -InvoiceSentByEMail=Hóa đơn của khách hàng% s gửi Thư điện tử -SupplierOrderSentByEMail=Để nhà cung cấp% s gửi Thư điện tử -SupplierInvoiceSentByEMail=Nhà cung cấp hóa đơn% s gửi bằng thư điện tử -ShippingSentByEMail=Vận chuyển% s gửi thư điện tử -ShippingValidated= Vận chuyển% s xác nhận -InterventionSentByEMail=Can thiệp% s gửi thư điện tử -InterventionClassifiedBilled=Can thiệp% s phân loại như Quảng cáo tại +ActionsEvents=Sự kiện mà Dolibarr sẽ tạo ra một hành động trong chương trình nghị sự tự động +PropalValidatedInDolibarr=Đề nghị xác nhận %s +InvoiceValidatedInDolibarr=Hoá đơn %s xác nhận +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceBackToDraftInDolibarr=Hoá đơn %s trở lại trạng thái soạn thảo +InvoiceDeleteDolibarr=Hoá đơn %s bị xóa +OrderValidatedInDolibarr= Thứ tự %s xác nhận +OrderApprovedInDolibarr=Thứ tự %s đã được phê duyệt +OrderRefusedInDolibarr=Thứ tự %s từ chối +OrderBackToDraftInDolibarr=Thứ tự %s trở lại trạng thái soạn thảo +OrderCanceledInDolibarr=Thứ tự %s hủy bỏ +ProposalSentByEMail=Đề nghị thương mại%s gửi bằng thư điện tử +OrderSentByEMail=Đơn đặt hàng %s gửi Thư điện tử +InvoiceSentByEMail=Hóa đơn của khách hàng %s gửi Thư điện tử +SupplierOrderSentByEMail=Để nhà cung cấp %s gửi Thư điện tử +SupplierInvoiceSentByEMail=Nhà cung cấp hóa đơn %s gửi bằng thư điện tử +ShippingSentByEMail=Vận chuyển %s gửi thư điện tử +ShippingValidated= Vận chuyển %s xác nhận NewCompanyToDolibarr= Bên thứ ba tạo ra DateActionPlannedStart= Ngày bắt đầu lên kế hoạch DateActionPlannedEnd= Ngày kết thúc kế hoạch @@ -69,10 +68,10 @@ DateActionDoneEnd= Bất ngày cuối DateActionStart= Ngày bắt đầu DateActionEnd= Ngày kết thúc AgendaUrlOptions1=Bạn cũng có thể thêm các thông số sau đây để lọc đầu ra: -AgendaUrlOptions2=login =% s ​​để hạn chế sản lượng để hành động được tạo ra bởi, phân định hoặc thực hiện bằng cách sử dụng% s. -AgendaUrlOptions3=Logina =% s ​​để hạn chế sản lượng để hành động được tạo ra bởi người sử dụng% s. -AgendaUrlOptions4=logint =% s ​​để hạn chế sản lượng để hành động được gán cho người dùng% s. -AgendaUrlOptions5=logind =% s ​​để hạn chế sản lượng để hành động thực hiện bằng cách sử dụng% s. +AgendaUrlOptions2=login =%s ​​để hạn chế sản lượng để hành động được tạo ra bởi, phân định hoặc thực hiện bằng cách sử dụng %s. +AgendaUrlOptions3=Logina =%s ​​để hạn chế sản lượng để hành động thuộc sở hữu của một người dùng %s. +AgendaUrlOptions4=logint =%s ​​để hạn chế sản lượng để hành động được gán cho người dùng %s. +AgendaUrlOptionsProject=dự án = PROJECT_ID để hạn chế sản lượng để hành động liên quan đến dự án PROJECT_ID. AgendaShowBirthdayEvents=Hiển thị địa chỉ liên lạc sinh nhật AgendaHideBirthdayEvents=Giấu địa chỉ liên lạc sinh nhật Busy=Bận @@ -84,10 +83,10 @@ ExportCal=Lịch xuất khẩu ExtSites=Nhập lịch bên ngoài ExtSitesEnableThisTool=Hiển thị lịch bên ngoài (được định nghĩa vào thiết lập toàn cầu) vào chương trình nghị sự. Không ảnh hưởng đến lịch bên ngoài được xác định bởi người sử dụng. ExtSitesNbOfAgenda=Số lịch -AgendaExtNb=Lịch nb% s +AgendaExtNb=Lịch nb %s ExtSiteUrlAgenda=URL để truy cập tập tin .ical ExtSiteNoLabel=Không có Mô tả WorkingTimeRange=Phạm vi thời gian làm việc WorkingDaysRange=Ngày làm việc trong khoảng -AddEvent=Add event -MyAvailability=My availability +AddEvent=Tạo sự kiện +MyAvailability=Sẵn có của tôi diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang index c8f914a802a..5a05d8f4b62 100644 --- a/htdocs/langs/vi_VN/banks.lang +++ b/htdocs/langs/vi_VN/banks.lang @@ -74,7 +74,7 @@ Account=Tài khoản ByCategories=By loại ByRubriques=By loại BankTransactionByCategories=Giao dịch ngân hàng theo danh mục -BankTransactionForCategory=Giao dịch ngân hàng cho thể loại% s +BankTransactionForCategory=Giao dịch ngân hàng cho thể loại %s RemoveFromRubrique=Hủy bỏ liên kết với thể loại RemoveFromRubriqueConfirm=Bạn Bạn có chắc chắn muốn xóa liên kết giữa các giao dịch và danh mục? ListBankTransactions=Danh sách các giao dịch ngân hàng @@ -115,7 +115,7 @@ BankTransfers=Chuyển khoản ngân hàng TransferDesc=Chuyển từ một tài khoản với nhau, Dolibarr sẽ viết hai bản ghi (ghi nợ trong tài khoản nguồn và tín dụng trong tài khoản mục tiêu, số tiền tương tự. Cùng một nhãn và ngày sẽ được sử dụng cho giao dịch này) TransferFrom=Từ TransferTo=Để -TransferFromToDone=Việc chuyển giao từ% s đến% s trong% s% s đã được ghi nhận. +TransferFromToDone=Việc chuyển giao từ %s đến %s của %s %s đã được ghi nhận. CheckTransmitter=Transmitter ValidateCheckReceipt=Xác nhận việc kiểm tra này? ConfirmValidateCheckReceipt=Bạn có chắc chắn bạn muốn xác nhận việc kiểm tra này, không có thay đổi sẽ có thể một lần này được thực hiện? diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang index a2b13f31f0d..ec7882a6bf0 100644 --- a/htdocs/langs/vi_VN/bills.lang +++ b/htdocs/langs/vi_VN/bills.lang @@ -5,9 +5,9 @@ BillsCustomers=Hoá đơn của khách hàng BillsCustomer=Hóa đơn của khách hàng BillsSuppliers=Hoá đơn của nhà cung cấp BillsCustomersUnpaid=Hoá đơn chưa thanh toán của khách hàng -BillsCustomersUnpaidForCompany=Hoá đơn chưa thanh toán của khách hàng cho% s +BillsCustomersUnpaidForCompany=Hoá đơn chưa thanh toán của khách hàng cho %s BillsSuppliersUnpaid=Hoá đơn chưa thanh toán của nhà cung cấp -BillsSuppliersUnpaidForCompany=Hoá đơn chưa thanh toán của nhà cung cấp cho% s +BillsSuppliersUnpaidForCompany=Hoá đơn chưa thanh toán của nhà cung cấp cho %s BillsLate=Khoản thanh toán trễ BillsStatistics=Hoá đơn số liệu thống kê của khách hàng BillsStatisticsSuppliers=Hoá đơn của nhà cung cấp số liệu thống kê @@ -24,19 +24,19 @@ InvoiceProFormaDesc=Proforma hóa đơn là một hình ảnh của một InvoiceReplacement=Thay thế hóa đơn InvoiceReplacementAsk=Thay thế hóa đơn cho hóa đơn InvoiceReplacementDesc=Thay thế hóa đơn được sử dụng để hủy bỏ và thay thế hoàn toàn một hóa đơn không có thanh toán đã nhận được.

    Lưu ý: Chỉ có hoá đơn không có thanh toán trên nó có thể được thay thế. Nếu bạn thay thế hóa đơn chưa khép kín, nó sẽ được tự động đóng cửa để 'bỏ rơi'. -InvoiceAvoir=Lưu ý tín dụng -InvoiceAvoirAsk=Lưu ý tín dụng cho hóa đơn đúng -InvoiceAvoirDesc=Những lưu ý tín dụng là một hóa đơn tiêu cực được sử dụng để giải quyết thực tế là một hóa đơn có số tiền đó khác hơn so với số tiền thực sự trả tiền (do khách hàng trả tiền quá nhiều bởi lỗi, hoặc sẽ không được thanh toán hoàn toàn kể từ khi ông quay trở lại một số sản phẩm chẳng hạn). -invoiceAvoirWithLines=Tạo tín dụng Lưu ý với dòng từ hoá đơn nguồn gốc -invoiceAvoirWithPaymentRestAmount=Tạo tín dụng Lưu ý với số lượng hồ có nguồn gốc hóa đơn thanh toán của -invoiceAvoirLineWithPaymentRestAmount=Lượng tín dụng Ghi chú của hồ hóa đơn thanh toán của -ReplaceInvoice=Thay thế hóa đơn% s +InvoiceAvoir=Ghi nợ +InvoiceAvoirAsk=Ghi nợ cho hóa đơn đúng +InvoiceAvoirDesc=Những lưu ý ghi nợ là một hóa đơn tiêu cực được sử dụng để giải quyết thực tế là một hóa đơn có số tiền đó khác hơn so với số tiền thực sự trả tiền (do khách hàng trả tiền quá nhiều bởi lỗi, hoặc sẽ không được thanh toán hoàn toàn kể từ khi ông quay trở lại một số sản phẩm chẳng hạn). +invoiceAvoirWithLines=Tạo phiếu ghi nợ với dòng từ hoá đơn nguồn gốc +invoiceAvoirWithPaymentRestAmount=Tạo phiếu ghi nợ với còn lại chưa thanh toán của hóa đơn gốc +invoiceAvoirLineWithPaymentRestAmount=Lưu ý cho ghi nợ còn lại chưa thanh toán tiền +ReplaceInvoice=Thay thế hóa đơn %s ReplacementInvoice=Thay thế hóa đơn -ReplacedByInvoice=Thay thế bằng hóa đơn% s +ReplacedByInvoice=Thay thế bằng hóa đơn %s ReplacementByInvoice=Thay thế bằng hóa đơn -CorrectInvoice=Hóa đơn đúng% s +CorrectInvoice=Hóa đơn đúng %s CorrectionInvoice=Chỉnh hóa đơn -UsedByInvoice=Được sử dụng để thanh toán hoá đơn% s +UsedByInvoice=Được sử dụng để thanh toán hoá đơn %s ConsumedBy=Tiêu thụ NotConsumed=Không tiêu thụ NoReplacableInvoice=Không có hoá đơn replacable @@ -68,7 +68,7 @@ ReceivedPayments=Khoản tiền nhận được ReceivedCustomersPayments=Khoản tiền nhận được từ khách hàng PayedSuppliersPayments=Thanh toán payed để nhà cung cấp ReceivedCustomersPaymentsToValid=Nhận được khoản thanh toán cho khách hàng để xác nhận -PaymentsReportsForYear=Báo cáo thanh toán cho% s +PaymentsReportsForYear=Báo cáo thanh toán cho%s PaymentsReports=Thanh toán báo cáo PaymentsAlreadyDone=Thanh toán đã được thực hiện PaymentsBackAlreadyDone=Thanh toán đã được thực hiện trở lại @@ -87,19 +87,19 @@ ClassifyCanceled=Phân loại 'bỏ rơi' ClassifyClosed=Phân loại 'Đóng' ClassifyUnBilled=Phân loại 'chưa lập hoá đơn' CreateBill=Tạo hóa đơn -AddBill=Thêm hóa đơn hoặc tín dụng lưu ý +AddBill=Tạo hóa đơn hoặc ghi nợ lưu ý AddToDraftInvoices=Thêm vào dự thảo hóa đơn DeleteBill=Xóa hóa đơn SearchACustomerInvoice=Tìm kiếm một hóa đơn của khách hàng SearchASupplierInvoice=Tìm kiếm một nhà cung cấp hóa đơn CancelBill=Hủy bỏ một hóa đơn SendRemindByMail=Gửi lời nhắc nhở bằng thư điện tử -DoPayment=Do thanh toán -DoPaymentBack=Do thanh toán lại +DoPayment=Thực hiện thanh toán +DoPaymentBack=Thực hiện thanh toán lại ConvertToReduc=Chuyển đổi thành giảm giá trong tương lai EnterPaymentReceivedFromCustomer=Nhập thanh toán nhận được từ khách hàng EnterPaymentDueToCustomer=Thực hiện thanh toán do khách hàng -DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa vì còn phải trả là số không +DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa bởi vì còn lại chưa thanh toán là số không Amount=Số tiền PriceBase=Giá cơ sở BillStatus=Tình trạng hóa đơn @@ -127,8 +127,8 @@ PaymentStatusToValidShort=Để xác nhận ErrorVATIntraNotConfigured=Số thuế GTGT Intracommunautary chưa được xác định ErrorNoPaiementModeConfigured=Không có phương thức thanh toán mặc định được xác định. Tới hóa đơn thiết lập mô-đun để sửa lỗi này. ErrorCreateBankAccount=Tạo một tài khoản ngân hàng, sau đó đi vào bảng cài đặt của mô-đun hóa đơn để xác định phương thức thanh toán -ErrorBillNotFound=Hoá đơn% s không tồn tại -ErrorInvoiceAlreadyReplaced=Lỗi, bạn cố gắng để xác nhận một hóa đơn để thay thế hóa đơn% s. Nhưng điều này đã được thay thế bằng hóa đơn% s. +ErrorBillNotFound=Hoá đơn %s không tồn tại +ErrorInvoiceAlreadyReplaced=Lỗi, bạn cố gắng để xác nhận một hóa đơn để thay thế hóa đơn%s. Nhưng điều này đã được thay thế bằng hóa đơn%s. ErrorDiscountAlreadyUsed=Lỗi, giảm giá đã được sử dụng ErrorInvoiceAvoirMustBeNegative=Lỗi, hóa đơn đúng phải có một số tiêu cực ErrorInvoiceOfThisTypeMustBePositive=Lỗi, loại hóa đơn phải có một số lượng tích cực @@ -137,11 +137,9 @@ BillFrom=Từ BillTo=Để ActionsOnBill=Hoạt động trên hoá đơn NewBill=Hóa đơn mới -Prélèvements=Lệnh chuyển tiền định -Prélèvements=Lệnh chuyển tiền định -LastBills=Hoá đơn cuối% s +LastBills=Hoá đơn cuối %s LastCustomersBills=Cuối% của hoá đơn cho khách hàng -LastSuppliersBills=Cuối% s nhà cung cấp hoá đơn +LastSuppliersBills=Cuối%s nhà cung cấp hoá đơn AllBills=Tất cả hóa đơn OtherBills=Hoá đơn khác DraftBills=Dự thảo hoá đơn @@ -149,17 +147,17 @@ CustomersDraftInvoices=Khách hàng soạn thảo hoá đơn SuppliersDraftInvoices=Nhà cung cấp dự thảo hoá đơn Unpaid=Chưa thanh toán ConfirmDeleteBill=Bạn Bạn có chắc chắn muốn xóa hóa đơn này? -ConfirmValidateBill=Bạn có chắc chắn bạn muốn xác nhận hóa đơn này với tham chiếu% s? -ConfirmUnvalidateBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn% s để soạn thảo trạng thái? -ConfirmClassifyPaidBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn% s đến tình trạng thanh toán? -ConfirmCancelBill=Bạn có chắc chắn bạn muốn hủy bỏ hóa đơn% s? +ConfirmValidateBill=Bạn có chắc chắn bạn muốn xác nhận hóa đơn này với tham chiếu %s ? +ConfirmUnvalidateBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn %s để soạn thảo trạng thái? +ConfirmClassifyPaidBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn %s đến tình trạng thanh toán? +ConfirmCancelBill=Bạn có chắc chắn bạn muốn hủy bỏ hóa đơn %s ? ConfirmCancelBillQuestion=Tại sao bạn muốn để phân loại hóa đơn này 'bỏ rơi'? -ConfirmClassifyPaidPartially=Bạn có chắc chắn bạn muốn thay đổi hóa đơn% s đến tình trạng thanh toán? +ConfirmClassifyPaidPartially=Bạn có chắc chắn bạn muốn thay đổi hóa đơn %s đến tình trạng thanh toán? ConfirmClassifyPaidPartiallyQuestion=Hoá đơn này chưa được thanh toán hoàn toàn. Lý do để bạn có thể đóng hóa đơn này là gì? -ConfirmClassifyPaidPartiallyReasonAvoir=Phần còn lại phải trả (% s% s) là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi bị quy tắc thuế GTGT với một lưu ý tín dụng. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Phần còn lại phải trả (% s% s) là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi chấp nhận để mất thuế GTGT giảm giá này. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Phần còn lại phải trả (% s% s) là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi khôi phục lại thuế GTGT giảm giá này mà không có một ghi chú tín dụng. -ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad khách hàng +ConfirmClassifyPaidPartiallyReasonAvoir=Còn lại chưa thanh toán (%s %s) là giảm giá cấp vì khoản thanh toán đã được thực hiện trước thời hạn. Tôi làm đúng luật thuế GTGT với một ghi chú ghi nợ. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Còn lại chưa thanh toán (%s %s) là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi chấp nhận để mất thuế GTGT đối với giảm giá này. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Còn lại chưa thanh toán (%s %s) là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi thu hồi thuế GTGT đối với giảm giá này mà không có một ghi chú ghi nợ. +ConfirmClassifyPaidPartiallyReasonBadCustomer=Khách hàng xấu ConfirmClassifyPaidPartiallyReasonProductReturned=Sản phẩm trả lại một phần ConfirmClassifyPaidPartiallyReasonOther=Số tiền bị bỏ rơi vì lý do khác ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Sự lựa chọn này là có thể nếu hóa đơn của bạn đã được cung cấp với bình luận phù hợp. (Ví dụ «Chỉ có thuế tương ứng với mức giá mà đã được thực tế phải trả cho quyền khấu trừ») @@ -167,11 +165,11 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ở một số nước, sự l ConfirmClassifyPaidPartiallyReasonAvoirDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp với ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Một khách hàng xấu là một khách hàng mà từ chối trả nợ của mình. ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Lựa chọn này được sử dụng khi thanh toán không đầy đủ vì một số sản phẩm đã được trả lại -ConfirmClassifyPaidPartiallyReasonOtherDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp, ví dụ như trong tình huống sau đây:
    - Thanh toán không hoàn thành vì một số sản phẩm được vận chuyển trở lại
    - Số tiền đòi quá quan trọng bởi vì giảm giá bị lãng quên
    Trong mọi trường hợp, số tiền trên, tuyên bố phải được sửa chữa trong hệ thống kế toán bằng cách tạo ra một lưu ý tín dụng. +ConfirmClassifyPaidPartiallyReasonOtherDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp, ví dụ như trong tình huống sau đây:
    - Thanh toán không hoàn thành vì một số sản phẩm được vận chuyển trở lại
    - Số tiền đòi quá quan trọng bởi vì giảm giá bị lãng quên
    Trong mọi trường hợp, số tiền trên, tuyên bố phải được sửa chữa trong hệ thống kế toán bằng cách tạo ra một lưu ý ghi nợ. ConfirmClassifyAbandonReasonOther=Khác ConfirmClassifyAbandonReasonOtherDesc=Lựa chọn này sẽ được sử dụng trong tất cả các trường hợp khác. Ví dụ bởi vì bạn có kế hoạch để tạo ra một hóa đơn thay thế. -ConfirmCustomerPayment=Bạn có xác nhận đầu vào thanh toán này cho% s% s? -ConfirmSupplierPayment=Bạn có xác nhận đầu vào thanh toán này cho% s% s? +ConfirmCustomerPayment=Bạn có xác nhận đầu vào thanh toán này cho %s %s ? +ConfirmSupplierPayment=Bạn có xác nhận đầu vào thanh toán này cho %s %s ? ConfirmValidatePayment=Bạn có chắc chắn bạn muốn xác nhận thanh toán này? Không có thay đổi có thể được thực hiện một lần thanh toán được xác nhận. ValidateBill=Xác nhận hóa đơn UnvalidateBill=Hóa đơn Unvalidate @@ -183,23 +181,23 @@ ShowSocialContribution=Hiển thị đóng góp xã hội ShowBill=Hiện hóa đơn ShowInvoice=Hiện hóa đơn ShowInvoiceReplace=Hiển thị thay thế hóa đơn -ShowInvoiceAvoir=Xem tin tín dụng +ShowInvoiceAvoir=Xem tin ghi nợ ShowInvoiceDeposit=Hiện tiền gửi hóa đơn ShowPayment=Hiện thanh toán File=Tập tin AlreadyPaid=Đã thanh toán AlreadyPaidBack=Đã thanh toán lại -AlreadyPaidNoCreditNotesNoDeposits=Đã thanh toán (không có ghi chú tín dụng và tiền gửi) +AlreadyPaidNoCreditNotesNoDeposits=Đã thanh toán (không có ghi chú ghi nợ và tiền gửi) Abandoned=Bị bỏ rơi -RemainderToPay=Phần còn lại phải trả -RemainderToTake=Phần còn lại để có -RemainderToPayBack=Phần còn lại để trả lại +RemainderToPay=Còn lại chưa thanh toán +RemainderToTake=Số tiền còn lại để mất +RemainderToPayBack=Số tiền còn lại để trả lại Rest=Cấp phát AmountExpected=Số tiền tuyên bố ExcessReceived=Dư thừa đã nhận EscompteOffered=Giảm giá cung cấp (thanh toán trước hạn) -SendBillRef=Trình hóa đơn% s -SendReminderBillRef=Trình hóa đơn% s (nhắc nhở) +SendBillRef=Trình hóa đơn%s +SendReminderBillRef=Trình hóa đơn%s (nhắc nhở) StandingOrders=Đứng đơn đặt hàng StandingOrder=Lệnh chuyển tiền định NoDraftBills=Không có dự thảo hoá đơn @@ -219,19 +217,18 @@ NoInvoice=Không có hoá đơn ClassifyBill=Phân loại hóa đơn SupplierBillsToPay=Nhà cung cấp hoá đơn thanh toán CustomerBillsUnpaid=Hóa đơn khách hàng chưa thanh toán -DispenseMontantLettres=Dự luật này được soạn thảo bởi mechanographical được miễn thứ tự chữ -DispenseMontantLettres=Dự luật này được soạn thảo bởi mechanographical được miễn thứ tự chữ +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Không thể thu hồi SetConditions=Thiết lập các điều khoản thanh toán SetMode=Đặt chế độ thanh toán Billed=Hóa đơn -RepeatableInvoice=Được xác định trước hóa đơn -RepeatableInvoices=Hoá đơn được xác định trước -Repeatable=Được xác định trước -Repeatables=Được xác định trước -ChangeIntoRepeatableInvoice=Chuyển đổi thành được xác định trước -CreateRepeatableInvoice=Tạo được xác định trước hóa đơn -CreateFromRepeatableInvoice=Tạo từ được xác định trước hóa đơn +RepeatableInvoice=Hóa đơn mẫu +RepeatableInvoices=Hoá đơn mẫu +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Chuyển đổi thành mẫu hóa đơn +CreateRepeatableInvoice=Tạo mẫu hóa đơn +CreateFromRepeatableInvoice=Tạo ra từ mẫu hóa đơn CustomersInvoicesAndInvoiceLines=Hoá đơn của khách hàng và dòng hóa đơn của CustomersInvoicesAndPayments=Hoá đơn và các khoản thanh toán của khách hàng ExportDataset_invoice_1=Hóa đơn khách hàng danh sách và đường hóa đơn của @@ -248,19 +245,19 @@ AddRelativeDiscount=Tạo giảm giá tương đối EditRelativeDiscount=Chỉnh sửa giảm giá tương đối AddGlobalDiscount=Tạo giảm tuyệt đối EditGlobalDiscounts=Chỉnh sửa giảm giá tuyệt đối -AddCreditNote=Tạo ghi chú tín dụng +AddCreditNote=Tạo ghi chú ghi nợ ShowDiscount=Hiện giảm giá ShowReduc=Các khấu trừ RelativeDiscount=Giảm tương đối GlobalDiscount=Giảm giá toàn cầu -CreditNote=Lưu ý tín dụng -CreditNotes=Ghi chú tín dụng +CreditNote=Ghi nợ +CreditNotes=Ghi nợ Deposit=Tiền đặt cọc Deposits=Tiền gửi -DiscountFromCreditNote=Giảm giá từ giấy báo% s -DiscountFromDeposit=Thanh toán từ hóa đơn tiền gửi% s -AbsoluteDiscountUse=Đây là loại tín dụng có thể được sử dụng trên hóa đơn trước khi xác nhận nó -CreditNoteDepositUse=Hóa đơn phải được xác nhận để sử dụng vị vua này tín dụng +DiscountFromCreditNote=Giảm giá từ giấy báo %s +DiscountFromDeposit=Thanh toán từ hóa đơn tiền gửi %s +AbsoluteDiscountUse=Đây là loại ghi nợ có thể được sử dụng trên hóa đơn trước khi xác nhận nó +CreditNoteDepositUse=Hóa đơn phải được xác nhận để sử dụng vị vua này ghi nợ NewGlobalDiscount=Giảm giá mới tuyệt đối NewRelativeDiscount=Giảm giá mới tương đối NoteReason=Lưu ý / Lý do @@ -284,13 +281,13 @@ PaymentNumber=Số thanh toán RemoveDiscount=Hủy bỏ giảm giá WatermarkOnDraftBill=Watermark về dự thảo hoá đơn (không có gì nếu trống) InvoiceNotChecked=Không có hoá đơn được lựa chọn -CloneInvoice=Hóa đơn Clone -ConfirmCloneInvoice=Bạn có chắc chắn bạn muốn nhân bản hóa đơn này% s? +CloneInvoice=Hóa đơn sao chép +ConfirmCloneInvoice=Bạn có chắc chắn bạn muốn nhân bản hóa đơn này %s ? DisabledBecauseReplacedInvoice=Hành động vô hiệu hóa vì hóa đơn đã được thay thế DescTaxAndDividendsArea=Khu vực này trình bày một bản tóm tắt của tất cả các khoản thanh toán cho các chi phí đặc biệt. Hồ sơ chỉ với thanh toán trong năm cố định được bao gồm ở đây. NbOfPayments=Nb thanh toán SplitDiscount=Tách chiết khấu trong hai -ConfirmSplitDiscount=Bạn có chắc chắn bạn muốn chia giảm giá này của% s% s thành 2 giảm giá thấp hơn? +ConfirmSplitDiscount=Bạn có chắc chắn bạn muốn chia giảm giá này của %s %s thành 2 giảm giá thấp hơn? TypeAmountOfEachNewDiscount=Số lượng đầu vào cho mỗi hai phần: TotalOfTwoDiscountMustEqualsOriginal=Tổng của hai giảm giá mới phải bằng số tiền giảm giá ban đầu. ConfirmRemoveDiscount=Bạn có chắc là bạn muốn loại bỏ giảm giá này? @@ -315,7 +312,7 @@ PaymentConditionPT_DELIVERY=Ngày giao hàng PaymentConditionShortPT_ORDER=Theo lệnh PaymentConditionPT_ORDER=Theo lệnh PaymentConditionShortPT_5050=50-50 -PaymentConditionPT_5050=50 %% trước, 50 %% khi giao hàng +PaymentConditionPT_5050=50%% trước, 50%% khi giao hàng FixAmount=Số tiền sửa chữa VarAmount=Số lượng biến (%% tot.) # PaymentType @@ -325,8 +322,8 @@ PaymentTypePRE=Để Ngân hàng PaymentTypeShortPRE=Để Ngân hàng PaymentTypeLIQ=Tiền PaymentTypeShortLIQ=Tiền -PaymentTypeCB=Thẻ tín dụng -PaymentTypeShortCB=Thẻ tín dụng +PaymentTypeCB=Thẻ ghi nợ +PaymentTypeShortCB=Thẻ ghi nợ PaymentTypeCHQ=Kiểm tra PaymentTypeShortCHQ=Kiểm tra PaymentTypeTIP=TIP @@ -357,7 +354,7 @@ FullPhoneNumber=Điện thoại TeleFax=Fax PrettyLittleSentence=Chấp nhận tiền thanh toán bằng séc do ban hành trong tên của tôi là một thành viên của một hiệp hội kế toán được chấp thuận của Cục Quản lý tài chính. IntracommunityVATNumber=Intracommunity số thuế GTGT -PaymentByChequeOrderedTo=Kiểm tra thanh toán (bao gồm thuế) được trả cho% s gửi đến +PaymentByChequeOrderedTo=Kiểm tra thanh toán (bao gồm thuế) được trả cho%s gửi đến PaymentByChequeOrderedToShort=Kiểm tra thanh toán (bao gồm thuế) được trả cho SendTo=gửi đến PaymentByTransferOnThisBankAccount=Thanh toán bằng chuyển khoản vào tài khoản ngân hàng sau @@ -369,8 +366,8 @@ LawApplicationPart4=giá của họ. LimitedLiabilityCompanyCapital=SARL có vốn đầu tư của UseLine=Áp dụng UseDiscount=Sử dụng giảm giá -UseCredit=Sử dụng tín dụng -UseCreditNoteInInvoicePayment=Giảm số tiền thanh toán bằng tín dụng này +UseCredit=Sử dụng ghi nợ +UseCreditNoteInInvoicePayment=Giảm số tiền thanh toán bằng ghi nợ này MenuChequeDeposits=Tiền gửi kiểm tra MenuCheques=Kiểm tra MenuChequesReceipts=Kiểm tra biên lai @@ -379,11 +376,11 @@ ChequesReceipts=Kiểm tra biên lai ChequesArea=Khu vực tiền gửi kiểm tra ChequeDeposits=Tiền gửi kiểm tra Cheques=Kiểm tra -CreditNoteConvertedIntoDiscount=Lưu ý tín dụng này hoặc hóa đơn tiền gửi đã được chuyển đổi thành% s +CreditNoteConvertedIntoDiscount=Ghi nợ này hoặc hóa đơn tiền gửi đã được chuyển đổi thành%s UsBillingContactAsIncoiveRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng thanh toán thay vì địa chỉ của bên thứ ba là người nhận hoá đơn ShowUnpaidAll=Hiển thị tất cả các hoá đơn chưa thanh toán ShowUnpaidLateOnly=Hiện hoá đơn chưa thanh toán cuối chỉ -PaymentInvoiceRef=Thanh toán hóa đơn% s +PaymentInvoiceRef=Thanh toán hóa đơn%s ValidateInvoice=Xác nhận hóa đơn Cash=Tiền Reported=Bị trì hoãn @@ -392,7 +389,7 @@ CantRemovePaymentWithOneInvoicePaid=Không thể loại bỏ thanh toán kể t ExpectedToPay=Thanh toán dự kiến PayedByThisPayment=Thanh toán thanh toán này ClosePaidInvoicesAutomatically=Phân loại "Đã thanh toán" tất cả các hóa đơn tiêu chuẩn hoặc thay thế hoàn toàn thanh toán. -ClosePaidCreditNotesAutomatically=Phân loại các "Đã thanh toán" tất cả các ghi chú tín dụng hoàn toàn trả lại. +ClosePaidCreditNotesAutomatically=Phân loại các "Đã thanh toán" tất cả các ghi chú ghi nợ hoàn toàn trả lại. AllCompletelyPayedInvoiceWillBeClosed=Tất cả hóa đơn không còn phải trả sẽ được tự động đóng cửa để trạng thái "Đã thanh toán". ToMakePayment=Trả ToMakePaymentBack=Trả lại @@ -401,8 +398,8 @@ NoteListOfYourUnpaidInvoices=Lưu ý: Danh sách này chỉ chứa các hoá đ RevenueStamp=Đóng dấu doanh thu YouMustCreateInvoiceFromThird=Tùy chọn này chỉ có sẵn khi tạo hóa đơn từ tab "khách hàng" của của bên thứ ba PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị) -TerreNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn và% syymm-nnnn cho các ghi chú tín dụng mà yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0 -MarsNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn%,% syymm-nnnn cho hoá đơn thay thế,% syymm-nnnn cho các ghi chú tín dụng và% syymm-nnnn cho các ghi chú tín dụng mà yyyy là năm, mm là tháng và NNNN là một chuỗi không có phá vỡ và không trở về 0 +TerreNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn và% syymm-nnnn cho các ghi chú ghi nợ mà yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0 +MarsNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn%,% syymm-nnnn cho hoá đơn thay thế,% syymm-nnnn cho các ghi chú ghi nợ và% syymm-nnnn cho các ghi chú ghi nợ mà yyyy là năm, mm là tháng và NNNN là một chuỗi không có phá vỡ và không trở về 0 TerreNumRefModelError=Một dự luật bắt đầu với $ syymm đã tồn tại và không tương thích với mô hình này của chuỗi. Loại bỏ nó hoặc đổi tên nó để kích hoạt module này. ##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Đại diện sau lên hóa đơn của khách hàng diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang index a734b1a3d69..622461f3da6 100644 --- a/htdocs/langs/vi_VN/boxes.lang +++ b/htdocs/langs/vi_VN/boxes.lang @@ -1,17 +1,18 @@ # Dolibarr language file - Source file is en_US - boxes BoxLastRssInfos=Thông tin Rss -BoxLastProducts=Cuối% của sản phẩm / dịch vụ +BoxLastProducts=Cuối %s của sản phẩm / dịch vụ BoxProductsAlertStock=Sản phẩm trong kho cảnh báo -BoxLastProductsInContract=Cuối% s hợp đồng sản phẩm / dịch vụ +BoxLastProductsInContract=Cuối %s hợp đồng sản phẩm / dịch vụ BoxLastSupplierBills=Nhà cung cấp hoá đơn cuối cùng của BoxLastCustomerBills=Hoá đơn của khách hàng trước BoxOldestUnpaidCustomerBills=Hoá đơn chưa thanh toán của khách hàng lâu đời nhất BoxOldestUnpaidSupplierBills=Hoá đơn chưa thanh toán lâu đời nhất của nhà cung cấp BoxLastProposals=Cuối cùng đề nghị thương mại -BoxLastProspects=Triển vọng biến đổi cuối cùng -BoxLastCustomers=Khách hàng biến đổi cuối cùng -BoxLastSuppliers=Các nhà cung cấp biến đổi cuối cùng +BoxLastProspects=Triển vọng đã sửa cuối cùng +BoxLastCustomers=Khách hàng đã sửa cuối cùng +BoxLastSuppliers=Các nhà cung cấp đã sửa cuối cùng BoxLastCustomerOrders=Đơn đặt hàng cuối cùng +BoxLastValidatedCustomerOrders=Đơn đặt hàng của khách hàng xác nhận cuối cùng BoxLastBooks=Cuốn sách cuối cùng BoxLastActions=Hành động cuối cùng BoxLastContracts=Hợp đồng cuối cùng @@ -22,41 +23,44 @@ BoxCurrentAccounts=Mở tài khoản ngoại BoxSalesTurnover=Doanh thu bán hàng BoxTotalUnpaidCustomerBills=Tổng số khách hàng chưa thanh toán hoá đơn của BoxTotalUnpaidSuppliersBills=Tổng số nhà cung cấp hoá đơn chưa thanh toán của -BoxTitleLastBooks=Sách ghi cuối% s +BoxTitleLastBooks=Sách ghi cuối %s BoxTitleNbOfCustomers=Số lượng khách hàng -BoxTitleLastRssInfos=Cuối% s tin tức từ% s -BoxTitleLastProducts=Cuối% s sửa đổi sản phẩm / dịch vụ +BoxTitleLastRssInfos=Cuối %s tin tức từ %s +BoxTitleLastProducts=Cuối %s sửa đổi sản phẩm / dịch vụ BoxTitleProductsAlertStock=Sản phẩm trong kho cảnh báo -BoxTitleLastCustomerOrders=Đơn đặt hàng của khách hàng biến đổi cuối cùng% s -BoxTitleLastSuppliers=Các nhà cung cấp ghi cuối% s -BoxTitleLastCustomers=Cuối% s ghi nhận khách hàng -BoxTitleLastModifiedSuppliers=Các nhà cung cấp biến đổi cuối cùng% s -BoxTitleLastModifiedCustomers=Khách hàng biến đổi cuối cùng% s -BoxTitleLastCustomersOrProspects=Cuối% s sửa đổi khách hàng hoặc khách hàng tiềm năng -BoxTitleLastPropals=Cuối% s ghi nhận đề xuất -BoxTitleLastCustomerBills=Hoá đơn cuối% s khách hàng -BoxTitleLastSupplierBills=Hoá đơn cuối% s nhà cung cấp -BoxTitleLastProspects=Cuối% s ghi nhận triển vọng -BoxTitleLastModifiedProspects=Triển vọng biến đổi cuối cùng% s +BoxTitleLastCustomerOrders=Đơn đặt hàng của khách hàng cuối %s +BoxTitleLastModifiedCustomerOrders=Đơn đặt hàng của khách hàng đã sửa %s cuối cùng +BoxTitleLastSuppliers=Các nhà cung cấp ghi cuối %s +BoxTitleLastCustomers=Cuối %s ghi nhận khách hàng +BoxTitleLastModifiedSuppliers=Các nhà cung cấp đã sửa cuối cùng %s +BoxTitleLastModifiedCustomers=Khách hàng đã sửa cuối cùng %s +BoxTitleLastCustomersOrProspects=Cuối %s khách hàng hoặc khách hàng tiềm năng +BoxTitleLastPropals=Cuối %s đề xuất +BoxTitleLastModifiedPropals=Đề xuất sửa đổi lần cuối %s +BoxTitleLastCustomerBills=Hoá đơn cuối %s khách hàng +BoxTitleLastModifiedCustomerBills=Hóa đơn của khách hàng đã sửa %s cuối cùng +BoxTitleLastSupplierBills=Hoá đơn cuối %s nhà cung cấp +BoxTitleLastModifiedSupplierBills=Hóa đơn của nhà cung cấp đã sửa %s cuối cùng +BoxTitleLastModifiedProspects=Triển vọng đã sửa cuối cùng %s BoxTitleLastProductsInContract=Cuối% của sản phẩm / dịch vụ trong hợp đồng -BoxTitleLastModifiedMembers=Các thành viên biến đổi cuối cùng% s -BoxTitleLastFicheInter=Can thiệp biến đổi cuối cùng% s -BoxTitleOldestUnpaidCustomerBills=Hoá đơn lâu đời nhất% s chưa thanh toán của khách hàng -BoxTitleOldestUnpaidSupplierBills=Hoá đơn lâu đời nhất% s chưa thanh toán của nhà cung cấp +BoxTitleLastModifiedMembers=Thành viên cuối %s +BoxTitleLastFicheInter=Can thiệp đã sửa cuối cùng %s +BoxTitleOldestUnpaidCustomerBills=Hoá đơn chưa thanh toán của khách hàng lâu đời nhất %s +BoxTitleOldestUnpaidSupplierBills=Cũ nhất%s nhà cung cấp hoá đơn chưa thanh toán BoxTitleCurrentAccounts=Số dư tài khoản mở của BoxTitleSalesTurnover=Doanh thu bán hàng -BoxTitleTotalUnpaidCustomerBills=Hoá đơn chưa thanh toán của khách hàng -BoxTitleTotalUnpaidSuppliersBills=Hoá đơn chưa thanh toán của nhà cung cấp -BoxTitleLastModifiedContacts=Cuối% s sửa đổi địa chỉ liên lạc / địa chỉ -BoxMyLastBookmarks=% Cuối cùng của tôi s bookmark +BoxTitleTotalUnpaidCustomerBills=Hóa đơn khách hàng chưa thanh toán +BoxTitleTotalUnpaidSuppliersBills=Nhà cung cấp hoá đơn chưa thanh toán +BoxTitleLastModifiedContacts=Cuối%s sửa đổi địa chỉ liên lạc / địa chỉ +BoxMyLastBookmarks=Bookmark %s cuối cùng của tôi BoxOldestExpiredServices=Dịch vụ lâu đời nhất đã hết hạn hoạt động -BoxLastExpiredServices=Cuối% s liên hệ lâu đời nhất với các dịch vụ đã hết hạn hoạt động -BoxTitleLastActionsToDo=Hành động cuối% s để làm -BoxTitleLastContracts=Hợp đồng cuối% s -BoxTitleLastModifiedDonations=Cuối% s đóng góp sửa đổi -BoxTitleLastModifiedExpenses=Chi phí biến đổi cuối cùng% s +BoxLastExpiredServices=Cuối %s liên hệ lâu đời nhất với các dịch vụ đã hết hạn hoạt động +BoxTitleLastActionsToDo=Hành động cuối %s để làm +BoxTitleLastContracts=Hợp đồng cuối %s +BoxTitleLastModifiedDonations=Cuối %s đóng góp sửa đổi +BoxTitleLastModifiedExpenses=Chi phí đã sửa cuối cùng %s BoxGlobalActivity=Hoạt động toàn cầu (hoá đơn, đề xuất, đơn đặt hàng) -FailedToRefreshDataInfoNotUpToDate=Không thể làm mới RSS thông. Cuối ngày làm mới thành công:% s +FailedToRefreshDataInfoNotUpToDate=Không thể làm mới RSS thông. Cuối ngày làm mới thành công: %s LastRefreshDate=Cuối ngày làm mới NoRecordedBookmarks=Không có dấu xác định. ClickToAdd=Nhấn vào đây để thêm. @@ -76,7 +80,8 @@ NoContractedProducts=Không có sản phẩm / dịch vụ ký hợp đồng NoRecordedContracts=Không có hợp đồng thu âm NoRecordedInterventions=Không có biện pháp can thiệp ghi BoxLatestSupplierOrders=Đơn đặt hàng nhà cung cấp mới nhất -BoxTitleLatestSupplierOrders=% Của các đơn đặt hàng nhà cung cấp mới nhất +BoxTitleLatestSupplierOrders=Đơn đặt hàng nhà cung cấp cuối%s +BoxTitleLatestModifiedSupplierOrders=Đơn hàng nhà cung cấp đã sửa %s cuối cùng NoSupplierOrder=Không có nhà cung cấp để ghi lại BoxCustomersInvoicesPerMonth=Hoá đơn của khách hàng mỗi tháng BoxSuppliersInvoicesPerMonth=Nhà cung cấp hoá đơn mỗi tháng @@ -85,7 +90,7 @@ BoxSuppliersOrdersPerMonth=Đơn đặt hàng nhà cung cấp mỗi tháng BoxProposalsPerMonth=Đề xuất mỗi tháng NoTooLowStockProducts=Không có sản phẩm trong giới hạn cổ phiếu thấp BoxProductDistribution=Sản phẩm / Dịch vụ phân phối -BoxProductDistributionFor=Phân phối% s cho% s +BoxProductDistributionFor=Phân phối %s cho %s ForCustomersInvoices=Khách hàng hoá đơn ForCustomersOrders=Khách hàng đặt hàng ForProposals=Đề xuất diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang index b26bf057ca2..fb5a7b99c2a 100644 --- a/htdocs/langs/vi_VN/cashdesk.lang +++ b/htdocs/langs/vi_VN/cashdesk.lang @@ -9,7 +9,7 @@ CashDeskBankCheque=Tài khoản ngân hàng (kiểm tra) CashDeskWarehouse=Kho CashdeskShowServices=Dịch vụ bán hàng CashDeskProducts=Sản phẩm -CashDeskStock=Cổ +CashDeskStock=Tồn kho CashDeskOn=trên CashDeskThirdParty=Bên thứ ba CashdeskDashboard=Điểm truy cập bán diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang index 6f08b8ab539..70049b18354 100644 --- a/htdocs/langs/vi_VN/categories.lang +++ b/htdocs/langs/vi_VN/categories.lang @@ -42,9 +42,9 @@ ErrCatAlreadyExists=Tên này đã được sử dụng AddProductToCat=Thêm sản phẩm này vào một danh mục? ImpossibleAddCat=Không thể thêm các loại ImpossibleAssociateCategory=Không thể kết hợp các thể loại để -WasAddedSuccessfully=% S đã được thêm thành công. +WasAddedSuccessfully=%s đã được thêm thành công. ObjectAlreadyLinkedToCategory=Yếu tố đã được liên kết với thể loại này. -CategorySuccessfullyCreated=Thể loại này% s đã được thêm thành công. +CategorySuccessfullyCreated=Thể loại này %s đã được thêm thành công. ProductIsInCategories=Sản phẩm / dịch vụ để sở hữu loại sau SupplierIsInCategories=Sở hữu của bên thứ ba để cung cấp các loại sau đây CompanyIsInCustomersCategories=Bên thứ ba này sở hữu để sau khách hàng / khách hàng tiềm năng loại @@ -101,9 +101,6 @@ CatSupLinks=Liên kết giữa nhà cung cấp và các loại CatCusLinks=Mối liên hệ giữa khách hàng / khách hàng tiềm năng và các loại CatProdLinks=Liên kết giữa các sản phẩm / dịch vụ và các loại CatMemberLinks=Liên kết giữa các thành viên và các loại -CatProdLinks=Liên kết giữa các sản phẩm / dịch vụ và các loại -CatCusLinks=Mối liên hệ giữa khách hàng / khách hàng tiềm năng và các loại -CatSupLinks=Liên kết giữa nhà cung cấp và các loại DeleteFromCat=Di chuyển từ mục DeletePicture=Ảnh xóa ConfirmDeletePicture=Xác nhận xoá hình ảnh? @@ -111,4 +108,5 @@ ExtraFieldsCategories=Thuộc tính bổ sung CategoriesSetup=Loại thiết lập CategorieRecursiv=Liên kết với các chủ đề chính tự động CategorieRecursivHelp=Nếu được kích hoạt, sản phẩm này cũng sẽ liên quan đến chủ đề chính khi thêm vào một tiểu thể loại -AddProductServiceIntoCategory=Add the following product/service +AddProductServiceIntoCategory=Thêm sản phẩm / dịch vụ sau đây +ShowCategory=Show category diff --git a/htdocs/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang index 46c7b8d170a..438fc7048a3 100644 --- a/htdocs/langs/vi_VN/commercial.lang +++ b/htdocs/langs/vi_VN/commercial.lang @@ -7,20 +7,20 @@ Customer=Khách hàng Customers=Khách hàng Prospect=Triển vọng Prospects=Triển vọng -DeleteAction=Xóa một sự kiện / nhiệm vụ -NewAction=Sự kiện mới / nhiệm vụ -AddAction=Thêm sự kiện / nhiệm vụ -AddAnAction=Thêm một sự kiện / nhiệm vụ -AddActionRendezVous=Thêm một sự kiện Rendez-vous +DeleteAction=Xóa một sự kiện / tác vụ +NewAction=Sự kiện mới / tác vụ +AddAction=Tạo sự kiện / tác vụ +AddAnAction=Tạo một sự kiện / tác vụ +AddActionRendezVous=Tạo một sự kiện Rendez-vous Rendez-Vous=Rendezvous -ConfirmDeleteAction=Bạn có chắc chắn muốn xóa sự kiện này / nhiệm vụ? +ConfirmDeleteAction=Bạn có chắc chắn muốn xóa sự kiện này / tác vụ? CardAction=Thẻ sự kiện PercentDone=Tỷ lệ hoàn thành -ActionOnCompany=Nhiệm vụ về công ty -ActionOnContact=Nhiệm vụ về liên hệ +ActionOnCompany=Tác vụ về công ty +ActionOnContact=Tác vụ về liên hệ TaskRDV=Các cuộc họp -TaskRDVWith=Gặp gỡ với% s -ShowTask=Hiện nhiệm vụ +TaskRDVWith=Gặp gỡ với %s +ShowTask=Hiện tác vụ ShowAction=Hiện sự kiện ActionsReport=Sự kiện báo cáo ThirdPartiesOfSaleRepresentative=Thirdparties với đại diện bán hàng @@ -35,17 +35,17 @@ ShowCustomer=Hiện khách hàng ShowProspect=Hiện khách hàng tiềm năng ListOfProspects=Danh sách khách hàng tiềm năng ListOfCustomers=Danh sách khách hàng -LastDoneTasks=Hoàn thành nhiệm vụ cuối% s -LastRecordedTasks=Nhiệm vụ ghi lại cuối cùng -LastActionsToDo=Hoạt động lâu đời nhất cuối% s không hoàn thành -DoneAndToDoActionsFor=Sự kiện hoàn thành và Để làm cho% s +LastDoneTasks=Hoàn thành tác vụ cuối %s +LastRecordedTasks=Tác vụ ghi lại cuối cùng +LastActionsToDo=Hoạt động lâu đời nhất cuối %s không hoàn thành +DoneAndToDoActionsFor=Sự kiện hoàn thành và Để làm cho %s DoneAndToDoActions=Để hoàn thành và làm sự kiện DoneActions=Sự kiện hoàn thành -DoneActionsFor=Sự kiện hoàn thành% s +DoneActionsFor=Sự kiện hoàn thành %s ToDoActions=Sự kiện không đầy đủ -ToDoActionsFor=Sự kiện không đầy đủ cho% s -SendPropalRef=Nộp đề xuất thương mại% s -SendOrderRef=Trình tự% s +ToDoActionsFor=Sự kiện không đầy đủ cho %s +SendPropalRef=Nộp đề xuất thương mại %s +SendOrderRef=Đệ trình đơn hàng %s StatusNotApplicable=Không áp dụng StatusActionToDo=Để làm StatusActionDone=Hoàn thành @@ -66,7 +66,7 @@ ActionAffectedTo=Tổ chức sự kiện thuộc sở hữu của ActionDoneBy=Sự kiện được thực hiện bởi ActionUserAsk=Báo cáo của ErrorStatusCantBeZeroIfStarted=Nếu trường 'ngày thực hiện "được làm đầy, hành động được bắt đầu (hoặc hoàn thành), do đó lĩnh vực' Trạng thái 'không thể là 0 %%. -ActionAC_TEL=Gọi điện thoại +ActionAC_TEL=Cuộc gọi ActionAC_FAX=Gửi fax ActionAC_PROP=Gửi đề nghị qua đường bưu điện ActionAC_EMAIL=Gởi thư @@ -86,7 +86,7 @@ ActionAC_MANUAL=Sự kiện chèn bằng tay ActionAC_AUTO=Sự kiện tự động chèn Stats=Thống kê doanh số bán hàng CAOrder=Khối lượng bán hàng (đơn đặt hàng xác nhận) -FromTo=từ% s đến% s +FromTo=từ %s đến %s MargeOrder=Tỷ suất lợi nhuận (đơn đặt hàng xác nhận) RecapAnnee=Tóm tắt các năm NoData=Không có dữ liệu diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang index 6717f473870..c63934a0536 100644 --- a/htdocs/langs/vi_VN/companies.lang +++ b/htdocs/langs/vi_VN/companies.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - companies -ErrorCompanyNameAlreadyExists=Tên công ty% s đã tồn tại. Chọn một số khác. -ErrorPrefixAlreadyExists=Tiền tố% s đã tồn tại. Chọn một số khác. +ErrorCompanyNameAlreadyExists=Tên công ty %s đã tồn tại. Chọn một số khác. +ErrorPrefixAlreadyExists=Tiền tố %s đã tồn tại. Chọn một số khác. ErrorSetACountryFirst=Thiết lập đầu tiên của đất nước SelectThirdParty=Chọn một bên thứ ba DeleteThirdParty=Xóa một bên thứ ba @@ -40,7 +40,7 @@ ThirdPartyProspects=Triển vọng ThirdPartyProspectsStats=Triển vọng ThirdPartyCustomers=Khách hàng ThirdPartyCustomersStats=Khách hàng -ThirdPartyCustomersWithIdProf12=Khách hàng có% s hay% s +ThirdPartyCustomersWithIdProf12=Khách hàng có%s hay%s ThirdPartySuppliers=Nhà cung cấp ThirdPartyType=Loại bên thứ ba Company/Fundation=Công ty / cơ sở @@ -94,7 +94,7 @@ LocalTax2ES=IRPF TypeLocaltax1ES=Loại RE TypeLocaltax2ES=IRPF Loại TypeES=Loại -ThirdPartyEMail=% S +ThirdPartyEMail=%s WrongCustomerCode=Mã khách hàng không hợp lệ WrongSupplierCode=Mã nhà cung cấp không hợp lệ CustomerCodeModel=Mô hình mã khách hàng @@ -247,10 +247,10 @@ CustomerRelativeDiscount=Giảm giá của khách hàng liên quan CustomerAbsoluteDiscount=Giảm giá khách hàng tuyệt đối CustomerRelativeDiscountShort=Giảm tương đối CustomerAbsoluteDiscountShort=Giảm giá tuyệt đối -CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định của% s %% +CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định của %s%% CompanyHasNoRelativeDiscount=Khách hàng này không có giảm giá tương đối theo mặc định -CompanyHasAbsoluteDiscount=Khách hàng này vẫn có các khoản tín dụng giảm giá hoặc tiền đặt cọc cho% s% s -CompanyHasCreditNote=Khách hàng này vẫn có giấy báo cho% s% s +CompanyHasAbsoluteDiscount=Khách hàng này vẫn có các khoản tín dụng giảm giá hoặc tiền đặt cọc cho %s %s +CompanyHasCreditNote=Khách hàng này vẫn có giấy báo cho %s %s CompanyHasNoAbsoluteDiscount=Khách hàng này không có tín dụng giảm giá có sẵn CustomerAbsoluteDiscountAllUsers=Giảm giá tuyệt đối (do tất cả người dùng) CustomerAbsoluteDiscountMy=Giảm giá tuyệt đối (do chính mình) @@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Giảm giá tuyệt đối có sẵn DiscountNone=Không Supplier=Nhà cung cấp CompanyList=Danh sách của công ty -AddContact=Thêm số liên lạc -AddContactAddress=Thêm số liên lạc / địa chỉ +AddContact=Tạo liên hệ +AddContactAddress=Tạo liên hệ / địa chỉ EditContact=Sửa liên lạc EditContactAddress=Sửa liên lạc / địa chỉ Contact=Liên hệ @@ -268,8 +268,8 @@ ContactsAddresses=Liên hệ / địa chỉ NoContactDefinedForThirdParty=Không liên lạc được xác định cho bên thứ ba này NoContactDefined=Không liên lạc được xác định DefaultContact=Mặc định liên lạc / địa chỉ -AddCompany=Thêm công ty -AddThirdParty=Thêm bên thứ ba +AddCompany=Tạo công ty +AddThirdParty=Tạo bên thứ ba DeleteACompany=Xóa một công ty PersonalInformations=Dữ liệu cá nhân AccountancyCode=Đang kế toán @@ -285,7 +285,7 @@ ValidityControledByModule=Hiệu lực điều khiển bởi mô-đun ThisIsModuleRules=Đây là quy tắc cho các mô-đun này LastProspect=Cuối ProspectToContact=Khách hàng tiềm năng để liên hệ -CompanyDeleted=Công ty "% s" sẽ bị xóa khỏi cơ sở dữ liệu. +CompanyDeleted=Công ty "%s" sẽ bị xóa khỏi cơ sở dữ liệu. ListOfContacts=Danh sách địa chỉ liên lạc / địa chỉ ListOfContactsAddresses=Danh sách địa chỉ liên lạc / adresses ListOfProspectsContacts=Danh sách liên hệ khách hàng tiềm năng @@ -311,12 +311,12 @@ LastContacts=Địa chỉ liên lạc cuối cùng MyContacts=Địa chỉ liên lạc của tôi Phones=Điện thoại Capital=Vốn -CapitalOf=Thủ đô của% s +CapitalOf=Vốn của%s EditCompany=Chỉnh sửa công ty EditDeliveryAddress=Chỉnh sửa địa chỉ giao hàng ThisUserIsNot=Thành viên này không phải là một khách hàng tiềm năng, khách hàng cũng không phải nhà cung cấp VATIntraCheck=Kiểm tra -VATIntraCheckDesc=Các liên kết% s cho phép yêu cầu các dịch vụ kiểm tra thuế GTGT châu Âu. Một truy cập internet từ máy chủ bên ngoài là cần thiết cho dịch vụ này để làm việc. +VATIntraCheckDesc=Các liên kết %s cho phép yêu cầu các dịch vụ kiểm tra thuế GTGT châu Âu. Một truy cập internet từ máy chủ bên ngoài là cần thiết cho dịch vụ này để làm việc. VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do VATIntraCheckableOnEUSite=Kiểm tra Intracomunnautary thuế GTGT trên trang web của hoa hồng Châu Âu VATIntraManualCheck=Bạn cũng có thể kiểm tra bằng tay từ châu Âu trang web % s @@ -379,8 +379,8 @@ DeliveryAddressLabel=Giao hàng tận nơi nhãn địa chỉ DeleteDeliveryAddress=Xóa một địa chỉ giao hàng ConfirmDeleteDeliveryAddress=Bạn Bạn có chắc chắn muốn xóa địa chỉ giao hàng này? NewDeliveryAddress=Địa chỉ giao hàng mới -AddDeliveryAddress=Thêm địa chỉ -AddAddress=Thêm địa chỉ +AddDeliveryAddress=Tạo địa chỉ +AddAddress=Tạo địa chỉ NoOtherDeliveryAddress=Không có địa chỉ giao hàng thay thế được xác định SupplierCategory=Loại nhà cung cấp JuridicalStatus200=Độc lập @@ -397,18 +397,18 @@ YouMustCreateContactFirst=Bạn phải tạo ra các email liên lạc cho bên ListSuppliersShort=Danh sách nhà cung cấp ListProspectsShort=Danh sách khách hàng tiềm năng ListCustomersShort=Danh sách khách hàng -ThirdPartiesArea=Third parties and contact area -LastModifiedThirdParties=Các bên thứ ba cuối% s sửa đổi +ThirdPartiesArea=Bên thứ ba và các khu vực liên hệ +LastModifiedThirdParties=Các bên thứ ba cuối%s sửa đổi UniqueThirdParties=Tổng số của bên thứ ba độc đáo InActivity=Mở ActivityCeased=Đóng ActivityStateFilter=Tình trạng hoạt động -ProductsIntoElements=Danh sách sản phẩm vào% s +ProductsIntoElements=Danh sách sản phẩm vào%s CurrentOutstandingBill=Hóa đơn đang lưu hành OutstandingBill=Max. cho hóa đơn xuất sắc OutstandingBillReached=Đạt tối đa. cho hóa đơn xuất sắc MonkeyNumRefModelDesc=Quay trở lại với các định dạng numero syymm-nnnn cho mã khách hàng và% syymm-nnnn cho mã nhà cung cấp nơi yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0. LeopardNumRefModelDesc=Mã này là miễn phí. Mã này có thể được sửa đổi bất cứ lúc nào. ManagingDirectors=Quản lý (các) tên (Giám đốc điều hành, giám đốc, chủ tịch ...) -SearchThirdparty=Search thirdparty -SearchContact=Search contact +SearchThirdparty=Tìm kiếm của bên thứ ba +SearchContact=Tìm kiếm liên lạc diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang index b1b6319f082..c169fe2afbc 100644 --- a/htdocs/langs/vi_VN/compta.lang +++ b/htdocs/langs/vi_VN/compta.lang @@ -104,13 +104,14 @@ SalesTurnoverMinimum=Doanh thu bán hàng tối thiểu ByThirdParties=Do các bên thứ ba ByUserAuthorOfInvoice=Của tác giả hóa đơn AccountancyExport=Kế toán xuất khẩu -ErrorWrongAccountancyCodeForCompany=Bad đang kế toán của khách hàng cho% s +ErrorWrongAccountancyCodeForCompany=Bad đang kế toán của khách hàng cho %s SuppliersProductsSellSalesTurnover=Doanh thu được tạo ra bởi việc bán các sản phẩm của nhà cung cấp. CheckReceipt=Kiểm tra tiền gửi CheckReceiptShort=Kiểm tra tiền gửi +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=Giảm giá mới NewCheckDeposit=Tiền gửi kiểm tra mới -NewCheckDepositOn=Tạo nhận đối với tiền gửi trên tài khoản:% s +NewCheckDepositOn=Tạo nhận đối với tiền gửi trên tài khoản: %s NoWaitingChecks=Không có kiểm tra chờ đợi tiền gửi. DateChequeReceived=Kiểm tra ngày tiếp nhận NbOfCheques=Nb kiểm tra @@ -119,22 +120,22 @@ ConfirmPaySocialContribution=Bạn có chắc chắn bạn muốn phân loại DeleteSocialContribution=Xóa một đóng góp xã hội ConfirmDeleteSocialContribution=Bạn Bạn có chắc chắn muốn xóa đóng góp xã hội này? ExportDataset_tax_1=Đóng góp xã hội và thanh toán -CalcModeVATDebt=Chế độ% sVAT về kế toán cam kết% s. -CalcModeVATEngagement=Chế độ sVAT% đối với thu nhập-chi phí% s. -CalcModeDebt=Chế độ% sClaims-Các khoản nợ% cho biết kế toán cam kết. -CalcModeEngagement=Chế độ% sIncomes-Chi% cho biết kế toán tiền mặt -CalcModeLT1= Chế độ SRE% trên hoá đơn của khách hàng - nhà cung cấp hoá đơn% s -CalcModeLT1Debt=Chế độ SRE% trên hóa đơn khách hàng% s -CalcModeLT1Rec= Chế độ% SRE các nhà cung cấp hoá đơn% s -CalcModeLT2= Chế độ sIRPF% trên hoá đơn của khách hàng - nhà cung cấp hóa đơn% s -CalcModeLT2Debt=Chế độ sIRPF% trên hóa đơn khách hàng% s -CalcModeLT2Rec= Chế độ% sIRPF các nhà cung cấp hóa đơn% s +CalcModeVATDebt=Chế độ %sVAT về kế toán cam kết%s. +CalcModeVATEngagement=Chế độ %sVAT đối với thu nhập-chi phí%s. +CalcModeDebt=Chế độ %sClaims-Các khoản nợ%s cho biết kế toán cam kết. +CalcModeEngagement=Chế độ %sIncomes-Chi%s cho biết kế toán tiền mặt +CalcModeLT1= Chế độ %sRE trên hoá đơn của khách hàng - nhà cung cấp hoá đơn%s +CalcModeLT1Debt=Chế độ %sRE% trên hóa đơn khách hàng%s +CalcModeLT1Rec= Chế độ %sRE các nhà cung cấp hoá đơn%s +CalcModeLT2= Chế độ %sIRPF trên hoá đơn của khách hàng - nhà cung cấp hóa đơn%s +CalcModeLT2Debt=Chế độ %sIRPF trên hóa đơn khách hàng%s +CalcModeLT2Rec= Chế độ %sIRPF các nhà cung cấp hóa đơn%s AnnualSummaryDueDebtMode=Cán cân thu nhập và chi phí, tổng kết hàng năm AnnualSummaryInputOutputMode=Cán cân thu nhập và chi phí, tổng kết hàng năm -AnnualByCompaniesDueDebtMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, chế độ% sClaims-Các khoản nợ% cho biết kế toán cam kết. -AnnualByCompaniesInputOutputMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, chế độ% sIncomes-Chi% cho biết kế toán tiền mặt. -SeeReportInInputOutputMode=Xem báo cáo% sIncomes-Chi% cho biết tiền mặt chiếm một tính toán thanh toán thực tế được thực hiện -SeeReportInDueDebtMode=Xem báo cáo% sClaims-Các khoản nợ% s cho biết cam kết chiếm một tính toán trên hoá đơn +AnnualByCompaniesDueDebtMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, chế độ %sClaims-Các khoản nợ%s biết kế toán cam kết. +AnnualByCompaniesInputOutputMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, %sIncomes-Expenses%s cho biết kế toán tiền mặt. +SeeReportInInputOutputMode=Xem báo cáo %sIncomes-Chi%s cho biết tiền mặt chiếm một tính toán thanh toán thực tế được thực hiện +SeeReportInDueDebtMode=Xem báo cáo%sClaims-Các khoản nợ%s cho biết cam kết chiếm một tính toán trên hoá đơn RulesAmountWithTaxIncluded=- Các khoản hiển thị là với tất cả các loại thuế bao gồm RulesResultDue=- Nó bao gồm hoá đơn xuất sắc, chi phí và thuế GTGT cho dù họ được trả tiền hay không.
    - Đó là dựa vào ngày xác nhận hóa đơn, thuế GTGT và vào ngày đến hạn cho các chi phí. RulesResultInOut=- Nó bao gồm các khoản thanh toán thực tế được thực hiện trên hóa đơn, chi phí và thuế GTGT.
    - Đó là dựa vào ngày thanh toán hoá đơn, chi phí và thuế GTGT. @@ -152,8 +153,8 @@ LT2ReportByQuartersInInputOutputMode=Báo cáo của tỷ lệ IRPF VATReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ thuế GTGT thu, nộp LT1ReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ RE LT2ReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ IRPF -SeeVATReportInInputOutputMode=Xem báo cáo% sVAT vỏ bọc% s cho một tính toán tiêu chuẩn -SeeVATReportInDueDebtMode=Xem báo cáo% sVAT trên dòng% s cho một tính toán với một tùy chọn trên dòng chảy +SeeVATReportInInputOutputMode=Xem báo cáo %sVAT vỏ bọc%s cho một tính toán tiêu chuẩn +SeeVATReportInDueDebtMode=Xem báo cáo %sVAT trên dòng%s cho một tính toán với một tùy chọn trên dòng chảy RulesVATInServices=- Đối với dịch vụ, báo cáo bao gồm các quy định thuế GTGT thực sự nhận được hoặc ban hành trên cơ sở ngày thanh toán. RulesVATInProducts=- Đối với tài sản vật chất, nó bao gồm các hoá đơn GTGT trên cơ sở ngày hóa đơn. RulesVATDueServices=- Đối với dịch vụ, báo cáo bao gồm hóa đơn GTGT do, trả tiền hay không, dựa trên ngày hóa đơn. @@ -164,9 +165,9 @@ NotUsedForGoods=Không được sử dụng đối với hàng hóa ProposalStats=Thống kê về các đề xuất OrderStats=Thống kê về đơn đặt hàng InvoiceStats=Thống kê trên hóa đơn -Dispatch=Cử -Dispatched=Cử -ToDispatch=Cử +Dispatch=Đang gửi +Dispatched=Đã gửi +ToDispatch=Gửi đi ThirdPartyMustBeEditAsCustomer=Bên thứ ba phải được định nghĩa là một khách hàng SellsJournal=Tạp chí Kinh doanh PurchasesJournal=Mua Tạp chí @@ -187,23 +188,19 @@ AccountancyDashboard=Kế toán tổng hợp ByProductsAndServices=Các sản phẩm và dịch vụ RefExt=Ref bên ngoài ToCreateAPredefinedInvoice=Để tạo ra một hóa đơn được xác định trước, tạo ra một hóa đơn tiêu chuẩn sau đó, mà không cần xác nhận nó, bấm vào nút vào "Chuyển đổi sang hóa đơn được xác định trước". -LinkedOrder=Link to order +LinkedOrder=Liên kết để đặt hàng ReCalculate=Tính toán lại Mode1=Phương pháp 1 Mode2=Phương pháp 2 -CalculationRuleDesc=Để tính tổng số thuế GTGT, có hai phương pháp:
    Phương pháp 1 đang đi ngang vat trên mỗi dòng, sau đó tổng hợp chúng.
    Cách 2 là cách tổng hợp tất cả vat trên mỗi dòng, sau đó làm tròn kết quả.
    Kết quả cuối cùng có thể khác với vài xu. Chế độ mặc định là chế độ% s. +CalculationRuleDesc=Để tính tổng số thuế GTGT, có hai phương pháp:
    Phương pháp 1 đang đi ngang vat trên mỗi dòng, sau đó tổng hợp chúng.
    Cách 2 là cách tổng hợp tất cả vat trên mỗi dòng, sau đó làm tròn kết quả.
    Kết quả cuối cùng có thể khác với vài xu. Chế độ mặc định là chế độ%s. CalculationRuleDescSupplier=theo nhà cung cấp, lựa chọn phương pháp thích hợp để áp dụng quy tắc tính toán tương tự và nhận được cùng một kết quả mong đợi của nhà cung cấp của bạn. 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=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 +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 +ACCOUNTING_ACCOUNT_SUPPLIER=Kế toán mã bằng cách mặc định cho nhà cung cấp thirdparties +CloneTax=Sao chép một đóng góp xã hội +ConfirmCloneTax=Xác nhận bản sao của một đóng góp xã hội +CloneTaxForNextMonth=Sao chép nó vào tháng tới diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang index b073df38243..e5d7db9f1bb 100644 --- a/htdocs/langs/vi_VN/contracts.lang +++ b/htdocs/langs/vi_VN/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts -ContractsArea=Diện tích hợp đồng +ContractsArea=Phạm vi hợp đồng ListOfContracts=Danh sách các hợp đồng -LastContracts=Hợp đồng đổi cuối cùng% s +LastModifiedContracts=Last %s modified contracts AllContracts=Tất cả các hợp ContractCard=Thẻ đồng ContractStatus=Tình trạng hợp đồng @@ -27,7 +27,7 @@ MenuRunningServices=Dịch vụ đang chạy MenuExpiredServices=Dịch vụ hết hạn MenuClosedServices=Dịch vụ khép kín NewContract=Hợp đồng mới -AddContract=Thêm hợp đồng +AddContract=Tạo hợp đồng SearchAContract=Tìm kiếm một hợp đồng DeleteAContract=Xóa một hợp đồng CloseAContract=Đóng một hợp đồng @@ -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=Hợp đồng đổi cuối cùng% s +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/cron.lang b/htdocs/langs/vi_VN/cron.lang index bcece4045b0..019e6939edb 100644 --- a/htdocs/langs/vi_VN/cron.lang +++ b/htdocs/langs/vi_VN/cron.lang @@ -18,9 +18,8 @@ CronExplainHowToRunUnix=Về môi trường Unix bạn nên sử dụng crontab CronExplainHowToRunWin=Trên Microsoft (tm) Windows environement bạn có thể sử dụng công cụ nhiệm vụ theo lịch trình để chạy dòng lệnh mỗi phút # Menu CronJobs=Việc theo lịch trình -CronListActive= Danh sách các công việc mới -CronListInactive= Danh sách việc làm người khuyết tật -CronListActive= Danh sách các công việc mới +CronListActive=List of active/scheduled jobs +CronListInactive=Danh sách việc làm người khuyết tật # Page list CronDateLastRun=Chạy cuối CronLastOutput=Bài đầu ra chạy diff --git a/htdocs/langs/vi_VN/deliveries.lang b/htdocs/langs/vi_VN/deliveries.lang index c61a321ab88..eaad58cffcb 100644 --- a/htdocs/langs/vi_VN/deliveries.lang +++ b/htdocs/langs/vi_VN/deliveries.lang @@ -12,7 +12,7 @@ SetDeliveryDate=Thiết lập ngày vận chuyển ValidateDeliveryReceipt=Xác nhận giao hàng ValidateDeliveryReceiptConfirm=Bạn có chắc chắn bạn muốn xác nhận giao hàng này? DeleteDeliveryReceipt=Xóa nhận giao hàng -DeleteDeliveryReceiptConfirm=Bạn Bạn có chắc chắn muốn xóa nhận giao hàng% s? +DeleteDeliveryReceiptConfirm=Bạn Bạn có chắc chắn muốn xóa nhận giao hàng %s ? DeliveryMethod=Phương thức vận chuyển TrackingNumber=Số theo dõi DeliveryNotValidated=Giao hàng tận nơi không xác nhận @@ -23,4 +23,6 @@ GoodStatusDeclaration=Đã nhận được hàng hoá trên trong tình trạng Deliverer=Giao: Sender=Tên người gửi Recipient=Người nhận -ErrorStockIsNotEnough=Không có đủ chứng khoán +ErrorStockIsNotEnough=Không có đủ tồn kho +Shippable=Shippable +NonShippable=Không shippable diff --git a/htdocs/langs/vi_VN/donations.lang b/htdocs/langs/vi_VN/donations.lang index 2a0e4670460..3fd817258c2 100644 --- a/htdocs/langs/vi_VN/donations.lang +++ b/htdocs/langs/vi_VN/donations.lang @@ -4,7 +4,7 @@ Donations=Tài trợ DonationRef=Mã tài trợ Donor=Nhà tài trợ Donors=Các nhà tài trợ -AddDonation=Thêm tài trợ +AddDonation=Create a donation NewDonation=Thêm tài trợ mới ShowDonation=Hiển thị tài trợ DonationPromise=Hứa tài trợ @@ -31,3 +31,8 @@ DonationRecipient=Người nhận tài trợ ThankYou=Trân trọng Cảm ơn! IConfirmDonationReception=Người nhận tuyên bố tiếp nhận, như là một đóng góp, số tiền sau MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/exports.lang b/htdocs/langs/vi_VN/exports.lang index b940d63b5a0..e5de485ea10 100644 --- a/htdocs/langs/vi_VN/exports.lang +++ b/htdocs/langs/vi_VN/exports.lang @@ -1,26 +1,26 @@ # Dolibarr language file - Source file is en_US - exports -ExportsArea=Khu vực xuất khẩu -ImportArea=Khu vực nhập khẩu -NewExport=Xuất khẩu mới -NewImport=Nhập khẩu mới -ExportableDatas=Số liệu xuất khẩu -ImportableDatas=Dữ liệu nhập cảng -SelectExportDataSet=Chọn dữ liệu bạn muốn xuất khẩu ... -SelectImportDataSet=Chọn dữ liệu bạn muốn nhập khẩu ... -SelectExportFields=Chọn lĩnh vực bạn muốn xuất khẩu, hoặc chọn một hồ sơ xuất khẩu được xác định trước -SelectImportFields=Chọn lĩnh vực nguồn tập tin bạn muốn nhập khẩu và lĩnh vực mục tiêu của họ trong cơ sở dữ liệu bằng cách kéo lên và xuống với neo% s, hoặc chọn một hồ sơ nhập khẩu được xác định trước: -NotImportedFields=Các lĩnh vực của tập tin nguồn không nhập khẩu -SaveExportModel=Lưu hồ sơ xuất khẩu này nếu bạn có kế hoạch để sử dụng lại sau ... -SaveImportModel=Lưu hồ sơ nhập khẩu này nếu bạn có kế hoạch để sử dụng lại sau ... -ExportModelName=Tên hồ sơ xuất khẩu -ExportModelSaved=Hồ sơ xuất khẩu được lưu dưới tên% s. -ExportableFields=Lĩnh vực xuất khẩu -ExportedFields=Lĩnh vực xuất khẩu -ImportModelName=Tên hồ sơ nhập khẩu -ImportModelSaved=Hồ sơ nhập khẩu lưu dưới tên% s. -ImportableFields=Lĩnh vực nhập cảng -ImportedFields=Lĩnh vực nhập khẩu -DatasetToExport=Số liệu để xuất khẩu +ExportsArea=Khu vực xuất dữ liệu +ImportArea=Khu vực nhập dữ liệu +NewExport=Xuất dữ liệu mới +NewImport=Nhập dữ liệu mới +ExportableDatas=Số liệu xuất dữ liệu +ImportableDatas=Dữ liệu nhập +SelectExportDataSet=Chọn dữ liệu bạn muốn xuất dữ liệu ... +SelectImportDataSet=Chọn dữ liệu bạn muốn nhập dữ liệu ... +SelectExportFields=Chọn lĩnh vực bạn muốn xuất dữ liệu, hoặc chọn một hồ sơ xuất dữ liệu được xác định trước +SelectImportFields=Chọn lĩnh vực nguồn tập tin bạn muốn nhập dữ liệu và lĩnh vực mục tiêu của họ trong cơ sở dữ liệu bằng cách kéo lên và xuống với neo% s, hoặc chọn một hồ sơ nhập dữ liệu được xác định trước: +NotImportedFields=Các lĩnh vực của tập tin nguồn không nhập dữ liệu +SaveExportModel=Lưu hồ sơ xuất dữ liệu này nếu bạn có kế hoạch để sử dụng lại sau ... +SaveImportModel=Lưu hồ sơ nhập dữ liệu này nếu bạn có kế hoạch để sử dụng lại sau ... +ExportModelName=Tên hồ sơ xuất dữ liệu +ExportModelSaved=Hồ sơ xuất dữ liệu được lưu dưới tên% s. +ExportableFields=Lĩnh vực xuất dữ liệu +ExportedFields=Lĩnh vực xuất dữ liệu +ImportModelName=Tên hồ sơ nhập dữ liệu +ImportModelSaved=Hồ sơ nhập dữ liệu lưu dưới tên% s. +ImportableFields=Lĩnh vực nhập +ImportedFields=Lĩnh vực nhập dữ liệu +DatasetToExport=Số liệu để xuất dữ liệu DatasetToImport=Nhập tập tin vào bộ dữ liệu NoDiscardedFields=Không có lĩnh vực trong tập tin nguồn sẽ bị loại bỏ Dataset=Dataset @@ -30,23 +30,23 @@ FieldsTitle=Các lĩnh vực tiêu đề FieldOrder=Để lĩnh vực FieldTitle=Dòng tiêu đề ChooseExportFormat=Chọn định dạng xuất -NowClickToGenerateToBuildExportFile=Bây giờ, chọn định dạng tập tin trong combo box và click vào nút "Tạo" để xây dựng tập tin xuất khẩu ... +NowClickToGenerateToBuildExportFile=Bây giờ, chọn định dạng tập tin trong combo box và click vào nút "Tạo" để xây dựng tập tin xuất dữ liệu ... AvailableFormats=Định dạng có sẵn LibraryShort=Thư viện LibraryUsed=Thư viện sử dụng LibraryVersion=Phiên bản Step=Bước -FormatedImport=Trợ lý nhập khẩu +FormatedImport=Trợ lý nhập dữ liệu FormatedImportDesc1=Khu vực này cho phép nhập dữ liệu cá nhân, sử dụng một trợ lý để giúp bạn trong quá trình mà không có kiến ​​thức kỹ thuật. FormatedImportDesc2=Bước đầu tiên là chọn một vị vua dữ liệu mà bạn muốn tải, sau đó tập tin để tải, sau đó lựa chọn các lĩnh vực mà bạn muốn tải. -FormatedExport=Trợ xuất khẩu -FormatedExportDesc1=Khu vực này cho phép xuất khẩu dữ liệu cá nhân, sử dụng một trợ lý để giúp bạn trong quá trình mà không có kiến ​​thức kỹ thuật. +FormatedExport=Trợ xuất dữ liệu +FormatedExportDesc1=Khu vực này cho phép xuất dữ liệu dữ liệu cá nhân, sử dụng một trợ lý để giúp bạn trong quá trình mà không có kiến ​​thức kỹ thuật. FormatedExportDesc2=Bước đầu tiên là chọn một bộ dữ liệu được xác định trước, sau đó lựa chọn các lĩnh vực mà bạn muốn trong các tập tin kết quả của bạn, và có trật tự. -FormatedExportDesc3=Khi dữ liệu để xuất khẩu được lựa chọn, bạn có thể xác định các định dạng tập tin đầu ra bạn muốn xuất khẩu dữ liệu của bạn. +FormatedExportDesc3=Khi dữ liệu để xuất dữ liệu được lựa chọn, bạn có thể xác định các định dạng tập tin đầu ra bạn muốn xuất dữ liệu dữ liệu của bạn. Sheet=Bảng -NoImportableData=Không có dữ liệu nhập cảng (không có mô-đun với các định nghĩa để cho phép nhập khẩu dữ liệu) -FileSuccessfullyBuilt=Xuất khẩu tập tin được tạo ra -SQLUsedForExport=SQL Yêu cầu sử dụng để xây dựng các tập tin xuất khẩu +NoImportableData=Không có dữ liệu nhập (không có mô-đun với các định nghĩa để cho phép nhập dữ liệu dữ liệu) +FileSuccessfullyBuilt=Xuất dữ liệu tập tin được tạo ra +SQLUsedForExport=SQL Yêu cầu sử dụng để xây dựng các tập tin xuất dữ liệu LineId=Id của dòng LineDescription=Mô tả dòng LineUnitPrice=Đơn giá đường @@ -56,12 +56,12 @@ LineTotalHT=Số tiền đã trừ thuế cho các dòng LineTotalTTC=Số tiền có thuế đối với dòng LineTotalVAT=Số tiền thuế GTGT đối với dòng TypeOfLineServiceOrProduct=Loại đường (0 = sản phẩm, dịch vụ = 1) -FileWithDataToImport=Tập tin với dữ liệu nhập khẩu -FileToImport=Tập tin nguồn để nhập khẩu -FileMustHaveOneOfFollowingFormat=File để nhập khẩu phải có một trong những định dạng sau +FileWithDataToImport=Tập tin với dữ liệu nhập dữ liệu +FileToImport=Tập tin nguồn để nhập dữ liệu +FileMustHaveOneOfFollowingFormat=File để nhập dữ liệu phải có một trong những định dạng sau DownloadEmptyExample=Tải về ví dụ về tập tin mã nguồn trống -ChooseFormatOfFileToImport=Chọn định dạng tập tin để sử dụng như là định dạng tập tin nhập khẩu bằng cách nhấp vào Picto% s để chọn nó ... -ChooseFileToImport=Tải lên tập tin sau đó nhấn vào Picto% s để chọn tập tin như tập tin nguồn nhập khẩu ... +ChooseFormatOfFileToImport=Chọn định dạng tập tin để sử dụng như là định dạng tập tin nhập dữ liệu bằng cách nhấp vào Picto% s để chọn nó ... +ChooseFileToImport=Tải lên tập tin sau đó nhấn vào Picto% s để chọn tập tin như tập tin nguồn nhập dữ liệu ... SourceFileFormat=Định dạng tập tin nguồn FieldsInSourceFile=Lĩnh vực trong tập tin nguồn FieldsInTargetDatabase=Lĩnh vực mục tiêu trong cơ sở dữ liệu Dolibarr (đậm = bắt buộc) @@ -69,9 +69,9 @@ Field=Dòng NoFields=Không có lĩnh vực MoveField=Số cột lĩnh vực di chuyển% s ExampleOfImportFile=Example_of_import_file -SaveImportProfile=Lưu hồ sơ nhập khẩu này -ErrorImportDuplicateProfil=Không thể lưu hồ sơ nhập khẩu này với tên này. Một hồ sơ hiện tại đã tồn tại với tên này. -ImportSummary=Nhập khẩu tóm tắt thiết lập +SaveImportProfile=Lưu hồ sơ nhập dữ liệu này +ErrorImportDuplicateProfil=Không thể lưu hồ sơ nhập dữ liệu này với tên này. Một hồ sơ hiện tại đã tồn tại với tên này. +ImportSummary=Nhập dữ liệu tóm tắt thiết lập TablesTarget=Bảng mục tiêu FieldsTarget=Lĩnh vực mục tiêu TableTarget=Bảng mục tiêu @@ -79,42 +79,42 @@ FieldTarget=Trường mục tiêu FieldSource=Lĩnh vực nguồn DoNotImportFirstLine=Không nhập dòng đầu tiên của tập tin nguồn NbOfSourceLines=Số dòng trong tập tin nguồn -NowClickToTestTheImport=Kiểm tra các thông số nhập khẩu bạn đã xác định. Nếu đúng, hãy nhấp vào nút "% s" để khởi động một mô phỏng của quá trình nhập khẩu (không có dữ liệu sẽ được thay đổi trong cơ sở dữ liệu của bạn, nó chỉ là một mô phỏng cho thời điểm này) ... -RunSimulateImportFile=Khởi động mô phỏng nhập khẩu +NowClickToTestTheImport=Kiểm tra các thông số nhập dữ liệu bạn đã xác định. Nếu đúng, hãy nhấp vào nút "% s" để khởi động một mô phỏng của quá trình nhập dữ liệu (không có dữ liệu sẽ được thay đổi trong cơ sở dữ liệu của bạn, nó chỉ là một mô phỏng cho thời điểm này) ... +RunSimulateImportFile=Khởi động mô phỏng nhập dữ liệu FieldNeedSource=Trường này yêu cầu dữ liệu từ tập tin nguồn SomeMandatoryFieldHaveNoSource=Một số thông tin bắt buộc không có nguồn từ tập tin dữ liệu InformationOnSourceFile=Thông tin về các tập tin nguồn InformationOnTargetTables=Thông tin về các lĩnh vực mục tiêu -SelectAtLeastOneField=Chuyển ít nhất một lĩnh vực nguồn trong cột của lĩnh vực xuất khẩu -SelectFormat=Chọn định dạng tập tin nhập khẩu này -RunImportFile=Nhập khẩu tập tin khởi động -NowClickToRunTheImport=Kiểm tra kết quả của mô phỏng nhập khẩu. Nếu mọi thứ đều ổn, khởi động nhập khẩu dứt khoát. -DataLoadedWithId=Tất cả dữ liệu sẽ được nạp với id nhập khẩu sau đây:% s -ErrorMissingMandatoryValue=Dữ liệu bắt buộc có sản phẩm nào trong tập tin nguồn cho trường% s. -TooMuchErrors=Hiện vẫn còn% s dòng nguồn khác với các lỗi nhưng sản lượng còn hạn chế. -TooMuchWarnings=Hiện vẫn còn% s dòng nguồn khác với các cảnh báo nhưng sản lượng còn hạn chế. +SelectAtLeastOneField=Chuyển ít nhất một lĩnh vực nguồn trong cột của lĩnh vực xuất dữ liệu +SelectFormat=Chọn định dạng tập tin nhập dữ liệu này +RunImportFile=Nhập dữ liệu tập tin khởi động +NowClickToRunTheImport=Kiểm tra kết quả của mô phỏng nhập dữ liệu. Nếu mọi thứ đều ổn, khởi động nhập dữ liệu dứt khoát. +DataLoadedWithId=Tất cả dữ liệu sẽ được nạp với id nhập dữ liệu sau đây: %s +ErrorMissingMandatoryValue=Dữ liệu bắt buộc có sản phẩm nào trong tập tin nguồn cho trường %s. +TooMuchErrors=Hiện vẫn còn %s dòng nguồn khác với các lỗi nhưng sản lượng còn hạn chế. +TooMuchWarnings=Hiện vẫn còn %s dòng nguồn khác với các cảnh báo nhưng sản lượng còn hạn chế. EmptyLine=Dòng trống (sẽ bị loại bỏ) -CorrectErrorBeforeRunningImport=Trước tiên, bạn phải sửa chữa tất cả các lỗi trước khi chạy nhập khẩu dứt khoát. -FileWasImported=Tập tin được nhập khẩu với số% s. -YouCanUseImportIdToFindRecord=Bạn có thể tìm thấy tất cả hồ sơ nhập khẩu trong cơ sở dữ liệu của bạn bằng cách lọc trên sân import_key = '% s'. -NbOfLinesOK=Số dòng không có lỗi và không có cảnh báo:% s. -NbOfLinesImported=Số dòng nhập thành công:% s. +CorrectErrorBeforeRunningImport=Trước tiên, bạn phải sửa chữa tất cả các lỗi trước khi chạy nhập dữ liệu dứt khoát. +FileWasImported=Tập tin được nhập dữ liệu với số %s. +YouCanUseImportIdToFindRecord=Bạn có thể tìm thấy tất cả hồ sơ nhập dữ liệu trong cơ sở dữ liệu của bạn bằng cách lọc trên sân import_key = '%s'. +NbOfLinesOK=Số dòng không có lỗi và không có cảnh báo %s. +NbOfLinesImported=Số dòng nhập thành công %s. DataComeFromNoWhere=Giá trị để chèn đến từ hư không trong tập tin nguồn. -DataComeFromFileFieldNb=Giá trị để chèn đến từ số lĩnh vực% s trong tập tin nguồn. -DataComeFromIdFoundFromRef=Giá trị xuất phát từ số lĩnh vực% s của file gốc sẽ được sử dụng để tìm id của đối tượng phụ huynh để sử dụng (Vì vậy, các Objet% s có ref. Từ tập tin nguồn phải tồn tại vào Dolibarr). -DataComeFromIdFoundFromCodeId=Mã số đó xuất phát từ số lĩnh vực% s của file gốc sẽ được sử dụng để tìm id của đối tượng phụ huynh để sử dụng (Vì vậy, các mã từ file nguồn phải tồn tại vào từ điển% s). Lưu ý rằng nếu bạn biết id, bạn cũng có thể sử dụng nó vào tập tin nguồn thay vì mã. Nhập khẩu nên hoạt động trong cả hai trường hợp. +DataComeFromFileFieldNb=Giá trị để chèn đến từ số lĩnh vực %s trong tập tin nguồn. +DataComeFromIdFoundFromRef=Giá trị xuất phát từ số lĩnh vực %s của file gốc sẽ được sử dụng để tìm id của đối tượng phụ huynh để sử dụng (Vì vậy, các objet %s có ref. Từ tập tin nguồn phải tồn tại vào Dolibarr). +DataComeFromIdFoundFromCodeId=Mã số đó xuất phát từ số lĩnh vực %s của file gốc sẽ được sử dụng để tìm id của đối tượng phụ huynh để sử dụng (Vì vậy, các mã từ file nguồn phải tồn tại vào từ điển %s). Lưu ý rằng nếu bạn biết id, bạn cũng có thể sử dụng nó vào tập tin nguồn thay vì mã. Nhập dữ liệu nên hoạt động trong cả hai trường hợp. DataIsInsertedInto=Dữ liệu từ tập tin nguồn sẽ được chèn vào các lĩnh vực sau đây: DataIDSourceIsInsertedInto=Id của đối tượng phụ huynh tìm thấy bằng cách sử dụng dữ liệu trong tập tin nguồn, sẽ được chèn vào các lĩnh vực sau đây: DataCodeIDSourceIsInsertedInto=Id của dòng mẹ tìm thấy từ mã, sẽ được đưa vào lĩnh vực sau đây: SourceRequired=Giá trị dữ liệu là bắt buộc SourceExample=Ví dụ về giá trị dữ liệu có thể -ExampleAnyRefFoundIntoElement=Bất kỳ ref tìm thấy cho các phần tử% s -ExampleAnyCodeOrIdFoundIntoDictionary=Bất kỳ mã (hoặc id) được tìm thấy vào từ điển% s +ExampleAnyRefFoundIntoElement=Bất kỳ ref tìm thấy cho các phần từ %s. +ExampleAnyCodeOrIdFoundIntoDictionary=Bất kỳ mã (hoặc id) được tìm thấy vào từ điển %s. CSVFormatDesc=Comma định dạng tập tin Giá trị Ly (csv).
    Đây là một định dạng tập tin văn bản mà các lĩnh vực được phân cách bằng dấu phân cách [% s]. Nếu tách được tìm thấy bên trong một lĩnh vực nội dung, lĩnh vực được làm tròn bằng cách nhân vật tròn [% s]. Thoát khỏi nhân vật để thoát khỏi nhân vật tròn là [% s]. Excel95FormatDesc=Định dạng tập tin Excel (xls)
    Đây là nguồn gốc Excel 95 định dạng (BIFF5). Excel2007FormatDesc=Định dạng tập tin Excel (xlsx)
    Đây là nguồn gốc định dạng Excel 2007 (SpreadsheetML). TsvFormatDesc=Tab Ly định dạng tập tin Giá trị (.tsv)
    Đây là một định dạng tập tin văn bản mà các lĩnh vực được phân cách bởi một lập bảng [tab]. -ExportFieldAutomaticallyAdded=Dòng% s đã được tự động thêm vào. Nó sẽ tránh bạn phải có dòng tương tự như được coi là bản sao hồ sơ (với lĩnh vực này nói thêm, tất cả các dòng sẽ sở hữu id của riêng mình và sẽ khác nhau). +ExportFieldAutomaticallyAdded=Dòng %s đã được tự động thêm vào. Nó sẽ tránh bạn phải có dòng tương tự như được coi là bản sao hồ sơ (với lĩnh vực này nói thêm, tất cả các dòng sẽ sở hữu id của riêng mình và sẽ khác nhau). CsvOptions=Csv Tùy chọn Separator=Separator Enclosure=Bao vây diff --git a/htdocs/langs/vi_VN/externalsite.lang b/htdocs/langs/vi_VN/externalsite.lang index 4d7ae4de747..3c743e21a60 100644 --- a/htdocs/langs/vi_VN/externalsite.lang +++ b/htdocs/langs/vi_VN/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Thiết lập liên kết đến trang web bên ngoài ExternalSiteURL=Địa chỉ trang bên ngoài ExternalSiteModuleNotComplete=Mô-đun trang web bên ngoài được cấu hình không đúng. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang index f77cc564473..78b2efdd9b6 100644 --- a/htdocs/langs/vi_VN/holiday.lang +++ b/htdocs/langs/vi_VN/holiday.lang @@ -1,13 +1,13 @@ # Dolibarr language file - Source file is en_US - holiday HRM=HRM -Holidays=Leaves -CPTitreMenu=Leaves +Holidays=Nghỉ phép +CPTitreMenu=Nghỉ phép MenuReportMonth=Báo cáo hàng tháng -MenuAddCP=Make a leave request -NotActiveModCP=You must enable the module Leaves to view this page. -NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . -NoCPforUser=You don't have any available day. -AddCP=Make a leave request +MenuAddCP=Thực hiện một yêu cầu nghỉ phép +NotActiveModCP=Bạn phải kích hoạt Leaves mô đun để xem trang này. +NotConfigModCP=Bạn phải cấu hình các module Nghỉ phép để xem trang này. Để làm điều này, nhấn vào đây . +NoCPforUser=Bạn không có bất kỳ ngày nào có sẵn. +AddCP=Thực hiện một yêu cầu nghỉ phép Employe=Nhân viên DateDebCP=Ngày bắt đầu DateFinCP=Ngày kết thúc @@ -18,24 +18,24 @@ ApprovedCP=Đã được phê duyệt CancelCP=Hủy bỏ RefuseCP=Từ chối ValidatorCP=Approbator -ListeCP=List of leaves +ListeCP=Danh sách nghỉ phép ReviewedByCP=Sẽ được xem xét bởi DescCP=Mô tả -SendRequestCP=Create leave request -DelayToRequestCP=Leave requests must be made at least %s day(s) before them. -MenuConfCP=Edit balance of leaves -UpdateAllCP=Update the leaves -SoldeCPUser=Leaves balance is %s days. +SendRequestCP=Tạo yêu cầu nghỉ phép +DelayToRequestCP=Để lại yêu cầu phải được thực hiện vào ngày thứ nhất là% s (s) trước họ. +MenuConfCP=Sửa cân bằng của nghỉ phép +UpdateAllCP=Cập nhật các nghỉ phép +SoldeCPUser=Nghỉ phép số dư là% s ngày. ErrorEndDateCP=Bạn phải chọn ngày kết thúc lớn hơn ngày bắt đầu. ErrorSQLCreateCP=Đã xảy ra lỗi SQL trong quá trình tạo: -ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ErrorIDFicheCP=Một lỗi đã xảy ra, yêu cầu nghỉ phép không tồn tại. ReturnCP=Trở lại trang trước -ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request +ErrorUserViewCP=Bạn không được cấp phép để xem yêu cầu nghỉ phép này. +InfosCP=Thông tin về các yêu cầu nghỉ phép InfosWorkflowCP=Thông tin Quy trình làm việc RequestByCP=Theo yêu cầu của -TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed +TitreRequestCP=Yêu cầu rời +NbUseDaysCP=Số ngày nghỉ tiêu thụ EditCP=Chỉnh sửa DeleteCP=Xóa ActionValidCP=Xác nhận @@ -43,26 +43,25 @@ ActionRefuseCP=Từ chối ActionCancelCP=Hủy bỏ StatutCP=Tình trạng SendToValidationCP=Gửi cho xác nhận -TitleDeleteCP=Delete the leave request -ConfirmDeleteCP=Confirm the deletion of this leave request? -ErrorCantDeleteCP=Error you don't have the right to delete this leave request. -CantCreateCP=You don't have the right to make leave requests. -InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=Cập nhật -CantUpdate=You cannot update this leave request. +TitleDeleteCP=Xóa yêu cầu nghỉ +ConfirmDeleteCP=Xác nhận việc xóa yêu cầu nghỉ này? +ErrorCantDeleteCP=Lỗi bạn không có quyền xóa yêu cầu nghỉ phép này. +CantCreateCP=Bạn không có quyền thực hiện các yêu cầu nghỉ phép. +InvalidValidatorCP=Bạn phải chọn một approbator để yêu cầu nghỉ phép của bạn. +CantUpdate=Bạn không thể cập nhật yêu cầu nghỉ phép này. NoDateDebut=Bạn phải chọn một ngày bắt đầu. NoDateFin=Bạn phải chọn ngày kết thúc. -ErrorDureeCP=Yêu cầu của bạn cho các ngày nghỉ không có ngày làm việc. -TitleValidCP=Thông qua những ngày nghỉ theo yêu cầu -ConfirmValidCP=Are you sure you want to approve the leave request? +ErrorDureeCP=Yêu cầu nghỉ phép của bạn không có một ngày làm việc. +TitleValidCP=Chấp nhận yêu cầu nghỉ +ConfirmValidCP=Bạn có chắc chắn muốn chấp nhận yêu cầu nghỉ phép? DateValidCP=Ngày phê duyệt -TitleToValidCP=Send leave request -ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Từ chối các yêu cầu ngày lễ -ConfirmRefuseCP=Are you sure you want to refuse the leave request? +TitleToValidCP=Gửi yêu cầu nghỉ phép +ConfirmToValidCP=Bạn có chắc chắn muốn gửi yêu cầu nghỉ phép? +TitleRefuseCP=Từ chối các yêu cầu nghỉ phép +ConfirmRefuseCP=Bạn có chắc chắn muốn từ chối các yêu cầu nghỉ phép? NoMotifRefuseCP=Bạn phải chọn một lý do để từ chối yêu cầu. -TitleCancelCP=Hủy bỏ những ngày nghỉ theo yêu cầu -ConfirmCancelCP=Are you sure you want to cancel the leave request? +TitleCancelCP=Hủy bỏ yêu cầu nghỉ +ConfirmCancelCP=Bạn có chắc chắn muốn hủy bỏ yêu cầu nghỉ phép? DetailRefusCP=Lý do từ chối DateRefusCP=Ngày từ chối DateCancelCP=Ngày hủy @@ -72,42 +71,42 @@ MotifCP=Lý do UserCP=Người sử dụng ErrorAddEventToUserCP=Đã xảy ra lỗi khi thêm ngày nghỉ đặc biệt. AddEventToUserOkCP=Việc bổ sung nghỉ đặc biệt đã được hoàn thành. -MenuLogCP=View logs of leave requests -LogCP=Log of updates of available vacation days +MenuLogCP=Xem nhật các yêu cầu nghỉ +LogCP=Đăng cập nhật ngày nghỉ có sẵn ActionByCP=Thực hiện bởi UserUpdateCP=Đối với người sử dụng PrevSoldeCP=Cân bằng trước NewSoldeCP=New Balance -alreadyCPexist=Một yêu cầu cho các ngày nghỉ đã được thực hiện vào thời kỳ này. +alreadyCPexist=Một yêu cầu nghỉ phép đã được thực hiện vào thời gian này. UserName=Tên Employee=Nhân viên -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation +FirstDayOfHoliday=Ngày đầu tiên của kỳ nghỉ +LastDayOfHoliday=Ngày cuối cùng của kỳ nghỉ HolidaysMonthlyUpdate=Cập nhật hàng tháng ManualUpdate=Cập nhật thủ công -HolidaysCancelation=Leave request cancelation +HolidaysCancelation=Để lại yêu cầu hủy bỏ ## Configuration du Module ## -ConfCP=Cấu hình của mô-đun lễ +ConfCP=Cấu hình yêu cầu nghỉ phép mô-đun DescOptionCP=Mô tả các tùy chọn ValueOptionCP=Giá trị -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Nhóm có khả năng chấp nhận các yêu cầu nghỉ phép ConfirmConfigCP=Xác nhận cấu hình -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Cuối cùng tự động cập nhật giao nghỉ phép UpdateConfCPOK=Cập nhật thành công. ErrorUpdateConfCP=Đã xảy ra lỗi trong quá trình cập nhật, vui lòng thử lại. -AddCPforUsers=Xin vui lòng thêm số dư của ngày lễ của người sử dụng bằng cách nhấn vào đây . -DelayForSubmitCP=Hạn chót nộp hồ cho ngày lễ -AlertapprobatortorDelayCP=Ngăn chặn các approbator nếu yêu cầu kỳ nghỉ không phù hợp với thời hạn -AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay -AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance -nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month -Module27130Name= Management of leave requests -Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request -TitleOptionEventCP=Settings of leave requets for events +AddCPforUsers=Xin vui lòng thêm số dư của nghỉ phép phân bổ của người sử dụng bằng cách nhấn vào đây . +DelayForSubmitCP=Thời hạn để thực hiện một yêu cầu nghỉ phép +AlertapprobatortorDelayCP=Ngăn chặn các approbator nếu yêu cầu nghỉ phép không phù hợp với thời hạn +AlertValidatorDelayCP=Préevent các approbator nếu yêu cầu nghỉ phép quá chậm trễ +AlertValidorSoldeCP=Ngăn chặn các approbator nếu yêu cầu nghỉ phép vượt quá sự cân bằng +nbUserCP=Số lượng người dùng được hỗ trợ trong các mô-đun nghỉ phép +nbHolidayDeductedCP=Số ngày nghỉ phép để được khấu trừ mỗi ngày của kỳ nghỉ thực hiện +nbHolidayEveryMonthCP=Số ngày nghỉ phép thêm vào mỗi tháng +Module27130Name= Quản lý các yêu cầu nghỉ +Module27130Desc= Quản lý các yêu cầu nghỉ phép +TitleOptionMainCP=Thiết lập chính của yêu cầu nghỉ phép +TitleOptionEventCP=Cài đặt của requets nghỉ cho các sự kiện ValidEventCP=Xác nhận UpdateEventCP=Cập nhật các sự kiện CreateEventCP=Tạo @@ -127,23 +126,23 @@ UpdateEventOptionCP=Cập nhật ErrorMailNotSend=Đã xảy ra lỗi trong khi gửi email: NoCPforMonth=Không để trong tháng này. nbJours=Số ngày -TitleAdminCP=Configuration of Leaves +TitleAdminCP=Cấu hình của Nghỉ phép #Messages Hello=Xin chào -HolidaysToValidate=Validate leave requests -HolidaysToValidateBody=Below is a leave request to validate -HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. -HolidaysValidated=Validated leave requests -HolidaysValidatedBody=Your leave request for %s to %s has been validated. -HolidaysRefused=Request denied -HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : -HolidaysCanceled=Canceled leaved request -HolidaysCanceledBody=Your leave request for %s to %s has been canceled. -Permission20000=Read you own leave requests -Permission20001=Create/modify your leave requests -Permission20002=Create/modify leave requests for everybody -Permission20003=Delete leave requests -Permission20004=Setup users available vacation days -Permission20005=Review log of modified leave requests -Permission20006=Read leaves monthly report +HolidaysToValidate=Xác nhận yêu cầu nghỉ phép +HolidaysToValidateBody=Dưới đây là một yêu cầu nghỉ việc để xác nhận +HolidaysToValidateDelay=Yêu cầu nghỉ phép này sẽ diễn ra trong một thời gian ít hơn% s ngày. +HolidaysToValidateAlertSolde=Người dùng đã thực hiện điều này để lại reques không có đủ ngày có sẵn. +HolidaysValidated=Yêu cầu xác nhận nghỉ +HolidaysValidatedBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã được xác nhận. +HolidaysRefused=Yêu cầu bị từ chối +HolidaysRefusedBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã bị từ chối vì lý do sau: +HolidaysCanceled=Yêu cầu hủy bỏ nghỉ phép +HolidaysCanceledBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã được hủy bỏ. +Permission20000=Đọc bạn sở hữu yêu cầu nghỉ +Permission20001=Tạo / chỉnh sửa các yêu cầu nghỉ phép của bạn +Permission20002=Tạo / chỉnh sửa các yêu cầu nghỉ phép cho tất cả mọi người +Permission20003=Xóa yêu cầu nghỉ phép +Permission20004=Người sử dụng thiết lập ngày nghỉ có sẵn +Permission20005=Log xét các yêu cầu nghỉ phép biến đổi +Permission20006=Đọc lại báo cáo hàng tháng diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang index d238f2485f2..e59c45f7a10 100644 --- a/htdocs/langs/vi_VN/install.lang +++ b/htdocs/langs/vi_VN/install.lang @@ -2,34 +2,34 @@ InstallEasy=Chỉ cần làm theo các hướng dẫn từng bước. MiscellaneousChecks=Điều kiện tiên quyết kiểm tra DolibarrWelcome=Chào mừng bạn đến Dolibarr -ConfFileExists=Cấu hình tập tin% s tồn tại. -ConfFileDoesNotExists=Cấu hình tập tin% s không tồn tại! -ConfFileDoesNotExistsAndCouldNotBeCreated=Cấu hình tập tin% s không tồn tại và không thể được tạo ra! -ConfFileCouldBeCreated=Cấu hình tập tin% s có thể được tạo ra. -ConfFileIsNotWritable=Tập tin cấu hình% s là không thể ghi. Kiểm tra quyền truy cập. Đối với lần đầu tiên cài đặt, máy chủ web của bạn phải được cấp để có thể viết vào tập tin này trong quá trình cấu hình ("chmod 666" ví dụ trên Unix như hệ điều hành). -ConfFileIsWritable=Tập tin cấu hình% s có thể ghi. +ConfFileExists=Cấu hình tập tin %s tồn tại. +ConfFileDoesNotExists=Cấu hình tập tin %s không tồn tại! +ConfFileDoesNotExistsAndCouldNotBeCreated=Cấu hình tập tin %s không tồn tại và không thể được tạo ra! +ConfFileCouldBeCreated=Cấu hình tập tin %s có thể được tạo ra. +ConfFileIsNotWritable=Tập tin cấu hình %s là không thể ghi. Kiểm tra quyền truy cập. Đối với lần đầu tiên cài đặt, máy chủ web của bạn phải được cấp để có thể viết vào tập tin này trong quá trình cấu hình ("chmod 666" ví dụ trên Unix như hệ điều hành). +ConfFileIsWritable=Tập tin cấu hình %s có thể ghi. ConfFileReload=Cập nhật lại thông tin từ tập tin cấu hình. PHPSupportSessions=PHP này hỗ trợ phiên. PHPSupportPOSTGETOk=PHP này hỗ trợ các biến POST và GET. PHPSupportPOSTGETKo=Có thể thiết lập PHP của bạn không hỗ trợ các biến POST và / hoặc GET. Kiểm tra variables_order tham số của bạn trong php.ini. PHPSupportGD=Điều này hỗ trợ PHP GD chức năng đồ họa. PHPSupportUTF8=PHP hỗ trợ chức năng này UTF8. -PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập để% s. Điều này là đủ. -PHPMemoryTooLow=PHP bộ nhớ phiên tối đa của bạn được thiết lập để% s byte. Điều này cần được quá thấp. Thay đổi php.ini của bạn để thiết lập thông số memory_limit ít nhất% s byte. +PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập %s. Điều này là đủ. +PHPMemoryTooLow=PHP bộ nhớ phiên tối đa của bạn được thiết lập %s byte. Điều này cần được quá thấp. Thay đổi php.ini của bạn để thiết lập thông số memory_limit ít nhất %s byte. Recheck=Nhấn vào đây để kiểm tra significative hơn ErrorPHPDoesNotSupportSessions=Cài đặt PHP của bạn không hỗ trợ phiên. Tính năng này là cần thiết để làm cho Dolibarr làm việc. Kiểm tra thiết lập PHP của bạn. ErrorPHPDoesNotSupportGD=Cài đặt PHP của bạn không hỗ trợ chức năng đồ họa GD. Không có đồ thị sẽ có sẵn. ErrorPHPDoesNotSupportUTF8=Cài đặt PHP của bạn không hỗ trợ chức năng UTF8. Dolibarr không thể làm việc một cách chính xác. Giải quyết này trước khi cài đặt Dolibarr. -ErrorDirDoesNotExists=Thư mục% s không tồn tại. +ErrorDirDoesNotExists=Thư mục %s không tồn tại. ErrorGoBackAndCorrectParameters=Tới lạc hậu và chính xác các thông số sai. -ErrorWrongValueForParameter=Bạn có thể gõ một giá trị sai cho tham số '% s'. -ErrorFailedToCreateDatabase=Không thể tạo cơ sở dữ liệu '% s'. -ErrorFailedToConnectToDatabase=Không thể kết nối với cơ sở dữ liệu '% s'. -ErrorDatabaseVersionTooLow=Phiên bản cơ sở dữ liệu (% s) quá già. Phiên bản% s hoặc cao hơn là cần thiết. -ErrorPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản% s là bắt buộc. -WarningPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản% s hoặc nhiều hơn dự kiến. Phiên bản này sẽ cho phép cài đặt nhưng không được hỗ trợ. -ErrorConnectedButDatabaseNotFound=Kết nối với máy chủ thành công nhưng không tìm thấy cơ sở dữ liệu '% s'. -ErrorDatabaseAlreadyExists=Cơ sở dữ liệu '% s' đã tồn tại. +ErrorWrongValueForParameter=Bạn có thể gõ một giá trị sai cho tham số '%s'. +ErrorFailedToCreateDatabase=Không thể tạo cơ sở dữ liệu '%s'. +ErrorFailedToConnectToDatabase=Không thể kết nối với cơ sở dữ liệu '%s'. +ErrorDatabaseVersionTooLow=Phiên bản cơ sở dữ liệu (%s) quá già. Phiên bản %s hoặc cao hơn là cần thiết. +ErrorPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản %s là bắt buộc. +WarningPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản %s hoặc nhiều hơn dự kiến. Phiên bản này sẽ cho phép cài đặt nhưng không được hỗ trợ. +ErrorConnectedButDatabaseNotFound=Kết nối với máy chủ thành công nhưng không tìm thấy cơ sở dữ liệu '%s'. +ErrorDatabaseAlreadyExists=Cơ sở dữ liệu '%s' đã tồn tại. IfDatabaseNotExistsGoBackAndUncheckCreate=Nếu cơ sở dữ liệu không tồn tại, quay trở lại và kiểm tra tùy chọn "Tạo cơ sở dữ liệu". IfDatabaseExistsGoBackAndCheckCreate=Nếu cơ sở dữ liệu đã tồn tại, quay trở lại và bỏ chọn "Tạo cơ sở dữ liệu" tùy chọn. WarningBrowserTooOld=Quá phiên bản cũ của trình duyệt. Nâng cấp trình duyệt của bạn đến một phiên bản mới của trình duyệt Firefox, Chrome hay Opera là rất recommanded. @@ -75,8 +75,8 @@ UserCreation=Người dùng tạo ra CreateDatabaseObjects=Cơ sở dữ liệu đối tượng sáng tạo ReferenceDataLoading=Tài liệu tham khảo dữ liệu tải TablesAndPrimaryKeysCreation=Bàn phím chính tạo -CreateTableAndPrimaryKey=Tạo bảng% s -CreateOtherKeysForTable=Tạo các phím nước ngoài và các chỉ số cho bảng% s +CreateTableAndPrimaryKey=Tạo bảng %s +CreateOtherKeysForTable=Tạo các phím nước ngoài và các chỉ số cho bảng %s OtherKeysCreation=Phím và chỉ số nước ngoài tạo FunctionsCreation=Chức năng sáng tạo AdminAccountCreation=Tạo đăng nhập quản trị @@ -87,7 +87,7 @@ SetupEnd=Kết thúc cài đặt SystemIsInstalled=Cài đặt này hoàn tất. SystemIsUpgraded=Dolibarr đã được nâng cấp thành công. YouNeedToPersonalizeSetup=Bạn cần phải cấu hình cho phù hợp với nhu cầu Dolibarr của bạn (ngoại hình, tính năng, ...). Để làm điều này, hãy làm theo các liên kết dưới đây: -AdminLoginCreatedSuccessfuly=Dolibarr quản trị viên đăng nhập '% s' tạo ra successfuly. +AdminLoginCreatedSuccessfuly=Dolibarr quản trị viên đăng nhập '%s' tạo ra successfuly. GoToDolibarr=Tới Dolibarr GoToSetupArea=Tới Dolibarr (setup) MigrationNotFinished=Phiên bản cơ sở dữ liệu của bạn không phải là hoàn toàn cập nhật, vì vậy bạn sẽ phải chạy quá trình nâng cấp một lần nữa. @@ -97,7 +97,7 @@ WithNoSlashAtTheEnd=Nếu không có các dấu gạch chéo "/" ở cuối DirectoryRecommendation=Nó được recommanded sử dụng một thư mục bên ngoài thư mục của bạn của trang web của bạn. LoginAlreadyExists=Đã tồn tại DolibarrAdminLogin=Dolibarr quản trị đăng nhập -AdminLoginAlreadyExists=Dolibarr tài khoản quản trị '% s' đã tồn tại. Quay trở lại, nếu bạn muốn tạo một số khác. +AdminLoginAlreadyExists=Dolibarr tài khoản quản trị '%s' đã tồn tại. Quay trở lại, nếu bạn muốn tạo một số khác. WarningRemoveInstallDir=Cảnh báo, vì lý do bảo mật, một khi cài đặt hoặc nâng cấp hoàn thành, để tránh sử dụng các công cụ cài đặt một lần nữa, bạn nên thêm một tập tin gọi là install.lock vào thư mục tài liệu Dolibarr, để tránh việc sử dụng độc hại của nó. ThisPHPDoesNotSupportTypeBase=Hệ thống PHP này không hỗ trợ bất kỳ giao diện để truy cập cơ sở dữ liệu loại% s FunctionNotAvailableInThisPHP=Không có sẵn trên PHP này @@ -127,8 +127,8 @@ DBSortingCollation=Nhân vật thứ tự sắp xếp DBSortingCollationComment=Chọn mã trang xác định thứ tự sắp xếp của nhân vật được sử dụng bởi cơ sở dữ liệu. Thông số này cũng được gọi là "đối chiếu" của một số cơ sở dữ liệu.
    Thông số này không thể xác định nếu cơ sở dữ liệu đã tồn tại. CharacterSetDatabase=Ký tự đặt cho cơ sở dữ liệu CharacterSetDatabaseComment=Chọn bộ ký tự muốn để tạo cơ sở dữ liệu.
    Thông số này không thể xác định nếu cơ sở dữ liệu đã tồn tại. -YouAskDatabaseCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu% s, nhưng cho điều này, Dolibarr cần kết nối với máy chủ% s với các điều khoản sử dụng siêu% s. -YouAskLoginCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu đăng nhập% s, nhưng cho điều này, Dolibarr cần kết nối với máy chủ% s với các điều khoản sử dụng siêu% s. +YouAskDatabaseCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu %s, nhưng cho điều này, Dolibarr cần kết nối với máy chủ %s với quyền super user %s. +YouAskLoginCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu đăng nhập %s,     nhưng cho điều này, Dolibarr cần kết nối với máy chủ %s với quyền super user %s. BecauseConnectionFailedParametersMayBeWrong=Khi kết nối thành công, máy chủ hoặc người sử dụng siêu thông số phải là sai. OrphelinsPaymentsDetectedByMethod=Trẻ em mồ côi thanh toán được phát hiện bằng phương pháp% s RemoveItManuallyAndPressF5ToContinue=Loại bỏ nó bằng tay và bấm F5 để tiếp tục. @@ -138,11 +138,11 @@ KeepDefaultValuesMamp=Bạn sử dụng các hướng dẫn cài đặt Dolibarr KeepDefaultValuesProxmox=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ một thiết bị ảo Proxmox, vì vậy giá trị đề xuất ở đây đã được tối ưu hóa. Thay đổi chúng chỉ khi bạn biết những gì bạn làm. FieldRenamed=Dòng đổi tên IfLoginDoesNotExistsCheckCreateUser=Nếu đăng nhập không tồn tại được nêu ra, bạn phải kiểm tra tùy chọn "Tạo người dùng" -ErrorConnection=Server "% s", tên cơ sở dữ liệu "% s", đăng nhập "% s", hoặc mật khẩu cơ sở dữ liệu có thể sai hoặc phiên bản client PHP có thể là quá cũ so với phiên bản cơ sở dữ liệu. -InstallChoiceRecommanded=Đề nghị lựa chọn để cài đặt phiên bản% s từ phiên bản hiện tại của bạn% s +ErrorConnection=Server "%s" tên cơ sở dữ liệu "%s" đăng nhập "%s" hoặc mật khẩu cơ sở dữ liệu có thể sai hoặc phiên bản client PHP có thể là quá cũ so với phiên bản cơ sở dữ liệu. +InstallChoiceRecommanded=Đề nghị lựa chọn để cài đặt phiên bản %s từ phiên bản hiện tại của bạn %s InstallChoiceSuggested=Cài đặt lựa chọn được đề xuất bởi trình cài đặt. -MigrateIsDoneStepByStep=Phiên bản mục tiêu (% s) có một khoảng cách của một số phiên bản, vì vậy cài đặt chương trình sẽ trở lại với đề nghị di chuyển tiếp theo lần này sẽ được hoàn thành. -CheckThatDatabasenameIsCorrect=Kiểm tra xem tên "% s" cơ sở dữ liệu là chính xác. +MigrateIsDoneStepByStep=Phiên bản mục tiêu (%s) có một khoảng cách của một số phiên bản, vì vậy cài đặt chương trình sẽ trở lại với đề nghị di chuyển tiếp theo lần này sẽ được hoàn thành. +CheckThatDatabasenameIsCorrect=Kiểm tra xem tên "%s" cơ sở dữ liệu là chính xác. IfAlreadyExistsCheckOption=Nếu tên này là chính xác và cơ sở dữ liệu chưa tồn tại, bạn phải kiểm tra tùy chọn "Tạo cơ sở dữ liệu". OpenBaseDir=PHP openbasedir tham số YouAskToCreateDatabaseSoRootRequired=Bạn đã chọn hộp "Tạo cơ sở dữ liệu". Đối với điều này, bạn cần cung cấp tên đăng nhập / mật khẩu của siêu người dùng (dưới cùng của mẫu). @@ -153,7 +153,7 @@ MigrationShippingDelivery=Nâng cấp lưu trữ vận chuyển MigrationShippingDelivery2=Nâng cấp lưu trữ vận chuyển 2 MigrationFinished=Di cư đã hoàn thành LastStepDesc=Bước cuối cùng: Xác định đây đăng nhập và mật khẩu bạn có kế hoạch sử dụng để kết nối với phần mềm. Đừng mất này vì nó là tài khoản để quản lý tất cả những người khác. -ActivateModule=Kích hoạt module% s +ActivateModule=Kích hoạt module %s ShowEditTechnicalParameters=Click vào đây để hiển thị các thông số tiên tiến / chỉnh sửa (chế độ chuyên môn) ######### @@ -166,15 +166,15 @@ MigrationInvoice=Di chuyển dữ liệu cho hóa đơn của khách hàng MigrationContract=Di chuyển dữ liệu cho các hợp đồng MigrationSuccessfullUpdate=Nâng cấp thành công MigrationUpdateFailed=Quá trình nâng cấp thất bại -MigrationRelationshipTables=Di chuyển dữ liệu cho các bảng mối quan hệ (% s) +MigrationRelationshipTables=Di chuyển dữ liệu cho các bảng mối quan hệ (%s) MigrationPaymentsUpdate=Chỉnh sửa dữ liệu thanh toán -MigrationPaymentsNumberToUpdate=Thanh toán% s (s) để cập nhật -MigrationProcessPaymentUpdate=Thanh toán Cập nhật (s)% s +MigrationPaymentsNumberToUpdate=Thanh toán %s (các) để cập nhật +MigrationProcessPaymentUpdate=Thanh toán Cập nhật (các) %s MigrationPaymentsNothingToUpdate=Không có những thứ nhiều hơn để làm MigrationPaymentsNothingUpdatable=Không thanh toán có thể được sửa chữa MigrationContractsUpdate=Hợp đồng sửa chữa dữ liệu -MigrationContractsNumberToUpdate=Hợp đồng% s (s) để cập nhật -MigrationContractsLineCreation=Tạo dòng hợp đồng cho hợp đồng ref% s +MigrationContractsNumberToUpdate=Hợp đồng %s (các) để cập nhật +MigrationContractsLineCreation=Tạo dòng hợp đồng cho hợp đồng ref %s MigrationContractsNothingToUpdate=Không có những thứ nhiều hơn để làm MigrationContractsFieldDontExist=Dòng fk_facture không tồn tại nữa. Không có gì để làm. MigrationContractsEmptyDatesUpdate=Hợp đồng sửa chữa ngày rỗng @@ -182,15 +182,15 @@ MigrationContractsEmptyDatesUpdateSuccess=Hợp đồng sửa chữa ngày emtpy MigrationContractsEmptyDatesNothingToUpdate=Không có hợp đồng ngày trống để sửa chữa MigrationContractsEmptyCreationDatesNothingToUpdate=Không có ngày tạo lập hợp đồng để sửa chữa MigrationContractsInvalidDatesUpdate=Điều chỉnh hợp đồng ngày giá trị xấu -MigrationContractsInvalidDateFix=Đúng hợp đồng% s (ngày hợp đồng =% s, Bắt đầu từ ngày dịch vụ này min =% s) -MigrationContractsInvalidDatesNumber=Hợp đồng sửa đổi% s +MigrationContractsInvalidDateFix=Đúng hợp đồng %s (ngày hợp đồng =%s, Bắt đầu từ ngày dịch vụ này min =%s) +MigrationContractsInvalidDatesNumber=Hợp đồng sửa đổi %s MigrationContractsInvalidDatesNothingToUpdate=Không có ngày có giá trị xấu để sửa chữa MigrationContractsIncoherentCreationDateUpdate=Giá trị Bad chỉnh ngày tạo lập hợp đồng MigrationContractsIncoherentCreationDateUpdateSuccess=Giá trị Bad chỉnh ngày tạo lập hợp đồng thực hiện succesfuly MigrationContractsIncoherentCreationDateNothingToUpdate=Không có giá trị tốt cho ngày tạo lập hợp đồng để sửa chữa MigrationReopeningContracts=Mở hợp đồng đóng cửa do lỗi -MigrationReopenThisContract=Mở lại hợp đồng% s -MigrationReopenedContractsNumber=Hợp đồng sửa đổi% s +MigrationReopenThisContract=Mở lại hợp đồng %s +MigrationReopenedContractsNumber=Hợp đồng sửa đổi %s MigrationReopeningContractsNothingToUpdate=Không có hợp đồng đóng mở MigrationBankTransfertsUpdate=Cập nhật liên kết giữa các giao dịch ngân hàng và chuyển khoản ngân hàng MigrationBankTransfertsNothingToUpdate=Tất cả các liên kết được cập nhật diff --git a/htdocs/langs/vi_VN/interventions.lang b/htdocs/langs/vi_VN/interventions.lang index 7e905bcf958..ca16bedea78 100644 --- a/htdocs/langs/vi_VN/interventions.lang +++ b/htdocs/langs/vi_VN/interventions.lang @@ -3,7 +3,7 @@ Intervention=Can thiệp Interventions=Các can thiệp InterventionCard=Thẻ can thiệp NewIntervention=Can thiệp mới -AddIntervention=Thêm can thiệp +AddIntervention=Create intervention ListOfInterventions=Danh sách can thiệp EditIntervention=Sửa can thiệp ActionsOnFicheInter=Hành động can thiệp vào @@ -30,6 +30,15 @@ StatusInterInvoiced=Hóa đơn RelatedInterventions=Can thiệp liên quan ShowIntervention=Hiện can thiệp SendInterventionRef=Nộp can thiệp% s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Đại diện theo dõi can thiệp TypeContact_fichinter_internal_INTERVENING=Can thiệp diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang index 1183ab80854..89dd796dbf0 100644 --- a/htdocs/langs/vi_VN/mails.lang +++ b/htdocs/langs/vi_VN/mails.lang @@ -71,19 +71,19 @@ CloneContent=Nhắn Clone CloneReceivers=Người nhận Cloner DateLastSend=Ngày cuối cùng gửi DateSending=Ngày gửi -SentTo=Gửi đến% s +SentTo=Gửi đến %s MailingStatusRead=Đọc CheckRead=Đọc nhận -YourMailUnsubcribeOK=Email% s là đúng unsubcribe từ danh sách gửi thư +YourMailUnsubcribeOK=Email %s là đúng unsubcribe từ danh sách gửi thư MailtoEMail=Siêu liên kết email ActivateCheckRead=Cho phép sử dụng "Unsubcribe" liên kết ActivateCheckReadKey=Sử dụng chìa khóa để sử dụng mã hóa URL cho "Đọc Tiếp nhận" và "Unsubcribe" tính năng -EMailSentToNRecipients=Thư điện tử gửi đến người nhận% s. -XTargetsAdded=Người nhận% s thêm vào danh sách mục tiêu +EMailSentToNRecipients=Thư điện tử gửi đến người nhận %s. +XTargetsAdded=Người nhận %s thêm vào danh sách mục tiêu EachInvoiceWillBeAttachedToEmail=Một tài liệu mặc định sử dụng hóa đơn mẫu tài liệu sẽ được tạo ra và gắn liền với mỗi email. -MailTopicSendRemindUnpaidInvoices=Nhắc nhở các hóa đơn% s (% s) +MailTopicSendRemindUnpaidInvoices=Nhắc nhở các hóa đơn %s (%s) SendRemind=Gửi lời nhắc nhở bằng email -RemindSent=Nhắc nhở% s (s) gửi +RemindSent=Nhắc nhở %s (các) gửi AllRecipientSelectedForRemind=Tất cả thirdparties chọn, và nếu một email được thiết lập (lưu ý rằng một email cho mỗi hóa đơn sẽ được gửi) NoRemindSent=Không có lời nhắc nhở gửi thư điện tử ResultOfMassSending=Kết quả của khối lượng thư điện tử gửi nhắc nhở @@ -100,11 +100,11 @@ MailingModuleDescContactsByCompanyCategory=Liên hệ / địa chỉ của các MailingModuleDescContactsByCategory=Liên hệ / địa chỉ của các bên thứ ba theo thể loại MailingModuleDescMembersCategories=Thành viên sáng lập (theo loại) MailingModuleDescContactsByFunction=Liên hệ / địa chỉ của các bên thứ ba (bởi vị trí / chức năng) -LineInFile=Dòng% s trong tập tin +LineInFile=Dòng %s trong tập tin RecipientSelectionModules=Yêu cầu xác định cho lựa chọn của người nhận MailSelectedRecipients=Người nhận lựa chọn MailingArea=Khu vực EMailings -LastMailings=Cuối% s emailings +LastMailings=Cuối %s emailings TargetsStatistics=Mục tiêu thống kê NbOfCompaniesContacts=Địa chỉ liên lạc duy nhất / địa chỉ MailNoChangePossible=Người nhận các thư điện tử xác nhận không thể thay đổi @@ -115,7 +115,7 @@ SentBy=Gửi MailingNeedCommand=Vì lý do an ninh, gửi các thư điện tử là tốt hơn khi thực hiện từ dòng lệnh. Nếu bạn có một, yêu cầu quản trị máy chủ của bạn để khởi động các lệnh sau đây để gửi các thư điện tử cho tất cả người nhận: MailingNeedCommand2=Tuy nhiên bạn có thể gửi trực tuyến bằng cách thêm tham số MAILING_LIMIT_SENDBYWEB với giá trị của số lượng tối đa của các email mà bạn muốn gửi bởi phiên. Đối với điều này, hãy vào Trang chủ - Cài đặt - Loại khác. ConfirmSendingEmailing=Nếu bạn không thể hoặc muốn gởi kèm với trình duyệt www của bạn, vui lòng xác nhận bạn có chắc bạn muốn gửi email tại từ trình duyệt của bạn? -LimitSendingEmailing=Lưu ý: Trên dòng gửi emailings được giới hạn vì lý do an ninh và thời gian chờ đến người nhận% s bằng cách gửi phiê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. TargetsReset=Xóa danh sách ToClearAllRecipientsClickHere=Click vào đây để xóa danh sách người nhận các thư điện tử này ToAddRecipientsChooseHere=Thêm người nhận bằng cách chọn từ danh sách @@ -132,7 +132,10 @@ TagMailtoEmail=Người nhận thư điện tử Notifications=Thông báo NoNotificationsWillBeSent=Không có thông báo email được lên kế hoạch cho sự kiện này và công ty ANotificationsWillBeSent=1 thông báo sẽ được gửi qua email -SomeNotificationsWillBeSent=Thông báo% s sẽ được gửi qua email -AddNewNotification=Kích hoạt một yêu cầu thông báo email mới -ListOfActiveNotifications=Liệt kê tất cả các yêu cầu hoạt động thông báo qua email +SomeNotificationsWillBeSent=Thông báo %s sẽ được gửi qua email +AddNewNotification=Kích hoạt một mục tiêu thông báo email mới +ListOfActiveNotifications=Liệt kê tất cả các mục tiêu email thông báo hoạt động ListOfNotificationsDone=Liệt kê tất cả các thông báo email gửi +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang index aa14bfa53ee..e4f8cd66622 100644 --- a/htdocs/langs/vi_VN/main.lang +++ b/htdocs/langs/vi_VN/main.lang @@ -7,7 +7,7 @@ DIRECTION=ltr FONTFORPDF=Helvetica FONTSIZEFORPDF=10 SeparatorDecimal=. -SeparatorThousand=None +SeparatorThousand=, FormatDateShort=%m/%d/%Y FormatDateShortInput=%m/%d/%Y FormatDateShortJava=MM/dd/yyyy @@ -27,19 +27,19 @@ NoTranslation=Không có bản dịch NoRecordFound=Không có hồ sơ tìm thấy NoError=Không có lỗi Error=Lỗi -ErrorFieldRequired=Dòng '% s' được yêu cầu -ErrorFieldFormat=Dòng '% s' có một giá trị xấu -ErrorFileDoesNotExists=Tập tin% s không tồn tại -ErrorFailedToOpenFile=Không thể mở tập tin% s -ErrorCanNotCreateDir=Không thể tạo thư mục% s -ErrorCanNotReadDir=Không thể đọc thư mục% s +ErrorFieldRequired=Dòng '%s' được yêu cầu +ErrorFieldFormat=Dòng '%s' có một giá trị xấu +ErrorFileDoesNotExists=Tập tin %s không tồn tại +ErrorFailedToOpenFile=Không thể mở tập tin %s +ErrorCanNotCreateDir=Không thể tạo thư mục %s +ErrorCanNotReadDir=Không thể đọc thư mục %s ErrorConstantNotDefined=Thông số% s chưa được xác định ErrorUnknown=Lỗi không xác định ErrorSQL=Lỗi SQL ErrorLogoFileNotFound=Logo tập tin '% s' không được tìm thấy ErrorGoToGlobalSetup=Đi đến 'Công ty / cơ sở "thiết lập để sửa lỗi này ErrorGoToModuleSetup=Tới Học phần thiết lập để sửa lỗi này -ErrorFailedToSendMail=Không thể gửi thư (người gửi =% s, thu =% s) +ErrorFailedToSendMail=Không thể gửi thư (người gửi =%s, thu =%s) ErrorAttachedFilesDisabled=Tập tin đính bị vô hiệu hóa trên máy chủ này ErrorFileNotUploaded=Tập tin không được tải lên. Kiểm tra kích thước không vượt quá tối đa cho phép, không gian miễn phí có sẵn trên đĩa và không có đã là một tập tin có cùng tên trong thư mục này. ErrorInternalErrorDetected=Lỗi được phát hiện @@ -48,22 +48,22 @@ ErrorWrongHostParameter=Tham số máy chủ sai ErrorYourCountryIsNotDefined=Đất nước các bạn không được xác định. Đi đến Trang chủ-Setup-Chỉnh sửa và đăng lại hình thức. ErrorRecordIsUsedByChild=Không thể xóa hồ sơ này. Kỷ lục này được sử dụng bởi ít nhất một hồ sơ trẻ em. ErrorWrongValue=Giá trị sai -ErrorWrongValueForParameterX=Giá trị sai cho tham số% s +ErrorWrongValueForParameterX=Giá trị sai cho tham số %s ErrorNoRequestInError=Không yêu cầu trong báo lỗi ErrorServiceUnavailableTryLater=Dịch vụ không sẵn sàng cho thời điểm này. Hãy thử lại sau. ErrorDuplicateField=Giá trị nhân bản trong một lĩnh vực duy nhất ErrorSomeErrorWereFoundRollbackIsDone=Một số lỗi đã được tìm thấy. Chúng tôi rollback thay đổi. -ErrorConfigParameterNotDefined=Thông số% s không được định nghĩa trong tập tin cấu hình Dolibarr conf.php. -ErrorCantLoadUserFromDolibarrDatabase=Không thể tìm thấy người dùng% s trong cơ sở dữ liệu Dolibarr. -ErrorNoVATRateDefinedForSellerCountry=Lỗi, không có giá vat xác định cho đất nước '% s'. -ErrorNoSocialContributionForSellerCountry=Lỗi, không có loại đóng góp xã hội được xác định cho đất nước '% s'. +ErrorConfigParameterNotDefined=Thông số %s không được định nghĩa trong tập tin cấu hình Dolibarr conf.php. +ErrorCantLoadUserFromDolibarrDatabase=Không thể tìm thấy người dùng %s trong cơ sở dữ liệu Dolibarr. +ErrorNoVATRateDefinedForSellerCountry=Lỗi, không có giá vat xác định cho đất nước '%s'. +ErrorNoSocialContributionForSellerCountry=Lỗi, không có loại đóng góp xã hội được xác định cho đất nước '%s'. ErrorFailedToSaveFile=Lỗi, không lưu tập tin. -ErrorOnlyPngJpgSupported=Lỗi, chỉ Png và .jpg tập tin định dạng hình ảnh được hỗ trợ. -ErrorImageFormatNotSupported=PHP của bạn không hỗ trợ chức năng để chuyển đổi hình ảnh của định dạng này. SetDate=Thiết lập ngày SelectDate=Chọn một ngày -SeeAlso=Xem thêm% s +SeeAlso=Xem thêm %s BackgroundColorByDefault=Màu mặc định nề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 FileWasNotUploaded=Một tập tin được lựa chọn để đính kèm nhưng vẫn chưa được tải lên. Bấm vào nút "Đính kèm tập tin" cho việc này. NbOfEntries=Nb các mục GoToWikiHelpPage=Đọc trợ giúp trực tuyến (cần truy cập Internet) @@ -74,7 +74,7 @@ LevelOfFeature=Mức độ tính năng NotDefined=Không xác định DefinedAndHasThisValue=Xác định và giá trị IsNotDefined=không xác định -DolibarrInHttpAuthenticationSoPasswordUseless=Chế độ xác thực Dolibarr được thiết lập để% s trong tập tin cấu hình conf.php.
    Điều này có nghĩa rằng cơ sở dữ liệu mật khẩu là ở ngoài để Dolibarr, vì vậy thay đổi lĩnh vực này có thể không có tác dụng. +DolibarrInHttpAuthenticationSoPasswordUseless=Chế độ xác thực Dolibarr được thiết lập để %s trong tập tin cấu hình conf.php.
    Điều này có nghĩa rằng cơ sở dữ liệu mật khẩu là ở ngoài để Dolibarr, vì vậy thay đổi lĩnh vực này có thể không có tác dụng. Administrator=Quản trị viên Undefined=Không xác định PasswordForgotten=Mật khẩu đã quên? @@ -97,7 +97,7 @@ MoreInformation=Thông tin chi tiết TechnicalInformation=Thông tin kỹ thuật NotePublic=Lưu ý (công cộng) NotePrivate=Lưu ý (tư nhân) -PrecisionUnitIsLimitedToXDecimals=Dolibarr đã được thiết lập để hạn chế độ chính xác của các đơn giá cho% s thập phân. +PrecisionUnitIsLimitedToXDecimals=Dolibarr đã được thiết lập để hạn chế độ chính xác của các đơn giá cho %s thập phân. DoTest=Kiểm tra ToFilter=Lọc WarningYouHaveAtLeastOneTaskLate=Cảnh báo, bạn có ít nhất một yếu tố đó đã vượt quá sự chậm trễ khoan dung. @@ -131,7 +131,7 @@ AddActionDone=Thêm sự kiện thực hiện Close=Đóng Close2=Đóng Confirm=Xác nhận -ConfirmSendCardByMail=Bạn có thực sự muốn gửi nội dung của thẻ này qua đường bưu điện đến% s? +ConfirmSendCardByMail=Bạn có thực sự muốn gửi nội dung của thẻ này qua đường bưu điện đến %s ? Delete=Xóa Remove=Hủy bỏ Resiliate=Resiliate @@ -206,7 +206,7 @@ Limit=Giới hạn Limits=Giới hạn DevelopmentTeam=Nhóm phát triển Logout=Đăng xuất -NoLogoutProcessWithAuthMode=Không có tính năng ngắt kết nối applicative với chế độ xác thực% s +NoLogoutProcessWithAuthMode=Không có tính năng ngắt kết nối applicative với chế độ xác thực %s Connection=Kết nối Setup=Thiết lập Alert=Báo @@ -266,6 +266,7 @@ Afternoon=Chiều Quadri=Quadri MonthOfDay=Tháng ngày HourShort=H +MinuteShort=mn Rate=Tỷ giá UseLocalTax=Bao gồm thuế Bytes=Bytes @@ -340,6 +341,7 @@ FullList=Danh mục đầy đủ Statistics=Thống kê OtherStatistics=Số liệu thống kê khác Status=Tình trạng +Favorite=Yêu thích ShortInfo=Thông tin. Ref=Tài liệu tham khảo. RefSupplier=Tài liệu tham khảo. nhà cung cấp @@ -365,6 +367,7 @@ ActionsOnCompany=Sự kiện về bên thứ ba này ActionsOnMember=Sự kiện về thành viên này NActions=Sự kiện% s NActionsLate=% S cuối +RequestAlreadyDone=Request already recorded Filter=Lọc RemoveFilter=Bỏ bộ lọc ChartGenerated=Biểu đồ được tạo ra @@ -498,7 +501,7 @@ File=Tập tin Files=Tập tin NotAllowed=Không được phép ReadPermissionNotAllowed=Cho phép đọc không được phép -AmountInCurrency=Số tiền tệ trong% s +AmountInCurrency=Số tiền tệ trong %s Example=Ví dụ Examples=Ví dụ NoExample=Không có ví dụ @@ -510,7 +513,7 @@ NbOfObjects=Số đối tượng NbOfReferers=Số referrers Referers=Đề cập đối tượng TotalQuantity=Tổng số lượng -DateFromTo=Từ% s đến% s +DateFromTo=Từ %s đến %s DateFrom=Từ% s DateUntil=Cho đến% s Check=Kiểm tra @@ -562,11 +565,11 @@ GoBack=Quay trở lại CanBeModifiedIfOk=Có thể được sửa đổi nếu hợp lệ CanBeModifiedIfKo=Có thể được sửa đổi nếu không hợp lệ RecordModifiedSuccessfully=Ghi lại đổi thành công -RecordsModified=Hồ sơ% s sửa đổi +RecordsModified=Hồ sơ %s sửa đổi AutomaticCode=Mã tự động NotManaged=Không quản lý FeatureDisabled=Tính năng bị vô hiệu hóa -MoveBox=Di chuyển hộp% s +MoveBox=Di chuyển hộp %s Offered=Cung cấp NotEnoughPermissions=Bạn không có quyền cho hành động này SessionName=Tên phiên @@ -581,7 +584,7 @@ Canceled=Hủy bỏ YouCanChangeValuesForThisListFromDictionarySetup=Bạn có thể thay đổi giá trị cho danh sách này từ trình đơn thiết lập - từ điển Color=Màu Documents=Tập tin liên kết -DocumentsNb=Các tập tin liên kết (% s) +DocumentsNb=Các tập tin liên kết (%s) Documents2=Tài liệu BuildDocuments=Các tài liệu được tạo ra UploadDisabled=Tải khuyết tật @@ -589,7 +592,7 @@ MenuECM=Tài liệu MenuAWStats=AWStats MenuMembers=Thành viên MenuAgendaGoogle=Chương trình nghị sự của Google -ThisLimitIsDefinedInSetup=Hạn Dolibarr (Menu nhà thiết lập bảo mật):% s Kb, PHP giới hạn:% s Kb +ThisLimitIsDefinedInSetup=Hạn Dolibarr (Menu nhà thiết lập bảo mật): %s Kb, PHP giới hạn: %s Kb NoFileFound=Không có tài liệu được lưu trong thư mục này CurrentUserLanguage=Ngôn ngữ hiện tại CurrentTheme=Chủ đề hiện tại @@ -615,12 +618,12 @@ Merge=Hợp nhất PrintContentArea=Hiển thị trang in khu vực nội dung chính MenuManager=Quản lý đơn NoMenu=Không có trình đơn phụ -WarningYouAreInMaintenanceMode=Cảnh báo, bạn đang ở trong một chế độ bảo trì, vì vậy chỉ đăng nhập% s được phép sử dụng ứng dụng tại thời điểm này. +WarningYouAreInMaintenanceMode=Cảnh báo, bạn đang ở trong một chế độ bảo trì, vì vậy chỉ đăng nhập %s được phép sử dụng ứng dụng tại thời điểm này. CoreErrorTitle=Lỗi hệ thống CoreErrorMessage=Xin lỗi, đã xảy ra lỗi. Kiểm tra các bản ghi hoặc liên hệ với quản trị hệ thống của bạn. CreditCard=Thẻ tín dụng -FieldsWithAreMandatory=Các lĩnh vực với% s là bắt buộc -FieldsWithIsForPublic=Các lĩnh vực với% s được hiển thị trên danh sách công khai của các thành viên. Nếu bạn không muốn điều này, đánh dấu vào hộp "công cộng". +FieldsWithAreMandatory=Các lĩnh vực với %s là bắt buộc +FieldsWithIsForPublic=Các lĩnh vực với %s được hiển thị trên danh sách công khai của các thành viên. Nếu bạn không muốn điều này, đánh dấu vào hộp "công cộng". AccordingToGeoIPDatabase=(Theo GeoIP chuyển đổi) Line=Dòng NotSupported=Không được hỗ trợ @@ -670,16 +673,16 @@ from=từ toward=hướng Access=Truy cập HelpCopyToClipboard=Sử dụng tổ hợp phím Ctrl + C để copy vào clipboard -SaveUploadedFileWithMask=Lưu tập tin trên máy chủ với tên "% s" (nếu không "% s") +SaveUploadedFileWithMask=Lưu tập tin trên máy chủ với tên "%s" (nếu không "%s") OriginFileName=Tên tập tin gốc SetDemandReason=Bộ nguồn SetBankAccount=Xác định tài khoản ngân hàng AccountCurrency=Tài khoản ngoại tệ ViewPrivateNote=Xem ghi chú -XMoreLines=Dòng% s (s) ẩn +XMoreLines=Dòng (các) %s ẩn PublicUrl=URL công cộng AddBox=Thêm vào hộp - +SelectElementAndClickRefresh=Chọn một phần tử và nhấn Refresh # Week day Monday=Thứ hai Tuesday=Thứ ba diff --git a/htdocs/langs/vi_VN/margins.lang b/htdocs/langs/vi_VN/margins.lang index 1b5d917f82f..0ae04d128e2 100644 --- a/htdocs/langs/vi_VN/margins.lang +++ b/htdocs/langs/vi_VN/margins.lang @@ -1,21 +1,21 @@ # Dolibarr language file - Source file is en_US - marges -Margin=Margin -Margins=Lợi nhuận +Margin=Biên lợi nhuận +Margins=Biên lợi nhuận TotalMargin=Tổng biên -MarginOnProducts=Tỷ suất lợi nhuận / Sản phẩm -MarginOnServices=Tỷ suất lợi nhuận / Dịch vụ -MarginRate=Tỷ lệ Margin +MarginOnProducts=Tỷ suất biên lợi nhuận / Sản phẩm +MarginOnServices=Tỷ suất biên lợi nhuận / Dịch vụ +MarginRate=Tỷ lệ Biên lợi nhuận MarkRate=Đánh dấu tỷ lệ -DisplayMarginRates=Tỷ lệ lợi nhuận hiển thị +DisplayMarginRates=Tỷ lệ biên lợi nhuận hiển thị DisplayMarkRates=Giá đánh dấu hiển thị InputPrice=Giá đầu vào -margin=Quản lý lợi nhuận -margesSetup=Lợi nhuận thiết lập quản lý -MarginDetails=Chi tiết Margin -ProductMargins=Lợi nhuận sản phẩm -CustomerMargins=Lợi nhuận của khách hàng -SalesRepresentativeMargins=Lợi nhuận đại diện bán hàng +margin=Quản lý biên lợi nhuận +margesSetup=Biên lợi nhuận thiết lập quản lý +MarginDetails=Chi tiết Biên lợi nhuận +ProductMargins=Biên lợi nhuận sản phẩm +CustomerMargins=Biên lợi nhuận của khách hàng +SalesRepresentativeMargins=Biên lợi nhuận đại diện bán hàng ProductService=Sản phẩm hoặc dịch vụ AllProducts=Tất cả các sản phẩm và dịch vụ ChooseProduct/Service=Chọn sản phẩm hoặc dịch vụ @@ -23,19 +23,22 @@ StartDate=Ngày bắt đầu EndDate=Ngày kết thúc Launch=Bắt đầu ForceBuyingPriceIfNull=Giá mua vũ lực nếu rỗng -ForceBuyingPriceIfNullDetails=nếu "ON", lợi nhuận sẽ bằng không trên đường (giá mua = giá bán), nếu không ("OFF"), Marge sẽ bằng giá bán (giá mua = 0) +ForceBuyingPriceIfNullDetails=nếu "ON", biên lợi nhuận sẽ bằng không trên đường (giá mua = giá bán), nếu không ("OFF"), Marge sẽ bằng giá bán (giá mua = 0) MARGIN_METHODE_FOR_DISCOUNT=Phương pháp biên giảm giá toàn cầu UseDiscountAsProduct=Là một sản phẩm UseDiscountAsService=Là một dịch vụ UseDiscountOnTotal=Trên tổng số phụ -MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Xác định nếu giảm giá toàn cầu được coi là một sản phẩm, một dịch vụ, hoặc chỉ trên tổng số phụ để tính tỷ suất lợi nhuận. +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Xác định nếu giảm giá toàn cầu được coi là một sản phẩm, một dịch vụ, hoặc chỉ trên tổng số phụ để tính tỷ suất biên lợi nhuận. MARGIN_TYPE=Loại biên MargeBrute=Biên liệu -MargeNette=Tỷ suất lợi nhuận -MARGIN_TYPE_DETAILS=Biên liệu: Giá bán - giá mua
    Tỷ suất lợi nhuận: Giá bán - Giá vốn +MargeNette=Tỷ suất biên lợi nhuận +MARGIN_TYPE_DETAILS=Biên liệu: Giá bán - giá mua
    Tỷ suất biên lợi nhuận: Giá bán - Giá vốn CostPrice=Giá thành BuyingCost=Giá thành UnitCharges=Chi phí đơn vị Charges=Phí AgentContactType=Loại liên hệ đại lý thương mại -AgentContactTypeDetails=Xác định những gì liên lạc loại (liên kết trên hóa đơn) sẽ được sử dụng cho báo cáo lợi nhuận của các đại lý thương mại +AgentContactTypeDetails=Xác định những gì liên lạc loại (liên kết trên hóa đơn) sẽ được sử dụng cho các báo cáo biên lợi nhuận cho mỗi đại diện bán hàng +rateMustBeNumeric=Tỷ giá phải là một giá trị số +markRateShouldBeLesserThan100=Đánh dấu suất phải thấp hơn 100 +ShowMarginInfos=Show margin infos 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/orders.lang b/htdocs/langs/vi_VN/orders.lang index 98b00ee5c6d..37da0e7191f 100644 --- a/htdocs/langs/vi_VN/orders.lang +++ b/htdocs/langs/vi_VN/orders.lang @@ -1,20 +1,20 @@ # Dolibarr language file - Source file is en_US - orders -OrdersArea=Khách hàng đặt hàng khu vực -SuppliersOrdersArea=Nhà cung cấp đơn đặt hàng khu vực -OrderCard=Thẻ thứ tự -OrderId=Id thứ tự -Order=Trật tự +OrdersArea=Khu vực đơn hàng của khách hàng +SuppliersOrdersArea=Khu vực đơn đặt hàng của nhà cung cấp +OrderCard=Thẻ đơn hàng +OrderId=Mã đơn hàng +Order=Đơn đặt hàng Orders=Đơn đặt hàng OrderLine=Dòng thứ tự OrderFollow=Theo dõi OrderDate=Ngày đặt hàng OrderToProcess=Để xử lý -NewOrder=Trật tự mới -ToOrder=Làm cho trật tự -MakeOrder=Làm cho trật tự +NewOrder=Đơn đặt hàng mới +ToOrder=Tạo đơn đặt hàng +MakeOrder=Tạo đơn đặt hàng SupplierOrder=Để nhà cung cấp SuppliersOrders=Nhà cung cấp đơn đặt hàng -SuppliersOrdersRunning=Các nhà cung cấp hiện tại đơn đặt hàng +SuppliersOrdersRunning=Đơn đặt hàng của các nhà cung cấp hiện tại CustomerOrder=Đơn đặt hàng CustomersOrders=Đơn đặt hàng của khách hàng CustomersOrdersRunning=Đơn đặt hàng của khách hàng hiện tại của @@ -30,106 +30,106 @@ StatusOrderValidatedShort=Xác nhận StatusOrderSentShort=Trong quá trình StatusOrderSent=Lô hàng trong quá trình StatusOrderOnProcessShort=Tiếp nhận -StatusOrderProcessedShort=Xử lý -StatusOrderToBillShort=Giao -StatusOrderToBill2Short=Vào hóa đơn -StatusOrderApprovedShort=Đã được phê duyệt -StatusOrderRefusedShort=Từ chối -StatusOrderToProcessShort=Để xử lý -StatusOrderReceivedPartiallyShort=Một phần nhận -StatusOrderReceivedAllShort=Tất cả mọi thứ được -StatusOrderCanceled=Hủy bỏ -StatusOrderDraft=Dự thảo (cần phải được xác nhận) +StatusOrderProcessedShort=Đã xử lý +StatusOrderToBillShort=Đã giao hàng +StatusOrderToBill2Short=Thanh toán +StatusOrderApprovedShort=Đã được duyệt +StatusOrderRefusedShort=Đã bị từ chối +StatusOrderToProcessShort=Đang xử lý +StatusOrderReceivedPartiallyShort=Đã nhận một phần +StatusOrderReceivedAllShort=Đã nhận đủ +StatusOrderCanceled=Đã bị hủy +StatusOrderDraft=Nháp (cần phải được xác nhận) StatusOrderValidated=Xác nhận -StatusOrderOnProcess=Chờ đợi để nhận được -StatusOrderProcessed=Xử lý -StatusOrderToBill=Giao -StatusOrderToBill2=Vào hóa đơn -StatusOrderApproved=Đã được phê duyệt -StatusOrderRefused=Từ chối -StatusOrderReceivedPartially=Một phần nhận -StatusOrderReceivedAll=Tất cả mọi thứ được -ShippingExist=Một lô hàng tồn -DraftOrWaitingApproved=Dự thảo đã được phê duyệt chưa đặt hàng -DraftOrWaitingShipped=Dự thảo hoặc xác nhận chưa vận chuyển -MenuOrdersToBill=Đơn đặt hàng cung cấp -MenuOrdersToBill2=Đơn đặt hàng vào hóa đơn -SearchOrder=Để tìm kiếm +StatusOrderOnProcess=Đang chờ nhận +StatusOrderProcessed=Đã xử lý +StatusOrderToBill=Đã giao hàng +StatusOrderToBill2=Thanh toán +StatusOrderApproved=Đã được duyệt +StatusOrderRefused=Đã bị từ chối +StatusOrderReceivedPartially=Đã nhận một phần +StatusOrderReceivedAll=Đã nhận đầy đủ +ShippingExist=A shipment exists +DraftOrWaitingApproved=Nháp hoặc đã được phê duyệt nhưng chưa đặt hàng +DraftOrWaitingShipped=Nháp hoặc đã xác nhận nhưng chưa vận chuyển +MenuOrdersToBill=Đơn hàng đã giao +MenuOrdersToBill2=Billable orders +SearchOrder=Tìm kiếm đơn hàng SearchACustomerOrder=Tìm kiếm một đơn đặt hàng -ShipProduct=Sản phẩm tàu +ShipProduct=Ship product Discount=Giảm giá -CreateOrder=Tạo thứ tự -RefuseOrder=Từ chối để -ApproveOrder=Chấp nhận đặt hàng +CreateOrder=Tạo đơn hàng +RefuseOrder=Từ chối đơn hàng +ApproveOrder=Chấp nhận đơn hàng ValidateOrder=Xác nhận đặt hàng -UnvalidateOrder=Để Unvalidate -DeleteOrder=Xóa để -CancelOrder=Hủy lệnh -AddOrder=Thêm để +UnvalidateOrder=Đơn hàng chưa xác nhận +DeleteOrder=Xóa đơn hàng +CancelOrder=Hủy đơn hàng +AddOrder=Tạo đơn hàng AddToMyOrders=Thêm vào đơn đặt hàng của tôi AddToOtherOrders=Thêm vào đơn đặt hàng khác -AddToDraftOrders=Thêm vào dự thảo để -ShowOrder=Hiển thị thứ tự -NoOpenedOrders=Không có đơn đặt hàng mở -NoOtherOpenedOrders=Không có đơn đặt hàng mở khác +AddToDraftOrders=Thêm vào đơn hàng nháp +ShowOrder=Hiển thị đơn đặt hàng +NoOpenedOrders=Không có đơn hàng được mở +NoOtherOpenedOrders=Không có đơn hàng được mở khác NoDraftOrders=Không có đơn hàng nháp OtherOrders=Đơn đặt hàng khác -LastOrders=Đơn đặt hàng cuối% s -LastModifiedOrders=Đơn đặt hàng biến đổi cuối cùng% s -LastClosedOrders=Cuối% s đóng đơn đặt hàng -AllOrders=Mọi đơn đặt hàng +LastOrders=Đơn đặt hàng cuối %s +LastModifiedOrders=Đơn đặt hàng đã điều chỉnh cuối cùng %s +LastClosedOrders=Đơn hàng đã đóng cuối cùng %s +AllOrders=Tất cả đơn đặt hàng NbOfOrders=Số đơn đặt hàng -OrdersStatistics=Thống kê thứ tự của +OrdersStatistics=Thống kê đơn đặt hàng OrdersStatisticsSuppliers=Số liệu thống kê để nhà cung cấp NumberOfOrdersByMonth=Số đơn đặt hàng theo tháng AmountOfOrdersByMonthHT=Số lượng đơn đặt hàng theo tháng (sau thuế) ListOfOrders=Danh sách đơn đặt hàng -CloseOrder=Đóng cửa để -ConfirmCloseOrder=Bạn có chắc là bạn muốn thiết lập trật tự này để deliverd? Khi một đơn hàng được giao, nó có thể được thiết lập để tính tiền. -ConfirmCloseOrderIfSending=Bạn có chắc là bạn muốn đóng theo thứ tự này? Bạn phải đóng lệnh chỉ khi tất cả vận chuyển được thực hiện. -ConfirmDeleteOrder=Bạn Bạn có chắc chắn muốn xóa lệnh này? -ConfirmValidateOrder=Bạn có chắc chắn bạn muốn xác nhận thứ tự này dưới tên% s? -ConfirmUnvalidateOrder=Bạn Bạn có chắc chắn muốn lập lại trật tự% s để soạn thảo trạng thái? -ConfirmCancelOrder=Bạn có chắc chắn bạn muốn hủy bỏ lệnh này? -ConfirmMakeOrder=Bạn có chắc chắn bạn muốn xác nhận bạn đã thực hiện lệnh này vào% s? +CloseOrder=Đóng đơn đặt hàng +ConfirmCloseOrder=Bạn có chắc là bạn muốn thiết lập đơn đạt hàng này để giao? Khi một đơn hàng được giao, nó có thể được thiết lập để tính tiền. +ConfirmCloseOrderIfSending=Bạn có chắc là bạn muốn đóng theo đơn đặt hàng này? Bạn phải đóng đơn đặt hàng chỉ khi tất cả vận chuyển được thực hiện. +ConfirmDeleteOrder=Bạn Bạn có chắc chắn muốn xóa đơn đặt hàng này? +ConfirmValidateOrder=Bạn có chắc chắn bạn muốn xác nhận đơn đặt hàng này dưới tên %s ? +ConfirmUnvalidateOrder=Bạn Bạn có chắc chắn muốn chuyển lại đơn đặt hàng %s về trạng thái soạn thảo? +ConfirmCancelOrder=Bạn có chắc chắn bạn muốn hủy bỏ đơn đặt hàng này? +ConfirmMakeOrder=Bạn có chắc chắn bạn muốn xác nhận bạn đã thực hiện lệnh này vào %s ? GenerateBill=Tạo hóa đơn -ClassifyShipped=Phân loại giao +ClassifyShipped=Phân loại giao hàng ClassifyBilled=Phân loại hóa đơn ComptaCard=Thẻ kế toán DraftOrders=Dự thảo đơn đặt hàng RelatedOrders=Đơn đặt hàng liên quan OnProcessOrders=Trong quá trình các đơn đặt hàng -RefOrder=Tài liệu tham khảo. để -RefCustomerOrder=Tài liệu tham khảo. đơn đặt hàng -RefCustomerOrderShort=Tài liệu tham khảo. cust. để -SendOrderByMail=Gửi đơn qua đường bưu điện -ActionsOnOrder=Sự kiện về trật tự +RefOrder=Số tham chiếu đơn hàng +RefCustomerOrder=Số tham chiếu đơn đặt hàng của khách hàng +RefCustomerOrderShort=Số tham chiếu đơn đặt hàng của khách hàng +SendOrderByMail=Gửi đơn đặt hàng qua đường bưu điện +ActionsOnOrder=Sự kiện về đơn đặt hàng NoArticleOfTypeProduct=Không có bài viết của loại 'sản phẩm' như vậy không có bài viết shippable về đơn hàng này -OrderMode=Phương pháp thứ tự +OrderMode=Phương pháp đơn hàng AuthorRequest=Yêu cầu tác giả UseCustomerContactAsOrderRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ để người nhận -RunningOrders=Đơn đặt hàng về quy trình +RunningOrders=Đơn đặt hàng đang được xử lý UserWithApproveOrderGrant=Người dùng được cấp "thông qua các đơn đặt hàng" cho phép. -PaymentOrderRef=Thanh toán tự% s -CloneOrder=Để Clone -ConfirmCloneOrder=Bạn có chắc chắn bạn muốn sao chép lệnh này% s? -DispatchSupplierOrder=Tiếp nhận đơn đặt hàng nhà cung cấp% s +PaymentOrderRef=Thanh toán đơn đặt hàng %s +CloneOrder=Sao chép đơn đặt hàng +ConfirmCloneOrder=Bạn có chắc chắn bạn muốn sao chép đơn đặt hàng này %s ? +DispatchSupplierOrder=Tiếp nhận đơn đặt hàng nhà cung cấp %s ##### Types de contacts ##### -TypeContact_commande_internal_SALESREPFOLL=Đại diện sau-up đơn đặt hàng +TypeContact_commande_internal_SALESREPFOLL=Đại diện theo dõi đơn đặt hàng TypeContact_commande_internal_SHIPPING=Đại diện theo dõi vận chuyển -TypeContact_commande_external_BILLING=Hóa đơn của khách hàng liên lạc -TypeContact_commande_external_SHIPPING=Vận chuyển khách hàng liên hệ -TypeContact_commande_external_CUSTOMER=Liên hệ với khách hàng theo thứ tự sau-up -TypeContact_order_supplier_internal_SALESREPFOLL=Đại diện theo dõi để cung cấp +TypeContact_commande_external_BILLING=Địa chỉ hóa đơn khách hàng +TypeContact_commande_external_SHIPPING=Địa chỉ giao hàng cho khách hàng +TypeContact_commande_external_CUSTOMER=Địa chỉ khách hàng theo dõi đơn hàng +TypeContact_order_supplier_internal_SALESREPFOLL=Đại diện theo dõi đơn hàng nhà cung cấp TypeContact_order_supplier_internal_SHIPPING=Đại diện theo dõi vận chuyển -TypeContact_order_supplier_external_BILLING=Nhà cung cấp hóa đơn liên lạc -TypeContact_order_supplier_external_SHIPPING=Nhà cung cấp vận chuyển liên lạc -TypeContact_order_supplier_external_CUSTOMER=Nhà cung cấp liên lạc theo thứ tự sau-up +TypeContact_order_supplier_external_BILLING=Địa chỉ hóa đơn nhà cung cấp +TypeContact_order_supplier_external_SHIPPING=Địa chỉ giao hàng cho nhà cung cấp +TypeContact_order_supplier_external_CUSTOMER=Đia chỉ nhà cung cấp theo dõi đơn hàng Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON liên tục không được xác định Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON liên tục không được xác định -Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Không thể tải tập tin mô-đun '% s' -Error_FailedToLoad_COMMANDE_ADDON_File=Không thể tải tập tin mô-đun '% s' +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Không thể tải tập tin mô-đun '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Không thể tải tập tin mô-đun '%s' Error_OrderNotChecked=Không có đơn đặt hàng cho hóa đơn được lựa chọn # Sources OrderSource0=Đề nghị thương mại @@ -142,22 +142,21 @@ OrderSource6=Cửa hàng QtyOrdered=Số lượng đặt hàng AddDeliveryCostLine=Thêm một dòng chi phí giao hàng cho thấy trọng lượng của thứ tự # Documents models -PDFEinsteinDescription=Một mô hình để đầy đủ (logo ...) -PDFEdisonDescription=Một mô hình đơn giản để +PDFEinsteinDescription=Một mô hình đơn hàng đầy đủ (logo ...) +PDFEdisonDescription=Một mô hình đơn hàng đơn giản PDFProformaDescription=Hoá đơn chiếu lệ đầy đủ (logo ...) # Orders modes OrderByMail=Thư OrderByFax=Fax -OrderByEMail=Thư điện tử +OrderByEMail=Email OrderByWWW=Trực tuyến OrderByPhone=Điện thoại -CreateInvoiceForThisCustomer=Đơn đặt hàng Bill +CreateInvoiceForThisCustomer=Thanh toán đơn hàng NoOrdersToInvoice=Không có đơn đặt hàng có thể thanh toán -CloseProcessedOrdersAutomatically=Phân loại "chế biến" tất cả các đơn đặt hàng lựa chọn. -MenuOrdersToBill2=Đơn đặt hàng vào hóa đơn -OrderCreation=Tạo ra thứ tự -Ordered=Ra lệnh +CloseProcessedOrdersAutomatically=Chọn "Đã xử lý" cho tất cả các đơn đặt hàng. +OrderCreation=Tạo đơn hàng +Ordered=Đơn hàng đã được tạo OrderCreated=Đơn đặt hàng của bạn đã được tạo ra OrderFail=Một lỗi đã xảy ra trong quá trình tạo đơn đặt hàng của bạn CreateOrders=Tạo đơn đặt hàng -ToBillSeveralOrderSelectCustomer=Để tạo ra một hóa đơn cho một số đơn đặt hàng, kích đầu tiên vào khách hàng, sau đó chọn "% s". +ToBillSeveralOrderSelectCustomer=Để tạo ra một hóa đơn cho một số đơn đặt hàng, đầu tiên nhấp vào khách hàng, sau đó chọn "%s". diff --git a/htdocs/langs/vi_VN/oscommerce.lang b/htdocs/langs/vi_VN/oscommerce.lang deleted file mode 100644 index 648f546555f..00000000000 --- a/htdocs/langs/vi_VN/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=Hệ điều hành thương mại -OSCommerceSetup=Thiết lập mô-đun hệ điều hành thương mại -OSCommerceSetupSaved=Thiết lập hệ điều hành thương mại lưu -OSCommerceServer=Hệ điều hành máy chủ lưu trữ thương mại / ip -OSCommerceDatabaseName=Tên cơ sở dữ liệu hệ điều hành thương mại -OSCommercePrefix=Hệ điều hành thương mại bảng tiền tố -OSCommerceUser=Đăng nhập cơ sở dữ liệu hệ điều hành thương mại diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang index 60293670023..a87e0bbfbcb 100644 --- a/htdocs/langs/vi_VN/other.lang +++ b/htdocs/langs/vi_VN/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Mã bảo vệ Calendar=Lịch -AddTrip=Thêm chuyến đi Tools=Công cụ ToolsDesc=Khu vực này được dành riêng cho nhóm dụng cụ khác không có sẵn vào mục trình đơn khác.

    Các công cụ này có thể đạt được từ menu bên cạnh. Birthday=Sinh nhật @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Dự án sáng tạo Notify_TASK_CREATE=Nhiệm vụ tạo Notify_TASK_MODIFY=Nhiệm vụ sửa đổi Notify_TASK_DELETE=Công tác xóa +SeeModuleSetup=See module setup NbOfAttachedFiles=Số đính kèm tập tin / tài liệu TotalSizeOfAttachedFiles=Tổng dung lượng của các file đính kèm / tài liệu MaxSize=Kích thước tối đa @@ -203,25 +203,26 @@ ForgetIfNothing=Nếu bạn không yêu cầu thay đổi này, chỉ cần quê ##### Calendar common ##### AddCalendarEntry=Thêm phần trong lịch% s -NewCompanyToDolibarr=Công ty% s thêm vào Dolibarr -ContractValidatedInDolibarr=Hợp đồng xác nhận trong% s Dolibarr -ContractCanceledInDolibarr=Hợp đồng bị hủy bỏ trong% s Dolibarr -ContractClosedInDolibarr=Hợp đồng% s đóng cửa Dolibarr -PropalClosedSignedInDolibarr=Đề xuất% s đã ký trong Dolibarr -PropalClosedRefusedInDolibarr=Đề xuất% s từ chối trong Dolibarr -PropalValidatedInDolibarr=Đề nghị xác nhận% s trong Dolibarr -InvoiceValidatedInDolibarr=Hoá đơn% s xác nhận trong Dolibarr -InvoicePaidInDolibarr=Hoá đơn% s thay đổi để trả Dolibarr -InvoiceCanceledInDolibarr=Hoá đơn% s hủy bỏ Dolibarr -PaymentDoneInDolibarr=Thanh toán% hoàn thành công việc trong Dolibarr -CustomerPaymentDoneInDolibarr=Khách hàng thanh toán% hoàn thành công việc trong Dolibarr -SupplierPaymentDoneInDolibarr=Nhà cung cấp thanh toán% hoàn thành công việc trong Dolibarr -MemberValidatedInDolibarr=Thành viên% s xác nhận trong Dolibarr -MemberResiliatedInDolibarr=Thành viên% s resiliated trong Dolibarr -MemberDeletedInDolibarr=Thành viên% s xóa từ Dolibarr -MemberSubscriptionAddedInDolibarr=Đăng ký cho thành viên được thêm vào trong% s Dolibarr -ShipmentValidatedInDolibarr=Lô hàng% s xác nhận trong Dolibarr -ShipmentDeletedInDolibarr=Lô hàng% s xóa từ Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=Xuất khẩu ExportsArea=Khu vực xuất khẩu diff --git a/htdocs/langs/vi_VN/paybox.lang b/htdocs/langs/vi_VN/paybox.lang index f937768240c..aced32a4944 100644 --- a/htdocs/langs/vi_VN/paybox.lang +++ b/htdocs/langs/vi_VN/paybox.lang @@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page NewPayboxPaymentReceived=New Paybox payment received NewPayboxPaymentFailed=New Paybox payment tried but failed PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang index 38a20e0037d..eb6a21adcba 100644 --- a/htdocs/langs/vi_VN/products.lang +++ b/htdocs/langs/vi_VN/products.lang @@ -6,9 +6,9 @@ Products=Sản phẩm Services=Dịch vụ Product=Sản phẩm Service=Dịch vụ -ProductId=Sản phẩm / dịch vụ id +ProductId=Số ID Sản phẩm/dịch vụ Create=Tạo -Reference=Tài liệu tham khảo +Reference=Tham chiếu NewProduct=Sản phẩm mới NewService=Dịch vụ mới ProductCode=Mã sản phẩm @@ -17,15 +17,15 @@ 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ụ -ProductsAndServicesOnSell=Sản phẩm có sẵn và dịch vụ -ProductsAndServicesNotOnSell=Sản phẩm cũ và Dịch vụ -ProductsAndServicesStatistics=Sản phẩm và dịch vụ thống kê -ProductsStatistics=Sản phẩm thống kê +ProductsAndServicesOnSell=Sản phẩm và dịch vụ có sẵn +ProductsAndServicesNotOnSell=Sản phẩm và dịch vụ lỗi thời +ProductsAndServicesStatistics=Thống kê Sản phẩm và Dịch vụ +ProductsStatistics=Thống kê Sản phẩm ProductsOnSell=Sản phẩm có sẵn ProductsNotOnSell=Sản phẩm lỗi thời ProductsOnSellAndOnBuy=Sản phẩm không phải để bán cũng không mua @@ -33,80 +33,80 @@ ServicesOnSell=Dịch vụ có sẵn ServicesNotOnSell=Dịch vụ lỗi thời ServicesOnSellAndOnBuy=Dịch vụ không phải để bán cũng không mua InternalRef=Tham khảo nội bộ -LastRecorded=Sản phẩm cuối cùng / dịch vụ bán ghi -LastRecordedProductsAndServices=Cuối% s ghi nhận sản phẩm / dịch vụ -LastModifiedProductsAndServices=Cuối% s sửa đổi sản phẩm / dịch vụ -LastRecordedProducts=Cuối% của sản phẩm ghi -LastRecordedServices=Dịch vụ cuối% s ghi +LastRecorded=Sản phẩm/dịch vụ được bán cuối cùng +LastRecordedProductsAndServices=Sản phẩm/dịch vụ %s được ghi cuối cùng +LastModifiedProductsAndServices=Sản phẩm/dịch vụ %s được sửa cuối cùng +LastRecordedProducts=Sản phẩm %s cuối cùng được ghi +LastRecordedServices=Dịch vụ %s cuối cùng được ghi LastProducts=Sản phẩm cuối cùng -CardProduct0=Sản phẩm thẻ -CardProduct1=Dịch vụ thẻ -CardContract=Thẻ đồng +CardProduct0=Thẻ Sản phẩm +CardProduct1=Thẻ Dịch vụ +CardContract=Thẻ Hợp đồng 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 -OnBuy=Mua +OnSell=Để bán +OnBuy=Để Mua NotOnSell=Không phải để bán -ProductStatusOnSell=Bán -ProductStatusNotOnSell=Không phải để bán -ProductStatusOnSellShort=Bán -ProductStatusNotOnSellShort=Không phải để bán -ProductStatusOnBuy=Mua -ProductStatusNotOnBuy=Không mua -ProductStatusOnBuyShort=Mua -ProductStatusNotOnBuyShort=Không mua -UpdatePrice=Giá cập nhật +ProductStatusOnSell=Để bán +ProductStatusNotOnSell=Không dành để bán +ProductStatusOnSellShort=Để bán +ProductStatusNotOnSellShort=Không dành để bán +ProductStatusOnBuy=Để Mua +ProductStatusNotOnBuy=Không dành để Mua +ProductStatusOnBuyShort=Để Mua +ProductStatusNotOnBuyShort=Không dành để Mua +UpdatePrice=Cập nhật Giá AppliedPricesFrom=Giá áp dụng từ SellingPrice=Giá bán SellingPriceHT=Giá bán (đã trừ thuế) SellingPriceTTC=Giá bán (bao thuế.) -PublicPrice=Giá công +PublicPrice=Giá niêm yết CurrentPrice=Giá hiện tại NewPrice=Giá mới -MinPrice=Giọt. giá bán +MinPrice=Giá bán tối thiểu MinPriceHT=Giọt. giá bán (đã trừ thuế) MinPriceTTC=Giọt. giá bán (bao thuế.) -CantBeLessThanMinPrice=Giá bán không thấp hơn mức cho phép cho sản phẩm này (% s không có thuế) tối thiểu. Thông báo này cũng có thể xuất hiện khi bạn nhập một giảm quá quan trọng. +CantBeLessThanMinPrice=Giá bán không thấp hơn mức cho phép cho sản phẩm này (%s không có thuế) tối thiểu. Thông báo này cũng có thể xuất hiện khi bạn nhập một giảm quá quan trọng. ContractStatus=Tình trạng hợp đồng -ContractStatusClosed=Đóng -ContractStatusRunning=Chạy -ContractStatusExpired=hết hạn +ContractStatusClosed=Đã đóng +ContractStatusRunning=Đang chạy +ContractStatusExpired=Đã hết hạn ContractStatusOnHold=Không chạy -ContractStatusToRun=Để có được chạy +ContractStatusToRun=Để được chạy ContractNotRunning=Hợp đồng này không hoạt động -ErrorProductAlreadyExists=Một sản phẩm có sự tham khảo% s đã tồn tại. -ErrorProductBadRefOrLabel=Giá trị sai để tham khảo hoặc nhãn. +ErrorProductAlreadyExists=Một sản phẩm với tham chiếu %s đã tồn tại. +ErrorProductBadRefOrLabel=Sai giá trị tham khảo hoặc nhãn ErrorProductClone=Có một vấn đề trong khi cố gắng để sao chép các sản phẩm hoặc dịch vụ. ErrorPriceCantBeLowerThanMinPrice=Lỗi giá không thể thấp hơn giá tối thiểu. Suppliers=Nhà cung cấp SupplierRef=Ref sản phẩm của nhà cung cấp. ShowProduct=Hiện sản phẩm ShowService=Hiện dịch vụ -ProductsAndServicesArea=Sản phẩm và dịch vụ khu vực +ProductsAndServicesArea=Khu vực Sản phẩm và DỊch vụ ProductsArea=Khu vực sản phẩm ServicesArea=Khu vực dịch vụ AddToMyProposals=Thêm vào đề nghị của tôi AddToOtherProposals=Thêm vào các đề xuất khác AddToMyBills=Thêm vào hóa đơn của tôi AddToOtherBills=Thêm vào hóa đơn khác -CorrectStock=Chứng khoán chính xác +CorrectStock=Chính xác tồn kho AddPhoto=Thêm hình ảnh -ListOfStockMovements=Danh sách chuyển động chứng khoán +ListOfStockMovements=Danh sách chuyển tồn kho BuyingPrice=Giá mua -SupplierCard=Nhà cung cấp thẻ -CommercialCard=Thẻ thương mại -AllWays=Con đường để tìm sản phẩm của bạn trong kho -NoCat=Sản phẩm của bạn không có trong bất kỳ thể loại -PrimaryWay=Con đường chính -PriceRemoved=Giá loại bỏ +SupplierCard=Thẻ Nhà cung cấp +CommercialCard=Thẻ Thương mại +AllWays=Đường dẫn để tìm sản phẩm của bạn trong kho +NoCat=Sản phẩm của bạn không có trong bất kỳ ngành nào +PrimaryWay=Đường dẫn chính +PriceRemoved=Giá đã bị xóa BarCode=Mã vạch BarcodeType=Loại mã vạch SetDefaultBarcodeType=Đặt mã vạch loại @@ -115,30 +115,30 @@ NoteNotVisibleOnBill=Lưu ý (không hiển thị trên hóa đơn, đề nghị CreateCopy=Tạo bản sao ServiceLimitedDuration=Nếu sản phẩm là một dịch vụ với thời gian hạn chế: MultiPricesAbility=Một số mức giá cho mỗi sản phẩm / dịch vụ -MultiPricesNumPrices=Số giá +MultiPricesNumPrices=Số của 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 -EditAssociate=Phó +AssociatedProductsAbility=Kích hoạt tính năng bao bì ảo +AssociatedProducts=Bao bì sản phẩm +AssociatedProductsNumber=Số lượng sản phẩm được tạo bao bì ảo +ParentProductsNumber=Số sản phẩm bao bì gốc +IfZeroItIsNotAVirtualProduct=Nếu bằng 0, sản phẩm này không phải là một sản phẩm bao bì ảo +IfZeroItIsNotUsedByVirtualProduct=Nếu bằng 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm bao bì ảo +EditAssociate=Phụ kiện Translation=Dịch KeywordFilter=Bộ lọc từ khóa CategoryFilter=Bộ lọc danh mục ProductToAddSearch=Tìm kiếm sản phẩm để thêm 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 -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ụ? -ProductDeleted=Sản phẩm / dịch vụ "% s" sẽ bị xóa khỏi cơ sở dữ liệu. -DeletePicture=Xóa một bức tranh -ConfirmDeletePicture=Bạn Bạn có chắc chắn muốn xóa ảnh này? +NoMatchFound=Không 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 bao bì sản phẩm/dịch vụ 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à gốc của 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ụ? +ProductDeleted=Sản phẩm / dịch vụ "%s" sẽ bị xóa khỏi cơ sở dữ liệu. +DeletePicture=Xóa một hình +ConfirmDeletePicture=Bạn có chắc chắn muốn xóa hình này? ExportDataset_produit_1=Sản phẩm ExportDataset_service_1=Dịch vụ ImportDataset_produit_1=Sản phẩm @@ -146,20 +146,20 @@ ImportDataset_service_1=Dịch vụ 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 +MatchingProducts=Sản phẩm / dịch vụ trùng khớp +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 SL thiểu này (không 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 NoSupplierPriceDefinedForThisProduct=Không có giá nhà cung cấp / SL được xác định cho sản phẩm này -RecordedProducts=Sản phẩm được ghi lại -RecordedServices=Dịch vụ ghi +RecordedProducts=Sản phẩm được ghi +RecordedServices=Dịch vụ được ghi RecordedProductsAndServices=Sản phẩm / dịch vụ được ghi nhận PredefinedProductsToSell=Sản phẩm được xác định trước để bán PredefinedServicesToSell=Dịch vụ được xác định trước để bán @@ -167,72 +167,72 @@ PredefinedProductsAndServicesToSell=Sản phẩm được xác định trước PredefinedProductsToPurchase=Sản phẩm được xác định trước để mua hàng PredefinedServicesToPurchase=Dịch vụ được xác định trước để mua hàng PredefinedProductsAndServicesToPurchase=Sản phẩm được xác định trước / dịch vụ để puchase -GenerateThumb=Tạo ngón tay cái -ProductCanvasAbility=Sử dụng đặc biệt "vải" addons +GenerateThumb=Generate thumb +ProductCanvasAbility=Sử dụng phần mở rộng "canvas" đặc biệt ServiceNb=Dịch vụ #% s -ListProductServiceByPopularity=Danh sách sản phẩm / dịch vụ nổi tiếng -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 +ListProductServiceByPopularity=Danh sách sản phẩm / dịch vụ phổ biến +ListProductByPopularity=Danh sách sản phẩm phổ biến +ListServiceByPopularity=Danh sách các dịch vụ phổ biến 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 -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 +CloneProduct=Sao chép sản phẩm hoặc dịch vụ +ConfirmCloneProduct=Bạn có chắc chắn bạn muốn sao chép sản phẩm hoặc dịch vụ %s? +CloneContentProduct=Sao chép tất cả thông tin chính của sản phẩm / dịch vụ +ClonePricesProduct=Sao chép Thông tin chính và giá cả +CloneCompositionProduct=Sao chép bao bì 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ụ +NewRefForClone=Số tham chiếu các sản phẩm/dịch vụ mới CustomerPrices=Giá khách hàng SuppliersPrices=Giá nhà cung cấp SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (các sản phẩm hoặc dịch vụ) -CustomCode=Luật hải quan +CustomCode=Mã hải quan CountryOrigin=Nước xuất xứ -HiddenIntoCombo=Thành viên ẩn danh vào danh sách chọn -Nature=Thiên nhiên -ProductCodeModel=Ref sản phẩm mẫu -ServiceCodeModel=Dịch vụ ref mẫu -AddThisProductCard=Tạo ra sản phẩm thẻ +HiddenIntoCombo=Ẩn vào danh sách chọn +Nature=Tự nhiên +ProductCodeModel=Mẫu tham chiếu Sản phẩm +ServiceCodeModel=MẪu tham chiếu dịch vụ +AddThisProductCard=Tạo thẻ Sản phẩm HelpAddThisProductCard=Tùy chọn này cho phép bạn tạo ra hoặc sao chép một sản phẩm nếu nó không tồn tại. -AddThisServiceCard=Tạo dịch vụ thẻ +AddThisServiceCard=Tạo thẻ Dịch vụ HelpAddThisServiceCard=Tùy chọn này cho phép bạn tạo ra hoặc sao chép một dịch vụ nếu nó không tồn tại. CurrentProductPrice=Giá hiện tại AlwaysUseNewPrice=Luôn luôn sử dụng giá hiện tại của sản phẩm / dịch vụ -AlwaysUseFixedPrice=Sử dụng các mức giá cố định -PriceByQuantity=Giá bán của của số lượng +AlwaysUseFixedPrice=Sử dụng giá cố định +PriceByQuantity=Giá bán theo số lượng PriceByQuantityRange=Phạm vi số lượng -ProductsDashboard=Sản phẩm / dịch vụ tóm tắt +ProductsDashboard=Tóm tắt Sản phẩm / dịch vụ UpdateOriginalProductLabel=Sửa đổi nhãn gốc HelpUpdateOriginalProductLabel=Cho phép chỉnh sửa tên của sản phẩm ### composition fabrication -Building=Sản xuất và các mặt hàng dispatchment +Building=Sản xuất và các mặt hàng điều phối Build=Sản xuất -BuildIt=Sản xuất & văn -BuildindListInfo=Số lượng có sẵn để sản xuất mỗi kho (đặt nó là 0 cho không có thêm hành động) +BuildIt=Sản xuất & điều phối +BuildindListInfo=Số lượng có sẵn để sản xuất mỗi kho (đặt nó là 0 nếu không có hành động tiếp theo) QtyNeed=Số lượng UnitPmp=Đơn vị VWAP Net CostPmpHT=Tổng VWAP Net -ProductUsedForBuild=Tự động tiêu thụ sản +ProductUsedForBuild=Tự động tiêu thụ bởi sản xuất ProductBuilded=Sản xuất hoàn thành ProductsMultiPrice=Sản phẩm đa giá ProductsOrServiceMultiPrice=Giá của khách hàng (những sản phẩm, dịch vụ, đa giá) ProductSellByQuarterHT=Sản phẩm doanh thu quý VWAP ServiceSellByQuarterHT=Dịch vụ doanh thu quý VWAP -Quarter1=1. Quý -Quarter2=2. Quý -Quarter3=3. Quý -Quarter4=4. Quý +Quarter1=Quý 1 +Quarter2=Quý 2 +Quarter3=Quý 3 +Quarter4=Quý 4 BarCodePrintsheet=In mã vạch -PageToGenerateBarCodeSheets=Với công cụ này, bạn có thể in tờ dán mã vạch. Chọn định dạng của trang nhãn dán của bạn, loại mã vạch và giá trị của mã vạch, sau đó nhấn vào nút% s. -NumberOfStickers=Số nhãn in trên trang -PrintsheetForOneBarCode=In nhiều dán một mã vạch +PageToGenerateBarCodeSheets=Với công cụ này, bạn có thể in tờ dán mã vạch. Chọn định dạng của trang nhãn dán của bạn, loại mã vạch và giá trị của mã vạch, sau đó nhấn vào nút %s. +NumberOfStickers=Số nhãn để in trên trang +PrintsheetForOneBarCode=In nhiều nhãn cho một mã vạch BuildPageToPrint=Tạo trang in FillBarCodeTypeAndValueManually=Điền loại mã vạch và giá trị bằng tay. FillBarCodeTypeAndValueFromProduct=Điền loại mã vạch và giá trị từ mã vạch của sản phẩm. FillBarCodeTypeAndValueFromThirdParty=Điền loại mã vạch và giá trị từ mã vạch của một của bên thứ ba. -DefinitionOfBarCodeForProductNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không đầy đủ cho các sản phẩm% s. -DefinitionOfBarCodeForThirdpartyNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không hoàn chỉnh cho% s của bên thứ ba. -BarCodeDataForProduct=Thông tin mã vạch của sản phẩm% s: -BarCodeDataForThirdparty=Thông tin mã vạch của bên thứ ba của% s: +DefinitionOfBarCodeForProductNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không đầy đủ cho các sản phẩm %s. +DefinitionOfBarCodeForThirdpartyNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không hoàn chỉnh cho %s của bên thứ ba. +BarCodeDataForProduct=Thông tin mã vạch của sản phẩm %s: +BarCodeDataForThirdparty=Thông tin mã vạch của bên thứ ba của %s: ResetBarcodeForAllRecords=Xác định giá trị mã vạch cho tất cả các hồ sơ (cũng sẽ thiết lập lại giá trị này đã được xác định mã vạch với các giá trị mới) PriceByCustomer=Giá bán của khách hàng PriceCatalogue=Giá duy nhất cho mỗi sản phẩm / dịch vụ @@ -240,5 +240,10 @@ PricingRule=Quy định giá AddCustomerPrice=Thêm giá của khách hàng ForceUpdateChildPriceSoc=Đặt giá trên cùng một công ty con của khách hàng 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 +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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/vi_VN/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang index 88e52a17a5f..b37fed33b8e 100644 --- a/htdocs/langs/vi_VN/sendings.lang +++ b/htdocs/langs/vi_VN/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Đối với thời điểm này, tạo ra một RelatedShippings=Shippings liên quan ShipmentLine=Đường vận chuyển CarrierList=Danh sách vận chuyển +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=Catch của khách hàng diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang index f5bfa524b6e..304832413e7 100644 --- a/htdocs/langs/vi_VN/stocks.lang +++ b/htdocs/langs/vi_VN/stocks.lang @@ -2,7 +2,7 @@ WarehouseCard=Thẻ kho Warehouse=Kho Warehouses=Các kho hàng -NewWarehouse=Kho mới / khu vực chứng khoán +NewWarehouse=Kho mới / khu vực kho WarehouseEdit=Sửa kho MenuNewWarehouse=Kho mới WarehouseOpened=Kho mở @@ -14,64 +14,64 @@ WarehouseTarget=Kho tiêu ValidateSending=Xóa gửi CancelSending=Hủy bỏ việc gửi DeleteSending=Xóa gửi -Stock=Cổ -Stocks=Cổ phiếu -Movement=Phong trào -Movements=Biến động +Stock=Tồn kho +Stocks=Tồn kho +Movement=Chuyển kho +Movements=Danh sách chuyển kho ErrorWarehouseRefRequired=Tên tài liệu tham khảo kho là cần thiết ErrorWarehouseLabelRequired=Nhãn kho là cần thiết -CorrectStock=Chứng khoán chính xác +CorrectStock=Tồn kho chính xác ListOfWarehouses=Danh sách kho -ListOfStockMovements=Danh sách chuyển động chứng khoán -StocksArea=Khu vực cổ phiếu +ListOfStockMovements=Danh sách chuyển động kho +StocksArea=Warehouses area Location=Đến từ LocationSummary=Ngắn vị trí tên NumberOfDifferentProducts=Số lượng sản phẩm khác nhau NumberOfProducts=Tổng số sản phẩm LastMovement=Chuyển động mới -LastMovements=Phong trào cuối +LastMovements=Chuyển kho cuối Units=Đơn vị Unit=Đơn vị -StockCorrection=Chứng khoán chính xác -StockTransfer=Chuyển nhượng chứng khoán +StockCorrection=Tồn kho chính xác +StockTransfer=Chuyển nhượng kho StockMovement=Chuyển -StockMovements=Chuyển nhượng chứng khoán -LabelMovement=Nhãn Phong trào +StockMovements=Chuyển nhượng kho +LabelMovement=Nhãn Chuyển kho NumberOfUnit=Số đơn vị UnitPurchaseValue=Giá mua đơn vị TotalStock=Tổng kho -StockTooLow=Cổ phiếu quá thấp -StockLowerThanLimit=Cổ thấp hơn so với giới hạn cảnh báo +StockTooLow=Tồn kho quá thấp +StockLowerThanLimit=Tồn kho thấp hơn so với giới hạn cảnh báo EnhancedValue=Giá trị PMPValue=Giá bình quân gia quyền PMPValueShort=WAP EnhancedValueOfWarehouses=Các kho hàng giá trị UserWarehouseAutoCreate=Tạo một kho tự động khi tạo một người sử dụng QtyDispatched=Số lượng cử -OrderDispatch=Điều phối chứng khoán -RuleForStockManagementDecrease=Quy tắc cho quản lý chứng khoán giảm -RuleForStockManagementIncrease=Quy tắc cho tăng quản lý chứng khoán -DeStockOnBill=Giảm chứng khoán thực tế trên hoá đơn khách hàng / tín dụng ghi xác nhận -DeStockOnValidateOrder=Giảm cổ phiếu sản trên khách hàng xác nhận đơn đặt hàng -DeStockOnShipment=Giảm cổ phiếu sản trên xác nhận lô hàng -ReStockOnBill=Tăng cổ phiếu thực tế các nhà cung cấp hoá đơn tín dụng / ghi xác nhận -ReStockOnValidateOrder=Tăng cổ phiếu thực sự tán thành đơn đặt hàng các nhà cung cấp -ReStockOnDispatchOrder=Tăng cổ phiếu sản trên dẫn điều phối vào kho, sau khi tiếp nhận đơn đặt hàng nhà cung cấp -ReStockOnDeleteInvoice=Tăng cổ phiếu sản trên xóa hóa đơn -OrderStatusNotReadyToDispatch=Đặt hàng vẫn chưa hoặc không có thêm một trạng thái cho phép điều phối các sản phẩm trong kho chứng khoán. -StockDiffPhysicTeoric=Lý do cho cổ phiếu khác biệt về thể chất và lý thuyết -NoPredefinedProductToDispatch=Không có sản phẩm được xác định trước cho đối tượng này. Vì vậy, không có điều phối trong chứng khoán là bắt buộc. +OrderDispatch=Điều phối kho +RuleForStockManagementDecrease=Quy tắc cho quản lý kho giảm +RuleForStockManagementIncrease=Quy tắc cho tăng quản lý kho +DeStockOnBill=Giảm kho thực tế trên hoá đơn khách hàng / tín dụng ghi xác nhận +DeStockOnValidateOrder=Giảm tồn kho thực trên khách hàng xác nhận đơn đặt hàng +DeStockOnShipment=Giảm tồn kho thực trên xác nhận lô hàng +ReStockOnBill=Tăng tồn kho thực tế các nhà cung cấp hoá đơn tín dụng / ghi xác nhận +ReStockOnValidateOrder=Tăng tồn kho thực sự tán thành đơn đặt hàng các nhà cung cấp +ReStockOnDispatchOrder=Tăng tồn kho thực trên dẫn điều phối vào kho, sau khi tiếp nhận đơn đặt hàng nhà cung cấp +ReStockOnDeleteInvoice=Tăng tồn kho thực trên xóa hóa đơn +OrderStatusNotReadyToDispatch=Đặt hàng vẫn chưa hoặc không có thêm một trạng thái cho phép điều phối các sản phẩm trong kho kho. +StockDiffPhysicTeoric=Lý do cho tồn kho khác biệt về thể chất và lý thuyết +NoPredefinedProductToDispatch=Không có sản phẩm được xác định trước cho đối tượng này. Vì vậy, không có điều phối trong kho là bắt buộc. DispatchVerb=Công văn StockLimitShort=Hạn cảnh báo -StockLimit=Hạn cổ phiếu cho cảnh báo -PhysicalStock=Cổ vật lý -RealStock=Bất Cổ -VirtualStock=Chứng khoán ảo -MininumStock=Cổ phiếu tối thiểu +StockLimit=Hạn tồn kho cho cảnh báo +PhysicalStock=Tồn kho vật lý +RealStock=Tồn kho thực +VirtualStock=Tồn kho ảo +MininumStock=Tồn kho tối thiểu StockUp=Dự trữ -MininumStockShort=Cổ phút +MininumStockShort=Tồn kho tối thiểu StockUpShort=Dự trữ -IdWarehouse=Kho Id +IdWarehouse=Mã kho DescWareHouse=Mô tả kho LieuWareHouse=Địa phương hóa kho WarehousesAndProducts=Các kho hàng và sản phẩm @@ -80,46 +80,46 @@ AverageUnitPricePMP=Trọng giá đầu vào trung bình SellPriceMin=Đơn giá bán EstimatedStockValueSellShort=Giá trị bán EstimatedStockValueSell=Giá trị bán -EstimatedStockValueShort=Giá trị cổ phiếu đầu vào -EstimatedStockValue=Giá trị cổ phiếu đầu vào +EstimatedStockValueShort=Giá trị tồn kho đầu vào +EstimatedStockValue=Giá trị tồn kho đầu vào DeleteAWarehouse=Xóa một nhà kho ConfirmDeleteWarehouse=Bạn có chắc chắn muốn xóa kho% s? -PersonalStock=Cổ phiếu cá nhân của% s -ThisWarehouseIsPersonalStock=Kho này đại diện cho cổ phiếu cá nhân của% s% s -SelectWarehouseForStockDecrease=Chọn nhà kho để sử dụng cho chứng khoán giảm -SelectWarehouseForStockIncrease=Chọn nhà kho để sử dụng cho chứng khoán tăng -NoStockAction=Không có hành động chứng khoán +PersonalStock=Tồn kho cá nhân của% s +ThisWarehouseIsPersonalStock=Kho này đại diện cho tồn kho cá nhân của% s% s +SelectWarehouseForStockDecrease=Chọn nhà kho để sử dụng cho kho giảm +SelectWarehouseForStockIncrease=Chọn nhà kho để sử dụng cho kho tăng +NoStockAction=Không có hành động kho LastWaitingSupplierOrders=Đơn đặt hàng chờ đợi để tiếp khách -DesiredStock=Chứng khoán mong muốn +DesiredStock=Tồn kho mong muốn StockToBuy=Để đặt hàng Replenishment=Bổ sung ReplenishmentOrders=Đơn đặt hàng bổ sung -VirtualDiffersFromPhysical=Theo để tăng / giảm lựa chọn cổ phiếu, chứng khoán vật chất và chứng khoán ảo (vật lý + đơn đặt hàng hiện tại) có thể có khác nhau -UseVirtualStockByDefault=Sử dụng chứng khoán ảo theo mặc định, thay vì cổ vật lý, cho các tính năng bổ sung -UseVirtualStock=Sử dụng chứng khoán ảo -UsePhysicalStock=Sử dụng vật lý cổ phiếu +VirtualDiffersFromPhysical=Theo để tăng / giảm lựa chọn tồn kho, kho vật chất và kho ảo (vật lý + đơn đặt hàng hiện tại) có thể có khác nhau +UseVirtualStockByDefault=Sử dụng kho ảo theo mặc định, thay vì cổ vật lý, cho các tính năng bổ sung +UseVirtualStock=Sử dụng kho ảo +UsePhysicalStock=Sử dụng vật lý tồn kho CurentSelectionMode=Dòng định mức chế độ lựa chọn -CurentlyUsingVirtualStock=Chứng khoán ảo -CurentlyUsingPhysicalStock=Cổ vật lý -RuleForStockReplenishment=Quy tắc cho cổ phiếu bổ sung +CurentlyUsingVirtualStock=Tồn kho ảo +CurentlyUsingPhysicalStock=Tồn kho vật lý +RuleForStockReplenishment=Quy tắc cho tồn kho bổ sung SelectProductWithNotNullQty=Chọn ít nhất một sản phẩm với một SL không null và một nhà cung cấp AlertOnly= Cảnh báo chỉ -WarehouseForStockDecrease=Kho% s sẽ được sử dụng cho chứng khoán giảm -WarehouseForStockIncrease=Kho% s sẽ được sử dụng cho chứng khoán tăng +WarehouseForStockDecrease=Kho% s sẽ được sử dụng cho kho giảm +WarehouseForStockIncrease=Kho% s sẽ được sử dụng cho kho tăng ForThisWarehouse=Đối với kho này -ReplenishmentStatusDesc=Đây là danh sách của tất cả các sản phẩm với một cổ phiếu thấp hơn so với cổ phiếu mong muốn (hoặc thấp hơn giá trị cảnh báo nếu hộp kiểm "cảnh báo chỉ" được chọn), và đề nghị bạn để tạo ra các đơn đặt hàng nhà cung cấp để lấp đầy sự khác biệt. +ReplenishmentStatusDesc=Đây là danh sách của tất cả các sản phẩm với một tồn kho thấp hơn so với tồn kho mong muốn (hoặc thấp hơn giá trị cảnh báo nếu hộp kiểm "cảnh báo chỉ" được chọn), và đề nghị bạn để tạo ra các đơn đặt hàng nhà cung cấp để lấp đầy sự khác biệt. ReplenishmentOrdersDesc=Đây là danh sách của tất cả các đơn đặt hàng nhà cung cấp mở Replenishments=Replenishments NbOfProductBeforePeriod=Số lượng sản phẩm% s trong kho trước khi thời gian được lựa chọn (<% s) NbOfProductAfterPeriod=Số lượng sản phẩm% s trong kho sau khi được lựa chọn thời gian (>% s) -MassMovement=Phong trào quần chúng -MassStockMovement=Phong trào chứng khoán đại chúng +MassMovement=Chuyển kho toàn bộ +MassStockMovement=Chuyển kho toàn bộ SelectProductInAndOutWareHouse=Chọn một sản phẩm, một số lượng lớn, kho nguồn và một kho hàng mục tiêu, sau đó nhấp vào "% s". Một khi điều này được thực hiện với mọi hoạt động cần thiết, kích vào "% s". RecordMovement=Ghi transfert ReceivingForSameOrder=Receivings về đơn hàng này -StockMovementRecorded=Chuyển động chứng khoán được ghi nhận -RuleForStockAvailability=Quy định về yêu cầu chứng khoán -StockMustBeEnoughForInvoice=Mức cổ phiếu phải đủ để thêm sản phẩm / dịch vụ vào hóa đơn -StockMustBeEnoughForOrder=Mức cổ phiếu phải đủ để thêm sản phẩm / dịch vụ vào nề nếp -StockMustBeEnoughForShipment= Mức cổ phiếu phải đủ để thêm sản phẩm / dịch vụ vào lô hàng +StockMovementRecorded=Chuyển động kho được ghi nhận +RuleForStockAvailability=Quy định về yêu cầu kho +StockMustBeEnoughForInvoice=Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào hóa đơn +StockMustBeEnoughForOrder=Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào nề nếp +StockMustBeEnoughForShipment= Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào lô hàng 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/users.lang b/htdocs/langs/vi_VN/users.lang index f3652dcb525..c80e82cd32c 100644 --- a/htdocs/langs/vi_VN/users.lang +++ b/htdocs/langs/vi_VN/users.lang @@ -63,7 +63,6 @@ ShowGroup=Hiện nhóm ShowUser=Hiện người dùng NonAffectedUsers=Người dùng không được giao UserModified=Người sử dụng sửa đổi thành công -GroupModified=Nhóm đổi thành công PhotoFile=Hình ảnh tập tin UserWithDolibarrAccess=Người sử dụng truy cập Dolibarr ListOfUsersInGroup=Danh sách các thành viên trong nhóm này @@ -103,7 +102,7 @@ UserDisabled=Sử dụng% s khuyết tật UserEnabled=Sử dụng% s kích hoạt UserDeleted=Sử dụng% s loại bỏ NewGroupCreated=Nhóm% s tạo -GroupModified=Nhóm đổi thành công +GroupModified=Group %s modified GroupDeleted=Nhóm% s loại bỏ ConfirmCreateContact=Bạn có chắc chắn bạn muốn tạo một tài khoản Dolibarr cho liên hệ này? ConfirmCreateLogin=Bạn có chắc chắn bạn muốn tạo một tài khoản Dolibarr thành viên này? @@ -120,3 +119,4 @@ UseTypeFieldToChange=Sử dụng Type để thay đổi OpenIDURL=OpenID URL LoginUsingOpenID=Sử dụng OpenID để đăng nhập WeeklyHours=Giờ hàng tuần +ColorUser=Màu của người sử dụng diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang index 85dce579a88..846f80ab12d 100644 --- a/htdocs/langs/vi_VN/withdrawals.lang +++ b/htdocs/langs/vi_VN/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=Nhận LastWithdrawalReceipts=Biên lai thu hồi cuối% s WithdrawedBills=Hoá đơn bị thu hồi WithdrawalsLines=Đường rút -RequestStandingOrderToTreat=Yêu cầu đứng đơn đặt hàng để điều trị -RequestStandingOrderTreated=Yêu cầu đơn đặt hàng thường trực điều trị +RequestStandingOrderToTreat=Yêu cầu đứng đơn đặt hàng để xử lý +RequestStandingOrderTreated=Yêu cầu cho các đơn hàng thường trực xử lý +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Đơn đặt hàng của khách hàng đứng CustomerStandingOrder=Để đứng hàng NbOfInvoiceToWithdraw=Nb. hóa đơn với rút lại yêu cầu @@ -40,14 +41,13 @@ TransMetod=Phương pháp truyền Send=Gửi Lines=Dòng StandingOrderReject=Ban hành từ chối -InvoiceRefused=Hoá đơn từ chối WithdrawalRefused=Rút từ chối WithdrawalRefusedConfirm=Bạn có chắc chắn bạn muốn nhập một từ chối thu hồi đối với xã hội RefusedData=Ngày từ chối RefusedReason=Lý do từ chối RefusedInvoicing=Thanh toán từ chối NoInvoiceRefused=Không sạc từ chối -InvoiceRefused=Hoá đơn từ chối +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=Tình trạng StatusUnknown=Không biết StatusWaiting=Chờ @@ -76,13 +76,14 @@ WithBankUsingRIB=Đối với tài khoản ngân hàng sử dụng RIB WithBankUsingBANBIC=Đối với tài khoản ngân hàng sử dụng IBAN / BIC / SWIFT BankToReceiveWithdraw=Tài khoản ngân hàng để nhận Bỏ cuộc CreditDate=Về tín dụng -WithdrawalFileNotCapable=Không thể tạo ra tập tin nhận thu hồi cho quốc gia của bạn +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/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang index ae7111d3c32..fc37725f98e 100644 --- a/htdocs/langs/zh_CN/accountancy.lang +++ b/htdocs/langs/zh_CN/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=选择会计科目表 Validate=验证 Addanaccount=添加一个会计帐户 AccountAccounting=会计账户 -Ventilation=通风 +Ventilation=Breakdown ToDispatch=派遣 Dispatched=调度 -CustomersVentilation=通风客户 -SuppliersVentilation=通风系统供应商 +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=贸易保证金 Reports=报告 ByCustomerInvoice=依据”发票“的客户 @@ -45,9 +45,9 @@ WriteBookKeeping=在”总账“中的”账户记录“ Bookkeeping=总帐 AccountBalanceByMonth=”账户余额“按月份 -AccountingVentilation=会计通风 -AccountingVentilationSupplier=会计通风的供应商 -AccountingVentilationCustomer=会计通风客户 +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=线 CAHTF=总采购供应商HT @@ -56,7 +56,7 @@ InvoiceLinesDone=发票通风线 IntoAccount=在会计帐户 Ventilate=通风 -VentilationAuto=自动通风 +VentilationAuto=Automatic breakdown Processing=处理 EndProcessing=处理的结束 @@ -68,9 +68,9 @@ NotVentilatedinAccount=不通风的会计账户 ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=会计长度账户显示在的Dolibarr AccountLengthDesc=功能允许由零的数字代替空格假装会计账户的长度。这个函数只接触了显示屏，它不修改的Dolibarr登记的会计科目。为出口，这个功能是必要的，以与特定的软件兼容。 @@ -84,7 +84,7 @@ ACCOUNTING_CASH_JOURNAL=Cash journal ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_TRANSFER_CASH=转账账户 ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) @@ -140,14 +140,14 @@ Active=声明 NewFiscalYear=新财年 -DescVentilCustomer=在这里，请咨询您的发票客户的年度会计通风 +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=总成交量HT TotalMarge=总销售利润率 DescVentilDoneCustomer=这里查阅发票的客户的行和其会计帐户的列表 DescVentilTodoCustomer=与会计帐户通风客户发票行 ChangeAccount=变化的账户选择行会计帐户： Vide=- -DescVentilSupplier=在这里，请咨询您的发票供应商的年度会计通风 +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=与会计帐户通风发票的供应商的线路 DescVentilDoneSupplier=在这里请教发票的供应商的线条和其会计帐户列表 @@ -155,4 +155,4 @@ ValidateHistory=自动验证 ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计帐户，因为它是用来 -FicheVentilation=通风卡 +FicheVentilation=Breakdown card diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index e0a4870b103..aa7361675a0 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -43,19 +43,21 @@ SecuritySetup=安全设置 ErrorModuleRequirePHPVersion=错误，此模块要求 PHP 版本 %s 或更高 ErrorModuleRequireDolibarrVersion=错误，此模块要求 Dolibarr 版本 %s 或更高 ErrorDecimalLargerThanAreForbidden=错误，不支持超过 %s 的精度。 -DictionarySetup=Dictionary setup -Dictionary=Dictionaries -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years +DictionarySetup=词典的设置 +Dictionary=字典库 +Chartofaccounts=会计科目表 +Fiscalyear=财务年度 ErrorReservedTypeSystemSystemAuto=类型值 'system' 与 'systemauto' 是系统保留值。不能以'user'为值添加您的记录 ErrorCodeCantContainZero=编码不能包含 0 -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=禁用JavaScript和Ajax功能(推荐 盲人或文本浏览器) ConfirmAjax=使用 Ajax 弹出式确认窗口 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. +UseSearchToSelectCompany=使用自动填充字段来选择第三方(而不是使用一个列表框)。 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). +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=在第三表中显示全天事件 @@ -106,9 +108,9 @@ OtherOptions=其他选项 OtherSetup=其他设置 CurrentValueSeparatorDecimal=小数位分隔符 CurrentValueSeparatorThousand=千位分隔符 -Destination=Destination -IdModule=Module ID -IdPermissions=Permissions ID +Destination=目的地 +IdModule=模块ID +IdPermissions=权限ID Modules=模块 ModulesCommon=主要模块 ModulesOther=其他模块 @@ -120,7 +122,7 @@ LanguageBrowserParameter=参数 %s LocalisationDolibarrParameters=本地化参数 ClientTZ=客户端时区(用户侧) ClientHour=客户端时间(用户侧) -OSTZ=Server OS Time Zone +OSTZ=服务器操作系统时区 PHPTZ=PHP服务器时区 PHPServerOffsetWithGreenwich=PHP服务器与 GMT 时差(秒) ClientOffsetWithGreenwich=客户机/浏览器与 GMT 时差(秒) @@ -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=资讯框可用 @@ -238,9 +241,9 @@ OfficialWebSiteFr=法国官方网站 OfficialWiki=Dolibarr Wiki 上的文档 OfficialDemo=Dolibarr在线演示 OfficialMarketPlace=官方市场提供外部模块/扩展 -OfficialWebHostingService=Referenced web hosting services (Cloud hosting) -ReferencedPreferredPartners=Preferred Partners -OtherResources=Autres ressources +OfficialWebHostingService=引用网络托管服务（云主机） +ReferencedPreferredPartners=首选合作伙伴 +OtherResources=其他资源 ForDocumentationSeeWiki=用户或开发人员用文档(文档，常见问题…)，
    参见 Dolibarr 百科：
    %s ForAnswersSeeForum=您有任何其他问题/帮助，可以到 Dolibarr 论坛：
    %s HelpCenterDesc1=此处可以帮助你获得 Dolibarr 帮助支持服务。 @@ -302,7 +305,7 @@ CurrentVersion=Dolibarr 当前版本 CallUpdatePage=请到数据库的结构和数据更新页面：%s。 LastStableVersion=最新的稳定版本 GenericMaskCodes=您可自由设置格式掩码。在 %s 格式掩码中， 有如下计数标记可用：
    {000000}表示按顺序递增的序号。序号位数与掩码中0的个数相同，不足自动补零，达最大值后自动归零。
    {000000+000} 同上但 %s 起始序号从 + 后的数值记起。
    {000000@x} 与第一种相同，但序号到X月时自动清零(x=1~12 、0＝程序设置中的财年起始月、99＝每月清零)。 如果使用此种掩码且 x >= 2 ，则必须同时使用日期掩码 {yy}{mm} 或 {yyyy}{mm}。
    {dd} 天 (01~31)。
    {mm} 月 (01~12)。
    {yy}，{yyyy} 或 {y} 代表 2位, 4位 或 1 位年。

    -GenericMaskCodes2={cccc} the client code on n characters
    {cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
    {tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
    +GenericMaskCodes2={cccc} n个字符，客户端代码
    {cccc000}上的n个字符的客户端代码后面是一个专门用于客户计数器。此计数器将比较全局计数器相同时间为用户进行复位。
    {tttt}第三方类型的n个字符（见词典第三方类型）的代码。
    GenericMaskCodes3=其它非标记字符将维持不变。
    不允许使用空格
    GenericMaskCodes4a=例如: 2007-01-31 第三方“TheCompany”的第99笔 %s ：
    GenericMaskCodes4b=例如: 2007-03-1 建立的第三方公司:
    @@ -437,14 +440,14 @@ Module52Name=库存 Module52Desc=产品库存的管理 Module53Name=服务 Module53Desc=服务的管理 -Module54Name=合同 -Module54Desc=合同的和服务的管理 +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=条码 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,16 +478,16 @@ Module320Name=RSS 源 Module320Desc=添加 RSS 源至 Dolibarr 主屏幕页面 Module330Name=书签 Module330Desc=书签的管理 -Module400Name=项目 -Module400Desc=在其他模块内部的管理项目 +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) -Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries +Module500Name=特别费用（税，社会公益，股息） +Module500Desc=特别费用如税收，社会公益，分红及工资管理 Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=通知 -Module600Desc=当系统中一些商业事件发生时，通过电邮通知第三方联系人。 +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=捐赠 Module700Desc=捐款的管理 Module1200Name=Mantis @@ -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 客户端 @@ -514,20 +521,20 @@ Module5000Name=多公司 Module5000Desc=允许你管理多个公司 Module6000Name=工作流程 Module6000Desc=工作流管理 -Module20000Name=休假 -Module20000Desc=声明和跟踪聘员休假 -Module39000Name=Product batch -Module39000Desc=Batch number, eat-by and sell-by date management on products +Module20000Name=Leave Requests management +Module20000Desc=Declare and follow employees leaves requests +Module39000Name=产品批号 +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products Module50000Name=出纳 Module50000Desc=模块通过 PayBox 提供信用卡网上支付页面 Module50100Name=POS Module50100Desc=POS 模块 -Module50200Name= Paypal -Module50200Desc= 模块提供信用卡与Paypal网上支付页面 -Module50400Name=Accounting (advanced) -Module50400Desc=Accounting management (double parties) +Module50200Name=Paypal +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=利润空间 @@ -606,15 +613,16 @@ Permission151=阅读常年订单 Permission152=创建/修改常年订单请求 Permission153=阅读常年订单收据 Permission154=信贷/拒绝站在订单收据 -Permission161=读取合同 -Permission162=建立/修改服务合同 -Permission163=启动服务合同 -Permission164=禁用服务合同 -Permission165=删除合同 -Permission171=阅读差旅记录 -Permission172=建立/修改差旅记录 -Permission173=删除差旅记录 -Permission178=导出差旅记录 +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=读取供应商资讯 Permission181=读取采购订单 Permission182=建立/修改采购订单 @@ -671,7 +679,7 @@ Permission300=读取条码 Permission301=建立/修改条码 Permission302=删除条码 Permission311=阅读服务 -Permission312=指派服务到合同 +Permission312=Assign service/subscription to contract Permission331=阅读书签 Permission332=建立/修改书签 Permission333=删除书签 @@ -688,10 +696,10 @@ Permission401=读取折扣 Permission402=建立/修改折扣 Permission403=确认折扣 Permission404=删除折扣 -Permission510=Read Salaries -Permission512=Create/modify salaries -Permission514=Delete salaries -Permission517=Export salaries +Permission510=查看工资 +Permission512=创建/修改工资 +Permission514=删除工资 +Permission517=导出工资 Permission531=阅读服务 Permission532=建立/修改服务 Permission534=删除服务 @@ -701,8 +709,8 @@ Permission701=读取捐款资讯 Permission702=建立/修改捐款资讯 Permission703=删除捐款资讯 Permission1001=读取库存资讯 -Permission1002=建立/修改库存资讯 -Permission1003=删除库存资讯 +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=读取库存的转让资讯 Permission1005=建立/修改库存转让 Permission1101=读取交货订单 @@ -751,18 +759,18 @@ Permission50202=进口交易 Permission54001=打印 Permission55001=Read polls Permission55002=Create/modify polls -Permission59001=Read commercial margins -Permission59002=Define commercial margins +Permission59001=查看商业利润 +Permission59002=确定商业利润 DictionaryCompanyType=Thirdparties type DictionaryCompanyJuridicalType=Juridical kinds of thirdparties DictionaryProspectLevel=Prospect potential level -DictionaryCanton=State/Cantons -DictionaryRegion=Regions +DictionaryCanton=国家/各省、直辖市、自治区 +DictionaryRegion=地区 DictionaryCountry=国家 -DictionaryCurrency=Currencies -DictionaryCivility=Civility title +DictionaryCurrency=货币 +DictionaryCivility=文明单位称号 DictionaryActions=Type of agenda events -DictionarySocialContributions=Social contributions types +DictionarySocialContributions=社会公益类型 DictionaryVAT=VAT Rates or Sales Tax Rates DictionaryRevenueStamp=Amount of revenue stamps DictionaryPaymentConditions=Payment terms @@ -778,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 @@ -788,7 +797,7 @@ VATIsNotUsedDesc=默认情况下，建议的营业税为0，可用于像协会 VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices. ##### Local Taxes ##### -LTRate=Rate +LTRate=率 LocalTax1IsUsed=使用第二项税率 LocalTax1IsNotUsed=不使用第二项税率 LocalTax1IsUsedDesc=使用其它类型税率(非增值税VAT) @@ -813,12 +822,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. 规则结束。 LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules. LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=报告 +CalcLocaltax1ES=销售 - 购买 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2ES=购买 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3ES=销售 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=如果代码没有翻译则默认使用以下标签 LabelOnDocuments=文档中的标签 @@ -887,6 +896,7 @@ PermanentLeftSearchForm=常驻左侧菜单搜寻框 DefaultLanguage=默认语言使用(语言代码) EnableMultilangInterface=启用多语言界面 EnableShowLogo=左侧菜单中显示公司标志 +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=您的系统已成功更新 CompanyInfo=公司资讯 CompanyIds=公司/协会的编号 @@ -931,14 +941,14 @@ EventsSetup=设置 事件日志 LogEvents=安全稽核事件 Audit=安全稽核 InfoDolibarr=Dolibarr 信息 -InfoBrowser=Infos Browser +InfoBrowser=浏览器信息 InfoOS=系统 信息 InfoWebServer=网页服务器 信息 InfoDatabase=数据库 信息 InfoPHP=PHP 信息 InfoPerf=履行相关信息 -BrowserName=Browser name -BrowserOS=Browser OS +BrowserName=浏览器名称 +BrowserOS=浏览器操作系统 ListEvents=稽核事件 ListOfSecurityEvents=安全事件清单 SecurityEventsPurged=安全事件清除 @@ -1015,13 +1025,13 @@ ExtraFieldsThirdParties=增补属性 (往来单位) ExtraFieldsContacts=增补属性 (联系人/地址) ExtraFieldsMember=增补属性 (成员) ExtraFieldsMemberType=增补属性 (成员类型) -ExtraFieldsCustomerOrders=Complementary attributes (orders) -ExtraFieldsCustomerInvoices=Complementary attributes (invoices) +ExtraFieldsCustomerOrders=增补的属性（订单） +ExtraFieldsCustomerInvoices=增补的属性（发票） ExtraFieldsSupplierOrders=增补属性 (订单) ExtraFieldsSupplierInvoices=增补属性 (账单) ExtraFieldsProject=增补属性 (项目) ExtraFieldsProjectTask=增补属性 (任务) -ExtraFieldHasWrongValue=Attribute %s has a wrong value. +ExtraFieldHasWrongValue=属性 %s 有一个错误的值。 AlphaNumOnlyCharsAndNoSpace=仅限英文字母 (不包括空格) AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space SendingMailSetup=通过电邮发送的设置 @@ -1038,7 +1048,6 @@ YesInSummer=是(在夏天) OnlyFollowingModulesAreOpenedToExternalUsers=注意，仅如下模块向外部用户开放。(无论外部用户的权限如何)： SuhosinSessionEncrypt=会话存储空间已用 Suhosin 加密 ConditionIsCurrently=当前条件为 %s -TestNotPossibleWithCurrentBrowsers=自动检测不能使用 YouUseBestDriver=你使用的驱动程序 %s 就是目前最佳驱动程式。 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=你只有 %s 的产品/服务在数据库。这并不需要任何特别的优化。 @@ -1052,7 +1061,7 @@ AddRefInList=显示客户/供应商参考列表(选择列表或组合框)和大 FieldEdition=Edition of field %s FixTZ=TimeZone fix FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) -GetBarCode=Get barcode +GetBarCode=获取条码 EmptyNumRefModelDesc=The code is free. This code can be modified at any time. ##### Module password generation PasswordGenerationStandard=返回一个根据 Dolibarr 内部算法生成的密码：8个字符，包含小写数字和字母。 @@ -1074,11 +1083,11 @@ ModuleCompanyCodeAquarium=根据以下编码原则返回会计编号:
    以 %s ModuleCompanyCodePanicum=只会回传一个空的会计编号 ModuleCompanyCodeDigitaria=会计编号取决于第三方的编号。代码以C开头，后跟第三方单位的 5 位代码 UseNotifications=使用通知 -NotificationsDesc=电邮通知功能令您可以将 Dolibarr 中的事件通过邮件自动通知给所设定的第三方(客户或供应商)。Choice of active notification and targets contacts is made one third party at time. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=文件模板 DocumentModelOdt=从开放文档模板软件(OpenOffice, KOffice, TextEdit,...等)生成(.ODT，.ODS）模板文档。 WatermarkOnDraft=为草稿文档加水印 -JSOnPaimentBill=Activate feature to autofill payment lines on payment form +JSOnPaimentBill=激活在线支付功能来自动填充付款的形式 CompanyIdProfChecker=Professional Id 规则 MustBeUnique=必须是唯一 ID 吗？ MustBeMandatory=强制创建第三方？ @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=添加交付日期的能力 UseOptionLineIfNoQuantity=定量为0的产品或服务项视为可选项* FreeLegalTextOnProposal=报价单中的额外说明文本 WatermarkOnDraftProposal=为商业计划书草案添加水印(如果空) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=订单管理设置 OrdersNumberingModules=订单编号模块 @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order FreeLegalTextOnOrders=订单中的额外说明文本 WatermarkOnDraftOrders=为订单草稿加水印(如果空) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=点击拨号模块设置 ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
    __PHONETO__ that will be replaced with the phone number of person to call
    __PHONEFROM__ that will be replaced with phone number of calling person (yours)
    __LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
    __PASS__ that will be replaced with your clicktodial password (defined on your user card). @@ -1158,10 +1169,10 @@ FicheinterNumberingModules=干预编号模块 TemplatePDFInterventions=干预信息卡文档模板 WatermarkOnDraftInterventionCards=干预卡文档加水印(如果有) ##### Contracts ##### -ContractsSetup=合同模块的设置 +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=合同编号模块 TemplatePDFContracts=Contracts documents models -FreeLegalTextOnContracts=Free text on contracts +FreeLegalTextOnContracts=合同自由文本 WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) ##### Members ##### MembersSetup=会员模块设置 @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=HTTP服务器 %s 类型的文件不会被压缩 CacheByServer=缓存服务器 CacheByClient=通过浏览器缓存 CompressionOfResources=压缩的HTTP响应 -TestNotPossibleWithCurrentBrowsers=自动检测不能使用 +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=产品模块设置 ServiceSetup=服务模块设置 @@ -1332,7 +1343,7 @@ ConfirmDeleteProductLineAbility=从表单中删除产品时要求确认 ModifyProductDescAbility=允许更改表单中的产品说明 ViewProductDescInFormAbility=表单中是否可以直接显示产品描述资讯(如果关闭则用弹出工具提示显示) ViewProductDescInThirdpartyLanguageAbility=是否可以直接显示其他语系的产品描述资讯 -UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectProductTooltip=此外，如果你有大量的产品（> 10万），你可以通过设置 - >其他不变PRODUCT_DONOTSEARCH_ANYWHERE设置为1，提高速度。搜索将被限制在开始的字符串。 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). UseEcoTaxeAbility=支持生态附加税 (WEEE) SetDefaultBarcodeTypeProducts=默认的条码类型 @@ -1382,9 +1393,10 @@ MailingSetup=电邮发送模块设置 MailingEMailFrom=邮件模块所使用的邮件发件人 MailingEMailError=对错误的电子邮件发送错误通知邮件(慎用避免循环退信造成IP拉入黑名单) ##### Notification ##### -NotificationSetup=电邮通知模块设置 +NotificationSetup=EMail notification module setup NotificationEMailFrom=通知模块所使用的邮件发件人 -ListOfAvailableNotifications=可用的通知名单 (项目视实际启用的模块而定) +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=发货单模块设置 SendingsReceiptModel=发货单据模板 @@ -1412,8 +1424,9 @@ OSCommerceTestOk=成功连接到服务器'%s'的数据库'%s'上，身份用户 OSCommerceTestKo1=服务器'%s'连接成功，但无法打开数据库'%s'。 OSCommerceTestKo2=以用户身份'%s'连接至服务器'%s' 失败。 ##### Stock ##### -StockSetup=库存模块设置 -UserWarehouse=*启用用户自定义库存 +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=菜单(项)已删除 TreeMenu=树状菜单 @@ -1478,11 +1491,14 @@ ClickToDialDesc=此模块可以在电话号码后添加图标点击此图标将 ##### Point Of Sales (CashDesk) ##### CashDesk=POS CashDeskSetup=POS 模块设置 -CashDeskThirdPartyForSell=销售用通用第三方 +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=接收现金付款的默认帐户 CashDeskBankAccountForCheque= 接收支票付款的默认帐户 CashDeskBankAccountForCB= 接收信用卡支付的默认帐户 -CashDeskIdWareHouse=销售发货仓库 +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. ##### Bookmark ##### BookmarkSetup=书签模块设置 BookmarkDesc=此模块可以管理您的书签您也可以将Dolibarr的任意页面加入您的左侧菜单中。 @@ -1524,17 +1540,25 @@ TaskModelModule=任务报告文档模型 ECMSetup = GED 设置 ECMAutoTree = 自动树形文件夹和文档 ##### Fiscal Year ##### -FiscalYears=Fiscal years -FiscalYear=Fiscal year -FiscalYearCard=Fiscal year card -NewFiscalYear=New fiscal year -EditFiscalYear=Edit fiscal year -OpenFiscalYear=Open fiscal year -CloseFiscalYear=Close fiscal year -DeleteFiscalYear=Delete fiscal year -ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? -Opened=Opened -Closed=Closed - -Format=Format -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +FiscalYears=财年 +FiscalYear=财务年度 +FiscalYearCard=财务年度卡 +NewFiscalYear=新财务年度 +EditFiscalYear=编辑财务年度 +OpenFiscalYear=打开财务年度 +CloseFiscalYear=关闭财务年度 +DeleteFiscalYear=删除财务年度 +ConfirmDeleteFiscalYear=您确定要删除本财年？ +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 +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order +Format=格式 +TypePaymentDesc=0：客户支付类型，1：供应商支付类型，2：客户和供应商的付款方式 diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang index 2d25e6718cd..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=查看列表 @@ -41,9 +42,10 @@ AutoActions= 全自动灌装议程 AgendaAutoActionDesc= 这里定义Dolibarr会为其自动创建待办事项的活动。如果没有被选\n中(默认情况下)，只有手动操作被列入待办事项。 AgendaSetupOtherDesc= 这页允许配置议程模块其他参数。 AgendaExtSitesDesc=此页面允许声明日历的外部来源，从而在Dolibarr待办事项中可以看到他们的事件。 -ActionsEvents= Dolibarr将为其自动创建一个动作的事件 -PropalValidatedInDolibarr= 建议%s的验证 -InvoiceValidatedInDolibarr= 发票%s的验证 +ActionsEvents=Dolibarr将为其自动创建一个动作的事件 +PropalValidatedInDolibarr=建议%s的验证 +InvoiceValidatedInDolibarr=发票%s的验证 +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=发票的%s去回到草案状态 InvoiceDeleteDolibarr=删除 %s 发票 OrderValidatedInDolibarr= 订购%s的验证 @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=为了%s批准 OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=为了%s回到草案状态 OrderCanceledInDolibarr=为了%s取消 -InterventionValidatedInDolibarr=%s的验证干预 ProposalSentByEMail=商业建议通过电子邮件发送%s OrderSentByEMail=客户订单通过电子邮件发送%s InvoiceSentByEMail=客户发票通过电子邮件发送%s @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=供应商的订单通过电子邮件发送%s SupplierInvoiceSentByEMail=供应商的发票通过电子邮件发送%s ShippingSentByEMail=通过电子邮件发送的航运%s ShippingValidated= Shipping %s validated -InterventionSentByEMail=通过电子邮件发送的干预%s -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= 第三方创建 DateActionPlannedStart= 计划开始日期 DateActionPlannedEnd= 计划结束日期 @@ -70,9 +69,9 @@ DateActionStart= 开始日期 DateActionEnd= 结束日期 AgendaUrlOptions1=您还可以添加以下参数来筛选输出： AgendaUrlOptions2=login=%s 表示限制只导出创造用户，受影响用户或使用者或执行者为%s的待办事项。 -AgendaUrlOptions3=logina=%s 表示限制只导出创建用户为%s的待办事项。 +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s表示限制只导出使用者与受影响者为%s的待办事项。 -AgendaUrlOptions5=logind=%s表示限制只导出执行者为%s的待办事项。 +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=显示生日的接触 AgendaHideBirthdayEvents=隐藏生日的接触 Busy=忙碌 @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL来访问。iCal文件 ExtSiteNoLabel=无说明 WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang index 79975931d85..18c59db625f 100644 --- a/htdocs/langs/zh_CN/bills.lang +++ b/htdocs/langs/zh_CN/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=信用注意 InvoiceAvoirAsk=信用注意纠正发票 InvoiceAvoirDesc=信贷说明是一种消极的发票用来解决一个事实，即发票已缴纳的数额相差实在比额（因为顾客付出太多的错误，例如将不支付或完全因为他归还了部分产品）。 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=替换%s的发票 ReplacementInvoice=更换发票 ReplacedByInvoice=按发票取代s% @@ -87,7 +87,7 @@ ClassifyCanceled=分类'已遗弃' ClassifyClosed=分类'已关闭' ClassifyUnBilled=Classify 'Unbilled' CreateBill=创建发票 -AddBill=添加注意发票或信用 +AddBill=Create invoice or credit note AddToDraftInvoices=添加到草案发票 DeleteBill=删除发票 SearchACustomerInvoice=搜寻客户发票 @@ -99,7 +99,7 @@ DoPaymentBack=付款回 ConvertToReduc=转换到未来的折扣 EnterPaymentReceivedFromCustomer=输入从客户收到付款 EnterPaymentDueToCustomer=由于客户的付款 -DisabledBecauseRemainderToPayIsZero=禁用，因为其余部分支付为零 +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=额 PriceBase=价格基准 BillStatus=发票状态 @@ -137,8 +137,6 @@ BillFrom=From BillTo=Bill To ActionsOnBill=行动对发票 NewBill=新发票 -Prélèvements=长期订单 -Prélèvements=长期订单 LastBills=上次%s的发票 LastCustomersBills=上次%s的客户发票 LastSuppliersBills=上次%s的供应商发票 @@ -156,9 +154,9 @@ ConfirmCancelBill=你确定要取消发票%s吗 ？ ConfirmCancelBillQuestion=你为什么要这样分类发票'放弃'？ ConfirmClassifyPaidPartially=您确定要更改%s的地位发票支付？ ConfirmClassifyPaidPartiallyQuestion=这发票尚未完全支付。是什么原因让你关闭此发票？ -ConfirmClassifyPaidPartiallyReasonAvoir=其余部分支付（%s的%s）是一个折扣，因为获得付款之前任期。我注意到规范使用信用卡的增值税。 -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=其余部分支付（%s的%s）是一个折扣，因为获得付款之前任期。我接受失去这个折扣的增值税。 -ConfirmClassifyPaidPartiallyReasonDiscountVat=其余部分支付（%s的%s）是一个折扣，因为获得付款之前任期。我在此折扣不恢复信贷注意到增值税。 +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=坏顾客 ConfirmClassifyPaidPartiallyReasonProductReturned=产品部分返回 ConfirmClassifyPaidPartiallyReasonOther=其他原因而放弃额 @@ -191,9 +189,9 @@ AlreadyPaid=已支付 AlreadyPaidBack=已经支付 AlreadyPaidNoCreditNotesNoDeposits=已支付（无信用票据及存款） Abandoned=弃 -RemainderToPay=未支付 -RemainderToTake=其余部分采取 -RemainderToPayBack=其余还钱 +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=待办 AmountExpected=索赔额 ExcessReceived=收到过剩 @@ -219,19 +217,18 @@ NoInvoice=没有发票 ClassifyBill=分类发票 SupplierBillsToPay=供应商发票，以支付 CustomerBillsUnpaid=客户未付发票 -DispenseMontantLettres=由mechanographical是从字母顺序豁免起草的法案 -DispenseMontantLettres=由mechanographical是从字母顺序豁免起草的法案 +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=非可收回 SetConditions=设置付款条件 SetMode=设置支付方式 Billed=帐单 -RepeatableInvoice=预先定义的发票 -RepeatableInvoices=预先定义的发票 -Repeatable=预先定义 -Repeatables=预先定义 -ChangeIntoRepeatableInvoice=转换成预先定义 -CreateRepeatableInvoice=建立预先定义的发票 -CreateFromRepeatableInvoice=创建从预先定义的发票 +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=客户发票和发票的路线 CustomersInvoicesAndPayments=客户发票和付款 ExportDataset_invoice_1=客户发票清单和发票的路线 diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang index 1b9cf293eb9..2b0e2a388f3 100644 --- a/htdocs/langs/zh_CN/categories.lang +++ b/htdocs/langs/zh_CN/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=供应商及个类别之间的相关链接 CatCusLinks=客户/前景和类别之间的相关链接 CatProdLinks=产品/服务和类别之间的相关链接 CatMemberLinks=成员和类别之间的相关链接 -CatProdLinks=产品/服务和类别之间的相关链接 -CatCusLinks=客户/前景和类别之间的相关链接 -CatSupLinks=供应商及个类别之间的相关链接 DeleteFromCat=从类别中删除 DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang index d1e62ea5eea..1386b63e55c 100644 --- a/htdocs/langs/zh_CN/compta.lang +++ b/htdocs/langs/zh_CN/compta.lang @@ -12,7 +12,7 @@ OptionModeTrueDesc=在这种情况下，营业额计算超过付款（付款日 OptionModeVirtualDesc=在这种情况下，营业额计算超过发票（验证的日期）。当这些发票是因为，不论是否已支付或没有，他们在输出中列出的营业额。 FeatureIsSupportedInInOutModeOnly=功能只在信用额，债务提供会计模式（见会计模块的配置） VATReportBuildWithOptionDefinedInModule=这里显示的数额计算使用由税务模块设置定义的规则。 -LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. +LTReportBuildWithOptionDefinedInModule=这里显示的金额是根据公司定义的规则进行计算的。 Param=设置 RemainingAmountPayment=剩余的付款金额： AmountToBeCharged=支付的总金额： @@ -54,7 +54,7 @@ LT1SupplierES=RE purchases VATCollected=增值税征收 ToPay=待支付 ToGet=待取回 -SpecialExpensesArea=Area for all special payments +SpecialExpensesArea=特殊支付区域 TaxAndDividendsArea=税收，社会捐献和股息区 SocialContribution=社会捐献 SocialContributions=社会捐献 @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=坏客户对会计守则在% SuppliersProductsSellSalesTurnover=通过对供应商的产品销售产生营业额。 CheckReceipt=支票存款 CheckReceiptShort=支票存款 +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=新优惠 NewCheckDeposit=新的支票存款 NewCheckDepositOn=创建于账户上的存款收据：%s的 @@ -196,13 +197,9 @@ 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=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_CUSTOMER=第三方客户缺省会计代码 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties CloneTax=Clone a social contribution ConfirmCloneTax=Confirm the clone of a social contribution diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang index c89675f574a..b5ccca60cad 100644 --- a/htdocs/langs/zh_CN/contracts.lang +++ b/htdocs/langs/zh_CN/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=合同区 ListOfContracts=合约名单 -LastContracts=最后%s的修改过的合同 +LastModifiedContracts=Last %s modified contracts AllContracts=所有合同 ContractCard=合同卡 ContractStatus=合同地位 @@ -27,7 +27,7 @@ MenuRunningServices=正在运行的服务 MenuExpiredServices=过期服务 MenuClosedServices=休息服务 NewContract=新合同 -AddContract=新增合同 +AddContract=Create contract SearchAContract=搜索合同 DeleteAContract=删除合同 CloseAContract=关闭的合同 @@ -53,7 +53,7 @@ ListOfRunningContractsLines=名单合同线运行 ListOfRunningServices=运行服务的列表 NotActivatedServices=不活跃的服务（除验证合同） BoardNotActivatedServices=服务激活验证合同之间 -LastContracts=最后%s的修改过的合同 +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/cron.lang b/htdocs/langs/zh_CN/cron.lang index 1878e5a1dc4..85476b74a5c 100644 --- a/htdocs/langs/zh_CN/cron.lang +++ b/htdocs/langs/zh_CN/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = 关于 CronAbout = 关于cron CronAboutPage = cron的“关于”页面 - -# # Right -# Permission23101 = 阅读计划任务 Permission23102 = 创建/更新计划任务 Permission23103 = 删除计划任务 Permission23104 = 执行计划任务 - -# # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=最后运行 +CronLastOutput=最后运行结果 +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=命令 +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job CronNone= 无 CronDtStart=开始日期 CronDtEnd=结束日期 -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe +CronDtNextLaunch=接下来执行 +CronDtLastLaunch=最后执行 +CronFrequency=频率 +CronClass=Classe CronMethod=方法 CronModule=模 -# CronAction=Action +CronAction=Action CronStatus=地位 CronStatusActive=启用 CronStatusInactive=残疾人士 -# CronNoJobs=No jobs registered +CronNoJobs=No jobs registered CronPriority=优先 CronLabel=描述 -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create CronArgs=参数 -# CronSaveSucess=Save succesfully +CronSaveSucess=保存成功 CronNote=评论 -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=启用 CronStatusInactiveBtn=禁用 -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# CronInfoPage=信息 - - -# # Common -# CronType=任务类型 CronType_method=一个Dolibarr类的调用方法 -# CronType_command=Shell command +CronType_command=Shell command CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/zh_CN/donations.lang b/htdocs/langs/zh_CN/donations.lang index 1dcb4689411..0cd5d256a2c 100644 --- a/htdocs/langs/zh_CN/donations.lang +++ b/htdocs/langs/zh_CN/donations.lang @@ -4,7 +4,7 @@ Donations=捐赠 DonationRef=捐赠文书 Donor=捐赠者 Donors=捐赠者 -AddDonation=添加捐赠 +AddDonation=Create a donation NewDonation=新捐赠 ShowDonation=显示捐赠 DonationPromise=礼品的承诺 @@ -31,3 +31,8 @@ DonationRecipient=受捐赠者 ThankYou=谢谢您 IConfirmDonationReception=接受者声明接收，捐款，数额如下 MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/zh_CN/externalsite.lang index 4cd72a69451..60addb61283 100644 --- a/htdocs/langs/zh_CN/externalsite.lang +++ b/htdocs/langs/zh_CN/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=设置链接到外部网站 ExternalSiteURL=外部网站网址 ExternalSiteModuleNotComplete=外部网站模块配置不正确。 +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang index 7d37dc79414..ba28033c043 100644 --- a/htdocs/langs/zh_CN/holiday.lang +++ b/htdocs/langs/zh_CN/holiday.lang @@ -7,7 +7,7 @@ MenuAddCP=Make a leave request NotActiveModCP=You must enable the module Leaves to view this page. NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . NoCPforUser=You don't have any available day. -AddCP=Make a leave request +AddCP=做一个请假申请 Employe=雇员 DateDebCP=开始日期 DateFinCP=结束日期 @@ -18,24 +18,24 @@ ApprovedCP=批准 CancelCP=取消 RefuseCP=拒绝 ValidatorCP=同意 -ListeCP=List of leaves +ListeCP=请假记录 ReviewedByCP=将审查 DescCP=描述 SendRequestCP=Create leave request DelayToRequestCP=Leave requests must be made at least %s day(s) before them. -MenuConfCP=Edit balance of leaves -UpdateAllCP=Update the leaves +MenuConfCP=编辑剩余假期数 +UpdateAllCP=更新假期 SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=你必须选择结束日期大于起始日期。 ErrorSQLCreateCP=创建过程中发生了一个SQL错误： -ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ErrorIDFicheCP=出现一个错误，请假申请不存在。 ReturnCP=返回前一页 -ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request -InfosWorkflowCP=Information Workflow +ErrorUserViewCP=您无权阅读该请假申请。 +InfosCP=请假申请信息 +InfosWorkflowCP=工作流程信息 RequestByCP=Requested by -TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed +TitreRequestCP=请假条 +NbUseDaysCP=消耗的休假天数 EditCP=编辑 DeleteCP=删除 ActionValidCP=验证 @@ -43,31 +43,30 @@ ActionRefuseCP=拒绝 ActionCancelCP=取消 StatutCP=地位 SendToValidationCP=发送到验证 -TitleDeleteCP=Delete the leave request -ConfirmDeleteCP=Confirm the deletion of this leave request? -ErrorCantDeleteCP=Error you don't have the right to delete this leave request. -CantCreateCP=You don't have the right to make leave requests. +TitleDeleteCP=删除请假条 +ConfirmDeleteCP=确认删除该请假申请？ +ErrorCantDeleteCP=错误，您没有权限删除这个请假条。 +CantCreateCP=您无权做请假条。 InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=更新 -CantUpdate=You cannot update this leave request. +CantUpdate=您不能更新这个请假条 NoDateDebut=你必须选择开始日期。 NoDateFin=你必须选择结束日期。 -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=批准申请假期 +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=批准日期 TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=取消假期申请 +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=拒绝原因 DateRefusCP=拒绝日期 DateCancelCP=注销日期 DefineEventUserCP=为用户分配一个特殊的假期 -addEventToUserCP=Assign leave +addEventToUserCP=指定休假 MotifCP=雷森 UserCP=用户 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. @@ -78,35 +77,35 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=名称 Employee=雇员 -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation +FirstDayOfHoliday=假期第一天 +LastDayOfHoliday=假期最后一天 HolidaysMonthlyUpdate=每月更新 ManualUpdate=手动更新 HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=节假日模块的配置 +ConfCP=Configuration of leave request module DescOptionCP=选项​​描述 ValueOptionCP=值 -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=验证配置 -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=更新成功。 ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=验证 UpdateEventCP=Update events @@ -125,7 +124,7 @@ TitleUpdateEventCP=Edit or delete a exceptional leave DeleteEventOptionCP=删除 UpdateEventOptionCP=更新 ErrorMailNotSend=An error occurred while sending email: -NoCPforMonth=No leave this month. +NoCPforMonth=这个月无休。 nbJours=天数 TitleAdminCP=Configuration of Leaves #Messages diff --git a/htdocs/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang index df8ca7a572c..af761b7fe90 100644 --- a/htdocs/langs/zh_CN/interventions.lang +++ b/htdocs/langs/zh_CN/interventions.lang @@ -3,7 +3,7 @@ Intervention=介入 Interventions=干预 InterventionCard=干预卡 NewIntervention=新的干预 -AddIntervention=添加干预 +AddIntervention=Create intervention ListOfInterventions=名单干预 EditIntervention=编辑干预 ActionsOnFicheInter=干预的行动 @@ -30,6 +30,15 @@ StatusInterInvoiced=帐单 RelatedInterventions=相关的干预措施 ShowIntervention=展干预 SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=代表随访干预 TypeContact_fichinter_internal_INTERVENING=干预 diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang index 447d8021405..7ce895780f5 100644 --- a/htdocs/langs/zh_CN/mails.lang +++ b/htdocs/langs/zh_CN/mails.lang @@ -115,7 +115,7 @@ SentBy=发送 MailingNeedCommand=出于安全的原因，收发邮件发送是更好地执行命令行。如果你有一个，请问您的服务器管理员启动以下命令给所有收件人发送电子邮件： MailingNeedCommand2=但是您可以发送到网上，加入与最大的电子邮件数量值参数MAILING_LIMIT_SENDBYWEB你要发送的会议。 ConfirmSendingEmailing=如果你能或不喜欢他们发送您的www浏览器，请确认你确定要发送电子邮件现在从你的浏览器吗？ -LimitSendingEmailing=注：在线发送%s的email限制发送，安全和超时的原因。 +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=清除名单 ToClearAllRecipientsClickHere=点击这里以清除此电子邮件的收件人列表 ToAddRecipientsChooseHere=添加从名单中选择收件人 @@ -133,6 +133,9 @@ Notifications=通知 NoNotificationsWillBeSent=没有电子邮件通知此事件的计划和公司 ANotificationsWillBeSent=1通知将通过电子邮件发送 SomeNotificationsWillBeSent=%s的通知将通过电子邮件发送 -AddNewNotification=启动一个新的电子邮件通知的要求 -ListOfActiveNotifications=列出所有有效的电子邮件通知要求 +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=列出所有发送电子邮件通知 +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang index b1dbdf62e7c..6829f2fb346 100644 --- a/htdocs/langs/zh_CN/main.lang +++ b/htdocs/langs/zh_CN/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=无法找到用户%s在Dolibarr数 ErrorNoVATRateDefinedForSellerCountry=错误，没有增值税税率确定为国家'%s'的。 ErrorNoSocialContributionForSellerCountry=错误，没有社会贡献类型定义为国家'%s'的。 ErrorFailedToSaveFile=错误，无法保存文件。 -ErrorOnlyPngJpgSupported=错误，只。PNG和。jpg图像文件格式支持。 -ErrorImageFormatNotSupported=你的PHP不支持函数来转换这种格式的图像。 SetDate=Set date SelectDate=Select a date SeeAlso=另请参阅 %s BackgroundColorByDefault=默认的背景颜色 +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=一个文件被选中的附件，但还没有上传。点击“附加文件”为这一点。 NbOfEntries=铌条目 GoToWikiHelpPage=在线阅读帮助（需要互联网接入） @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=夸德里 MonthOfDay=本月的一天 HourShort=Ĥ +MinuteShort=mn Rate=率 UseLocalTax=含税 Bytes=字节 @@ -340,6 +341,7 @@ FullList=全部列表 Statistics=统计 OtherStatistics=其他统计 Status=状态 +Favorite=Favorite ShortInfo=信息。 Ref=号码 RefSupplier=号。供应商 @@ -365,6 +367,7 @@ ActionsOnCompany=关于这个第三方的行动 ActionsOnMember=有关此成员的活动 NActions=%s的行动 NActionsLate=%s的后期 +RequestAlreadyDone=Request already recorded Filter=过滤器 RemoveFilter=删除过滤器 ChartGenerated=图表生成 @@ -645,6 +648,7 @@ OptionalFieldsSetup=额外的属性设置 URLPhoto=照片/徽标的URL SetLinkToThirdParty=链接到另一个第三方 CreateDraft=创建草案 +SetToDraft=Back to draft ClickToEdit=单击“编辑” ObjectDeleted=删除对象%s ByCountry=按国家 @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=星期一 Tuesday=星期二 diff --git a/htdocs/langs/zh_CN/margins.lang b/htdocs/langs/zh_CN/margins.lang index 1d90b4bc871..c348b547321 100644 --- a/htdocs/langs/zh_CN/margins.lang +++ b/htdocs/langs/zh_CN/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=产品/服务 AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=开始日期 EndDate=结束日期 Launch=开始 - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/zh_CN/orders.lang index 4b5b283cb47..02ee548183d 100644 --- a/htdocs/langs/zh_CN/orders.lang +++ b/htdocs/langs/zh_CN/orders.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - orders OrdersArea=客户订单区 -SuppliersOrdersArea=供应商的订单区 +SuppliersOrdersArea=供应商订单区 OrderCard=订购卡 OrderId=订单编号 Order=订单 @@ -8,7 +8,7 @@ Orders=订单 OrderLine=在线订单 OrderFollow=跟进 OrderDate=订购日期 -OrderToProcess=为了处理 +OrderToProcess=待处理订单 NewOrder=新订单 ToOrder=订单填写 MakeOrder=订单填写 @@ -18,133 +18,133 @@ SuppliersOrdersRunning=当前供应商的订单 CustomerOrder=客户订单 CustomersOrders=客户的订单 CustomersOrdersRunning=当前客户的订单 -CustomersOrdersAndOrdersLines=客户的订单，订单的行 -OrdersToValid=常规验证 -OrdersToBill=比尔订单 -OrdersInProcess=订单流程 -OrdersToProcess=订单处理 -SuppliersOrdersToProcess=供应商的订单处理 -StatusOrderCanceledShort=取消 +CustomersOrdersAndOrdersLines=客户订单和订单行 +OrdersToValid=客户订单验证 +OrdersToBill=已发货订单 +OrdersInProcess=处理中的客户订单 +OrdersToProcess=待处理客户订单 +SuppliersOrdersToProcess=待处理供应商订单 +StatusOrderCanceledShort=已取消 StatusOrderDraftShort=草案 -StatusOrderValidatedShort=验证 -StatusOrderSentShort=在过程 -StatusOrderSent=出货过程中 +StatusOrderValidatedShort=已验证 +StatusOrderSentShort=处理中 +StatusOrderSent=船运处理中 StatusOrderOnProcessShort=论过程 -StatusOrderProcessedShort=加工 -StatusOrderToBillShort=为了法案 -StatusOrderToBill2Short=为了法案 -StatusOrderApprovedShort=核准 -StatusOrderRefusedShort=拒绝 -StatusOrderToProcessShort=要处理 -StatusOrderReceivedPartiallyShort=部分接受 -StatusOrderReceivedAllShort=一切都收到 -StatusOrderCanceled=取消 +StatusOrderProcessedShort=处理中 +StatusOrderToBillShort=已递送 +StatusOrderToBill2Short=待付账 +StatusOrderApprovedShort=已核准 +StatusOrderRefusedShort=已拒绝 +StatusOrderToProcessShort=待处理 +StatusOrderReceivedPartiallyShort=部分收到 +StatusOrderReceivedAllShort=全部收到 +StatusOrderCanceled=已取消 StatusOrderDraft=草案（需要验证） -StatusOrderValidated=验证 -StatusOrderOnProcess=论过程 -StatusOrderProcessed=加工 -StatusOrderToBill=为了法案 -StatusOrderToBill2=为了法案 -StatusOrderApproved=核准 -StatusOrderRefused=拒绝 -StatusOrderReceivedPartially=部分接受 -StatusOrderReceivedAll=一切都收到 -ShippingExist=A货存在 -DraftOrWaitingApproved=草案尚未下令或批准 -DraftOrWaitingShipped=草案或审定尚未运 -MenuOrdersToBill=比尔订单 -MenuOrdersToBill2=订单票据 -SearchOrder=搜索顺序 -SearchACustomerOrder=Search a customer order -ShipProduct=船舶产品 +StatusOrderValidated=已验证 +StatusOrderOnProcess=等待接收 +StatusOrderProcessed=已处理 +StatusOrderToBill=已递送 +StatusOrderToBill2=待付账 +StatusOrderApproved=已核准 +StatusOrderRefused=已拒绝 +StatusOrderReceivedPartially=部分收到 +StatusOrderReceivedAll=全部收到 +ShippingExist=航运存在 +DraftOrWaitingApproved=草案或尚未批准的订单 +DraftOrWaitingShipped=草案或尚未验证的船运 +MenuOrdersToBill=已发货订单 +MenuOrdersToBill2=Billable orders +SearchOrder=搜索订单 +SearchACustomerOrder=搜索一个客户订单 +ShipProduct=航运产品 Discount=折扣 CreateOrder=创建订单 RefuseOrder=拒绝订单 -ApproveOrder=接受命令 -ValidateOrder=为了验证 +ApproveOrder=接受订单 +ValidateOrder=验证订单 UnvalidateOrder=未验证订单 DeleteOrder=删除订单 CancelOrder=取消订单 -AddOrder=添加顺序 +AddOrder=Create order AddToMyOrders=添加到我的订单 -AddToOtherOrders=添加到其他命令 +AddToOtherOrders=添加到其他订单 AddToDraftOrders=添加订单草案 -ShowOrder=显示顺序 -NoOpenedOrders=没有打开订单 +ShowOrder=显示订单 +NoOpenedOrders=没有打开的订单 NoOtherOpenedOrders=没有其他打开的订单 NoDraftOrders=没有订单草案 -OtherOrders=其他命令 +OtherOrders=其他订单 LastOrders=上次%s的订单 LastModifiedOrders=最后修改%s的订单 -LastClosedOrders=最后%的封闭式订单 +LastClosedOrders=最后关闭的%订单 AllOrders=所有的订单 NbOfOrders=订单号码 -OrdersStatistics=为了统计 +OrdersStatistics=订单统计 OrdersStatisticsSuppliers=供应商的订单统计 NumberOfOrdersByMonth=按月份订单数 AmountOfOrdersByMonthHT=每月订单金额（税后） ListOfOrders=订单列表 -CloseOrder=关闭命令 -ConfirmCloseOrder=您确定要关闭这个秩序？一旦订单是封闭的，它只能产生帐单。 -ConfirmCloseOrderIfSending=您确定要关闭这个秩序？你必须关闭，只有当所有航运完成的顺序。 -ConfirmDeleteOrder=你确定要删除这个秩序？ +CloseOrder=关闭订单 +ConfirmCloseOrder=您确定要关闭这个订单？一旦订单被关闭，它只能产生帐单。 +ConfirmCloseOrderIfSending=您确定要关闭这个订单？只有当所有航运完成的时候你才必须关闭一个订单。 +ConfirmDeleteOrder=你确定要删除这个订单？ ConfirmValidateOrder=你确定要验证这个原则下，根据名称%s吗 ？ -ConfirmUnvalidateOrder=你是否确定要恢复秩序%s草案状态？ +ConfirmUnvalidateOrder=你是否确定要恢复订单%s草案状态？ ConfirmCancelOrder=您确定要取消此订单？ -ConfirmMakeOrder=你一定要确认你这对%的命令？ +ConfirmMakeOrder=你确定你想要生成这个%的订单？ GenerateBill=生成发票 ClassifyShipped=归类"已交付" ClassifyBilled=归类“已付账” ComptaCard=会计证 DraftOrders=草案订单 -RelatedOrders=有关命令 -OnProcessOrders=在处理订单 +RelatedOrders=相关订单 +OnProcessOrders=处理中订单 RefOrder=订单号码 RefCustomerOrder=客户订单号 -RefCustomerOrderShort=号。卡斯特。秩序 -SendOrderByMail=为了通过邮件发送 -ActionsOnOrder=订购行动 +RefCustomerOrderShort=客户订单号缩写 +SendOrderByMail=通过邮件发送订单 +ActionsOnOrder=订单上的事件 NoArticleOfTypeProduct=任何类型的产品文章'，以便对这一秩序shippable文章 OrderMode=订购方法 AuthorRequest=要求提交 UseCustomerContactAsOrderRecipientIfExist=如果存在客户联系方式，使用它而不是第三方地址为收件人地址 -RunningOrders=订单的过程 -UserWithApproveOrderGrant=授予了“批准订单”权限的用户。 -PaymentOrderRef=清缴秩序% +RunningOrders=处理中的订单 +UserWithApproveOrderGrant=授予了“核准订单”权限的用户。 +PaymentOrderRef=订单付款%s CloneOrder=克隆订单 ConfirmCloneOrder=你确定要克隆这个订单%s吗 ？ DispatchSupplierOrder=接收供应商的订单%s ##### Types de contacts ##### -TypeContact_commande_internal_SALESREPFOLL=代表随访客户订单 -TypeContact_commande_internal_SHIPPING=代表随访航运 -TypeContact_commande_external_BILLING=客户发票接触 -TypeContact_commande_external_SHIPPING=客户航运联系 -TypeContact_commande_external_CUSTOMER=客户联系随访秩序 -TypeContact_order_supplier_internal_SALESREPFOLL=代表随访供应商的订单 -TypeContact_order_supplier_internal_SHIPPING=代表随访航运 -TypeContact_order_supplier_external_BILLING=供应商发票接触 -TypeContact_order_supplier_external_SHIPPING=航运供应商联系 -TypeContact_order_supplier_external_CUSTOMER=供应商联系随访秩序 +TypeContact_commande_internal_SALESREPFOLL=代表跟进客户订单 +TypeContact_commande_internal_SHIPPING=代表跟进航运 +TypeContact_commande_external_BILLING=客户发票联系人 +TypeContact_commande_external_SHIPPING=客户航运联系人 +TypeContact_commande_external_CUSTOMER=客户跟进订单联系人 +TypeContact_order_supplier_internal_SALESREPFOLL=代表跟进供应商订单 +TypeContact_order_supplier_internal_SHIPPING=代表跟进航运 +TypeContact_order_supplier_external_BILLING=供应商发票联系人 +TypeContact_order_supplier_external_SHIPPING=供应商航运联系人 +TypeContact_order_supplier_external_CUSTOMER=供应商跟进订单联系人 -Error_COMMANDE_SUPPLIER_ADDON_NotDefined=常COMMANDE_SUPPLIER_ADDON没有定义 -Error_COMMANDE_ADDON_NotDefined=常COMMANDE_ADDON没有定义 +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=常量COMMANDE_SUPPLIER_ADDON没有定义 +Error_COMMANDE_ADDON_NotDefined=常量COMMANDE_ADDON没有定义 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=无法加载模块文件'%s'的 Error_FailedToLoad_COMMANDE_ADDON_File=无法加载模块文件'%s'的 Error_OrderNotChecked=没有订单发票选择 # Sources -OrderSource0=商业建议 +OrderSource0=报价单 OrderSource1=因特网 OrderSource2=邮件活动 -OrderSource3=电话的宣传运动， +OrderSource3=电话宣传运动 OrderSource4=传真活动 -OrderSource5=商业 +OrderSource5=广告 OrderSource6=商店 QtyOrdered=订购数量 AddDeliveryCostLine=添加交货成本线，显示该命令的重量 # Documents models PDFEinsteinDescription=一个完整的命令模式（logo. ..） PDFEdisonDescription=一份简单的订购模式 -PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=完整的预开发票(标志...) # Orders modes OrderByMail=邮件 OrderByFax=传真 @@ -153,11 +153,10 @@ OrderByWWW=在线 OrderByPhone=电话 CreateInvoiceForThisCustomer=计费订单 NoOrdersToInvoice=没有订单计费 -CloseProcessedOrdersAutomatically=分类“处理”所有选定的订单。 -MenuOrdersToBill2=订单票据 +CloseProcessedOrdersAutomatically=归类所有“已处理”的订单。 OrderCreation=创建订单 -Ordered=有序 +Ordered=已下单 OrderCreated=您的订单已创建 OrderFail=您的订单创建期间发生了错误 CreateOrders=创建订单 -ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +ToBillSeveralOrderSelectCustomer=要为多个订单创建一张发票, 首先点击客户，然后选择 "%s". diff --git a/htdocs/langs/zh_CN/oscommerce.lang b/htdocs/langs/zh_CN/oscommerce.lang deleted file mode 100644 index 58838b82038..00000000000 --- a/htdocs/langs/zh_CN/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=商务部操作系统 -OSCommerceSetup=商务部模块安装操作系统 -OSCommerceSetupSaved=商务部操作系统设置保存 -OSCommerceServer=商业服务器操作系统的主机/ IP -OSCommerceDatabaseName=操作系统商业数据库的名称 -OSCommercePrefix=操作系统商务部表前缀 -OSCommerceUser=操作系统商业数据库登录 diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang index 246160b982f..87e6584b4d6 100644 --- a/htdocs/langs/zh_CN/other.lang +++ b/htdocs/langs/zh_CN/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=安全代码 Calendar=日历 -AddTrip=添加行程 Tools=工具 ToolsDesc=这个区域是专门用于杂项工具组到其他菜单项。

    这些工具可以达到从侧面菜单。 Birthday=生日 @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=所附文件数/文件 TotalSizeOfAttachedFiles=所附文件的总大小/文件 MaxSize=最大尺寸 @@ -80,6 +80,16 @@ ModifiedBy=由%改性s ValidatedBy=由%验证s CanceledBy=由%s已取消 ClosedBy=由%闭s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=档案%s被删除 DirWasRemoved=目录%s被删除 FeatureNotYetAvailableShort=在下一版本可用 @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=日历项中添加%s的 -NewCompanyToDolibarr=%s的公司加入Dolibarr -ContractValidatedInDolibarr=%s的验证合同中Dolibarr -ContractCanceledInDolibarr=%s的合同取消Dolibarr -ContractClosedInDolibarr=%s的合同在Dolibarr关闭 -PropalClosedSignedInDolibarr=建议%s的签署Dolibarr -PropalClosedRefusedInDolibarr=建议%s的拒绝在Dolibarr -PropalValidatedInDolibarr=建议在Dolibarr%s的验证 -InvoiceValidatedInDolibarr=%s的验证发票在Dolibarr -InvoicePaidInDolibarr=发票%s的改变Dolibarr支付 -InvoiceCanceledInDolibarr=%s的发票取消Dolibarr -PaymentDoneInDolibarr=%s的支付做Dolibarr -CustomerPaymentDoneInDolibarr=%s的客户付款做Dolibarr -SupplierPaymentDoneInDolibarr=%s的供应商付款做Dolibarr -MemberValidatedInDolibarr=成员%s验证在Dolibarr -MemberResiliatedInDolibarr=成员%s resiliated在Dolibarr -MemberDeletedInDolibarr=成员%s删除Dolibarr -MemberSubscriptionAddedInDolibarr=对成员%认购s加入Dolibarr -ShipmentValidatedInDolibarr=运费%s在Dolibarr验证 -ShipmentDeletedInDolibarr=从Dolibarr删除 %s 出货 +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=出口 ExportsArea=出口地区 diff --git a/htdocs/langs/zh_CN/paybox.lang b/htdocs/langs/zh_CN/paybox.lang index 119119f7b2e..be6470eb128 100644 --- a/htdocs/langs/zh_CN/paybox.lang +++ b/htdocs/langs/zh_CN/paybox.lang @@ -35,3 +35,6 @@ MessageKO=取消支付返回页面的讯息 NewPayboxPaymentReceived=新的出纳收到货款 NewPayboxPaymentFailed=新的出纳支付的尝试，但未能 PAYBOX_PAYONLINE_SENDEMAIL=电子邮件提醒后付款（成功或失败） +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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_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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/zh_CN/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang index 1665ecc8137..b3b6e2e2c1b 100644 --- a/htdocs/langs/zh_CN/sendings.lang +++ b/htdocs/langs/zh_CN/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=就目前而言，建立一个新的装运完成 RelatedShippings=相关运送 ShipmentLine=航线 CarrierList=转运列表 +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=按客户捕捉 diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang index d31e76ce60f..8c7df3be823 100644 --- a/htdocs/langs/zh_CN/stocks.lang +++ b/htdocs/langs/zh_CN/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=仓库标签要求 CorrectStock=正确的股票 ListOfWarehouses=仓库名单 ListOfStockMovements=名单的股票走势 -StocksArea=股票区 +StocksArea=Warehouses area Location=位置 LocationSummary=短名称位置 NumberOfDifferentProducts=不同的产品数 diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang index 592ca9fe45e..ba1a3ecec4d 100644 --- a/htdocs/langs/zh_CN/users.lang +++ b/htdocs/langs/zh_CN/users.lang @@ -63,7 +63,6 @@ ShowGroup=显示组 ShowUser=显示用户 NonAffectedUsers=非受影响的用户 UserModified=用户修改成功 -GroupModified=集团修改成功 PhotoFile=图片档案 UserWithDolibarrAccess=与Dolibarr用户访问 ListOfUsersInGroup=在这个名单的用户组 @@ -103,7 +102,7 @@ UserDisabled=用户%s禁用 UserEnabled=用户%s启动 UserDeleted=使用者%s删除 NewGroupCreated=集团创建%s的 -GroupModified=集团修改成功 +GroupModified=Group %s modified GroupDeleted=群组%s删除 ConfirmCreateContact=你确定要为此创造联系Dolibarr帐户？ ConfirmCreateLogin=你确定要创建该成员成为Dolibarr帐户？ @@ -114,8 +113,10 @@ YourRole=您的角色 YourQuotaOfUsersIsReached=你的活跃用户达到配额！ NbOfUsers=NB用户 DontDowngradeSuperAdmin=只有超级管理员可以降级超级管理员 -HierarchicalResponsible=责任分级 +HierarchicalResponsible=Supervisor HierarchicView=分层视图 UseTypeFieldToChange=改变用户字段类型 OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang index 46a24c5c759..fa4949d1971 100644 --- a/htdocs/langs/zh_CN/withdrawals.lang +++ b/htdocs/langs/zh_CN/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=收据 LastWithdrawalReceipts=最后%s撤出收益 WithdrawedBills=撤回发票 WithdrawalsLines=提款线 -RequestStandingOrderToTreat=要求会议常规治疗 -RequestStandingOrderTreated=站在请求处理的订单 +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=站在客户的订单 CustomerStandingOrder=客户的长期订单 NbOfInvoiceToWithdraw=可撤消请求发票数目 @@ -40,14 +41,13 @@ TransMetod=传输的方法 Send=发送 Lines=线路 StandingOrderReject=发出拒绝 -InvoiceRefused=负责对客户拒绝 WithdrawalRefused=提款Refuseds WithdrawalRefusedConfirm=你确定要输入一个社会拒绝撤出 RefusedData=日期拒收 RefusedReason=拒绝的原因 RefusedInvoicing=帐单拒绝 NoInvoiceRefused=拒绝不收 -InvoiceRefused=负责对客户拒绝 +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=地位 StatusUnknown=未知 StatusWaiting=等候 @@ -76,13 +76,14 @@ WithBankUsingRIB=有关银行账户，使用肋 WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的银行帐户 BankToReceiveWithdraw=银行帐户，以接收退出 CreditDate=信贷 -WithdrawalFileNotCapable=无法生成撤出贵国收到文件 +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/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang index 8cab9d2b651..39c2732ec29 100644 --- a/htdocs/langs/zh_TW/accountancy.lang +++ b/htdocs/langs/zh_TW/accountancy.lang @@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts Validate=Validate Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Ventilation +Ventilation=Breakdown ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Ventilation customers -SuppliersVentilation=Ventilation suppliers +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers TradeMargin=Trade margin Reports=Reports ByCustomerInvoice=By invoices customers @@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger Bookkeeping=General ledger AccountBalanceByMonth=Account balance by month -AccountingVentilation=Accounting ventilation -AccountingVentilationSupplier=Accounting ventilation supplier -AccountingVentilationCustomer=Accounting ventilation customer +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer Line=Line CAHTF=Total purchase supplier HT @@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice IntoAccount=In the accounting account Ventilate=Ventilate -VentilationAuto=Automatic ventilation +VentilationAuto=Automatic breakdown Processing=Processing EndProcessing=The end of processing @@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements AccountLength=Length of the accounting accounts shown in Dolibarr AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. @@ -140,14 +140,14 @@ Active=Statement NewFiscalYear=New fiscal year -DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account ChangeAccount=Change the accounting account for lines selected by the account: Vide=- -DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account @@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Ventilation card +FicheVentilation=Breakdown card diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 09d12f227e3..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=資訊框可用 @@ -437,14 +440,14 @@ Module52Name=庫存 Module52Desc=產品庫存的管理 Module53Name=服務 Module53Desc=服務的管理 -Module54Name=合同 -Module54Desc=合同的和服務的管理 +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=條碼 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=項目 -Module400Desc=項目的其他模組內部管理 +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) @@ -484,7 +487,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di Module510Name=Salaries Module510Desc=Management of employees salaries and payments Module600Name=通知 -Module600Desc=由一些商業活動的電子郵件發送Dolibarr通知給第三方的交往 +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=捐贈 Module700Desc=捐款的管理 Module1200Name=螂 @@ -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 @@ -514,20 +521,20 @@ Module5000Name=多公司 Module5000Desc=允許你管理多個公司 Module6000Name=Workflow Module6000Desc=Workflow management -Module20000Name=Holidays -Module20000Desc=Declare and follow employees holidays +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=銷售點 Module50100Desc=銷售點模組 -Module50200Name= 貝寶 -Module50200Desc= 模組提供信用卡與Paypal網上支付頁面 +Module50200Name=貝寶 +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 @@ -606,15 +613,16 @@ Permission151=閲讀常年訂單 Permission152=安裝常年訂單 Permission153=閲讀常年訂單收據 Permission154=信貸/拒絶站在訂單收據 -Permission161=看看合同 -Permission162=建立/修改合約 -Permission163=啟動了一個服務合同 -Permission164=禁用服務的合同 -Permission165=刪除合同 -Permission171=閲讀人次 -Permission172=建立/修改行程 -Permission173=刪除人次 -Permission178=出口旅行 +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses Permission180=讀取供應商資訊 Permission181=讀取供應商訂單 Permission182=建立/修改供應商訂單 @@ -671,7 +679,7 @@ Permission300=讀取條碼 Permission301=建立/修改條碼 Permission302=刪除條碼 Permission311=閲讀服務 -Permission312=指定的服務合約 +Permission312=Assign service/subscription to contract Permission331=閲讀書籤 Permission332=建立/修改書籤 Permission333=刪除書籤 @@ -701,8 +709,8 @@ Permission701=閲讀捐款 Permission702=建立/修改捐款 Permission703=刪除捐款 Permission1001=讀取庫存資訊 -Permission1002=建立/修改庫存資訊 -Permission1003=刪除庫存資訊 +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses Permission1004=讀取庫存的轉讓資訊 Permission1005=建立/修改庫存轉讓 Permission1101=讀取交貨訂單 @@ -778,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 @@ -887,6 +896,7 @@ PermanentLeftSearchForm=常駐左搜尋列表菜單 DefaultLanguage=預設語言使用（語言代碼） EnableMultilangInterface=啟用多語言界面 EnableShowLogo=在菜單上顯示的標誌 +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=您的系統已成功更新 CompanyInfo=公司/基本資訊 CompanyIds=公司/基本ID @@ -1038,7 +1048,6 @@ YesInSummer=Yes in summer OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=根據以下編碼原則返回會計編號:
    以 %s ModuleCompanyCodePanicum=只會回傳一個空的會計編號 ModuleCompanyCodeDigitaria=會計代碼依賴於第三方的代碼。該代碼是字元組成的“C”的第一個位置的前5第三方代碼字元之後。 UseNotifications=使用通知 -NotificationsDesc=電子郵件通知功能，您可以靜靜地發送自動郵件，對於一些Dolibarr活動時，（客戶或供應商）被配置給第三方。主動通知和作出選擇的目標聯繫在一次第三方。 +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page. ModelModules=文件範本 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=在草稿文件上產生浮水印字串(如果以下文字框不是空字串) @@ -1138,6 +1147,7 @@ AddDeliveryAddressAbility=添加交付日期的能力 UseOptionLineIfNoQuantity=一個產品線/服務的，是作為一個選項視為零的數額 FreeLegalTextOnProposal=可在下面輸入額外的建議書資訊 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal ##### Orders ##### OrdersSetup=設定訂單管理模組 OrdersNumberingModules=訂單編號模組 @@ -1146,6 +1156,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=為了驗證該命令後，建議密切，使得它可以不一步的臨時命令 FreeLegalTextOnOrders=可在下面輸入額外的訂單資訊 WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable ##### Clicktodial ##### ClickToDialSetup=點擊撥號模組設置 ClickToDialUrlDesc=連結時調用一個電話象形點擊完成。丹斯l'網址，vous pouvez utiliser萊balises
    %%1 $ s的誇血清remplacé電話桿樂德l' appelé
    %%2 $ s的誇血清remplacé電話桿樂德l' appelant（樂votre）
    %%3 $ s的誇血清remplacé桿votre登錄clicktodial（定義所涵蓋河畔votre膠片utilisateur）
    %%4 $ s的誇血清remplacé桿votre摩托羅拉德過時clicktodial（定義所涵蓋河畔votre膠片utilisateur）。 @@ -1158,7 +1169,7 @@ FicheinterNumberingModules=干預編號模組 TemplatePDFInterventions=干預卡文件模式 WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=合同模組的設置 +ContractsSetup=Contracts/Subscriptions module setup ContractsNumberingModules=合同編號模組 TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1322,7 +1333,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -TestNotPossibleWithCurrentBrowsers=Automatic detection not possible +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=產品模組設置 ServiceSetup=服務模組的設置 @@ -1382,9 +1393,10 @@ MailingSetup=設定電子郵件發送模組 MailingEMailFrom=發件人的電子郵件（從）為通過電子郵件發送電子郵件模組 MailingEMailError=回電子郵件（錯誤對），與錯誤的電子郵件 ##### Notification ##### -NotificationSetup=模組設置電子郵件通知府 +NotificationSetup=EMail notification module setup NotificationEMailFrom=發件人的電子郵件（從）為發送通知郵件 -ListOfAvailableNotifications=可用的通知名單（此名單上激活的模組依賴） +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target ##### Sendings ##### SendingsSetup=設定出貨單模組 SendingsReceiptModel=出貨單據範本 @@ -1412,8 +1424,9 @@ OSCommerceTestOk=連接到服務器'%s'於資料庫'用戶'%s'的%s'的成功。 OSCommerceTestKo1=連接到服務器'%s'的成功，但是數據庫'%s'的無法達成。 OSCommerceTestKo2=連接到服務器'%s的與用戶'%s'的失敗。 ##### Stock ##### -StockSetup=庫存模組設置 -UserWarehouse=使用用戶的個人股票 +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. ##### Menu ##### MenuDeleted=選單中刪除 TreeMenu=樹選單 @@ -1478,11 +1491,14 @@ ClickToDialDesc=這個模組允許添加後Dolibarr聯繫電話號碼的圖標 ##### Point Of Sales (CashDesk) ##### CashDesk=銷售點 CashDeskSetup=模組設置的銷售點 -CashDeskThirdPartyForSell=通用第三方使用銷售 +CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=帳戶用於接收現金付款 CashDeskBankAccountForCheque= 帳戶用於接收支票付款 CashDeskBankAccountForCB= 帳戶用於接收信用卡支付現金 -CashDeskIdWareHouse=倉庫使用銷售 +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. ##### Bookmark ##### BookmarkSetup=模組設置書籤 BookmarkDesc=這個模組允許您管理書籤。您還可以添加快捷方式到任何Dolibarr網頁或在您的左邊菜單externale網站。 @@ -1535,6 +1551,14 @@ DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? Opened=Opened Closed=Closed - +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang index 7d9a577b157..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=查看列表 @@ -41,9 +42,10 @@ AutoActions= 全自動灌裝議程 AgendaAutoActionDesc= 在此事件定義為要Dolibarr自動創建一個議程的行動。如果沒有被選中（默認情況下），只有手動操作將被列入議程。 AgendaSetupOtherDesc= 這頁允許配置議程模塊其他參數。 AgendaExtSitesDesc=此頁面允許申報日歷的外部來源，以他們的活動看到到Dolibarr議程。 -ActionsEvents= 為此Dolibarr活動將創建一個自動行動議程 -PropalValidatedInDolibarr= 建議%s的驗證 -InvoiceValidatedInDolibarr= 發票%s的驗證 +ActionsEvents=為此Dolibarr活動將創建一個自動行動議程 +PropalValidatedInDolibarr=建議%s的驗證 +InvoiceValidatedInDolibarr=發票%s的驗證 +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=發票的%s去回到草案狀態 InvoiceDeleteDolibarr=Invoice %s deleted OrderValidatedInDolibarr= 採購訂單%s已驗證 @@ -51,7 +53,6 @@ OrderApprovedInDolibarr=為了%s批準 OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=為了%s回到草案狀態 OrderCanceledInDolibarr=為了%s取消 -InterventionValidatedInDolibarr=%s的驗證幹預 ProposalSentByEMail=商業建議通過電子郵件發送%s OrderSentByEMail=客戶訂單通過電子郵件發送%s InvoiceSentByEMail=客戶發票通過電子郵件發送%s @@ -59,8 +60,6 @@ SupplierOrderSentByEMail=供應商的訂單通過電子郵件發送%s SupplierInvoiceSentByEMail=供應商的發票通過電子郵件發送%s ShippingSentByEMail=通過電子郵件發送的航運%s ShippingValidated= Shipping %s validated -InterventionSentByEMail=通過電子郵件發送的幹預%s -InterventionClassifiedBilled=Intervention %s classified as Billed NewCompanyToDolibarr= 第三方創建 DateActionPlannedStart= 計劃開始日期 DateActionPlannedEnd= 計劃結束日期 @@ -70,9 +69,9 @@ DateActionStart= 開始日期 DateActionEnd= 結束日期 AgendaUrlOptions1=您還可以添加以下參數來篩選輸出： AgendaUrlOptions2=login=%s到限制產量以行動來創造，受影響或將使用者 與所做%。 -AgendaUrlOptions3=logina=%s到限制輸出到用戶的操作創建為%。 +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. AgendaUrlOptions4=logint=%s到限制輸出到行動使用者與受影響%。 -AgendaUrlOptions5=logind=%s到限制輸出到用戶的行為進行由%。 +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=顯示生日的接觸 AgendaHideBirthdayEvents=隱藏生日的接觸 Busy=Busy @@ -89,5 +88,5 @@ ExtSiteUrlAgenda=URL來訪問。iCal文件 ExtSiteNoLabel=無說明 WorkingTimeRange=Working time range WorkingDaysRange=Working days range -AddEvent=Add event +AddEvent=Create event MyAvailability=My availability diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang index 795fea0ec9c..1674ff158ab 100644 --- a/htdocs/langs/zh_TW/bills.lang +++ b/htdocs/langs/zh_TW/bills.lang @@ -28,8 +28,8 @@ InvoiceAvoir=信用票據 InvoiceAvoirAsk=信用註意糾正發票 InvoiceAvoirDesc=信貸說明是一種消極的發票用來解決一個事實，即發票已繳納的數額相差實在比額（因為顧客付出太多的錯誤，例如將不支付或完全因為他歸還了部分產品）。 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount ReplaceInvoice=替換%s的發票 ReplacementInvoice=更換發票 ReplacedByInvoice=按發票取代%s @@ -87,7 +87,7 @@ ClassifyCanceled=分類'遺棄' ClassifyClosed=分類'關閉' ClassifyUnBilled=Classify 'Unbilled' CreateBill=建立發票 -AddBill=新增發票(invoice)或票據(credit note) +AddBill=Create invoice or credit note AddToDraftInvoices=Add to draft invoice DeleteBill=刪除發票 SearchACustomerInvoice=搜尋客戶發票 @@ -99,7 +99,7 @@ DoPaymentBack=不要付款回 ConvertToReduc=轉換到未來的折扣 EnterPaymentReceivedFromCustomer=輸入從客戶收到付款 EnterPaymentDueToCustomer=由於客戶的付款 -DisabledBecauseRemainderToPayIsZero=禁用，因為其余部分支付為零 +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero Amount=總額 PriceBase=價格基準 BillStatus=發票狀態 @@ -137,8 +137,6 @@ BillFrom=From BillTo=Bill To ActionsOnBill=行動對發票 NewBill=新建發票(invoice) -Prélèvements=長期訂單 -Prélèvements=長期訂單 LastBills=上次%s的發票 LastCustomersBills=上次%s的客戶發票 LastSuppliersBills=上次%s的供應商發票 @@ -156,9 +154,9 @@ ConfirmCancelBill=你確定要取消發票%s嗎 ？ ConfirmCancelBillQuestion=你為什麽要這樣分類發票'放棄'？ ConfirmClassifyPaidPartially=您確定要更改%s的地位發票支付？ ConfirmClassifyPaidPartiallyQuestion=這發票尚未完全支付。是什麽原因讓你關閉此發票？ -ConfirmClassifyPaidPartiallyReasonAvoir=其余部分支付（%s的%s）是一個折扣，因為獲得付款之前任期。我註意到規範使用信用卡的增值稅。 -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=其余部分支付（%s的%s）是一個折扣，因為獲得付款之前任期。我接受失去這個折扣的增值稅。 -ConfirmClassifyPaidPartiallyReasonDiscountVat=其余部分支付（%s的%s）是一個折扣，因為獲得付款之前任期。我在此折扣不恢復信貸註意到增值稅。 +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=壞顧客 ConfirmClassifyPaidPartiallyReasonProductReturned=產品部分返回 ConfirmClassifyPaidPartiallyReasonOther=其他原因而放棄額 @@ -191,9 +189,9 @@ AlreadyPaid=已支付 AlreadyPaidBack=Already paid back AlreadyPaidNoCreditNotesNoDeposits=已支付（無信用票據及存款） Abandoned=棄 -RemainderToPay=未支付 -RemainderToTake=其余部分采取 -RemainderToPayBack=Remainder to pay back +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back Rest=Pending AmountExpected=索賠額 ExcessReceived=收到過剩 @@ -219,19 +217,18 @@ NoInvoice=沒有任何發票(invoice) ClassifyBill=分類發票 SupplierBillsToPay=待付款的供應商發票 CustomerBillsUnpaid=客戶未付款的發票 -DispenseMontantLettres=由mechanographical是從字母順序豁免起草的法案 -DispenseMontantLettres=由mechanographical是從字母順序豁免起草的法案 +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=非可收回 SetConditions=設置付款條件 SetMode=設置支付方式 Billed=帳單 -RepeatableInvoice=事先定義的發票 -RepeatableInvoices=事先定義的發票清單 -Repeatable=事先定義 -Repeatables=事先定義 -ChangeIntoRepeatableInvoice=轉換成預先定義 -CreateRepeatableInvoice=建立預先定義的發票 -CreateFromRepeatableInvoice=創建從預先定義的發票 +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice CustomersInvoicesAndInvoiceLines=客戶發票和發票的路線 CustomersInvoicesAndPayments=客戶發票和付款 ExportDataset_invoice_1=客戶發票清單和發票的路線 diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang index 4642c5a954c..85497e00361 100644 --- a/htdocs/langs/zh_TW/categories.lang +++ b/htdocs/langs/zh_TW/categories.lang @@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories CatCusLinks=Links between customers/prospects and categories CatProdLinks=Links between products/services and categories CatMemberLinks=Links between members and categories -CatProdLinks=Links between products/services and categories -CatCusLinks=Links between customers/prospects and categories -CatSupLinks=Links between suppliers and categories DeleteFromCat=Remove from category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? @@ -112,3 +109,4 @@ CategoriesSetup=Categories setup CategorieRecursiv=Link with parent category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang index d083d28aaf8..90a7651497b 100644 --- a/htdocs/langs/zh_TW/compta.lang +++ b/htdocs/langs/zh_TW/compta.lang @@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=壞客戶對會計守則在% SuppliersProductsSellSalesTurnover=通過對供應商的產品銷售產生營業額。 CheckReceipt=支票存款 CheckReceiptShort=支票存款 +LastCheckReceiptShort=Last %s check receipts NewCheckReceipt=新優惠 NewCheckDeposit=新的支票存款 NewCheckDepositOn=創建於賬戶上的存款收據：%s的 @@ -196,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 9d5a60567c5..d513a4f4b35 100644 --- a/htdocs/langs/zh_TW/contracts.lang +++ b/htdocs/langs/zh_TW/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=合同區 ListOfContracts=合約名單 -LastContracts=最後%s的修改過的合同 +LastModifiedContracts=Last %s modified contracts AllContracts=所有合同 ContractCard=合同卡 ContractStatus=合同地位 @@ -27,7 +27,7 @@ MenuRunningServices=正在運行的服務 MenuExpiredServices=過期服務 MenuClosedServices=休息服務 NewContract=新合同 -AddContract=新增合同 +AddContract=Create contract SearchAContract=搜尋合同 DeleteAContract=刪除合同 CloseAContract=關閉的合同 @@ -53,7 +53,7 @@ ListOfRunningContractsLines=名單合同線運行 ListOfRunningServices=運行服務的列表 NotActivatedServices=不活躍的服務（除驗證合同） BoardNotActivatedServices=服務激活驗證合同之間 -LastContracts=最後%s的修改過的合同 +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/cron.lang b/htdocs/langs/zh_TW/cron.lang index c3e4131b2c8..04f3929fe1c 100644 --- a/htdocs/langs/zh_TW/cron.lang +++ b/htdocs/langs/zh_TW/cron.lang @@ -1,114 +1,86 @@ # Dolibarr language file - Source file is en_US - cron -# # About page -# About = 關於 -# CronAbout = About Cron -# CronAboutPage = Cron about page - -# +CronAbout = About Cron +CronAboutPage = Cron about page # Right -# -# Permission23101 = Read Scheduled task -# Permission23102 = Create/update Scheduled task -# Permission23103 = Delete Scheduled task -# Permission23104 = Execute Scheduled task - -# +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task # Admin -# -# CronSetup= Scheduled job management setup -# URLToLaunchCronJobs=URL to check and launch cron jobs if required -# OrToLaunchASpecificJob=Or to check and launch a specific job -# KeyForCronAccess=Security key for URL to launch cron jobs -# FileToLaunchCronJobs=Command line to launch cron jobs -# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes -# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes +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 jobs -# CronListInactive= List of disabled jobs -# CronListActive= List of active jobs - - -# +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs # Page list -# -# CronDateLastRun=Last run -# CronLastOutput=Last run output -# CronLastResult=Last result code -# CronListOfCronJobs=List of scheduled jobs -# CronCommand=Command -# CronList=Jobs list -# CronDelete= Delete cron jobs -# CronConfirmDelete= Are you sure you want to delete this cron job ? -# CronExecute=Launch job -# CronConfirmExecute= Are you sure to execute this job now -# CronInfo= Jobs allow to execute task that have been planned -# CronWaitingJobs=Wainting jobs -# CronTask=Job +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job CronNone= 無 CronDtStart=開始日期 CronDtEnd=結束日期 -# CronDtNextLaunch=Next execution -# CronDtLastLaunch=Last execution -# CronFrequency=Frequancy -# CronClass=Classe +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe CronMethod=方法 CronModule=模組 -# CronAction=Action +CronAction=Action CronStatus=地位 CronStatusActive=啟用 CronStatusInactive=已禁用 -# CronNoJobs=No jobs registered +CronNoJobs=No jobs registered CronPriority=優先 CronLabel=描述 -# CronNbRun=Nb. launch -# CronEach=Every -# JobFinished=Job launched and finished - -# +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished #Page card -# -# CronAdd= Add jobs -# CronHourStart= Start Hour and date of task -# CronEvery= And execute task each -# CronObject= Instance/Object to create +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create CronArgs=參數清單 -# CronSaveSucess=Save succesfully +CronSaveSucess=Save succesfully CronNote=註解 -# CronFieldMandatory=Fields %s is mandatory -# CronErrEndDateStartDt=End date cannot be before start date -# CronStatusActiveBtn=Enable +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable CronStatusInactiveBtn=禁用 -# CronTaskInactive=This job is disabled -# CronDtLastResult=Last result date -# CronId=Id -# CronClassFile=Classes (filename.class.php) -# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product -# CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php -# CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product -# CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth -# CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef -# CronCommandHelp=The system command line to execute. - -# +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. # Info -# -# CronInfoPage=Information - - -# +CronInfoPage=Information # Common -# -# CronType=Task type -# CronType_method=Call method of a Dolibarr Class -# CronType_command=Shell command -# CronMenu=Cron -# CronCannotLoadClass=Cannot load class %s or object %s - -# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/zh_TW/donations.lang b/htdocs/langs/zh_TW/donations.lang index fc7c7019e8e..5f5db905084 100644 --- a/htdocs/langs/zh_TW/donations.lang +++ b/htdocs/langs/zh_TW/donations.lang @@ -4,7 +4,7 @@ Donations=捐贈 DonationRef=Donation ref. Donor=捐贈者 Donors=捐助者 -AddDonation=添加捐贈 +AddDonation=Create a donation NewDonation=新捐贈 ShowDonation=Show donation DonationPromise=禮品的承諾 @@ -31,3 +31,8 @@ DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/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/externalsite.lang b/htdocs/langs/zh_TW/externalsite.lang index 11e8a83bad8..dbdaf2d783f 100644 --- a/htdocs/langs/zh_TW/externalsite.lang +++ b/htdocs/langs/zh_TW/externalsite.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - externalsite ExternalSiteSetup=設置鏈接到外部網站 ExternalSiteURL=外部網站網址 -# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang index a60a165a32b..2bddf36550d 100644 --- a/htdocs/langs/zh_TW/holiday.lang +++ b/htdocs/langs/zh_TW/holiday.lang @@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request? ErrorCantDeleteCP=Error you don't have the right to delete this leave request. CantCreateCP=You don't have the right to make leave requests. InvalidValidatorCP=You must choose an approbator to your leave request. -UpdateButtonCP=更新 CantUpdate=You cannot update this leave request. NoDateDebut=You must select a start date. NoDateFin=You must select an end date. -ErrorDureeCP=Your request for holidays does not contain working day. -TitleValidCP=Approve the request holidays +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request ConfirmValidCP=Are you sure you want to approve the leave request? DateValidCP=Date approved TitleToValidCP=Send leave request ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the request holidays +TitleRefuseCP=Refuse the leave request ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=You must choose a reason for refusing the request. -TitleCancelCP=Cancel the request holidays +TitleCancelCP=Cancel the leave request ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Reason for refusal DateRefusCP=Date of refusal @@ -78,7 +77,7 @@ ActionByCP=Performed by UserUpdateCP=For the user PrevSoldeCP=Previous Balance NewSoldeCP=New Balance -alreadyCPexist=A request for holidays has already been done on this period. +alreadyCPexist=A leave request has already been done on this period. UserName=名稱 Employee=Employee FirstDayOfHoliday=First day of vacation @@ -88,25 +87,25 @@ ManualUpdate=Manual update HolidaysCancelation=Leave request cancelation ## Configuration du Module ## -ConfCP=Configuration of holidays module +ConfCP=Configuration of leave request module DescOptionCP=Description of the option ValueOptionCP=價值 -GroupToValidateCP=Group with the ability to approve vacation +GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validate the configuration -LastUpdateCP=Last automatic update of vacation +LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Updated successfully. ErrorUpdateConfCP=An error occurred during the update, please try again. -AddCPforUsers=Please add the balance of holidays of users by clicking here. -DelayForSubmitCP=Deadline to apply for holidays -AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Number of users supported in the module Leaves -nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken -nbHolidayEveryMonthCP=Number of vacation days added every month +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month Module27130Name= Management of leave requests Module27130Desc= Management of leave requests -TitleOptionMainCP=Main settings of Leave request +TitleOptionMainCP=Main settings of leave request TitleOptionEventCP=Settings of leave requets for events ValidEventCP=驗證 UpdateEventCP=Update events diff --git a/htdocs/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang index a32490b2473..c26551d4a96 100644 --- a/htdocs/langs/zh_TW/interventions.lang +++ b/htdocs/langs/zh_TW/interventions.lang @@ -3,7 +3,7 @@ Intervention=介入 Interventions=幹預 InterventionCard=幹預卡 NewIntervention=新的幹預 -AddIntervention=添加幹預 +AddIntervention=Create intervention ListOfInterventions=名單幹預 EditIntervention=編輯幹預 ActionsOnFicheInter=幹預的行動 @@ -30,6 +30,15 @@ StatusInterInvoiced=帳單 RelatedInterventions=相關的幹預措施 ShowIntervention=展幹預 SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=代表隨訪幹預 TypeContact_fichinter_internal_INTERVENING=幹預 diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang index 0b6f99c6339..61cba6b14a7 100644 --- a/htdocs/langs/zh_TW/mails.lang +++ b/htdocs/langs/zh_TW/mails.lang @@ -115,7 +115,7 @@ SentBy=發送 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=但是您可以發送到網上，加入與最大的電子郵件數量值參數MAILING_LIMIT_SENDBYWEB你要發送的會議。 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: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=清除名單 ToClearAllRecipientsClickHere=點擊這裏以清除此電子郵件的收件人列表 ToAddRecipientsChooseHere=添加從名單中選擇收件人 @@ -133,6 +133,9 @@ Notifications=通知 NoNotificationsWillBeSent=沒有電子郵件通知此事件的計劃和公司 ANotificationsWillBeSent=1通知將通過電子郵件發送 SomeNotificationsWillBeSent=%s的通知將通過電子郵件發送 -AddNewNotification=啟動一個新的電子郵件通知的要求 -ListOfActiveNotifications=列出所有有效的電子郵件通知要求 +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets ListOfNotificationsDone=列出所有發送電子郵件通知 +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang index 90961f2cb9d..3b27e8f9a7e 100644 --- a/htdocs/langs/zh_TW/main.lang +++ b/htdocs/langs/zh_TW/main.lang @@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=無法找到用戶%s在Dolibarr數 ErrorNoVATRateDefinedForSellerCountry=錯誤!沒有定義 '%s' 幣別的營業稅率。 ErrorNoSocialContributionForSellerCountry=錯誤，沒有社會貢獻類型定義為國家'%s'的。 ErrorFailedToSaveFile=錯誤，無法保存文件。 -ErrorOnlyPngJpgSupported=錯誤，只。PNG和。jpg圖像文件格式支持。 -ErrorImageFormatNotSupported=你的PHP不支持函數來轉換這種格式的圖像。 SetDate=Set date SelectDate=Select a date SeeAlso=See also %s BackgroundColorByDefault=默認的背景顏色 +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded FileWasNotUploaded=一個文件被選中的附件，但還沒有上傳。點擊“附加文件”為這一點。 NbOfEntries=鈮條目 GoToWikiHelpPage=至 維基 網站看線上說明(需要連接網際網路的功能) @@ -266,6 +266,7 @@ Afternoon=Afternoon Quadri=誇德裏 MonthOfDay=本月的一天 HourShort=Ĥ +MinuteShort=mn Rate=稅率 UseLocalTax=Include tax Bytes=Bytes @@ -340,6 +341,7 @@ FullList=全部列表 Statistics=統計 OtherStatistics=其他統計 Status=狀態 +Favorite=Favorite ShortInfo=Info. Ref=編號 RefSupplier=供應商編號 @@ -365,6 +367,7 @@ ActionsOnCompany=關於這個第三方的行動 ActionsOnMember=有關此成員的活動 NActions=%s的行動 NActionsLate=%s的後期 +RequestAlreadyDone=Request already recorded Filter=篩選器 RemoveFilter=刪除篩選器 ChartGenerated=圖表生成 @@ -645,6 +648,7 @@ OptionalFieldsSetup=額外的屬性設置 URLPhoto=照片/徽標的URL SetLinkToThirdParty=鏈接到另一個第三方 CreateDraft=建立草稿 +SetToDraft=Back to draft ClickToEdit=單擊“編輯” ObjectDeleted=刪除對象%s ByCountry=按國家 @@ -678,7 +682,7 @@ ViewPrivateNote=View notes XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box - +SelectElementAndClickRefresh=Select an element and click Refresh # Week day Monday=星期一 Tuesday=星期二 diff --git a/htdocs/langs/zh_TW/margins.lang b/htdocs/langs/zh_TW/margins.lang index 9034cb7fa49..80bee50f2c3 100644 --- a/htdocs/langs/zh_TW/margins.lang +++ b/htdocs/langs/zh_TW/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=產品或服務 AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=開始日期 EndDate=結束日期 Launch=開始 - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type -AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/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/orders.lang b/htdocs/langs/zh_TW/orders.lang index 8affd74e84e..e83d01cad45 100644 --- a/htdocs/langs/zh_TW/orders.lang +++ b/htdocs/langs/zh_TW/orders.lang @@ -2,7 +2,7 @@ OrdersArea=客戶訂單面積 SuppliersOrdersArea=供應商的訂單面積 OrderCard=訂單資訊 -# OrderId=Order Id +OrderId=Order Id Order=訂單 Orders=訂單 OrderLine=在線訂單 @@ -28,7 +28,7 @@ StatusOrderCanceledShort=已取消 StatusOrderDraftShort=草案階段 StatusOrderValidatedShort=驗證階段 StatusOrderSentShort=在過程 -# StatusOrderSent=Shipment in process +StatusOrderSent=Shipment in process StatusOrderOnProcessShort=處理中 StatusOrderProcessedShort=處理完畢 StatusOrderToBillShort=等待帳單 @@ -53,9 +53,9 @@ ShippingExist=A貨存在 DraftOrWaitingApproved=草案尚未下令或批準 DraftOrWaitingShipped=草案或審定尚未運 MenuOrdersToBill=訂單To帳單 -# MenuOrdersToBill2=Orders to bill +MenuOrdersToBill2=Billable orders SearchOrder=搜尋訂單 -# SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Search a customer order ShipProduct=船舶產品 Discount=折扣 CreateOrder=創建訂單 @@ -65,14 +65,14 @@ ValidateOrder=驗證訂單 UnvalidateOrder=Unvalidate秩序 DeleteOrder=刪除訂單 CancelOrder=取消訂單 -AddOrder=新增訂單 +AddOrder=Create order AddToMyOrders=新增我的訂單 AddToOtherOrders=新增其他人的訂單 -# AddToDraftOrders=Add to draft order +AddToDraftOrders=Add to draft order ShowOrder=顯示訂單 NoOpenedOrders=沒有打開訂單 NoOtherOpenedOrders=沒有其他人已經新增的訂單 -# NoDraftOrders=No draft orders +NoDraftOrders=No draft orders OtherOrders=其他命令 LastOrders=上次%s的訂單 LastModifiedOrders=最新修改的訂單 @@ -82,7 +82,7 @@ NbOfOrders=訂單號碼 OrdersStatistics=訂單統計 OrdersStatisticsSuppliers=供應商的訂單統計 NumberOfOrdersByMonth=按月份訂單數 -# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=訂單列表 CloseOrder=關閉命令 ConfirmCloseOrder=您確定要關閉這個秩序？一旦訂單是封閉的，它只能產生帳單。 @@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=你是否確定要還原訂單%s草案狀態？ ConfirmCancelOrder=您確定要取消此訂單？ ConfirmMakeOrder=請確認您是否想要確認您於 %s 製作的訂單？ GenerateBill=生成發票 -# ClassifyShipped=Classify delivered +ClassifyShipped=Classify delivered ClassifyBilled=分類“帳單” ComptaCard=會計證 DraftOrders=草案訂單 @@ -101,7 +101,6 @@ RelatedOrders=有關命令 OnProcessOrders=處理中的訂單 RefOrder=訂單號碼 RefCustomerOrder=客戶訂單號 -CustomerOrder=客戶訂單 RefCustomerOrderShort=客戶訂單號 SendOrderByMail=為了通過郵件發送 ActionsOnOrder=採購過程中的事件記錄 @@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=常COMMANDE_SUPPLIER_ADDON沒有定義 Error_COMMANDE_ADDON_NotDefined=常COMMANDE_ADDON沒有定義 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=無法加載模塊文件'%s'的 Error_FailedToLoad_COMMANDE_ADDON_File=無法加載模塊文件'%s'的 -# Error_OrderNotChecked=No orders to invoice selected - - +Error_OrderNotChecked=No orders to invoice selected # Sources OrderSource0=商業建議 OrderSource1=因特網 @@ -144,25 +141,22 @@ OrderSource5=商業 OrderSource6=商店 QtyOrdered=訂購數量 AddDeliveryCostLine=添加交貨成本線，顯示該命令的重量 - # Documents models PDFEinsteinDescription=可產生一份完整的訂單範本（logo. ..） PDFEdisonDescription=可產生一份簡單的訂單範本 -# PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=A complete proforma invoice (logo…) # Orders modes OrderByMail=郵件 OrderByFax=傳真 OrderByEMail=電子郵件 OrderByWWW=網頁 OrderByPhone=電話 - -# CreateInvoiceForThisCustomer=Bill orders -# NoOrdersToInvoice=No orders billable -# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. -# MenuOrdersToBill2=Orders to bill -# OrderCreation=Order creation -# Ordered=Ordered -# OrderCreated=Your orders have been created -# OrderFail=An error happened during your orders creation -# CreateOrders=Create orders -# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/zh_TW/oscommerce.lang b/htdocs/langs/zh_TW/oscommerce.lang deleted file mode 100644 index 9d6d95cddc6..00000000000 --- a/htdocs/langs/zh_TW/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=商務部操作系統 -OSCommerceSetup=商務部模塊安裝操作系統 -OSCommerceSetupSaved=商務部操作系統設置保存 -OSCommerceServer=商業服務器操作系統的主機/ IP -OSCommerceDatabaseName=操作系統商業數據庫的名稱 -OSCommercePrefix=操作系統商務部表前綴 -OSCommerceUser=操作系統商業數據庫登錄 diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang index aa23ef336f5..227494058af 100644 --- a/htdocs/langs/zh_TW/other.lang +++ b/htdocs/langs/zh_TW/other.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=安全代碼 Calendar=日歷 -AddTrip=添加行程 Tools=工具 ToolsDesc=此區提供無法加入在子選單的雜項工具。

    請選擇左側選單來執行你想要的工具。 Birthday=生日 @@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup NbOfAttachedFiles=所附文件數/文件 TotalSizeOfAttachedFiles=附件大小總計 MaxSize=檔案最大 @@ -80,6 +80,16 @@ ModifiedBy=修改 by %s ValidatedBy=被%s驗證 CanceledBy=被%s取消 ClosedBy=被%s關閉 +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed FileWasRemoved=檔案%s被刪除 DirWasRemoved=目錄%s被刪除 FeatureNotYetAvailableShort=在下一版本可用 @@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your ##### Calendar common ##### AddCalendarEntry=日歷項中添加%s的 -NewCompanyToDolibarr=%s的公司加入Dolibarr -ContractValidatedInDolibarr=%s的驗證合同中Dolibarr -ContractCanceledInDolibarr=%s的合同取消Dolibarr -ContractClosedInDolibarr=%s的合同在Dolibarr關閉 -PropalClosedSignedInDolibarr=建議%s的簽署Dolibarr -PropalClosedRefusedInDolibarr=建議%s的拒絕在Dolibarr -PropalValidatedInDolibarr=建議在Dolibarr%s的驗證 -InvoiceValidatedInDolibarr=%s的驗證發票在Dolibarr -InvoicePaidInDolibarr=發票%s的改變Dolibarr支付 -InvoiceCanceledInDolibarr=%s的發票取消Dolibarr -PaymentDoneInDolibarr=%s的支付做Dolibarr -CustomerPaymentDoneInDolibarr=%s的客戶付款做Dolibarr -SupplierPaymentDoneInDolibarr=%s的供應商付款做Dolibarr -MemberValidatedInDolibarr=成員%s驗證在Dolibarr -MemberResiliatedInDolibarr=成員%s resiliated在Dolibarr -MemberDeletedInDolibarr=成員%s刪除Dolibarr -MemberSubscriptionAddedInDolibarr=對成員%s認購加入Dolibarr -ShipmentValidatedInDolibarr=運費%s在Dolibarr驗證 -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted ##### Export ##### Export=出口 ExportsArea=出口地區 diff --git a/htdocs/langs/zh_TW/paybox.lang b/htdocs/langs/zh_TW/paybox.lang index 0bcac93c633..9b0238829a0 100644 --- a/htdocs/langs/zh_TW/paybox.lang +++ b/htdocs/langs/zh_TW/paybox.lang @@ -32,6 +32,9 @@ VendorName=供應商名稱 CSSUrlForPaymentForm=付款方式的CSS樣式表的URL MessageOK=訊息驗證支付返回頁面 MessageKO=取消支付返回頁面的訊息 -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/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/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 new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/zh_TW/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang index ec32163c56e..d721893af67 100644 --- a/htdocs/langs/zh_TW/sendings.lang +++ b/htdocs/langs/zh_TW/sendings.lang @@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=就目前而言，從這個訂單而建立的出 RelatedShippings=相關出貨清單 ShipmentLine=Shipment line CarrierList=List of transporters +SendingRunning=Product from customer order already sent +SuppliersReceiptRunning=Product from supplier order already received # Sending methods SendingMethodCATCH=按客戶捕捉 diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang index 3332371f2fa..d46a709f7cb 100644 --- a/htdocs/langs/zh_TW/stocks.lang +++ b/htdocs/langs/zh_TW/stocks.lang @@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=倉庫標簽要求 CorrectStock=目前的庫存 ListOfWarehouses=倉庫名單 ListOfStockMovements=庫存轉讓清單 -StocksArea=庫存區 +StocksArea=Warehouses area Location=位置 LocationSummary=擺放位置 NumberOfDifferentProducts=Number of different products diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang index b573b41b492..9b4cf4f6f2e 100644 --- a/htdocs/langs/zh_TW/users.lang +++ b/htdocs/langs/zh_TW/users.lang @@ -63,7 +63,6 @@ ShowGroup=顯示群組 ShowUser=顯示用戶 NonAffectedUsers=非受影響的用戶 UserModified=用戶修改成功 -GroupModified=集團修改成功 PhotoFile=圖片檔案 UserWithDolibarrAccess=與Dolibarr用戶訪問 ListOfUsersInGroup=在這個名單的用戶組 @@ -103,7 +102,7 @@ UserDisabled=用戶%s禁用 UserEnabled=用戶%s啟動 UserDeleted=使用者%s刪除 NewGroupCreated=集團創建%s的 -GroupModified=集團修改成功 +GroupModified=Group %s modified GroupDeleted=群組%s刪除 ConfirmCreateContact=你確定要為此創造聯系Dolibarr帳戶？ ConfirmCreateLogin=你確定要創建該成員成為Dolibarr帳戶？ @@ -114,8 +113,10 @@ YourRole=您的角色 YourQuotaOfUsersIsReached=你的活躍用戶達到配額！ NbOfUsers=用戶數 DontDowngradeSuperAdmin=只有超級管理員可以降級超級管理員 -HierarchicalResponsible=Hierarchical responsible +HierarchicalResponsible=Supervisor HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang index 5a9b91daff4..06d3f9d694c 100644 --- a/htdocs/langs/zh_TW/withdrawals.lang +++ b/htdocs/langs/zh_TW/withdrawals.lang @@ -14,8 +14,9 @@ WithdrawalReceiptShort=收據 LastWithdrawalReceipts=最後%s撤出收益 WithdrawedBills=撤回發票 WithdrawalsLines=提款線 -RequestStandingOrderToTreat=要求會議常規治療 -RequestStandingOrderTreated=站在請求處理的訂單 +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=站在客戶的訂單 CustomerStandingOrder=客戶的長期訂單 NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request @@ -40,14 +41,13 @@ TransMetod=傳輸的方法 Send=發送 Lines=線路 StandingOrderReject=發出拒絕 -InvoiceRefused=負責對客戶拒絕 WithdrawalRefused=提款Refuseds WithdrawalRefusedConfirm=你確定要輸入一個社會拒絕撤出 RefusedData=日期拒收 RefusedReason=拒絕的原因 RefusedInvoicing=帳單拒絕 NoInvoiceRefused=拒絕不收 -InvoiceRefused=負責對客戶拒絕 +InvoiceRefused=Invoice refused (Charge the rejection to customer) Status=地位 StatusUnknown=未知 StatusWaiting=等候 @@ -76,13 +76,14 @@ WithBankUsingRIB=有關銀行賬戶，使用肋 WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的銀行帳戶 BankToReceiveWithdraw=銀行帳戶，以接收退出 CreditDate=信貸 -WithdrawalFileNotCapable=無法生成撤出貴國收到文件 +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/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); } diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index e95fac9f639..dfad1c7e7b8 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -668,7 +668,7 @@ class Livraison extends CommonObject $picto='sending'; $label=$langs->trans("ShowReceiving").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$lien.$this->ref.$lienfin; return $result; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 6698866869e..48f788c96fa 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1,14 +1,15 @@ * Copyright (C) 2003 Xavier Dutoit - * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2014 Philippe Grand * Copyright (C) 2008 Matteli * Copyright (C) 2011-2013 Juanjo Menent - * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2012 Christophe Battarel + * 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 @@ -637,7 +638,7 @@ if (! defined('NOLOGIN')) { $db->rollback(); session_destroy(); - dol_print_error($db,'Error in some triggers on action USER_LOGIN',LOG_ERR); + dol_print_error($db,'Error in some triggers on action USER_LOGIN'); exit; } else @@ -959,12 +960,12 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php'; // If not defined, eldy by default - print ''; - //print ''; - //print ''; - //print ''; - //print ''; - print "\n"; + if (empty($conf->global->MAIN_ACTIVATE_HTML5)) { + $doctype = ''; + }else { + $doctype = ''; // Html5 - Developement - Only available on Eldy template + } + print $doctype."\n"; if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print ''."\n"; else print ''."\n"; //print ''."\n"; @@ -975,6 +976,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs // Displays meta print ''."\n"; // Evite indexation par robots print ''."\n"; + if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) print ''."\n"; // Needed for Responsive Web Design $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1); if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL; print ''."\n"; @@ -986,12 +988,14 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs $appli='Dolibarr'; if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE; + if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print ''.dol_htmlentities($title).''; if ($title) print ''.dol_htmlentities($appli.' - '.$title).''; else print "".dol_htmlentities($appli).""; print "\n"; $ext=''; if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION); + if (GETPOST('version')) $ext='version='.GETPOST('version','int'); // usefull to force no cache on css/js if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax) { @@ -1015,13 +1019,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs //print ''."\n"; print ''."\n"; } - if ((! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && $conf->global->MAIN_USE_JQUERY_MULTISELECT == 'multiselect') || (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT') == 'multiselect')) // jQuery multiselect + if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) // jQuery plugin "mutiselect", "multiple-select", "select2"... { - print ''."\n"; - } - if ((! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && $conf->global->MAIN_USE_JQUERY_MULTISELECT == 'multiple-select') || (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT') == 'multiple-select')) // jQuery multiple-select - { - print ''."\n"; + $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT; + print ''."\n"; } // jQuery Timepicker if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) @@ -1130,14 +1131,12 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs { if (constant('JS_JQUERY_FLOT')) { - print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; } else { - print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; @@ -1188,6 +1187,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; } + if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) // jQuery plugin "mutiselect", "multiple-select", "select2"... + { + $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)) { @@ -1300,7 +1304,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='') { global $user, $conf, $langs, $db; - global $dolibarr_main_authentication; + global $dolibarr_main_authentication, $dolibarr_main_demo; global $hookmanager,$menumanager; // Instantiate hooks of thirdparty module @@ -1410,10 +1414,10 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a $logintext.='>'.$user->login.''; if ($user->societe_id) $logintext.=$companylink; $logintext.=''; - $loginhtmltext.=''.$langs->trans("User").''; $loginhtmltext.='
    '.$langs->trans("Name").': '.$user->getFullName($langs); $loginhtmltext.='
    '.$langs->trans("Login").': '.$user->login; + $loginhtmltext.='
    '.$langs->trans("EMail").': '.$user->email; $loginhtmltext.='
    '.$langs->trans("Administrator").': '.yn($user->admin); $type=($user->societe_id?$langs->trans("External").$company:$langs->trans("Internal")); $loginhtmltext.='
    '.$langs->trans("Type").': '.$type; @@ -1421,9 +1425,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a $loginhtmltext.='
    '; $loginhtmltext.='
    '.$langs->trans("Connection").''; if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $loginhtmltext.='
    '.$langs->trans("ConnectedOnMultiCompany").': '.$conf->entity.' (user entity '.$user->entity.')'; + $loginhtmltext.='
    '.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)'); $loginhtmltext.='
    '.$langs->trans("ConnectedSince").': '.dol_print_date($user->datelastlogin,"dayhour"); $loginhtmltext.='
    '.$langs->trans("PreviousConnexion").': '.dol_print_date($user->datepreviouslogin,"dayhour"); - $loginhtmltext.='
    '.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"]; $loginhtmltext.='
    '.$langs->trans("CurrentTheme").': '.$conf->theme; $loginhtmltext.='
    '.$langs->trans("CurrentMenuManager").': '.$menumanager->name; $s=picto_from_langcode($langs->getDefaultLang()); @@ -1534,8 +1538,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me // Instantiate hooks of thirdparty module $hookmanager->initHooks(array('searchform','leftblock')); - if (empty($conf->dol_use_jmobile) && ! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'
    '."\n"; - else print '
    '; + if (empty($conf->dol_use_jmobile) && ! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".''."\n".'
    '."\n"; + else print "\n".''."\n".'
    '."\n"; print "\n"; @@ -1543,33 +1547,33 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire) { $langs->load("companies"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname', 'T'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname', 'T', 'searchleftt'); } if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire) { $langs->load("companies"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', img_object('','contact').' '.$langs->trans("Contacts"), 'contact', 'contactname'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', img_object('','contact').' '.$langs->trans("Contacts"), 'contact', 'contactname', '', 'searchleftc'); } if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE)) { $langs->load("products"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp'); } if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER)) { $langs->load("products"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', img_object('','product').' '.$langs->trans("SupplierRef"), 'products', 'srefsupplier'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', img_object('','product').' '.$langs->trans("SupplierRef"), 'products', 'srefsupplier', '', 'searchlefts'); } if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire) { $langs->load("members"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'M'); + $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm'); } // Execute hook printSearchForm @@ -1628,9 +1632,12 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me print "\n"; } - //Dolibarr version - $doliurl='http://www.dolibarr.org'; + print "\n"; + print "\n"; + print '
    '."\n"; + //Dolibarr version + $doliurl='http://www.dolibarr.org'; //local communities if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr'; if (preg_match('/es/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.es'; @@ -1649,11 +1656,11 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me else $appli.=" ".DOL_VERSION; } else $appli.=" ".DOL_VERSION; - print '
    '; + print '
    '; if ($doliurl) print ''; print $appli; if ($doliurl) print ''; - print '
    '; + print '
    '."\n"; // Link to Dolibarr wiki pages if ($helppagename && empty($conf->global->MAIN_HELP_DISABLELINK)) @@ -1673,7 +1680,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me // Link to help pages if ($helpbaseurl && $helppage) { - print '\n"; + print "\n"; + print "\n"; - print "\n"; + print "
    \n"; + print "\n"; + print "\n"; // Execute hook printLeftBlock $parameters=array(); @@ -1801,21 +1810,26 @@ function getHelpParamFor($helppagename,$langs) * @param string $htmlmodesearch Value to set into parameter "mode_search" ('soc','contact','products','member',...) * @param string $htmlinputname Field Name input form * @param string $accesskey Accesskey + * @param string $idname Complement for id to avoid multiple same id in the page * @return string */ -function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinputname,$accesskey='') +function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinputname,$accesskey='', $idname='') { global $conf,$langs; + if (!$htmlinputid) { + $htmlinputid = $htmlinputname; + } + $ret=''; $ret.='
    '; - $ret.=''; + $ret.='
    '; $ret.=''; $ret.=''; $ret.=''; @@ -1823,7 +1837,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinput $ret.=($accesskey?' accesskey="'.$accesskey.'"':''); if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.$langs->trans("SearchOf").''.strip_tags($title).'"'; else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"'; - $ret.=' name="'.$htmlinputname.'" id="'.$htmlinputname.'" size="10" />'; + $ret.=' name="'.$htmlinputname.'" id="'.$idname.$htmlinputname.'" size="10" />'; $ret.=''; $ret.="\n"; return $ret; diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 3dd0fcd0b49..8a0aefba711 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 @@ -109,8 +109,8 @@ $sql = "SELECT"; if ($agentid > 0) $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,"; $sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,"; $sql.= " sum(d.total_ht) as selling_price,"; -$sql.= " sum(".$db->ifsql('d.total_ht <=0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; -$sql.= " sum(".$db->ifsql('d.total_ht <=0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge" ; +$sql.= " sum(".$db->ifsql('d.total_ht < 0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; +$sql.= " sum(".$db->ifsql('d.total_ht < 0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge" ; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact e ON e.element_id = f.rowid and e.statut = 4 and e.fk_c_type_contact = ".(empty($conf->global->AGENT_CONTACT_TYPE)?-1:$conf->global->AGENT_CONTACT_TYPE); @@ -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 fbc947a7cc9..3cd39d4101f 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -164,8 +164,8 @@ $sql = "SELECT"; $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,"; if ($client) $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,"; $sql.= " sum(d.total_ht) as selling_price,"; -$sql.= " sum(".$db->ifsql('d.total_ht <=0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; -$sql.= " sum(".$db->ifsql('d.total_ht <=0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge"; +$sql.= " sum(".$db->ifsql('d.total_ht < 0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; +$sql.= " sum(".$db->ifsql('d.total_ht < 0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."facturedet as d"; @@ -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)) diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index a8830f777ec..b359287d24f 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -166,8 +166,8 @@ $sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref,"; if ($id > 0) $sql.= " d.fk_product,"; if ($id > 0) $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,"; $sql.= " sum(d.total_ht) as selling_price,"; -$sql.= " sum(".$db->ifsql('d.total_ht <=0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; -$sql.= " sum(".$db->ifsql('d.total_ht <=0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge"; +$sql.= " sum(".$db->ifsql('d.total_ht < 0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; +$sql.= " sum(".$db->ifsql('d.total_ht < 0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."product as p"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; 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 ''; @@ -208,17 +203,17 @@ if ($id > 0 || ! empty($ref)) print "\n"; print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).''; print "".$objp->code_client."\n"; - print ""; - print dol_print_date($db->jdate($objp->datef),'day').""; - print "".price($objp->selling_price, null, null, null, null, $rounding)."\n"; - print "".price($objp->buying_price, null, null, null, null, $rounding)."\n"; - print "".price($objp->qty, null, null, null, null, $rounding)."\n"; - print "".price($objp->marge, null, null, null, null, $rounding)."\n"; - if (! empty($conf->global->DISPLAY_MARGIN_RATES)) - print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."\n"; - if (! empty($conf->global->DISPLAY_MARK_RATES)) - print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."\n"; - print ''.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).''; + print ""; + print dol_print_date($db->jdate($objp->datef),'day').""; + print "".price($objp->selling_price, null, null, null, null, $rounding)."\n"; + print "".price($objp->buying_price, null, null, null, null, $rounding)."\n"; + print "".price($objp->qty, null, null, null, null, $rounding)."\n"; + print "".price($objp->marge, null, null, null, null, $rounding)."\n"; + if (! empty($conf->global->DISPLAY_MARGIN_RATES)) + print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."\n"; + if (! empty($conf->global->DISPLAY_MARK_RATES)) + print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."\n"; + print ''.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).''; 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 cc7a5fb1c75..457d55e81f0 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -128,10 +128,10 @@ if ($socid > 0) $sql = "SELECT distinct s.nom, 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.= " sum(d.total_ht) as selling_price,"; - $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.= " f.datef, f.paye, f.fk_statut as statut, f.type,"; + $sql.= " sum(d.total_ht) as selling_price,"; // may be negative or positive + $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"; @@ -140,10 +140,10 @@ if ($socid > 0) $sql.= " AND s.entity = ".$conf->entity; $sql.= " AND d.fk_facture = f.rowid"; $sql.= " AND f.fk_soc = $socid"; - $sql .= " AND d.buy_price_ht IS NOT NULL"; + $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.= " ORDER BY ".$sortfield." ".$sortorder; + $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.= $db->order($sortfield,$sortorder); // TODO: calculate total to display then restore pagination //$sql.= $db->plimit($conf->liste_limit +1, $offset); @@ -153,7 +153,7 @@ if ($socid > 0) { $num = $db->num_rows($result); - print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&socid=$societe->id",$sortfield,$sortorder,'',0,0,''); + print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&socid=".$societe->id,$sortfield,$sortorder,'',0,0,''); $i = 0; print ""; @@ -183,16 +183,8 @@ if ($socid > 0) { $objp = $db->fetch_object($result); - 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):'' ; $var=!$var; @@ -205,7 +197,7 @@ if ($socid > 0) print ""; print "\n"; - print "\n"; + print "\n"; print "\n"; if (! empty($conf->global->DISPLAY_MARGIN_RATES)) print "\n"; @@ -263,8 +255,8 @@ $db->close(); ?> diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index 884d5124126..5d32db24d5c 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -313,7 +313,7 @@ print $urllink; print '
    "; 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->type == 2 ? -1 : 1) * $objp->buying_price, null, null, null, null, $rounding)."".price($objp->marge, null, null, null, null, $rounding)."".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."
    '; -if ($action == 'edit') print '

    '; +if ($action == 'edit') print '
    '; print ''."\n"; @@ -373,7 +373,7 @@ print '
    '; if ($object->allow_comments) { print $langs->trans("AddACommentForPoll") . '
    '; print '
    '."\n"; - print $langs->trans("Name") .':
    '."\n"; + print $langs->trans("Name") .':
    '."\n"; print '
    '."\n"; if (isset($erreur_commentaire_vide) && $erreur_commentaire_vide=="yes") { print "" . $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")) . ""; diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php index bcc1146c714..b4c8570dec8 100644 --- a/htdocs/opensurvey/class/opensurveysondage.class.php +++ b/htdocs/opensurvey/class/opensurveysondage.class.php @@ -254,7 +254,7 @@ class Opensurveysondage extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -392,6 +392,7 @@ class Opensurveysondage extends CommonObject function fetch_lines() { $ret=array(); + $sql = "SELECT id_users, nom as name, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql.= " WHERE id_sondage = '".$this->db->escape($this->id_sondage)."'"; $resql=$this->db->query($sql); @@ -441,7 +442,9 @@ class Opensurveysondage extends CommonObject * * @return Object[] */ - public function getComments() { + public function getComments() + { + $comments = array(); $sql = 'SELECT id_comment, usercomment, comment'; $sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_comments'; @@ -449,13 +452,16 @@ class Opensurveysondage extends CommonObject $sql.= " ORDER BY id_comment"; $resql = $this->db->query($sql); - $num_rows=$this->db->num_rows($resql); + if ($resql) + { + $num_rows=$this->db->num_rows($resql); - $comments = array(); - - if ($num_rows > 0) { - while ($obj = $this->db->fetch_object($resql)) { - $comments[] = $obj; + if ($num_rows > 0) + { + while ($obj = $this->db->fetch_object($resql)) + { + $comments[] = $obj; + } } } @@ -469,8 +475,8 @@ class Opensurveysondage extends CommonObject * @param string $comment_user Comment author * @return boolean False in case of the query fails, true if it was successful */ - public function addComment($comment, $comment_user) { - + public function addComment($comment, $comment_user) + { $sql = "INSERT INTO ".MAIN_DB_PREFIX."opensurvey_comments (id_sondage, comment, usercomment)"; $sql.= " VALUES ('".$this->db->escape($this->id_sondage)."','".$this->db->escape($comment)."','".$this->db->escape($comment_user)."')"; $resql = $this->db->query($sql); @@ -488,8 +494,9 @@ class Opensurveysondage extends CommonObject * @param int $id_comment Id of the comment * @return boolean False in case of the query fails, true if it was successful */ - public function deleteComment($id_comment) { - $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'opensurvey_comments WHERE id_comment = '.$id_comment.' AND id_sondage = '.$this->id_sondage; + public function deleteComment($id_comment) + { + $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'opensurvey_comments WHERE id_comment = '.$id_comment.' AND id_sondage = "'.$this->db->escape($this->id_sondage).'"'; $resql = $this->db->query($sql); if (!$resql) { @@ -504,8 +511,8 @@ class Opensurveysondage extends CommonObject * * @return void */ - private function cleanParameters() { - + private function cleanParameters() + { $this->id_sondage = trim($this->id_sondage); $this->commentaires = trim($this->commentaires); $this->mail_admin = trim($this->mail_admin); diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 83482bbe04f..d21a08007a4 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -123,7 +123,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) $result = $db->query($sql); $nbtotalofrecords = $db->num_rows($result); } -$sql.= " WHERE p.entity = ".getEntity('survey'); +$sql.= " WHERE p.entity = ".getEntity('survey',1); if ($status == 'expired') $sql.=" AND date_fin < '".$db->idate($now)."'"; if ($status == 'opened') $sql.=" AND date_fin >= '".$db->idate($now)."'"; if ($surveytitle) $sql.=" AND titre LIKE '%".$db->escape($surveytitle)."%'"; diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php index e835c274e7d..0d52b360ddb 100644 --- a/htdocs/opensurvey/wizard/choix_date.php +++ b/htdocs/opensurvey/wizard/choix_date.php @@ -338,7 +338,7 @@ print $langs->trans("OpenSurveyStep2")."\n"; print '
    '."\n"; //debut du tableau qui affiche le calendrier -print '
    '."\n"; +print '
    '."\n"; print ''."\n"; print ''; print ''."\n"; print '
    '.$motmois.' '.$_SESSION["annee"].'
    '; @@ -490,9 +490,9 @@ for ($i = 0; $i < $nbrejourmois + $premierjourmois; $i++) { //fin du tableau print '
    '."\n"; -print '
    '."\n"; +print '
    '."\n"; -print '
    '."\n"; +print '
    '."\n"; // affichage de tous les jours choisis if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur) @@ -507,7 +507,7 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur) for ($i = 0; $i < $_SESSION["nbrecaseshoraires"]; $i++) { $j = $i+1; - print ''. $langs->trans("Time") .' '.$j.'
    '."\n"; + print '
    '. $langs->trans("Time") .' '.$j.'
    '."\n"; } if ($_SESSION["nbrecaseshoraires"] < 10) { @@ -555,7 +555,7 @@ print ''."\n"; print ''."\n"; //bandeau de pied print '



    '."\n"; -print '
    '."\n"; +print ''."\n"; llxFooter(); diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php index db2948a1cd3..3c10c256742 100644 --- a/htdocs/opensurvey/wizard/index.php +++ b/htdocs/opensurvey/wizard/index.php @@ -43,15 +43,15 @@ llxHeader('', $langs->trans("OpenSurvey"), '', "", 0, 0, $arrayofjs, $arrayofcss print_fiche_titre($langs->trans("CreatePoll")); -print '
    -
    '; -print '

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

    -
    -
    -
    -
    -
    -
    '; +print '
    '; +print '
    '; +print '

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

    '; +print '
    '; +print '
    '; +print '
    '; +print '
    '; +print '
    '; +print '
    '; llxFooter(); diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index 30e02591190..19ce68c750c 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -195,7 +195,7 @@ print ''; -print '
    '; +print '
    '; print '

    '; diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 78c500c7551..a55687db823 100644 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -131,7 +131,7 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG) $IBS_MODE=1; // Mode formulaire $IBS_PORTEUR=$EMAIL; $IBS_RETOUR="montant:M;ref:R;auto:A;trans:T"; // Format des parametres du get de validation en reponse (url a definir sous paybox) - //$IBS_TXT="
    ".$langsiso->trans("YouWillBeRedirectedOnPayBox")."
    ".$langsiso->trans("PleaseBePatient")."...
    "; + //$IBS_TXT="
    ".$langsiso->trans("YouWillBeRedirectedOnPayBox")."
    ".$langsiso->trans("PleaseBePatient")."...
    "; $IBS_TXT=' '; // Use a space $IBS_BOUTPI=$langs->trans("Wait"); //$IBS_BOUTPI=''; @@ -280,10 +280,10 @@ function html_print_paybox_footer($fromcompany,$langs) } print '

    '."\n"; - print '
    '."\n"; + print '
    '."\n"; print $fromcompany->name.'
    '; print $line1.'
    '; print $line2; - print '
    '."\n"; + print ''."\n"; } diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index 69b0664eb9d..eec35e38430 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(); @@ -232,7 +232,7 @@ print ''; print ''; -print '
    '; +print '
    '; print ''; diff --git a/htdocs/paypal/img/object_paypal.png b/htdocs/paypal/img/object_paypal.png index 4ff3c80565d..74ac4392ded 100644 Binary files a/htdocs/paypal/img/object_paypal.png and b/htdocs/paypal/img/object_paypal.png differ diff --git a/htdocs/paypal/img/paypal.png b/htdocs/paypal/img/paypal.png deleted file mode 100644 index 2caabff50b7..00000000000 Binary files a/htdocs/paypal/img/paypal.png and /dev/null differ diff --git a/htdocs/paypal/img/paypal_logo.png b/htdocs/paypal/img/paypal_logo.png deleted file mode 100644 index 2a4fd7c9ad5..00000000000 Binary files a/htdocs/paypal/img/paypal_logo.png and /dev/null differ diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index c1440d80245..2e8ab4bf0b8 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -153,11 +153,11 @@ function html_print_paypal_footer($fromcompany,$langs) } print '

    '."\n"; - print '
    '."\n"; + print '
    '."\n"; print $fromcompany->name.'
    '; print $line1.'
    '; print $line2; - print '
    '."\n"; + print ''."\n"; } /** @@ -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); diff --git a/htdocs/printipp/admin/printipp.php b/htdocs/printipp/admin/printipp.php index 6aaf44f8bdd..28ad55453eb 100644 --- a/htdocs/printipp/admin/printipp.php +++ b/htdocs/printipp/admin/printipp.php @@ -35,6 +35,7 @@ if (! $user->admin) accessforbidden(); $action = GETPOST('action','alpha'); $mode = GETPOST('mode','alpha'); +$value = GETPOST('value','alpha'); if (!$mode) $mode='config'; @@ -68,6 +69,17 @@ if ($action == 'setvalue' && $user->admin) } } +// Set default model +else if ($action == 'setprinteruri') +{ + if (dolibarr_set_const($db, "PRINTIPP_URI_DEFAULT",$value,'chaine',0,'',$conf->entity)) + { + // La constante qui a ete lue en avant du nouveau set + // on passe donc par une variable pour avoir un affichage coherent + $conf->global->PRINTIPP_URI_DEFAULT = $value; + } +} + /* * View @@ -82,11 +94,6 @@ print_fiche_titre($langs->trans("PrintIPPSetup"),$linkback,'setup'); $head=printippadmin_prepare_head(); -dol_fiche_head($head, $mode, $langs->trans("ModuleSetup")); - -print $langs->trans("PrintIPPDesc")."
    \n"; - -print '
    '; if ($mode == 'config' && $user->admin) { @@ -94,8 +101,11 @@ if ($mode == 'config' && $user->admin) print ''; print ''; + dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic'); - print ''; + print $langs->trans("PrintIPPDesc")."

    \n"; + + print '
    '; $var=true; print ''; @@ -103,8 +113,9 @@ if ($mode == 'config' && $user->admin) print ''; print "\n"; + /* $var=!$var; - print ''; - + */ + $var=!$var; print ''; $var=!$var; - print ''; $var=!$var; - print ''; @@ -156,16 +168,22 @@ if ($mode == 'config' && $user->admin) //print ''; //print "\n"; - print ''; - print '
    '.$langs->trans("Value").'
    '; + print '
    '; print $langs->trans("PRINTIPP_ENABLED").''; if (! empty($conf->use_javascript_ajax)) @@ -123,7 +134,8 @@ if ($mode == 'config' && $user->admin) } } print '
    '; print $langs->trans("PRINTIPP_HOST").''; @@ -139,13 +151,13 @@ if ($mode == 'config' && $user->admin) print '
    '; + print '
    '; print $langs->trans("PRINTIPP_USER").''; print ''; print '
    '; + print '
    '; print $langs->trans("PRINTIPP_PASSWORD").''; print ''; print '
    '.$langs->trans("Value").'

    '; + dol_fiche_end(); + + print '
    '; + print ''; } if ($mode == 'test' && $user->admin) { - print ''; + dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic'); + + print $langs->trans("PrintIPPDesc")."

    \n"; + + print '
    '; $printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD); $var=true; print '
    '; @@ -180,6 +198,7 @@ if ($mode == 'test' && $user->admin) //print ''; print ''; print ''; + print ''; print "\n"; $list = $printer->getlist_available_printers(); @@ -200,14 +219,26 @@ if ($mode == 'test' && $user->admin) //print ''; print ''; print ''; + // Defaut + print "'; print "\n"; } print '
    DeviceMediaSupported'.$langs->trans("Select").'
    '.$printer_det->device_uri->_value0.''.$printer_det->media_default->_value0.''.$printer_det->media_type_supported->_value1.'"; + if ($conf->global->PRINTIPP_URI_DEFAULT == "$value") + { + print img_picto($langs->trans("Default"),'on'); + } + else + { + print ''.img_picto($langs->trans("Disabled"),'off').''; + } + print '
    '; if (count($list) == 0) print $langs->trans("NoPrinterFound"); + + dol_fiche_end(); } -dol_fiche_end(); llxFooter(); diff --git a/htdocs/printipp/lib/printipp.lib.php b/htdocs/printipp/lib/printipp.lib.php index c87080032f5..64c14609df5 100644 --- a/htdocs/printipp/lib/printipp.lib.php +++ b/htdocs/printipp/lib/printipp.lib.php @@ -36,12 +36,12 @@ function printippadmin_prepare_head() $head = array(); $head[$h][0] = DOL_URL_ROOT."/printipp/admin/printipp.php?mode=config"; - $head[$h][1] = $langs->trans("Config"); + $head[$h][1] = $langs->trans("CupsServer"); $head[$h][2] = 'config'; $h++; $head[$h][0] = DOL_URL_ROOT."/printipp/admin/printipp.php?mode=test"; - $head[$h][1] = $langs->trans("Test"); + $head[$h][1] = $langs->trans("Printer"); $head[$h][2] = 'test'; $h++; 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/admin/product_tools.php b/htdocs/product/admin/product_tools.php index a4aae519b98..84dacf8db43 100644 --- a/htdocs/product/admin/product_tools.php +++ b/htdocs/product/admin/product_tools.php @@ -298,10 +298,9 @@ else */ print ''; - print ''; // Boutons actions - print '
    '; + print '
    '; print ''; print '
    '; 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/card.php b/htdocs/product/card.php index 237fa97c0f0..50ed04a29df 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -74,7 +74,7 @@ if ($id > 0 || ! empty($ref)) // Get object canvas (By default, this is not defined, so standard usage of dolibarr) $canvas = !empty($object->canvas)?$object->canvas:GETPOST("canvas"); -$objcanvas=''; +$objcanvas=null; if (! empty($canvas)) { require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; @@ -124,7 +124,7 @@ if (empty($reshook)) // Barcode value if ($action == 'setbarcode' && $createbarcode) { - $result=$object->check_barcode(GETPOST('barcode'),GETPOT('barcode_type_code')); + $result=$object->check_barcode(GETPOST('barcode'),GETPOST('barcode_type_code')); if ($result >= 0) { @@ -839,7 +839,7 @@ else print ''; $tmpcode=''; if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type); - print ''.$langs->trans("Ref").''; + print ''.$langs->trans("Ref").''; if ($_error) { print $langs->trans("RefAlreadyExists"); @@ -864,7 +864,7 @@ else // Batch number management if (! empty($conf->productbatch->enabled)) { - print ''.$langs->trans("Status").' ('.$langs->trans("Batch").')'; + print ''.$langs->trans("ManageLotSerial").''; $statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch")); print $form->selectarray('status_batch',$statutarray,GETPOST('status_batch')); print ''; @@ -1053,7 +1053,7 @@ else print '
    '; //} - print '
    '; + print '
    '; print ''; } @@ -1083,7 +1083,7 @@ else print ''; // Ref - print ''; + print ''; // Label print ''; @@ -1122,7 +1122,7 @@ else // Batch number managment if ($conf->productbatch->enabled) { - print ''; @@ -1289,8 +1289,11 @@ else print '
    '; //} - print '
        '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } @@ -1419,7 +1422,7 @@ else // Status (to sell) print ''; } @@ -1544,7 +1547,9 @@ else } // Note - print ''; + print ' '."\n"; + print ''."\n"; + print ' '."\n"; print "
    '.$langs->trans("Ref").'
    '.$langs->trans("Ref").'
    '.$langs->trans("Label").'
    '.$langs->trans("Status").' ('.$langs->trans("Lot").')'; + print '
    '.$langs->trans("ManageLotSerial").''; $statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch")); print $form->selectarray('status_batch',$statutarray,$object->status_batch); print '
    '.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { print ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); } else { print $object->getLibStatut(2,0); @@ -1428,7 +1431,7 @@ else // Status (to buy) print '
    '.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { print ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); } else { print $object->getLibStatut(2,1); @@ -1437,11 +1440,11 @@ else // Batch number management (to batch) if ($conf->productbatch->enabled) { - print '
    '.$langs->trans("Status").' ('.$langs->trans("Lot").')'; - if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { + print '
    '.$langs->trans("ManageLotSerial").''; + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch'); } else { - print $object->getLibStatut(2,2); + print $object->getLibStatut(0,2); } print '
    '.$langs->trans("Note").''.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'
    '.$langs->trans("Note").''.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'
    \n"; diff --git a/htdocs/product/class/priceexpression.class.php b/htdocs/product/class/priceexpression.class.php new file mode 100755 index 00000000000..45fd9f9fa30 --- /dev/null +++ b/htdocs/product/class/priceexpression.class.php @@ -0,0 +1,349 @@ + + * Copyright (C) 2014 Juanjo Menent +/* Copyright (C) 2014 Ion Agorria + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/product/class/priceexpression.class.php + * \ingroup product + * \brief Class for accesing price expression table + */ + + +/** + * Class for accesing price expression table + */ +class PriceExpression +{ + var $db; //!< To store db handler + var $error; //!< To return error code (or message) + var $errors=array(); //!< To return several error codes (or messages) + var $id; + var $title; + var $expression; + + /** + * Constructor + * + * @param DoliDb $db Database handler + */ + function __construct($db) + { + $this->db = $db; + return 1; + } + + + /** + * Create object into database + * + * @param User $user User that creates + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int <0 if KO, Id of created object if OK + */ + function create($user, $notrigger=0) + { + $error=0; + + // Clean parameters + if (isset($this->title)) $this->title=trim($this->title); + if (isset($this->expression)) $this->expression=trim($this->expression); + + // Insert request + $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_price_expression ("; + $sql.= "title, expression"; + $sql.= ") VALUES ("; + $sql.= " ".(isset($this->title)?"'".$this->db->escape($this->title)."'":"''").","; + $sql.= " ".(isset($this->expression)?"'".$this->db->escape($this->expression)."'":"''"); + $sql.= ")"; + + $this->db->begin(); + + dol_syslog(get_class($this)."::create", LOG_DEBUG); + $resql=$this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + + if (! $error) + { + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element); + + if (! $notrigger) + { + // Uncomment this and change MYOBJECT to your own tag if you + // want this action calls a trigger. + + //// Call triggers + //$result=$this->call_trigger('MYOBJECT_CREATE',$user); + //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} + //// End call triggers + } + } + + // Commit or rollback + if ($error) + { + foreach($this->errors as $errmsg) + { + dol_syslog(__METHOD__." ".$errmsg, LOG_ERR); + $this->error.=($this->error?', '.$errmsg:$errmsg); + } + $this->db->rollback(); + return -1*$error; + } + else + { + $this->db->commit(); + return $this->id; + } + } + + + /** + * Load object in memory from the database + * + * @param int $id Id object + * @return int < 0 if KO, 0 if OK but not found, > 0 if OK + */ + function fetch($id) + { + $sql = "SELECT title, expression"; + $sql.= " FROM ".MAIN_DB_PREFIX."c_price_expression"; + $sql.= " WHERE rowid = ".$id; + + dol_syslog(get_class($this)."::fetch"); + $resql=$this->db->query($sql); + if ($resql) + { + $obj = $this->db->fetch_object($resql); + if ($obj) + { + $this->id = $id; + $this->title = $obj->title; + $this->expression = $obj->expression; + return 1; + } + else + { + return 0; + } + } + else + { + $this->error="Error ".$this->db->lasterror(); + return -1; + } + } + + /** + * List all price expressions + * + * @return array Array of price expressions + */ + function list_price_expression() + { + $sql = "SELECT rowid, title, expression"; + $sql.= " FROM ".MAIN_DB_PREFIX."c_price_expression"; + $sql.= " ORDER BY title"; + + dol_syslog(get_class($this)."::list_price_expression"); + $resql=$this->db->query($sql); + if ($resql) + { + $retarray = array(); + + while ($record = $this->db->fetch_array($resql)) + { + $price_expression_obj = new PriceExpression($this->db); + $price_expression_obj->id = $record["rowid"]; + $price_expression_obj->title = $record["title"]; + $price_expression_obj->expression = $record["expression"]; + $retarray[]=$price_expression_obj; + } + + $this->db->free($resql); + return $retarray; + } + else + { + $this->error=$this->db->error(); + return -1; + } + } + + + /** + * Returns any existing rowid with specified title + * + * @param String $title Title of expression + * @return int < 0 if KO, 0 if OK but not found, > 0 rowid + */ + function find_title($title) + { + $sql = "SELECT rowid"; + $sql.= " FROM ".MAIN_DB_PREFIX."c_price_expression"; + $sql.= " WHERE title = '".$this->db->escape($title)."'"; + + dol_syslog(get_class($this)."::find_title"); + $resql=$this->db->query($sql); + if ($resql) + { + $obj = $this->db->fetch_object($resql); + if ($obj) + { + return (int) $obj->rowid; + } + else + { + return 0; + } + } + else + { + $this->error="Error ".$this->db->lasterror(); + return -1; + } + } + + + /** + * Update object into database + * + * @param User $user User that modifies + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int <0 if KO, >0 if OK + */ + function update($user=0, $notrigger=0) + { + $error=0; + + // Clean parameters + if (isset($this->title)) $this->title=trim($this->title); + if (isset($this->expression)) $this->expression=trim($this->expression); + + // Update request + $sql = "UPDATE ".MAIN_DB_PREFIX."c_price_expression SET"; + $sql.= " title = ".(isset($this->title)?"'".$this->db->escape($this->title)."'":"''").","; + $sql.= " expression = ".(isset($this->expression)?"'".$this->db->escape($this->expression)."'":"''").""; + $sql.= " WHERE rowid = ".$this->id; + + $this->db->begin(); + + dol_syslog(get_class($this)."::update"); + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + + if (! $error) + { + if (! $notrigger) + { + // Uncomment this and change MYOBJECT to your own tag if you + // want this action calls a trigger. + + //// Call triggers + //$result=$this->call_trigger('MYOBJECT_MODIFY',$user); + //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} + //// End call triggers + } + } + + // Commit or rollback + if ($error) + { + foreach($this->errors as $errmsg) + { + dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR); + $this->error.=($this->error?', '.$errmsg:$errmsg); + } + $this->db->rollback(); + return -1*$error; + } + else + { + $this->db->commit(); + return 1; + } + } + + + /** + * Delete object in database + * + * @param int $rowid Row id of expression + * @param User $user User that deletes + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int <0 if KO, >0 if OK + */ + function delete($rowid, $user, $notrigger=0) + { + $error=0; + + $this->db->begin(); + + if (! $error) + { + if (! $notrigger) + { + // Uncomment this and change MYOBJECT to your own tag if you + // want this action calls a trigger. + + //// Call triggers + //$result=$this->call_trigger('MYOBJECT_DELETE',$user); + //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} + //// End call triggers + } + } + + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_price_expression"; + $sql.= " WHERE rowid = ".$rowid; + + dol_syslog(get_class($this)."::delete"); + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + } + + // Commit or rollback + if ($error) + { + foreach($this->errors as $errmsg) + { + dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR); + $this->error.=($this->error?', '.$errmsg:$errmsg); + } + $this->db->rollback(); + return -1*$error; + } + else + { + $this->db->commit(); + return 1; + } + } + + /** + * Initialise object with example values + * Id must be 0 if object instance is a specimen + * + * @return void + */ + function initAsSpecimen() + { + $this->id=0; + $this->expression=''; + } +} diff --git a/htdocs/product/class/priceparser.class.php b/htdocs/product/class/priceparser.class.php new file mode 100755 index 00000000000..5e4fb949cbb --- /dev/null +++ b/htdocs/product/class/priceparser.class.php @@ -0,0 +1,240 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/product/class/priceparser.class.php + * \ingroup product + * \brief File of class to calculate prices using expression + */ +require_once DOL_DOCUMENT_ROOT.'/includes/evalmath/evalmath.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/priceexpression.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + +/** + * Class to parse product price expressions + */ +class PriceParser +{ + protected $db; + // Limit of expressions per price + public $limit = 100; + // The error that ocurred when parsing price + public $error; + // The expression that caused the error + public $error_expr; + //The special char + public $special_chr = "#"; + //The separator char + public $separator_chr = ";"; + + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + $this->db = $db; + } + + /** + * Returns translated error + * + * @return string Translated error + */ + public function translatedError() + { + global $langs; + $langs->load("errors"); + /* + -No arg + 9, an unexpected error occured + 14, division by zero + 19, expression not found + 20, empty expression + + -1 Arg + 1, cannot assign to constant '%s' + 2, cannot redefine built-in function '%s' + 3, undefined variable '%s' in function definition + 4, illegal character '%s' + 5, unexpected '%s' + 8, unexpected operator '%s' + 10, operator '%s' lacks operand + 11, expecting '%s' + 17, undefined variable '%s' + 21, empty result '%s' + 22, negative result '%s' + + -2 Args + 6, wrong number of arguments (%s given, %s expected) + + -internal errors + 7, internal error + 12, internal error + 13, internal error + 15, internal error + 16, internal error + 18, internal error + */ + if (empty($this->error)) { + return $langs->trans("ErrorPriceExpressionUnknown", 0); //this is not supposed to happen + } + list($code, $info) = $this->error; + if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg + { + return $langs->trans("ErrorPriceExpression".$code); + } + else if (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) //Errors which have 1 arg + { + return $langs->trans("ErrorPriceExpression".$code, $info); + } + else if (in_array($code, array(6))) //Errors which have 2 args + { + return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]); + } + else if (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors + { + return $langs->trans("ErrorPriceExpressionInternal", $code); + } + else //Unknown errors + { + return $langs->trans("ErrorPriceExpressionUnknown", $code); + } + } + + /** + * Calculates price based on expression + * + * @param array $values Strings to replaces + * @param String $expression The expression to parse + * @return int > 0 if OK, < 1 if KO + */ + public function parseExpression($values, $expression) + { + //Check if empty + $expression = trim($expression); + if (empty($expression)) + { + $this->error = array(20, null); + return -1; + } + + //Prepare the lib, parameters and values + $em = new EvalMath(); + $em->suppress_errors = true; //Don't print errors on page + $this->error_expr = null; + $search = array(); + $replace = array(); + foreach ($values as $key => $value) { + if ($value !== null) { + $search[] = $this->special_chr.$key.$this->special_chr; + $replace[] = $value; + } + } + + //Iterate over each expression splitted by $separator_chr + $expression = str_replace("\n", $this->separator_chr, $expression); + $expressions = explode($this->separator_chr, $expression); + $expressions = array_slice($expressions, 0, $limit); + foreach ($expressions as $expr) { + $expr = trim($expr); + if (!empty($expr)) + { + $expr = str_ireplace($search, $replace, $expr); + $last_result = $em->evaluate($expr); + $this->error = $em->last_error_code; + if ($this->error !== null) { //$em->last_error is null if no error happened, so just check if error is not null + $this->error_expr = $expr; + return -2; + } + } + } + $vars = $em->vars(); + if (empty($vars["price"])) { + $vars["price"] = $last_result; + } + if ($vars["price"] === null) + { + $this->error = array(21, $expression); + return -3; + } + if ($vars["price"] < 0) + { + $this->error = array(22, $expression); + return -4; + } + return $vars["price"]; + } + + /** + * Calculates supplier product price based on product id and string expression + * + * @param int $product_id The Product id to get information + * @param string $expression The expression to parse + * @param int $quantity Min quantity + * @param int $tva_tx VAT rate + * @param array $extra_values Any aditional values for expression + * @return int > 0 if OK, < 1 if KO + */ + public function parseProductSupplierExpression($product_id, $expression, $quantity = null, $tva_tx = null, $extra_values = array()) + { + //Accessible values by expressions + $expression_values = array( + "quantity" => $quantity, + "tva_tx" => $tva_tx, + ); + $expression_values = array_merge($expression_values, $extra_values); + + //Retreive all extrafield for product and add it to expression_values + $extrafields = new ExtraFields($this->db); + $extralabels = $extrafields->fetch_name_optionals_label('product', true); + $product = new Product($this->db); + $product->fetch_optionals($product_id, $extralabels); + foreach($extrafields->attribute_label as $key=>$label) + { + $expression_values['options_'.$key] = $product->array_options['options_'.$key]; + } + + //Parse the expression and return the price + return $this->parseExpression($expression_values, $expression); + } + + /** + * Calculates supplier product price based on product id and expression id + * + * @param int $product_id The Product id to get information + * @param int $expression_id The expression to parse + * @param int $quantity Min quantity + * @param int $tva_tx VAT rate + * @param array $extra_values Any aditional values for expression + * @return int > 0 if OK, < 1 if KO + */ + public function parseProductSupplier($product_id, $expression_id, $quantity = null, $tva_tx = null, $extra_values = array()) + { + $price_expression = new PriceExpression($this->db); + $res = $price_expression->fetch($expression_id); + if ($res > 1) { + $this->error = array(19, null); + return -1; + } + + //Parse the expression and return the price + return $this->parseProductSupplierExpression($product_id, $price_expression->expression, $quantity, $tva_tx, $extra_values); + } +} \ No newline at end of file diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php old mode 100644 new mode 100755 index 98b5d155ba7..294c8d1610e --- 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 @@ -124,9 +129,9 @@ class Product extends CommonObject //! barcode var $barcode; // value var $barcode_type; // id - var $barcode_type_code; // code (loaded by fetch_barcode). Example ean, isbn... + var $barcode_type_code; // code (loaded by fetch_barcode). Example 'ean', 'isbn', ... var $barcode_type_label; // label (loaded by fetch_barcode) - var $barcode_type_coder; // coder (loaded by fetch_barcode) + var $barcode_type_coder; // coder (loaded by fetch_barcode). Engine. var $stats_propale=array(); var $stats_commande=array(); @@ -680,6 +685,8 @@ class Product extends CommonObject } } + $action='update'; + // Actions on extra fields (by external module or standard code) $hookmanager->initHooks(array('productdao')); $parameters=array('id'=>$this->id); @@ -1164,11 +1171,12 @@ class Product extends CommonObject */ function get_buyprice($prodfournprice,$qty,$product_id=0,$fourn_ref=0) { + require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php'; $result = 0; // We do select by searching with qty and prodfournprice $sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity,"; - $sql.= " pfp.fk_product, pfp.ref_fourn, pfp.fk_soc, pfp.tva_tx"; + $sql.= " pfp.fk_product, pfp.ref_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_price_expression"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " WHERE pfp.rowid = ".$prodfournprice; if ($qty) $sql.= " AND pfp.quantity <= ".$qty; @@ -1180,6 +1188,13 @@ class Product extends CommonObject $obj = $this->db->fetch_object($resql); if ($obj && $obj->quantity > 0) // If found { + if (!empty($obj->fk_price_expression)) { + $priceparser = new PriceParser($this->db); + $price_result = $priceparser->parseProductSupplier($obj->fk_product, $obj->fk_price_expression, $obj->quantity, $obj->tva_tx); + if ($price_result >= 0) { + $obj->price = $price_result; + } + } $this->buyprice = $obj->price; // \deprecated $this->fourn_pu = $obj->price / $obj->quantity; // Prix unitaire du produit pour le fournisseur $fourn_id $this->ref_fourn = $obj->ref_fourn; // Ref supplier @@ -1191,7 +1206,7 @@ class Product extends CommonObject { // We do same select again but searching with qty, ref and id product $sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.fk_soc,"; - $sql.= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.tva_tx"; + $sql.= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.tva_tx, pfp.fk_price_expression"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " WHERE pfp.ref_fourn = '".$fourn_ref."'"; $sql.= " AND pfp.fk_product = ".$product_id; @@ -1206,6 +1221,13 @@ class Product extends CommonObject $obj = $this->db->fetch_object($resql); if ($obj && $obj->quantity > 0) // If found { + if (!empty($obj->fk_price_expression)) { + $priceparser = new PriceParser($this->db); + $price_result = $priceparser->parseProductSupplier($obj->fk_product, $obj->fk_price_expression, $obj->quantity, $obj->tva_tx); + if ($result >= 0) { + $obj->price = $price_result; + } + } $this->buyprice = $obj->price; // deprecated $this->fourn_qty = $obj->quantity; // min quantity for price $this->fourn_pu = $obj->price / $obj->quantity; // Prix unitaire du produit pour le fournisseur $fourn_id @@ -1396,7 +1418,7 @@ class Product extends CommonObject if (! $id && ! $ref && ! $ref_ext) { $this->error='ErrorWrongParameters'; - dol_print_error(get_class($this)."::fetch ".$this->error, LOG_ERR); + dol_print_error(get_class($this)."::fetch ".$this->error); return -1; } @@ -2819,8 +2841,8 @@ class Product extends CommonObject if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle'); if ($withpicto) { - if ($this->type == 0) $result.=($lien.img_object($langs->trans("ShowProduct").' '.$this->label,'product').$lienfin.' '); - if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->label,'service').$lienfin.' '); + if ($this->type == 0) $result.=($lien.img_object($langs->trans("ShowProduct").' '.$this->label, 'product', 'class="classfortooltip"').$lienfin.' '); + if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$lienfin.' '); } $result.=$lien.$newref.$lienfin; return $result; @@ -3247,11 +3269,11 @@ class Product extends CommonObject $alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height']; if ($photo_vignette && $imgarray['height'] > $maxHeight) { $return.= ''; - $return.= ''; + $return.= 'dol_use_jmobile?'max-height':'height').'="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">'; } else { $return.= ''; - $return.= ''; + $return.= 'dol_use_jmobile?'max-height':'height').'="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">'; } $return.= ''."\n"; diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index c124f9648e3..088dccf6861 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -34,7 +34,7 @@ class Productbatch extends CommonObject private static $_table_element='product_batch'; //!< Name of table without prefix where object is stored var $id; - + var $tms=''; var $fk_product_stock; var $sellby=''; @@ -42,8 +42,9 @@ class Productbatch extends CommonObject var $batch=''; var $qty; var $import_key; + public $warehouseid; + - /** @@ -92,7 +93,7 @@ class Productbatch extends CommonObject $sql.= " ".(! isset($this->qty)?'NULL':$this->qty).","; $sql.= " ".(! isset($this->import_key)?'NULL':"'".$this->db->escape($this->import_key)."'").""; - + $sql.= ")"; $this->db->begin(); @@ -148,17 +149,18 @@ class Productbatch extends CommonObject global $langs; $sql = "SELECT"; $sql.= " t.rowid,"; - + $sql.= " t.tms,"; $sql.= " t.fk_product_stock,"; $sql.= " t.sellby,"; $sql.= " t.eatby,"; $sql.= " t.batch,"; $sql.= " t.qty,"; - $sql.= " t.import_key"; + $sql.= " t.import_key,"; + $sql.= " w.fk_entrepot"; - $sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as t"; + $sql.= " INNER JOIN ".MAIN_DB_PREFIX."product_stock w on t.fk_product_stock=w.rowid"; $sql.= " WHERE t.rowid = ".$id; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); @@ -177,6 +179,7 @@ class Productbatch extends CommonObject $this->batch = $obj->batch; $this->qty = $obj->qty; $this->import_key = $obj->import_key; + $this->warehouseid= $obj->fk_entrepot; } $this->db->free($resql); @@ -196,7 +199,7 @@ class Productbatch extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -376,7 +379,7 @@ class Productbatch extends CommonObject function initAsSpecimen() { $this->id=0; - + $this->tms=''; $this->fk_product_stock=''; $this->sellby=''; @@ -384,14 +387,14 @@ class Productbatch extends CommonObject $this->batch=''; $this->import_key=''; - + } /** * Clean fields (triming) * * @return void - */ + */ private function clean_param() { if (isset($this->fk_product_stock)) $this->fk_product_stock=(int) trim($this->fk_product_stock); if (isset($this->batch)) $this->batch=trim($this->batch); @@ -429,7 +432,7 @@ class Productbatch extends CommonObject if (! empty($batch_number)) $sql.= " AND batch = '".$this->db->escape($batch_number)."'"; if (! empty($where)) $sql.= " AND (".implode(" OR ",$where).")"; - + dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) @@ -439,7 +442,7 @@ class Productbatch extends CommonObject $obj = $this->db->fetch_object($resql); $this->id = $obj->rowid; - + $this->tms = $this->db->jdate($obj->tms); $this->fk_product_stock = $obj->fk_product_stock; $this->sellby = $this->db->jdate($obj->sellby); @@ -480,10 +483,10 @@ class Productbatch extends CommonObject $sql.= " t.qty,"; $sql.= " t.import_key"; - + $sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as t"; $sql.= " WHERE fk_product_stock=".$fk_product_stock; - + if ($with_qty) $sql.= " AND qty<>0"; dol_syslog("productbatch::findAll", LOG_DEBUG); $resql=$db->query($sql); diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 8c71f29581b..ca139a87965 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -130,24 +130,28 @@ if ($action == 'search') { $current_lang = $langs->getDefaultLang(); - $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.price, p.fk_product_type as type'; + $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,'; + $sql.= ' p.fk_product_type, p.tms as datem'; if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= ', pl.label as labelm, pl.description as descriptionm'; $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON p.rowid = cp.fk_product'; if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND lang='".($current_lang)."'"; - $sql.= ' WHERE p.entity IN ('.getEntity("product", 1).')'; + $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')'; if ($key != "") { + // For natural search + $params = array('p.ref', 'p.label', 'p.description', 'p.note'); + // multilang if (! empty($conf->global->MAIN_MULTILANGS)) { - $sql.= " AND (p.ref LIKE '%".$key."%'"; - $sql.= " OR pl.label LIKE '%".$key."%')"; + $params[] = 'pl.label'; + $params[] = 'pl.description'; + $params[] = 'pl.note'; } - else - { - $sql.= " AND (p.ref LIKE '%".$key."%'"; - $sql.= " OR p.label LIKE '%".$key."%')"; + if (! empty($conf->barcode->enabled)) { + $params[] = 'p.barcode'; } + $sql .= natural_search($params, $key); } if (! empty($conf->categorie->enabled) && ! empty($parent) && $parent != -1) { @@ -533,9 +537,11 @@ if ($id > 0 || ! empty($ref)) if($num > 0) { - print '
    trans("Update").'">'; - print '     '; - print '
    '; + print '
    '; + print 'trans("Update").'">'; + print '     '; + print ''; + print '
    '; } print ''; diff --git a/htdocs/product/expression.php b/htdocs/product/expression.php new file mode 100755 index 00000000000..68c57489bfb --- /dev/null +++ b/htdocs/product/expression.php @@ -0,0 +1,221 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/product/expression.php + * \ingroup product + * \brief Page for editing expression + */ + +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/priceexpression.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php'; + +$langs->load("products"); +$langs->load("accountancy"); //"Back" translation is on this file + +$id = GETPOST('id', 'int'); +$eid = GETPOST('eid', 'int'); +$action = GETPOST('action', 'alpha'); +$title = GETPOST('expression_title', 'alpha'); +$expression = GETPOST('expression'); +$tab = GETPOST('tab', 'alpha'); +$tab = (!empty($tab)) ? $tab : 'card'; + +// Security check +$result=restrictedArea($user,'produit|service&fournisseur',$id,'product&product','','','rowid'); + +//Initialize objects +$product = new Product($db); +$product->fetch($id, ''); + +$price_expression = new PriceExpression($db); + +//Fetch expression data +if (empty($eid)) //This also disables fetch when eid == 0 +{ + $eid = 0; +} +else if ($action != 'delete') +{ + $price_expression->fetch($eid); +} + +/* + * Actions + */ + +if ($action == 'add') +{ + if ($eid == 0) + { + $result = $price_expression->find_title($title); + if ($result == 0) //No existing entry found with title, ok + { + //Check the expression validity by parsing it + $priceparser = new PriceParser($db); + $price_result = $priceparser->parseProductSupplierExpression($id, $expression, 0, 0); + if ($price_result < 0) { //Expression is not valid + setEventMessage($priceparser->translatedError(), 'errors'); + } + else + { + $price_expression->title = $title; + $price_expression->expression = $expression; + $result = $price_expression->create($user); + if ($result > 0) //created successfully, set the eid to newly created entry + { + $eid = $price_expression->id; + } + else + { + setEventMessage("add: ".$price_expression->error, 'errors'); + } + } + } + else if ($result < 0) + { + setEventMessage("add find: ".$price_expression->error, 'errors'); + } + else + { + setEventMessage($langs->trans("ErrorRecordAlreadyExists"), 'errors'); + } + } +} + +if ($action == 'update') +{ + if ($eid != 0) + { + $result = $price_expression->find_title($title); + if ($result == 0 || $result == $eid) //No existing entry found with title or existing one is the current one, ok + { + //Check the expression validity by parsing it + $priceparser = new PriceParser($db); + $price_result = $priceparser->parseProductSupplierExpression($id, $expression, 0, 0); + if ($price_result < 0) { //Expression is not valid + setEventMessage($priceparser->translatedError(), 'errors'); + } + else + { + $price_expression->id = $eid; + $price_expression->title = $title; + $price_expression->expression = $expression; + $result = $price_expression->update($user); + if ($result < 0) + { + setEventMessage("update: ".$price_expression->error, 'errors'); + } + } + } + else if ($result < 0) + { + setEventMessage("update find: ".$price_expression->error, 'errors'); + } + else + { + setEventMessage($langs->trans("ErrorRecordAlreadyExists"), 'errors'); + } + } +} + +if ($action == 'delete') +{ + if ($eid != 0) + { + $result = $price_expression->delete($eid, $user); + if ($result < 0) + { + setEventMessage("delete: ".$price_expression->error, 'errors'); + } + $eid = 0; + } +} + +/* + * View + */ + +//Header +llxHeader("","",$langs->trans("CardProduct".$product->type)); +print_fiche_titre($langs->trans("PriceExpressionEditor")); +$form = new Form($db); + +//Form/Table +print '
    '; +print ''; +print ''; +print ''; + +// Price expression selector +print ''; + +// Title input +print ''; + +//Price expression editor +print ''; +print '
    '.$langs->trans("PriceExpressionSelected").''; +$price_expression_list = array(0 => $langs->trans("New")); //Put the new as first option +foreach ($price_expression->list_price_expression() as $entry) { + $price_expression_list[$entry->id] = $entry->title; +} +print $form->selectarray('expression_selection', $price_expression_list, $eid); +print '
    '.$langs->trans("Name").''; +print ''; +print '
    '.$form->textwithpicto($langs->trans("PriceExpressionEditor"),$langs->trans("PriceExpressionEditorHelp"),1).''; +require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; +$doleditor=new DolEditor('expression',isset($price_expression->expression)?$price_expression->expression:'','',300,'','',false,false,false,4,80); +$doleditor->Create(); +print '
    '; + +//Buttons +print '
    '; +print ''; +print ''.$langs->trans("Back").''; +if ($eid == 0) +{ + print '
    '.$langs->trans('Delete').'
    '."\n"; +} +else +{ + print '
    '.$langs->trans("Delete").'
    '; +} +print '
    '; + +print '
    '; + +// This code reloads the page depending of selected option, goes back in history when back is pressed +print ''; + +llxFooter(); +$db->close(); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php old mode 100644 new mode 100755 index 9832e57eb6d..4f382d3b7f8 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2012 Juanjo Menent * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2014 Ion Agorria * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,11 +31,12 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/priceexpression.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php'; $langs->load("products"); $langs->load("suppliers"); $langs->load("bills"); -// Charges ???? if (! empty($conf->margin->enabled)) $langs->load("margins"); $id = GETPOST('id', 'int'); @@ -104,6 +106,7 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel")) $npr = preg_match('/\*/', $_POST['tva_tx']) ? 1 : 0 ; $tva_tx = str_replace('*','', GETPOST('tva_tx','alpha')); $tva_tx = price2num($tva_tx); + $price_expression = GETPOST('eid', 'int') == 0 ? 'NULL' : GETPOST('eid', 'int'); //Discard expression if not in expression mode if ($tva_tx == '') { @@ -127,8 +130,14 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel")) } if ($_POST["price"] < 0 || $_POST["price"] == '') { - $error++; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")), 'errors'); + if ($price_expression == 'NULL') { //This is not because of using expression instead of numeric price + $error++; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")), 'errors'); + } + else + { + $_POST["price"] = 0; + } } $product = new ProductFournisseur($db); @@ -174,6 +183,26 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel")) { $error++; setEventMessage($product->error, 'errors'); + } + else + { + if ($price_expression != 'NULL') { + //Check the expression validity by parsing it + $priceparser = new PriceParser($db); + $price_result = $priceparser->parseProductSupplier($id, $price_expression, $quantity, $tva_tx); + if ($price_result < 0) { //Expression is not valid + $error++; + setEventMessage($priceparser->translatedError(), 'errors'); + } + } + if (! $error && ! empty($conf->dynamicprices->enabled)) { + $ret=$product->setPriceExpression($price_expression); + if ($ret < 0) + { + $error++; + setEventMessage($product->error, 'errors'); + } + } } } @@ -267,7 +296,7 @@ if ($id || $ref) if ($rowid) { - $product->fetch_product_fournisseur_price($rowid); + $product->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price print_fiche_titre($langs->trans("ChangeSupplierPrice")); } else @@ -369,8 +398,41 @@ if ($id || $ref) print ''; print ''; + if (! empty($conf->dynamicprices->enabled)) { //Only show price mode and expression selector if module is enabled + // Price mode selector + print ''.$langs->trans("PriceMode").''; + $price_expression = new PriceExpression($db); + $price_expression_list = array(0 => $langs->trans("PriceNumeric")); //Put the numeric mode as first option + foreach ($price_expression->list_price_expression() as $entry) { + $price_expression_list[$entry->id] = $entry->title; + } + $price_expression_preselection = GETPOST('eid') ? GETPOST('eid') : ($product->fk_price_expression ? $product->fk_price_expression : '0'); + print $form->selectarray('eid', $price_expression_list, $price_expression_preselection); + print ' 
    '.$langs->trans("PriceExpressionEditor").'
    '; + print ''; + // This code hides the numeric price input if is not selected, loads the editor page if editor button is pressed + print ''; + } + // Price qty min - print ''.$langs->trans("PriceQtyMin").''; + print ''.$langs->trans("PriceQtyMin").''; print ''; print ' '; print $form->select_PriceBaseType((GETPOST('price_base_type')?GETPOST('price_base_type'):$product->price_base_type), "price_base_type"); @@ -383,15 +445,18 @@ if ($id || $ref) print ''; // Charges ???? - if (! empty($conf->margin->enabled)) + if ($conf->global->PRODUCT_CHARGES) { - print ''; - print ''.$langs->trans("Charges").''; - print ''; - print ''; - print ''; + if (! empty($conf->margin->enabled)) + { + print ''; + print ''.$langs->trans("Charges").''; + print ''; + print ''; + print ''; + } } - + if (is_object($hookmanager)) { $parameters=array('id_fourn'=>$id_fourn,'prod_id'=>$product->id); @@ -400,9 +465,11 @@ if ($id || $ref) print ''; - print '
    '; - print '   '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } @@ -444,11 +511,17 @@ if ($id || $ref) print ''.$langs->trans("VATRate").''; print ''.$langs->trans("PriceQtyMinHT").''; // Charges ???? - if (! empty($conf->margin->enabled)) print ''.$langs->trans("Charges").''; + if ($conf->global->PRODUCT_CHARGES) + { + if (! empty($conf->margin->enabled)) print ''.$langs->trans("Charges").''; + } print_liste_field_titre($langs->trans("UnitPriceHT"),$_SERVER["PHP_SELF"],"pfp.unitprice","",$param,'align="right"',$sortfield,$sortorder); print ''.$langs->trans("DiscountQtyMin").''; // Charges ???? - if (! empty($conf->margin->enabled)) print ''.$langs->trans("UnitCharges").''; + if ($conf->global->PRODUCT_CHARGES) + { + if (! empty($conf->margin->enabled)) print ''.$langs->trans("UnitCharges").''; + } print ''; print "\n"; @@ -494,13 +567,16 @@ if ($id || $ref) print ''; // Charges ???? - if (! empty($conf->margin->enabled)) - { - print ''; - print $productfourn->fourn_charges?price($productfourn->fourn_charges):""; - print ''; + if ($conf->global->PRODUCT_CHARGES) + { + if (! empty($conf->margin->enabled)) + { + print ''; + print $productfourn->fourn_charges?price($productfourn->fourn_charges):""; + print ''; + } } - + // Unit price print ''; print price($productfourn->fourn_unitprice); @@ -512,14 +588,17 @@ if ($id || $ref) print price2num($productfourn->fourn_remise_percent).'%'; print ''; - // Unit Charges ??? - if (! empty($conf->margin->enabled)) + // Charges ???? + if ($conf->global->PRODUCT_CHARGES) { - print ''; - print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):" "); - print ''; + if (! empty($conf->margin->enabled)) + { + print ''; + print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):" "); + print ''; + } } - + if (is_object($hookmanager)) { $parameters=array('id_pfp'=>$productfourn->product_fourn_price_id,'id_fourn'=>$id_fourn,'prod_id'=>$product->id); diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 45f90823747..820f0829b61 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -167,7 +167,7 @@ print $total; print ''; print ''; -if (! empty($conf->categorie->enabled)) +if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHSTATS_ON_PRODUCTS)) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; print '
    '; @@ -341,8 +341,12 @@ llxFooter(); $db->close(); - - +/* + * Print html activity for product type + * + * @param int $product_type Type of product + * @return void + */ function activitytrim($product_type) { global $conf,$langs,$db; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index ebf8b77f722..a5cc97defa7 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -69,7 +69,7 @@ $limit = $conf->liste_limit; // Get object canvas (By default, this is not defined, so standard usage of dolibarr) $canvas=GETPOST("canvas"); -$objcanvas=''; +$objcanvas=null; if (! empty($canvas)) { require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; @@ -87,12 +87,14 @@ else $result=restrictedArea($user,'produit|service','','','','','',$objcanvas); * Actions */ -if (isset($_POST["button_removefilter_x"])) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $sref=""; $sbarcode=""; $snom=""; $search_categ=0; + $tosell=""; + $tobuy=""; } @@ -127,28 +129,27 @@ else { $texte = $langs->trans("ProductsAndServices"); } + // Add what we are searching for + if (! empty($sall)) $texte.= " - ".$sall; $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,'; $sql.= ' p.fk_product_type, p.tms as datem,'; - $sql.= ' p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte,'; + $sql.= ' p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,'; $sql.= ' MIN(pfp.unitprice) as minsellprice'; - $sql .= ', p.desiredstock'; $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p'; if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product"; // multilang - if ($conf->global->MAIN_MULTILANGS) // si l'option est active - { - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang() ."'"; - } + if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang() ."'"; $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')'; if ($sall) { // For natural search $params = array('p.ref', 'p.label', 'p.description', 'p.note'); // multilang - if ($conf->global->MAIN_MULTILANGS) // si l'option est active + if (! empty($conf->global->MAIN_MULTILANGS)) { + $params[] = 'pl.label'; $params[] = 'pl.description'; $params[] = 'pl.note'; } @@ -169,7 +170,7 @@ else { $params = array('p.label'); // multilang - if ($conf->global->MAIN_MULTILANGS) // si l'option est active + if (! empty($conf->global->MAIN_MULTILANGS)) { $params[] = 'pl.label'; } @@ -199,7 +200,6 @@ else $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1, $offset); - dol_syslog("product:list.php:", LOG_DEBUG); $resql = $db->query($sql); if ($resql) { @@ -383,7 +383,7 @@ else print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -511,7 +511,7 @@ else $product_static->status = $objp->tosell; // Status (to sell) print ''; - if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); } else { print $product_static->LibStatut($objp->tosell,5,0); @@ -520,7 +520,7 @@ else // Status (to buy) print ''; - if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); } else { print $product_static->LibStatut($objp->tobuy,5,1); diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 8607cfeeb8e..92ad4cfbe1f 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, $_SERVER["PHP_SELF"],$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); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 3ff496356a8..516a4be9fbd 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,32 +349,33 @@ if ($isphoto) { print ''; // MultiPrix -if (! empty($conf->global->PRODUIT_MULTIPRICES)) +if (! empty($conf->global->PRODUIT_MULTIPRICES)) { - if (! empty($socid)) + // Price and min price are variable (depends on level of company). + if (! empty($socid)) { $soc = new Societe($db); $soc->id = $socid; $soc->fetch($socid); + // Selling price print '' . $langs->trans("SellingPrice") . ''; - + print ''; if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') { - print '' . price($object->multiprices_ttc ["$soc->price_level"]); + print price($object->multiprices_ttc["$soc->price_level"]); } else { - print '' . price($object->multiprices ["$soc->price_level"]); + print price($object->multiprices["$soc->price_level"]); } - if ($object->multiprices_base_type["$soc->price_level"]) { - print ' ' . $langs->trans($object->multiprices_base_type ["$soc->price_level"]); + print ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]); } else { print ' ' . $langs->trans($object->price_base_type); } print ''; - // Prix mini + // Price min print '' . $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 { @@ -382,7 +391,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) { // TVA - if ($i == 1) // We show only price for level 1 + if ($i == 1) // We show only vat for level 1 { print '' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx [1], true) . ''; } @@ -411,10 +420,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"]); @@ -422,12 +431,13 @@ 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("PriceByQuantity") . ' ' . $i; print ''; if ($object->prices_by_qty [$i] == 1) { - print ''; + print '
    '; print ''; print ''; @@ -437,30 +447,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 ''; @@ -516,7 +526,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 '"; } // 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 '"; } @@ -930,8 +947,11 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { 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 ' '; @@ -472,7 +482,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"); @@ -524,7 +535,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; if ($object->prices_by_qty [0] == 1) { - print ''; + print '
    '; print ''; print ''; print ''; @@ -532,31 +543,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 '
    ' . $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 ' '; @@ -669,8 +682,11 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> print '
    '; - print '

     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print '
    '; } else { @@ -795,7 +811,8 @@ if ($result) { print '    		' . $objp->price_level . "' . $langs->trans($type) . "
    '; - print '

     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print '
    '; } elseif ($action == 'edit_customer_price') { @@ -1012,8 +1032,11 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; - print '

     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print '
    '; } elseif ($action == 'showlog_customer_price') { diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index d9b3538eb72..c8480d6e65a 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -63,7 +63,7 @@ $search_categ = GETPOST("search_categ"); // Get object canvas (By default, this is not defined, so standard usage of dolibarr) $canvas=GETPOST("canvas"); -$objcanvas=''; +$objcanvas=null; if (! empty($canvas)) { require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; 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 "\n"; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 051a0575aaa..b31305b448b 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -45,6 +45,8 @@ $id = GETPOST("id",'int'); if (! $sortfield) $sortfield="p.ref"; if (! $sortorder) $sortorder="DESC"; +$backtopage=GETPOST("backtopage"); + // Security check $result=restrictedArea($user,'stock'); @@ -71,16 +73,29 @@ 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) { - header("Location: card.php?id=".$id); - exit; - } + setEventMessage($langs->trans("RecordSaved")); - $action = 'create'; - setEventMessage($object->error, 'errors'); + if (! empty($backtopage)) + { + header("Location: ".$backtopage); + exit; + } + else + { + header("Location: card.php?id=".$id); + exit; + } + } + else + { + $action = 'create'; + setEventMessage($object->error, 'errors'); + } } else { setEventMessage($langs->trans("ErrorWarehouseRefRequired"), 'errors'); @@ -164,6 +179,9 @@ if ($action == 'create') print "
    \n"; print ''; print ''; + print ''; + + dol_fiche_head(); print ''; @@ -206,7 +224,9 @@ if ($action == 'create') print '
    '; - print '

    '; + dol_fiche_end(); + + print '
    '; print '
    '; } @@ -425,10 +445,10 @@ else $totalunit+=$objp->value; // Price buy PMP - print ''.price(price2num($objp->pmp,'MU')).''; + print ''.price(price2num($objp->ppmp,'MU')).''; // Total PMP - print ''.price(price2num($objp->pmp*$objp->value,'MT')).''; - $totalvalue+=price2num($objp->pmp*$objp->value,'MT'); + print ''.price(price2num($objp->ppmp*$objp->value,'MT')).''; + $totalvalue+=price2num($objp->ppmp*$objp->value,'MT'); // Price sell min if (empty($conf->global->PRODUIT_MULTIPRICES)) @@ -538,8 +558,11 @@ else print ''; - print '

     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 3bf672f29a3..c0627015be3 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -516,7 +516,7 @@ class Entrepot extends CommonObject $lien=''; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"),'stock').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"), 'stock', 'class="classfortooltip"').$lienfin.' '); $result.=$lien.$this->libelle.$lienfin; return $result; } diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 9e508f41461..ad99f68c9b0 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; @@ -474,7 +495,14 @@ class MouvementStock extends CommonObject } } - + + /** + * Get origin + * + * @param variant $fk_origin id of origin + * @param int $origintype origin type + * @return string name url + */ function get_origin($fk_origin, $origintype) { switch ($origintype) { case 'commande': diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index d2078d473e7..dc394f898dc 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -15,7 +15,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ /** 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/mouvement.php b/htdocs/product/stock/mouvement.php index 06e089c5209..1bac6b9fef5 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -60,7 +60,7 @@ $offset = $conf->liste_limit * $page; if (! $sortfield) $sortfield="m.datem"; if (! $sortorder) $sortorder="DESC"; -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $year=''; $month=''; @@ -332,9 +332,13 @@ if ($resql) print ''; - print '
     '; - print '
    '; - print ''; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; + + print ''; } /* @@ -370,8 +374,11 @@ if ($resql) print ''; - print '
     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 22dc080d6e2..352750295af 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -6,7 +6,7 @@ * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2013 Juanjo Menent - * Copyright (C) 2014 Cédric Gross + * Copyright (C) 2014-2015 Cédric Gross * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,6 +31,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php'; @@ -122,10 +123,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 +141,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) @@ -167,13 +171,13 @@ if ($action == "correct_stock" && ! $cancel) // Transfer stock from a warehouse to another warehouse if ($action == "transfert_stock" && ! $cancel) { - if (! (GETPOST("id_entrepot_source") > 0) || ! (GETPOST("id_entrepot_destination") > 0)) + if (! (GETPOST("id_entrepot_source",'int') > 0) || ! (GETPOST("id_entrepot_destination",'int') > 0)) { setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Warehouse")), 'errors'); $error++; $action='transfert'; } - if (! GETPOST("nbpiece")) + if (! GETPOST("nbpiece",'int')) { setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("NumberOfUnit")), 'errors'); $error++; @@ -182,9 +186,9 @@ if ($action == "transfert_stock" && ! $cancel) if (! $error) { - if (GETPOST("id_entrepot_source") <> GETPOST("id_entrepot_destination")) + if (GETPOST("id_entrepot_source",'int') <> GETPOST("id_entrepot_destination",'int')) { - if (is_numeric(GETPOST("nbpiece")) && $id) + if (GETPOST("nbpiece",'int') && $id) { $product = new Product($db); $result=$product->fetch($id); @@ -195,31 +199,63 @@ if ($action == "transfert_stock" && ! $cancel) // Define value of products moved $pricesrc=0; - if (isset($product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp)) $pricesrc=$product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp; + //if (isset($product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp)) $pricesrc=$product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp; + if (isset($product->pmp)) $pricesrc=$product->pmp; $pricedest=$pricesrc; - //print 'price src='.$pricesrc.', price dest='.$pricedest;exit; + $pdluoid=GETPOST('pdluoid','int'); - // Remove stock - $result1=$product->correct_stock( - $user, - GETPOST("id_entrepot_source"), - GETPOST("nbpiece"), - 1, - GETPOST("label"), - $pricesrc - ); + if ($pdluoid>0) + { + $pdluo = new Productbatch($db); + $result=$pdluo->fetch($pdluoid); - // Add stock - $result2=$product->correct_stock( - $user, - GETPOST("id_entrepot_destination"), - GETPOST("nbpiece"), - 0, - GETPOST("label"), - $pricedest - ); + if ($result>0 && $pdluo->id) + { + // Remove stock + $result1=$product->correct_stock_batch( + $user, + $pdluo->warehouseid, + GETPOST("nbpiece",'int'), + 1, + GETPOST("label",'san_alpha'), + $pricesrc, + $pdluo->eatby,$pdluo->sellby,$pdluo->batch + ); + // Add stock + $result2=$product->correct_stock_batch( + $user, + GETPOST("id_entrepot_destination",'int'), + GETPOST("nbpiece",'int'), + 0, + GETPOST("label",'san_alpha'), + $pricedest, + $pdluo->eatby,$pdluo->sellby,$pdluo->batch + ); + } + } + else + { + // Remove stock + $result1=$product->correct_stock( + $user, + GETPOST("id_entrepot_source"), + GETPOST("nbpiece"), + 1, + GETPOST("label"), + $pricesrc + ); + // Add stock + $result2=$product->correct_stock( + $user, + GETPOST("id_entrepot_destination"), + GETPOST("nbpiece"), + 0, + GETPOST("label"), + $pricedest + ); + } if ($result1 >= 0 && $result2 >= 0) { $db->commit(); @@ -236,6 +272,48 @@ if ($action == "transfert_stock" && ! $cancel) } } +// Update batch information +if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save')) +{ + + $pdluo = new Productbatch($db); + $result=$pdluo->fetch(GETPOST('pdluoid','int')); + + if ($result>0) + { + if ($pdluo->id) + { + if ((! GETPOST("sellby")) && (! GETPOST("eatby")) && (! GETPOST("batch_number"))) { + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("atleast1batchfield")), 'errors'); + } + else + { + $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']); + $pdluo->batch=GETPOST("batch_number",'san_alpha'); + $pdluo->eatby=$d_eatby; + $pdluo->sellby=$d_sellby; + $result=$pdluo->update($user); + if ($result<0) + { + setEventMessages($pdluo->error,$pdluo->errors, 'errors'); + } + } + } + else + { + setEventMessages($langs->trans('BatchInformationNotfound'),null, 'errors'); + } + } + else + { + setEventMessages($pdluo->error,null, 'errors'); + } + header("Location: product.php?id=".$id); + exit; +} + + /* * View @@ -279,7 +357,7 @@ if ($id > 0 || $ref) // Status (to sell) print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { print ajax_object_onoff($product, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell'); } else { print $product->getLibStatut(2,0); @@ -288,7 +366,7 @@ if ($id > 0 || $ref) // Status (to buy) print ''.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) { + if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { print ajax_object_onoff($product, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy'); } else { print $product->getLibStatut(2,1); @@ -296,8 +374,8 @@ if ($id > 0 || $ref) print ''; if ($conf->productbatch->enabled) { - print ''.$langs->trans("Status").' ('.$langs->trans("l_sellby").')'; - print $product->getLibStatut(2,2); + print ''.$langs->trans("ManageLotSerial").''; + print $product->getLibStatut(0,2); print ''; } @@ -306,13 +384,50 @@ if ($id > 0 || $ref) print ''.price($product->pmp).' '.$langs->trans("HT").''; print ''; - // Sell price - print ''.$langs->trans("SellPriceMin").''; - print ''; - if (empty($conf->global->PRODUIT_MULTIPRICES)) print price($product->price).' '.$langs->trans("HT"); - else print $langs->trans("Variable"); - print ''; - print ''; + // Minimum Price + print ''.$langs->trans("BuyingPriceMin").''; + print ''; + $product_fourn = new ProductFournisseur($db); + if ($product_fourn->find_min_price_product_fournisseur($product->id) > 0) + { + if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(); + else print $langs->trans("NotDefined"); + } + print ''; + + $object = $product; + if (empty($conf->global->PRODUIT_MULTIPRICES)) + { + // Price + print '' . $langs->trans("SellingPrice") . ''; + if ($object->price_base_type == 'TTC') { + print price($object->price_ttc) . ' ' . $langs->trans($object->price_base_type); + } else { + print price($object->price) . ' ' . $langs->trans($object->price_base_type); + } + print ''; + + // Price minimum + print '' . $langs->trans("MinPrice") . ''; + if ($object->price_base_type == 'TTC') { + print price($object->price_min_ttc) . ' ' . $langs->trans($object->price_base_type); + } else { + print price($object->price_min) . ' ' . $langs->trans($object->price_base_type); + } + print ''; + } + else + { + // Price + print '' . $langs->trans("SellingPrice") . ''; + print $langs->trans("Variable"); + print ''; + + // Price minimum + print '' . $langs->trans("MinPrice") . ''; + print $langs->trans("Variable"); + print ''; + } // Stock print ''.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer).''; @@ -334,7 +449,7 @@ if ($id > 0 || $ref) // Calculating a theorical value print ''.$langs->trans("VirtualStock").''; - print "".$product->stock_theorique; + print "".(empty($product->stock_theorique)?0:$product->stock_theorique); if ($product->stock_theorique < $product->seuil_stock_alerte) { print ' '.img_warning($langs->trans("StockLowerThanLimit")); } @@ -342,7 +457,8 @@ if ($id > 0 || $ref) print ''; print ''; - $text_stock_options = (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)?$langs->trans("DeStockOnShipment").'
    ':''); + $text_stock_options = ''; + $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)?$langs->trans("DeStockOnShipment").'
    ':''); $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)?$langs->trans("DeStockOnValidateOrder").'
    ':''); $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_BILL)?$langs->trans("DeStockOnBill").'
    ':''); $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)?$langs->trans("ReStockOnBill").'
    ':''); @@ -353,7 +469,6 @@ if ($id > 0 || $ref) print ''; $found=0; - // Number of customer orders running if (! empty($conf->commande->enabled)) { @@ -471,20 +586,26 @@ if ($id > 0 || $ref) //eat-by date if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) { print ''; - print ''.$langs->trans("l_eatby").''; + print ''.$langs->trans("batch_number").''; + print ''; + print ''; + print ''; + print ''.$langs->trans("l_eatby").''; $form->select_date('','eatby','','',1,""); print ''; - print ''.$langs->trans("l_sellby").''; + print ''; + print ''.$langs->trans("l_sellby").''; $form->select_date('','sellby','','',1,""); print ''; - print ''.$langs->trans("batch_number").''; - print ''; - print ''; + print ''; } print ''; - print '
     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } @@ -493,15 +614,43 @@ if ($id > 0 || $ref) */ if ($action == "transfert") { + $pdluoid=GETPOST('pdluoid','int'); + + if ($pdluoid > 0) + { + $pdluo = new Productbatch($db); + $result=$pdluo->fetch($pdluoid); + + if ($result > 0) + { + $pdluoid=$pdluo->id; + } + else + { + dol_print_error($db); + } + } + print_titre($langs->trans("StockTransfer")); print '
    '."\n"; print ''; print ''; + if ($pdluoid) + { + print ''; + } print ''; print ''; print ''; print '
    '.$langs->trans("WarehouseSource").''; - print $formproduct->selectWarehouses(($_GET["dwid"]?$_GET["dwid"]:GETPOST('id_entrepot_source')),'id_entrepot_source','',1); + if ($pdluoid) + { + print $formproduct->selectWarehouses($pdluo->warehouseid,'id_entrepot_source','',1,1); + } + else + { + print $formproduct->selectWarehouses(($_GET["dwid"]?$_GET["dwid"]:GETPOST('id_entrepot_source')),'id_entrepot_source','',1); + } print ''.$langs->trans("WarehouseTarget").''; print $formproduct->selectWarehouses(GETPOST('id_entrepot_destination'),'id_entrepot_destination','',1); @@ -519,8 +668,11 @@ if ($id > 0 || $ref) print '
    '; - print '
     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print '
    '; } @@ -580,7 +732,7 @@ if (empty($action) && $product->id) /* - * Contenu des stocks + * Stock detail */ print '
    '; print ''; @@ -591,9 +743,10 @@ print ''; print ''; print ''; if ( (! empty($conf->productbatch->enabled)) && $product->hasbatch()) { - print ''; - print ''; + print ''; print ''; + print ''; + print ''; print ''; print ''; } @@ -626,31 +779,58 @@ if ($resql) print ''; print ''; // PMP - print ''; // Ditto : Show PMP from movement or from product - 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 // Sell price print ''; // Ditto : Show PMP from movement or from product + // Value sell print ''; // Ditto : Show PMP from movement or from product else print $langs->trans("Variable"); 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 + 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) { - print "\n".''; - print ''; - print ''; - print ''; - print ''; + foreach ($details as $pdluo) + { + if ( $action == 'editline' && GETPOST('lineid',int)==$pdluo->id ) + { //Current line edit + print "\n".''; + print ''; + print ''; + print ''; + print ''; + print ''; + } } } $i++; @@ -658,18 +838,21 @@ if ($resql) } } else dol_print_error($db); + print ''; print ''; print ''; +// Value purchase print ''; print ''; +// Value to sell print ''; print '
    '.$langs->trans("Warehouse").''.$langs->trans("SellPriceMin").''.$langs->trans("EstimatedStockValueSellShort").'
    '.$langs->trans("l_eatby").''.$langs->trans("l_sellby").'
    '.$langs->trans("batch_number").''.$langs->trans("l_eatby").''.$langs->trans("l_sellby").'
    '.$entrepotstatic->getNomUrl(1).''.$obj->reel.($obj->reel<0?' '.img_warning():'').''.(price2num($obj->pmp)?price2num($obj->pmp,'MU'):'').''.(price2num($obj->pmp)?price(price2num($obj->pmp*$obj->reel,'MT')):'').''.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').''.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').''; if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'),1); else print $langs->trans("Variable"); print ''; if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT'),1).'
    '. dol_print_date($pdluo->eatby,'day') .''. dol_print_date($pdluo->sellby,'day') .''.$pdluo->batch.''.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'
    '; + print '
    '; + print ''; + print ''; + print ''; + print ''; + print ''; + print '
    '; + $form->select_date($pdluo->eatby,'eatby','','',1,""); + print ''; + $form->select_date($pdluo->sellby,'sellby','','',1,""); + print ''.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').''; + print '
    '; + } + else + { + print "\n".'
    '; + print 'id.'">'.$langs->trans("StockMovement").''; + print 'id.'#'.$pdluo->id.'">'; + print img_edit().''.$pdluo->batch.''. dol_print_date($pdluo->eatby,'day') .''. dol_print_date($pdluo->sellby,'day') .''.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'
    '.$langs->trans("Total").':'.$total.''; -print ($totalwithpmp?price($totalvalue/$totalwithpmp):' '); +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):' '); else print $langs->trans("Variable"); print ''; if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($totalvaluesell,'MT'),1); else print $langs->trans("Variable"); diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index cd7e4cdcb3c..34b38fe8919 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -217,9 +217,11 @@ if ($action == 'edit') } } - print '
    '; - print '     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; @@ -300,9 +302,11 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service print '
    '; - print '
    '; - print '     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 0c2cebc2e27..692e4ab08b4 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -181,7 +181,7 @@ print ''.$langs->trans("DateEnd").''; print ''.$langs->trans("PlannedWorkload").''; print ''.$langs->trans("ProgressDeclared").''; print ''.$langs->trans("TimeSpent").''; -print ''.$langs->trans("AddDuration").''; +print ''.$langs->trans("NewTimeSpent").''; print "\n"; // By default, we can edit only tasks we are assigned to diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index df67d9d8fa1..1f6f430fccb 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -260,7 +260,7 @@ if (empty($reshook)) { $db->commit(); - if (GETPOST('socid','int') > 0) $object->thirdparty->fetch(GETPOST('socid','int')); + if (GETPOST('socid','int') > 0) $object->fetch_thirdparty(GETPOST('socid','int')); else unset($object->thirdparty); } } @@ -434,9 +434,13 @@ if ($action == 'create' && $user->rights->projet->creer) // Customer print ''.$langs->trans("ThirdParty").''; - $text=$form->select_company(GETPOST('socid','int'),'socid','',1,1); - $texthelp=$langs->trans("IfNeedToUseOhterObjectKeepEmpty"); - print $form->textwithtooltip($text.' '.img_help(),$texthelp,1); + $text=$form->select_company(GETPOST('socid','int'),'socid','',1,1); + if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile)) + { + $texthelp=$langs->trans("IfNeedToUseOhterObjectKeepEmpty"); + print $form->textwithtooltip($text.' '.img_help(),$texthelp,1); + } + else print $text; print ''; // Public @@ -471,14 +475,14 @@ if ($action == 'create' && $user->rights->projet->creer) print ''; - print '
    '; + print '
    '; print ''; if (! empty($backtopage)) { print '     '; print ''; } - print '
    '; + print '
    '; print ''; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index f294fa560ac..5bf17d596a4 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; @@ -298,7 +303,7 @@ class Project extends CommonObject else if (! empty($ref)) { $sql.= " WHERE ref='".$this->db->escape($ref)."'"; - $sql.= " AND entity IN (".getEntity('project').")"; + $sql.= " AND entity IN (".getEntity('project',1).")"; } dol_syslog(get_class($this)."::fetch", LOG_DEBUG); @@ -411,13 +416,13 @@ class Project extends CommonObject { if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date; if (empty($datefieldname)) return 'Error this object has no date field defined'; - $sql.=" AND ".$datefieldname." >= '".$this->db->jdate($dates)."'"; + $sql.=" AND ".$datefieldname." >= '".$this->db->idate($dates)."'"; } if ($datee > 0) { if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date; if (empty($datefieldname)) return 'Error this object has no date field defined'; - $sql.=" AND ".$datefieldname." <= '".$this->db->jdate($datee)."'"; + $sql.=" AND ".$datefieldname." <= '".$this->db->idate($datee)."'"; } if (! $sql) return -1; @@ -479,48 +484,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)) @@ -545,16 +573,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 } @@ -788,7 +809,7 @@ class Project extends CommonObject $label = $langs->trans("ShowProject") . ': ' . $this->ref . ($this->title ? ' - ' . $this->title : ''); - if ($withpicto) $result.=($lien . img_object($label, $picto) . $lienfin); + if ($withpicto) $result.=($lien . img_object($label, $picto, 'class="classfortooltip"') . $lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : ''); return $result; @@ -910,7 +931,7 @@ class Project extends CommonObject $sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec"; $sql.= ", " . MAIN_DB_PREFIX . "c_type_contact as ctc"; } - $sql.= " WHERE p.entity IN (".getEntity('project').")"; + $sql.= " WHERE p.entity IN (".getEntity('project',1).")"; // Internal users must see project he is contact to even if project linked to a third party he can't see. //if ($socid || ! $user->rights->societe->client->voir) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")"; if ($socid > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")"; diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index e3e6373962b..786caafb7ec 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -261,7 +261,7 @@ class Task extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -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) { @@ -496,7 +513,7 @@ class Task extends CommonObject $label=$langs->trans("ShowTask").': '.$this->ref.($this->label?' - '.$this->label:''); - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; return $result; @@ -791,7 +808,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); @@ -801,9 +818,9 @@ class Task extends CommonObject $this->db->rollback(); $ret = -2; } - + $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); @@ -1067,7 +1084,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; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index c7f772ef93d..bc7478a0dbb 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2010 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2012 Juanjo Menent * @@ -155,7 +155,7 @@ print ''; print ''; -print ''; +dol_fiche_end(); /* @@ -164,18 +164,21 @@ print ''; $listofreferent=array( 'propal'=>array( + 'name'=>"Proposalq", 'title'=>"ListProposalsAssociatedProject", 'class'=>'Propal', 'table'=>'propal', 'datefieldname'=>'datep', 'test'=>$conf->propal->enabled && $user->rights->propale->lire), 'order'=>array( + 'name'=>"CustomerOrderq", 'title'=>"ListOrdersAssociatedProject", 'class'=>'Commande', 'table'=>'commande', 'datefieldname'=>'date_commande', 'test'=>$conf->commande->enabled && $user->rights->commande->lire), 'invoice'=>array( + 'name'=>"CustomerInvoiceq", 'title'=>"ListInvoicesAssociatedProject", 'class'=>'Facture', 'margin'=>'add', @@ -183,18 +186,21 @@ $listofreferent=array( 'datefieldname'=>'datef', 'test'=>$conf->facture->enabled && $user->rights->facture->lire), 'invoice_predefined'=>array( + 'name'=>"PredefinedInvoices", 'title'=>"ListPredefinedInvoicesAssociatedProject", 'class'=>'FactureRec', 'table'=>'facture_rec', 'datefieldname'=>'datec', 'test'=>$conf->facture->enabled && $user->rights->facture->lire), 'order_supplier'=>array( + 'name'=>"SuplierOrders", 'title'=>"ListSupplierOrdersAssociatedProject", 'class'=>'CommandeFournisseur', 'table'=>'commande_fournisseur', 'datefieldname'=>'date_commande', 'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire), 'invoice_supplier'=>array( + 'name'=>"BillsSuppliers", 'title'=>"ListSupplierInvoicesAssociatedProject", 'class'=>'FactureFournisseur', 'margin'=>'minus', @@ -202,12 +208,14 @@ $listofreferent=array( 'datefieldname'=>'datef', 'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire), 'contract'=>array( + 'name'=>"Contracts", 'title'=>"ListContractAssociatedProject", 'class'=>'Contrat', 'table'=>'contrat', 'datefieldname'=>'date_contrat', 'test'=>$conf->contrat->enabled && $user->rights->contrat->lire), 'intervention'=>array( + 'name'=>"Interventions", 'title'=>"ListFichinterAssociatedProject", 'class'=>'Fichinter', 'table'=>'fichinter', @@ -215,6 +223,7 @@ $listofreferent=array( 'disableamount'=>1, 'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire), 'trip'=>array( + 'name'=>"TripAndExpenses", 'title'=>"ListTripAssociatedProject", 'class'=>'Deplacement', 'table'=>'deplacement', @@ -223,6 +232,7 @@ $listofreferent=array( 'disableamount'=>1, 'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire), 'agenda'=>array( + 'name'=>"Agenda", 'title'=>"ListActionsAssociatedProject", 'class'=>'ActionComm', 'table'=>'actioncomm', @@ -237,7 +247,7 @@ if ($action=="addelement") $elementselectid = GETPOST("elementselect"); $result=$project->update_element($tablename, $elementselectid); if ($result<0) { - setEventMessage($mailchimp->error,'errors'); + setEventMessage($project->error,'errors'); } }elseif ($action == "unlink") { @@ -445,8 +455,13 @@ foreach ($listofreferent as $key => $value) } } -// Margin display of the project -print_titre("Margin"); +// Profit for all project +$langs->load("suppliers"); +$langs->load("bills"); +$langs->load("orders"); +$langs->load("proposals"); +$langs->load("margins"); +print_fiche_titre($langs->trans("Profit"),'',''); print ''; print ''; print ''; @@ -455,9 +470,9 @@ print ''; print ''; print ''; - foreach ($listofreferent as $key => $value) { + $name=$langs->trans($value['name']); $title=$value['title']; $classname=$value['class']; $tablename=$value['table']; @@ -486,7 +501,7 @@ foreach ($listofreferent as $key => $value) } print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index bba783bf51e..ec807f5a5a3 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2010 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -49,6 +49,7 @@ $sortorder = GETPOST("sortorder",'alpha'); $socstatic=new Societe($db); $projectstatic=new Project($db); +$userstatic=new User($db); $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$mine:(empty($user->rights->projet->all->lire)?0:2)),1); //var_dump($projectsListId); @@ -83,7 +84,8 @@ if (! empty($conf->projet->enabled) && $user->rights->projet->lire) print ''; print ''; print ''; - print ''; + print ''; + print ''; print ''; print ''; print "
    '.$langs->trans("Element").''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").'
    '.$classname.''.$name.''.$i.''.price($total_ht).''.price($total_ttc).'
    '.$langs->trans("SearchAProject").'
    :
    :
    :
    \n"; @@ -156,20 +158,23 @@ print ''; // Tasks for all resources of all opened projects and time spent for each task/resource print '
    '; -$sql = "SELECT p.ref, p.title, p.rowid as projectid, t.label, t.rowid as taskid, u.rowid as userid, t.planned_workload, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent"; +$max = (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA); + +$sql = "SELECT p.ref, p.title, p.rowid as projectid, t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent"; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid"; -$sql.= " INNER JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid"; -$sql.= " INNER JOIN ".MAIN_DB_PREFIX."projet_task_time as tasktime on tasktime.fk_task = t.rowid"; -$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u on tasktime.fk_user = u.rowid"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tasktime on tasktime.fk_task = t.rowid"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on tasktime.fk_user = u.rowid"; $sql.= " WHERE p.entity = ".$conf->entity; -if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; +if ($mine || empty($user->rights->projet->all->lire)) $sql.= " AND p.rowid IN (".$projectsListId.")"; if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")"; $sql.= " AND p.fk_statut=1"; -$sql.= " GROUP BY p.ref, p.title, p.rowid, t.label, t.rowid, u.rowid, t.planned_workload, t.dateo, t.datee"; -$sql.= " ORDER BY u.rowid, t.dateo, t.datee"; +$sql.= " GROUP BY p.ref, p.title, p.rowid, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee"; +$sql.= " ORDER BY t.rowid, t.dateo, t.datee"; +$sql.= $db->plimit($max+1); // We want more to know if we have more than limit -$userstatic=new User($db); +$var=true; dol_syslog('projet:index.php: affectationpercent', LOG_DEBUG); $resql = $db->query($sql); @@ -178,75 +183,87 @@ if ( $resql ) $num = $db->num_rows($resql); $i = 0; - if ($num > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)) + print '
    '; + + print_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'
    '; + + print ''; + print ''; + //print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + while ($i < $num && $i < $max) { -/* $langs->load("errors"); - print ''; - print '';*/ - } - else - { - print '
    '; + $obj = $db->fetch_object($resql); + $var=!$var; - print_fiche_titre($langs->trans("TimeSpent"),'','').'
    '; - - print '
    '.$langs->trans('TaskRessourceLinks').''.$langs->trans('Projects').''.$langs->trans('Task').''.$langs->trans('DateStart').''.$langs->trans('DateEnd').''.$langs->trans('PlannedWorkload').''.$langs->trans("ProgressDeclared").''; + print ''.$langs->trans('TimeSpent').''.$langs->trans("ProgressCalculated").''; + print '
    '; - print $langs->trans("WarningTooManyDataPleaseUseMoreFilters"); - print '
    '; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - while ($i < $num) + $username=''; + if ($obj->userid && $userstatic->id != $obj->userid) // We have a user and it is not last loaded user { - $obj = $db->fetch_object($resql); - $var=!$var; - - $username=''; - if ($obj->userid && $userstatic->id != $obj->userid) // We have a user and it is not last loaded user - { - $result=$userstatic->fetch($obj->userid); - if (! $result) $userstatic->id=0; - } - if ($userstatic->id) $username = $userstatic->getNomUrl(0,0); - - print ""; - print ''; - print ''; - print ''; - print ''; - print ''; - /* I disable this because information is wrong. This percent has no meaning for a particular resource. What do we want ? - * Percent of completion ? - * If we want to show completion, we must remove "user" into list, - if (empty($obj->planned_workload)) { - $percentcompletion = $langs->trans("Unknown"); - } else { - $percentcompletion = intval($obj->task_duration*100/$obj->planned_workload); - }*/ - print ''; - print "\n"; - - $i++; + $result=$userstatic->fetch($obj->userid); + if (! $result) $userstatic->id=0; } + if ($userstatic->id) $username = $userstatic->getNomUrl(0,0); - print "
    '.$langs->trans('TaskRessourceLinks').''.$langs->trans('Projects').''.$langs->trans('Task').''.$langs->trans('DateStart').''.$langs->trans('DateEnd').''.$langs->trans('TimeSpent').'
    '.$username.''; - $projectstatic->id=$obj->projectid; - $projectstatic->ref=$obj->ref; - $projectstatic->title=$obj->title; - print $projectstatic->getNomUrl(1,'',16); - //print ''.$obj->title.''; - print ''.$obj->label.''.dol_print_date($db->jdate($obj->dateo)).''.dol_print_date($db->jdate($obj->datee)).''; - //print $percentcompletion.' %'; - print convertSecondToTime($obj->timespent, 'all'); - print '
    "; + print ""; + //print ''.$username.''; + print ''; + $projectstatic->id=$obj->projectid; + $projectstatic->ref=$obj->ref; + $projectstatic->title=$obj->title; + print $projectstatic->getNomUrl(1,'',16); + //print ''.$obj->title.''; + print ''; + print ''; + if (! empty($obj->taskid)) + { + print ''.$obj->label.''; + } + else print $langs->trans("NoTasks"); + print ''; + print ''.dol_print_date($db->jdate($obj->dateo),'day').''; + print ''.dol_print_date($db->jdate($obj->datee),'day').''; + print ''; + print convertSecondToTime($obj->planned_workload, 'all'); + print ''; + print ''; + print ($obj->taskid>0)?$obj->progress.'%':''; + print ''; + print ''; + print convertSecondToTime($obj->timespent, 'all'); + print ''; + print ''; + if (! empty($obj->taskid)) + { + if (empty($obj->planned_workload) > 0) { + $percentcompletion = $langs->trans("WorkloadNotDefined"); + } else { + $percentcompletion = intval($obj->duration_effective*100/$obj->planned_workload).'%'; + } + } + print $percentcompletion; + print ''; + print "\n"; + + $i++; } + if ($num > $max) + { + print ''.$langs->trans("WarningTooManyDataPleaseUseMoreFilters").''; + } + + print ""; + + $db->free($resql); } else diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index b4260e8ea91..f00a6ef518b 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -27,6 +27,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load('projects'); @@ -61,8 +62,18 @@ $mine = $_REQUEST['mode']=='mine' ? 1 : 0; $search_ref=GETPOST("search_ref"); $search_label=GETPOST("search_label"); $search_societe=GETPOST("search_societe"); +$search_year=GETPOST("search_year"); $search_all=GETPOST("search_all"); +// Purge criteria +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers +{ + $search_ref=""; + $search_label=""; + $search_societe=""; + $search_year=""; + $search_all=0; +} /* * View @@ -98,6 +109,10 @@ if ($search_societe) { $sql .= natural_search('s.nom', $search_societe); } +if ($search_year) { + $sql .= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($search_year,12,false)).")"; + $sql .= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($search_year,1,false)).")"; +} if ($search_all) { $sql .= natural_search(array('p.ref','p.title','s.nom'), $search_all); @@ -147,8 +162,10 @@ if ($resql) print ''; print ''; print ' '; - print ''; - print "\n"; + print ''; + print ''; + print ''; + print ''; while ($i < $num) { diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index eaec5ae0816..850b76bd3b3 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -300,7 +300,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third print ''; print ''.$langs->trans("AffectedTo").''; - $contactsofproject=$object->getListContactId('internal'); + $contactsofproject=(! empty($object->id)?$object->getListContactId('internal'):''); $form->select_users($user->id,'userid',0,'',0,'',$contactsofproject); print ''; @@ -417,7 +417,7 @@ else print ''.$langs->trans("LabelTask").''; print ''.$langs->trans("DateStart").''; print ''.$langs->trans("DateEnd").''; - print ''.$langs->trans("PlannedWorkload").''; + print ''.$langs->trans("PlannedWorkload").''; print ''.$langs->trans("ProgressDeclared").''; print ''.$langs->trans("TimeSpent").''; print ''.$langs->trans("ProgressCalculated").''; diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index da002ef72d2..99d127fb9a9 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->fetch_thirdparty(); @@ -188,7 +188,7 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans("Label").''.$projectstatic->title.''; print ''.$langs->trans("ThirdParty").''; - if (! empty($projectstatic->thridparty->id)) print $projectstatic->thridparty->getNomUrl(1); + if (! empty($projectstatic->thirdparty->id)) print $projectstatic->thirdparty->getNomUrl(1); else print ' '; print ''; print ''; @@ -215,8 +215,6 @@ if ($id > 0 || ! empty($ref)) print ''; dol_fiche_end(); - - print '
    '; } // To verify role of users @@ -259,7 +257,7 @@ if ($id > 0 || ! empty($ref)) // Customer print "".$langs->trans("ThirdParty").""; print ''; - if ($projectstatic->thridparty->id > 0) print $projectstatic->thridparty->getNomUrl(1); + if ($projectstatic->thirdparty->id > 0) print $projectstatic->thirdparty->getNomUrl(1); else print ' '; print ''; } @@ -348,12 +346,9 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - $events=array(); - $events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); - $thirdpartyofproject=$projectstatic->getListContactId('thirdparty'); $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$projectstatic->societe->id; - $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', $thirdpartyofproject, 0, $events, '&withproject='.$withproject); + $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', $thirdpartyofproject, 0, '&withproject='.$withproject); print ''; print ''; diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 03ca7bae452..ee3b9288d3c 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -121,7 +121,7 @@ llxHeader('',$langs->trans('Task')); if ($object->id > 0) { - if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); + $projectstatic->fetch_thirdparty(); $userWrite = $projectstatic->restrictedProjectArea($user,'write'); @@ -152,7 +152,7 @@ if ($object->id > 0) print ''.$langs->trans("Label").''.$projectstatic->title.''; print ''.$langs->trans("ThirdParty").''; - if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1); + if (! empty($projectstatic->thirdparty->id)) print $projectstatic->thirdparty->getNomUrl(1); else print ' '; print ''; print ''; @@ -179,8 +179,6 @@ if ($object->id > 0) print ''; dol_fiche_end(); - - print '
    '; } $head = task_prepare_head($object); @@ -225,7 +223,7 @@ if ($object->id > 0) // Third party print ''.$langs->trans("ThirdParty").''; - if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1); + if ($projectstatic->thirdparty->id) print $projectstatic->thirdparty->getNomUrl(1); else print ' '; print ''; } diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index cdf90a918a3..a9b059fce81 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -51,7 +51,13 @@ $page = $page == -1 ? 0 : $page; $mine = $_REQUEST['mode']=='mine' ? 1 : 0; - +// Purge criteria +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers +{ + $search_project=""; + $search_status=""; +} +if (empty($search_status)) $search_status=1; /* * View @@ -86,7 +92,7 @@ else $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$socid); // Get list of tasks in tasksarray and taskarrayfiltered -// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him). +// We need all tasks (even not limited to a user because a task assigned to a user can have a parent that is not assigned to him and we need such parents). $tasksarray=$taskstatic->getTasksArray(0, 0, $projectstatic->id, $socid, 0, $search_project, $search_status); // We load also tasks limited to a particular user $tasksrole=($mine ? $taskstatic->getUserRolesForProjectsOrTasks(0,$user,$projectstatic->id,0) : ''); @@ -97,7 +103,7 @@ print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -122,11 +128,14 @@ print $form->selectarray('search_status', $listofstatus, $search_status); print ''; print ''; -print ''; -print "\n"; -if (count($tasksarray) > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)) +$max=1000; + +if (count($tasksarray) > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?$max:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)) { $langs->load("errors"); print ''; diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index 04e92c7c7f2..5b479085f61 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -51,7 +51,7 @@ if ($id > 0 || ! empty($ref)) if ($object->fetch($id,$ref) > 0) { $projectstatic->fetch($object->fk_project); - if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); + if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty(); $object->project = dol_clone($projectstatic); } @@ -134,7 +134,7 @@ if ($object->id > 0) // Company print ''; print ''; @@ -161,8 +161,6 @@ if ($object->id > 0) print '
    '.$langs->trans("Project").''.$langs->trans("Status").''.$langs->trans("ProjectStatus").''.$langs->trans("RefTask").''.$langs->trans("LabelTask").''.$langs->trans("DateStart").''; print ' '; +print ''; +print ''; +print ''; print '
    '.$langs->trans("ThirdParty").''; - if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1); + if (! empty($projectstatic->thirdparty->id)) print $projectstatic->thirdparty->getNomUrl(1); else print ' '; print '
    '; dol_fiche_end(); - - print '
    '; } $head = task_prepare_head($object); @@ -196,7 +194,7 @@ if ($object->id > 0) // Third party print ''.$langs->trans("ThirdParty").''; - if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1); + if ($projectstatic->thirdparty->id > 0) print $projectstatic->thirdparty->getNomUrl(1); else print' '; print ''; } diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 73400bbcc6e..a64d5354768 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -262,8 +262,6 @@ if ($id > 0 || ! empty($ref)) print ''; dol_fiche_end(); - - print '
    '; } /* @@ -295,9 +293,6 @@ if ($id > 0 || ! empty($ref)) //$arrayofuseridoftask=$object->getListContactId('internal'); $head=task_prepare_head($object); - dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask'); - - if ($action == 'edit' && $user->rights->projet->creer) { @@ -307,6 +302,8 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; + dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask'); + print ''; // Ref @@ -372,10 +369,12 @@ if ($id > 0 || ! empty($ref)) print '
    '; - print '

    '; + dol_fiche_end(); + + print '
    '; print '   '; print ''; - print '
    '; + print '
    '; print ''; } @@ -387,6 +386,8 @@ if ($id > 0 || ! empty($ref)) $param=($withproject?'&withproject=1':''); $linkback=$withproject?''.$langs->trans("BackToList").'':''; + dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask'); + if ($action == 'delete') { print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject,$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete"); @@ -471,12 +472,11 @@ if ($id > 0 || ! empty($ref)) print ''; + dol_fiche_end(); } - dol_fiche_end(); - - if ($_GET["action"] != 'edit') + if ($action != 'edit') { /* * Actions diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 676b17a5951..9951902ec5b 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -73,7 +73,7 @@ if ($action == 'addtimespent' && $user->rights->projet->creer) if (! $error) { - $object->fetch($id); + $object->fetch($id, $ref); $object->fetch_projet(); if (empty($object->projet->statut)) @@ -119,7 +119,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"]; @@ -194,7 +194,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->fetch_thirdparty(); @@ -259,8 +259,6 @@ if ($id > 0 || ! empty($ref)) print ''; dol_fiche_end(); - - print '
    '; } $head=task_prepare_head($object); @@ -296,22 +294,22 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans("DateStart").''; print dol_print_date($object->date_start,'dayhour'); print ''; - + // Date end print ''.$langs->trans("DateEnd").''; print dol_print_date($object->date_end,'dayhour'); print ''; - + // Planned workload print ''.$langs->trans("PlannedWorkload").''; print convertSecondToTime($object->planned_workload,'allhourmin'); print ''; - + // Progress declared print ''.$langs->trans("ProgressDeclared").''; print $object->progress.' %'; print ''; - + // Progress calculated print ''.$langs->trans("ProgressCalculated").''; if ($object->planned_workload) @@ -322,7 +320,7 @@ if ($id > 0 || ! empty($ref)) } else print ''; print ''; - + // Project if (empty($withproject)) { @@ -337,30 +335,6 @@ if ($id > 0 || ! empty($ref)) print ''; } - // Date start - print ''.$langs->trans("DateStart").''; - print dol_print_date($object->date_start,'dayhour'); - print ''; - - // Date end - print ''.$langs->trans("DateEnd").''; - print dol_print_date($object->date_end,'dayhour'); - print ''; - - // Planned workload - print ''.$langs->trans("PlannedWorkload").''.convertSecondToTime($object->planned_workload,'allhourmin').''; - - // Declared progress - print ''.$langs->trans("ProgressDeclared").''; - print $object->progress.' %'; - print ''; - - // Calculated progress - print ''.$langs->trans("ProgressCalculated").''; - if ($object->planned_workload) print round(100 * $object->duration_effective / $object->planned_workload,2).' %'; - else print ''; - print ''; - print ''; dol_fiche_end(); @@ -386,8 +360,7 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans("By").''; print ''.$langs->trans("Note").''; print ''.$langs->trans("ProgressDeclared").''; - print ''.$langs->trans("Duration").''; - print ' '; + print ''.$langs->trans("NewTimeSpent").''; print "\n"; print ''; @@ -400,11 +373,11 @@ if ($id > 0 || ! empty($ref)) // Contributor print ''; - print img_object('','user'); + print img_object('','user','class="hideonsmartphone"'); $contactsoftask=$object->getListContactId('internal'); if (count($contactsoftask)>0) { $userid=$contactsoftask[0]; - $form->select_users($userid,'userid',0,'',0,'',$contactsoftask); + print $form->select_dolusers($userid,'userid',0,'',0,'',$contactsoftask); }else { print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime'); } @@ -412,7 +385,7 @@ if ($id > 0 || ! empty($ref)) // Note print ''; - print ''; + print ''; print ''; // Progress declared @@ -420,7 +393,7 @@ if ($id > 0 || ! empty($ref)) print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress,'progress'); print ''; - // Duration + // Duration - Time spent print ''; print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text'); print ''; @@ -469,13 +442,14 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; + print ''; print ''; print ''; print ''; print ''; print ''; - print ''; + print ''; print ''; print "\n"; @@ -506,7 +480,7 @@ if ($id > 0 || ! empty($ref)) $contactsoftask[]=$task_time->fk_user; } if (count($contactsoftask)>0) { - $form->select_users($task_time->fk_user,'userid_line',0,'',0,'',$contactsoftask); + print $form->select_dolusers($task_time->fk_user,'userid_line',0,'',0,'',$contactsoftask); }else { print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime'); } @@ -524,7 +498,7 @@ if ($id > 0 || ! empty($ref)) print ''."\n"; print '
    '.$langs->trans("Date").''.$langs->trans("By").''.$langs->trans("Note").''.$langs->trans("Duration").''.$langs->trans("TimeSpent").' 
    '; if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid) { - print ''; + print ''; } else { diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index 5c2efc4a0ac..dba28538780 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -259,9 +259,7 @@ color: #444444 !important; margin: 8px 0px 8px 2px; -border-left: 1px solid #DDD; -border-right: 1px solid #DDD; -border-bottom: 1px solid #EEE; +border: 1px solid #bbb; border-radius: 8px; -moz-border-radius: 8px; @@ -269,11 +267,7 @@ border-radius: 8px; -webkit-box-shadow: 4px 4px 4px #EEE; box-shadow: 4px 4px 4px #EEE; -background-image: linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%); -background-image: -o-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%); -background-image: -moz-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%); -background-image: -webkit-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%); -background-image: -ms-linear-gradient(bottom, rgb(246,248,250) 15%, rgb(235,235,238) 100%); +background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%); } @@ -311,7 +305,7 @@ print "\n"; print ''; print '
    '; -print '
    Dolibarr logo

    '; +print '
    Dolibarr logo

    '; print '
    '; print $langs->trans("DemoDesc").'
    '; diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index c8628bd26a0..bb218e4c0cf 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -110,9 +110,9 @@ function llxHeaderVierge($title, $head="", $disablejs=0, $disablehead=0, $arrayo { $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png'; } - print '
    '; + print '
    '; print 'Logo'; - print '

    '; + print '
    '; print '
    '; } @@ -343,9 +343,9 @@ if ($action == 'added') // Si on a pas ete redirige print '
    '; - print '
    '; + print '
    '; print $langs->trans("NewMemberbyWeb"); - print '
    '; + print '
    '; llxFooterVierge(); exit; @@ -591,13 +591,13 @@ if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT) print "
    \n"; // Save -print '
    '; +print '
    '; print ''; if (! empty($backtopage)) { print '     '; } -print '
    '; +print ''; print "
    \n"; print ''; diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 47a93e39c32..0213ee7f6fa 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -166,7 +166,7 @@ if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcredi else if (! empty($conf->global->PAYBOX_CREDITOR)) $creditor=$conf->global->PAYBOX_CREDITOR; print ''."\n"; -print '
    '; +print '
    '; print '
    '; print ''; print ''; @@ -778,7 +778,7 @@ print '
    '."\n"; print ''."\n"; -print '
    '."\n"; +print '
    '."\n"; print '
    '; diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index afe685fb6ac..8c66f6157ba 100644 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -268,7 +268,7 @@ if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcredi else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR; print ''."\n"; -print '
    '."\n"; +print '
    '."\n"; print '
    '."\n"; print ''."\n"; print ''."\n"; @@ -870,7 +870,12 @@ if (GETPOST("source") == 'membersubscription' && $valid) // Amount $var=!$var; print ''.$langs->trans("Amount"); - if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; + if (empty($amount)) + { + print ' ('.$langs->trans("ToComplete"); + if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - '.$langs->trans("SeeHere").''; + print ')'; + } print ''; if (empty($amount) || ! is_numeric($amount)) { @@ -959,7 +964,7 @@ print ''."\n"; print ''."\n"; print '
    '."\n"; -print '
    '."\n"; +print ''."\n"; print '
    '; diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index b447be4574b..5ff161f0b1a 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -5,11 +5,13 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require '../../main.inc.php'; -if (!empty($conf->global->MAIN_FEATURES_LEVEL)) +if ($_SERVER['REMOTE_ADDR'] != '127.0.0.1') { - print "Page available onto dev environment only"; + print "Page available only frome remote address 127.0.0.1"; exit; } + + $usedolheader=0; // 1 = Test inside a dolibarr page, 0 = Use hard coded header @@ -30,16 +32,21 @@ if (empty($usedolheader)) + - + +" /> - + +-- + - + +
    - -
    -This page is a sample of page using tables. To make test with
    -- css (edit page to change)
    -- jmobile (edit page to enable/disable)
    +

    +This page is a sample of page using tables. It is designed to make test with
    +- css (edit page to change to test another css)
    +- jmobile (add parameter dol_use_jmobile=1 to enable view with jmobile)
    - dataTables
    - tablednd
    - +



    Example 0a : Table with div+div+div containg a select that should be overflowed and truncated => Use this to align text or form
    -
    +
    -
    +
    @@ -84,7 +90,7 @@ This page is a sample of page using tables. To make test with
    -
    +
    @@ -97,7 +103,7 @@ This page is a sample of page using tables. To make test with
    - + @@ -111,9 +117,8 @@ This page is a sample of page using tables. To make test with
    use_javascript_ajax) && $object->statut == 0) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; + if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; ?> -
    line3
    @@ -302,7 +307,7 @@ $('xxxth').replaceWith( - +


    Example 3 : Standard table => Use this if you need the drag and drop for lines
    @@ -310,11 +315,10 @@ $('xxxth').replaceWith( use_javascript_ajax) && $object->statut == 0) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; + if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; ?> - - +
    title1title2
    title1title2
    a1b1
    a2b2
    diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php index 126c9723fa7..ece0c218160 100644 --- a/htdocs/public/test/test_forms.php +++ b/htdocs/public/test/test_forms.php @@ -1,48 +1,31 @@ global->MAIN_FEATURES_LEVEL)) +if ($_SERVER['REMOTE_ADDR'] != '127.0.0.1') { - print "Page available onto dev environment only"; + print "Page available only frome remote address 127.0.0.1"; exit; } + + +llxHeader(); + ?> - - - - - - - -Test page - - - - - - - - - - - - - - - - -
    -
    -This page is a sample of page using html methods.
    +

    +This page is a sample of page using Dolibarr HTML widget methods. It is designed to make test with
    +- css (edit page to change to test another css)
    +- jmobile (add parameter dol_use_jmobile=1 to enable view with jmobile)
    +


    -select_date using tzuser date @@ -64,8 +47,41 @@ print '

    '."\n"; print "Test 3: We must have here 1970-01-01 00:00:00 selected (fields are mandatory)
    \n"; $form->select_date(dol_get_first_day(1970,1,false), 'test3', 1, 1, 0); -?> +print '

    '."\n"; -
    - - \ No newline at end of file +// Test4a: form->select_product +print "Test 4: Select product - "; +$form->select_produits(0,'producttest'); + +print '

    '."\n"; + +// Test4b: form->selectarray +print "Test 4: Select array - "; +$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3'); +$arrayselected=array(1,3); +print $form->selectarray('selectarray',$array); + +print '

    '."\n"; + +// Test5: a multiselect +print "Test 5: a multiselect
    \n"; +$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3'); +$arrayselected=array(1,3); +print $form->multiselectarray('testmulti', $array, $arrayselected, '', 0, '', 0, 250); + +print '

    '."\n"; + +// Test6: a select +print "Test 6a: a select
    \n"; +$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.'); +$selected=3; +print $form->selectarray('testselecta', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1); +print '

    '; +print "Test 6b: a select
    \n"; +$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3'); +$selected=3; +print $form->selectarray('testselectb', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1); + + +llxFooter(); +$db->close(); diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php index fde152b6185..679644ac9e0 100644 --- a/htdocs/resource/add.php +++ b/htdocs/resource/add.php @@ -32,7 +32,7 @@ if (! $res) die("Include of main fails"); require_once 'class/resource.class.php'; require_once 'class/html.formresource.class.php'; -// Load traductions files requiredby by page +// Load traductions files required by page $langs->load("resource"); $langs->load("companies"); $langs->load("other"); @@ -41,6 +41,7 @@ $langs->load("resource@resource"); // Get parameters $id = GETPOST('id','int'); $action = GETPOST('action','alpha'); +$cancel = GETPOST('cancel','alpha'); if (empty($sortorder)) $sortorder="DESC"; if (empty($sortfield)) $sortfield="t.rowid"; if (empty($arch)) $arch = 0; @@ -65,57 +66,64 @@ $object = new Resource($db); if ($action == 'confirm_add_resource') { - $error=''; - - $ref=GETPOST('ref','alpha'); - $description=GETPOST('description','alpha'); - $fk_code_type_resource=GETPOST('fk_code_type_resource','alpha'); - - if (empty($ref)) + if (! $cancel) { - $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")); - setEventMessage($mesg, 'errors'); - $error++; - } - - if (! $error) - { - $object=new Resource($db); - $object->ref=$ref; - $object->description=$description; - $object->fk_code_type_resource=$fk_code_type_resource; + $error=''; - $result=$object->create($user); - if ($result > 0) + $ref=GETPOST('ref','alpha'); + $description=GETPOST('description','alpha'); + $fk_code_type_resource=GETPOST('fk_code_type_resource','alpha'); + + if (empty($ref)) { - // Creation OK - $db->commit(); - setEventMessage($langs->trans('ResourceCreatedWithSuccess')); - Header("Location: card.php?id=" . $object->id); - return; + $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")); + setEventMessage($mesg, 'errors'); + $error++; + } + + if (! $error) + { + $object=new Resource($db); + $object->ref=$ref; + $object->description=$description; + $object->fk_code_type_resource=$fk_code_type_resource; + + $result=$object->create($user); + if ($result > 0) + { + // Creation OK + $db->commit(); + setEventMessage($langs->trans('ResourceCreatedWithSuccess')); + Header("Location: card.php?id=" . $object->id); + return; + } + else + { + // Creation KO + setEventMessage($object->error, 'errors'); + $action = ''; + } } else { - // Creation KO - setEventMessage($object->error, 'errors'); $action = ''; } } else { - $action = ''; + Header("Location: list.php"); } } -/*************************************************** -* VIEW -* -****************************************************/ +/* + * View + * + */ $form=new Form($db); $formresource = new FormResource($db); -if ( !$action ) +if (! $action) { $pagetitle=$langs->trans('AddResource'); llxHeader('',$pagetitle,''); @@ -161,8 +169,10 @@ if ( !$action ) print ''; - echo '
    ', - ' ', + echo '
    ', + '', + ' ', + '', '
    '; print ''; diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index b2ee3ae1814..33a27796aaf 100644 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -139,7 +139,7 @@ if ( $object->fetch($id) > 0 ) /*--------------------------------------- * Edit object - */ + */ print '
    '; print ''; print ''; @@ -171,7 +171,7 @@ if ( $object->fetch($id) > 0 ) } else { - // Confirmation suppression resource line + // Confirm deleting resource line if ($action == 'delete') { print $form->formconfirm("card.php?&id=".$id,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResource"),"confirm_delete_resource",'','',1); @@ -228,9 +228,9 @@ if ( $object->fetch($id) > 0 ) print '
    '; } } - if ($action != "delete" ) + if ($action != "delete" && $action != "edit") { - // Edit resource + // Delete resource if($user->rights->resource->delete) { print '
    '; diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index 19768f569e3..deea00f9c99 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -205,7 +205,7 @@ class Resource extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=0, $notrigger=0) + function update($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -388,7 +388,7 @@ class Resource extends CommonObject $sql.= " ty.label as type_label"; $sql.= " FROM ".MAIN_DB_PREFIX."resource as t"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource"; - //$sql.= " WHERE t.entity IN (".getEntity('resource').")"; + $sql.= " WHERE t.entity IN (".getEntity('resource',1).")"; //Manage filter if (!empty($filter)){ @@ -402,7 +402,7 @@ class Resource extends CommonObject } } $sql.= " GROUP BY t.rowid"; - $sql.= " ORDER BY $sortfield $sortorder "; + $sql.= $this->db->order($sortfield,$sortorder); if ($limit) $sql.= $this->db->plimit($limit+1,$offset); dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG); @@ -462,7 +462,7 @@ class Resource extends CommonObject $sql.= " t.fk_user_create,"; $sql.= " t.tms"; $sql.= ' FROM '.MAIN_DB_PREFIX .'element_resources as t '; - //$sql.= " WHERE t.entity IN (".getEntity('resource').")"; + $sql.= " WHERE t.entity IN (".getEntity('resource',1).")"; //Manage filter if (!empty($filter)){ @@ -476,7 +476,8 @@ class Resource extends CommonObject } } $sql.= " GROUP BY t.rowid"; - $sql.= " ORDER BY $sortfield $sortorder " . $this->db->plimit($limit+1,$offset); + $sql.= $this->db->order($sortfield,$sortorder); + if ($limit) $sql.= $this->db->plimit($limit+1,$offset); dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG); $resql=$this->db->query($sql); @@ -547,7 +548,7 @@ class Resource extends CommonObject $sql.= " t.fk_user_create,"; $sql.= " t.tms"; $sql.= ' FROM '.MAIN_DB_PREFIX .'element_resources as t '; - //$sql.= " WHERE t.entity IN (".getEntity('resource').")"; + $sql.= " WHERE t.entity IN (".getEntity('resource',1).")"; //Manage filter if (!empty($filter)){ @@ -561,7 +562,8 @@ class Resource extends CommonObject } } $sql.= " GROUP BY t.resource_id"; - $sql.= " ORDER BY " . $sortfield . " " . $sortorder . " " . $this->db->plimit($limit+1,$offset); + $sql.= $this->db->order($sortfield,$sortorder); + if ($limit) $sql.= $this->db->plimit($limit+1,$offset); dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG); $resql=$this->db->query($sql); @@ -633,7 +635,7 @@ class Resource extends CommonObject if (! $this->table_element) { - dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined", LOG_ERR); + dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined"); return -1; } @@ -695,7 +697,7 @@ class Resource extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update_element_resource($user=0, $notrigger=0) + function update_element_resource($user=null, $notrigger=0) { global $conf, $langs; $error=0; @@ -796,16 +798,20 @@ class Resource extends CommonObject return $resources; } + /* + * Return an int number of resources linked to the element + * + * @return int + */ function fetchElementResources($element,$element_id) { - $resources = $this->getElementResources($element,$element_id); - $i=0; - foreach($resources as $nb => $resource) - { - $this->lines[$i] = fetchObjectByElement($resource['resource_id'],$resource['resource_type']); - $i++; - } - return $i; + $resources = $this->getElementResources($element,$element_id); + $i=0; + foreach($resources as $nb => $resource) { + $this->lines[$i] = fetchObjectByElement($resource['resource_id'],$resource['resource_type']); + $i++; + } + return $i; } @@ -876,7 +882,7 @@ class Resource extends CommonObject $label=$langs->trans("ShowResource").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$lien.$this->ref.$lienfin; return $result; diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index 02a24735454..d50c9a4ec6f 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -1,6 +1,5 @@ +/* Copyright (C) 2013 Jean-François Ferry * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,7 +31,7 @@ require 'class/resource.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; // Load traductions files requiredby by page -$langs->load("resource@resource"); +$langs->load("resource"); $langs->load("other"); // Get parameters @@ -70,8 +69,9 @@ $resource_id = GETPOST('fk_resource','int'); $resource_type = GETPOST('resource_type','alpha'); $busy = GETPOST('busy','int'); $mandatory = GETPOST('mandatory','int'); +$cancel = GETPOST('cancel','alpha'); -if($action == 'add_element_resource' && !GETPOST('cancel')) +if($action == 'add_element_resource' && ! $cancel) { $objstat = fetchObjectByElement($element_id,$element); $res = $objstat->add_element_resource($resource_id,$resource_type,$busy,$mandatory); @@ -251,9 +251,6 @@ else foreach ($object->available_resources as $modresources => $resources) { - $langs->load($resources); - //print '

    '.$modresources.'

    '; - $resources=(array) $resources; // To be sure $resources is an array foreach($resources as $resource_obj) { @@ -301,7 +298,7 @@ else { print '
    '; print '
    '; - print 'Add resource'; + print ''.$langs->trans('AddResource').''; print '
    '; print '
    '; } diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 9a0fca19781..ab70bc9a338 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -1,6 +1,5 @@ +/* Copyright (C) 2013-2014 Jean-François Ferry * * 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 @@ -116,7 +115,7 @@ else print_liste_field_titre($langs->trans('Id'),$_SERVER['PHP_SELF'],'t.rowid','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'t.ref','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('ResourceType'),$_SERVER['PHP_SELF'],'ty.code','',$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('Edit')); + print_liste_field_titre($langs->trans('Action'),"","","","",'width="60" align="center"',"",""); print ''; foreach ($object->lines as $resource) @@ -128,7 +127,7 @@ else $style='style="background: orange;"'; print ''; - print $resource->id; + print ''.$resource->id.''; print ''; print ''; @@ -139,9 +138,14 @@ else print $resource->type_label; print ''; - print ''; - print ''.$langs->trans('View').' '; - print ''.$langs->trans('Edit').''; + print ''; + print ''; + print img_edit(); + print ''; + print ' '; + print ''; + print img_delete(); + print ''; print ''; print ''; diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php index 9bb756ac7ee..a0b72c80aea 100644 --- a/htdocs/societe/admin/contact_extrafields.php +++ b/htdocs/societe/admin/contact_extrafields.php @@ -68,7 +68,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("CompanySetup"),$linkback,'setup'); -$head = societe_admin_prepare_head(null); +$head = societe_admin_prepare_head(); dol_fiche_head($head, 'attributes_contacts', $langs->trans("ThirdParties"), 0, 'company'); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index f17a9d9f298..84a593d759a 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -711,7 +711,7 @@ print ' '."\n"; // Utilisation formulaire Ajax sur choix societe $var=!$var; print ""; -print ''.$form->textwithpicto($langs->trans("UseSearchToSelectCompany"),$langs->trans('UseSearchToSelectCompanyTooltip'),1).' '; +print ''.$form->textwithpicto($langs->trans("DelaiedFullListToSelectCompany"),$langs->trans('UseSearchToSelectCompanyTooltip'),1).' '; if (! $conf->use_javascript_ajax) { print ''; @@ -726,7 +726,7 @@ else '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')', '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')', ); - print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT",$arrval,$conf->global->COMPANY_USE_SEARCH_TO_SELECT); + print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT); print ''; print ''; print ""; @@ -735,7 +735,7 @@ print ''; $var=!$var; print ""; -print ''.$form->textwithpicto($langs->trans("UseSearchToSelectContact"),$langs->trans('UseSearchToSelectContactTooltip'),1).''; +print ''.$form->textwithpicto($langs->trans("DelaiedFullListToSelectContact"),$langs->trans('UseSearchToSelectContactTooltip'),1).''; if (! $conf->use_javascript_ajax) { print ''; @@ -750,7 +750,7 @@ else '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')', '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')', ); - print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT",$arrval,$conf->global->CONTACT_USE_SEARCH_TO_SELECT); + print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->CONTACT_USE_SEARCH_TO_SELECT); print ''; print ''; print ""; diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index 20c9068d4f6..748ba690ea0 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -158,7 +158,7 @@ else print '
    '; print $langs->trans("VATIntraManualCheck",$langs->trans("VATIntraCheckURL"),$langs->trans("VATIntraCheckURL")).'
    '; print '
    '; -print '
    '; +print '
    '; if ($messagetoshow) { diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index f08a4a2455c..55511922385 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -232,7 +232,7 @@ class Address * @param User $user Objet de l'utilisateur * @return int >0 si ok, <0 si ko */ - function fetch_lines($socid, $user=0) + function fetch_lines($socid, $user=null) { global $langs, $conf; @@ -325,7 +325,7 @@ class Address * @param User $user Objet de l'utilisateur * @return int >0 si ok, <0 si ko */ - function fetch_address($id, $user=0) + function fetch_address($id, $user=null) { global $langs; global $conf; @@ -426,7 +426,7 @@ class Address $lien = '    '; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label,'address').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$lienfin.' '); $result.=$lien.$this->label.$lienfin; return $result; } diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 79b59211b51..37e646d6b88 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -45,7 +45,6 @@ class CompanyBankAccount extends Account var $cle_rib; var $bic; var $iban; - var $iban_prefix; // deprecated var $proprio; var $owner_address; var $default_rib; @@ -141,7 +140,7 @@ class CompanyBankAccount extends Account $sql .= ",number='".$this->number."'"; $sql .= ",cle_rib='".$this->cle_rib."'"; $sql .= ",bic='".$this->bic."'"; - $sql .= ",iban_prefix = '".$this->iban_prefix."'"; + $sql .= ",iban_prefix = '".$this->iban."'"; $sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'"; $sql .= ",proprio = '".$this->db->escape($this->proprio)."'"; $sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'"; @@ -196,7 +195,6 @@ class CompanyBankAccount extends Account $this->cle_rib = $obj->cle_rib; $this->bic = $obj->bic; $this->iban = $obj->iban; - $this->iban_prefix = $obj->iban; // deprecated $this->domiciliation = $obj->domiciliation; $this->proprio = $obj->proprio; $this->owner_address = $obj->owner_address; diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index e95ec86066c..8f2e64874c6 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -878,6 +878,8 @@ class Societe extends CommonObject } } + $action='update'; + // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('thirdpartydao')); @@ -1750,7 +1752,7 @@ class Societe extends CommonObject $lien.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'">'; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin); + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name, 'company', 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$lien.($maxlen?dol_trunc($name,$maxlen):$name).$lienfin; @@ -2380,7 +2382,7 @@ class Societe extends CommonObject * * @param int $idprof 1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm) * @param string $value Value of profid - * @param int $socid Id of society if update + * @param int $socid Id of thirdparty if update * @return boolean true if exists, false if not */ function id_prof_exists($idprof,$value,$socid=0) @@ -2811,7 +2813,7 @@ class Societe extends CommonObject } else // For backward compatibility { - dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING); + dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR); include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; $country_code=getCountry($country_id,2,$this->db); // This need a SQL request, but it's the old feature that should not be used anymore $country_label=getCountry($country_id,0,$this->db); // This need a SQL request, but it's the old feature that should not be used anymore @@ -2901,10 +2903,10 @@ class Societe extends CommonObject } /** - * Check if thirdparty may using localtax or not + * Check if we must use localtax feature or not according to country (country of $mysocin most cases). * * @param int $localTaxNum To get info for only localtax1 or localtax2 - * @return array array(0=>boolean, 1=>boolean) + * @return boolean true or false */ function useLocalTax($localTaxNum=0) { @@ -2926,9 +2928,9 @@ class Societe extends CommonObject } /** - * Check if thirdparty is from a country using revenue stamps + * Check if we must use revenue stamps feature or not according to country (country of $mysocin most cases). * - * @return boolean Yes or no + * @return boolean true or false */ function useRevenueStamp() { diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index f89212e5fbc..f8b5829b03e 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -58,7 +58,7 @@ $month = GETPOST('month','int'); $year = GETPOST('year','int'); // Clean up on purge search criteria ? -if (GETPOST("button_removefilter")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $sref=''; $sprod_fulldescr=''; @@ -76,11 +76,18 @@ $langs->load("orders"); $langs->load("suppliers"); $langs->load("propal"); +// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array +$hookmanager->initHooks(array('consumptionthirdparty')); + /* * Actions */ +$parameters=array('id'=>$socid); +$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + /* diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index 2fde1ef5dcf..c2ad751f196 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -147,7 +147,7 @@ if ($object->id) print ''; - print '
    '; + dol_fiche_end(); $modulepart = 'societe'; $permission = $user->rights->societe->creer; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 243b55f01ca..a6a00bb0046 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -62,7 +62,7 @@ $rowspan=2; if (! empty($conf->barcode->enabled)) $rowspan++; print ''; print ''; -print ''; +print '
    '."\n"; print ''; print ''; print "'; //print ''; -print ''; -print "
    '.$langs->trans("SearchThirdparty").'
    "; @@ -78,8 +78,8 @@ if (! empty($conf->barcode->enabled)) print "
    "; print ':

    "; +print ''."\n"; +print "
    \n"; /* * Search contact @@ -87,18 +87,18 @@ print "
    "; $rowspan=2; if (! empty($conf->barcode->enabled)) $rowspan++; print '
    '; -print ''; -print ''; +print ''."\n"; +print '
    '."\n"; print ''; -print ''; +print ''."\n"; print "'; -print ''; +print ''."\n"; print "'; //print ''; -print ''; -print "
    '.$langs->trans("SearchContact").'
    '.$langs->trans("SearchContact").'
    "; print ':
    "; print ':

    "; +print ''."\n"; +print "
    \n"; /* * Statistics area @@ -134,7 +134,7 @@ if ($result) } else dol_print_error($db); -print ''; +print '
    '."\n"; print ''; if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(round($third['customer'])?1:0)+(round($third['supplier'])?1:0)+(round($third['other'])?1:0) >= 2)) { @@ -146,7 +146,7 @@ if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(rou if (! empty($conf->societe->enabled)) $dataseries[]=array('label'=>$langs->trans("Others"),'data'=>round($third['other'])); $data=array('series'=>$dataseries); dol_print_graph('stats',300,180,$data,1,'pie',0); - print ''; + print ''."\n"; } else { @@ -176,7 +176,7 @@ print $total; print ''; print '
    '.$langs->trans("Statistics").'
    '; -if (! empty($conf->categorie->enabled)) +if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $elementtype = 'societe'; @@ -267,12 +267,13 @@ if ($result) { $transRecordedType = $langs->trans("LastModifiedThirdParties",$max); + print "\n\n"; print ''; - print ''; + print ''; + print ''; + print ''; + print ''."\n"; $var=True; @@ -326,7 +327,8 @@ if ($result) $db->free(); - print "
    '.$transRecordedType.''; - print ' '; - print ''.$langs->trans('Status').''; - print '
    '.$transRecordedType.' '.$langs->trans('Status').'
    "; + print "\n"; + print "\n"; } } else diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index 7ab39a10ddc..0932144a860 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -292,8 +292,11 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; - print '

     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print '
    '; } elseif ($action == 'edit_customer_price') { @@ -368,8 +371,11 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; - print '

     '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print '
    '; } elseif ($action == 'showlog_customer_price') { diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index b95839d67b9..f57eb6a5b70 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 * @@ -71,7 +71,7 @@ if ($action == 'update' && ! $_POST["cancel"]) $account->number = $_POST["number"]; $account->cle_rib = $_POST["cle_rib"]; $account->bic = $_POST["bic"]; - $account->iban_prefix = $_POST["iban_prefix"]; + $account->iban = $_POST["iban"]; $account->domiciliation = $_POST["domiciliation"]; $account->proprio = $_POST["proprio"]; $account->owner_address = $_POST["owner_address"]; @@ -129,7 +129,7 @@ if ($action == 'add' && ! $_POST["cancel"]) $account->number = $_POST["number"]; $account->cle_rib = $_POST["cle_rib"]; $account->bic = $_POST["bic"]; - $account->iban_prefix = $_POST["iban_prefix"]; + $account->iban = $_POST["iban"]; $account->domiciliation = $_POST["domiciliation"]; $account->proprio = $_POST["proprio"]; $account->owner_address = $_POST["owner_address"]; @@ -185,6 +185,7 @@ if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes') } } + /* * View */ @@ -292,7 +293,7 @@ if ($socid && $action != 'edit' && $action != "create") } print ''.$langs->trans("IBAN").''; - print ''.$account->iban_prefix.''; + print ''.$account->iban.''; print ''.$langs->trans("BIC").''; print ''.$account->bic.''; @@ -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 ''.$rib->label.''; // Bank name @@ -382,7 +388,7 @@ if ($socid && $action != 'edit' && $action != "create") } if (count($rib_list) == 0) { - print ''.$langs->trans("NoBANRecord").''; + print ''.$langs->trans("NoBANRecord").''; } print ''; @@ -458,7 +464,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) if ($val == 'AccountNumber') { - print ''.$langs->trans("BankAccountNumber").''; + print ''.$langs->trans("BankAccountNumber").''; print ''; print ''; } @@ -475,14 +481,14 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) } // IBAN - print ''.$langs->trans("IBAN").''; - print ''; + print ''.$langs->trans("IBAN").''; + print ''; - print ''.$langs->trans("BIC").''; + print ''.$langs->trans("BIC").''; print ''; print ''.$langs->trans("BankAccountDomiciliation").''; - print ""; @@ -497,9 +503,11 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) print '
    '; - print '
    '; - print '   '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } @@ -556,7 +564,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer) // IBAN print ''.$langs->trans("IBAN").''; - print ''; + print ''; print ''.$langs->trans("BIC").''; print ''; @@ -577,9 +585,11 @@ if ($socid && $action == 'create' && $user->rights->societe->creer) print '
    '; - print '
    '; - print '   '; - print '
    '; + print '
    '; + print ''; + print '     '; + print ''; + print '
    '; print ''; } diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 0a5a9303d90..67757376569 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -65,7 +65,7 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); // Get object canvas (By default, this is not defined, so standard usage of dolibarr) $object->getCanvas($socid); $canvas = $object->canvas?$object->canvas:GETPOST("canvas"); -$objcanvas=''; +$objcanvas=null; if (! empty($canvas)) { require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; @@ -106,7 +106,6 @@ if (empty($reshook)) { //obtidre selected del combobox $value=GETPOST('lt1'); - $object = new Societe($db); $object->fetch($socid); $res=$object->setValueFrom('localtax1_value', $value); } @@ -114,7 +113,6 @@ if (empty($reshook)) { //obtidre selected del combobox $value=GETPOST('lt2'); - $object = new Societe($db); $object->fetch($socid); $res=$object->setValueFrom('localtax2_value', $value); } @@ -583,14 +581,22 @@ if (empty($reshook)) * View */ -$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; -llxHeader('',$langs->trans("ThirdParty"),$help_url); - $form = new Form($db); $formfile = new FormFile($db); $formadmin = new FormAdmin($db); $formcompany = new FormCompany($db); +if ($socid > 0 && empty($object->id)) +{ + $res=$object->fetch($socid); + if ($result <= 0) dol_print_error('',$object->error); +} + +$title=$langs->trans("ThirdParty"); +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name; +$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; +llxHeader('',$title,$help_url); + $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')'; if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) @@ -598,12 +604,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) // ----------------------------------------- // When used with CANVAS // ----------------------------------------- - if (empty($object->error) && $socid) - { - $object = new Societe($db); - $result=$object->fetch($socid); - if ($result <= 0) dol_print_error('',$object->error); - } $objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates $objcanvas->display_canvas($action); // Show template } @@ -782,16 +782,19 @@ else print '
    '; print $langs->trans("ThirdPartyType").':     '; print '
    '; - print ''; print ''; print '     '; - print ''; - print ' '; - print $langs->trans("Individual"); - print ' ('.$langs->trans("ToCreateContactWithSameName").')'; + print ''; print '
    '; print "
    \n"; } @@ -809,6 +812,8 @@ else print ''; if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print ''; + dol_fiche_head(null, 'card', '', 0, ''); + print ''; // Name, firstname @@ -1051,14 +1056,7 @@ else print $form->selectyesno('localtax2assuj_value',0,1); print ''; } -/* - if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || GETPOST("type")=='') ) - { - print ''; - } -*/ + if (! empty($conf->global->MAIN_MULTILANGS)) { print '
    '.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; - print $form->selectyesno('localtax2assuj_value',0,1); - print '
    '."\n"; @@ -1095,9 +1093,11 @@ else print '
    '."\n"; - print '
    '; + dol_fiche_end(); + + print '
    '; print ''; - print '
    '."\n"; + print '
    '."\n"; print ''."\n"; } @@ -1111,9 +1111,6 @@ else if ($socid) { - $object = new Societe($db); - $res=$object->fetch($socid); - if ($res < 0) { dol_print_error($db,$object->error); exit; } $res=$object->fetch_optionals($object->id,$extralabels); //if ($res < 0) { dol_print_error($db); exit; } @@ -1608,11 +1605,11 @@ else print ''; print '
    '; - print '
    '; + print '
    '; print ''; - print '     '; + print '     '; print ''; - print '
    '; + print '
    '; print ''; @@ -1624,9 +1621,6 @@ else /* * View */ - $object = new Societe($db); - $res=$object->fetch($socid); - if ($res < 0) { dol_print_error($db,$object->error); exit; } $res=$object->fetch_optionals($object->id,$extralabels); //if ($res < 0) { dol_print_error($db); exit; } @@ -1727,7 +1721,7 @@ else // Status print ''.$langs->trans("Status").''; print ''; - if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer) { + if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { print ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased'); } else { print $object->getLibStatut(2); diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php index f0b3532018b..2d046a3ec16 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -153,7 +153,7 @@ llxHeader('',$langs->trans("ThirdParty"),$help_url); // Do we click on purge search criteria ? -if (GETPOST("button_removefilter_x")) +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_categ=''; $search_sale=''; diff --git a/htdocs/support/default.css b/htdocs/support/default.css index 14454a19245..ea62df52ef0 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -148,3 +148,11 @@ background: #DDDFDD; table { font-size: 12px; } table.login { border: 1px solid #C0C0C0; background: #F0F0F0; font-size: 12px; } + +.inline-block +{ + display:inline-block; + vertical-align: top; + margin: 12px; + min-width: 400px; +} 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 diff --git a/htdocs/theme/amarok/img/object_phoning_fax.png b/htdocs/theme/amarok/img/object_phoning_fax.png new file mode 100644 index 00000000000..b1266e84127 Binary files /dev/null and b/htdocs/theme/amarok/img/object_phoning_fax.png differ diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index abfeef4aa2a..bd41d0735a5 100644 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -298,7 +298,7 @@ div.floatright { float:; } -div.inline-block +.inline-block { display:inline-block; } diff --git a/htdocs/theme/auguria/img/object_phoning_fax.png b/htdocs/theme/auguria/img/object_phoning_fax.png new file mode 100644 index 00000000000..36cdcc8d4a2 Binary files /dev/null and b/htdocs/theme/auguria/img/object_phoning_fax.png differ diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 6e4ba602ade..35e0cdd36c9 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -196,7 +196,7 @@ div.floatright { float:; } -div.inline-block +.inline-block { display:inline-block; } diff --git a/htdocs/theme/bureau2crea/img/object_phoning_fax.png b/htdocs/theme/bureau2crea/img/object_phoning_fax.png new file mode 100644 index 00000000000..9f5a14edd23 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/object_phoning_fax.png differ diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index b4573c1fc13..b720bd4a802 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -221,7 +221,7 @@ div.floatright { float:; } -div.inline-block +.inline-block { display:inline-block; } diff --git a/htdocs/theme/cameleo/img/object_phoning_fax.png b/htdocs/theme/cameleo/img/object_phoning_fax.png new file mode 100644 index 00000000000..9f5a14edd23 Binary files /dev/null and b/htdocs/theme/cameleo/img/object_phoning_fax.png differ diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 096eab6c74d..a49ad6daaec 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -197,7 +197,7 @@ div.floatright { float:; } -div.inline-block +.inline-block { display:inline-block; } diff --git a/htdocs/theme/dolibarr_preferred_partner_int.png b/htdocs/theme/dolibarr_preferred_partner_int.png new file mode 100755 index 00000000000..c72d6153ddc Binary files /dev/null and b/htdocs/theme/dolibarr_preferred_partner_int.png differ diff --git a/htdocs/theme/eldy/img/menus/agenda.png b/htdocs/theme/eldy/img/menus/agenda.png index 866037c9b54..0798d15f938 100644 Binary files a/htdocs/theme/eldy/img/menus/agenda.png and b/htdocs/theme/eldy/img/menus/agenda.png differ diff --git a/htdocs/theme/eldy/img/menus/agenda_over.png b/htdocs/theme/eldy/img/menus/agenda_over.png new file mode 100644 index 00000000000..bdebed8fa26 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/agenda_over.png differ diff --git a/htdocs/theme/eldy/img/menus/bank.png b/htdocs/theme/eldy/img/menus/bank.png index 9c6300eae32..fbaee7cc6bd 100644 Binary files a/htdocs/theme/eldy/img/menus/bank.png and b/htdocs/theme/eldy/img/menus/bank.png differ 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 00000000000..d395710a877 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/bank_over.png differ diff --git a/htdocs/theme/eldy/img/menus/commercial.png b/htdocs/theme/eldy/img/menus/commercial.png index efc1b3f0608..df9b443ceec 100644 Binary files a/htdocs/theme/eldy/img/menus/commercial.png and b/htdocs/theme/eldy/img/menus/commercial.png differ diff --git a/htdocs/theme/eldy/img/menus/commercial_over.png b/htdocs/theme/eldy/img/menus/commercial_over.png new file mode 100644 index 00000000000..5fc4f661821 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/commercial_over.png differ diff --git a/htdocs/theme/eldy/img/menus/company.png b/htdocs/theme/eldy/img/menus/company.png index 95e5db62046..828bf8f2e70 100644 Binary files a/htdocs/theme/eldy/img/menus/company.png and b/htdocs/theme/eldy/img/menus/company.png differ diff --git a/htdocs/theme/eldy/img/menus/company_over.png b/htdocs/theme/eldy/img/menus/company_over.png new file mode 100644 index 00000000000..bed6b8dcbfb Binary files /dev/null and b/htdocs/theme/eldy/img/menus/company_over.png differ diff --git a/htdocs/theme/eldy/img/menus/cron.png b/htdocs/theme/eldy/img/menus/cron.png deleted file mode 100644 index ddfe62e7b24..00000000000 Binary files a/htdocs/theme/eldy/img/menus/cron.png and /dev/null differ diff --git a/htdocs/theme/eldy/img/menus/ecm.png b/htdocs/theme/eldy/img/menus/ecm.png index a9a975219cd..542ff5766e1 100644 Binary files a/htdocs/theme/eldy/img/menus/ecm.png and b/htdocs/theme/eldy/img/menus/ecm.png differ diff --git a/htdocs/theme/eldy/img/menus/ecm_over.png b/htdocs/theme/eldy/img/menus/ecm_over.png new file mode 100644 index 00000000000..269258a8cfb Binary files /dev/null and b/htdocs/theme/eldy/img/menus/ecm_over.png differ diff --git a/htdocs/theme/eldy/img/menus/externalsite.png b/htdocs/theme/eldy/img/menus/externalsite.png index 0bf9138d463..01e30553fc5 100644 Binary files a/htdocs/theme/eldy/img/menus/externalsite.png and b/htdocs/theme/eldy/img/menus/externalsite.png differ 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 00000000000..8e227ddc83f Binary files /dev/null and b/htdocs/theme/eldy/img/menus/externalsite_over.png differ diff --git a/htdocs/theme/eldy/img/menus/ftp.png b/htdocs/theme/eldy/img/menus/ftp.png new file mode 100644 index 00000000000..d9d96f0255b Binary files /dev/null and b/htdocs/theme/eldy/img/menus/ftp.png differ 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 00000000000..e3ea742e7c7 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/ftp_over.png differ diff --git a/htdocs/theme/eldy/img/menus/generic1.png b/htdocs/theme/eldy/img/menus/generic1.png index 0222dd8c81d..39f808bed32 100644 Binary files a/htdocs/theme/eldy/img/menus/generic1.png and b/htdocs/theme/eldy/img/menus/generic1.png differ 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 00000000000..adfa8c1599b Binary files /dev/null and b/htdocs/theme/eldy/img/menus/generic1_over.png differ diff --git a/htdocs/theme/eldy/img/menus/generic2.png b/htdocs/theme/eldy/img/menus/generic2.png index 86847858c4a..f4dfc5f360a 100644 Binary files a/htdocs/theme/eldy/img/menus/generic2.png and b/htdocs/theme/eldy/img/menus/generic2.png differ diff --git a/htdocs/theme/eldy/img/menus/generic2_over.png b/htdocs/theme/eldy/img/menus/generic2_over.png new file mode 100644 index 00000000000..c8e58fc2220 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/generic2_over.png differ diff --git a/htdocs/theme/eldy/img/menus/generic3.png b/htdocs/theme/eldy/img/menus/generic3.png index e22f73aa6f9..00769352dae 100644 Binary files a/htdocs/theme/eldy/img/menus/generic3.png and b/htdocs/theme/eldy/img/menus/generic3.png differ 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 00000000000..0672d20bce4 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/generic3_over.png differ diff --git a/htdocs/theme/eldy/img/menus/generic4.png b/htdocs/theme/eldy/img/menus/generic4.png index 29a3d7fed67..5f9240240da 100644 Binary files a/htdocs/theme/eldy/img/menus/generic4.png and b/htdocs/theme/eldy/img/menus/generic4.png differ 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 00000000000..6a4d7b1acce Binary files /dev/null and b/htdocs/theme/eldy/img/menus/generic4_over.png differ diff --git a/htdocs/theme/eldy/img/menus/globe.png b/htdocs/theme/eldy/img/menus/globe.png index 073348a5246..8c2380eda13 100644 Binary files a/htdocs/theme/eldy/img/menus/globe.png and b/htdocs/theme/eldy/img/menus/globe.png differ diff --git a/htdocs/theme/eldy/img/menus/globe_over.png b/htdocs/theme/eldy/img/menus/globe_over.png new file mode 100644 index 00000000000..fd1e54f4754 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/globe_over.png differ diff --git a/htdocs/theme/eldy/img/menus/holiday.png b/htdocs/theme/eldy/img/menus/holiday.png index 42c519aa63d..493974477f3 100644 Binary files a/htdocs/theme/eldy/img/menus/holiday.png and b/htdocs/theme/eldy/img/menus/holiday.png differ diff --git a/htdocs/theme/eldy/img/menus/home.png b/htdocs/theme/eldy/img/menus/home.png index f4d0d917d1f..2c174340c76 100644 Binary files a/htdocs/theme/eldy/img/menus/home.png and b/htdocs/theme/eldy/img/menus/home.png differ diff --git a/htdocs/theme/eldy/img/menus/home_over.png b/htdocs/theme/eldy/img/menus/home_over.png new file mode 100644 index 00000000000..ff0d692307f Binary files /dev/null and b/htdocs/theme/eldy/img/menus/home_over.png differ diff --git a/htdocs/theme/eldy/img/menus/mail.png b/htdocs/theme/eldy/img/menus/mail.png index 39434770f60..b7ff50e3d99 100644 Binary files a/htdocs/theme/eldy/img/menus/mail.png and b/htdocs/theme/eldy/img/menus/mail.png differ diff --git a/htdocs/theme/eldy/img/menus/mail_over.png b/htdocs/theme/eldy/img/menus/mail_over.png new file mode 100644 index 00000000000..f9de32d3002 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/mail_over.png differ diff --git a/htdocs/theme/eldy/img/menus/members.png b/htdocs/theme/eldy/img/menus/members.png index 4b703f42cd7..fb72919971c 100644 Binary files a/htdocs/theme/eldy/img/menus/members.png and b/htdocs/theme/eldy/img/menus/members.png differ 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 00000000000..8c77498c304 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/members_over.png differ diff --git a/htdocs/theme/eldy/img/menus/money.png b/htdocs/theme/eldy/img/menus/money.png index 50166e0f74b..503e5c67519 100644 Binary files a/htdocs/theme/eldy/img/menus/money.png and b/htdocs/theme/eldy/img/menus/money.png differ 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 00000000000..9a501e762d0 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/money_over.png differ diff --git a/htdocs/theme/eldy/img/menus/pointofsale.png b/htdocs/theme/eldy/img/menus/pointofsale.png index 748ec41b1e6..6bb68041d19 100644 Binary files a/htdocs/theme/eldy/img/menus/pointofsale.png and b/htdocs/theme/eldy/img/menus/pointofsale.png differ diff --git a/htdocs/theme/eldy/img/menus/pointofsale_over.png b/htdocs/theme/eldy/img/menus/pointofsale_over.png new file mode 100644 index 00000000000..4abe7219694 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/pointofsale_over.png differ diff --git a/htdocs/theme/eldy/img/menus/products.png b/htdocs/theme/eldy/img/menus/products.png index 1831440b1d3..a5ecf2ceb78 100644 Binary files a/htdocs/theme/eldy/img/menus/products.png and b/htdocs/theme/eldy/img/menus/products.png differ 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 00000000000..0a5d9a7951f Binary files /dev/null and b/htdocs/theme/eldy/img/menus/products_over.png differ diff --git a/htdocs/theme/eldy/img/menus/project.png b/htdocs/theme/eldy/img/menus/project.png index 882235d2cd3..ae4d177c6cd 100644 Binary files a/htdocs/theme/eldy/img/menus/project.png and b/htdocs/theme/eldy/img/menus/project.png differ 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 00000000000..d6c28b6d7ee Binary files /dev/null and b/htdocs/theme/eldy/img/menus/project_over.png differ diff --git a/htdocs/theme/eldy/img/menus/shop.png b/htdocs/theme/eldy/img/menus/shop.png new file mode 100644 index 00000000000..fab7db59040 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/shop.png differ 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 00000000000..bda5823f8c3 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/shop_over.png differ diff --git a/htdocs/theme/eldy/img/menus/tools.png b/htdocs/theme/eldy/img/menus/tools.png index ed5d0326c43..de7f2b7b221 100644 Binary files a/htdocs/theme/eldy/img/menus/tools.png and b/htdocs/theme/eldy/img/menus/tools.png differ 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 00000000000..80f9a7f553a Binary files /dev/null and b/htdocs/theme/eldy/img/menus/tools_over.png differ diff --git a/htdocs/theme/eldy/img/object_action.png b/htdocs/theme/eldy/img/object_action.png index 001b0cf9b76..0b02fada414 100644 Binary files a/htdocs/theme/eldy/img/object_action.png and b/htdocs/theme/eldy/img/object_action.png differ diff --git a/htdocs/theme/eldy/img/object_address.png b/htdocs/theme/eldy/img/object_address.png index a4b878966dc..201577281f0 100644 Binary files a/htdocs/theme/eldy/img/object_address.png and b/htdocs/theme/eldy/img/object_address.png differ diff --git a/htdocs/theme/eldy/img/object_phoning.png b/htdocs/theme/eldy/img/object_phoning.png index 36cdcc8d4a2..23a4e0b1dbb 100644 Binary files a/htdocs/theme/eldy/img/object_phoning.png and b/htdocs/theme/eldy/img/object_phoning.png differ diff --git a/htdocs/theme/eldy/img/object_phoning_fax.png b/htdocs/theme/eldy/img/object_phoning_fax.png new file mode 100644 index 00000000000..03d96a1e414 Binary files /dev/null and b/htdocs/theme/eldy/img/object_phoning_fax.png differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3eb64ad5c2e..bb5941c8130 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']); @@ -63,7 +64,7 @@ $theme='eldy'; // Value of theme if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } // Define image path files and other constants -$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; +$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Helvetica, Verdana, Arial, sans-serif'; $img_head=''; $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); $dol_hide_topmenu=$conf->dol_hide_topmenu; @@ -99,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 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'; @@ -124,19 +125,15 @@ 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'; - /*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,14 @@ 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)); + +// 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] : ''); @@ -263,7 +268,7 @@ input, textarea, select { border-top:solid 1px rgba(0,0,0,.3); border-bottom:solid 1px rgba(0,0,0,.2); /* box-shadow: 1px 1px 1px rgba(0,0,0,.2) inset;*/ - padding:2px; + padding:4px; margin-left:1px; margin-bottom:1px; margin-top:1px; @@ -434,6 +439,8 @@ th .button { /* ============================================================================== */ .hideobject { display: none; } +.minwidth100 { min-width: 100px; } +.minwidth200 { min-width: 200px; } .hideonsmartphone { display: none; } .noenlargeonsmartphone { width : 50px !important; display: inline !important; } @@ -672,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; } @@ -849,7 +856,7 @@ form#login { vertical-align: middle; } .login_table_title { - max-width: 540px; + max-width: 530px; color: #888888; text-shadow: 1px 1px 1px #FFF; } @@ -861,9 +868,9 @@ form#login { margin-right: 10px; padding-left:6px; padding-right:6px; - padding-top:12px; + padding-top:16px; padding-bottom:12px; - max-width: 540px; + max-width: 560px; background-color: #FFFFFF; @@ -891,12 +898,21 @@ div#login_left, div#login_right { display: inline-block; min-width: 245px; padding-top: 10px; + padding-left: 16px; + padding-right: 16px; text-align: center; vertical-align: middle; } table.login_table tr td table.none tr td { padding: 2px; } +table.login_table_securitycode { + border-spacing: 0px; +} +table.login_table_securitycode tr td { + padding-left: 0px; + padding-right: 4px; +} #securitycode { min-width: 60px; } @@ -957,6 +973,18 @@ img.login, img.printer, img.entity { font-weight: bold; } +.span-icon-user { + background: url() no-repeat scroll 7px 7px; +} +.span-icon-password { + background-image: url(); + background-repeat: no-repeat; +} +/* +.span-icon-user input, .span-icon-password input { + margin-right: 30px; +} +*/ /* ============================================================================== */ /* Menu gauche */ @@ -1832,7 +1860,7 @@ table.liste td { } */ -.impair:hover { +.impair:hover, td.nohover { background: rgb(); @@ -1843,13 +1871,13 @@ table.liste td { .impair, .nohover .impair:hover, tr.impair td.nohover { - background: linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background: #eaeaea !important; + background: #eaeaea; font-family: ; border: 0px; @@ -1858,24 +1886,24 @@ table.liste td { min-height: 18px; /* seems to not be used */ } -td.nohover, .pair:hover { +.pair:hover { - background: rgb() !important; + background: rgb(); - background: #fafafa !important; + background: #fafafa; border: 0px; } .pair, .nohover .pair:hover, tr.pair td.nohover { - background: linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background: #ffffff !important; + background: #ffffff; font-family: ; border: 0px; @@ -1951,6 +1979,10 @@ input.liste_titre { background: none; } +.margintable td { + border: 0px !important; +} + /* Disable shadows */ .noshadow { -moz-box-shadow: 0px 0px 0px #DDD !important; @@ -1969,18 +2001,6 @@ div.tabBar .noborder { * Boxes */ -.tdboxstats { - - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - - background: #ffffff !important; - -} - .boxstats { margin: 3px; @@ -2455,6 +2475,7 @@ li.cal_event { border: none; list-style-type: none; } cursor:pointer; } + /* ============================================================================== */ /* jQuery - jeditable */ /* ============================================================================== */ @@ -2643,7 +2664,7 @@ A.none, A.none:active, A.none:visited, A.none:hover { { line-height: 1em !important; } -.ui-autocomplete-input { margin: 0; padding: 2px; } +.ui-autocomplete-input { margin: 0; padding: 4px; } /* ============================================================================== */ @@ -2911,6 +2932,38 @@ div.dolEventError h1, div.dolEventError h2 { background-image: none; } +/* ============================================================================== */ +/* Select2 */ +/* ============================================================================== */ + +.select2-choice, +.select2-drop.select2-drop-above.select2-drop-active, +.select2-container-active .select2-choice, +.select2-container-active .select2-choices, +.select2-dropdown-open.select2-drop-above .select2-choice, +.select2-dropdown-open.select2-drop-above .select2-choices, +.select2-container-multi.select2-container-active .select2-choices +{ + border: 1px solid #aaa; +} + +.select2-drop-active +{ + border: 1px solid #aaa; + border-top: none; +} +a span.select2-chosen +{ + font-weight: normal !important; +} +.select2-container .select2-choice { + background-image: none; +} +.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit +{ + background: #FFFFFF; +} + /* ============================================================================== */ /* JMobile */ diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index 1993f12bd5c..e46647f3b69 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -122,6 +122,10 @@ $arrayofcss=array(); llxHeader('',$langs->trans("UserSetup"),'','',0,0,$arrayofjs,$arrayofcss); + +print '
    '; +print ''; + $head=user_prepare_head($fuser); dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user'); @@ -129,9 +133,6 @@ dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user'); print $langs->trans("AgendaExtSitesDesc")."
    \n"; print "
    \n"; -print ''; -print ''; - $selectedvalue=$conf->global->AGENDA_DISABLE_EXT; if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1; @@ -172,15 +173,15 @@ while ($i <= $MAXAGENDA) } print ''; -print '
    '; -print '
    '; +dol_fiche_end(); + +print '
    '; print "trans("Save")."\">"; -print "
    "; +print "
    "; print "\n"; -dol_fiche_end(); llxFooter(); diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 9c2290cc629..fe86717a4c9 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -37,7 +37,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; -//if (! empty($conf->agenda->enabled))require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; if (! empty($conf->ldap->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; if (! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php'); @@ -1010,7 +1009,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print "\n"; - print '

    '; + print '
    '; print ""; } @@ -2127,11 +2126,11 @@ else print ''; - print '
    '; + print '
    '; print ''; - print '   '; + print '     '; print ''; - print '
    '; + print '
    '; print ''; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index b91356f7b88..9ea4f3de9c5 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -138,7 +138,7 @@ class User extends CommonObject * * @param int $id Si defini, id a utiliser pour recherche * @param string $login Si defini, login a utiliser pour recherche - * @param strinf $sid Si defini, sid a utiliser pour recherche + * @param string $sid Si defini, sid a utiliser pour recherche * @param int $loadpersonalconf Also load personal conf of user (in $user->conf->xxx) * @return int <0 if KO, 0 not found, >0 if OK */ @@ -1265,7 +1265,10 @@ class User extends CommonObject } } + $action='update'; + // Actions on extra fields (by external module or standard code) + // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('userdao')); $parameters=array('socid'=>$this->id); $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks @@ -1659,7 +1662,7 @@ class User extends CommonObject /** * Add user into a group * - * @param Group $group Id of group + * @param int $group Id of group * @param int $entity Entity * @param int $notrigger Disable triggers * @return int <0 if KO, >0 if OK @@ -1718,7 +1721,7 @@ class User extends CommonObject /** * Remove a user from a group * - * @param Group $group Id of group + * @param int $group Id of group * @param int $entity Entity * @param int $notrigger Disable triggers * @return int <0 if KO, >0 if OK @@ -1789,10 +1792,10 @@ class User extends CommonObject if ($withpicto) { - $result.=($lien.img_object($langs->trans("ShowUser"),'user').$lienfin); + $result.=($lien.img_object($langs->trans("ShowUser"), 'user', 'class="classfortooltip"').$lienfin); if ($withpicto != 2) $result.=' '; } - $result.=$lien.$this->getFullName($langs,'','',16).$lienfin; + $result.=$lien.$this->getFullName($langs,'','',24).$lienfin; return $result; } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index e096f8fc470..5ff1a928d1c 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -620,16 +620,10 @@ class UserGroup extends CommonObject if ($this->update(1) < 0) return -2; - if (! $notrigger) - { - // Call trigger - $result=$this->call_trigger('GROUP_CREATE',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } - // End call triggers - } - + $action='create'; // Actions on extra fields (by external module or standard code) + // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('groupdao')); $parameters=array(); $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks @@ -646,6 +640,14 @@ class UserGroup extends CommonObject } else if ($reshook < 0) $error++; + if (! $error && ! $notrigger) + { + // Call trigger + $result=$this->call_trigger('GROUP_CREATE',$user); + if ($result < 0) { $error++; $this->db->rollback(); return -1; } + // End call triggers + } + if ($error > 0) { $error++; $this->db->rollback(); return -1; } else $this->db->commit(); @@ -689,15 +691,10 @@ class UserGroup extends CommonObject $resql = $this->db->query($sql); if ($resql) { - if (! $notrigger) - { - // Call trigger - $result=$this->call_trigger('GROUP_MODIFY',$user); - if ($result < 0) { $error++; } - // End call triggers - } + $action='update'; // Actions on extra fields (by external module or standard code) + // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('groupdao')); $parameters=array(); $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks @@ -714,6 +711,14 @@ class UserGroup extends CommonObject } else if ($reshook < 0) $error++; + if (! $error && ! $notrigger) + { + // Call trigger + $result=$this->call_trigger('GROUP_MODIFY',$user); + if ($result < 0) { $error++; } + // End call triggers + } + if (! $error) { $this->db->commit(); diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 3dc3c14cc12..f72a8eb0f15 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -155,10 +155,10 @@ if ($id > 0) print ''; - print '
    '; - print '     '; + print '
    '; + print '     '; print ''; - print '
    '; + print '
    '; print ''; } diff --git a/htdocs/user/document.php b/htdocs/user/document.php index b18424625ce..2659b9427c8 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -88,10 +88,11 @@ if ($id > 0 || ! empty($ref)) { $result = $object->fetch($id, $ref); - $upload_dir = $conf->user->multidir_output[$object->entity] . "/" . $object->id ; + $entitytouseforuserdir = $object->entity; + if (empty($entitytouseforuserdir)) $entitytouseforuserdir=1; + $upload_dir = $conf->user->multidir_output[$entitytouseforuserdir] . "/" . $object->id ; } - /* * Actions */ @@ -159,8 +160,8 @@ if ($object->id) print '
    '; - $modulepart = 'societe'; - $permission = $user->rights->societe->creer; + $modulepart = 'user'; + $permission = $user->rights->user->user->creer; $param = '&id=' . $object->id; include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; } diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index a1930f7c027..5f79c939432 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -264,7 +264,7 @@ if ($action == 'create') print "\n"; - print '

    '; + print '
    '; print ""; } @@ -536,7 +536,7 @@ else print "\n"; - print '

    '; + print '
    '; print ''; diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 00af5b0e6d2..1f06fa3a3c2 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -91,7 +91,7 @@ if ($resql) { print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],"g.entity",$param,"",'align="center"',$sortfield,$sortorder); } - print_liste_field_titre($langs->trans("NbOfUsers"),$_SERVER["PHP_SELF"],"g.nb",$param,"",'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("NbOfUsers"),$_SERVER["PHP_SELF"],"nb",$param,"",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"g.datec",$param,"",'align="right"',$sortfield,$sortorder); print "\n"; $var=True; 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").''; diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 448dd76d147..2a992aa3212 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -133,11 +133,11 @@ if ($id) if ($action == 'edit') { - print '

    '; + print '
    '; print ''; - print '   '; + print '     '; print ''; - print '
    '; + print ''; } print "\n"; diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 65e9e4ca7a6..860e74c5567 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -179,10 +179,10 @@ if ($action == 'edit') print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)); print ''; print 'conf->MAIN_LANG_DEFAULT)?" checked":""); - print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo + print empty($dolibarr_main_demo)?'':' disabled="disabled"'; // Disabled for demo print '> '.$langs->trans("UsePersonalValue").''; print ''; - print $formadmin->select_language((! empty($fuser->conf->MAIN_LANG_DEFAULT)?$fuser->conf->MAIN_LANG_DEFAULT:''),'main_lang_default',1); + print $formadmin->select_language((! empty($fuser->conf->MAIN_LANG_DEFAULT)?$fuser->conf->MAIN_LANG_DEFAULT:''),'main_lang_default',1,null,0,0,(! empty($dolibarr_main_demo))); print ''; // Taille max des listes @@ -190,7 +190,7 @@ if ($action == 'edit') print ''.$langs->trans("MaxSizeList").''; print ''.$conf->global->MAIN_SIZE_LISTE_LIMIT.''; print 'conf->MAIN_SIZE_LISTE_LIMIT)?" checked":""); - print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo + print empty($dolibarr_main_demo)?'':' disabled="disabled"'; // Disabled for demo print '> '.$langs->trans("UsePersonalValue").''; print ''; @@ -202,11 +202,11 @@ if ($action == 'edit') dol_fiche_end(); - print '
    '; + print '
    '; print ''; - print '     '; + print '     '; print ''; - print '
    '; + print ''; print ''; diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index f9dbb54f8f4..b63b3e65ffc 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -276,7 +276,7 @@ print '
    '; if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"), 0, 1).'
    '; // Show warning about external users -if (empty($user->societe_id)) print showModulesExludedForExternal($modules).'

    '."\n"; +if (empty($user->societe_id)) print info_admin(showModulesExludedForExternal($modules)).'

    '."\n"; // For multicompany transversal mode // TODO Place a hook here diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php index a12f638a174..431150bd9e9 100644 --- a/htdocs/webservices/admin/webservices.php +++ b/htdocs/webservices/admin/webservices.php @@ -90,9 +90,9 @@ print ''; print ''; -print '
    '; +print '
    '; print ''; -print '
    '; +print ''; print ''; 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'); diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php index f42c270fa42..b7550244fc2 100644 --- a/htdocs/webservices/server_contact.php +++ b/htdocs/webservices/server_contact.php @@ -234,7 +234,7 @@ $server->register( * @param array $authentication Array of authentication information * @param int $id Id of object * @param string $ref Ref of object - * @param ref_ext $ref_ext Ref external of object + * @param string $ref_ext Ref external of object * @return mixed */ function getContact($authentication,$id,$ref='',$ref_ext='') @@ -655,6 +655,7 @@ function updateContact($authentication,$contact) $object->province_id=$contact['province_id']; + $object->phone_pro=$contact['phone_pro']; $object->phone_perso=$contact['phone_perso']; $object->phone_mobile=$contact['phone_mobile']; $object->fax=$contact['fax']; diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php index 9903c6b4ed9..9229d3b9c26 100644 --- a/htdocs/webservices/server_order.php +++ b/htdocs/webservices/server_order.php @@ -29,6 +29,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once '../master.inc.php'; require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); @@ -84,6 +85,52 @@ $server->wsdl->addComplexType( ) ); +$line_fields = array( + 'id' => array('name'=>'id','type'=>'xsd:string'), + 'type' => array('name'=>'type','type'=>'xsd:int'), + 'fk_commande' => array('name'=>'fk_commande','type'=>'xsd:int'), + 'fk_parent_line' => array('name'=>'fk_parent_line','type'=>'xsd:int'), + 'desc' => array('name'=>'desc','type'=>'xsd:string'), + 'qty' => array('name'=>'qty','type'=>'xsd:double'), + 'price' => array('name'=>'price','type'=>'xsd:double'), + 'unitprice' => array('name'=>'unitprice','type'=>'xsd:double'), + 'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:double'), + + 'remise' => array('name'=>'remise','type'=>'xsd:double'), + 'remise_percent' => array('name'=>'remise_percent','type'=>'xsd:double'), + + 'total_net' => array('name'=>'total_net','type'=>'xsd:double'), + 'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'), + 'total' => array('name'=>'total','type'=>'xsd:double'), + + 'date_start' => array('name'=>'date_start','type'=>'xsd:date'), + 'date_end' => array('name'=>'date_end','type'=>'xsd:date'), + + // From product + 'product_id' => array('name'=>'product_id','type'=>'xsd:int'), + 'product_ref' => array('name'=>'product_ref','type'=>'xsd:string'), + 'product_label' => array('name'=>'product_label','type'=>'xsd:string'), + 'product_desc' => array('name'=>'product_desc','type'=>'xsd:string') +); + + +//Retreive all extrafield for thirdsparty +// fetch optionals attributes and labels +$extrafields=new ExtraFields($db); +$extralabels=$extrafields->fetch_name_optionals_label('commandedet',true); +if (count($extrafields)>0) { + $extrafield_line_array = array(); +} +foreach($extrafields->attribute_label as $key=>$label) +{ + //$value=$object->array_options["options_".$key]; + $type =$extrafields->attribute_type[$key]; + if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';} + else {$type='xsd:string';} + $extrafield_line_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type); +} +$line_fields=array_merge($line_fields,$extrafield_line_array); + // Define other specific objects $server->wsdl->addComplexType( 'line', @@ -91,33 +138,7 @@ $server->wsdl->addComplexType( 'struct', 'all', '', - array( - 'id' => array('name'=>'id','type'=>'xsd:string'), - 'type' => array('name'=>'type','type'=>'xsd:int'), - 'fk_commande' => array('name'=>'fk_commande','type'=>'xsd:int'), - 'fk_parent_line' => array('name'=>'fk_parent_line','type'=>'xsd:int'), - 'desc' => array('name'=>'desc','type'=>'xsd:string'), - 'qty' => array('name'=>'qty','type'=>'xsd:double'), - 'price' => array('name'=>'price','type'=>'xsd:double'), - 'unitprice' => array('name'=>'unitprice','type'=>'xsd:double'), - 'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:double'), - - 'remise' => array('name'=>'remise','type'=>'xsd:double'), - 'remise_percent' => array('name'=>'remise_percent','type'=>'xsd:double'), - - 'total_net' => array('name'=>'total_net','type'=>'xsd:double'), - 'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'), - 'total' => array('name'=>'total','type'=>'xsd:double'), - - 'date_start' => array('name'=>'date_start','type'=>'xsd:date'), - 'date_end' => array('name'=>'date_end','type'=>'xsd:date'), - - // From product - 'product_id' => array('name'=>'product_id','type'=>'xsd:int'), - 'product_ref' => array('name'=>'product_ref','type'=>'xsd:string'), - 'product_label' => array('name'=>'product_label','type'=>'xsd:string'), - 'product_desc' => array('name'=>'product_desc','type'=>'xsd:string') - ) + $line_fields ); /*$server->wsdl->addComplexType( @@ -151,53 +172,73 @@ $server->wsdl->addComplexType( ) ); +$order_fields = array( + 'id' => array('name'=>'id','type'=>'xsd:string'), + 'ref' => array('name'=>'ref','type'=>'xsd:string'), + 'ref_client' => array('name'=>'ref_client','type'=>'xsd:string'), + 'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'), + 'ref_int' => array('name'=>'ref_int','type'=>'xsd:string'), + 'thirdparty_id' => array('name'=>'thirdparty_id','type'=>'xsd:int'), + 'status' => array('name'=>'status','type'=>'xsd:int'), + 'billed' => array('name'=>'billed','type'=>'xsd:string'), + 'total_net' => array('name'=>'total_net','type'=>'xsd:double'), + 'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'), + 'total_localtax1' => array('name'=>'total_localtax1','type'=>'xsd:double'), + 'total_localtax2' => array('name'=>'total_localtax2','type'=>'xsd:double'), + 'total' => array('name'=>'total','type'=>'xsd:double'), + 'date' => array('name'=>'date','type'=>'xsd:date'), + 'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'), + 'date_validation' => array('name'=>'date_validation','type'=>'xsd:dateTime'), + 'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'), + 'remise' => array('name'=>'remise','type'=>'xsd:string'), + 'remise_percent' => array('name'=>'remise_percent','type'=>'xsd:string'), + 'remise_absolue' => array('name'=>'remise_absolue','type'=>'xsd:string'), + 'source' => array('name'=>'source','type'=>'xsd:string'), + 'note_private' => array('name'=>'note_private','type'=>'xsd:string'), + 'note_public' => array('name'=>'note_public','type'=>'xsd:string'), + 'project_id' => array('name'=>'project_id','type'=>'xsd:string'), + + 'mode_reglement_id' => array('name'=>'mode_reglement_id','type'=>'xsd:string'), + 'mode_reglement_code' => array('name'=>'mode_reglement_code','type'=>'xsd:string'), + 'mode_reglement' => array('name'=>'mode_reglement','type'=>'xsd:string'), + 'cond_reglement_id' => array('name'=>'cond_reglement_id','type'=>'xsd:string'), + 'cond_reglement_code' => array('name'=>'cond_reglement_code','type'=>'xsd:string'), + 'cond_reglement' => array('name'=>'cond_reglement','type'=>'xsd:string'), + 'cond_reglement_doc' => array('name'=>'cond_reglement_doc','type'=>'xsd:string'), + + 'date_livraison' => array('name'=>'date_livraison','type'=>'xsd:date'), + 'fk_delivery_address' => array('name'=>'fk_delivery_address','type'=>'xsd:int'), + 'demand_reason_id' => array('name'=>'demand_reason_id','type'=>'xsd:string'), + + 'lines' => array('name'=>'lines','type'=>'tns:LinesArray2') +); + +//Retreive all extrafield for thirdsparty +// fetch optionals attributes and labels +$extrafields=new ExtraFields($db); +$extralabels=$extrafields->fetch_name_optionals_label('commande',true); +if (count($extrafields)>0) { + $extrafield_array = array(); +} +foreach($extrafields->attribute_label as $key=>$label) +{ + //$value=$object->array_options["options_".$key]; + $type =$extrafields->attribute_type[$key]; + if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';} + else {$type='xsd:string';} + $extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type); +} +$order_fields=array_merge($order_fields,$extrafield_array); + $server->wsdl->addComplexType( 'order', 'complexType', 'struct', 'all', '', - array( - 'id' => array('name'=>'id','type'=>'xsd:string'), - 'ref' => array('name'=>'ref','type'=>'xsd:string'), - 'ref_client' => array('name'=>'ref_client','type'=>'xsd:string'), - 'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'), - 'ref_int' => array('name'=>'ref_int','type'=>'xsd:string'), - 'thirdparty_id' => array('name'=>'thirdparty_id','type'=>'xsd:int'), - 'status' => array('name'=>'status','type'=>'xsd:int'), - 'facturee' => array('name'=>'facturee','type'=>'xsd:string'), - 'total_net' => array('name'=>'total_net','type'=>'xsd:double'), - 'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'), - 'total_localtax1' => array('name'=>'total_localtax1','type'=>'xsd:double'), - 'total_localtax2' => array('name'=>'total_localtax2','type'=>'xsd:double'), - 'total' => array('name'=>'total','type'=>'xsd:double'), - 'date' => array('name'=>'date','type'=>'xsd:date'), - 'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'), - 'date_validation' => array('name'=>'date_validation','type'=>'xsd:dateTime'), - 'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'), - 'remise' => array('name'=>'remise','type'=>'xsd:string'), - 'remise_percent' => array('name'=>'remise_percent','type'=>'xsd:string'), - 'remise_absolue' => array('name'=>'remise_absolue','type'=>'xsd:string'), - 'source' => array('name'=>'source','type'=>'xsd:string'), - 'note_private' => array('name'=>'note_private','type'=>'xsd:string'), - 'note_public' => array('name'=>'note_public','type'=>'xsd:string'), - 'project_id' => array('name'=>'project_id','type'=>'xsd:string'), - - 'mode_reglement_id' => array('name'=>'mode_reglement_id','type'=>'xsd:string'), - 'mode_reglement_code' => array('name'=>'mode_reglement_code','type'=>'xsd:string'), - 'mode_reglement' => array('name'=>'mode_reglement','type'=>'xsd:string'), - 'cond_reglement_id' => array('name'=>'cond_reglement_id','type'=>'xsd:string'), - 'cond_reglement_code' => array('name'=>'cond_reglement_code','type'=>'xsd:string'), - 'cond_reglement' => array('name'=>'cond_reglement','type'=>'xsd:string'), - 'cond_reglement_doc' => array('name'=>'cond_reglement_doc','type'=>'xsd:string'), - - 'date_livraison' => array('name'=>'date_livraison','type'=>'xsd:date'), - 'fk_delivery_address' => array('name'=>'fk_delivery_address','type'=>'xsd:int'), - 'demand_reason_id' => array('name'=>'demand_reason_id','type'=>'xsd:string'), - - 'lines' => array('name'=>'lines','type'=>'tns:LinesArray2') - ) + $order_fields ); + /* $server->wsdl->addComplexType( 'OrdersArray', @@ -273,8 +314,17 @@ $server->register( 'WS to create an order' ); +$server->register( + 'updateOrder', + array('authentication'=>'tns:authentication','order'=>'tns:order'), // Entry values + array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'), // Exit values + $ns, + $ns.'#updateOrder', + $styledoc, + $styleuse, + 'WS to update an order' +); -// Register WSDL $server->register( 'validOrder', array('authentication'=>'tns:authentication','id'=>'xsd:string'), // Entry values @@ -398,7 +448,7 @@ function getOrder($authentication,$id='',$ref='',$ref_ext='') 'remise_absolue' => $order->remise_absolue, 'source' => $order->source, - 'facturee' => $order->facturee, + 'billed' => $order->billed, 'note_private' => $order->note_private, 'note_public' => $order->note_public, 'cond_reglement_id' => $order->cond_reglement_id, @@ -555,7 +605,7 @@ function getOrdersForThirdParty($authentication,$idthirdparty) 'remise_absolue' => $order->remise_absolue, 'source' => $order->source, - 'facturee' => $order->facturee, + 'billed' => $order->billed, 'note_private' => $order->note_private, 'note_public' => $order->note_public, 'cond_reglement_id' => $order->cond_reglement_id, @@ -638,12 +688,22 @@ function createOrder($authentication,$order) $newobject->note_private=$order['note_private']; $newobject->note_public=$order['note_public']; $newobject->statut=0; // We start with status draft - $newobject->facturee=$order['facturee']; + $newobject->billed=$order['billed']; $newobject->fk_project=$order['project_id']; $newobject->cond_reglement_id=$order['cond_reglement_id']; $newobject->demand_reason_id=$order['demand_reason_id']; $newobject->date_creation=$now; + // Retrieve all extrafield for order + // fetch optionals attributes and labels + $extrafields=new ExtraFields($db); + $extralabels=$extrafields->fetch_name_optionals_label('commandet',true); + foreach($extrafields->attribute_label as $key=>$label) + { + $key='options_'.$key; + $newobject->array_options[$key]=$order[$key]; + } + // Trick because nusoap does not store data with same structure if there is one or several lines $arrayoflines=array(); if (isset($order['lines']['line'][0])) $arrayoflines=$order['lines']['line']; @@ -666,6 +726,17 @@ function createOrder($authentication,$order) $newline->total_ttc=$line['total']; $newline->date_start=$line['date_start']; $newline->date_end=$line['date_end']; + + // Retrieve all extrafield for lines + // fetch optionals attributes and labels + $extrafields=new ExtraFields($db); + $extralabels=$extrafields->fetch_name_optionals_label('commandedet',true); + foreach($extrafields->attribute_label as $key=>$label) + { + $key='options_'.$key; + $newline->array_options[$key]=$line[$key]; + } + $newobject->lines[]=$newline; } @@ -800,5 +871,109 @@ function validOrder($authentication,$id='') return $objectresp; } +/** + * Update an order + * + * @param array $authentication Array of authentication information + * @param array $order Order info + * @return array Array result + */ +function updateOrder($authentication,$order) +{ + global $db,$conf,$langs; + + $now=dol_now(); + + dol_syslog("Function: updateOrder login=".$authentication['login']); + + if ($authentication['entity']) $conf->entity=$authentication['entity']; + + // Init and check authentication + $objectresp=array(); + $errorcode='';$errorlabel=''; + $error=0; + $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel); + // Check parameters + if (empty($order['id']) && empty($order['ref']) && empty($order['ref_ext'])) { + $error++; $errorcode='KO'; $errorlabel="Order id or ref or ref_ext is mandatory."; + } + + if (! $error) + { + $objectfound=false; + + include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; + + $object=new Commande($db); + $result=$object->fetch($order['id'],(empty($order['id'])?$order['ref']:''),(empty($order['id']) && empty($order['ref'])?$order['ref_ext']:'')); + + if (!empty($object->id)) { + + $objectfound=true; + + $db->begin(); + + if (isset($order['status'])) + { + if ($order['status'] == -1) $result=$object->cancel($fuser); + if ($order['status'] == 1) $result=$object->valid($fuser); + if ($order['status'] == 0) $result=$object->set_reopen($fuser); + if ($order['status'] == 3) $result=$object->cloture($fuser); + } + + if (isset($order['billed'])) + { + if ($order['billed']) $result=$object->classifyBilled($fuser); + if (! $order['billed']) $result=$object->classifyBilled($fuser); + } + + //Retreive all extrafield for object + // fetch optionals attributes and labels + $extrafields=new ExtraFields($db); + $extralabels=$extrafields->fetch_name_optionals_label('commande',true); + foreach($extrafields->attribute_label as $key=>$label) + { + $key='options_'.$key; + if (isset($order[$key])) + { + $result=$object->setValueFrom($key, $order[$key], 'commande_extrafields'); + } + } + + if ($result <= 0) { + $error++; + } + } + + if ((! $error) && ($objectfound)) + { + $db->commit(); + $objectresp=array( + 'result'=>array('result_code'=>'OK', 'result_label'=>''), + 'id'=>$object->id + ); + } + elseif ($objectfound) + { + $db->rollback(); + $error++; + $errorcode='KO'; + $errorlabel=$object->error; + } else { + $error++; + $errorcode='NOT_FOUND'; + $errorlabel='Order id='.$order['id'].' ref='.$order['ref'].' ref_ext='.$order['ref_ext'].' cannot be found'; + } + } + + if ($error) + { + $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel)); + } + + return $objectresp; +} + + // Return the results. $server->service(file_get_contents("php://input")); diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index ffe25f8e3e8..6f36b664a3b 100644 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -327,7 +327,7 @@ $server->register( * @param array $authentication Array of authentication information * @param int $id Id of object * @param string $ref Ref of object - * @param ref_ext $ref_ext Ref external of object + * @param string $ref_ext Ref external of object * @param string $lang Lang to force * @return mixed */ @@ -378,7 +378,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang='' if (! empty($product->multilangs[$langs->defaultlang]["label"])) $product->label = $product->multilangs[$langs->defaultlang]["label"]; if (! empty($product->multilangs[$langs->defaultlang]["description"])) $product->description = $product->multilangs[$langs->defaultlang]["description"]; if (! empty($product->multilangs[$langs->defaultlang]["note"])) $product->note = $product->multilangs[$langs->defaultlang]["note"]; - + $productorservice_result_fields = array( 'id' => $product->id, 'ref' => $product->ref, @@ -396,7 +396,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang='' 'country_id' => $product->country_id>0?$product->country_id:'', 'country_code' => $product->country_code, 'custom_code' => $product->customcode, - + 'price_net' => $product->price, 'price' => $product->price_ttc, 'price_min_net' => $product->price_min, @@ -408,7 +408,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang='' //! Spanish local taxes 'localtax1_tx' => $product->localtax1_tx, 'localtax2_tx' => $product->localtax2_tx, - + 'stock_real' => $product->stock_reel, 'stock_alert' => $product->seuil_stock_alerte, 'pmp' => $product->pmp, @@ -416,19 +416,19 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang='' 'dir' => $pdir, 'images' => $product->liste_photos($dir,$nbmax=10) ); - + //Retreive all extrafield for thirdsparty // fetch optionals attributes and labels $extrafields=new ExtraFields($db); $extralabels=$extrafields->fetch_name_optionals_label('product',true); //Get extrafield values $product->fetch_optionals($product->id,$extralabels); - + foreach($extrafields->attribute_label as $key=>$label) { $productorservice_result_fields=array_merge($productorservice_result_fields,array('options_'.$key => $product->array_options['options_'.$key])); } - + // Create $objectresp = array( 'result'=>array('result_code'=>'OK', 'result_label'=>''), @@ -533,7 +533,7 @@ function createProductOrService($authentication,$product) }*/ //var_dump($product['ref_ext']); //var_dump($product['lines'][0]['type']); - + $extrafields=new ExtraFields($db); $extralabels=$extrafields->fetch_name_optionals_label('product',true); foreach($extrafields->attribute_label as $key=>$label) @@ -652,7 +652,7 @@ function updateProductOrService($authentication,$product) }*/ //var_dump($product['ref_ext']); //var_dump($product['lines'][0]['type']); - + $extrafields=new ExtraFields($db); $extralabels=$extrafields->fetch_name_optionals_label('product',true); foreach($extrafields->attribute_label as $key=>$label) @@ -965,19 +965,19 @@ function getProductsForCategory($authentication,$id,$lang='') 'dir' => $pdir, 'images' => $obj->liste_photos($dir,$nbmax=10) ); - + //Retreive all extrafield for thirdsparty // fetch optionals attributes and labels $extrafields=new ExtraFields($db); $extralabels=$extrafields->fetch_name_optionals_label('product',true); //Get extrafield values $product->fetch_optionals($obj->id,$extralabels); - + foreach($extrafields->attribute_label as $key=>$label) { $products[$iProduct]=array_merge($products[$iProduct],array('options_'.$key => $product->array_options['options_'.$key])); } - + $iProduct++; } diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php index 4fb5cc81e8c..6339486922f 100644 --- a/htdocs/webservices/server_user.php +++ b/htdocs/webservices/server_user.php @@ -299,7 +299,7 @@ $server->register( * @param array $authentication Array of authentication information * @param int $id Id of object * @param string $ref Ref of object - * @param ref_ext $ref_ext Ref external of object + * @param string $ref_ext Ref external of object * @return mixed */ function getUser($authentication,$id,$ref='',$ref_ext='') diff --git a/scripts/odt2pdf/odt2pdf.sh b/scripts/odt2pdf/odt2pdf.sh index 0599e4291c5..9d9bf18a8c7 100755 --- a/scripts/odt2pdf/odt2pdf.sh +++ b/scripts/odt2pdf/odt2pdf.sh @@ -22,7 +22,7 @@ if [ -f "$1.odt" ] nbprocess=$(pgrep -c soffice) if [ $nbprocess -ne 1 ] then - soffice --invisible --accept="socket,host=127.0.0.1,port=8100;urp;" --nofirststartwizard --headless& + soffice --invisible --accept="socket,host=127.0.0.1,port=8100;urp;" --nofirststartwizard --headless & retcode=$? if [ $retcode -ne 0 ] then diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php index b43b9d230b3..334e42eb5f9 100644 --- a/test/phpunit/AdherentTest.php +++ b/test/phpunit/AdherentTest.php @@ -1,6 +1,6 @@ - * Copyright (C) 2013 Marcos García +/* Copyright (C) 2010 Laurent Destailleur + * Copyright (C) 2013 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 @@ -19,9 +19,9 @@ /** * \file test/phpunit/AdherentTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -31,11 +31,10 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent.class.php'; require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent_type.class.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -49,72 +48,77 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class AdherentTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return AdherentTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return AdherentTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n"; die(); } - - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { + print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n"; + die(); + } + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** @@ -124,71 +128,71 @@ class AdherentTest extends PHPUnit_Framework_TestCase */ public function testAdherentTypeCreate() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new AdherentType($this->savdb); - $localobject->statut=1; - $localobject->libelle='Adherent type test'; - $localobject->cotisation=1; - $localobject->vote=1; - $result=$localobject->create($user); + $localobject=new AdherentType($this->savdb); + $localobject->statut=1; + $localobject->libelle='Adherent type test'; + $localobject->cotisation=1; + $localobject->vote=1; + $result=$localobject->create($user); print __METHOD__." result=".$result."\n"; - $this->assertLessThan($result, 0); + $this->assertLessThan($result, 0); - return $localobject->id; + return $localobject->id; } /** * testAdherentCreate * - * @param int $fk_adherent_type Id type of member - * @return int + * @param int $fk_adherent_type Id type of member + * @return int * * @depends testAdherentTypeCreate * The depends says test is run only if previous is ok */ public function testAdherentCreate($fk_adherent_type) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Adherent($this->savdb); - $localobject->initAsSpecimen(); - $localobject->typeid=$fk_adherent_type; - $result=$localobject->create($user); + $localobject=new Adherent($this->savdb); + $localobject->initAsSpecimen(); + $localobject->typeid=$fk_adherent_type; + $result=$localobject->create($user); print __METHOD__." result=".$result."\n"; - $this->assertLessThan($result, 0); + $this->assertLessThan($result, 0); - return $result; + return $result; } /** * testAdherentFetch * - * @param int $id Id of object to fetch - * @return object Fetched object + * @param int $id Id of object to fetch + * @return object Fetched object * * @depends testAdherentCreate * The depends says test is run only if previous is ok */ public function testAdherentFetch($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Adherent($this->savdb); - $result=$localobject->fetch($id); - print __METHOD__." id=".$id." result=".$result."\n"; + $localobject=new Adherent($this->savdb); + $result=$localobject->fetch($id); + print __METHOD__." id=".$id." result=".$result."\n"; $this->assertLessThan($result, 0); return $localobject; @@ -222,78 +226,78 @@ class AdherentTest extends PHPUnit_Framework_TestCase /** * testAdherentUpdate * - * @param Adherent $localobject Member instance - * @return Adherent + * @param Adherent $localobject Member instance + * @return Adherent * - * @depends testAdherentFetchLogin + * @depends testAdherentFetchLogin * The depends says test is run only if previous is ok */ public function testAdherentUpdate(Adherent $localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; $timestamp = dol_now(); $localobject->civility_id = 0; - $localobject->login='newlogin'; - $localobject->societe='New company'; - $localobject->note='New note after update'; - //$localobject->note_public='New note public after update'; - $localobject->lastname='New name'; - $localobject->firstname='New firstname'; - $localobject->address='New address'; - $localobject->zip='New zip'; - $localobject->town='New town'; - $localobject->country_id=2; - $localobject->statut=0; + $localobject->login='newlogin'; + $localobject->societe='New company'; + $localobject->note='New note after update'; + //$localobject->note_public='New note public after update'; + $localobject->lastname='New name'; + $localobject->firstname='New firstname'; + $localobject->address='New address'; + $localobject->zip='New zip'; + $localobject->town='New town'; + $localobject->country_id=2; + $localobject->statut=0; $localobject->morphy=0; - $localobject->phone='New tel pro'; - $localobject->phone_perso='New tel perso'; - $localobject->phone_mobile='New tel mobile'; - $localobject->email='newemail@newemail.com'; + $localobject->phone='New tel pro'; + $localobject->phone_perso='New tel perso'; + $localobject->phone_mobile='New tel mobile'; + $localobject->email='newemail@newemail.com'; $localobject->birth=$timestamp; - $result=$localobject->update($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - $result=$localobject->update_note($localobject->note); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - //$result=$localobject->update_note_public($localobject->note_public); - //print __METHOD__." id=".$localobject->id." result=".$result."\n"; - //$this->assertLessThan($result, 0); + $result=$localobject->update($user); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + $result=$localobject->update_note($localobject->note); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + //$result=$localobject->update_note_public($localobject->note_public); + //print __METHOD__." id=".$localobject->id." result=".$result."\n"; + //$this->assertLessThan($result, 0); - $newobject=new Adherent($this->savdb); - $result=$newobject->fetch($localobject->id); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $newobject=new Adherent($this->savdb); + $result=$newobject->fetch($localobject->id); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); $this->assertEquals($localobject->civility_id, $newobject->civility_id); - $this->assertEquals($localobject->login, $newobject->login); - $this->assertEquals($localobject->societe, $newobject->societe); - $this->assertEquals($localobject->note, $newobject->note); - //$this->assertEquals($localobject->note_public, $newobject->note_public); - $this->assertEquals($localobject->lastname, $newobject->lastname); - $this->assertEquals($localobject->firstname, $newobject->firstname); - $this->assertEquals($localobject->address, $newobject->address); - $this->assertEquals($localobject->zip, $newobject->zip); - $this->assertEquals($localobject->town, $newobject->town); - $this->assertEquals($localobject->country_id, $newobject->country_id); - $this->assertEquals('BE', $newobject->country_code); + $this->assertEquals($localobject->login, $newobject->login); + $this->assertEquals($localobject->societe, $newobject->societe); + $this->assertEquals($localobject->note, $newobject->note); + //$this->assertEquals($localobject->note_public, $newobject->note_public); + $this->assertEquals($localobject->lastname, $newobject->lastname); + $this->assertEquals($localobject->firstname, $newobject->firstname); + $this->assertEquals($localobject->address, $newobject->address); + $this->assertEquals($localobject->zip, $newobject->zip); + $this->assertEquals($localobject->town, $newobject->town); + $this->assertEquals($localobject->country_id, $newobject->country_id); + $this->assertEquals('BE', $newobject->country_code); $this->assertEquals('Belgium', $newobject->country); - $this->assertEquals($localobject->statut, $newobject->statut); - $this->assertEquals($localobject->phone, $newobject->phone); - $this->assertEquals($localobject->phone_perso, $newobject->phone_perso); - $this->assertEquals($localobject->phone_mobile, $newobject->phone_mobile); - $this->assertEquals($localobject->email, $newobject->email); + $this->assertEquals($localobject->statut, $newobject->statut); + $this->assertEquals($localobject->phone, $newobject->phone); + $this->assertEquals($localobject->phone_perso, $newobject->phone_perso); + $this->assertEquals($localobject->phone_mobile, $newobject->phone_mobile); + $this->assertEquals($localobject->email, $newobject->email); $this->assertEquals($localobject->birth, $timestamp); $this->assertEquals($localobject->morphy, $newobject->morphy); //We return newobject because of new values - return $newobject; + return $newobject; } /** @@ -430,24 +434,24 @@ class AdherentTest extends PHPUnit_Framework_TestCase */ public function testAdherentValidate(Adherent $localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->validate($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $result=$localobject->validate($user); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); - return $localobject; + return $localobject; } /** * testAdherentOther * - * @param Adherent $localobject Member instance - * @return int Id of object + * @param Adherent $localobject Member instance + * @return int Id of object * * @depends testAdherentValidate * The depends says test is run only if previous is ok @@ -520,17 +524,17 @@ class AdherentTest extends PHPUnit_Framework_TestCase */ public function testAdherentDelete($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->delete($localobject->id); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $result=$localobject->delete($localobject->id); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); - return $localobject; + return $localobject; } @@ -545,18 +549,18 @@ class AdherentTest extends PHPUnit_Framework_TestCase */ public function testAdherentTypeDelete($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobjectat=new AdherentType($this->savdb); - $result=$localobjectat->fetch($localobject->typeid); - $result=$localobjectat->delete(); - print __METHOD__." result=".$result."\n"; - $this->assertLessThan($result, 0); + $localobjectat=new AdherentType($this->savdb); + $result=$localobjectat->fetch($localobject->typeid); + $result=$localobjectat->delete(); + print __METHOD__." result=".$result."\n"; + $this->assertLessThan($result, 0); - return $localobject->id; + return $localobject->id; } } diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php index 90b0951cc86..bef0c2eff9d 100644 --- a/test/phpunit/AdminLibTest.php +++ b/test/phpunit/AdminLibTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/AdminLibTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -29,11 +29,10 @@ global $conf,$user,$langs,$db; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/admin.lib.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -43,74 +42,76 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; * * @backupGlobals disabled * @backupStaticAttributes enabled - * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. + * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. */ class AdminLibTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return AdminLibTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return AdminLibTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** @@ -120,25 +121,25 @@ class AdminLibTest extends PHPUnit_Framework_TestCase */ public function testVersionCompare() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=versioncompare(array(3,1,-4),array(3,1,1)); - print __METHOD__." result=".$result."\n"; - $this->assertEquals(-3,$result); - $result=versioncompare(array(3,1,0),array(3,1,1)); - print __METHOD__." result=".$result."\n"; - $this->assertEquals(-3,$result); - $result=versioncompare(array(3,1,0),array(3,2,0)); - print __METHOD__." result=".$result."\n"; - $this->assertEquals(-2,$result); - $result=versioncompare(array(3,1,0),array(3,1,0)); - print __METHOD__." result=".$result."\n"; - $this->assertEquals(0,$result); + $result=versioncompare(array(3,1,-4),array(3,1,1)); + print __METHOD__." result=".$result."\n"; + $this->assertEquals(-3,$result); + $result=versioncompare(array(3,1,0),array(3,1,1)); + print __METHOD__." result=".$result."\n"; + $this->assertEquals(-3,$result); + $result=versioncompare(array(3,1,0),array(3,2,0)); + print __METHOD__." result=".$result."\n"; + $this->assertEquals(-2,$result); + $result=versioncompare(array(3,1,0),array(3,1,0)); + print __METHOD__." result=".$result."\n"; + $this->assertEquals(0,$result); - return $result; + return $result; } } diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index a8a554ca25d..5f5d3f940bb 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -1,6 +1,6 @@ - * Copyright (C) 2011-2012 Regis Houssin +/* Copyright (C) 2010-2012 Laurent Destailleur + * Copyright (C) 2011-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,32 +19,29 @@ /** * \file test/phpunit/AllTest.php - * \ingroup test + * \ingroup test * \brief This file is a test suite to run all unit tests - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ print "PHP Version: ".phpversion()."\n"; print "Memory: ". ini_get('memory_limit')."\n"; global $conf,$user,$langs,$db; -//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver +//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; -if ($langs->defaultlang != 'en_US') -{ +if ($langs->defaultlang != 'en_US') { print "Error: Default language for company to run tests must be set to en_US or auto. Current is ".$langs->defaultlang."\n"; exit; } -if (! empty($conf->google->enabled)) -{ - print "Warning: Google module should not be enabled.\n"; +if (! empty($conf->google->enabled)) { + print "Warning: Google module should not be enabled.\n"; } -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -59,37 +56,37 @@ class AllTests * * @return void */ - public static function suite() + public static function suite() { - $suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework'); + $suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework'); //require_once dirname(__FILE__).'/CoreTest.php'; //$suite->addTestSuite('CoreTest'); - require_once dirname(__FILE__).'/AdminLibTest.php'; - $suite->addTestSuite('AdminLibTest'); - require_once dirname(__FILE__).'/DateLibTest.php'; - $suite->addTestSuite('DateLibTest'); - //require_once dirname(__FILE__).'/DateLibTzFranceTest.php'; - //$suite->addTestSuite('DateLibTzFranceTest'); - require_once dirname(__FILE__).'/MarginsLibTest.php'; - $suite->addTestSuite('MarginsLibTest'); - require_once dirname(__FILE__).'/FilesLibTest.php'; - $suite->addTestSuite('FilesLibTest'); - require_once dirname(__FILE__).'/JsonLibTest.php'; - $suite->addTestSuite('JsonLibTest'); - require_once dirname(__FILE__).'/ImagesLibTest.php'; - $suite->addTestSuite('ImagesLibTest'); - require_once dirname(__FILE__).'/FunctionsLibTest.php'; - $suite->addTestSuite('FunctionsLibTest'); - require_once dirname(__FILE__).'/Functions2LibTest.php'; - $suite->addTestSuite('Functions2LibTest'); - require_once dirname(__FILE__).'/XCalLibTest.php'; - $suite->addTestSuite('XCalLibTest'); + require_once dirname(__FILE__).'/AdminLibTest.php'; + $suite->addTestSuite('AdminLibTest'); + require_once dirname(__FILE__).'/DateLibTest.php'; + $suite->addTestSuite('DateLibTest'); + //require_once dirname(__FILE__).'/DateLibTzFranceTest.php'; + //$suite->addTestSuite('DateLibTzFranceTest'); + require_once dirname(__FILE__).'/MarginsLibTest.php'; + $suite->addTestSuite('MarginsLibTest'); + require_once dirname(__FILE__).'/FilesLibTest.php'; + $suite->addTestSuite('FilesLibTest'); + require_once dirname(__FILE__).'/JsonLibTest.php'; + $suite->addTestSuite('JsonLibTest'); + require_once dirname(__FILE__).'/ImagesLibTest.php'; + $suite->addTestSuite('ImagesLibTest'); + require_once dirname(__FILE__).'/FunctionsLibTest.php'; + $suite->addTestSuite('FunctionsLibTest'); + require_once dirname(__FILE__).'/Functions2LibTest.php'; + $suite->addTestSuite('Functions2LibTest'); + require_once dirname(__FILE__).'/XCalLibTest.php'; + $suite->addTestSuite('XCalLibTest'); - require_once dirname(__FILE__).'/LangTest.php'; - $suite->addTestSuite('LangTest'); - require_once dirname(__FILE__).'/SqlTest.php'; - $suite->addTestSuite('SqlTest'); + require_once dirname(__FILE__).'/LangTest.php'; + $suite->addTestSuite('LangTest'); + require_once dirname(__FILE__).'/SqlTest.php'; + $suite->addTestSuite('SqlTest'); require_once dirname(__FILE__).'/SecurityTest.php'; $suite->addTestSuite('SecurityTest'); @@ -98,8 +95,8 @@ class AllTests $suite->addTestSuite('NumberingModulesTest'); require_once dirname(__FILE__).'/PgsqlTest.php'; $suite->addTestSuite('PgsqlTest'); - require_once dirname(__FILE__).'/PdfDocTest.php'; - $suite->addTestSuite('PdfDocTest'); + require_once dirname(__FILE__).'/PdfDocTest.php'; + $suite->addTestSuite('PdfDocTest'); require_once dirname(__FILE__).'/BuildDocTest.php'; $suite->addTestSuite('BuildDocTest'); require_once dirname(__FILE__).'/CMailFileTest.php'; @@ -147,13 +144,13 @@ class AllTests require_once dirname(__FILE__).'/FactureFournisseurTest.php'; $suite->addTestSuite('FactureFournisseurTest'); - require_once dirname(__FILE__).'/UserTest.php'; + require_once dirname(__FILE__).'/UserTest.php'; $suite->addTestSuite('UserTest'); - require_once dirname(__FILE__).'/UserGroupTest.php'; + require_once dirname(__FILE__).'/UserGroupTest.php'; $suite->addTestSuite('UserGroupTest'); require_once dirname(__FILE__).'/BankAccountTest.php'; $suite->addTestSuite('BankAccountTest'); - require_once dirname(__FILE__).'/CompanyBankAccountTest.php'; + require_once dirname(__FILE__).'/CompanyBankAccountTest.php'; $suite->addTestSuite('CompanyBankAccountTest'); require_once dirname(__FILE__).'/ChargeSocialesTest.php'; $suite->addTestSuite('ChargeSocialesTest'); @@ -195,7 +192,7 @@ class AllTests // GUI require_once dirname(__FILE__).'/FormAdminTest.php'; - $suite->addTestSuite('FormAdminTest'); + $suite->addTestSuite('FormAdminTest'); return $suite; diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php index 4983f1e2173..fa952b86640 100644 --- a/test/phpunit/BankAccountTest.php +++ b/test/phpunit/BankAccountTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/ContratTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -29,11 +29,10 @@ global $conf,$user,$langs,$db; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/compta/bank/class/account.class.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -49,127 +48,129 @@ $langs->load("main"); */ class BankAccountTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return BankAccountTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return BankAccountTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** * testBankAccountCreate * - * @return int + * @return int */ public function testBankAccountCreate() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Account($this->savdb); - $localobject->initAsSpecimen(); - $localobject->date_solde=dol_now(); - $result=$localobject->create($user); + $localobject=new Account($this->savdb); + $localobject->initAsSpecimen(); + $localobject->date_solde=dol_now(); + $result=$localobject->create($user); - print __METHOD__." result=".$result."\n"; - $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; + $this->assertLessThan($result, 0); - return $result; + return $result; } /** * testBankAccountFetch * - * @param int $id Id of contract - * @return int + * @param int $id Id of contract + * @return int * - * @depends testBankAccountCreate + * @depends testBankAccountCreate * The depends says test is run only if previous is ok */ public function testBankAccountFetch($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Account($this->savdb); - $result=$localobject->fetch($id); + $localobject=new Account($this->savdb); + $result=$localobject->fetch($id); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertLessThan($result, 0); + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertLessThan($result, 0); - return $localobject; + return $localobject; } /** * testBankAccountOther * - * @param Object $localobject Object contract - * @return int + * @param Object $localobject Object contract + * @return int * * @depends testBankAccountFetch * The depends says test is run only if previous is ok @@ -197,27 +198,27 @@ class BankAccountTest extends PHPUnit_Framework_TestCase /** * testBankAccountDelete * - * @param int $id Id of contract - * @return int + * @param int $id Id of contract + * @return int * - * @depends testBankAccountOther + * @depends testBankAccountOther * The depends says test is run only if previous is ok */ public function testBankAccountDelete($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Account($this->savdb); - $result=$localobject->fetch($id); - $result=$localobject->delete($id); + $localobject=new Account($this->savdb); + $result=$localobject->fetch($id); + $result=$localobject->delete($id); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $result; + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $result; } } diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index 3ed7a6524c7..99098c432ea 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -1,6 +1,6 @@ - * Copyright (C) 2012 Regis Houssin +/* Copyright (C) 2010-2012 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,9 +19,9 @@ /** * \file test/phpunit/BuildDocTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -56,11 +56,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/modules/project/modules_proje require_once dirname(__FILE__).'/../../htdocs/core/modules/fichinter/modules_fichinter.php'; require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/modules_expedition.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -74,35 +73,35 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class BuildDocTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return BuildDocTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return BuildDocTest + */ + function __construct() { - global $conf,$user,$langs,$db; + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; + + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; + } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; if (! $conf->facture->enabled) { print __METHOD__." invoice module not enabled\n"; die(); } if (! $conf->commande->enabled) { print __METHOD__." order module not enabled\n"; die(); } @@ -112,41 +111,43 @@ class BuildDocTest extends PHPUnit_Framework_TestCase if (! $conf->ficheinter->enabled) { print __METHOD__." intervention module not enabled\n"; die(); } if (! $conf->deplacement->enabled) { print __METHOD__." trip module not enabled\n"; die(); } - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. - print __METHOD__."\n"; + print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** @@ -156,76 +157,76 @@ class BuildDocTest extends PHPUnit_Framework_TestCase */ public function testFactureBuild() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $conf->facture->dir_output.='/temp'; + $conf->facture->dir_output.='/temp'; - $localobjectcom=new Commande($this->savdb); - $localobjectcom->initAsSpecimen(); + $localobjectcom=new Commande($this->savdb); + $localobjectcom->initAsSpecimen(); - $localobject=new Facture($this->savdb); - $localobject->createFromOrder($localobjectcom); - $localobject->date_lim_reglement = dol_now() + 3600 * 24 *30; + $localobject=new Facture($this->savdb); + $localobject->createFromOrder($localobjectcom); + $localobject->date_lim_reglement = dol_now() + 3600 * 24 *30; - // Crabe (english) - $localobject->modelpdf='crabe'; - $result = $localobject->generateDocument($localobject->modelpdf, $langs); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; + // Crabe (english) + $localobject->modelpdf='crabe'; + $result = $localobject->generateDocument($localobject->modelpdf, $langs); + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; - // Crabe (japanese) - $newlangs1=new Translate("",$conf); - $newlangs1->setDefaultLang('ja_JP'); - $localobject->modelpdf='crabe'; - $result = $localobject->generateDocument($localobject->modelpdf, $newlangs1); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; + // Crabe (japanese) + $newlangs1=new Translate("",$conf); + $newlangs1->setDefaultLang('ja_JP'); + $localobject->modelpdf='crabe'; + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs1); + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; - // Crabe (saudiarabia) - $newlangs2a=new Translate("",$conf); - $newlangs2a->setDefaultLang('sa_SA'); - $localobject->modelpdf='crabe'; - $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2a); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; + // Crabe (saudiarabia) + $newlangs2a=new Translate("",$conf); + $newlangs2a->setDefaultLang('sa_SA'); + $localobject->modelpdf='crabe'; + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2a); + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; - // Crabe (english_saudiarabia) - $newlangs2b=new Translate("",$conf); - $newlangs2b->setDefaultLang('en_SA'); - $localobject->modelpdf='crabe'; - $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2b); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; + // Crabe (english_saudiarabia) + $newlangs2b=new Translate("",$conf); + $newlangs2b->setDefaultLang('en_SA'); + $localobject->modelpdf='crabe'; + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2b); + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; - // Crabe (greek) - $newlangs3=new Translate("",$conf); - $newlangs3->setDefaultLang('el_GR'); - $localobject->modelpdf='crabe'; - $result = $localobject->generateDocument($localobject->modelpdf, $newlangs3); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; + // Crabe (greek) + $newlangs3=new Translate("",$conf); + $newlangs3->setDefaultLang('el_GR'); + $localobject->modelpdf='crabe'; + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs3); + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; - // Crabe (chinese) - $newlangs4=new Translate("",$conf); - $newlangs4->setDefaultLang('zh_CN'); - $localobject->modelpdf='crabe'; - $result = $localobject->generateDocument($localobject->modelpdf, $newlangs4); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; + // Crabe (chinese) + $newlangs4=new Translate("",$conf); + $newlangs4->setDefaultLang('zh_CN'); + $localobject->modelpdf='crabe'; + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs4); + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; - // Crabe (russian) - $newlangs5=new Translate("",$conf); - $newlangs5->setDefaultLang('ru_RU'); - $localobject->modelpdf='crabe'; - $result = $localobject->generateDocument($localobject->modelpdf, $newlangs5); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; + // Crabe (russian) + $newlangs5=new Translate("",$conf); + $newlangs5->setDefaultLang('ru_RU'); + $localobject->modelpdf='crabe'; + $result = $localobject->generateDocument($localobject->modelpdf, $newlangs5); + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; - return 0; + return 0; } /** @@ -247,7 +248,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Canelle $localobject->modelpdf='canelle'; - $result = $localobject->generateDocument($localobject->modelpdf, $langs); + $result = $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; @@ -274,7 +275,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Einstein $localobject->modelpdf='einstein'; - $result = $localobject->generateDocument($localobject->modelpdf, $langs); + $result = $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; @@ -285,9 +286,9 @@ class BuildDocTest extends PHPUnit_Framework_TestCase /** * testCommandeFournisseurBuild - * - * @return int - */ + * + * @return int + */ public function testCommandeFournisseurBuild() { global $conf,$user,$langs,$db; @@ -329,7 +330,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Azur $localobject->modelpdf='azur'; - $result = $localobject->generateDocument($localobject->modelpdf, $langs); + $result = $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; @@ -355,7 +356,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Baleine $localobject->modelpdf='baleine'; - $result = $localobject->generateDocument($localobject->modelpdf, $langs); + $result = $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php index 26e18161b77..52a65a8949e 100755 --- a/test/phpunit/CMailFileTest.php +++ b/test/phpunit/CMailFileTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/CMailFileTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -29,11 +29,10 @@ global $conf,$user,$langs,$db; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/core/class/CMailFile.class.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -47,70 +46,72 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class CMailFileTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return CMailFile - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return CMailFile + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** @@ -120,19 +121,19 @@ class CMailFileTest extends PHPUnit_Framework_TestCase */ public function testCMailFileText() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new CMailFile('Test','test@test.com','from@from.com','Message txt',array(),array(),array(),'','',1,0); + $localobject=new CMailFile('Test','test@test.com','from@from.com','Message txt',array(),array(),array(),'','',1,0); - $result=$localobject->sendfile(); + $result=$localobject->sendfile(); print __METHOD__." result=".$result."\n"; - $this->assertFalse($result); // False because mail send disabled + $this->assertFalse($result); // False because mail send disabled - return $result; + return $result; } /** diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php index 3d4801a5854..d9e030ef9ef 100755 --- a/test/phpunit/CategorieTest.php +++ b/test/phpunit/CategorieTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/CategorieTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -30,11 +30,10 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/categories/class/categorie.class.php'; require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -48,70 +47,72 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class CategorieTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return CategorieTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return CategorieTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** @@ -121,145 +122,145 @@ class CategorieTest extends PHPUnit_Framework_TestCase */ public function testCategorieCreate() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - // We create a category - $localobject=new Categorie($this->savdb); - $localobject->initAsSpecimen(); + // We create a category + $localobject=new Categorie($this->savdb); + $localobject->initAsSpecimen(); - // Check it does not exist (return 0) - $resultCheck=$localobject->already_exists(); - print __METHOD__." resultCheck=".$resultCheck."\n"; - $this->assertEquals(0, $resultCheck); + // Check it does not exist (return 0) + $resultCheck=$localobject->already_exists(); + print __METHOD__." resultCheck=".$resultCheck."\n"; + $this->assertEquals(0, $resultCheck); - // Create - $resultFirstCreate=$localobject->create($user); - print __METHOD__." resultFirstCreate=".$resultFirstCreate."\n"; - $this->assertGreaterThan(0, $resultFirstCreate); + // Create + $resultFirstCreate=$localobject->create($user); + print __METHOD__." resultFirstCreate=".$resultFirstCreate."\n"; + $this->assertGreaterThan(0, $resultFirstCreate); - // We try to create another one with same ref - $localobject2=new Categorie($this->savdb); - $localobject2->initAsSpecimen(); + // We try to create another one with same ref + $localobject2=new Categorie($this->savdb); + $localobject2->initAsSpecimen(); - // Check it does exist (return 1) - $resultCheck=$localobject2->already_exists(); - print __METHOD__." resultCheck=".$resultCheck."\n"; - $this->assertGreaterThan(0, $resultCheck); + // Check it does exist (return 1) + $resultCheck=$localobject2->already_exists(); + print __METHOD__." resultCheck=".$resultCheck."\n"; + $this->assertGreaterThan(0, $resultCheck); - $resultSecondCreate=$localobject2->create($user); - print __METHOD__." result=".$resultSecondCreate."\n"; - $this->assertEquals(-4, $resultSecondCreate); + $resultSecondCreate=$localobject2->create($user); + print __METHOD__." result=".$resultSecondCreate."\n"; + $this->assertEquals(-4, $resultSecondCreate); - return $resultFirstCreate; + return $resultFirstCreate; } /** * testCategorieProduct * - * @param int $id Id of category - * @return int + * @param int $id Id of category + * @return int * - * @depends testCategorieCreate + * @depends testCategorieCreate * The depends says test is run only if previous is ok */ public function testCategorieProduct($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobjecttmp=new Categorie($this->savdb); - $localobjecttmp->initAsSpecimen(); - $localobjecttmp->label='Specimen Category for product'; - $localobjecttmp->type=0; // product category - $catid=$localobjecttmp->create($user); + $localobjecttmp=new Categorie($this->savdb); + $localobjecttmp->initAsSpecimen(); + $localobjecttmp->label='Specimen Category for product'; + $localobjecttmp->type=0; // product category + $catid=$localobjecttmp->create($user); print __METHOD__." catid=".$catid."\n"; $this->assertGreaterThan(0, $catid); // Try to create product linked to category - $localobject2=new Product($this->savdb); - $localobject2->initAsSpecimen(); - $localobject2->ref.='-CATEG'; - $localobject2->tva_npr=1; - $result=$localobject2->create($user); - $cat = new Categorie($this->savdb); - $cat->id = $catid; - $result=$cat->add_type($localobject2,"product"); + $localobject2=new Product($this->savdb); + $localobject2->initAsSpecimen(); + $localobject2->ref.='-CATEG'; + $localobject2->tva_npr=1; + $result=$localobject2->create($user); + $cat = new Categorie($this->savdb); + $cat->id = $catid; + $result=$cat->add_type($localobject2,"product"); - print __METHOD__." result=".$result."\n"; - $this->assertGreaterThan(0, $result); + print __METHOD__." result=".$result."\n"; + $this->assertGreaterThan(0, $result); - // Get list of categories for product - $localcateg=new Categorie($this->savdb); - $listofcateg=$localcateg->containing($localobject2->id, 'product', 'label'); - $this->assertTrue(in_array('Specimen Category for product',$listofcateg), 'Categ not found linked to product when it should'); + // Get list of categories for product + $localcateg=new Categorie($this->savdb); + $listofcateg=$localcateg->containing($localobject2->id, 'product', 'label'); + $this->assertTrue(in_array('Specimen Category for product',$listofcateg), 'Categ not found linked to product when it should'); - return $id; + return $id; } /** * testCategorieFetch * - * @param int $id Id of category - * @return int + * @param int $id Id of category + * @return int * - * @depends testCategorieProduct + * @depends testCategorieProduct * The depends says test is run only if previous is ok */ public function testCategorieFetch($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Categorie($this->savdb); - $result=$localobject->fetch($id); + $localobject=new Categorie($this->savdb); + $result=$localobject->fetch($id); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertGreaterThan(0, $result); - return $localobject; + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertGreaterThan(0, $result); + return $localobject; } /** * testCategorieUpdate * - * @param Category $localobject Category - * @return int + * @param Category $localobject Category + * @return int - * @depends testCategorieFetch + * @depends testCategorieFetch * The depends says test is run only if previous is ok */ public function testCategorieUpdate($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject->note='New note after update'; - $result=$localobject->update($user); + $localobject->note='New note after update'; + $result=$localobject->update($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertGreaterThan(0, $result); - return $localobject; + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertGreaterThan(0, $result); + return $localobject; } /** * testCategorieOther * - * @param Category $localobject Category - * @return int + * @param Category $localobject Category + * @return int * * @depends testCategorieUpdate * The depends says test is run only if previous is ok @@ -289,50 +290,50 @@ class CategorieTest extends PHPUnit_Framework_TestCase /** * testCategorieDelete * - * @param int $id Id of category - * @return int + * @param int $id Id of category + * @return int * * @depends testCategorieOther * The depends says test is run only if previous is ok */ public function testCategorieDelete($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Categorie($this->savdb); - $result=$localobject->fetch($id); - $result=$localobject->delete($user); + $localobject=new Categorie($this->savdb); + $result=$localobject->fetch($id); + $result=$localobject->delete($user); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertGreaterThan(0, $result); - return $result; + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertGreaterThan(0, $result); + return $result; } /** * testCategorieStatic * - * @return void + * @return void * * @depends testCategorieDelete */ public function testCategorieStatic() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Categorie($this->savdb); + $localobject=new Categorie($this->savdb); $retarray=$localobject->get_full_arbo(3); - print __METHOD__." retarray size=".count($retarray)."\n"; - $this->assertTrue(is_array($retarray)); - return $retarray; + print __METHOD__." retarray size=".count($retarray)."\n"; + $this->assertTrue(is_array($retarray)); + return $retarray; } } diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php index 69b1f93f776..0836036afa5 100755 --- a/test/phpunit/ChargeSocialesTest.php +++ b/test/phpunit/ChargeSocialesTest.php @@ -80,6 +80,8 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php index 90c0d10e3fb..67c120a2bb8 100644 --- a/test/phpunit/CommandeFournisseurTest.php +++ b/test/phpunit/CommandeFournisseurTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/CommandeFournisseurTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -30,11 +30,10 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/fourn/class/fournisseur.commande.class.php'; require_once dirname(__FILE__).'/../../htdocs/fourn/class/fournisseur.product.class.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -49,71 +48,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return CommandeFournisseurTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return CommandeFournisseurTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; - //print $db->getVersion()."\n"; + print __METHOD__."\n"; + //print $db->getVersion()."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** @@ -123,169 +124,169 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase */ public function testCommandeFournisseurCreate() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - // Set supplier and product to use - $socid=1; - $societe=new Societe($db); - $societe->fetch($socid); - $product=new ProductFournisseur($db); - $product->fetch(0,'PIDRESS'); - if ($product->id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); } + // Set supplier and product to use + $socid=1; + $societe=new Societe($db); + $societe->fetch($socid); + $product=new ProductFournisseur($db); + $product->fetch(0,'PIDRESS'); + if ($product->id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); } - $quantity=10; - $ref_fourn='SUPPLIER_REF_PHPUNIT'; - $tva_tx=19.6; + $quantity=10; + $ref_fourn='SUPPLIER_REF_PHPUNIT'; + $tva_tx=19.6; - // Create supplier price - $result=$product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity); // This insert record with no value for price. Values are update later with update_buyprice - $this->assertGreaterThanOrEqual(1, $result); - $result=$product->update_buyprice($quantity, 10, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0); - $this->assertGreaterThanOrEqual(0, $result); + // Create supplier price + $result=$product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity); // This insert record with no value for price. Values are update later with update_buyprice + $this->assertGreaterThanOrEqual(1, $result); + $result=$product->update_buyprice($quantity, 10, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0); + $this->assertGreaterThanOrEqual(0, $result); - // Create supplier order with a too low quantity - $localobject=new CommandeFournisseur($db); - $localobject->initAsSpecimen(); - $localobject->lines=array(); // Overwrite lines of order - $line=new CommandeFournisseurLigne($db); - $line->desc=$langs->trans("Description")." specimen line too low"; - $line->qty=1; // So lower than $quantity - $line->fk_product=$product->id; - $line->ref_fourn=$ref_fourn; - $localobject->lines[]=$line; + // Create supplier order with a too low quantity + $localobject=new CommandeFournisseur($db); + $localobject->initAsSpecimen(); + $localobject->lines=array(); // Overwrite lines of order + $line=new CommandeFournisseurLigne($db); + $line->desc=$langs->trans("Description")." specimen line too low"; + $line->qty=1; // So lower than $quantity + $line->fk_product=$product->id; + $line->ref_fourn=$ref_fourn; + $localobject->lines[]=$line; - $result=$localobject->create($user); + $result=$localobject->create($user); print __METHOD__." result=".$result."\n"; - $this->assertEquals(-1, $result); // must be -1 because quantity is lower than minimum of supplier price + $this->assertEquals(-1, $result); // must be -1 because quantity is lower than minimum of supplier price - $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''"; - $db->query($sql); + $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''"; + $db->query($sql); - // Create supplier order - $localobject2=new CommandeFournisseur($db); - $localobject2->initAsSpecimen(); // This create 5 lines of first product found for socid 1 - $localobject2->lines=array(); // Overwrite lines of order - $line=new CommandeFournisseurLigne($db); - $line->desc=$langs->trans("Description")." specimen line ok"; - $line->qty=10; // So enough quantity - $line->fk_product=$product->id; - $line->ref_fourn=$ref_fourn; - $localobject2->lines[]=$line; + // Create supplier order + $localobject2=new CommandeFournisseur($db); + $localobject2->initAsSpecimen(); // This create 5 lines of first product found for socid 1 + $localobject2->lines=array(); // Overwrite lines of order + $line=new CommandeFournisseurLigne($db); + $line->desc=$langs->trans("Description")." specimen line ok"; + $line->qty=10; // So enough quantity + $line->fk_product=$product->id; + $line->ref_fourn=$ref_fourn; + $localobject2->lines[]=$line; - $result=$localobject2->create($user); - print __METHOD__." result=".$result."\n"; - $this->assertGreaterThanOrEqual(0, $result); + $result=$localobject2->create($user); + print __METHOD__." result=".$result."\n"; + $this->assertGreaterThanOrEqual(0, $result); - return $result; + return $result; } /** * testCommandeFournisseurFetch * - * @param int $id Id of supplier order - * @return void + * @param int $id Id of supplier order + * @return void * - * @depends testCommandeFournisseurCreate + * @depends testCommandeFournisseurCreate * The depends says test is run only if previous is ok */ public function testCommandeFournisseurFetch($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new CommandeFournisseur($this->savdb); - $result=$localobject->fetch($id); + $localobject=new CommandeFournisseur($this->savdb); + $result=$localobject->fetch($id); - print __METHOD__." id=".$id." result=".$result."\n"; + print __METHOD__." id=".$id." result=".$result."\n"; $this->assertLessThan($result, 0); - return $localobject; + return $localobject; } /** * testCommandeFournisseurValid * - * @param Object $localobject Supplier order - * @return void + * @param Object $localobject Supplier order + * @return void * - * @depends testCommandeFournisseurFetch + * @depends testCommandeFournisseurFetch * The depends says test is run only if previous is ok */ public function testCommandeFournisseurValid($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->valid($user); + $result=$localobject->valid($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $localobject; + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $localobject; } /** * testCommandeFournisseurApprove * - * @param Object $localobject Supplier order - * @return void + * @param Object $localobject Supplier order + * @return void * - * @depends testCommandeFournisseurValid + * @depends testCommandeFournisseurValid * The depends says test is run only if previous is ok */ public function testCommandeFournisseurApprove($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->approve($user); + $result=$localobject->approve($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $localobject; + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $localobject; } /** * testCommandeFournisseurCancel * - * @param Object $localobject Supplier order - * @return void + * @param Object $localobject Supplier order + * @return void * - * @depends testCommandeFournisseurValid + * @depends testCommandeFournisseurValid * The depends says test is run only if previous is ok */ public function testCommandeFournisseurCancel($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->cancel($user); + $result=$localobject->cancel($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $localobject; + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $localobject; } /** * testCommandeFournisseurOther * - * @param Object $localobject Supplier order - * @return void + * @param Object $localobject Supplier order + * @return void * * @depends testCommandeFournisseurCancel * The depends says test is run only if previous is ok @@ -314,27 +315,27 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase /** * testCommandeFournisseurDelete * - * @param int $id Id of order - * @return void + * @param int $id Id of order + * @return void * - * @depends testCommandeFournisseurOther + * @depends testCommandeFournisseurOther * The depends says test is run only if previous is ok */ public function testCommandeFournisseurDelete($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new CommandeFournisseur($this->savdb); - $result=$localobject->fetch($id); - $result=$localobject->delete($user); + $localobject=new CommandeFournisseur($this->savdb); + $result=$localobject->fetch($id); + $result=$localobject->delete($user); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $result; + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $result; } } diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php index 8a2e3f57120..0bb7788d33f 100644 --- a/test/phpunit/CommandeTest.php +++ b/test/phpunit/CommandeTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/CommandeTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -29,11 +29,10 @@ global $conf,$user,$langs,$db; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/commande/class/commande.class.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -47,173 +46,176 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class CommandeTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return CommandeTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return CommandeTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; - //print $db->getVersion()."\n"; + print __METHOD__."\n"; + //print $db->getVersion()."\n"; } - /** - * End phpunit tests - * - * @return void - */ + + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** * testCommandeCreate * - * @return void + * @return void */ public function testCommandeCreate() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Commande($this->savdb); - $localobject->initAsSpecimen(); - $result=$localobject->create($user); + $localobject=new Commande($this->savdb); + $localobject->initAsSpecimen(); + $result=$localobject->create($user); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; - return $result; + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; + return $result; } /** * testCommandeFetch * - * @param int $id Id order - * @return Commande + * @param int $id Id order + * @return Commande * * @depends testCommandeCreate * The depends says test is run only if previous is ok */ public function testCommandeFetch($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Commande($this->savdb); - $result=$localobject->fetch($id); + $localobject=new Commande($this->savdb); + $result=$localobject->fetch($id); - $this->assertLessThan($result, 0); - print __METHOD__." id=".$id." result=".$result."\n"; - return $localobject; + $this->assertLessThan($result, 0); + print __METHOD__." id=".$id." result=".$result."\n"; + return $localobject; } /** * testCommandeValid * - * @param Object $localobject Order - * @return void + * @param Object $localobject Order + * @return void * * @depends testCommandeFetch * The depends says test is run only if previous is ok */ public function testCommandeValid($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->valid($user); + $result=$localobject->valid($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $localobject; + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $localobject; } /** * testCommandeCancel * - * @param Object $localobject Order - * @return void + * @param Object $localobject Order + * @return void * - * @depends testCommandeValid + * @depends testCommandeValid * The depends says test is run only if previous is ok */ public function testCommandeCancel($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->cancel(); + $result=$localobject->cancel(); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $localobject; + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $localobject; } /** * testCommandeOther * - * @param Object $localobject Order - * @return void + * @param Object $localobject Order + * @return void * * @depends testCommandeCancel * The depends says test is run only if previous is ok @@ -241,27 +243,27 @@ class CommandeTest extends PHPUnit_Framework_TestCase /** * testCommandeDelete * - * @param int $id Id of order - * @return void + * @param int $id Id of order + * @return void * - * @depends testCommandeOther + * @depends testCommandeOther * The depends says test is run only if previous is ok */ public function testCommandeDelete($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Commande($this->savdb); - $result=$localobject->fetch($id); - $result=$localobject->delete($user); + $localobject=new Commande($this->savdb); + $result=$localobject->fetch($id); + $result=$localobject->delete($user); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $result; + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $result; } } diff --git a/test/phpunit/CommonObjectTest.php b/test/phpunit/CommonObjectTest.php index a22146dfc2a..18f96034fd1 100644 --- a/test/phpunit/CommonObjectTest.php +++ b/test/phpunit/CommonObjectTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/CommonObjectTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -30,11 +30,10 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/commande/class/commande.class.php'; require_once dirname(__FILE__).'/../../htdocs/projet/class/project.class.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -48,138 +47,140 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class CommonObjectTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return CommonObjectTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return CommonObjectTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** - * testFetchUser + * testFetchUser * - * @return void + * @return void */ public function testFetchUser() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Commande($this->savdb); - $localobject->fetch(1); + $localobject=new Commande($this->savdb); + $localobject->fetch(1); - $result=$localobject->fetch_user(1); + $result=$localobject->fetch_user(1); - print __METHOD__." result=".$result."\n"; - $this->assertLessThan($localobject->user->id, 0); - return $result; + print __METHOD__." result=".$result."\n"; + $this->assertLessThan($localobject->user->id, 0); + return $result; } /** - * testFetchProjet + * testFetchProjet * - * @return void + * @return void */ public function testFetchProjet() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Commande($this->savdb); - $localobject->fetch(1); - $result=$localobject->fetch_projet(); + $localobject=new Commande($this->savdb); + $localobject->fetch(1); + $result=$localobject->fetch_projet(); - print __METHOD__." result=".$result."\n"; - $this->assertLessThanOrEqual($result,0); - return $result; + print __METHOD__." result=".$result."\n"; + $this->assertLessThanOrEqual($result,0); + return $result; } /** - * testFetchThirdParty + * testFetchThirdParty * - * @return void + * @return void */ public function testFetchThirdParty() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Commande($this->savdb); - $localobject->fetch(1); + $localobject=new Commande($this->savdb); + $localobject->fetch(1); - $result=$localobject->fetch_thirdparty(); + $result=$localobject->fetch_thirdparty(); - print __METHOD__." result=".$result."\n"; - $this->assertLessThanOrEqual($result,0); - return $result; + print __METHOD__." result=".$result."\n"; + $this->assertLessThanOrEqual($result,0); + return $result; } } diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php index a105bb37a53..95ea937a017 100644 --- a/test/phpunit/CompanyBankAccountTest.php +++ b/test/phpunit/CompanyBankAccountTest.php @@ -80,6 +80,8 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php index 3c09df861f0..b638cdc776b 100755 --- a/test/phpunit/ContactTest.php +++ b/test/phpunit/ContactTest.php @@ -89,6 +89,8 @@ class ContactTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php index 149d867135e..5adf002c885 100644 --- a/test/phpunit/ContratTest.php +++ b/test/phpunit/ContratTest.php @@ -80,6 +80,8 @@ class ContratTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; @@ -162,37 +164,13 @@ class ContratTest extends PHPUnit_Framework_TestCase return $localobject; } - /** - * testContratValid - * - * @param Contrat $localobject Contract - * @return int - * - * @depends testContratFetch - * The depends says test is run only if previous is ok - */ - public function testContratValid($localobject) - { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; - - $result=$localobject->update_statut($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - - $this->assertLessThan($result, 0); - return $localobject; - } - /** - * testContratValid + * testContratOther * * @param Object $localobject Object contract * @return int * - * @depends testContratValid + * @depends testContratFetch * The depends says test is run only if previous is ok */ public function testContratOther($localobject) diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php index 8d56b4a0b42..01f06e41af7 100755 --- a/test/phpunit/CoreTest.php +++ b/test/phpunit/CoreTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/CoreTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -49,70 +49,72 @@ if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is */ class CoreTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return CoreTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - //print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return CoreTest + */ + function __construct() { - global $conf,$user,$langs,$db; - //$db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + //print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + //$db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - //$db->rollback(); + global $conf,$user,$langs,$db; + //$db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } @@ -123,177 +125,170 @@ class CoreTest extends PHPUnit_Framework_TestCase */ public function testDetectURLROOT() { - global $dolibarr_main_prod; + global $dolibarr_main_prod; - global $dolibarr_main_url_root; - global $dolibarr_main_data_root; - global $dolibarr_main_document_root; - global $dolibarr_main_data_root_alt; - global $dolibarr_main_document_root_alt; - global $dolibarr_main_db_host; - global $dolibarr_main_db_port; - global $dolibarr_main_db_type; - global $dolibarr_main_db_prefix; + global $dolibarr_main_url_root; + global $dolibarr_main_data_root; + global $dolibarr_main_document_root; + global $dolibarr_main_data_root_alt; + global $dolibarr_main_document_root_alt; + global $dolibarr_main_db_host; + global $dolibarr_main_db_port; + global $dolibarr_main_db_type; + global $dolibarr_main_db_prefix; - $testtodo=3; + $testtodo=3; - // Case 1: - // Test for subdir dolibarrnew (that point to htdocs) in root directory /var/www - // URL: http://localhost/dolibarrnew/admin/system/phpinfo.php - // To prepare this test: - // - Create link from htdocs to /var/www/dolibarrnew - // - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarrnew'; - if ($testtodo == 1) - { - $_SERVER["HTTPS"]=''; - $_SERVER["SERVER_NAME"]='localhost'; - $_SERVER["SERVER_PORT"]='80'; - $_SERVER["DOCUMENT_ROOT"]='/var/www'; - $_SERVER["SCRIPT_NAME"]='/dolibarrnew/admin/system/phpinfo.php'; - $expectedresult='/dolibarrnew'; - } + // Case 1: + // Test for subdir dolibarrnew (that point to htdocs) in root directory /var/www + // URL: http://localhost/dolibarrnew/admin/system/phpinfo.php + // To prepare this test: + // - Create link from htdocs to /var/www/dolibarrnew + // - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarrnew'; + if ($testtodo == 1) { + $_SERVER["HTTPS"]=''; + $_SERVER["SERVER_NAME"]='localhost'; + $_SERVER["SERVER_PORT"]='80'; + $_SERVER["DOCUMENT_ROOT"]='/var/www'; + $_SERVER["SCRIPT_NAME"]='/dolibarrnew/admin/system/phpinfo.php'; + $expectedresult='/dolibarrnew'; + } - // Case 2: - // Test for subdir aaa (that point to dolibarr) in root directory /var/www - // URL: http://localhost/aaa/htdocs/admin/system/phpinfo.php - // To prepare this test: - // - Create link from dolibarr to /var/www/aaa - // - Put into conf.php $dolibarr_main_document_root='/var/www/aaa/htdocs'; - if ($testtodo == 2) - { - $_SERVER["HTTPS"]=''; - $_SERVER["SERVER_NAME"]='localhost'; - $_SERVER["SERVER_PORT"]='80'; - $_SERVER["DOCUMENT_ROOT"]='/var/www'; - $_SERVER["SCRIPT_NAME"]='/aaa/htdocs/admin/system/phpinfo.php'; - $expectedresult='/aaa/htdocs'; - } + // Case 2: + // Test for subdir aaa (that point to dolibarr) in root directory /var/www + // URL: http://localhost/aaa/htdocs/admin/system/phpinfo.php + // To prepare this test: + // - Create link from dolibarr to /var/www/aaa + // - Put into conf.php $dolibarr_main_document_root='/var/www/aaa/htdocs'; + if ($testtodo == 2) { + $_SERVER["HTTPS"]=''; + $_SERVER["SERVER_NAME"]='localhost'; + $_SERVER["SERVER_PORT"]='80'; + $_SERVER["DOCUMENT_ROOT"]='/var/www'; + $_SERVER["SCRIPT_NAME"]='/aaa/htdocs/admin/system/phpinfo.php'; + $expectedresult='/aaa/htdocs'; + } - // Case 3: - // Test for virtual host localhostdolibarrnew that point to htdocs directory with - // a direct document root - // URL: http://localhostdolibarrnew/admin/system/phpinfo.php - // To prepare this test: - // - Create virtual host localhostdolibarrnew that point to /home/ldestailleur/git/dolibarr/htdocs - // - Put into conf.php $dolibarr_main_document_root='/home/ldestailleur/git/dolibarr/htdocs'; - if ($testtodo == 3) - { - $_SERVER["HTTPS"]=''; - $_SERVER["SERVER_NAME"]='localhostdolibarrnew'; - $_SERVER["SERVER_PORT"]='80'; - $_SERVER["DOCUMENT_ROOT"]='/home/ldestailleur/git/dolibarr/htdocs'; - $_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php'; - $expectedresult=''; - } + // Case 3: + // Test for virtual host localhostdolibarrnew that point to htdocs directory with + // a direct document root + // URL: http://localhostdolibarrnew/admin/system/phpinfo.php + // To prepare this test: + // - Create virtual host localhostdolibarrnew that point to /home/ldestailleur/git/dolibarr/htdocs + // - Put into conf.php $dolibarr_main_document_root='/home/ldestailleur/git/dolibarr/htdocs'; + if ($testtodo == 3) { + $_SERVER["HTTPS"]=''; + $_SERVER["SERVER_NAME"]='localhostdolibarrnew'; + $_SERVER["SERVER_PORT"]='80'; + $_SERVER["DOCUMENT_ROOT"]='/home/ldestailleur/git/dolibarr/htdocs'; + $_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php'; + $expectedresult=''; + } - // Case 4: - // Test for virtual host localhostdolibarrnew that point to htdocs directory with - // a symbolic link - // URL: http://localhostdolibarrnew/admin/system/phpinfo.php - if ($testtodo == 4) - { - $_SERVER["HTTPS"]=''; - $_SERVER["SERVER_NAME"]='localhostdolibarrnew'; - $_SERVER["SERVER_PORT"]='80'; - $_SERVER["DOCUMENT_ROOT"]='/var/www/dolibarr'; // This is a link that point to /home/ldestail/workspace/dolibarr/htdocs - $_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php'; - $expectedresult=''; - } + // Case 4: + // Test for virtual host localhostdolibarrnew that point to htdocs directory with + // a symbolic link + // URL: http://localhostdolibarrnew/admin/system/phpinfo.php + if ($testtodo == 4) { + $_SERVER["HTTPS"]=''; + $_SERVER["SERVER_NAME"]='localhostdolibarrnew'; + $_SERVER["SERVER_PORT"]='80'; + $_SERVER["DOCUMENT_ROOT"]='/var/www/dolibarr'; // This is a link that point to /home/ldestail/workspace/dolibarr/htdocs + $_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php'; + $expectedresult=''; + } - // Case 5: - // Test for alias /dolibarralias, Test when using nginx, Test when using lighttpd - // URL: http://localhost/dolibarralias/admin/system/phpinfo.php - // To prepare this test: - // - Copy content of dolibarr project into /var/www/dolibarr - // - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarr/htdocs'; - // - Put into conf.php $dolibarr_main_url_root='http://localhost/dolibarralias'; (because autodetect will fails in this case) - if ($testtodo == 5) - { - $_SERVER["HTTPS"]=''; - $_SERVER["SERVER_NAME"]='localhost'; - $_SERVER["SERVER_PORT"]='80'; - $_SERVER["DOCUMENT_ROOT"]='/var/www'; - $_SERVER["SCRIPT_NAME"]='/dolibarralias/admin/system/phpinfo.php'; - $expectedresult='/dolibarralias'; - } + // Case 5: + // Test for alias /dolibarralias, Test when using nginx, Test when using lighttpd + // URL: http://localhost/dolibarralias/admin/system/phpinfo.php + // To prepare this test: + // - Copy content of dolibarr project into /var/www/dolibarr + // - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarr/htdocs'; + // - Put into conf.php $dolibarr_main_url_root='http://localhost/dolibarralias'; (because autodetect will fails in this case) + if ($testtodo == 5) { + $_SERVER["HTTPS"]=''; + $_SERVER["SERVER_NAME"]='localhost'; + $_SERVER["SERVER_PORT"]='80'; + $_SERVER["DOCUMENT_ROOT"]='/var/www'; + $_SERVER["SCRIPT_NAME"]='/dolibarralias/admin/system/phpinfo.php'; + $expectedresult='/dolibarralias'; + } - // Force to rerun filefunc.inc.php - include dirname(__FILE__).'/../../htdocs/filefunc.inc.php'; + // Force to rerun filefunc.inc.php + include dirname(__FILE__).'/../../htdocs/filefunc.inc.php'; - print __METHOD__." DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT."\n"; - print __METHOD__." DOL_URL_ROOT=".DOL_URL_ROOT."\n"; - $this->assertEquals(DOL_URL_ROOT,$expectedresult); + print __METHOD__." DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT."\n"; + print __METHOD__." DOL_URL_ROOT=".DOL_URL_ROOT."\n"; + $this->assertEquals(DOL_URL_ROOT,$expectedresult); - return true; + return true; } /** * testSqlAndScriptInject * - * @return void + * @return void */ public function testSqlAndScriptInject() { - global $dolibarr_main_prod; + global $dolibarr_main_prod; - global $dolibarr_main_url_root; - global $dolibarr_main_data_root; - global $dolibarr_main_document_root; - global $dolibarr_main_data_root_alt; - global $dolibarr_main_document_root_alt; - global $dolibarr_main_db_host; - global $dolibarr_main_db_port; - global $dolibarr_main_db_type; - global $dolibarr_main_db_prefix; + global $dolibarr_main_url_root; + global $dolibarr_main_data_root; + global $dolibarr_main_document_root; + global $dolibarr_main_data_root_alt; + global $dolibarr_main_document_root_alt; + global $dolibarr_main_db_host; + global $dolibarr_main_db_port; + global $dolibarr_main_db_type; + global $dolibarr_main_db_prefix; - // This is code copied from main.inc.php + // This is code copied from main.inc.php - /** - * Security: SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF). - * - * @param string $val Value - * @param string $type 1=GET, 0=POST, 2=PHP_SELF - * @return int >0 if there is an injection - */ - function test_sql_and_script_inject($val, $type) - { - $sql_inj = 0; - // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests) - if ($type != 2) - { - $sql_inj += preg_match('/delete[\s]+from/i', $val); - $sql_inj += preg_match('/create[\s]+table/i', $val); - $sql_inj += preg_match('/update.+set.+=/i', $val); - $sql_inj += preg_match('/insert[\s]+into/i', $val); - $sql_inj += preg_match('/select.+from/i', $val); - $sql_inj += preg_match('/union.+select/i', $val); - $sql_inj += preg_match('/(\.\.%2f)+/i', $val); - } - // For XSS Injection done by adding javascript with script - // This is all cases a browser consider text is javascript: - // When it found '0 if there is an injection + */ + function test_sql_and_script_inject($val, $type) + { + $sql_inj = 0; + // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests) + if ($type != 2) { + $sql_inj += preg_match('/delete[\s]+from/i', $val); + $sql_inj += preg_match('/create[\s]+table/i', $val); + $sql_inj += preg_match('/update.+set.+=/i', $val); + $sql_inj += preg_match('/insert[\s]+into/i', $val); + $sql_inj += preg_match('/select.+from/i', $val); + $sql_inj += preg_match('/union.+select/i', $val); + $sql_inj += preg_match('/(\.\.%2f)+/i', $val); + } + // For XSS Injection done by adding javascript with script + // This is all cases a browser consider text is javascript: + // When it found 'assertEquals($result,$expectedresult); + $this->assertEquals($result,$expectedresult); } } diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php index f5d9e7d0cc4..9dd362cca9d 100644 --- a/test/phpunit/DateLibTest.php +++ b/test/phpunit/DateLibTest.php @@ -80,6 +80,8 @@ class DateLibTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/DateLibTzFranceTest.php b/test/phpunit/DateLibTzFranceTest.php index 22bfc12590e..668af000204 100644 --- a/test/phpunit/DateLibTzFranceTest.php +++ b/test/phpunit/DateLibTzFranceTest.php @@ -85,6 +85,8 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/DiscountTest.php b/test/phpunit/DiscountTest.php index d9f92c84bd1..cf4d5033597 100755 --- a/test/phpunit/DiscountTest.php +++ b/test/phpunit/DiscountTest.php @@ -80,6 +80,8 @@ class DiscountTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php index 53788d71dab..d3d7c300308 100755 --- a/test/phpunit/EntrepotTest.php +++ b/test/phpunit/EntrepotTest.php @@ -83,6 +83,8 @@ class EntrepotTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php index 49695ab1946..e4ee73291be 100755 --- a/test/phpunit/ExportTest.php +++ b/test/phpunit/ExportTest.php @@ -84,6 +84,8 @@ class ExportTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php index a5855b37a37..199d397f50d 100644 --- a/test/phpunit/FactureFournisseurTest.php +++ b/test/phpunit/FactureFournisseurTest.php @@ -80,6 +80,8 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php index 4d4783240fa..f7f857fe317 100644 --- a/test/phpunit/FactureRecTest.php +++ b/test/phpunit/FactureRecTest.php @@ -81,6 +81,8 @@ class FactureRecTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php index cce025a77eb..c68014e9606 100644 --- a/test/phpunit/FactureTest.php +++ b/test/phpunit/FactureTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/FactureTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -29,11 +29,10 @@ global $conf,$user,$langs,$db; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -47,74 +46,76 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class FactureTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return FactureTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return FactureTest + */ + function __construct() { - global $conf,$user,$langs,$db; + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; + + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; + } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; if (! empty($conf->ecotaxdeee->enabled)) { print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(); } - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. - print __METHOD__."\n"; + print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ - protected function tearDown() + /** + * End phpunit tests + * + * @return void + */ + protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** @@ -124,107 +125,107 @@ class FactureTest extends PHPUnit_Framework_TestCase */ public function testFactureCreate() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Facture($this->savdb); - $localobject->initAsSpecimen(); - $result=$localobject->create($user); + $localobject=new Facture($this->savdb); + $localobject->initAsSpecimen(); + $result=$localobject->create($user); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; - return $result; + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; + return $result; } /** * testFactureFetch * - * @param int $id Id invoice - * @return int + * @param int $id Id invoice + * @return int * - * @depends testFactureCreate + * @depends testFactureCreate * The depends says test is run only if previous is ok */ public function testFactureFetch($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Facture($this->savdb); - $result=$localobject->fetch($id); + $localobject=new Facture($this->savdb); + $result=$localobject->fetch($id); - $this->assertLessThan($result, 0); - print __METHOD__." id=".$id." result=".$result."\n"; - return $localobject; + $this->assertLessThan($result, 0); + print __METHOD__." id=".$id." result=".$result."\n"; + return $localobject; } /** * testFactureFetch * - * @param Object $localobject Invoice - * @return int + * @param Object $localobject Invoice + * @return int * - * @depends testFactureFetch + * @depends testFactureFetch * The depends says test is run only if previous is ok */ public function testFactureUpdate($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; $this->changeProperties($localobject); - $result=$localobject->update($user); + $result=$localobject->update($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $localobject; + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $localobject; } /** * testFactureValid * - * @param Object $localobject Invoice - * @return void + * @param Object $localobject Invoice + * @return void * - * @depends testFactureUpdate + * @depends testFactureUpdate * The depends says test is run only if previous is ok */ public function testFactureValid($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->validate($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $result=$localobject->validate($user); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $this->assertLessThan($result, 0); - // Test everything are still same than specimen - $newlocalobject=new Facture($this->savdb); - $newlocalobject->initAsSpecimen(); - $this->changeProperties($newlocalobject); + // Test everything are still same than specimen + $newlocalobject=new Facture($this->savdb); + $newlocalobject->initAsSpecimen(); + $this->changeProperties($newlocalobject); $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','ref','statut','paye','specimen','facnumber','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement','cond_reglement_doc')), array()); // Actual, Expected - return $localobject; + return $localobject; } /** * testFactureOther * - * @param Object $localobject Invoice - * @return int + * @param Object $localobject Invoice + * @return int * * @depends testFactureValid * The depends says test is run only if previous is ok @@ -256,34 +257,34 @@ class FactureTest extends PHPUnit_Framework_TestCase /** * testFactureDelete * - * @param int $id Id of invoice - * @return int + * @param int $id Id of invoice + * @return int * - * @depends testFactureOther + * @depends testFactureOther * The depends says test is run only if previous is ok */ public function testFactureDelete($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Facture($this->savdb); - $result=$localobject->fetch($id); - $result=$localobject->delete($id); + $localobject=new Facture($this->savdb); + $result=$localobject->fetch($id); + $result=$localobject->delete($id); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertGreaterThanOrEqual(0, $result); - return $result; + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertGreaterThanOrEqual(0, $result); + return $result; } /** * Edit an object to test updates * - * @param mixed $localobject Object Facture - * @return void + * @param mixed $localobject Object Facture + * @return void */ public function changeProperties(&$localobject) { @@ -294,11 +295,11 @@ class FactureTest extends PHPUnit_Framework_TestCase /** * Compare all public properties values of 2 objects * - * @param Object $oA Object operand 1 - * @param Object $oB Object operand 2 - * @param boolean $ignoretype False will not report diff if type of value differs - * @param array $fieldstoignorearray Array of fields to ignore in diff - * @return array Array with differences + * @param Object $oA Object operand 1 + * @param Object $oB Object operand 2 + * @param boolean $ignoretype False will not report diff if type of value differs + * @param array $fieldstoignorearray Array of fields to ignore in diff + * @return array Array with differences */ public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id')) { diff --git a/test/phpunit/FactureTestRounding.php b/test/phpunit/FactureTestRounding.php index d4bb8b9dff7..5fe0df4e5d0 100644 --- a/test/phpunit/FactureTestRounding.php +++ b/test/phpunit/FactureTestRounding.php @@ -80,6 +80,8 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/FichinterTest.php b/test/phpunit/FichinterTest.php index 96366af85a9..baa72b7020a 100644 --- a/test/phpunit/FichinterTest.php +++ b/test/phpunit/FichinterTest.php @@ -80,6 +80,8 @@ class FichinterTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php index 0e011c96d2c..4477784ae7d 100644 --- a/test/phpunit/FilesLibTest.php +++ b/test/phpunit/FilesLibTest.php @@ -81,6 +81,8 @@ class FilesLibTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/FormAdminTest.php b/test/phpunit/FormAdminTest.php index 265f8e62759..30c96600210 100644 --- a/test/phpunit/FormAdminTest.php +++ b/test/phpunit/FormAdminTest.php @@ -80,6 +80,8 @@ class FormAdminTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php index 969810cb314..13462afc601 100755 --- a/test/phpunit/Functions2LibTest.php +++ b/test/phpunit/Functions2LibTest.php @@ -83,6 +83,8 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index f26718f1dd9..6036909cd23 100755 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -83,6 +83,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; @@ -824,4 +826,32 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase $this->assertEquals(dol_nl2br($string, 1, 1), "a
    a"); } + /** + * testDolPrice2Num + * + * @return boolean + */ + public function testDolPrice2Num() + { + $this->assertEquals(1000, price2num('1 000.0')); + $this->assertEquals(1000, price2num('1 000','MT')); + $this->assertEquals(1000, price2num('1 000','MU')); + + $this->assertEquals(1000.123456, price2num('1 000.123456')); + + // Round down + $this->assertEquals(1000.12, price2num('1 000.123452','MT')); + $this->assertEquals(1000.12345, price2num('1 000.123452','MU'),"Test MU"); + + // Round up + $this->assertEquals(1000.13, price2num('1 000.125456','MT')); + $this->assertEquals(1000.12546, price2num('1 000.125456','MU'),"Test MU"); + + // Text can't be converted + $this->assertEquals('12.4$',price2num('12.4$')); + $this->assertEquals('12r.4$',price2num('12r.4$')); + + return true; + } + } diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php index e91305c21e2..36556fd9281 100644 --- a/test/phpunit/HolidayTest.php +++ b/test/phpunit/HolidayTest.php @@ -83,6 +83,8 @@ class HolidayTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php index f43bfe1c169..41c7005e25d 100644 --- a/test/phpunit/ImagesLibTest.php +++ b/test/phpunit/ImagesLibTest.php @@ -81,6 +81,8 @@ class ImagesLibTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php index 4d9590e7a1d..067b06910c9 100755 --- a/test/phpunit/ImportTest.php +++ b/test/phpunit/ImportTest.php @@ -82,6 +82,8 @@ class ImportTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/JsonLibTest.php b/test/phpunit/JsonLibTest.php index 1a7127c69b1..66999e31c65 100755 --- a/test/phpunit/JsonLibTest.php +++ b/test/phpunit/JsonLibTest.php @@ -82,6 +82,8 @@ class JsonLibTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php index 5f876c8740c..d0fba783064 100755 --- a/test/phpunit/LangTest.php +++ b/test/phpunit/LangTest.php @@ -92,6 +92,8 @@ class LangTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/MarginsLibTest.php b/test/phpunit/MarginsLibTest.php index 7ae615e4934..7c2e8f68ef6 100644 --- a/test/phpunit/MarginsLibTest.php +++ b/test/phpunit/MarginsLibTest.php @@ -80,6 +80,8 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php index b5529489d00..eff4b85c698 100755 --- a/test/phpunit/ModulesTest.php +++ b/test/phpunit/ModulesTest.php @@ -79,6 +79,8 @@ class ModulesTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php index a3788b309d1..043b8ae5a83 100644 --- a/test/phpunit/NumberingModulesTest.php +++ b/test/phpunit/NumberingModulesTest.php @@ -79,6 +79,8 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php index 20feab6fb0a..fb48279cd66 100644 --- a/test/phpunit/PaypalTest.php +++ b/test/phpunit/PaypalTest.php @@ -84,6 +84,8 @@ class PaypalTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php index 02d20a816a8..13cb1b59ae3 100755 --- a/test/phpunit/PdfDocTest.php +++ b/test/phpunit/PdfDocTest.php @@ -83,6 +83,8 @@ class PdfDocTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/PgsqlTest.php b/test/phpunit/PgsqlTest.php index 4fdca35eb82..04693c017ed 100755 --- a/test/phpunit/PgsqlTest.php +++ b/test/phpunit/PgsqlTest.php @@ -83,6 +83,8 @@ class PgsqlTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php index 87ffd9c6066..c01a3701177 100755 --- a/test/phpunit/PricesTest.php +++ b/test/phpunit/PricesTest.php @@ -81,6 +81,8 @@ class PricesTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php index 852292a0ad9..199aace802c 100755 --- a/test/phpunit/ProductTest.php +++ b/test/phpunit/ProductTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/ProductTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -31,9 +31,9 @@ require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php'; if (empty($user->id)) { - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -43,169 +43,170 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; * * @backupGlobals disabled * @backupStaticAttributes enabled - * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. + * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. */ class ProductTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return ProductTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return ProductTest + */ + function __construct() { - global $conf,$user,$langs,$db; + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - if (empty($conf->produit->enabled)) { print __METHOD__." Module Product must be enabled.\n"; die(); } - - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. - - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + + if (empty($conf->produit->enabled)) { print __METHOD__." Module Product must be enabled.\n"; die(); } + + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + // teardownafterclass public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** * testProductCreate * - * @return void + * @return void */ public function testProductCreate() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Product($this->savdb); - $localobject->initAsSpecimen(); - $result=$localobject->create($user); + $localobject=new Product($this->savdb); + $localobject->initAsSpecimen(); + $result=$localobject->create($user); print __METHOD__." result=".$result."\n"; - $this->assertLessThanOrEqual($result, 0); + $this->assertLessThanOrEqual($result, 0); - return $result; + return $result; } /** * testProductFetch * - * @param int $id Id product - * @return Product + * @param int $id Id product + * @return Product * - * @depends testProductCreate + * @depends testProductCreate * The depends says test is run only if previous is ok */ public function testProductFetch($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Product($this->savdb); - $result=$localobject->fetch($id); + $localobject=new Product($this->savdb); + $result=$localobject->fetch($id); print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $this->assertLessThan($result, 0); - return $localobject; + return $localobject; } /** * testProductUpdate * - * @param Product $localobject Product - * @return void + * @param Product $localobject Product + * @return void * - * @depends testProductFetch + * @depends testProductFetch * The depends says test is run only if previous is ok */ public function testProductUpdate($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject->note='New note after update'; - $result=$localobject->update($localobject->id,$user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $localobject->note='New note after update'; + $result=$localobject->update($localobject->id,$user); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); - return $localobject; + return $localobject; } /** * testProductOther * - * @param Product $localobject Product - * @return void + * @param Product $localobject Product + * @return void * * @depends testProductUpdate * The depends says test is run only if previous is ok */ public function testProductOther($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; return $localobject->id; @@ -214,34 +215,34 @@ class ProductTest extends PHPUnit_Framework_TestCase /** * testProductDelete * - * @param int $id Id of product - * @return void + * @param int $id Id of product + * @return void * - * @depends testProductOther + * @depends testProductOther * The depends says test is run only if previous is ok */ public function testProductDelete($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Product($this->savdb); - $result=$localobject->fetch($id); + $localobject=new Product($this->savdb); + $result=$localobject->fetch($id); - $result=$localobject->delete($id); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $result=$localobject->delete($id); + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertLessThan($result, 0); - return $result; + return $result; } /** * testProductStatic * - * @return void + * @return void */ public function testProductStatic() { diff --git a/test/phpunit/ProjectTest.php b/test/phpunit/ProjectTest.php index 8b97f9fe8ea..e27cd1e0223 100644 --- a/test/phpunit/ProjectTest.php +++ b/test/phpunit/ProjectTest.php @@ -81,6 +81,8 @@ class ProjectTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php index 20b6a5afa38..707673e0d0f 100644 --- a/test/phpunit/PropalTest.php +++ b/test/phpunit/PropalTest.php @@ -80,6 +80,8 @@ class PropalTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php index 76d59c6705b..b7916c39d9f 100755 --- a/test/phpunit/ScriptsTest.php +++ b/test/phpunit/ScriptsTest.php @@ -92,6 +92,8 @@ class ScriptsTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php index e7160939532..00714e7bfab 100755 --- a/test/phpunit/SecurityTest.php +++ b/test/phpunit/SecurityTest.php @@ -92,6 +92,8 @@ class SecurityTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php index 730d3d457a2..34fdee385f7 100755 --- a/test/phpunit/SocieteTest.php +++ b/test/phpunit/SocieteTest.php @@ -18,23 +18,22 @@ /** * \file test/phpunit/SocieteTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; -//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver +//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/societe/class/societe.class.php'; $langs->load("dict"); -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -48,35 +47,35 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class SocieteTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return SocieteTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return SocieteTest + */ + function __construct() { - global $conf,$user,$langs,$db; + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; + + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; + } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') { print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(); } @@ -84,40 +83,42 @@ class SocieteTest extends PHPUnit_Framework_TestCase $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. - print __METHOD__."\n"; + print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** @@ -127,130 +128,130 @@ class SocieteTest extends PHPUnit_Framework_TestCase */ public function testSocieteCreate() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Societe($this->savdb); - $localobject->initAsSpecimen(); - $result=$localobject->create($user); + $localobject=new Societe($this->savdb); + $localobject->initAsSpecimen(); + $result=$localobject->create($user); print __METHOD__." result=".$result."\n"; - $this->assertLessThanOrEqual($result, 0); + $this->assertLessThanOrEqual($result, 0); - return $result; + return $result; } /** * testSocieteFetch * - * @param int $id Company id - * @return Societe $localobject Company - * + * @param int $id Company id + * @return Societe $localobject Company + * * @depends testSocieteCreate * The depends says test is run only if previous is ok */ public function testSocieteFetch($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Societe($this->savdb); - $result=$localobject->fetch($id); + $localobject=new Societe($this->savdb); + $result=$localobject->fetch($id); print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $this->assertLessThan($result, 0); $result=$localobject->verify(); print __METHOD__." id=".$id." result=".$result."\n"; $this->assertEquals($result, 0); - return $localobject; + return $localobject; } /** * testSocieteUpdate * - * @param Societe $localobject Company - * @return Societe $localobject Company - * - * @depends testSocieteFetch + * @param Societe $localobject Company + * @return Societe $localobject Company + * + * @depends testSocieteFetch * The depends says test is run only if previous is ok */ public function testSocieteUpdate($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject->note_private='New private note after update'; - $localobject->note_public='New public note after update'; - $localobject->name='New name'; - $localobject->address='New address'; - $localobject->zip='New zip'; - $localobject->town='New town'; - $localobject->country_id=2; - $localobject->status=0; - $localobject->phone='New tel'; - $localobject->fax='New fax'; - $localobject->email='newemail@newemail.com'; - $localobject->url='New url'; - $localobject->idprof1='new idprof1'; - $localobject->idprof2='new idprof2'; - $localobject->idprof3='new idprof3'; - $localobject->idprof4='new idprof4'; + $localobject->note_private='New private note after update'; + $localobject->note_public='New public note after update'; + $localobject->name='New name'; + $localobject->address='New address'; + $localobject->zip='New zip'; + $localobject->town='New town'; + $localobject->country_id=2; + $localobject->status=0; + $localobject->phone='New tel'; + $localobject->fax='New fax'; + $localobject->email='newemail@newemail.com'; + $localobject->url='New url'; + $localobject->idprof1='new idprof1'; + $localobject->idprof2='new idprof2'; + $localobject->idprof3='new idprof3'; + $localobject->idprof4='new idprof4'; - $result=$localobject->update($localobject->id,$user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - - $result=$localobject->update_note($localobject->note_private,'_private'); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0, 'Holiday::update_note_private error'); - - $result=$localobject->update_note_public($localobject->note_public); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0, 'Holiday::update_note_public error'); - - $newobject=new Societe($this->savdb); - $result=$newobject->fetch($localobject->id); + $result=$localobject->update($localobject->id,$user); print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $this->assertLessThan($result, 0); - $this->assertEquals($localobject->note_private, $newobject->note_private); - //$this->assertEquals($localobject->note_public, $newobject->note_public); - $this->assertEquals($localobject->name, $newobject->name); - $this->assertEquals($localobject->address, $newobject->address); - $this->assertEquals($localobject->zip, $newobject->zip); - $this->assertEquals($localobject->town, $newobject->town); - $this->assertEquals($localobject->country_id, $newobject->country_id); - $this->assertEquals('BE', $newobject->country_code); - $this->assertEquals($localobject->status, $newobject->status); - $this->assertEquals($localobject->phone, $newobject->phone); - $this->assertEquals($localobject->fax, $newobject->fax); - $this->assertEquals($localobject->email, $newobject->email); - $this->assertEquals($localobject->url, $newobject->url); - $this->assertEquals($localobject->idprof1, $newobject->idprof1); - $this->assertEquals($localobject->idprof2, $newobject->idprof2); - $this->assertEquals($localobject->idprof3, $newobject->idprof3); - $this->assertEquals($localobject->idprof4, $newobject->idprof4); + $result=$localobject->update_note($localobject->note_private,'_private'); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0, 'Holiday::update_note_private error'); - return $localobject; + $result=$localobject->update_note_public($localobject->note_public); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0, 'Holiday::update_note_public error'); + + $newobject=new Societe($this->savdb); + $result=$newobject->fetch($localobject->id); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + + $this->assertEquals($localobject->note_private, $newobject->note_private); + //$this->assertEquals($localobject->note_public, $newobject->note_public); + $this->assertEquals($localobject->name, $newobject->name); + $this->assertEquals($localobject->address, $newobject->address); + $this->assertEquals($localobject->zip, $newobject->zip); + $this->assertEquals($localobject->town, $newobject->town); + $this->assertEquals($localobject->country_id, $newobject->country_id); + $this->assertEquals('BE', $newobject->country_code); + $this->assertEquals($localobject->status, $newobject->status); + $this->assertEquals($localobject->phone, $newobject->phone); + $this->assertEquals($localobject->fax, $newobject->fax); + $this->assertEquals($localobject->email, $newobject->email); + $this->assertEquals($localobject->url, $newobject->url); + $this->assertEquals($localobject->idprof1, $newobject->idprof1); + $this->assertEquals($localobject->idprof2, $newobject->idprof2); + $this->assertEquals($localobject->idprof3, $newobject->idprof3); + $this->assertEquals($localobject->idprof4, $newobject->idprof4); + + return $localobject; } /** * testIdProfCheck * - * @param Societe $localobject Company - * @return Societe $localobject Company + * @param Societe $localobject Company + * @return Societe $localobject Company * - * @depends testSocieteUpdate + * @depends testSocieteUpdate * The depends says test is run only if previous is ok */ public function testIdProfCheck($localobject) @@ -302,19 +303,19 @@ class SocieteTest extends PHPUnit_Framework_TestCase /** * testSocieteOther * - * @param Societe $localobject Company - * @return int $id Id of company + * @param Societe $localobject Company + * @return int $id Id of company * - * @depends testIdProfCheck + * @depends testIdProfCheck * The depends says test is run only if previous is ok */ public function testSocieteOther($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; $result=$localobject->set_as_client(); print __METHOD__." id=".$localobject->id." result=".$result."\n"; @@ -347,34 +348,34 @@ class SocieteTest extends PHPUnit_Framework_TestCase /** * testSocieteDelete * - * @param int $id Id of company - * @return int + * @param int $id Id of company + * @return int * - * @depends testSocieteOther + * @depends testSocieteOther * The depends says test is run only if previous is ok */ public function testSocieteDelete($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new Societe($this->savdb); - $result=$localobject->fetch($id); + $localobject=new Societe($this->savdb); + $result=$localobject->fetch($id); - $result=$localobject->delete($id); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $result=$localobject->delete($id); + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertLessThan($result, 0); - return $result; + return $result; } /** - * testSocieteStatic - * - * @return void + * testSocieteStatic + * + * @return void */ public function testSocieteStatic() { @@ -394,7 +395,7 @@ class SocieteTest extends PHPUnit_Framework_TestCase /** * testSocieteGetFullAddress * - * @return int $id Id of company + * @return int $id Id of company */ public function testSocieteGetFullAddress() { diff --git a/test/phpunit/SqlTest.php b/test/phpunit/SqlTest.php index 251709f8471..2587ff5e178 100755 --- a/test/phpunit/SqlTest.php +++ b/test/phpunit/SqlTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/SqlTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -59,71 +59,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class SqlTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return SecurityTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return SecurityTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** @@ -133,38 +135,37 @@ class SqlTest extends PHPUnit_Framework_TestCase */ public function testSql() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration'); + $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration'); - foreach ($listofsqldir as $dir) - { - print 'Process dir '.$dir."\n"; - $filesarray = scandir($dir); - foreach($filesarray as $key => $file) - { - if (! preg_match('/\.sql$/',$file)) continue; + foreach ($listofsqldir as $dir) { + print 'Process dir '.$dir."\n"; + $filesarray = scandir($dir); + foreach($filesarray as $key => $file) { + if (! preg_match('/\.sql$/',$file)) + continue; - print 'Check sql file '.$file."\n"; - $filecontent=file_get_contents($dir.'/'.$file); + print 'Check sql file '.$file."\n"; + $filecontent=file_get_contents($dir.'/'.$file); - $result=strpos($filecontent,'`'); - print __METHOD__." Result for checking we don't have back quote = ".$result."\n"; - $this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.'); + $result=strpos($filecontent,'`'); + print __METHOD__." Result for checking we don't have back quote = ".$result."\n"; + $this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.'); - $result=strpos($filecontent,'int('); - print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n"; - $this->assertTrue($result===false, 'Found int(x) instead of integer into '.$file.'. Bad.'); + $result=strpos($filecontent,'int('); + print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n"; + $this->assertTrue($result===false, 'Found int(x) instead of integer into '.$file.'. Bad.'); - $result=strpos($filecontent,'ON DELETE CASCADE'); - print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n"; - $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.'); - } - } + $result=strpos($filecontent,'ON DELETE CASCADE'); + print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n"; + $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.'); + } + } return; } @@ -176,28 +177,28 @@ class SqlTest extends PHPUnit_Framework_TestCase */ public function testInitData() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdata'); - foreach($filesarray as $key => $file) - { - if (! preg_match('/\.sql$/',$file)) continue; + $filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdata'); + foreach($filesarray as $key => $file) { + if (! preg_match('/\.sql$/',$file)) + continue; - print 'Check sql file '.$file."\n"; - $filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdata/'.$file); + print 'Check sql file '.$file."\n"; + $filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdata/'.$file); - $result=strpos($filecontent,'@gmail.com'); - print __METHOD__." Result for checking we don't have personal data = ".$result."\n"; - $this->assertTrue($result===false, 'Found a bad key into file '.$file); + $result=strpos($filecontent,'@gmail.com'); + print __METHOD__." Result for checking we don't have personal data = ".$result."\n"; + $this->assertTrue($result===false, 'Found a bad key into file '.$file); - $result=strpos($filecontent,'eldy@'); - print __METHOD__." Result for checking we don't have personal data = ".$result."\n"; - $this->assertTrue($result===false, 'Found a bad key into file '.$file); - } + $result=strpos($filecontent,'eldy@'); + print __METHOD__." Result for checking we don't have personal data = ".$result."\n"; + $this->assertTrue($result===false, 'Found a bad key into file '.$file); + } return; } diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php index 0e43b361e20..d41eefcbd39 100644 --- a/test/phpunit/UserGroupTest.php +++ b/test/phpunit/UserGroupTest.php @@ -18,22 +18,21 @@ /** * \file test/phpunit/UserGroupTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; -//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver +//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/user/class/usergroup.class.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -47,71 +46,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class UserGroupTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return UserGroupTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return UserGroupTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** @@ -121,120 +122,120 @@ class UserGroupTest extends PHPUnit_Framework_TestCase */ public function testUserGroupCreate() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new UserGroup($this->savdb); - $localobject->initAsSpecimen(); - $result=$localobject->create($user); + $localobject=new UserGroup($this->savdb); + $localobject->initAsSpecimen(); + $result=$localobject->create($user); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; - return $result; + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; + return $result; } /** * testUserGroupFetch * - * @param int $id Id of group - * @return void - * @depends testUserGroupCreate + * @param int $id Id of group + * @return void + * @depends testUserGroupCreate * The depends says test is run only if previous is ok */ public function testUserGroupFetch($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new UserGroup($this->savdb); - $result=$localobject->fetch($id); + $localobject=new UserGroup($this->savdb); + $result=$localobject->fetch($id); - $this->assertLessThan($result, 0); - print __METHOD__." id=".$id." result=".$result."\n"; - return $localobject; + $this->assertLessThan($result, 0); + print __METHOD__." id=".$id." result=".$result."\n"; + return $localobject; } /** * testUserGroupUpdate * - * @param Object $localobject Group - * @return void - * @depends testUserGroupFetch + * @param Object $localobject Group + * @return void + * @depends testUserGroupFetch * The depends says test is run only if previous is ok */ public function testUserGroupUpdate($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject->note='New note after update'; - $result=$localobject->update($user); + $localobject->note='New note after update'; + $result=$localobject->update($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $localobject; + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $localobject; } /** * testUserGroupAddRight * - * @param Object $localobject Object to show - * @return void - * @depends testUserGroupUpdate + * @param Object $localobject Object to show + * @return void + * @depends testUserGroupUpdate * The depends says test is run only if previous is ok */ public function testUserGroupAddRight($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->addrights(1,'bookmarks'); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $result=$localobject->addrights(1,'bookmarks'); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $localobject; + $this->assertLessThan($result, 0); + return $localobject; } /** * testUserGroupDelRight * - * @param Object $localobject Object - * @return void - * @depends testUserGroupAddRight + * @param Object $localobject Object + * @return void + * @depends testUserGroupAddRight * The depends says test is run only if previous is ok */ public function testUserGroupDelRight($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->delrights(1,'bookmarks'); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $result=$localobject->delrights(1,'bookmarks'); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $localobject; + $this->assertLessThan($result, 0); + return $localobject; } /** * testUserGroupOther * - * @param Object $localobject Object - * @return void + * @param Object $localobject Object + * @return void * @depends testUserGroupDelRight * The depends says test is run only if previous is ok */ @@ -261,26 +262,26 @@ class UserGroupTest extends PHPUnit_Framework_TestCase /** * testUserGroupDelete * - * @param int $id Id of object - * @return void - * @depends testUserGroupOther + * @param int $id Id of object + * @return void + * @depends testUserGroupOther * The depends says test is run only if previous is ok */ public function testUserGroupDelete($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new UserGroup($this->savdb); - $result=$localobject->fetch($id); - $result=$localobject->delete($id); + $localobject=new UserGroup($this->savdb); + $result=$localobject->fetch($id); + $result=$localobject->delete($id); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $result; + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $result; } } diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php index e0eaa03acec..1e171737a6b 100644 --- a/test/phpunit/UserTest.php +++ b/test/phpunit/UserTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/UserTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -29,11 +29,10 @@ global $conf,$user,$langs,$db; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/user/class/user.class.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -47,146 +46,148 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class UserTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return UserTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return UserTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } /** * testUserCreate * - * @return void + * @return void */ public function testUserCreate() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new User($this->savdb); - $localobject->initAsSpecimen(); - $result=$localobject->create($user); + $localobject=new User($this->savdb); + $localobject->initAsSpecimen(); + $result=$localobject->create($user); - $this->assertLessThan($result, 0); - print __METHOD__." result=".$result."\n"; - return $result; + $this->assertLessThan($result, 0); + print __METHOD__." result=".$result."\n"; + return $result; } /** * testUserFetch * - * @param int $id Id of user - * @return void - * @depends testUserCreate + * @param int $id Id of user + * @return void + * @depends testUserCreate * The depends says test is run only if previous is ok */ public function testUserFetch($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new User($this->savdb); - $result=$localobject->fetch($id); + $localobject=new User($this->savdb); + $result=$localobject->fetch($id); - $this->assertLessThan($result, 0); - print __METHOD__." id=".$id." result=".$result."\n"; - return $localobject; + $this->assertLessThan($result, 0); + print __METHOD__." id=".$id." result=".$result."\n"; + return $localobject; } /** * testUserUpdate * - * @param Object $localobject User - * @return void - * @depends testUserFetch + * @param Object $localobject User + * @return void + * @depends testUserFetch * The depends says test is run only if previous is ok */ public function testUserUpdate($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $this->changeProperties($localobject); - $result=$localobject->update($user); + $this->changeProperties($localobject); + $result=$localobject->update($user); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $this->assertLessThan($result, 0); - // Test everything are still same than specimen - $newlocalobject=new User($this->savdb); - $newlocalobject->initAsSpecimen(); - $this->changeProperties($newlocalobject); - $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array()); // Actual, Expected + // Test everything are still same than specimen + $newlocalobject=new User($this->savdb); + $newlocalobject->initAsSpecimen(); + $this->changeProperties($newlocalobject); + $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array()); // Actual, Expected return $localobject; } @@ -194,32 +195,32 @@ class UserTest extends PHPUnit_Framework_TestCase /** * testUserDisable * - * @param Object $localobject User - * @return void - * @depends testUserUpdate + * @param Object $localobject User + * @return void + * @depends testUserUpdate * The depends says test is run only if previous is ok */ public function testUserDisable($localobject) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $result=$localobject->setstatus(0); - print __METHOD__." id=".$localobject->id." result=".$result."\n"; + $result=$localobject->setstatus(0); + print __METHOD__." id=".$localobject->id." result=".$result."\n"; - $this->assertLessThan($result, 0); + $this->assertLessThan($result, 0); - return $localobject; + return $localobject; } /** * testUserOther * - * @param Object $localobject User - * @return void + * @param Object $localobject User + * @return void * @depends testUserDisable * The depends says test is run only if previous is ok */ @@ -246,75 +247,70 @@ class UserTest extends PHPUnit_Framework_TestCase /** * testUserDelete * - * @param Object $id User - * @return void - * @depends testUserOther + * @param Object $id User + * @return void + * @depends testUserOther * The depends says test is run only if previous is ok */ public function testUserDelete($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $localobject=new User($this->savdb); - $result=$localobject->fetch($id); - $result=$localobject->delete($id); + $localobject=new User($this->savdb); + $result=$localobject->fetch($id); + $result=$localobject->delete($id); - print __METHOD__." id=".$id." result=".$result."\n"; - $this->assertLessThan($result, 0); - return $result; + print __METHOD__." id=".$id." result=".$result."\n"; + $this->assertLessThan($result, 0); + return $result; } /** * Edit an object to test updates * - * @param mixed $localobject Object Facture - * @return void + * @param mixed $localobject Object Facture + * @return void */ public function changeProperties(&$localobject) { - $localobject->note='New note after update'; + $localobject->note='New note after update'; } /** * Compare all public properties values of 2 objects * - * @param Object $oA Object operand 1 - * @param Object $oB Object operand 2 - * @param boolean $ignoretype False will not report diff if type of value differs - * @param array $fieldstoignorearray Array of fields to ignore in diff - * @return array Array with differences + * @param Object $oA Object operand 1 + * @param Object $oB Object operand 2 + * @param boolean $ignoretype False will not report diff if type of value differs + * @param array $fieldstoignorearray Array of fields to ignore in diff + * @return array Array with differences */ public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id')) { - $retAr=array(); + $retAr=array(); - if (get_class($oA) !== get_class($oB)) - { - $retAr[]="Supplied objects are not of same class."; - } - else - { - $oVarsA=get_object_vars($oA); - $oVarsB=get_object_vars($oB); - $aKeys=array_keys($oVarsA); - foreach($aKeys as $sKey) - { - if (in_array($sKey,$fieldstoignorearray)) continue; - if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) - { - $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]); - } - if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey]) - { - $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]); - } - } - } - return $retAr; + if (get_class($oA) !== get_class($oB)) { + $retAr[]="Supplied objects are not of same class."; + } else { + $oVarsA=get_object_vars($oA); + $oVarsB=get_object_vars($oB); + $aKeys=array_keys($oVarsA); + foreach($aKeys as $sKey) { + if (in_array($sKey,$fieldstoignorearray)) + continue; + if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) { + $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]); + } + if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey]) { + $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]); + } + } + } + return $retAr; } } diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php index 20e01595375..202f260bc84 100755 --- a/test/phpunit/WebservicesInvoicesTest.php +++ b/test/phpunit/WebservicesInvoicesTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/WebservicesInvoicesTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -31,11 +31,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -45,75 +44,77 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; * * @backupGlobals disabled * @backupStaticAttributes enabled - * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. + * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. */ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return DateLibTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return DateLibTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } @@ -124,60 +125,57 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase */ public function testWSInvoicesXxx() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php'; - $WS_METHOD = 'getInvoice'; - $ns='http://www.dolibarr.org/ns/'; + $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php'; + $WS_METHOD = 'getInvoice'; + $ns='http://www.dolibarr.org/ns/'; - // Set the WebService URL - print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; - $soapclient = new nusoap_client($WS_DOL_URL); - if ($soapclient) - { - $soapclient->soap_defencoding='UTF-8'; - $soapclient->decodeUTF8(false); - } + // Set the WebService URL + print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; + $soapclient = new nusoap_client($WS_DOL_URL); + if ($soapclient) { + $soapclient->soap_defencoding='UTF-8'; + $soapclient->decodeUTF8(false); + } - // Call the WebService method and store its result in $result. - $authentication=array( - 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, - 'sourceapplication'=>'DEMO', - 'login'=>'admin', - 'password'=>'admin', - 'entity'=>''); + // Call the WebService method and store its result in $result. + $authentication=array( + 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, + 'sourceapplication'=>'DEMO', + 'login'=>'admin', + 'password'=>'admin', + 'entity'=>'' + ); - // Test URL - $result=''; - $parameters = array('authentication'=>$authentication,'id'=>1); - print __METHOD__." call method ".$WS_METHOD."\n"; - try { - $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); - } - catch(SoapFault $exception) - { - echo $exception; - $result=0; - } - if (! $result || ! empty($result['faultstring'])) - { - //var_dump($soapclient); - print $soapclient->error_str; - print "\n
    \n"; - print $soapclient->request; - print "\n
    \n"; - print $soapclient->response; - print "\n"; - } + // Test URL + $result=''; + $parameters = array('authentication'=>$authentication,'id'=>1); + print __METHOD__." call method ".$WS_METHOD."\n"; + try { + $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); + } catch(SoapFault $exception) { + echo $exception; + $result=0; + } + if (! $result || ! empty($result['faultstring'])) { + //var_dump($soapclient); + print $soapclient->error_str; + print "\n
    \n"; + print $soapclient->request; + print "\n
    \n"; + print $soapclient->response; + print "\n"; + } - print __METHOD__." result=".$result."\n"; - $this->assertEquals('OK',$result['result']['result_code']); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('OK',$result['result']['result_code']); - return $result; + return $result; } } diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php index d76fc784722..06ead4f4873 100755 --- a/test/phpunit/WebservicesOrdersTest.php +++ b/test/phpunit/WebservicesOrdersTest.php @@ -18,24 +18,23 @@ /** * \file test/phpunit/WebservicesOrdersTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; -//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver +//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -49,71 +48,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return DateLibTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return DateLibTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } @@ -124,59 +125,56 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase */ public function testWSOrderGetOrder() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_order.php'; - $WS_METHOD = 'getOrder'; - $ns='http://www.dolibarr.org/ns/'; + $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_order.php'; + $WS_METHOD = 'getOrder'; + $ns='http://www.dolibarr.org/ns/'; - // Set the WebService URL - print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; - $soapclient = new nusoap_client($WS_DOL_URL); - if ($soapclient) - { - $soapclient->soap_defencoding='UTF-8'; - $soapclient->decodeUTF8(false); - } + // Set the WebService URL + print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; + $soapclient = new nusoap_client($WS_DOL_URL); + if ($soapclient) { + $soapclient->soap_defencoding='UTF-8'; + $soapclient->decodeUTF8(false); + } - // Call the WebService method and store its result in $result. - $authentication=array( - 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, - 'sourceapplication'=>'DEMO', - 'login'=>'admin', - 'password'=>'admin', - 'entity'=>''); + // Call the WebService method and store its result in $result. + $authentication=array( + 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, + 'sourceapplication'=>'DEMO', + 'login'=>'admin', + 'password'=>'admin', + 'entity'=>'' + ); - // Test URL - $parameters = array('authentication'=>$authentication,'id'=>1); - print __METHOD__." call method ".$WS_METHOD."\n"; - try { - $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); - } - catch(SoapFault $exception) - { - echo $exception; - $result=0; - } - if (! $result || ! empty($result['faultstring'])) - { - //var_dump($soapclient); - print $soapclient->error_str; - print "\n
    \n"; - print $soapclient->request; - print "\n
    \n"; - print $soapclient->response; - print "\n"; - } + // Test URL + $parameters = array('authentication'=>$authentication,'id'=>1); + print __METHOD__." call method ".$WS_METHOD."\n"; + try { + $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); + } catch(SoapFault $exception) { + echo $exception; + $result=0; + } + if (! $result || ! empty($result['faultstring'])) { + //var_dump($soapclient); + print $soapclient->error_str; + print "\n
    \n"; + print $soapclient->request; + print "\n
    \n"; + print $soapclient->response; + print "\n"; + } - print __METHOD__." result=".$result."\n"; - $this->assertEquals('OK',$result['result']['result_code']); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('OK',$result['result']['result_code']); - return $result; + return $result; } } diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php index 1ea80beb4bf..d04fc6b9b9c 100755 --- a/test/phpunit/WebservicesOtherTest.php +++ b/test/phpunit/WebservicesOtherTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/WebservicesOtherTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -31,11 +31,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -49,71 +48,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class WebservicesOtherTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return DateLibTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return DateLibTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } @@ -124,92 +125,85 @@ class WebservicesOtherTest extends PHPUnit_Framework_TestCase */ public function testWSOtherGetVersions() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php'; - $WS_METHOD = 'getVersions'; - $ns='http://www.dolibarr.org/ns/'; + $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php'; + $WS_METHOD = 'getVersions'; + $ns='http://www.dolibarr.org/ns/'; - // Set the WebService URL - print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; - $soapclient = new nusoap_client($WS_DOL_URL); - if ($soapclient) - { - $soapclient->soap_defencoding='UTF-8'; - $soapclient->decodeUTF8(false); - } + // Set the WebService URL + print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; + $soapclient = new nusoap_client($WS_DOL_URL); + if ($soapclient) { + $soapclient->soap_defencoding='UTF-8'; + $soapclient->decodeUTF8(false); + } - // Call the WebService method and store its result in $result. - $authentication=array( - 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, - 'sourceapplication'=>'DEMO', - 'login'=>'admin', - 'password'=>'admin', - 'entity'=>''); + // Call the WebService method and store its result in $result. + $authentication=array( + 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, + 'sourceapplication'=>'DEMO', + 'login'=>'admin', + 'password'=>'admin', + 'entity'=>'' + ); - // Test URL - $result=''; - $parameters = array('authentication'=>$authentication); - print __METHOD__." call method ".$WS_METHOD."\n"; - try { - $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); - } - catch(SoapFault $exception) - { - echo $exception; - $result=0; - } - if (! empty($result['faultstring'])) - { - print $result['faultstring']."\n"; - $result=0; - } - if (! $result) - { - //var_dump($soapclient); - print $soapclient->error_str; - print "\n
    \n"; - print $soapclient->request; - print "\n
    \n"; - print $soapclient->response; - print "\n"; - } + // Test URL + $result=''; + $parameters = array('authentication'=>$authentication); + print __METHOD__." call method ".$WS_METHOD."\n"; + try { + $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); + } catch(SoapFault $exception) { + echo $exception; + $result=0; + } + if (! empty($result['faultstring'])) { + print $result['faultstring']."\n"; + $result=0; + } + if (! $result) { + //var_dump($soapclient); + print $soapclient->error_str; + print "\n
    \n"; + print $soapclient->request; + print "\n
    \n"; + print $soapclient->response; + print "\n"; + } - print __METHOD__." result=".$result."\n"; - $this->assertEquals('OK',$result['result']['result_code']); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('OK',$result['result']['result_code']); - // Test method that does not exists - $WS_METHOD='methodthatdoesnotexists'; - $result=''; - $parameters = array('authentication'=>$authentication); - print __METHOD__." call method ".$WS_METHOD."\n"; - try { - $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); - } - catch(SoapFault $exception) - { - echo $exception; - $result=0; - } - if (! $result || ! empty($result['faultstring'])) - { - //var_dump($soapclient); - print $soapclient->error_str; - print "\n
    \n"; - print $soapclient->request; - print "\n
    \n"; - print $soapclient->response; - print "\n"; - } + // Test method that does not exists + $WS_METHOD='methodthatdoesnotexists'; + $result=''; + $parameters = array('authentication'=>$authentication); + print __METHOD__." call method ".$WS_METHOD."\n"; + try { + $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); + } catch(SoapFault $exception) { + echo $exception; + $result=0; + } + if (! $result || ! empty($result['faultstring'])) { + //var_dump($soapclient); + print $soapclient->error_str; + print "\n
    \n"; + print $soapclient->request; + print "\n
    \n"; + print $soapclient->response; + print "\n"; + } - print __METHOD__." result=".$result."\n"; - $this->assertEquals("SOAP-ENV:Client: Operation 'methodthatdoesnotexists' is not defined in the WSDL for this service", $soapclient->error_str); + print __METHOD__." result=".$result."\n"; + $this->assertEquals("SOAP-ENV:Client: Operation 'methodthatdoesnotexists' is not defined in the WSDL for this service", $soapclient->error_str); - return $result; + return $result; } } diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php index a4ff7293091..77fd81c78f6 100755 --- a/test/phpunit/WebservicesProductsTest.php +++ b/test/phpunit/WebservicesProductsTest.php @@ -20,9 +20,9 @@ /** * \file test/phpunit/WebservicesProductsTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -33,11 +33,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -51,71 +50,72 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class WebservicesProductsTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return DateLibTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return DateLibTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } @@ -126,198 +126,192 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase */ public function testWSProductsCreateProductOrService() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $datestring=dol_print_date(dol_now(),'dayhourlog'); + $datestring=dol_print_date(dol_now(),'dayhourlog'); - $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php'; - $WS_METHOD = 'createProductOrService'; - $ns='http://www.dolibarr.org/ns/'; + $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php'; + $WS_METHOD = 'createProductOrService'; + $ns='http://www.dolibarr.org/ns/'; - // Set the WebService URL - print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; - $soapclient = new nusoap_client($WS_DOL_URL); - if ($soapclient) - { - $soapclient->soap_defencoding='UTF-8'; - $soapclient->decodeUTF8(false); - } + // Set the WebService URL + print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; + $soapclient = new nusoap_client($WS_DOL_URL); + if ($soapclient) { + $soapclient->soap_defencoding='UTF-8'; + $soapclient->decodeUTF8(false); + } - // Call the WebService method and store its result in $result. - $authentication=array( - 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, - 'sourceapplication'=>'DEMO', - 'login'=>'admin', - 'password'=>'admin', - 'entity'=>''); + // Call the WebService method and store its result in $result. + $authentication=array( + 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, + 'sourceapplication'=>'DEMO', + 'login'=>'admin', + 'password'=>'admin', + 'entity'=>'' + ); - // Test URL - $result=''; - $parameters = array('authentication'=>$authentication,'product'=>array( - 'ref'=>'NewProductFromWS'.$datestring, - 'label'=>'New Product From WS '.$datestring, - 'type'=>1, - 'description'=>'This is a new product created from WS PHPUnit test case')); - print __METHOD__." call method ".$WS_METHOD."\n"; - try { - $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); - } - catch(SoapFault $exception) - { - echo $exception; - $result=0; - } - if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') - { - //var_dump($soapclient); - print $soapclient->error_str; - print "\n
    \n"; - print $soapclient->request; - print "\n
    \n"; - print $soapclient->response; - print "\n"; - } + // Test URL + $result=''; + $parameters = array( + 'authentication'=>$authentication,'product'=>array( + 'ref'=>'NewProductFromWS'.$datestring, + 'label'=>'New Product From WS '.$datestring, + 'type'=>1, + 'description'=>'This is a new product created from WS PHPUnit test case' + ) + ); + print __METHOD__." call method ".$WS_METHOD."\n"; + try { + $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); + } catch(SoapFault $exception) { + echo $exception; + $result=0; + } + if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') { + //var_dump($soapclient); + print $soapclient->error_str; + print "\n
    \n"; + print $soapclient->request; + print "\n
    \n"; + print $soapclient->response; + print "\n"; + } - print __METHOD__." result=".$result."\n"; - $this->assertEquals('OK',$result['result']['result_code']); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('OK',$result['result']['result_code']); - return $result['id']; + return $result['id']; } /** * testWSProductsGetProductOrService * - * @param int $id Id of product or service - * @return int Id of product or service + * @param int $id Id of product or service + * @return int Id of product or service * * @depends testWSProductsCreateProductOrService */ public function testWSProductsGetProductOrService($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php'; - $WS_METHOD = 'getProductOrService'; - $ns='http://www.dolibarr.org/ns/'; + $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php'; + $WS_METHOD = 'getProductOrService'; + $ns='http://www.dolibarr.org/ns/'; - // Set the WebService URL - print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; - $soapclient = new nusoap_client($WS_DOL_URL); - if ($soapclient) - { - $soapclient->soap_defencoding='UTF-8'; - $soapclient->decodeUTF8(false); - } + // Set the WebService URL + print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; + $soapclient = new nusoap_client($WS_DOL_URL); + if ($soapclient) { + $soapclient->soap_defencoding='UTF-8'; + $soapclient->decodeUTF8(false); + } - // Call the WebService method and store its result in $result. - $authentication=array( - 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, - 'sourceapplication'=>'DEMO', - 'login'=>'admin', - 'password'=>'admin', - 'entity'=>''); + // Call the WebService method and store its result in $result. + $authentication=array( + 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, + 'sourceapplication'=>'DEMO', + 'login'=>'admin', + 'password'=>'admin', + 'entity'=>'' + ); - // Test URL - $result=''; - $parameters = array('authentication'=>$authentication,'id'=>$id,'ref'=>''); - print __METHOD__." call method ".$WS_METHOD."\n"; - try { - $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); - } - catch(SoapFault $exception) - { - echo $exception; - $result=0; - } - if (! $result || ! empty($result['faultstring'])) - { - //var_dump($soapclient); - print $soapclient->error_str; - print "\n
    \n"; - print $soapclient->request; - print "\n
    \n"; - print $soapclient->response; - print "\n"; - } + // Test URL + $result=''; + $parameters = array('authentication'=>$authentication,'id'=>$id,'ref'=>''); + print __METHOD__." call method ".$WS_METHOD."\n"; + try { + $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); + } catch(SoapFault $exception) { + echo $exception; + $result=0; + } + if (! $result || ! empty($result['faultstring'])) { + //var_dump($soapclient); + print $soapclient->error_str; + print "\n
    \n"; + print $soapclient->request; + print "\n
    \n"; + print $soapclient->response; + print "\n"; + } - print __METHOD__." result=".$result."\n"; - $this->assertEquals('OK',$result['result']['result_code']); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('OK',$result['result']['result_code']); - return $id; + return $id; } /** * testWSProductsDeleteProductOrService * - * @param int $id Id of product or service - * @return int 0 + * @param int $id Id of product or service + * @return int 0 * - * @depends testWSProductsGetProductOrService + * @depends testWSProductsGetProductOrService */ public function testWSProductsDeleteProductOrService($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php'; - $WS_METHOD = 'deleteProductOrService'; - $ns='http://www.dolibarr.org/ns/'; + $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php'; + $WS_METHOD = 'deleteProductOrService'; + $ns='http://www.dolibarr.org/ns/'; - // Set the WebService URL - print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; - $soapclient = new nusoap_client($WS_DOL_URL); - if ($soapclient) - { - $soapclient->soap_defencoding='UTF-8'; - $soapclient->decodeUTF8(false); - } + // Set the WebService URL + print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; + $soapclient = new nusoap_client($WS_DOL_URL); + if ($soapclient) { + $soapclient->soap_defencoding='UTF-8'; + $soapclient->decodeUTF8(false); + } - // Call the WebService method and store its result in $result. - $authentication=array( - 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, - 'sourceapplication'=>'DEMO', - 'login'=>'admin', - 'password'=>'admin', - 'entity'=>''); + // Call the WebService method and store its result in $result. + $authentication=array( + 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, + 'sourceapplication'=>'DEMO', + 'login'=>'admin', + 'password'=>'admin', + 'entity'=>'' + ); - // Test URL - $result=''; - $parameters = array('authentication'=>$authentication,'listofid'=>$id); - print __METHOD__." call method ".$WS_METHOD."\n"; - try { - $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); - } - catch(SoapFault $exception) - { - echo $exception; - $result=0; - } - if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') - { - //var_dump($soapclient); - print $soapclient->error_str; - print "\n
    \n"; - print $soapclient->request; - print "\n
    \n"; - print $soapclient->response; - print "\n"; - } + // Test URL + $result=''; + $parameters = array('authentication'=>$authentication,'listofid'=>$id); + print __METHOD__." call method ".$WS_METHOD."\n"; + try { + $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); + } catch(SoapFault $exception) { + echo $exception; + $result=0; + } + if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') { + //var_dump($soapclient); + print $soapclient->error_str; + print "\n
    \n"; + print $soapclient->request; + print "\n
    \n"; + print $soapclient->response; + print "\n"; + } - print __METHOD__." result=".$result."\n"; - $this->assertEquals('OK',$result['result']['result_code']); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('OK',$result['result']['result_code']); - return 0; + return 0; } } diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php index 64753dcc502..0c99d7d362a 100755 --- a/test/phpunit/WebservicesThirdpartyTest.php +++ b/test/phpunit/WebservicesThirdpartyTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/WebservicesThirdpartyTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -31,11 +31,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -45,75 +44,77 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; * * @backupGlobals disabled * @backupStaticAttributes enabled - * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. + * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. */ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return DateLibTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return DateLibTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } @@ -124,60 +125,56 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase */ public function testWSThirdpartygetThirdParty() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php'; - $WS_METHOD = 'getThirdParty'; - $ns='http://www.dolibarr.org/ns/'; + $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php'; + $WS_METHOD = 'getThirdParty'; + $ns='http://www.dolibarr.org/ns/'; - // Set the WebService URL - print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; - $soapclient = new nusoap_client($WS_DOL_URL); - if ($soapclient) - { - $soapclient->soap_defencoding='UTF-8'; - $soapclient->decodeUTF8(false); - } + // Set the WebService URL + print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n"; + $soapclient = new nusoap_client($WS_DOL_URL); + if ($soapclient) { + $soapclient->soap_defencoding='UTF-8'; + $soapclient->decodeUTF8(false); + } - // Call the WebService method and store its result in $result. - $authentication=array( - 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, - 'sourceapplication'=>'DEMO', - 'login'=>'admin', - 'password'=>'admin', - 'entity'=>''); + // Call the WebService method and store its result in $result. + $authentication=array( + 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, + 'sourceapplication'=>'DEMO', + 'login'=>'admin', + 'password'=>'admin', + 'entity'=>''); - // Test URL - $result=''; - $parameters = array('authentication'=>$authentication, 'id'=>1); - print __METHOD__." call method ".$WS_METHOD."\n"; - try { - $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); - } - catch(SoapFault $exception) - { - echo $exception; - $result=0; - } - if (! $result || ! empty($result['faultstring'])) - { - //var_dump($soapclient); - print $soapclient->error_str; - print "\n
    \n"; - print $soapclient->request; - print "\n
    \n"; - print $soapclient->response; - print "\n"; - } + // Test URL + $result=''; + $parameters = array('authentication'=>$authentication, 'id'=>1); + print __METHOD__." call method ".$WS_METHOD."\n"; + try { + $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); + } catch(SoapFault $exception) { + echo $exception; + $result=0; + } + if (! $result || ! empty($result['faultstring'])) { + //var_dump($soapclient); + print $soapclient->error_str; + print "\n
    \n"; + print $soapclient->request; + print "\n
    \n"; + print $soapclient->response; + print "\n"; + } - print __METHOD__." result=".$result."\n"; - $this->assertEquals('OK',$result['result']['result_code']); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('OK',$result['result']['result_code']); - return $result; + return $result; } } diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php index e06b98d0921..9be97167104 100755 --- a/test/phpunit/WebservicesUserTest.php +++ b/test/phpunit/WebservicesUserTest.php @@ -18,9 +18,9 @@ /** * \file test/phpunit/WebservicesUserTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; @@ -31,11 +31,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -49,71 +48,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; */ class WebservicesUserTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return DateLibTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return DateLibTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ + /** + * End phpunit tests + * + * @return void + */ protected function tearDown() { - print __METHOD__."\n"; + print __METHOD__."\n"; } @@ -124,91 +125,84 @@ class WebservicesUserTest extends PHPUnit_Framework_TestCase */ public function testWSUserGetUser() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_user.php'; - $WS_METHOD = 'getUser'; - $ns='http://www.dolibarr.org/ns/'; + $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_user.php'; + $WS_METHOD = 'getUser'; + $ns='http://www.dolibarr.org/ns/'; - // Set the WebService URL - print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n"; - $soapclient = new nusoap_client($WS_DOL_URL); - if ($soapclient) - { - $soapclient->soap_defencoding='UTF-8'; - $soapclient->decodeUTF8(false); - } + // Set the WebService URL + print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n"; + $soapclient = new nusoap_client($WS_DOL_URL); + if ($soapclient) { + $soapclient->soap_defencoding='UTF-8'; + $soapclient->decodeUTF8(false); + } - // Call the WebService method and store its result in $result. - $authentication=array( - 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, - 'sourceapplication'=>'DEMO', - 'login'=>'admin', - 'password'=>'admin', - 'entity'=>''); + // Call the WebService method and store its result in $result. + $authentication=array( + 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, + 'sourceapplication'=>'DEMO', + 'login'=>'admin', + 'password'=>'admin', + 'entity'=>'' + ); - // Test URL - $result=''; - $parameters = array('authentication'=>$authentication,'ref'=>'admin'); - print __METHOD__."Call method ".$WS_METHOD."\n"; - try { - $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); - } - catch(SoapFault $exception) - { - echo $exception; - $result=0; - } - if (! empty($result['faultstring'])) - { - print $result['faultstring']."\n"; - $result=0; - } - if (! $result) - { - //var_dump($soapclient); - print $soapclient->error_str; - print "\n
    \n"; - print $soapclient->request; - print "\n
    \n"; - print $soapclient->response; - print "\n"; - } + // Test URL + $result=''; + $parameters = array('authentication'=>$authentication,'ref'=>'admin'); + print __METHOD__."Call method ".$WS_METHOD."\n"; + try { + $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); + } catch(SoapFault $exception) { + echo $exception; + $result=0; + } + if (! empty($result['faultstring'])) { + print $result['faultstring']."\n"; + $result=0; + } + if (! $result) { + //var_dump($soapclient); + print $soapclient->error_str; + print "\n
    \n"; + print $soapclient->request; + print "\n
    \n"; + print $soapclient->response; + print "\n"; + } - print __METHOD__." result=".$result."\n"; - $this->assertEquals('OK',$result['result']['result_code']); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('OK',$result['result']['result_code']); - // Test URL - $result=''; - $parameters = array('authentication'=>$authentication,'ref'=>'refthatdoesnotexists'); - print __METHOD__."Call method ".$WS_METHOD."\n"; - try { - $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); - } - catch(SoapFault $exception) - { - echo $exception; - $result=0; - } - if (! $result || ! empty($result['faultstring'])) - { - //var_dump($soapclient); - print $soapclient->error_str; - print "\n
    \n"; - print $soapclient->request; - print "\n
    \n"; - print $soapclient->response; - print "\n"; - } + // Test URL + $result=''; + $parameters = array('authentication'=>$authentication,'ref'=>'refthatdoesnotexists'); + print __METHOD__."Call method ".$WS_METHOD."\n"; + try { + $result = $soapclient->call($WS_METHOD,$parameters,$ns,''); + } catch(SoapFault $exception) { + echo $exception; + $result=0; + } + if (! $result || ! empty($result['faultstring'])) { + //var_dump($soapclient); + print $soapclient->error_str; + print "\n
    \n"; + print $soapclient->request; + print "\n
    \n"; + print $soapclient->response; + print "\n"; + } - print __METHOD__." result=".$result."\n"; - $this->assertEquals('NOT_FOUND',$result['result']['result_code']); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('NOT_FOUND',$result['result']['result_code']); - return $result; + return $result; } } diff --git a/test/phpunit/XCalLibTest.php b/test/phpunit/XCalLibTest.php index 6ec63912878..3bbf3469b17 100644 --- a/test/phpunit/XCalLibTest.php +++ b/test/phpunit/XCalLibTest.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2010-2012 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,22 +18,21 @@ /** * \file test/phpunit/XCalLibTest.php - * \ingroup test + * \ingroup test * \brief PHPUnit test - * \remarks To run this script as CLI: phpunit filename.php + * \remarks To run this script as CLI: phpunit filename.php */ global $conf,$user,$langs,$db; -//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver +//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/xcal.lib.php'; -if (empty($user->id)) -{ - print "Load permissions for admin user nb 1\n"; - $user->fetch(1); - $user->getrights(); +if (empty($user->id)) { + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); } $conf->global->MAIN_DISABLE_ALL_MAILS=1; @@ -43,98 +42,100 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; * * @backupGlobals disabled * @backupStaticAttributes enabled - * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. + * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. */ class XCalLibTest extends PHPUnit_Framework_TestCase { - protected $savconf; - protected $savuser; - protected $savlangs; - protected $savdb; + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; - /** - * Constructor - * We save global variables into local variables - * - * @return FilesLibTest - */ - function __construct() - { - //$this->sharedFixture - global $conf,$user,$langs,$db; - $this->savconf=$conf; - $this->savuser=$user; - $this->savlangs=$langs; - $this->savdb=$db; - - print __METHOD__." db->type=".$db->type." user->id=".$user->id; - //print " - db ".$db->db; - print "\n"; - } - - // Static methods - public static function setUpBeforeClass() + /** + * Constructor + * We save global variables into local variables + * + * @return FilesLibTest + */ + function __construct() { - global $conf,$user,$langs,$db; - $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; - print __METHOD__."\n"; + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + + // tear down after class public static function tearDownAfterClass() { - global $conf,$user,$langs,$db; - $db->rollback(); + global $conf,$user,$langs,$db; + $db->rollback(); - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * Init phpunit tests - * - * @return void - */ + /** + * Init phpunit tests + * + * @return void + */ protected function setUp() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - print __METHOD__."\n"; + print __METHOD__."\n"; } - /** - * End phpunit tests - * - * @return void - */ - protected function tearDown() - { - print __METHOD__."\n"; - } - - - /** - * testQuotedPrintEncodeDecode + /** + * End phpunit tests * * @return void + */ + protected function tearDown() + { + print __METHOD__."\n"; + } + + + /** + * testQuotedPrintEncodeDecode + * + * @return void */ public function testQuotedPrintEncodeDecode() { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; - $stringtoencode='ABCD=1234;'; - $result=quotedPrintEncode($stringtoencode); - print __METHOD__." result=".$result."\n"; - $this->assertEquals('ABCD=3D1234;',$result); + $stringtoencode='ABCD=1234;'; + $result=quotedPrintEncode($stringtoencode); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('ABCD=3D1234;',$result); - $resultback=quotedPrintDecode($result); - print __METHOD__." result=".$resultback."\n"; - $this->assertEquals($stringtoencode,$resultback); + $resultback=quotedPrintDecode($result); + print __METHOD__." result=".$resultback."\n"; + $this->assertEquals($stringtoencode,$resultback); } } diff --git a/test/soapui/Dolibarr-soapui-project.xml b/test/soapui/Dolibarr-soapui-project.xml index 1ffd1ad0e3c..c81b1ac8e1f 100755 --- a/test/soapui/Dolibarr-soapui-project.xml +++ b/test/soapui/Dolibarr-soapui-project.xml @@ -27446,4 +27446,374 @@ -]]> \ No newline at end of file +]]>http://localhostalias/dolibarr_3.7/webservices/server_order.php?wsdl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WS to get a particular invoice + + + + + WS to get all orders of a third party + + + + + WS to create an order + + + + + WS to update an order + + + + + WS to valid an order + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]>http://schemas.xmlsoap.org/wsdl/http://localhostalias/dolibarr_3.6/webservices/server_order.phphttp://localhostalias/dolibarr_3.7/webservices/server_order.php<xml-fragment/>UTF-8http://localhostalias/dolibarr_3.7/webservices/server_order.php + + + + + + dolibarrkey + aaa + admin + admin + + + + + + 123ext + ? + 1 + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + + + +]]>UTF-8http://localhostalias/dolibarr_3.7/webservices/server_order.php + + + + + + ? + ? + ? + ? + ? + + ? + ? + ? + + +]]>UTF-8http://localhostalias/dolibarr_3.7/webservices/server_order.php + + + + + + ? + ? + ? + ? + ? + + ? + + +]]>UTF-8http://localhostalias/dolibarr_3.7/webservices/server_order.php + + + + + + ? + ? + ? + ? + ? + + ? + + +]]><xml-fragment/>UTF-8http://localhostalias/dolibarr_3.7/webservices/server_order.php + + + + + + dolibarrkey + + admin + admin + + + + + 6 +0 + 2 + ? + ? + ? + ? + ? + ? + ? + ? + + + +]]> \ No newline at end of file